diff --git a/appinfo/info.xml b/appinfo/info.xml
index 44f40255..a713e873 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -56,6 +56,7 @@
 		<command>OCA\Social\Command\NoteCreate</command>
 		<command>OCA\Social\Command\NoteBoost</command>
 		<command>OCA\Social\Command\Reset</command>
+		<command>OCA\Social\Command\StreamDetails</command>
 		<command>OCA\Social\Command\Timeline</command>
 		<command>OCA\Social\Command\QueueStatus</command>
 		<command>OCA\Social\Command\QueueProcess</command>
diff --git a/css/style.scss b/css/style.scss
index 09a84a17..0ece984e 100644
--- a/css/style.scss
+++ b/css/style.scss
@@ -1,7 +1,13 @@
 @include icon-black-white('reply', 'social', 1);
 @include icon-black-white('emoji', 'social', 1);
-
 @include icon-black-white('boost', 'social', 1);
+
 .icon-boosted {
   @include icon-color('boost', 'social', '#0082c9', 1);
 }
+
+img.emoji {
+  margin: 3px;
+  width: 16px;
+  vertical-align: text-bottom;
+}
diff --git a/l10n/es.js b/l10n/es.js
index b23d9f5f..84d72db3 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -3,6 +3,9 @@ OC.L10N.register(
     {
     "Social" : "Social",
     "🎉 Nextcloud becomes part of the federated social networks!" : "¡🎉 Nextcloud pasa a ser parte de las redes sociales federadas!",
+    "** Disclaimer: this is an ALPHA version **\n\n**🎉 Nextcloud becomes part of the federated social networks!**\n\n**🙋 Find your friends:** No matter if they use Nextcloud, 🐘 Mastodon, 🇫 Friendica, and soon ✱ Diaspora, 👹 MediaGoblin and more – you can follow them!\n\n**📜 Profile info:** No need to fill out more profiles – your info from Nextcloud will be used and extended.\n\n**👐 Own your posts:** Everything you post stays on your Nextcloud!\n\n**🕸 Open standards:** We use the established ActivityPub standard!" : "** AVISO: Esta es una versión ALFA **\n\n**¡🎉 Nextcloud pasa a ser parte de las redes sociales federadas!**\n\n**🙋 Encuentra a tus amigos:** No importa si usan Nextcloud, 🐘 Mastodon, 🇫 Friendica, y pronto ✱ Diaspora, 👹 MediaGoblin y más, ¡Puedes seguirlos a todos!\n\n**📜 Información de perfil:** Sin necesidad de rellenar más perfiles – se usará y extenderá la información de tu perfil de Nextcloud. \n\n**👐 Sé el dueño de tu material:** ¡Todo lo que cuelgues permanece en tu Nextcloud!\n\n**🕸 Estándares abiertos:** ¡Usamos el estándar establecido ActivityPub! ",
+    ".well-known/webfinger isn't properly set up!" : ".well-known/webfinger no está bien configurado",
+    "Social needs the .well-known automatic discovery to be properly set up. If Nextcloud is not installed in the root of the domain, it is often the case that Nextcloud can't configure this automatically. To use Social, the admin of this Nextcloud instance needs to manually configure the .well-known redirects: " : "Social necesita que el descubrimiento automático de .well-known esté bien configurado. Si Nextcloud no está instalado en la raíz del dominio, a menudo se da el caso de que Nextcloud no puede configurarlo automáticamente. Para usar Social, el administrador de esta instancia de Netcloud debe configurar manualmente las redirecciones .well-known:",
     "Open documentation" : "Abrir la documentación",
     "Social app setup" : "Configuración de la app Social",
     "ActivityPub requires a fixed URL to make entries unique. Note that this can not be changed later without resetting the Social app." : "ActivityPub necesita una URL fija para hacer únicas las entradas. Nota: esto no puede cambiarse más tarde sin reiniciar la app Social.",
@@ -37,6 +40,7 @@ OC.L10N.register(
     "No results found" : "No se han encontrado resultados",
     "There were no results for your search:" : "No ha habido resultados para tu búsqueda:",
     "Searching for" : "Buscando",
+    "boosted" : "reforzado",
     "No posts found" : "No se han encontrado entradas",
     "Posts from people you follow will show up here" : "Las entradas de gente a la que sigues aparecerán aquí",
     "No direct messages found" : "No se han encontrado mensajes directos",
@@ -45,8 +49,10 @@ OC.L10N.register(
     "Posts from other people on this instance will show up here" : "Las entradas de otras personas en esta instancia aparecerán aquí",
     "No global posts found" : "No se han encontrado entradas globales",
     "Posts from federated instances will show up here" : "Las entradas de instancias federadas aparecerán aquí",
+    "No liked posts found" : "No se han encontrado entradas con Me gusta",
     "No posts found for this tag" : "No se han encontrado post para este tag",
     "Reply" : "Responder",
+    "Boost" : "Refuerzo",
     "Like" : "Me gusta",
     "More actions" : "Más acciones",
     "Delete post" : "Borrar post",
diff --git a/l10n/es.json b/l10n/es.json
index df6640c7..5cfe009b 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -1,6 +1,9 @@
 { "translations": {
     "Social" : "Social",
     "🎉 Nextcloud becomes part of the federated social networks!" : "¡🎉 Nextcloud pasa a ser parte de las redes sociales federadas!",
+    "** Disclaimer: this is an ALPHA version **\n\n**🎉 Nextcloud becomes part of the federated social networks!**\n\n**🙋 Find your friends:** No matter if they use Nextcloud, 🐘 Mastodon, 🇫 Friendica, and soon ✱ Diaspora, 👹 MediaGoblin and more – you can follow them!\n\n**📜 Profile info:** No need to fill out more profiles – your info from Nextcloud will be used and extended.\n\n**👐 Own your posts:** Everything you post stays on your Nextcloud!\n\n**🕸 Open standards:** We use the established ActivityPub standard!" : "** AVISO: Esta es una versión ALFA **\n\n**¡🎉 Nextcloud pasa a ser parte de las redes sociales federadas!**\n\n**🙋 Encuentra a tus amigos:** No importa si usan Nextcloud, 🐘 Mastodon, 🇫 Friendica, y pronto ✱ Diaspora, 👹 MediaGoblin y más, ¡Puedes seguirlos a todos!\n\n**📜 Información de perfil:** Sin necesidad de rellenar más perfiles – se usará y extenderá la información de tu perfil de Nextcloud. \n\n**👐 Sé el dueño de tu material:** ¡Todo lo que cuelgues permanece en tu Nextcloud!\n\n**🕸 Estándares abiertos:** ¡Usamos el estándar establecido ActivityPub! ",
+    ".well-known/webfinger isn't properly set up!" : ".well-known/webfinger no está bien configurado",
+    "Social needs the .well-known automatic discovery to be properly set up. If Nextcloud is not installed in the root of the domain, it is often the case that Nextcloud can't configure this automatically. To use Social, the admin of this Nextcloud instance needs to manually configure the .well-known redirects: " : "Social necesita que el descubrimiento automático de .well-known esté bien configurado. Si Nextcloud no está instalado en la raíz del dominio, a menudo se da el caso de que Nextcloud no puede configurarlo automáticamente. Para usar Social, el administrador de esta instancia de Netcloud debe configurar manualmente las redirecciones .well-known:",
     "Open documentation" : "Abrir la documentación",
     "Social app setup" : "Configuración de la app Social",
     "ActivityPub requires a fixed URL to make entries unique. Note that this can not be changed later without resetting the Social app." : "ActivityPub necesita una URL fija para hacer únicas las entradas. Nota: esto no puede cambiarse más tarde sin reiniciar la app Social.",
@@ -35,6 +38,7 @@
     "No results found" : "No se han encontrado resultados",
     "There were no results for your search:" : "No ha habido resultados para tu búsqueda:",
     "Searching for" : "Buscando",
+    "boosted" : "reforzado",
     "No posts found" : "No se han encontrado entradas",
     "Posts from people you follow will show up here" : "Las entradas de gente a la que sigues aparecerán aquí",
     "No direct messages found" : "No se han encontrado mensajes directos",
@@ -43,8 +47,10 @@
     "Posts from other people on this instance will show up here" : "Las entradas de otras personas en esta instancia aparecerán aquí",
     "No global posts found" : "No se han encontrado entradas globales",
     "Posts from federated instances will show up here" : "Las entradas de instancias federadas aparecerán aquí",
+    "No liked posts found" : "No se han encontrado entradas con Me gusta",
     "No posts found for this tag" : "No se han encontrado post para este tag",
     "Reply" : "Responder",
+    "Boost" : "Refuerzo",
     "Like" : "Me gusta",
     "More actions" : "Más acciones",
     "Delete post" : "Borrar post",
diff --git a/l10n/ja.js b/l10n/ja.js
index 0dfd28e3..a7822e7f 100644
--- a/l10n/ja.js
+++ b/l10n/ja.js
@@ -3,11 +3,11 @@ OC.L10N.register(
     {
     "🎉 Nextcloud becomes part of the federated social networks!" : "🎉 Nextcloudは分散ソーシャルネットワークの一部になります！",
     "** Disclaimer: this is an ALPHA version **\n\n**🎉 Nextcloud becomes part of the federated social networks!**\n\n**🙋 Find your friends:** No matter if they use Nextcloud, 🐘 Mastodon, 🇫 Friendica, and soon ✱ Diaspora, 👹 MediaGoblin and more – you can follow them!\n\n**📜 Profile info:** No need to fill out more profiles – your info from Nextcloud will be used and extended.\n\n**👐 Own your posts:** Everything you post stays on your Nextcloud!\n\n**🕸 Open standards:** We use the established ActivityPub standard!" : "** 免責事項：これはアルファ版です **\n\n** 🎉 Nextcloudは分散型ソーシャルネットワークの一部になります！**\n\n**🙋友達を探す：** Nextcloud、Mastodon、Friendica、近日中にはDiaspora、MediaGoblinなどを使用していてもフォローすることができます！\n\n** プロフィール情報：**これ以上プロフィールを記入する必要はありません - Nextcloudからのあなたの情報は使用され、広がってゆきます。\n\n**👐自分の投稿：**投稿したものはすべてNextcloudに残ります！\n\n**オープンスタンダード：**確立されたActivityPub形式を使用しています！",
-    ".well-known/webfinger isn't properly set up!" : ".well-known / webfingerが正しく設定されていません！",
-    "Social needs the .well-known automatic discovery to be properly set up. If Nextcloud is not installed in the root of the domain, it is often the case that Nextcloud can't configure this automatically. To use Social, the admin of this Nextcloud instance needs to manually configure the .well-known redirects: " : "Socialが適切に設定されるためには、well-knownの自動検出が必要です。 Nextcloudがドメインのルートにインストールされていない場合、Nextcloudがこれを自動的に設定できないことがよくあります。 Socialを使用するには、このNextcloudインスタンスの管理者は手動で.well-knownリダイレクトを設定する必要があります。",
+    ".well-known/webfinger isn't properly set up!" : ".well-known/webfingerが正しく設定されていません！",
+    "Social needs the .well-known automatic discovery to be properly set up. If Nextcloud is not installed in the root of the domain, it is often the case that Nextcloud can't configure this automatically. To use Social, the admin of this Nextcloud instance needs to manually configure the .well-known redirects: " : "Socialが適切に設定されるためには、.well-knownの自動検出が必要です。 Nextcloudがドメインのルートにインストールされていない場合、Nextcloudがこれを自動的に設定できないことがよくあります。 Socialを使用するには、このNextcloudインスタンスの管理者は手動で.well-knownリダイレクトを設定する必要があります。",
     "Open documentation" : "ドキュメントを開く",
     "Social app setup" : "Socialアプリのセットアップ",
-    "ActivityPub requires a fixed URL to make entries unique. Note that this can not be changed later without resetting the Social app." : "ActivityPubでは、エントリを一意にするために固定のURLが必要です。 \nこれは、Socialアプリをリセットせずに後で変更することはできません。",
+    "ActivityPub requires a fixed URL to make entries unique. Note that this can not be changed later without resetting the Social app." : "ActivityPubでは、エントリを一意にするために固定のURLが必要です。 これは、Socialアプリをリセットせずに後で変更することはできません。",
     "ActivityPub URL base" : "ActivityPub URLベース",
     "Finish setup" : "セットアップを終了",
     "The Social app needs to be set up by the server administrator." : "Socialアプリはサーバー管理者が設定する必要があります。",
diff --git a/l10n/ja.json b/l10n/ja.json
index 04fc016c..3312ce93 100644
--- a/l10n/ja.json
+++ b/l10n/ja.json
@@ -1,11 +1,11 @@
 { "translations": {
     "🎉 Nextcloud becomes part of the federated social networks!" : "🎉 Nextcloudは分散ソーシャルネットワークの一部になります！",
     "** Disclaimer: this is an ALPHA version **\n\n**🎉 Nextcloud becomes part of the federated social networks!**\n\n**🙋 Find your friends:** No matter if they use Nextcloud, 🐘 Mastodon, 🇫 Friendica, and soon ✱ Diaspora, 👹 MediaGoblin and more – you can follow them!\n\n**📜 Profile info:** No need to fill out more profiles – your info from Nextcloud will be used and extended.\n\n**👐 Own your posts:** Everything you post stays on your Nextcloud!\n\n**🕸 Open standards:** We use the established ActivityPub standard!" : "** 免責事項：これはアルファ版です **\n\n** 🎉 Nextcloudは分散型ソーシャルネットワークの一部になります！**\n\n**🙋友達を探す：** Nextcloud、Mastodon、Friendica、近日中にはDiaspora、MediaGoblinなどを使用していてもフォローすることができます！\n\n** プロフィール情報：**これ以上プロフィールを記入する必要はありません - Nextcloudからのあなたの情報は使用され、広がってゆきます。\n\n**👐自分の投稿：**投稿したものはすべてNextcloudに残ります！\n\n**オープンスタンダード：**確立されたActivityPub形式を使用しています！",
-    ".well-known/webfinger isn't properly set up!" : ".well-known / webfingerが正しく設定されていません！",
-    "Social needs the .well-known automatic discovery to be properly set up. If Nextcloud is not installed in the root of the domain, it is often the case that Nextcloud can't configure this automatically. To use Social, the admin of this Nextcloud instance needs to manually configure the .well-known redirects: " : "Socialが適切に設定されるためには、well-knownの自動検出が必要です。 Nextcloudがドメインのルートにインストールされていない場合、Nextcloudがこれを自動的に設定できないことがよくあります。 Socialを使用するには、このNextcloudインスタンスの管理者は手動で.well-knownリダイレクトを設定する必要があります。",
+    ".well-known/webfinger isn't properly set up!" : ".well-known/webfingerが正しく設定されていません！",
+    "Social needs the .well-known automatic discovery to be properly set up. If Nextcloud is not installed in the root of the domain, it is often the case that Nextcloud can't configure this automatically. To use Social, the admin of this Nextcloud instance needs to manually configure the .well-known redirects: " : "Socialが適切に設定されるためには、.well-knownの自動検出が必要です。 Nextcloudがドメインのルートにインストールされていない場合、Nextcloudがこれを自動的に設定できないことがよくあります。 Socialを使用するには、このNextcloudインスタンスの管理者は手動で.well-knownリダイレクトを設定する必要があります。",
     "Open documentation" : "ドキュメントを開く",
     "Social app setup" : "Socialアプリのセットアップ",
-    "ActivityPub requires a fixed URL to make entries unique. Note that this can not be changed later without resetting the Social app." : "ActivityPubでは、エントリを一意にするために固定のURLが必要です。 \nこれは、Socialアプリをリセットせずに後で変更することはできません。",
+    "ActivityPub requires a fixed URL to make entries unique. Note that this can not be changed later without resetting the Social app." : "ActivityPubでは、エントリを一意にするために固定のURLが必要です。 これは、Socialアプリをリセットせずに後で変更することはできません。",
     "ActivityPub URL base" : "ActivityPub URLベース",
     "Finish setup" : "セットアップを終了",
     "The Social app needs to be set up by the server administrator." : "Socialアプリはサーバー管理者が設定する必要があります。",
diff --git a/lib/Command/CheckInstall.php b/lib/Command/CheckInstall.php
index fcd06aa0..0b41a8cb 100644
--- a/lib/Command/CheckInstall.php
+++ b/lib/Command/CheckInstall.php
@@ -35,13 +35,20 @@ use Exception;
 use OC\Core\Command\Base;
 use OCA\Social\Service\CheckService;
 use OCA\Social\Service\MiscService;
+use OCA\Social\Service\PushService;
+use OCP\IUserManager;
+use OCP\Push\Exceptions\PushInstallException;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 
 class CheckInstall extends Base {
 
 
+	/** @var IUserManager */
+	private $userManager;
+
 	/** @var CheckService */
 	private $checkService;
 
@@ -52,16 +59,25 @@ class CheckInstall extends Base {
 	/**
 	 * CacheUpdate constructor.
 	 *
+	 * @param IUserManager $userManager
 	 * @param CheckService $checkService
 	 * @param MiscService $miscService
+	 * @param PushService $pushService
 	 */
-	public function __construct(CheckService $checkService, MiscService $miscService) {
+	public function __construct(
+		IUserManager $userManager, CheckService $checkService, MiscService $miscService,
+		PushService $pushService
+	) {
 		parent::__construct();
 
+		$this->userManager = $userManager;
 		$this->checkService = $checkService;
 		$this->miscService = $miscService;
+		$this->pushService = $pushService;
 	}
 
+	/** @var PushService */
+	private $pushService;
 
 	/**
 	 *
@@ -69,6 +85,10 @@ class CheckInstall extends Base {
 	protected function configure() {
 		parent::configure();
 		$this->setName('social:check:install')
+			 ->addOption(
+				 'push', '', InputOption::VALUE_REQUIRED, 'a local account used to test integration to Nextcloud Push',
+				 ''
+			 )
 			 ->setDescription('Check the integrity of the installation');
 	}
 
@@ -81,8 +101,30 @@ class CheckInstall extends Base {
 	 */
 	protected function execute(InputInterface $input, OutputInterface $output) {
 		$this->checkService->checkInstallationStatus();
+
+		$this->checkPushApp($input, $output);
 	}
 
 
+	/**
+	 * @param InputInterface $input
+	 * @param OutputInterface $output
+	 *
+	 * @throws Exception
+	 */
+	private function checkPushApp(InputInterface $input, OutputInterface $output) {
+		$userId = $input->getOption('push');
+		if ($userId !== '') {
+			$user = $this->userManager->get($userId);
+			if ($user === null) {
+				throw new Exception('unknown user');
+			}
+
+			$wrapper = $this->pushService->testOnAccount($userId);
+
+			$output->writeln(json_encode($wrapper, JSON_PRETTY_PRINT));
+		}
+	}
+
 }
 
diff --git a/lib/Command/ExtendedBase.php b/lib/Command/ExtendedBase.php
new file mode 100644
index 00000000..743c6fb5
--- /dev/null
+++ b/lib/Command/ExtendedBase.php
@@ -0,0 +1,134 @@
+<?php
+declare(strict_types=1);
+
+
+/**
+ * Nextcloud - Social Support
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018, Maxence Lange <maxence@artificial-owl.com>
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Social\Command;
+
+
+use daita\MySmallPhpTools\Exceptions\CacheItemNotFoundException;
+use OC\Core\Command\Base;
+use OCA\Social\AP;
+use OCA\Social\Exceptions\ItemUnknownException;
+use OCA\Social\Exceptions\RedundancyLimitException;
+use OCA\Social\Exceptions\SocialAppConfigException;
+use OCA\Social\Model\ActivityPub\Actor\Person;
+use OCA\Social\Model\ActivityPub\Stream;
+use Symfony\Component\Console\Helper\Table;
+use Symfony\Component\Console\Output\OutputInterface;
+
+
+class ExtendedBase extends Base {
+
+	/** @var OutputInterface */
+	protected $output;
+
+	/** @var bool */
+	protected $asJson = false;
+
+
+	/**
+	 * @param Person $actor
+	 */
+	protected function outputActor(Person $actor) {
+		if ($this->asJson) {
+			$this->output->writeln(json_encode($actor, JSON_PRETTY_PRINT));
+		}
+
+		$this->output->writeln('<info>Account</info>: ' . $actor->getAccount());
+		$this->output->writeln('<info>Id</info>: ' . $actor->getId());
+		$this->output->writeln('');
+
+	}
+
+
+	/**
+	 * @param Stream[] $streams
+	 */
+	protected function outputStreams(array $streams) {
+		if ($this->asJson) {
+			$this->output->writeln(json_encode($streams, JSON_PRETTY_PRINT));
+		}
+
+		$table = new Table($this->output);
+		$table->setHeaders(['Id', 'Source', 'Type', 'Author', 'Content']);
+		$table->render();
+		$this->output->writeln('');
+
+		foreach ($streams as $item) {
+			$objectId = $item->getObjectId();
+			$cache = $item->getCache();
+			$content = '';
+			$author = '';
+			if ($objectId !== '' && $cache->hasItem($objectId)) {
+				try {
+					$cachedObject = $cache->getItem($objectId)
+										  ->getObject();
+
+					/** @var Stream $cachedItem */
+					$cachedItem = AP::$activityPub->getItemFromData($cachedObject);
+					$content = $cachedItem->getContent();
+					$author = $cachedItem->getActor()
+										 ->getAccount();
+				} catch (CacheItemNotFoundException $e) {
+				} catch (ItemUnknownException $e) {
+				} catch (RedundancyLimitException $e) {
+				} catch (SocialAppConfigException $e) {
+				}
+			} else {
+				$content = $item->getContent();
+				$author = $item->getActor()
+							   ->getAccount();
+			}
+
+			$table->appendRow(
+				[
+					'<comment>' . $item->getId() . '</comment>',
+					'<info>' . $item->getActor()
+									->getAccount() . '</info>',
+					$item->getType(),
+					'<info>' . $author . '</info>',
+					$content,
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @param Stream $stream
+	 */
+	protected function outputStream(Stream $stream) {
+		$actor = $stream->getActor();
+		$this->output->writeln('id: <comment>' . $stream->getId() . '</comment>');
+		$this->output->writeln(
+			'author: <comment>' . $actor->getAccount() . '</comment>'
+		);
+		$this->output->writeln('type: <info>' . $stream->getType() . '</info>');
+	}
+
+}
diff --git a/lib/Command/NoteBoost.php b/lib/Command/NoteBoost.php
index 3df7a515..499672ce 100644
--- a/lib/Command/NoteBoost.php
+++ b/lib/Command/NoteBoost.php
@@ -36,7 +36,7 @@ use OC\Core\Command\Base;
 use OCA\Social\Service\AccountService;
 use OCA\Social\Service\BoostService;
 use OCA\Social\Service\MiscService;
-use OCA\Social\Service\NoteService;
+use OCA\Social\Service\StreamService;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -50,8 +50,8 @@ use Symfony\Component\Console\Output\OutputInterface;
  */
 class NoteBoost extends Base {
 
-	/** @var NoteService */
-	private $noteService;
+	/** @var StreamService */
+	private $streamService;
 
 	/** @var AccountService */
 	private $accountService;
@@ -67,17 +67,17 @@ class NoteBoost extends Base {
 	 * NoteBoost constructor.
 	 *
 	 * @param AccountService $accountService
-	 * @param NoteService $noteService
+	 * @param StreamService $streamService
 	 * @param BoostService $boostService
 	 * @param MiscService $miscService
 	 */
 	public function __construct(
-		AccountService $accountService, NoteService $noteService, BoostService $boostService,
+		AccountService $accountService, StreamService $streamService, BoostService $boostService,
 		MiscService $miscService
 	) {
 		parent::__construct();
 
-		$this->noteService = $noteService;
+		$this->streamService = $streamService;
 		$this->boostService = $boostService;
 		$this->accountService = $accountService;
 		$this->miscService = $miscService;
@@ -108,7 +108,7 @@ class NoteBoost extends Base {
 		$noteId = $input->getArgument('note_id');
 
 		$actor = $this->accountService->getActorFromUserId($userId);
-		$this->noteService->setViewer($actor);
+		$this->streamService->setViewer($actor);
 
 		if (!$input->getOption('unboost')) {
 			$activity = $this->boostService->create($actor, $noteId, $token);
diff --git a/lib/Command/NoteCreate.php b/lib/Command/NoteCreate.php
index d36b30f7..d54d9c30 100644
--- a/lib/Command/NoteCreate.php
+++ b/lib/Command/NoteCreate.php
@@ -132,7 +132,7 @@ class NoteCreate extends Base {
 	 */
 	protected function execute(InputInterface $input, OutputInterface $output) {
 
-		$userId = $input->getArgument('user_id');
+		$userId = $input->getArgument('userid');
 		$content = $input->getArgument('content');
 		$to = $input->getOption('to');
 		$hashtag = $input->getOption('hashtag');
diff --git a/lib/Command/NoteLike.php b/lib/Command/NoteLike.php
index d2618c0d..6c45bb95 100644
--- a/lib/Command/NoteLike.php
+++ b/lib/Command/NoteLike.php
@@ -36,7 +36,7 @@ use OC\Core\Command\Base;
 use OCA\Social\Service\AccountService;
 use OCA\Social\Service\LikeService;
 use OCA\Social\Service\MiscService;
-use OCA\Social\Service\NoteService;
+use OCA\Social\Service\StreamService;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -51,8 +51,8 @@ use Symfony\Component\Console\Output\OutputInterface;
 class NoteLike extends Base {
 
 
-	/** @var NoteService */
-	private $noteService;
+	/** @var StreamService */
+	private $streamService;
 
 	/** @var AccountService */
 	private $accountService;
@@ -68,17 +68,17 @@ class NoteLike extends Base {
 	 * NoteBoost constructor.
 	 *
 	 * @param AccountService $accountService
-	 * @param NoteService $noteService
+	 * @param StreamService $streamService
 	 * @param LikeService $likeService
 	 * @param MiscService $miscService
 	 */
 	public function __construct(
-		AccountService $accountService, NoteService $noteService, LikeService $likeService,
+		AccountService $accountService, StreamService $streamService, LikeService $likeService,
 		MiscService $miscService
 	) {
 		parent::__construct();
 
-		$this->noteService = $noteService;
+		$this->streamService = $streamService;
 		$this->likeService = $likeService;
 		$this->accountService = $accountService;
 		$this->miscService = $miscService;
@@ -109,7 +109,7 @@ class NoteLike extends Base {
 		$noteId = $input->getArgument('note_id');
 
 		$actor = $this->accountService->getActorFromUserId($userId);
-		$this->noteService->setViewer($actor);
+		$this->streamService->setViewer($actor);
 
 		if (!$input->getOption('unlike')) {
 			$activity = $this->likeService->create($actor, $noteId, $token);
diff --git a/lib/Command/StreamDetails.php b/lib/Command/StreamDetails.php
new file mode 100644
index 00000000..f6e952b5
--- /dev/null
+++ b/lib/Command/StreamDetails.php
@@ -0,0 +1,145 @@
+<?php
+declare(strict_types=1);
+
+
+/**
+ * Nextcloud - Social Support
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018, Maxence Lange <maxence@artificial-owl.com>
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCA\Social\Command;
+
+
+use Exception;
+use OCA\Social\Exceptions\StreamNotFoundException;
+use OCA\Social\Model\ActivityPub\Actor\Person;
+use OCA\Social\Service\DetailsService;
+use OCA\Social\Service\MiscService;
+use OCA\Social\Service\StreamService;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\ConsoleOutput;
+use Symfony\Component\Console\Output\OutputInterface;
+
+
+/**
+ * Class StreamDetails
+ *
+ * @package OCA\Social\Command
+ */
+class StreamDetails extends ExtendedBase {
+
+
+	/** @var StreamService */
+	private $streamService;
+
+	/** @var DetailsService */
+	private $detailsService;
+
+	/** @var MiscService */
+	private $miscService;
+
+
+	/**
+	 * StreamDetails constructor.
+	 *
+	 * @param StreamService $streamService
+	 * @param DetailsService $detailsService
+	 * @param MiscService $miscService
+	 */
+	public function __construct(
+		StreamService $streamService, DetailsService $detailsService, MiscService $miscService
+	) {
+		parent::__construct();
+
+		$this->streamService = $streamService;
+		$this->detailsService = $detailsService;
+		$this->miscService = $miscService;
+	}
+
+
+	/**
+	 *
+	 */
+	protected function configure() {
+		parent::configure();
+		$this->setName('social:details')
+			 ->addArgument('streamId', InputArgument::REQUIRED, 'Id of the Stream item')
+			 ->addOption('json', '', InputOption::VALUE_NONE, 'return JSON format')
+			 ->setDescription('Get details about a Stream item');
+	}
+
+
+	/**
+	 * @param InputInterface $input
+	 * @param OutputInterface $output
+	 *
+	 * @throws Exception
+	 */
+	protected function execute(InputInterface $input, OutputInterface $output) {
+		$output = new ConsoleOutput();
+		$this->output = $output->section();
+
+		$this->asJson = $input->getOption('json');
+		$streamId = $input->getArgument('streamId');
+
+		try {
+			$stream = $this->streamService->getStreamById($streamId);
+		} catch (StreamNotFoundException $e) {
+			throw new Exception('Unknown item');
+		}
+
+		$details = $this->detailsService->generateDetailsFromStream($stream);
+
+		if ($this->asJson) {
+			$this->output->writeln(json_encode($details, JSON_PRETTY_PRINT));
+
+			return;
+		}
+
+		$this->outputStream($stream);
+		$this->output->writeln('');
+
+		$this->output->writeln('<comment>Affected Timelines</comment>:');
+		$home = array_map(
+			function(Person $item): string {
+				return $item->getUserId();
+			}, $details->getHomeViewers()
+		);
+
+		$this->output->writeln('* <info>Home</info>: ' . json_encode($home, JSON_PRETTY_PRINT));
+		$direct = array_map(
+			function(Person $item): string {
+				return $item->getUserId();
+			}, $details->getDirectViewers()
+		);
+
+		$this->output->writeln('* <info>Direct</info>: ' . json_encode($direct, JSON_PRETTY_PRINT));
+		$this->output->writeln('* <info>Public</info>: ' . ($details->isPublic() ? 'true' : 'false'));
+		$this->output->writeln('* <info>Federated</info>: ' . ($details->isFederated() ? 'true' : 'true'));
+	}
+
+}
+
diff --git a/lib/Command/Timeline.php b/lib/Command/Timeline.php
index d2120ead..2379cb93 100644
--- a/lib/Command/Timeline.php
+++ b/lib/Command/Timeline.php
@@ -31,22 +31,13 @@ declare(strict_types=1);
 namespace OCA\Social\Command;
 
 
-use daita\MySmallPhpTools\Exceptions\CacheItemNotFoundException;
 use Exception;
-use OC\Core\Command\Base;
-use OCA\Social\AP;
 use OCA\Social\Db\StreamRequest;
-use OCA\Social\Exceptions\ItemUnknownException;
-use OCA\Social\Exceptions\RedundancyLimitException;
-use OCA\Social\Exceptions\SocialAppConfigException;
 use OCA\Social\Model\ActivityPub\Actor\Person;
-use OCA\Social\Model\ActivityPub\Stream;
 use OCA\Social\Service\AccountService;
-use OCA\Social\Service\CacheActorService;
 use OCA\Social\Service\ConfigService;
 use OCA\Social\Service\MiscService;
 use OCP\IUserManager;
-use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -59,7 +50,7 @@ use Symfony\Component\Console\Output\OutputInterface;
  *
  * @package OCA\Social\Command
  */
-class Timeline extends Base {
+class Timeline extends ExtendedBase {
 
 	/** @var IUserManager */
 	private $userManager;
@@ -77,18 +68,12 @@ class Timeline extends Base {
 	private $miscService;
 
 
-	/** @var OutputInterface */
-	private $output;
-
-	/** @var bool */
-	private $asJson;
-
 	/** @var int */
 	private $count;
 
 
 	/**
-	 * Stream constructor.
+	 * Timeline constructor.
 	 *
 	 * @param IUserManager $userManager
 	 * @param StreamRequest $streamRequest
@@ -147,25 +132,13 @@ class Timeline extends Base {
 
 		$actor = $this->accountService->getActor($userId);
 
-		$this->outputActor($actor);
+		if (!$this->asJson) {
+			$this->outputActor($actor);
+		}
 		$this->displayStream($actor, $timeline);
 	}
 
 
-	/**
-	 * @param Person $actor
-	 */
-	private function outputActor(Person $actor) {
-		if ($this->asJson) {
-			return;
-		}
-
-		$this->output->writeln('<info>Account</info>: ' . $actor->getAccount());
-		$this->output->writeln('<info>Id</info>: ' . $actor->getId());
-		$this->output->writeln('');
-
-	}
-
 
 	/**
 	 * @param Person $actor
@@ -177,27 +150,27 @@ class Timeline extends Base {
 		switch ($timeline) {
 			case 'home':
 				$stream = $this->streamRequest->getTimelineHome($actor, 0, $this->count);
-				$this->outputStream($stream);
+				$this->outputStreams($stream);
 				break;
 
 			case 'direct':
 				$stream = $this->streamRequest->getTimelineDirect($actor, 0, $this->count);
-				$this->outputStream($stream);
+				$this->outputStreams($stream);
 				break;
 
 			case 'notifications':
 				$stream = $this->streamRequest->getTimelineNotifications($actor, 0, $this->count);
-				$this->outputStream($stream);
+				$this->outputStreams($stream);
 				break;
 
 			case 'local':
 				$stream = $this->streamRequest->getTimelineGlobal(0, $this->count, true);
-				$this->outputStream($stream);
+				$this->outputStreams($stream);
 				break;
 
 			case 'global':
 				$stream = $this->streamRequest->getTimelineGlobal(0, $this->count, false);
-				$this->outputStream($stream);
+				$this->outputStreams($stream);
 				break;
 
 			default:
@@ -207,61 +180,5 @@ class Timeline extends Base {
 		}
 	}
 
-
-	/**
-	 * @param Stream[] $stream
-	 */
-	private function outputStream(array $stream) {
-		if ($this->asJson) {
-			$this->output->writeln(json_encode($stream, JSON_PRETTY_PRINT));
-		}
-
-		$table = new Table($this->output);
-		$table->setHeaders(['Id', 'Source', 'Type', 'Author', 'Content']);
-		$table->render();
-		$this->output->writeln('');
-
-		foreach ($stream as $item) {
-			$objectId = $item->getObjectId();
-			$cache = $item->getCache();
-			$content = '';
-			$author = '';
-			if ($objectId !== '' && $cache->hasItem($objectId)) {
-				try {
-					$cachedObject = $cache->getItem($objectId)
-										  ->getObject();
-
-					/** @var Stream $cachedItem */
-					$cachedItem = AP::$activityPub->getItemFromData($cachedObject);
-					$content = $cachedItem->getContent();
-					$author = $cachedItem->getActor()
-										 ->getAccount();
-				} catch (CacheItemNotFoundException $e) {
-				} catch (ItemUnknownException $e) {
-				} catch (RedundancyLimitException $e) {
-				} catch (SocialAppConfigException $e) {
-				}
-			} else {
-				$content = $item->getContent();
-				$author = $item->getActor()
-							   ->getAccount();
-			}
-
-			$table->appendRow(
-				[
-					'<comment>' . $item->getId() . '</comment>',
-					'<info>' . $item->getActor()
-									->getAccount() . '</info>',
-					$item->getType(),
-					'<info>' . $author . '</info>',
-					$content,
-				]
-			);
-		}
-
-
-	}
-
-
 }
 
diff --git a/lib/Controller/LocalController.php b/lib/Controller/LocalController.php
index 4f8ee719..d3adb361 100644
--- a/lib/Controller/LocalController.php
+++ b/lib/Controller/LocalController.php
@@ -48,7 +48,7 @@ use OCA\Social\Service\FollowService;
 use OCA\Social\Service\HashtagService;
 use OCA\Social\Service\LikeService;
 use OCA\Social\Service\MiscService;
-use OCA\Social\Service\NoteService;
+use OCA\Social\Service\StreamService;
 use OCA\Social\Service\PostService;
 use OCA\Social\Service\SearchService;
 use OCP\AppFramework\Controller;
@@ -92,8 +92,8 @@ class LocalController extends Controller {
 	/** @var PostService */
 	private $postService;
 
-	/** @var NoteService */
-	private $noteService;
+	/** @var StreamService */
+	private $streamService;
 
 	/** @var SearchService */
 	private $searchService;
@@ -122,7 +122,7 @@ class LocalController extends Controller {
 	 * @param HashtagService $hashtagService
 	 * @param FollowService $followService
 	 * @param PostService $postService
-	 * @param NoteService $noteService
+	 * @param StreamService $streamService
 	 * @param SearchService $searchService
 	 * @param BoostService $boostService
 	 * @param LikeService $likeService
@@ -133,7 +133,7 @@ class LocalController extends Controller {
 		IRequest $request, $userId, AccountService $accountService,
 		CacheActorService $cacheActorService, HashtagService $hashtagService,
 		FollowService $followService,
-		PostService $postService, NoteService $noteService, SearchService $searchService,
+		PostService $postService, StreamService $streamService, SearchService $searchService,
 		BoostService $boostService, LikeService $likeService, DocumentService $documentService,
 		MiscService $miscService
 	) {
@@ -143,7 +143,7 @@ class LocalController extends Controller {
 		$this->cacheActorService = $cacheActorService;
 		$this->hashtagService = $hashtagService;
 		$this->accountService = $accountService;
-		$this->noteService = $noteService;
+		$this->streamService = $streamService;
 		$this->searchService = $searchService;
 		$this->postService = $postService;
 		$this->followService = $followService;
@@ -202,7 +202,7 @@ class LocalController extends Controller {
 		try {
 			$this->initViewer(true);
 
-			return $this->directSuccess($this->noteService->getNoteById($id, true));
+			return $this->directSuccess($this->streamService->getStreamById($id, true));
 		} catch (Exception $e) {
 			return $this->fail($e);
 		}
@@ -220,13 +220,13 @@ class LocalController extends Controller {
 	 */
 	public function postDelete(string $id): DataResponse {
 		try {
-			$note = $this->noteService->getNoteById($id);
+			$note = $this->streamService->getStreamById($id);
 			$actor = $this->accountService->getActorFromUserId($this->userId);
 			if ($note->getAttributedTo() !== $actor->getId()) {
 				throw new InvalidResourceException('user have no rights');
 			}
 
-			$this->noteService->deleteLocalItem($note, Note::TYPE);
+			$this->streamService->deleteLocalItem($note, Note::TYPE);
 
 			return $this->success();
 		} catch (Exception $e) {
@@ -351,7 +351,7 @@ class LocalController extends Controller {
 	public function streamHome($since = 0, int $limit = 5): DataResponse {
 		try {
 			$this->initViewer(true);
-			$posts = $this->noteService->getStreamHome($this->viewer, $since, $limit);
+			$posts = $this->streamService->getStreamHome($this->viewer, $since, $limit);
 
 			return $this->success($posts);
 		} catch (Exception $e) {
@@ -372,7 +372,7 @@ class LocalController extends Controller {
 	public function streamNotifications($since = 0, int $limit = 5): DataResponse {
 		try {
 			$this->initViewer(true);
-			$posts = $this->noteService->getStreamNotifications($this->viewer, $since, $limit);
+			$posts = $this->streamService->getStreamNotifications($this->viewer, $since, $limit);
 
 			return $this->success($posts);
 		} catch (Exception $e) {
@@ -396,7 +396,7 @@ class LocalController extends Controller {
 			$this->initViewer();
 
 			$account = $this->cacheActorService->getFromLocalAccount($username);
-			$posts = $this->noteService->getStreamAccount($account->getId(), $since, $limit);
+			$posts = $this->streamService->getStreamAccount($account->getId(), $since, $limit);
 
 			return $this->success($posts);
 		} catch (Exception $e) {
@@ -417,7 +417,7 @@ class LocalController extends Controller {
 	public function streamDirect(int $since = 0, int $limit = 5): DataResponse {
 		try {
 			$this->initViewer(true);
-			$posts = $this->noteService->getStreamDirect($this->viewer, $since, $limit);
+			$posts = $this->streamService->getStreamDirect($this->viewer, $since, $limit);
 
 			return $this->success($posts);
 		} catch (Exception $e) {
@@ -440,7 +440,7 @@ class LocalController extends Controller {
 	public function streamTimeline(int $since = 0, int $limit = 5): DataResponse {
 		try {
 			$this->initViewer(true);
-			$posts = $this->noteService->getStreamLocalTimeline($since, $limit);
+			$posts = $this->streamService->getStreamLocalTimeline($since, $limit);
 
 			return $this->success($posts);
 		} catch (Exception $e) {
@@ -463,7 +463,7 @@ class LocalController extends Controller {
 	public function streamTag(string $hashtag, int $since = 0, int $limit = 5): DataResponse {
 		try {
 			$this->initViewer(true);
-			$posts = $this->noteService->getStreamLocalTag($this->viewer, $hashtag, $since, $limit);
+			$posts = $this->streamService->getStreamLocalTag($this->viewer, $hashtag, $since, $limit);
 
 			return $this->success($posts);
 		} catch (Exception $e) {
@@ -485,7 +485,7 @@ class LocalController extends Controller {
 	public function streamFederated(int $since = 0, int $limit = 5): DataResponse {
 		try {
 			$this->initViewer(true);
-			$posts = $this->noteService->getStreamGlobalTimeline($since, $limit);
+			$posts = $this->streamService->getStreamGlobalTimeline($since, $limit);
 
 			return $this->success($posts);
 		} catch (Exception $e) {
@@ -507,7 +507,7 @@ class LocalController extends Controller {
 	public function streamLiked(int $since = 0, int $limit = 5): DataResponse {
 		try {
 			$this->initViewer(true);
-			$posts = $this->noteService->getStreamLiked($since, $limit);
+			$posts = $this->streamService->getStreamLiked($since, $limit);
 
 			return $this->success($posts);
 		} catch (Exception $e) {
@@ -886,7 +886,7 @@ class LocalController extends Controller {
 		try {
 			$this->viewer = $this->accountService->getActorFromUserId($this->userId, true);
 
-			$this->noteService->setViewer($this->viewer);
+			$this->streamService->setViewer($this->viewer);
 			$this->followService->setViewer($this->viewer);
 			$this->cacheActorService->setViewer($this->viewer);
 		} catch (Exception $e) {
diff --git a/lib/Db/CoreRequestBuilder.php b/lib/Db/CoreRequestBuilder.php
index 7210e19c..040c1736 100644
--- a/lib/Db/CoreRequestBuilder.php
+++ b/lib/Db/CoreRequestBuilder.php
@@ -767,7 +767,40 @@ class CoreRequestBuilder {
 		$qb->leftJoin(
 			$this->defaultSelectAlias, CoreRequestBuilder::TABLE_CACHE_ACTORS, 'ca', $orX
 		);
+	}
 
+
+	/**
+	 * @param IQueryBuilder $qb
+	 * @param string $fieldActorId
+	 * @param string $alias
+	 */
+	protected function leftJoinAccounts(IQueryBuilder &$qb, string $fieldActorId, string $alias = ''
+	) {
+		if ($qb->getType() !== QueryBuilder::SELECT) {
+			return;
+		}
+
+		$expr = $qb->expr();
+		$func = $qb->func();
+
+		$pf = ($alias === '') ? $this->defaultSelectAlias : $alias;
+
+		$qb->selectAlias('lja.id', 'accounts_id')
+		   ->selectAlias('lja.user_id', 'accounts_user_id')
+		   ->selectAlias('lja.preferred_username', 'accounts_preferred_username')
+		   ->selectAlias('lja.name', 'accounts_name')
+		   ->selectAlias('lja.summary', 'accounts_summary')
+		   ->selectAlias('lja.public_key', 'accounts_public_key');
+
+		$on = $expr->eq(
+			$func->lower($pf . '.' . $fieldActorId),
+			$func->lower('lja.id')
+		);
+
+		$qb->leftJoin(
+			$this->defaultSelectAlias, CoreRequestBuilder::TABLE_ACTORS, 'lja', $on
+		);
 	}
 
 
@@ -797,6 +830,31 @@ class CoreRequestBuilder {
 	}
 
 
+	/**
+	 * @param array $data
+	 *
+	 * @return Person
+	 * @throws InvalidResourceException
+	 */
+	protected function parseAccountsLeftJoin(array $data): Person {
+		$new = [];
+		foreach ($data as $k => $v) {
+			if (substr($k, 0, 9) === 'accounts_') {
+				$new[substr($k, 9)] = $v;
+			}
+		}
+
+		$actor = new Person();
+		$actor->importFromDatabase($new);
+
+		if (!$actor->getUserId()) {
+			throw new InvalidResourceException();
+		}
+
+		return $actor;
+	}
+
+
 	/**
 	 * @param IQueryBuilder $qb
 	 */
diff --git a/lib/Db/FollowsRequest.php b/lib/Db/FollowsRequest.php
index 8e478caf..77ab6894 100644
--- a/lib/Db/FollowsRequest.php
+++ b/lib/Db/FollowsRequest.php
@@ -235,6 +235,28 @@ class FollowsRequest extends FollowsRequestBuilder {
 	}
 
 
+	/**
+	 * @param string $followId
+	 *
+	 * @return Follow[]
+	 */
+	public function getFollowersByFollowId(string $followId): array {
+		$qb = $this->getFollowsSelectSql();
+		$this->limitToFollowId($qb, $followId);
+		$this->limitToAccepted($qb, true);
+		$this->leftJoinAccounts($qb, 'actor_id');
+
+		$follows = [];
+		$cursor = $qb->execute();
+		while ($data = $cursor->fetch()) {
+			$follows[] = $this->parseFollowsSelectSql($data);
+		}
+		$cursor->closeCursor();
+
+		return $follows;
+	}
+
+
 	/**
 	 * @param Follow $follow
 	 */
diff --git a/lib/Db/FollowsRequestBuilder.php b/lib/Db/FollowsRequestBuilder.php
index 9d08dfbf..a41e7114 100644
--- a/lib/Db/FollowsRequestBuilder.php
+++ b/lib/Db/FollowsRequestBuilder.php
@@ -139,6 +139,14 @@ class FollowsRequestBuilder extends CoreRequestBuilder {
 
 			$follow->setCompleteDetails(true);
 			$follow->setActor($actor);
+
+			return $follow;
+		} catch (InvalidResourceException $e) {
+		}
+
+		try {
+			$actor = $this->parseAccountsLeftJoin($data);
+			$follow->setActor($actor);
 		} catch (InvalidResourceException $e) {
 		}
 
diff --git a/lib/Db/StreamRequestBuilder.php b/lib/Db/StreamRequestBuilder.php
index 05627687..45a6bc0f 100644
--- a/lib/Db/StreamRequestBuilder.php
+++ b/lib/Db/StreamRequestBuilder.php
@@ -461,7 +461,6 @@ class StreamRequestBuilder extends CoreRequestBuilder {
 		}
 
 		$item->setAction($action);
-
 		if ($item->getType() === Announce::TYPE) {
 			$item->setAttributedTo($this->get('following_actor_id', $data, ''));
 		}
diff --git a/lib/Interfaces/Activity/AcceptInterface.php b/lib/Interfaces/Activity/AcceptInterface.php
index 74038c54..32dff8e3 100644
--- a/lib/Interfaces/Activity/AcceptInterface.php
+++ b/lib/Interfaces/Activity/AcceptInterface.php
@@ -60,7 +60,7 @@ class AcceptInterface implements IActivityPubInterface {
 	 * @param ACore $item
 	 */
 	public function processIncomingRequest(ACore $item) {
-		if (!$item->gotObject()) {
+		if (!$item->hasObject()) {
 			return;
 		}
 		$object = $item->getObject();
diff --git a/lib/Interfaces/Activity/AddInterface.php b/lib/Interfaces/Activity/AddInterface.php
index 7d7dfb52..e861f069 100644
--- a/lib/Interfaces/Activity/AddInterface.php
+++ b/lib/Interfaces/Activity/AddInterface.php
@@ -60,7 +60,7 @@ class AddInterface implements IActivityPubInterface {
 	 * @param ACore $item
 	 */
 	public function processIncomingRequest(ACore $item) {
-		if (!$item->gotObject()) {
+		if (!$item->hasObject()) {
 			return;
 		}
 		$object = $item->getObject();
diff --git a/lib/Interfaces/Activity/BlockInterface.php b/lib/Interfaces/Activity/BlockInterface.php
index d708cf42..958d0b00 100644
--- a/lib/Interfaces/Activity/BlockInterface.php
+++ b/lib/Interfaces/Activity/BlockInterface.php
@@ -60,7 +60,7 @@ class BlockInterface implements IActivityPubInterface {
 	 * @param ACore $item
 	 */
 	public function processIncomingRequest(ACore $item) {
-		if (!$item->gotObject()) {
+		if (!$item->hasObject()) {
 			return;
 		}
 		$object = $item->getObject();
diff --git a/lib/Interfaces/Activity/CreateInterface.php b/lib/Interfaces/Activity/CreateInterface.php
index fa00968f..a9555032 100644
--- a/lib/Interfaces/Activity/CreateInterface.php
+++ b/lib/Interfaces/Activity/CreateInterface.php
@@ -60,7 +60,7 @@ class CreateInterface implements IActivityPubInterface {
 	 * @param ACore $item
 	 */
 	public function processIncomingRequest(ACore $item) {
-		if (!$item->gotObject()) {
+		if (!$item->hasObject()) {
 			return;
 		}
 		$object = $item->getObject();
diff --git a/lib/Interfaces/Activity/DeleteInterface.php b/lib/Interfaces/Activity/DeleteInterface.php
index c4533e8e..f087cf97 100644
--- a/lib/Interfaces/Activity/DeleteInterface.php
+++ b/lib/Interfaces/Activity/DeleteInterface.php
@@ -64,7 +64,7 @@ class DeleteInterface implements IActivityPubInterface {
 	public function processIncomingRequest(ACore $item) {
 		$item->checkOrigin($item->getId());
 
-		if (!$item->gotObject()) {
+		if (!$item->hasObject()) {
 
 			if ($item->getObjectId() !== '') {
 				$item->checkOrigin($item->getObjectId());
diff --git a/lib/Interfaces/Activity/RejectInterface.php b/lib/Interfaces/Activity/RejectInterface.php
index 64854226..d287c238 100644
--- a/lib/Interfaces/Activity/RejectInterface.php
+++ b/lib/Interfaces/Activity/RejectInterface.php
@@ -60,7 +60,7 @@ class RejectInterface implements IActivityPubInterface {
 	 * @param ACore $item
 	 */
 	public function processIncomingRequest(ACore $item) {
-		if (!$item->gotObject()) {
+		if (!$item->hasObject()) {
 			return;
 		}
 		$object = $item->getObject();
diff --git a/lib/Interfaces/Activity/RemoveInterface.php b/lib/Interfaces/Activity/RemoveInterface.php
index 852f8c00..92a4d7fb 100644
--- a/lib/Interfaces/Activity/RemoveInterface.php
+++ b/lib/Interfaces/Activity/RemoveInterface.php
@@ -60,7 +60,7 @@ class RemoveInterface implements IActivityPubInterface {
 	 * @param ACore $item
 	 */
 	public function processIncomingRequest(ACore $item) {
-		if (!$item->gotObject()) {
+		if (!$item->hasObject()) {
 			return;
 		}
 		$object = $item->getObject();
diff --git a/lib/Interfaces/Activity/UndoInterface.php b/lib/Interfaces/Activity/UndoInterface.php
index c74bcac4..a5b03c9b 100644
--- a/lib/Interfaces/Activity/UndoInterface.php
+++ b/lib/Interfaces/Activity/UndoInterface.php
@@ -60,7 +60,7 @@ class UndoInterface implements IActivityPubInterface {
 	 * @param ACore $item
 	 */
 	public function processIncomingRequest(ACore $item) {
-		if (!$item->gotObject()) {
+		if (!$item->hasObject()) {
 			return;
 		}
 
diff --git a/lib/Interfaces/Activity/UpdateInterface.php b/lib/Interfaces/Activity/UpdateInterface.php
index e129f4e0..a99fc5f2 100644
--- a/lib/Interfaces/Activity/UpdateInterface.php
+++ b/lib/Interfaces/Activity/UpdateInterface.php
@@ -60,7 +60,7 @@ class UpdateInterface implements IActivityPubInterface {
 	 * @param ACore $item
 	 */
 	public function processIncomingRequest(ACore $item) {
-		if (!$item->gotObject()) {
+		if (!$item->hasObject()) {
 			return;
 		}
 		$object = $item->getObject();
diff --git a/lib/Interfaces/Object/NoteInterface.php b/lib/Interfaces/Object/NoteInterface.php
index 8875bd46..0da2fca8 100644
--- a/lib/Interfaces/Object/NoteInterface.php
+++ b/lib/Interfaces/Object/NoteInterface.php
@@ -42,6 +42,7 @@ use OCA\Social\Model\ActivityPub\Object\Note;
 use OCA\Social\Service\ConfigService;
 use OCA\Social\Service\CurlService;
 use OCA\Social\Service\MiscService;
+use OCA\Social\Service\PushService;
 
 
 class NoteInterface implements IActivityPubInterface {
@@ -53,6 +54,9 @@ class NoteInterface implements IActivityPubInterface {
 	/** @var CurlService */
 	private $curlService;
 
+	/** @var PushService */
+	private $pushService;
+
 	/** @var ConfigService */
 	private $configService;
 
@@ -65,15 +69,17 @@ class NoteInterface implements IActivityPubInterface {
 	 *
 	 * @param StreamRequest $streamRequest
 	 * @param CurlService $curlService
+	 * @param PushService $pushService
 	 * @param ConfigService $configService
 	 * @param MiscService $miscService
 	 */
 	public function __construct(
-		StreamRequest $streamRequest, CurlService $curlService, ConfigService $configService,
-		MiscService $miscService
+		StreamRequest $streamRequest, CurlService $curlService, PushService $pushService,
+		ConfigService $configService, MiscService $miscService
 	) {
 		$this->streamRequest = $streamRequest;
 		$this->curlService = $curlService;
+		$this->pushService = $pushService;
 		$this->configService = $configService;
 		$this->miscService = $miscService;
 	}
@@ -147,6 +153,7 @@ class NoteInterface implements IActivityPubInterface {
 			$this->streamRequest->getStreamById($note->getId());
 		} catch (StreamNotFoundException $e) {
 			$this->streamRequest->save($note);
+			$this->pushService->onNewStream($note->getId());
 		}
 	}
 
diff --git a/lib/Model/ActivityPub/ACore.php b/lib/Model/ActivityPub/ACore.php
index 42b978bc..471968f7 100644
--- a/lib/Model/ActivityPub/ACore.php
+++ b/lib/Model/ActivityPub/ACore.php
@@ -144,7 +144,7 @@ class ACore extends Item implements JsonSerializable {
 	/**
 	 * @return bool
 	 */
-	public function gotObject(): bool {
+	public function hasObject(): bool {
 		if ($this->object === null) {
 			return false;
 		}
@@ -172,6 +172,22 @@ class ACore extends Item implements JsonSerializable {
 	}
 
 
+	/**
+	 * @param bool $filter - will remove general url like Public
+	 *
+	 * @return array
+	 */
+	public function getRecipients(bool $filter = false): array {
+		$recipients = array_merge($this->getToAll(), $this->getCcArray());
+
+		if (!$filter) {
+			return $recipients;
+		}
+
+		return array_diff($recipients, [self::CONTEXT_PUBLIC]);
+	}
+
+
 	/**
 	 * @return bool
 	 */
@@ -226,9 +242,7 @@ class ACore extends Item implements JsonSerializable {
 	 * @return bool
 	 */
 	public function isPublic(): bool {
-		return ($this->getTo() === self::CONTEXT_PUBLIC
-				|| in_array(self::CONTEXT_PUBLIC, $this->getCcArray())
-				|| in_array(self::CONTEXT_PUBLIC, $this->getToArray()));
+		return in_array(self::CONTEXT_PUBLIC, $this->getRecipients());
 	}
 
 
@@ -296,7 +310,9 @@ class ACore extends Item implements JsonSerializable {
 			return;
 		}
 
-		throw new InvalidOriginException('ACore::checkOrigin - id: ' . $id . ' - origin: ' . $origin);
+		throw new InvalidOriginException(
+			'ACore::checkOrigin - id: ' . $id . ' - origin: ' . $origin
+		);
 	}
 
 
@@ -661,7 +677,7 @@ class ACore extends Item implements JsonSerializable {
 		$this->addEntry('published', $this->getPublished());
 		$this->addEntryArray('tag', $this->getTags());
 
-		if ($this->gotObject()) {
+		if ($this->hasObject()) {
 			$this->addEntryItem('object', $this->getObject());
 		} else {
 			$this->addEntry('object', $this->getObjectId());
diff --git a/lib/Model/ActivityPub/Actor/Person.php b/lib/Model/ActivityPub/Actor/Person.php
index af2ebfd9..0f5c5b55 100644
--- a/lib/Model/ActivityPub/Actor/Person.php
+++ b/lib/Model/ActivityPub/Actor/Person.php
@@ -421,6 +421,7 @@ class Person extends ACore implements JsonSerializable {
 		$this->setPreferredUsername(
 			$this->validate(self::AS_USERNAME, 'preferred_username', $data, '')
 		)
+			 ->setUserId($this->get('user_id', $data, ''))
 			 ->setName($this->validate(self::AS_USERNAME, 'name', $data, ''))
 			 ->setAccount($this->validate(self::AS_ACCOUNT, 'account', $data, ''))
 			 ->setPublicKey($this->get('public_key', $data, ''))
diff --git a/lib/Model/ActivityPub/Item.php b/lib/Model/ActivityPub/Item.php
index a6959a0a..a36ffe06 100644
--- a/lib/Model/ActivityPub/Item.php
+++ b/lib/Model/ActivityPub/Item.php
@@ -31,6 +31,7 @@ namespace OCA\Social\Model\ActivityPub;
 
 
 use daita\MySmallPhpTools\Traits\TArrayTools;
+use OCA\Social\Exceptions\ActorDoesNotExistException;
 use OCA\Social\Model\ActivityPub\Actor\Person;
 use OCA\Social\Model\InstancePath;
 
@@ -395,6 +396,16 @@ class Item {
 		return $this->toArray;
 	}
 
+	/**
+	 * @return array
+	 */
+	public function getToAll(): array {
+		$arr = $this->toArray;
+		$arr[] = $this->to;
+
+		return $arr;
+	}
+
 	/**
 	 * @param string $to
 	 *
diff --git a/lib/Model/ActivityPub/Stream.php b/lib/Model/ActivityPub/Stream.php
index d8585927..2a6758db 100644
--- a/lib/Model/ActivityPub/Stream.php
+++ b/lib/Model/ActivityPub/Stream.php
@@ -82,6 +82,9 @@ class Stream extends ACore implements JsonSerializable {
 	/** @var StreamAction */
 	private $action = null;
 
+	/** @var string */
+	private $timeline = '';
+
 	/** @var bool */
 	private $hiddenOnTimeline = false;
 
@@ -304,6 +307,25 @@ class Stream extends ACore implements JsonSerializable {
 	}
 
 
+	/**
+	 * @return string
+	 */
+	public function getTimeline(): string {
+		return $this->timeline;
+	}
+
+	/**
+	 * @param string $timeline
+	 *
+	 * @return Stream
+	 */
+	public function setTimeline(string $timeline): self {
+		$this->timeline = $timeline;
+
+		return $this;
+	}
+
+
 	/**
 	 * @return bool
 	 */
diff --git a/lib/Model/LinkedDataSignature.php b/lib/Model/LinkedDataSignature.php
index 9baacd64..971e124f 100644
--- a/lib/Model/LinkedDataSignature.php
+++ b/lib/Model/LinkedDataSignature.php
@@ -39,7 +39,7 @@ use OCA\Social\Service\SignatureService;
 
 
 /**
- * Class InstancePath
+ * Class LinkedDataSignature
  *
  * @package OCA\Social\Model
  */
diff --git a/lib/Model/StreamDetails.php b/lib/Model/StreamDetails.php
new file mode 100644
index 00000000..a028406f
--- /dev/null
+++ b/lib/Model/StreamDetails.php
@@ -0,0 +1,208 @@
+<?php
+declare(strict_types=1);
+
+
+/**
+ * Nextcloud - Social Support
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018, Maxence Lange <maxence@artificial-owl.com>
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCA\Social\Model;
+
+
+use daita\MySmallPhpTools\Traits\TArrayTools;
+use JsonSerializable;
+use OCA\Social\Model\ActivityPub\Actor\Person;
+use OCA\Social\Model\ActivityPub\Stream;
+
+
+/**
+ * Class StreamDetails
+ *
+ * @package OCA\Social\Model
+ */
+class StreamDetails implements JsonSerializable {
+
+
+	use TArrayTools;
+
+
+	/** @var Stream */
+	private $stream;
+
+	/** @var Person[] */
+	private $homeViewers = [];
+
+	/** @var Person[] */
+	private $directViewers = [];
+
+	/** @var bool */
+	private $public = false;
+
+	/** @var bool */
+	private $federated = false;
+
+
+	/**
+	 * StreamDetails constructor.
+	 *
+	 * @param Stream|null $stream
+	 */
+	public function __construct(Stream $stream = null) {
+		$this->stream = $stream;
+	}
+
+
+	/**
+	 * @return Stream
+	 */
+	public function getStream(): Stream {
+		return $this->stream;
+	}
+
+	/**
+	 * @param Stream $stream
+	 *
+	 * @return StreamDetails
+	 */
+	public function setStream(Stream $stream): self {
+		$this->stream = $stream;
+
+		return $this;
+	}
+
+
+	/**
+	 * @return Person[]
+	 */
+	public function getHomeViewers(): array {
+		return $this->homeViewers;
+	}
+
+	/**
+	 * @param Person[] $viewers
+	 *
+	 * @return StreamDetails
+	 */
+	public function setHomeViewers(array $viewers): self {
+		$this->homeViewers = $viewers;
+
+		return $this;
+	}
+
+	/**
+	 * @param Person $viewer
+	 *
+	 * @return StreamDetails
+	 */
+	public function addHomeViewer(Person $viewer): self {
+		$this->homeViewers[] = $viewer;
+
+		return $this;
+	}
+
+
+	/**
+	 * @return Person[]
+	 */
+	public function getDirectViewers(): array {
+		return $this->directViewers;
+	}
+
+	/**
+	 * @param Person[] $viewers
+	 *
+	 * @return StreamDetails
+	 */
+	public function setDirectViewers(array $viewers): self {
+		$this->directViewers = $viewers;
+
+		return $this;
+	}
+
+	/**
+	 * @param Person $viewer
+	 *
+	 * @return StreamDetails
+	 */
+	public function addDirectViewer(Person $viewer): self {
+		$this->directViewers[] = $viewer;
+
+		return $this;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isPublic(): bool {
+		return $this->public;
+	}
+
+	/**
+	 * @param bool $public
+	 *
+	 * @return StreamDetails
+	 */
+	public function setPublic(bool $public): self {
+		$this->public = $public;
+
+		return $this;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isFederated(): bool {
+		return $this->federated;
+	}
+
+	/**
+	 * @param bool $federated
+	 *
+	 * @return StreamDetails
+	 */
+	public function setFederated(bool $federated): self {
+		$this->federated = $federated;
+
+		return $this;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function jsonSerialize(): array {
+		return [
+			'stream'        => $this->getStream(),
+			'homeViewers'   => $this->getHomeViewers(),
+			'directViewers' => $this->getDirectViewers(),
+			'public'        => $this->isPublic(),
+			'federated'     => $this->isFederated()
+		];
+	}
+
+}
+
diff --git a/lib/Service/ActivityService.php b/lib/Service/ActivityService.php
index f4c85288..134ccac9 100644
--- a/lib/Service/ActivityService.php
+++ b/lib/Service/ActivityService.php
@@ -430,7 +430,7 @@ class ActivityService {
 	private function saveActivity(ACore $activity) {
 		// TODO: save activity in DB ?
 
-		if ($activity->gotObject()) {
+		if ($activity->hasObject()) {
 			$this->saveObject($activity->getObject());
 		}
 	}
@@ -441,7 +441,7 @@ class ActivityService {
 	 */
 	private function saveObject(ACore $activity) {
 		try {
-			if ($activity->gotObject()) {
+			if ($activity->hasObject()) {
 				$this->saveObject($activity->getObject());
 			}
 
diff --git a/lib/Service/BoostService.php b/lib/Service/BoostService.php
index bda714c4..b865266e 100644
--- a/lib/Service/BoostService.php
+++ b/lib/Service/BoostService.php
@@ -60,8 +60,8 @@ class BoostService {
 	/** @var StreamRequest */
 	private $streamRequest;
 
-	/** @var NoteService */
-	private $noteService;
+	/** @var StreamService */
+	private $streamService;
 
 	/** @var SignatureService */
 	private $signatureService;
@@ -83,7 +83,7 @@ class BoostService {
 	 * BoostService constructor.
 	 *
 	 * @param StreamRequest $streamRequest
-	 * @param NoteService $noteService
+	 * @param StreamService $streamService
 	 * @param SignatureService $signatureService
 	 * @param ActivityService $activityService
 	 * @param StreamActionService $streamActionService
@@ -91,12 +91,12 @@ class BoostService {
 	 * @param MiscService $miscService
 	 */
 	public function __construct(
-		StreamRequest $streamRequest, NoteService $noteService, SignatureService $signatureService,
+		StreamRequest $streamRequest, StreamService $streamService, SignatureService $signatureService,
 		ActivityService $activityService, StreamActionService $streamActionService,
 		StreamQueueService $streamQueueService, MiscService $miscService
 	) {
 		$this->streamRequest = $streamRequest;
-		$this->noteService = $noteService;
+		$this->streamService = $streamService;
 		$this->signatureService = $signatureService;
 		$this->activityService = $activityService;
 		$this->streamActionService = $streamActionService;
@@ -118,10 +118,10 @@ class BoostService {
 	public function create(Person $actor, string $postId, &$token = ''): ACore {
 		/** @var Announce $announce */
 		$announce = AP::$activityPub->getItemFromType(Announce::TYPE);
-		$this->noteService->assignItem($announce, $actor, Stream::TYPE_ANNOUNCE);
+		$this->streamService->assignItem($announce, $actor, Stream::TYPE_ANNOUNCE);
 		$announce->setActor($actor);
 
-		$note = $this->noteService->getNoteById($postId, true);
+		$note = $this->streamService->getStreamById($postId, true);
 		if ($note->getType() !== Note::TYPE) {
 			throw new StreamNotFoundException('Stream is not a Note');
 		}
@@ -180,10 +180,10 @@ class BoostService {
 	 */
 	public function delete(Person $actor, string $postId, &$token = ''): ACore {
 		$undo = new Undo();
-		$this->noteService->assignItem($undo, $actor, Stream::TYPE_PUBLIC);
+		$this->streamService->assignItem($undo, $actor, Stream::TYPE_PUBLIC);
 		$undo->setActor($actor);
 
-		$note = $this->noteService->getNoteById($postId, true);
+		$note = $this->streamService->getStreamById($postId, true);
 		if ($note->getType() !== Note::TYPE) {
 			throw new StreamNotFoundException('Stream is not a Note');
 		}
diff --git a/lib/Service/ConfigService.php b/lib/Service/ConfigService.php
index 515521f4..fb5b1fe0 100644
--- a/lib/Service/ConfigService.php
+++ b/lib/Service/ConfigService.php
@@ -51,6 +51,7 @@ class ConfigService {
 	use TPathTools;
 	use TArrayTools;
 
+
 	const CLOUD_URL = 'cloud_url';
 	const SOCIAL_URL = 'social_url';
 	const SOCIAL_ADDRESS = 'social_address';
diff --git a/lib/Service/DetailsService.php b/lib/Service/DetailsService.php
new file mode 100644
index 00000000..189220a6
--- /dev/null
+++ b/lib/Service/DetailsService.php
@@ -0,0 +1,131 @@
+<?php
+declare(strict_types=1);
+
+
+/**
+ * Nextcloud - Social Support
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018, Maxence Lange <maxence@artificial-owl.com>
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCA\Social\Service;
+
+
+use OCA\Social\Exceptions\ActorDoesNotExistException;
+use OCA\Social\Exceptions\SocialAppConfigException;
+use OCA\Social\Model\ActivityPub\Stream;
+use OCA\Social\Model\StreamDetails;
+
+
+/**
+ * Class DetailsService
+ *
+ * @package OCA\Social\Service
+ */
+class DetailsService {
+
+	/** @var StreamService */
+	private $streamService;
+
+	/** @var AccountService */
+	private $accountService;
+
+	/** @var FollowService */
+	private $followService;
+
+	/** @var CacheActorService */
+	private $cacheActorService;
+
+
+	/**
+	 * DetailsService constructor.
+	 *
+	 * @param StreamService $streamService
+	 * @param AccountService $accountService
+	 * @param FollowService $followService
+	 * @param CacheActorService $cacheActorService
+	 */
+	public function __construct(
+		StreamService $streamService, AccountService $accountService,
+		FollowService $followService, CacheActorService $cacheActorService
+	) {
+		$this->streamService = $streamService;
+		$this->accountService = $accountService;
+		$this->followService = $followService;
+		$this->cacheActorService = $cacheActorService;
+	}
+
+
+	/**
+	 * @param Stream $stream
+	 *
+	 * @return StreamDetails
+	 * @throws SocialAppConfigException
+	 */
+	public function generateDetailsFromStream(Stream $stream): StreamDetails {
+		$this->streamService->detectType($stream);
+
+		$details = new StreamDetails($stream);
+		$this->setStreamViewers($details);
+
+		if ($stream->getTimeline() === Stream::TYPE_PUBLIC) {
+			if ($stream->isLocal()) {
+				$details->setPublic(true);
+			} else {
+				$details->setFederated(true);
+			}
+		}
+
+		return $details;
+	}
+
+
+	/**
+	 * @param StreamDetails $details
+	 *
+	 * @throws SocialAppConfigException
+	 */
+	private function setStreamViewers(StreamDetails $details) {
+		$stream = $details->getStream();
+
+		foreach ($stream->getRecipients(true) as $recipient) {
+			try {
+				$actor = $this->accountService->getFromId($recipient);
+				$details->addDirectViewer($actor);
+			} catch (ActorDoesNotExistException $e) {
+			}
+
+			$followers = $this->followService->getFollowersFromFollowId($recipient);
+			foreach ($followers as $follower) {
+				if (!$follower->hasActor()) {
+					continue;
+				}
+
+				$actor = $follower->getActor();
+				$details->addHomeViewer($actor);
+			}
+		}
+	}
+
+}
+
diff --git a/lib/Service/FollowService.php b/lib/Service/FollowService.php
index 73a87294..0c677d35 100644
--- a/lib/Service/FollowService.php
+++ b/lib/Service/FollowService.php
@@ -39,21 +39,20 @@ use OCA\Social\Exceptions\FollowDoesNotExistException;
 use OCA\Social\Exceptions\FollowSameAccountException;
 use OCA\Social\Exceptions\InvalidOriginException;
 use OCA\Social\Exceptions\InvalidResourceException;
+use OCA\Social\Exceptions\ItemUnknownException;
 use OCA\Social\Exceptions\RedundancyLimitException;
 use OCA\Social\Exceptions\RequestContentException;
-use OCA\Social\Exceptions\RequestResultNotJsonException;
-use OCA\Social\Exceptions\RetrieveAccountFormatException;
 use OCA\Social\Exceptions\RequestNetworkException;
+use OCA\Social\Exceptions\RequestResultNotJsonException;
 use OCA\Social\Exceptions\RequestResultSizeException;
 use OCA\Social\Exceptions\RequestServerException;
+use OCA\Social\Exceptions\RetrieveAccountFormatException;
 use OCA\Social\Exceptions\SocialAppConfigException;
-use OCA\Social\Exceptions\ItemUnknownException;
 use OCA\Social\Exceptions\UnauthorizedFediverseException;
 use OCA\Social\Exceptions\UrlCloudException;
-use OCA\Social\Model\ActivityPub\ACore;
-use OCA\Social\Model\ActivityPub\Object\Follow;
 use OCA\Social\Model\ActivityPub\Activity\Undo;
 use OCA\Social\Model\ActivityPub\Actor\Person;
+use OCA\Social\Model\ActivityPub\Object\Follow;
 use OCA\Social\Model\ActivityPub\OrderedCollection;
 use OCA\Social\Model\InstancePath;
 
@@ -285,5 +284,15 @@ class FollowService {
 		return $collection;
 	}
 
+
+	/**
+	 * @param string $recipient
+	 *
+	 * @return Follow[]
+	 */
+	public function getFollowersFromFollowId(string $recipient): array {
+		return $this->followsRequest->getFollowersByFollowId($recipient);
+	}
+
 }
 
diff --git a/lib/Service/LikeService.php b/lib/Service/LikeService.php
index 87d86456..67600eb4 100644
--- a/lib/Service/LikeService.php
+++ b/lib/Service/LikeService.php
@@ -63,8 +63,8 @@ class LikeService {
 	/** @var StreamRequest */
 	private $streamRequest;
 
-	/** @var NoteService */
-	private $noteService;
+	/** @var StreamService */
+	private $streamService;
 
 	/** @var SignatureService */
 	private $signatureService;
@@ -86,7 +86,7 @@ class LikeService {
 	 * LikeService constructor.
 	 *
 	 * @param StreamRequest $streamRequest
-	 * @param NoteService $noteService
+	 * @param StreamService $streamService
 	 * @param SignatureService $signatureService
 	 * @param ActivityService $activityService
 	 * @param StreamActionService $streamActionService
@@ -94,12 +94,12 @@ class LikeService {
 	 * @param MiscService $miscService
 	 */
 	public function __construct(
-		StreamRequest $streamRequest, NoteService $noteService, SignatureService $signatureService,
+		StreamRequest $streamRequest, StreamService $streamService, SignatureService $signatureService,
 		ActivityService $activityService, StreamActionService $streamActionService,
 		StreamQueueService $streamQueueService, MiscService $miscService
 	) {
 		$this->streamRequest = $streamRequest;
-		$this->noteService = $noteService;
+		$this->streamService = $streamService;
 		$this->signatureService = $signatureService;
 		$this->activityService = $activityService;
 		$this->streamActionService = $streamActionService;
@@ -124,7 +124,7 @@ class LikeService {
 		$like->setId($actor->getId() . '#like/' . $this->uuid(8));
 		$like->setActor($actor);
 
-		$note = $this->noteService->getNoteById($postId, true);
+		$note = $this->streamService->getStreamById($postId, true);
 		if ($note->getType() !== Note::TYPE) {
 			throw new StreamNotFoundException('Stream is not a Note');
 		}
@@ -174,7 +174,7 @@ class LikeService {
 		$undo = new Undo();
 		$undo->setActor($actor);
 
-		$note = $this->noteService->getNoteById($postId, true);
+		$note = $this->streamService->getStreamById($postId, true);
 		if ($note->getType() !== Note::TYPE) {
 			throw new StreamNotFoundException('Stream is not a Note');
 		}
diff --git a/lib/Service/MiscService.php b/lib/Service/MiscService.php
index 0d41633e..1e6f9cb9 100644
--- a/lib/Service/MiscService.php
+++ b/lib/Service/MiscService.php
@@ -36,6 +36,7 @@ use OCA\Social\AppInfo\Application;
 use OCP\ILogger;
 use OCP\IUser;
 use OCP\IUserManager;
+use OCP\Util;
 
 
 /**
@@ -79,6 +80,16 @@ class MiscService {
 	}
 
 
+	/**
+	 * @return int
+	 */
+	public function getNcVersion(): int {
+		$ver = Util::getVersion();
+
+		return $ver[0];
+	}
+
+
 	/**
 	 * @param string $userId
 	 *
diff --git a/lib/Service/PostService.php b/lib/Service/PostService.php
index a5baf010..9475f2fe 100644
--- a/lib/Service/PostService.php
+++ b/lib/Service/PostService.php
@@ -49,8 +49,8 @@ use OCA\Social\Model\Post;
 class PostService {
 
 
-	/** @var NoteService */
-	private $noteService;
+	/** @var StreamService */
+	private $streamService;
 
 	/** @var AccountService */
 	private $accountService;
@@ -68,17 +68,17 @@ class PostService {
 	/**
 	 * PostService constructor.
 	 *
-	 * @param NoteService $noteService
+	 * @param StreamService $streamService
 	 * @param AccountService $accountService
 	 * @param ActivityService $activityService
 	 * @param ConfigService $configService
 	 * @param MiscService $miscService
 	 */
 	public function __construct(
-		NoteService $noteService, AccountService $accountService, ActivityService $activityService,
+		StreamService $streamService, AccountService $accountService, ActivityService $activityService,
 		ConfigService $configService, MiscService $miscService
 	) {
-		$this->noteService = $noteService;
+		$this->streamService = $streamService;
 		$this->accountService = $accountService;
 		$this->activityService = $activityService;
 		$this->configService = $configService;
@@ -107,16 +107,16 @@ class PostService {
 	public function createPost(Post $post, &$token = ''): ACore {
 		$note = new Note();
 		$actor = $post->getActor();
-		$this->noteService->assignItem($note, $actor, $post->getType());
+		$this->streamService->assignItem($note, $actor, $post->getType());
 
 		$note->setAttributedTo($actor->getId());
 //		$this->configService->getSocialUrl() . '@' . $actor->getPreferredUsername()
 
 		$note->setContent(htmlentities($post->getContent(), ENT_QUOTES));
 
-		$this->noteService->replyTo($note, $post->getReplyTo());
-		$this->noteService->addRecipients($note, $post->getType(), $post->getTo());
-		$this->noteService->addHashtags($note, $post->getHashtags());
+		$this->streamService->replyTo($note, $post->getReplyTo());
+		$this->streamService->addRecipients($note, $post->getType(), $post->getTo());
+		$this->streamService->addHashtags($note, $post->getHashtags());
 
 		$token = $this->activityService->createActivity($actor, $note, $activity);
 		$this->accountService->cacheLocalActorDetailCount($actor);
diff --git a/lib/Service/PushService.php b/lib/Service/PushService.php
new file mode 100644
index 00000000..ec83cdb7
--- /dev/null
+++ b/lib/Service/PushService.php
@@ -0,0 +1,156 @@
+<?php
+declare(strict_types=1);
+
+
+/**
+ * Nextcloud - Social Support
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018, Maxence Lange <maxence@artificial-owl.com>
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCA\Social\Service;
+
+
+use daita\MySmallPhpTools\Traits\TAsync;
+use OC;
+use OC\Push\Model\Helper\PushCallback;
+use OCA\Social\Exceptions\SocialAppConfigException;
+use OCA\Social\Exceptions\StreamNotFoundException;
+use OCA\Social\Model\ActivityPub\Actor\Person;
+use OCP\AppFramework\QueryException;
+use OCP\Push\Exceptions\PushInstallException;
+use OCP\Push\IPushManager;
+use OCP\Push\Model\IPushWrapper;
+
+
+/**
+ * Class PushService
+ *
+ * @package OCA\Social\Service
+ */
+class PushService {
+
+
+	use TAsync;
+
+
+	/** @var IPushManager */
+	private $pushManager;
+
+	/** @var DetailsService */
+	private $detailsService;
+
+	/** @var StreamService */
+	private $streamService;
+
+	/** @var MiscService */
+	private $miscService;
+
+
+	/**
+	 * PushService constructor.
+	 *
+	 * @param DetailsService $detailsService
+	 * @param StreamService $streamService
+	 * @param MiscService $miscService
+	 */
+	public function __construct(
+		DetailsService $detailsService, StreamService $streamService, MiscService $miscService
+	) {
+		$this->detailsService = $detailsService;
+		$this->streamService = $streamService;
+		$this->miscService = $miscService;
+
+		// FIX ME: nc18/push
+		if ($this->miscService->getNcVersion() >= 18) {
+			try {
+				$this->pushManager = OC::$server->query(IPushManager::class);
+			} catch (QueryException $e) {
+				$miscService->log('QueryException while loading IPushManager - ' . $e->getMessage());
+			}
+		}
+	}
+
+
+	/**
+	 * @param string $streamId
+	 *
+	 * @throws SocialAppConfigException
+	 * @throws PushInstallException
+	 */
+	public function onNewStream(string $streamId) {
+		// FIXME: remove in nc18
+		if ($this->miscService->getNcVersion() < 18) {
+			return;
+		}
+
+		if (!$this->pushManager->isAvailable()) {
+			return;
+		}
+
+		try {
+			$stream = $this->streamService->getStreamById($streamId);
+		} catch (StreamNotFoundException $e) {
+			return;
+		}
+
+		$pushHelper = $this->pushManager->getPushHelper();
+		$details = $this->detailsService->generateDetailsFromStream($stream);
+		$home = array_map(
+			function(Person $item): string {
+				return $item->getUserId();
+			}, $details->getHomeViewers()
+		);
+
+		$callback = new PushCallback('social', 'timeline.home');
+		$callback->setPayloadSerializable($stream);
+		$callback->addUsers($home);
+		$pushHelper->toCallback($callback);
+
+		$direct = array_map(
+			function(Person $item): string {
+				return $item->getUserId();
+			}, $details->getDirectViewers()
+		);
+
+		$callback = new PushCallback('social', 'timeline.direct');
+		$callback->addUsers($direct);
+		$callback->setPayloadSerializable($stream);
+		$pushHelper->toCallback($callback);
+	}
+
+
+	/**
+	 * @param $userId
+	 *
+	 * @return IPushWrapper
+	 * @throws PushInstallException
+	 */
+	public function testOnAccount(string $userId): IPushWrapper {
+		$pushHelper = $this->pushManager->getPushHelper();
+
+		return $pushHelper->test($userId);
+	}
+
+}
+
diff --git a/lib/Service/SignatureService.php b/lib/Service/SignatureService.php
index e29a7210..d5cde685 100644
--- a/lib/Service/SignatureService.php
+++ b/lib/Service/SignatureService.php
@@ -257,12 +257,11 @@ class SignatureService {
 		}
 
 		try {
-			$origin = $this->checkRequestSignature($request, $data);
+			return $this->checkRequestSignature($request, $data);
 		} catch (RequestContentException $e) {
 			throw new SignatureIsGoneException();
+		} catch (SignatureException $e) {
 		}
-
-		return $origin;
 	}
 
 
@@ -360,9 +359,9 @@ class SignatureService {
 	 * @throws RequestResultNotJsonException
 	 * @throws RequestResultSizeException
 	 * @throws RequestServerException
-	 * @throws SignatureException
 	 * @throws SocialAppConfigException
 	 * @throws UnauthorizedFediverseException
+	 * @throws SignatureException
 	 */
 	private function checkRequestSignature(IRequest $request, string $data): string {
 		$signatureHeader = $request->getHeader('Signature');
@@ -381,7 +380,29 @@ class SignatureService {
 		// TODO: check digest
 		//	$this->generateDigest($data);
 
-		$publicKey = $this->retrieveKey($keyId);
+		try {
+			$publicKey = $this->retrieveKey($keyId);
+			$this->checkRequestSignatureUsingPublicKey($publicKey, $sign, $estimated, $signed);
+		} catch (SignatureException $e) {
+			$publicKey = $this->retrieveKey($keyId, true);
+			$this->checkRequestSignatureUsingPublicKey($publicKey, $sign, $estimated, $signed);
+		}
+
+		return $origin;
+	}
+
+
+	/**
+	 * @param string $publicKey
+	 * @param array $sign
+	 * @param string $estimated
+	 * @param bool $signed
+	 *
+	 * @throws SignatureException
+	 */
+	private function checkRequestSignatureUsingPublicKey(
+		string $publicKey, array $sign, string $estimated, bool $signed
+	) {
 		$algorithm = $this->getAlgorithmFromSignature($sign);
 		if ($publicKey === ''
 			|| openssl_verify($estimated, $signed, $publicKey, $algorithm) !== 1) {
@@ -390,8 +411,6 @@ class SignatureService {
 				. ' - algo: ' . $algorithm . ' - estimated: ' . $estimated
 			);
 		}
-
-		return $origin;
 	}
 
 
diff --git a/lib/Service/NoteService.php b/lib/Service/StreamService.php
similarity index 94%
rename from lib/Service/NoteService.php
rename to lib/Service/StreamService.php
index f13ffee8..0e09b7b4 100644
--- a/lib/Service/NoteService.php
+++ b/lib/Service/StreamService.php
@@ -51,7 +51,8 @@ use OCA\Social\Model\ActivityPub\Object\Note;
 use OCA\Social\Model\ActivityPub\Stream;
 use OCA\Social\Model\InstancePath;
 
-class NoteService {
+
+class StreamService {
 
 
 	/** @var StreamRequest */
@@ -207,6 +208,32 @@ class NoteService {
 	}
 
 
+	/**
+	 * @param $stream
+	 */
+	public function detectType(Stream $stream) {
+		if (in_array(ACore::CONTEXT_PUBLIC, $stream->getToAll())) {
+			$stream->setTimeline(Stream::TYPE_PUBLIC);
+
+			return;
+		}
+
+		if (in_array(ACore::CONTEXT_PUBLIC, $stream->getCcArray())) {
+			$stream->setType(Stream::TYPE_UNLISTED);
+
+			return;
+		}
+
+		try {
+			$actor = $this->cacheActorService->getFromId($stream->getAttributedTo());
+			echo json_encode($actor) . "\n";
+		} catch (Exception $e) {
+			return;
+		}
+
+	}
+
+
 	/**
 	 * @param Stream $stream
 	 * @param string $type
@@ -295,16 +322,17 @@ class NoteService {
 	 *
 	 * @throws InvalidOriginException
 	 * @throws InvalidResourceException
+	 * @throws ItemUnknownException
 	 * @throws MalformedArrayException
-	 * @throws StreamNotFoundException
 	 * @throws RedundancyLimitException
 	 * @throws RequestContentException
 	 * @throws RequestNetworkException
+	 * @throws RequestResultNotJsonException
 	 * @throws RequestResultSizeException
 	 * @throws RequestServerException
 	 * @throws SocialAppConfigException
-	 * @throws ItemUnknownException
-	 * @throws RequestResultNotJsonException
+	 * @throws StreamNotFoundException
+	 * @throws UnauthorizedFediverseException
 	 */
 	public function replyTo(Note $note, string $replyTo) {
 		if ($replyTo === '') {
@@ -346,7 +374,7 @@ class NoteService {
 	 * @return Stream
 	 * @throws StreamNotFoundException
 	 */
-	public function getNoteById(string $id, bool $asViewer = false): Stream {
+	public function getStreamById(string $id, bool $asViewer = false): Stream {
 		return $this->streamRequest->getStreamById($id, $asViewer);
 	}
 
diff --git a/package-lock.json b/package-lock.json
index 87d94c54..d39c4ca8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1120,50 +1120,79 @@
 				}
 			}
 		},
+		"@gulp-sourcemaps/identity-map": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.2.tgz",
+			"integrity": "sha512-ciiioYMLdo16ShmfHBXJBOFm3xPC4AuwO4xeRpFeHz7WK9PYsWCmigagG2XyzZpubK4a3qNKoUBDhbzHfa50LQ==",
+			"requires": {
+				"acorn": "^5.0.3",
+				"css": "^2.2.1",
+				"normalize-path": "^2.1.1",
+				"source-map": "^0.6.0",
+				"through2": "^2.0.3"
+			},
+			"dependencies": {
+				"acorn": {
+					"version": "5.7.3",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+					"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="
+				}
+			}
+		},
+		"@gulp-sourcemaps/map-sources": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz",
+			"integrity": "sha1-iQrnxdjId/bThIYCFazp1+yUW9o=",
+			"requires": {
+				"normalize-path": "^2.0.1",
+				"through2": "^2.0.3"
+			}
+		},
 		"@jest/console": {
-			"version": "24.7.1",
-			"resolved": "https://registry.npmjs.org/@jest/console/-/console-24.7.1.tgz",
-			"integrity": "sha512-iNhtIy2M8bXlAOULWVTUxmnelTLFneTNEkHCgPmgd+zNwy9zVddJ6oS5rZ9iwoscNdT5mMwUd0C51v/fSlzItg==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz",
+			"integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==",
 			"dev": true,
 			"requires": {
-				"@jest/source-map": "24.3.0",
-				"chalk": "2.4.2",
-				"slash": "2.0.0"
+				"@jest/source-map": "^24.9.0",
+				"chalk": "^2.0.1",
+				"slash": "^2.0.0"
 			}
 		},
 		"@jest/core": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/@jest/core/-/core-24.8.0.tgz",
-			"integrity": "sha512-R9rhAJwCBQzaRnrRgAdVfnglUuATXdwTRsYqs6NMdVcAl5euG8LtWDe+fVkN27YfKVBW61IojVsXKaOmSnqd/A==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/@jest/core/-/core-24.9.0.tgz",
+			"integrity": "sha512-Fogg3s4wlAr1VX7q+rhV9RVnUv5tD7VuWfYy1+whMiWUrvl7U3QJSJyWcDio9Lq2prqYsZaeTv2Rz24pWGkJ2A==",
 			"dev": true,
 			"requires": {
-				"@jest/console": "24.7.1",
-				"@jest/reporters": "24.8.0",
-				"@jest/test-result": "24.8.0",
-				"@jest/transform": "24.8.0",
-				"@jest/types": "24.8.0",
-				"ansi-escapes": "3.2.0",
-				"chalk": "2.4.2",
-				"exit": "0.1.2",
-				"graceful-fs": "4.2.0",
-				"jest-changed-files": "24.8.0",
-				"jest-config": "24.8.0",
-				"jest-haste-map": "24.8.1",
-				"jest-message-util": "24.8.0",
-				"jest-regex-util": "24.3.0",
-				"jest-resolve-dependencies": "24.8.0",
-				"jest-runner": "24.8.0",
-				"jest-runtime": "24.8.0",
-				"jest-snapshot": "24.8.0",
-				"jest-util": "24.8.0",
-				"jest-validate": "24.8.0",
-				"jest-watcher": "24.8.0",
-				"micromatch": "3.1.10",
-				"p-each-series": "1.0.0",
-				"pirates": "4.0.1",
-				"realpath-native": "1.1.0",
-				"rimraf": "2.6.3",
-				"strip-ansi": "5.2.0"
+				"@jest/console": "^24.7.1",
+				"@jest/reporters": "^24.9.0",
+				"@jest/test-result": "^24.9.0",
+				"@jest/transform": "^24.9.0",
+				"@jest/types": "^24.9.0",
+				"ansi-escapes": "^3.0.0",
+				"chalk": "^2.0.1",
+				"exit": "^0.1.2",
+				"graceful-fs": "^4.1.15",
+				"jest-changed-files": "^24.9.0",
+				"jest-config": "^24.9.0",
+				"jest-haste-map": "^24.9.0",
+				"jest-message-util": "^24.9.0",
+				"jest-regex-util": "^24.3.0",
+				"jest-resolve": "^24.9.0",
+				"jest-resolve-dependencies": "^24.9.0",
+				"jest-runner": "^24.9.0",
+				"jest-runtime": "^24.9.0",
+				"jest-snapshot": "^24.9.0",
+				"jest-util": "^24.9.0",
+				"jest-validate": "^24.9.0",
+				"jest-watcher": "^24.9.0",
+				"micromatch": "^3.1.10",
+				"p-each-series": "^1.0.0",
+				"realpath-native": "^1.1.0",
+				"rimraf": "^2.5.4",
+				"slash": "^2.0.0",
+				"strip-ansi": "^5.0.0"
 			},
 			"dependencies": {
 				"braces": {
@@ -1172,16 +1201,16 @@
 					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
 					"dev": true,
 					"requires": {
-						"arr-flatten": "1.1.0",
-						"array-unique": "0.3.2",
-						"extend-shallow": "2.0.1",
-						"fill-range": "4.0.0",
-						"isobject": "3.0.1",
-						"repeat-element": "1.1.3",
-						"snapdragon": "0.8.2",
-						"snapdragon-node": "2.1.1",
-						"split-string": "3.1.0",
-						"to-regex": "3.0.2"
+						"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": {
@@ -1190,7 +1219,7 @@
 							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 							"dev": true,
 							"requires": {
-								"is-extendable": "0.1.1"
+								"is-extendable": "^0.1.0"
 							}
 						}
 					}
@@ -1201,10 +1230,10 @@
 					"integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
 					"dev": true,
 					"requires": {
-						"extend-shallow": "2.0.1",
-						"is-number": "3.0.0",
-						"repeat-string": "1.6.1",
-						"to-regex-range": "2.1.1"
+						"extend-shallow": "^2.0.1",
+						"is-number": "^3.0.0",
+						"repeat-string": "^1.6.1",
+						"to-regex-range": "^2.1.0"
 					},
 					"dependencies": {
 						"extend-shallow": {
@@ -1213,7 +1242,7 @@
 							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 							"dev": true,
 							"requires": {
-								"is-extendable": "0.1.1"
+								"is-extendable": "^0.1.0"
 							}
 						}
 					}
@@ -1230,7 +1259,7 @@
 					"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
 					"dev": true,
 					"requires": {
-						"kind-of": "3.2.2"
+						"kind-of": "^3.0.2"
 					},
 					"dependencies": {
 						"kind-of": {
@@ -1239,7 +1268,7 @@
 							"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
 							"dev": true,
 							"requires": {
-								"is-buffer": "1.1.6"
+								"is-buffer": "^1.1.5"
 							}
 						}
 					}
@@ -1250,19 +1279,19 @@
 					"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
 					"dev": true,
 					"requires": {
-						"arr-diff": "4.0.0",
-						"array-unique": "0.3.2",
-						"braces": "2.3.2",
-						"define-property": "2.0.2",
-						"extend-shallow": "3.0.2",
-						"extglob": "2.0.4",
-						"fragment-cache": "0.2.1",
-						"kind-of": "6.0.2",
-						"nanomatch": "1.2.13",
-						"object.pick": "1.3.0",
-						"regex-not": "1.0.2",
-						"snapdragon": "0.8.2",
-						"to-regex": "3.0.2"
+						"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"
 					}
 				},
 				"to-regex-range": {
@@ -1271,118 +1300,119 @@
 					"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
 					"dev": true,
 					"requires": {
-						"is-number": "3.0.0",
-						"repeat-string": "1.6.1"
+						"is-number": "^3.0.0",
+						"repeat-string": "^1.6.1"
 					}
 				}
 			}
 		},
 		"@jest/environment": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/@jest/environment/-/environment-24.8.0.tgz",
-			"integrity": "sha512-vlGt2HLg7qM+vtBrSkjDxk9K0YtRBi7HfRFaDxoRtyi+DyVChzhF20duvpdAnKVBV6W5tym8jm0U9EfXbDk1tw==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/@jest/environment/-/environment-24.9.0.tgz",
+			"integrity": "sha512-5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ==",
 			"dev": true,
 			"requires": {
-				"@jest/fake-timers": "24.8.0",
-				"@jest/transform": "24.8.0",
-				"@jest/types": "24.8.0",
-				"jest-mock": "24.8.0"
+				"@jest/fake-timers": "^24.9.0",
+				"@jest/transform": "^24.9.0",
+				"@jest/types": "^24.9.0",
+				"jest-mock": "^24.9.0"
 			}
 		},
 		"@jest/fake-timers": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.8.0.tgz",
-			"integrity": "sha512-2M4d5MufVXwi6VzZhJ9f5S/wU4ud2ck0kxPof1Iz3zWx6Y+V2eJrES9jEktB6O3o/oEyk+il/uNu9PvASjWXQw==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz",
+			"integrity": "sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==",
 			"dev": true,
 			"requires": {
-				"@jest/types": "24.8.0",
-				"jest-message-util": "24.8.0",
-				"jest-mock": "24.8.0"
+				"@jest/types": "^24.9.0",
+				"jest-message-util": "^24.9.0",
+				"jest-mock": "^24.9.0"
 			}
 		},
 		"@jest/reporters": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-24.8.0.tgz",
-			"integrity": "sha512-eZ9TyUYpyIIXfYCrw0UHUWUvE35vx5I92HGMgS93Pv7du+GHIzl+/vh8Qj9MCWFK/4TqyttVBPakWMOfZRIfxw==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-24.9.0.tgz",
+			"integrity": "sha512-mu4X0yjaHrffOsWmVLzitKmmmWSQ3GGuefgNscUSWNiUNcEOSEQk9k3pERKEQVBb0Cnn88+UESIsZEMH3o88Gw==",
 			"dev": true,
 			"requires": {
-				"@jest/environment": "24.8.0",
-				"@jest/test-result": "24.8.0",
-				"@jest/transform": "24.8.0",
-				"@jest/types": "24.8.0",
-				"chalk": "2.4.2",
-				"exit": "0.1.2",
-				"glob": "7.1.4",
-				"istanbul-lib-coverage": "2.0.5",
-				"istanbul-lib-instrument": "3.3.0",
-				"istanbul-lib-report": "2.0.8",
-				"istanbul-lib-source-maps": "3.0.6",
-				"istanbul-reports": "2.2.6",
-				"jest-haste-map": "24.8.1",
-				"jest-resolve": "24.8.0",
-				"jest-runtime": "24.8.0",
-				"jest-util": "24.8.0",
-				"jest-worker": "24.6.0",
-				"node-notifier": "5.4.0",
-				"slash": "2.0.0",
-				"source-map": "0.6.1",
-				"string-length": "2.0.0"
+				"@jest/environment": "^24.9.0",
+				"@jest/test-result": "^24.9.0",
+				"@jest/transform": "^24.9.0",
+				"@jest/types": "^24.9.0",
+				"chalk": "^2.0.1",
+				"exit": "^0.1.2",
+				"glob": "^7.1.2",
+				"istanbul-lib-coverage": "^2.0.2",
+				"istanbul-lib-instrument": "^3.0.1",
+				"istanbul-lib-report": "^2.0.4",
+				"istanbul-lib-source-maps": "^3.0.1",
+				"istanbul-reports": "^2.2.6",
+				"jest-haste-map": "^24.9.0",
+				"jest-resolve": "^24.9.0",
+				"jest-runtime": "^24.9.0",
+				"jest-util": "^24.9.0",
+				"jest-worker": "^24.6.0",
+				"node-notifier": "^5.4.2",
+				"slash": "^2.0.0",
+				"source-map": "^0.6.0",
+				"string-length": "^2.0.0"
 			}
 		},
 		"@jest/source-map": {
-			"version": "24.3.0",
-			"resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.3.0.tgz",
-			"integrity": "sha512-zALZt1t2ou8le/crCeeiRYzvdnTzaIlpOWaet45lNSqNJUnXbppUUFR4ZUAlzgDmKee4Q5P/tKXypI1RiHwgag==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz",
+			"integrity": "sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==",
 			"dev": true,
 			"requires": {
-				"callsites": "3.1.0",
-				"graceful-fs": "4.2.0",
-				"source-map": "0.6.1"
+				"callsites": "^3.0.0",
+				"graceful-fs": "^4.1.15",
+				"source-map": "^0.6.0"
 			}
 		},
 		"@jest/test-result": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.8.0.tgz",
-			"integrity": "sha512-+YdLlxwizlfqkFDh7Mc7ONPQAhA4YylU1s529vVM1rsf67vGZH/2GGm5uO8QzPeVyaVMobCQ7FTxl38QrKRlng==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz",
+			"integrity": "sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==",
 			"dev": true,
 			"requires": {
-				"@jest/console": "24.7.1",
-				"@jest/types": "24.8.0",
-				"@types/istanbul-lib-coverage": "2.0.1"
+				"@jest/console": "^24.9.0",
+				"@jest/types": "^24.9.0",
+				"@types/istanbul-lib-coverage": "^2.0.0"
 			}
 		},
 		"@jest/test-sequencer": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.8.0.tgz",
-			"integrity": "sha512-OzL/2yHyPdCHXEzhoBuq37CE99nkme15eHkAzXRVqthreWZamEMA0WoetwstsQBCXABhczpK03JNbc4L01vvLg==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz",
+			"integrity": "sha512-6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A==",
 			"dev": true,
 			"requires": {
-				"@jest/test-result": "24.8.0",
-				"jest-haste-map": "24.8.1",
-				"jest-runner": "24.8.0",
-				"jest-runtime": "24.8.0"
+				"@jest/test-result": "^24.9.0",
+				"jest-haste-map": "^24.9.0",
+				"jest-runner": "^24.9.0",
+				"jest-runtime": "^24.9.0"
 			}
 		},
 		"@jest/transform": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-24.8.0.tgz",
-			"integrity": "sha512-xBMfFUP7TortCs0O+Xtez2W7Zu1PLH9bvJgtraN1CDST6LBM/eTOZ9SfwS/lvV8yOfcDpFmwf9bq5cYbXvqsvA==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-24.9.0.tgz",
+			"integrity": "sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==",
 			"dev": true,
 			"requires": {
-				"@babel/core": "7.5.5",
-				"@jest/types": "24.8.0",
-				"babel-plugin-istanbul": "5.1.4",
-				"chalk": "2.4.2",
-				"convert-source-map": "1.6.0",
-				"fast-json-stable-stringify": "2.0.0",
-				"graceful-fs": "4.2.0",
-				"jest-haste-map": "24.8.1",
-				"jest-regex-util": "24.3.0",
-				"jest-util": "24.8.0",
-				"micromatch": "3.1.10",
-				"realpath-native": "1.1.0",
-				"slash": "2.0.0",
-				"source-map": "0.6.1",
+				"@babel/core": "^7.1.0",
+				"@jest/types": "^24.9.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.9.0",
+				"jest-regex-util": "^24.9.0",
+				"jest-util": "^24.9.0",
+				"micromatch": "^3.1.10",
+				"pirates": "^4.0.1",
+				"realpath-native": "^1.1.0",
+				"slash": "^2.0.0",
+				"source-map": "^0.6.1",
 				"write-file-atomic": "2.4.1"
 			},
 			"dependencies": {
@@ -1392,16 +1422,16 @@
 					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
 					"dev": true,
 					"requires": {
-						"arr-flatten": "1.1.0",
-						"array-unique": "0.3.2",
-						"extend-shallow": "2.0.1",
-						"fill-range": "4.0.0",
-						"isobject": "3.0.1",
-						"repeat-element": "1.1.3",
-						"snapdragon": "0.8.2",
-						"snapdragon-node": "2.1.1",
-						"split-string": "3.1.0",
-						"to-regex": "3.0.2"
+						"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": {
@@ -1410,7 +1440,7 @@
 							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 							"dev": true,
 							"requires": {
-								"is-extendable": "0.1.1"
+								"is-extendable": "^0.1.0"
 							}
 						}
 					}
@@ -1421,10 +1451,10 @@
 					"integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
 					"dev": true,
 					"requires": {
-						"extend-shallow": "2.0.1",
-						"is-number": "3.0.0",
-						"repeat-string": "1.6.1",
-						"to-regex-range": "2.1.1"
+						"extend-shallow": "^2.0.1",
+						"is-number": "^3.0.0",
+						"repeat-string": "^1.6.1",
+						"to-regex-range": "^2.1.0"
 					},
 					"dependencies": {
 						"extend-shallow": {
@@ -1433,7 +1463,7 @@
 							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 							"dev": true,
 							"requires": {
-								"is-extendable": "0.1.1"
+								"is-extendable": "^0.1.0"
 							}
 						}
 					}
@@ -1450,7 +1480,7 @@
 					"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
 					"dev": true,
 					"requires": {
-						"kind-of": "3.2.2"
+						"kind-of": "^3.0.2"
 					},
 					"dependencies": {
 						"kind-of": {
@@ -1459,7 +1489,7 @@
 							"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
 							"dev": true,
 							"requires": {
-								"is-buffer": "1.1.6"
+								"is-buffer": "^1.1.5"
 							}
 						}
 					}
@@ -1470,19 +1500,19 @@
 					"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
 					"dev": true,
 					"requires": {
-						"arr-diff": "4.0.0",
-						"array-unique": "0.3.2",
-						"braces": "2.3.2",
-						"define-property": "2.0.2",
-						"extend-shallow": "3.0.2",
-						"extglob": "2.0.4",
-						"fragment-cache": "0.2.1",
-						"kind-of": "6.0.2",
-						"nanomatch": "1.2.13",
-						"object.pick": "1.3.0",
-						"regex-not": "1.0.2",
-						"snapdragon": "0.8.2",
-						"to-regex": "3.0.2"
+						"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"
 					}
 				},
 				"to-regex-range": {
@@ -1491,21 +1521,21 @@
 					"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
 					"dev": true,
 					"requires": {
-						"is-number": "3.0.0",
-						"repeat-string": "1.6.1"
+						"is-number": "^3.0.0",
+						"repeat-string": "^1.6.1"
 					}
 				}
 			}
 		},
 		"@jest/types": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-24.8.0.tgz",
-			"integrity": "sha512-g17UxVr2YfBtaMUxn9u/4+siG1ptg9IGYAYwvpwn61nBg779RXnjE/m7CxYcIzEt0AbHZZAHSEZNhkE2WxURVg==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
+			"integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
 			"dev": true,
 			"requires": {
-				"@types/istanbul-lib-coverage": "2.0.1",
-				"@types/istanbul-reports": "1.1.1",
-				"@types/yargs": "12.0.12"
+				"@types/istanbul-lib-coverage": "^2.0.0",
+				"@types/istanbul-reports": "^1.1.1",
+				"@types/yargs": "^13.0.0"
 			}
 		},
 		"@textlint/ast-node-types": {
@@ -1519,11 +1549,11 @@
 			"integrity": "sha512-cfCCrFmiGY/yq0NuKNxIQvZFy9kY/1immpSpTngOnyIbD4+eJOG5mxphhHDv3CHL9GltO4GcKr54kGBg3RNdbg==",
 			"dev": true,
 			"requires": {
-				"@babel/parser": "7.5.0",
-				"@babel/types": "7.5.0",
-				"@types/babel__generator": "7.0.2",
-				"@types/babel__template": "7.0.2",
-				"@types/babel__traverse": "7.0.7"
+				"@babel/parser": "^7.1.0",
+				"@babel/types": "^7.0.0",
+				"@types/babel__generator": "*",
+				"@types/babel__template": "*",
+				"@types/babel__traverse": "*"
 			}
 		},
 		"@types/babel__generator": {
@@ -1532,7 +1562,7 @@
 			"integrity": "sha512-NHcOfab3Zw4q5sEE2COkpfXjoE7o+PmqD9DQW4koUT3roNxwziUdXGnRndMat/LJNUtePwn1TlP4do3uoe3KZQ==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "7.5.0"
+				"@babel/types": "^7.0.0"
 			}
 		},
 		"@types/babel__template": {
@@ -1541,8 +1571,8 @@
 			"integrity": "sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==",
 			"dev": true,
 			"requires": {
-				"@babel/parser": "7.5.0",
-				"@babel/types": "7.5.0"
+				"@babel/parser": "^7.1.0",
+				"@babel/types": "^7.0.0"
 			}
 		},
 		"@types/babel__traverse": {
@@ -1551,7 +1581,7 @@
 			"integrity": "sha512-CeBpmX1J8kWLcDEnI3Cl2Eo6RfbGvzUctA+CjZUhOKDFbLfcr7fc4usEqLNWetrlJd7RhAkyYe2czXop4fICpw==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "7.5.0"
+				"@babel/types": "^7.3.0"
 			}
 		},
 		"@types/eslint-visitor-keys": {
@@ -1629,9 +1659,18 @@
 			"dev": true
 		},
 		"@types/yargs": {
-			"version": "12.0.12",
-			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-12.0.12.tgz",
-			"integrity": "sha512-SOhuU4wNBxhhTHxYaiG5NY4HBhDIDnJF60GU+2LqHAdKKer86//e4yg69aENCtQ04n0ovz+tq2YPME5t5yp4pw==",
+			"version": "13.0.2",
+			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
+			"integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+			"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
 		},
 		"@typescript-eslint/experimental-utils": {
@@ -1961,28 +2000,29 @@
 			"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
 			"dev": true
 		},
+		"accepts": {
+			"version": "1.3.7",
+			"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
+			"integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+			"requires": {
+				"mime-types": "~2.1.24",
+				"negotiator": "0.6.2"
+			}
+		},
 		"acorn": {
-			"version": "6.2.1",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.1.tgz",
-			"integrity": "sha512-JD0xT5FCRDNyjDda3Lrg/IxFscp9q4tiYtxE1/nOzlKCk7hIRuYjhq1kCNkbPjMRMZuFq20HNQn1I9k8Oj0E+Q==",
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",
+			"integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==",
 			"dev": true
 		},
 		"acorn-globals": {
-			"version": "4.3.2",
-			"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.2.tgz",
-			"integrity": "sha512-BbzvZhVtZP+Bs1J1HcwrQe8ycfO0wStkSGxuul3He3GkHOIZ6eTqOkPuw9IP1X3+IkOo4wiJmwkobzXYz4wewQ==",
+			"version": "4.3.3",
+			"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.3.tgz",
+			"integrity": "sha512-vkR40VwS2SYO98AIeFvzWWh+xyc2qi9s7OoXSFEGIP/rOJKzjnhykaZJNnHdoq4BL2gGxI5EZOU16z896EYnOQ==",
 			"dev": true,
 			"requires": {
-				"acorn": "6.2.0",
-				"acorn-walk": "6.2.0"
-			},
-			"dependencies": {
-				"acorn": {
-					"version": "6.2.0",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.0.tgz",
-					"integrity": "sha512-8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw==",
-					"dev": true
-				}
+				"acorn": "^6.0.1",
+				"acorn-walk": "^6.0.1"
 			}
 		},
 		"acorn-jsx": {
@@ -2036,6 +2076,11 @@
 			"integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
 			"dev": true
 		},
+		"ansi-colors": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-2.0.5.tgz",
+			"integrity": "sha512-yAdfUZ+c2wetVNIFsNRn44THW+Lty6S5TwMpUfLA/UaGhiXbBv/F8E60/1hMLd0cnF/CDoWH8vzVaI5bAcHCjw=="
+		},
 		"ansi-escape-sequences": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/ansi-escape-sequences/-/ansi-escape-sequences-4.1.0.tgz",
@@ -2050,6 +2095,14 @@
 			"integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
 			"dev": true
 		},
+		"ansi-gray": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
+			"integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
+			"requires": {
+				"ansi-wrap": "0.1.0"
+			}
+		},
 		"ansi-regex": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
@@ -2063,6 +2116,11 @@
 				"color-convert": "1.9.3"
 			}
 		},
+		"ansi-wrap": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
+			"integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768="
+		},
 		"anymatch": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
@@ -2257,6 +2315,11 @@
 			"resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz",
 			"integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q=="
 		},
+		"array-each": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
+			"integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8="
+		},
 		"array-equal": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
@@ -2360,8 +2423,7 @@
 		"assign-symbols": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-			"integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-			"dev": true
+			"integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
 		},
 		"ast-to-markdown": {
 			"version": "0.2.2",
@@ -2387,9 +2449,9 @@
 			"dev": true
 		},
 		"async-limiter": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
-			"integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==",
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
+			"integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
 			"dev": true
 		},
 		"asynckit": {
@@ -2401,8 +2463,7 @@
 		"atob": {
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-			"integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-			"dev": true
+			"integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
 		},
 		"autoprefixer": {
 			"version": "7.2.6",
@@ -2542,18 +2603,319 @@
 			}
 		},
 		"babel-jest": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-24.8.0.tgz",
-			"integrity": "sha512-+5/kaZt4I9efoXzPlZASyK/lN9qdRKmmUav9smVc0ruPQD7IsfucQ87gpOE8mn2jbDuS6M/YOW6n3v9ZoIfgnw==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-24.9.0.tgz",
+			"integrity": "sha512-ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw==",
 			"dev": true,
 			"requires": {
-				"@jest/transform": "24.8.0",
-				"@jest/types": "24.8.0",
-				"@types/babel__core": "7.1.2",
-				"babel-plugin-istanbul": "5.1.4",
-				"babel-preset-jest": "24.6.0",
-				"chalk": "2.4.2",
-				"slash": "2.0.0"
+				"@jest/transform": "^24.9.0",
+				"@jest/types": "^24.9.0",
+				"@types/babel__core": "^7.1.0",
+				"babel-plugin-istanbul": "^5.1.0",
+				"babel-preset-jest": "^24.9.0",
+				"chalk": "^2.4.2",
+				"slash": "^2.0.0"
+			},
+			"dependencies": {
+				"@jest/console": {
+					"version": "24.9.0",
+					"resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz",
+					"integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==",
+					"dev": true,
+					"requires": {
+						"@jest/source-map": "^24.9.0",
+						"chalk": "^2.0.1",
+						"slash": "^2.0.0"
+					}
+				},
+				"@jest/fake-timers": {
+					"version": "24.9.0",
+					"resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz",
+					"integrity": "sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==",
+					"dev": true,
+					"requires": {
+						"@jest/types": "^24.9.0",
+						"jest-message-util": "^24.9.0",
+						"jest-mock": "^24.9.0"
+					}
+				},
+				"@jest/source-map": {
+					"version": "24.9.0",
+					"resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz",
+					"integrity": "sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==",
+					"dev": true,
+					"requires": {
+						"callsites": "^3.0.0",
+						"graceful-fs": "^4.1.15",
+						"source-map": "^0.6.0"
+					}
+				},
+				"@jest/test-result": {
+					"version": "24.9.0",
+					"resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz",
+					"integrity": "sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==",
+					"dev": true,
+					"requires": {
+						"@jest/console": "^24.9.0",
+						"@jest/types": "^24.9.0",
+						"@types/istanbul-lib-coverage": "^2.0.0"
+					}
+				},
+				"@jest/transform": {
+					"version": "24.9.0",
+					"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-24.9.0.tgz",
+					"integrity": "sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==",
+					"dev": true,
+					"requires": {
+						"@babel/core": "^7.1.0",
+						"@jest/types": "^24.9.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.9.0",
+						"jest-regex-util": "^24.9.0",
+						"jest-util": "^24.9.0",
+						"micromatch": "^3.1.10",
+						"pirates": "^4.0.1",
+						"realpath-native": "^1.1.0",
+						"slash": "^2.0.0",
+						"source-map": "^0.6.1",
+						"write-file-atomic": "2.4.1"
+					}
+				},
+				"@jest/types": {
+					"version": "24.9.0",
+					"resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
+					"integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+					"dev": true,
+					"requires": {
+						"@types/istanbul-lib-coverage": "^2.0.0",
+						"@types/istanbul-reports": "^1.1.1",
+						"@types/yargs": "^13.0.0"
+					}
+				},
+				"@types/yargs": {
+					"version": "13.0.2",
+					"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
+					"integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+					"dev": true,
+					"requires": {
+						"@types/yargs-parser": "*"
+					}
+				},
+				"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"
+							}
+						}
+					}
+				},
+				"fill-range": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+					"integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+					"dev": true,
+					"requires": {
+						"extend-shallow": "^2.0.1",
+						"is-number": "^3.0.0",
+						"repeat-string": "^1.6.1",
+						"to-regex-range": "^2.1.0"
+					},
+					"dependencies": {
+						"extend-shallow": {
+							"version": "2.0.1",
+							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+							"dev": true,
+							"requires": {
+								"is-extendable": "^0.1.0"
+							}
+						}
+					}
+				},
+				"is-buffer": {
+					"version": "1.1.6",
+					"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+					"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+					"dev": true
+				},
+				"is-number": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+					"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+					"dev": true,
+					"requires": {
+						"kind-of": "^3.0.2"
+					},
+					"dependencies": {
+						"kind-of": {
+							"version": "3.2.2",
+							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+							"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+							"dev": true,
+							"requires": {
+								"is-buffer": "^1.1.5"
+							}
+						}
+					}
+				},
+				"jest-haste-map": {
+					"version": "24.9.0",
+					"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.9.0.tgz",
+					"integrity": "sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==",
+					"dev": true,
+					"requires": {
+						"@jest/types": "^24.9.0",
+						"anymatch": "^2.0.0",
+						"fb-watchman": "^2.0.0",
+						"fsevents": "^1.2.7",
+						"graceful-fs": "^4.1.15",
+						"invariant": "^2.2.4",
+						"jest-serializer": "^24.9.0",
+						"jest-util": "^24.9.0",
+						"jest-worker": "^24.9.0",
+						"micromatch": "^3.1.10",
+						"sane": "^4.0.3",
+						"walker": "^1.0.7"
+					}
+				},
+				"jest-message-util": {
+					"version": "24.9.0",
+					"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz",
+					"integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==",
+					"dev": true,
+					"requires": {
+						"@babel/code-frame": "^7.0.0",
+						"@jest/test-result": "^24.9.0",
+						"@jest/types": "^24.9.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": {
+					"version": "24.9.0",
+					"resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz",
+					"integrity": "sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==",
+					"dev": true,
+					"requires": {
+						"@jest/types": "^24.9.0"
+					}
+				},
+				"jest-regex-util": {
+					"version": "24.9.0",
+					"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz",
+					"integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==",
+					"dev": true
+				},
+				"jest-serializer": {
+					"version": "24.9.0",
+					"resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.9.0.tgz",
+					"integrity": "sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ==",
+					"dev": true
+				},
+				"jest-util": {
+					"version": "24.9.0",
+					"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.9.0.tgz",
+					"integrity": "sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==",
+					"dev": true,
+					"requires": {
+						"@jest/console": "^24.9.0",
+						"@jest/fake-timers": "^24.9.0",
+						"@jest/source-map": "^24.9.0",
+						"@jest/test-result": "^24.9.0",
+						"@jest/types": "^24.9.0",
+						"callsites": "^3.0.0",
+						"chalk": "^2.0.1",
+						"graceful-fs": "^4.1.15",
+						"is-ci": "^2.0.0",
+						"mkdirp": "^0.5.1",
+						"slash": "^2.0.0",
+						"source-map": "^0.6.0"
+					}
+				},
+				"jest-worker": {
+					"version": "24.9.0",
+					"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz",
+					"integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==",
+					"dev": true,
+					"requires": {
+						"merge-stream": "^2.0.0",
+						"supports-color": "^6.1.0"
+					}
+				},
+				"merge-stream": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+					"integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+					"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"
+					}
+				},
+				"supports-color": {
+					"version": "6.1.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+					"integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^3.0.0"
+					}
+				},
+				"to-regex-range": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+					"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+					"dev": true,
+					"requires": {
+						"is-number": "^3.0.0",
+						"repeat-string": "^1.6.1"
+					}
+				}
 			}
 		},
 		"babel-loader": {
@@ -2598,12 +2960,12 @@
 			}
 		},
 		"babel-plugin-jest-hoist": {
-			"version": "24.6.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.6.0.tgz",
-			"integrity": "sha512-3pKNH6hMt9SbOv0F3WVmy5CWQ4uogS3k0GY5XLyQHJ9EGpAT9XWkFd2ZiXXtkwFHdAHa5j7w7kfxSP5lAIwu7w==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz",
+			"integrity": "sha512-2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw==",
 			"dev": true,
 			"requires": {
-				"@types/babel__traverse": "7.0.7"
+				"@types/babel__traverse": "^7.0.6"
 			}
 		},
 		"babel-plugin-transform-es2015-modules-commonjs": {
@@ -2629,13 +2991,13 @@
 			}
 		},
 		"babel-preset-jest": {
-			"version": "24.6.0",
-			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.6.0.tgz",
-			"integrity": "sha512-pdZqLEdmy1ZK5kyRUfvBb2IfTPb2BUvIJczlPspS8fWmBQslNNDBqVfh7BW5leOVJMDZKzjD8XEyABTk6gQ5yw==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz",
+			"integrity": "sha512-izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg==",
 			"dev": true,
 			"requires": {
-				"@babel/plugin-syntax-object-rest-spread": "7.2.0",
-				"babel-plugin-jest-hoist": "24.6.0"
+				"@babel/plugin-syntax-object-rest-spread": "^7.0.0",
+				"babel-plugin-jest-hoist": "^24.9.0"
 			}
 		},
 		"babel-runtime": {
@@ -2795,11 +3157,16 @@
 			}
 		},
 		"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==",
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
+			"integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
 			"dev": true
 		},
+		"batch": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+			"integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY="
+		},
 		"bcrypt-pbkdf": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -2841,6 +3208,17 @@
 			"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=",
+			"requires": {
+				"continuable-cache": "^0.3.1",
+				"error": "^7.0.0",
+				"raw-body": "~1.1.0",
+				"safe-json-parse": "~1.0.1"
+			}
+		},
 		"boolbase": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
@@ -3017,6 +3395,11 @@
 			"integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
 			"dev": true
 		},
+		"bytes": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
+			"integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g="
+		},
 		"cacache": {
 			"version": "12.0.2",
 			"resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.2.tgz",
@@ -3515,6 +3898,11 @@
 			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
 			"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=="
+		},
 		"combined-stream": {
 			"version": "1.0.8",
 			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -3718,6 +4106,32 @@
 				}
 			}
 		},
+		"connect": {
+			"version": "3.7.0",
+			"resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
+			"integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
+			"requires": {
+				"debug": "2.6.9",
+				"finalhandler": "1.1.2",
+				"parseurl": "~1.3.3",
+				"utils-merge": "1.0.1"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "2.6.9",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+					"requires": {
+						"ms": "2.0.0"
+					}
+				}
+			}
+		},
+		"connect-livereload": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.6.1.tgz",
+			"integrity": "sha512-3R0kMOdL7CjJpU66fzAkCe6HNtd3AavCS4m+uW4KtJjrdGPT0SQEZieAYd+cm+lJoBznNQ4lqipYWkhBMgk00g=="
+		},
 		"console-browserify": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
@@ -3754,11 +4168,15 @@
 			"integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
 			"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="
+		},
 		"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.2"
 			}
@@ -3816,8 +4234,7 @@
 		"core-util-is": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-			"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-			"dev": true
+			"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
 		},
 		"cosmiconfig": {
 			"version": "3.1.0",
@@ -3928,7 +4345,6 @@
 			"version": "2.2.4",
 			"resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
 			"integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
-			"dev": true,
 			"requires": {
 				"inherits": "2.0.4",
 				"source-map": "0.6.1",
@@ -3937,23 +4353,23 @@
 			}
 		},
 		"css-loader": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.1.0.tgz",
-			"integrity": "sha512-MuL8WsF/KSrHCBCYaozBKlx+r7vIfUaDTEreo7wR7Vv3J6N0z6fqWjRk3e/6wjneitXN1r/Y9FTK1psYNOBdJQ==",
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.2.0.tgz",
+			"integrity": "sha512-QTF3Ud5H7DaZotgdcJjGMvyDj5F3Pn1j/sC6VBEOVp94cbwqyIBdcs/quzj4MC1BKQSrTpQznegH/5giYbhnCQ==",
 			"dev": true,
 			"requires": {
-				"camelcase": "5.3.1",
-				"cssesc": "3.0.0",
-				"icss-utils": "4.1.1",
-				"loader-utils": "1.2.3",
-				"normalize-path": "3.0.0",
-				"postcss": "7.0.17",
-				"postcss-modules-extract-imports": "2.0.0",
-				"postcss-modules-local-by-default": "3.0.2",
-				"postcss-modules-scope": "2.1.0",
-				"postcss-modules-values": "3.0.0",
-				"postcss-value-parser": "4.0.0",
-				"schema-utils": "2.0.1"
+				"camelcase": "^5.3.1",
+				"cssesc": "^3.0.0",
+				"icss-utils": "^4.1.1",
+				"loader-utils": "^1.2.3",
+				"normalize-path": "^3.0.0",
+				"postcss": "^7.0.17",
+				"postcss-modules-extract-imports": "^2.0.0",
+				"postcss-modules-local-by-default": "^3.0.2",
+				"postcss-modules-scope": "^2.1.0",
+				"postcss-modules-values": "^3.0.0",
+				"postcss-value-parser": "^4.0.0",
+				"schema-utils": "^2.0.0"
 			},
 			"dependencies": {
 				"normalize-path": {
@@ -3963,13 +4379,13 @@
 					"dev": true
 				},
 				"schema-utils": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.0.1.tgz",
-					"integrity": "sha512-HJFKJ4JixDpRur06QHwi8uu2kZbng318ahWEKgBjc0ZklcE4FDvmm2wghb448q0IRaABxIESt8vqPFvwgMB80A==",
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.1.0.tgz",
+					"integrity": "sha512-g6SViEZAfGNrToD82ZPUjq52KUPDYc+fN5+g6Euo5mLokl/9Yx14z0Cu4RR1m55HtBXejO0sBt+qw79axN+Fiw==",
 					"dev": true,
 					"requires": {
-						"ajv": "6.10.2",
-						"ajv-keywords": "3.4.1"
+						"ajv": "^6.1.0",
+						"ajv-keywords": "^3.1.0"
 					}
 				}
 			}
@@ -4003,12 +4419,12 @@
 			"dev": true
 		},
 		"cssstyle": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.3.0.tgz",
-			"integrity": "sha512-wXsoRfsRfsLVNaVzoKdqvEmK/5PFaEXNspVT22Ots6K/cnJdpoDKuQFw+qlMiXnmaif1OgeC466X1zISgAOcGg==",
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz",
+			"integrity": "sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==",
 			"dev": true,
 			"requires": {
-				"cssom": "0.3.8"
+				"cssom": "0.3.x"
 			}
 		},
 		"currently-unhandled": {
@@ -4026,6 +4442,15 @@
 			"integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
 			"dev": true
 		},
+		"d": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+			"integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+			"requires": {
+				"es5-ext": "^0.10.50",
+				"type": "^1.0.1"
+			}
+		},
 		"dashdash": {
 			"version": "1.14.1",
 			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@@ -4041,9 +4466,9 @@
 			"integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==",
 			"dev": true,
 			"requires": {
-				"abab": "2.0.0",
-				"whatwg-mimetype": "2.3.0",
-				"whatwg-url": "7.0.0"
+				"abab": "^2.0.0",
+				"whatwg-mimetype": "^2.2.0",
+				"whatwg-url": "^7.0.0"
 			},
 			"dependencies": {
 				"whatwg-url": {
@@ -4052,9 +4477,9 @@
 					"integrity": "sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==",
 					"dev": true,
 					"requires": {
-						"lodash.sortby": "4.7.0",
-						"tr46": "1.0.1",
-						"webidl-conversions": "4.0.2"
+						"lodash.sortby": "^4.7.0",
+						"tr46": "^1.0.1",
+						"webidl-conversions": "^4.0.2"
 					}
 				}
 			}
@@ -4079,6 +4504,16 @@
 				"ms": "2.0.0"
 			}
 		},
+		"debug-fabulous": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.1.0.tgz",
+			"integrity": "sha512-GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==",
+			"requires": {
+				"debug": "3.X",
+				"memoizee": "0.4.X",
+				"object-assign": "4.X"
+			}
+		},
 		"decamelize": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
@@ -4097,8 +4532,7 @@
 		"decode-uri-component": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-			"integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
-			"dev": true
+			"integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
 		},
 		"deep-extend": {
 			"version": "0.6.0",
@@ -4192,6 +4626,11 @@
 			"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
 			"dev": true
 		},
+		"depd": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+			"integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
+		},
 		"des.js": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
@@ -4202,6 +4641,11 @@
 				"minimalistic-assert": "^1.0.0"
 			}
 		},
+		"destroy": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+			"integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+		},
 		"detect-file": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
@@ -4211,13 +4655,12 @@
 		"detect-newline": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
-			"integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=",
-			"dev": true
+			"integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I="
 		},
 		"diff-sequences": {
-			"version": "24.3.0",
-			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.3.0.tgz",
-			"integrity": "sha512-xLqpez+Zj9GKSnPWS0WZw1igGocZ+uua8+y+5dDNTT934N3QuY1sp2LkHzwiaYQGz60hMq0pjAshdeXm5VUOEw==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz",
+			"integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==",
 			"dev": true
 		},
 		"diffie-hellman": {
@@ -4313,7 +4756,7 @@
 			"integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
 			"dev": true,
 			"requires": {
-				"webidl-conversions": "4.0.2"
+				"webidl-conversions": "^4.0.2"
 			}
 		},
 		"domhandler": {
@@ -4402,6 +4845,11 @@
 				"sigmund": "1.0.1"
 			}
 		},
+		"ee-first": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+			"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+		},
 		"electron-to-chromium": {
 			"version": "1.3.191",
 			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.191.tgz",
@@ -4434,6 +4882,11 @@
 			"integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
 			"dev": true
 		},
+		"encodeurl": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+			"integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
+		},
 		"end-of-stream": {
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
@@ -4467,6 +4920,15 @@
 				"prr": "1.0.1"
 			}
 		},
+		"error": {
+			"version": "7.0.2",
+			"resolved": "https://registry.npmjs.org/error/-/error-7.0.2.tgz",
+			"integrity": "sha1-pfdf/02ZJhJt2sDqXcOOaJFTywI=",
+			"requires": {
+				"string-template": "~0.2.1",
+				"xtend": "~4.0.0"
+			}
+		},
 		"error-ex": {
 			"version": "1.3.2",
 			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -4501,22 +4963,67 @@
 				"is-symbol": "1.0.2"
 			}
 		},
+		"es5-ext": {
+			"version": "0.10.50",
+			"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.50.tgz",
+			"integrity": "sha512-KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw==",
+			"requires": {
+				"es6-iterator": "~2.0.3",
+				"es6-symbol": "~3.1.1",
+				"next-tick": "^1.0.0"
+			}
+		},
+		"es6-iterator": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+			"integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+			"requires": {
+				"d": "1",
+				"es5-ext": "^0.10.35",
+				"es6-symbol": "^3.1.1"
+			}
+		},
+		"es6-symbol": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
+			"integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
+			"requires": {
+				"d": "1",
+				"es5-ext": "~0.10.14"
+			}
+		},
+		"es6-weak-map": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
+			"integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
+			"requires": {
+				"d": "1",
+				"es5-ext": "^0.10.46",
+				"es6-iterator": "^2.0.3",
+				"es6-symbol": "^3.1.1"
+			}
+		},
+		"escape-html": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+			"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.11.1",
-			"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.11.1.tgz",
-			"integrity": "sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==",
+			"version": "1.12.0",
+			"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz",
+			"integrity": "sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==",
 			"dev": true,
 			"requires": {
-				"esprima": "3.1.3",
-				"estraverse": "4.2.0",
-				"esutils": "2.0.2",
-				"optionator": "0.8.2",
-				"source-map": "0.6.1"
+				"esprima": "^3.1.3",
+				"estraverse": "^4.2.0",
+				"esutils": "^2.0.2",
+				"optionator": "^0.8.1",
+				"source-map": "~0.6.1"
 			},
 			"dependencies": {
 				"esprima": {
@@ -5067,6 +5574,20 @@
 			"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
 			"dev": true
 		},
+		"etag": {
+			"version": "1.8.1",
+			"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+			"integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
+		},
+		"event-emitter": {
+			"version": "0.3.5",
+			"resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+			"integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
+			"requires": {
+				"d": "1",
+				"es5-ext": "~0.10.14"
+			}
+		},
 		"events": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
@@ -5118,6 +5639,24 @@
 			"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
 			"dev": true
 		},
+		"exorcist": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/exorcist/-/exorcist-1.0.1.tgz",
+			"integrity": "sha1-eTFuPEiFhFSQ97tAXA5bXbEWfFI=",
+			"requires": {
+				"is-stream": "~1.1.0",
+				"minimist": "0.0.5",
+				"mkdirp": "~0.5.1",
+				"mold-source-map": "~0.4.0"
+			},
+			"dependencies": {
+				"minimist": {
+					"version": "0.0.5",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.5.tgz",
+					"integrity": "sha1-16oye87PUY+RBqxrjwA/o7zqhWY="
+				}
+			}
+		},
 		"expand-brackets": {
 			"version": "2.1.4",
 			"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
@@ -5229,17 +5768,17 @@
 			}
 		},
 		"expect": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/expect/-/expect-24.8.0.tgz",
-			"integrity": "sha512-/zYvP8iMDrzaaxHVa724eJBCKqSHmO0FA7EDkBiRHxg6OipmMn1fN+C8T9L9K8yr7UONkOifu6+LLH+z76CnaA==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz",
+			"integrity": "sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==",
 			"dev": true,
 			"requires": {
-				"@jest/types": "24.8.0",
-				"ansi-styles": "3.2.1",
-				"jest-get-type": "24.8.0",
-				"jest-matcher-utils": "24.8.0",
-				"jest-message-util": "24.8.0",
-				"jest-regex-util": "24.3.0"
+				"@jest/types": "^24.9.0",
+				"ansi-styles": "^3.2.0",
+				"jest-get-type": "^24.9.0",
+				"jest-matcher-utils": "^24.9.0",
+				"jest-message-util": "^24.9.0",
+				"jest-regex-util": "^24.9.0"
 			}
 		},
 		"extend": {
@@ -5251,7 +5790,6 @@
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
 			"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-			"dev": true,
 			"requires": {
 				"assign-symbols": "1.0.0",
 				"is-extendable": "1.0.1"
@@ -5261,7 +5799,6 @@
 					"version": "1.0.1",
 					"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
 					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-					"dev": true,
 					"requires": {
 						"is-plain-object": "2.0.4"
 					}
@@ -5359,6 +5896,17 @@
 			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
 			"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==",
+			"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",
@@ -5377,6 +5925,14 @@
 			"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
 			"dev": true
 		},
+		"faye-websocket": {
+			"version": "0.10.0",
+			"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
+			"integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
+			"requires": {
+				"websocket-driver": ">=0.5.1"
+			}
+		},
 		"fb-watchman": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz",
@@ -5416,23 +5972,23 @@
 			}
 		},
 		"file-loader": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.1.0.tgz",
-			"integrity": "sha512-ajDk1nlByoalZAGR4b0H6oD+EGlWnyW1qbSxzaUc7RFiqmn+RbXQQRbTc72jsiUIlVusJ4Et58ltds8ZwTfnAw==",
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.2.0.tgz",
+			"integrity": "sha512-+xZnaK5R8kBJrHK0/6HRlrKNamvVS5rjyuju+rnyxRGuwUJwpAMsVzUl5dz6rK8brkzjV6JpcFNjp6NqV0g1OQ==",
 			"dev": true,
 			"requires": {
-				"loader-utils": "1.2.3",
-				"schema-utils": "2.0.1"
+				"loader-utils": "^1.2.3",
+				"schema-utils": "^2.0.0"
 			},
 			"dependencies": {
 				"schema-utils": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.0.1.tgz",
-					"integrity": "sha512-HJFKJ4JixDpRur06QHwi8uu2kZbng318ahWEKgBjc0ZklcE4FDvmm2wghb448q0IRaABxIESt8vqPFvwgMB80A==",
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.1.0.tgz",
+					"integrity": "sha512-g6SViEZAfGNrToD82ZPUjq52KUPDYc+fN5+g6Euo5mLokl/9Yx14z0Cu4RR1m55HtBXejO0sBt+qw79axN+Fiw==",
 					"dev": true,
 					"requires": {
-						"ajv": "6.10.2",
-						"ajv-keywords": "3.4.1"
+						"ajv": "^6.1.0",
+						"ajv-keywords": "^3.1.0"
 					}
 				}
 			}
@@ -5470,6 +6026,30 @@
 				"to-regex-range": "5.0.1"
 			}
 		},
+		"finalhandler": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+			"integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+			"requires": {
+				"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"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "2.6.9",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+					"requires": {
+						"ms": "2.0.0"
+					}
+				}
+			}
+		},
 		"find-babel-config": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/find-babel-config/-/find-babel-config-1.2.0.tgz",
@@ -5746,6 +6326,11 @@
 				"map-cache": "0.2.2"
 			}
 		},
+		"fresh": {
+			"version": "0.5.2",
+			"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+			"integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
+		},
 		"from2": {
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
@@ -6619,6 +7204,14 @@
 				"minimatch": "3.0.4"
 			}
 		},
+		"glogg": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
+			"integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
+			"requires": {
+				"sparkles": "^1.0.0"
+			}
+		},
 		"gonzales-pe": {
 			"version": "4.2.4",
 			"resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.2.4.tgz",
@@ -6647,6 +7240,77 @@
 			"integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
 			"dev": true
 		},
+		"gulp-connect": {
+			"version": "5.7.0",
+			"resolved": "https://registry.npmjs.org/gulp-connect/-/gulp-connect-5.7.0.tgz",
+			"integrity": "sha512-8tRcC6wgXMLakpPw9M7GRJIhxkYdgZsXwn7n56BA2bQYGLR9NOPhMzx7js+qYDy6vhNkbApGKURjAw1FjY4pNA==",
+			"requires": {
+				"ansi-colors": "^2.0.5",
+				"connect": "^3.6.6",
+				"connect-livereload": "^0.6.0",
+				"fancy-log": "^1.3.2",
+				"map-stream": "^0.0.7",
+				"send": "^0.16.2",
+				"serve-index": "^1.9.1",
+				"serve-static": "^1.13.2",
+				"tiny-lr": "^1.1.1"
+			}
+		},
+		"gulp-rename": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.4.0.tgz",
+			"integrity": "sha512-swzbIGb/arEoFK89tPY58vg3Ok1bw+d35PfUNwWqdo7KM4jkmuGA78JiDNqR+JeZFaeeHnRg9N7aihX3YPmsyg=="
+		},
+		"gulp-sourcemaps": {
+			"version": "2.6.5",
+			"resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.5.tgz",
+			"integrity": "sha512-SYLBRzPTew8T5Suh2U8jCSDKY+4NARua4aqjj8HOysBh2tSgT9u4jc1FYirAdPx1akUxxDeK++fqw6Jg0LkQRg==",
+			"requires": {
+				"@gulp-sourcemaps/identity-map": "1.X",
+				"@gulp-sourcemaps/map-sources": "1.X",
+				"acorn": "5.X",
+				"convert-source-map": "1.X",
+				"css": "2.X",
+				"debug-fabulous": "1.X",
+				"detect-newline": "2.X",
+				"graceful-fs": "4.X",
+				"source-map": "~0.6.0",
+				"strip-bom-string": "1.X",
+				"through2": "2.X"
+			},
+			"dependencies": {
+				"acorn": {
+					"version": "5.7.3",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+					"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="
+				}
+			}
+		},
+		"gulp-uglify": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/gulp-uglify/-/gulp-uglify-3.0.2.tgz",
+			"integrity": "sha512-gk1dhB74AkV2kzqPMQBLA3jPoIAPd/nlNzP2XMDSG8XZrqnlCiDGAqC+rZOumzFvB5zOphlFh6yr3lgcAb/OOg==",
+			"requires": {
+				"array-each": "^1.0.1",
+				"extend-shallow": "^3.0.2",
+				"gulplog": "^1.0.0",
+				"has-gulplog": "^0.1.0",
+				"isobject": "^3.0.1",
+				"make-error-cause": "^1.1.1",
+				"safe-buffer": "^5.1.2",
+				"through2": "^2.0.0",
+				"uglify-js": "^3.0.5",
+				"vinyl-sourcemaps-apply": "^0.2.0"
+			}
+		},
+		"gulplog": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
+			"integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
+			"requires": {
+				"glogg": "^1.0.0"
+			}
+		},
 		"hammerjs": {
 			"version": "2.0.8",
 			"resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
@@ -6709,6 +7373,14 @@
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
 			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
 		},
+		"has-gulplog": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
+			"integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
+			"requires": {
+				"sparkles": "^1.0.0"
+			}
+		},
 		"has-symbols": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
@@ -6843,7 +7515,7 @@
 			"integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
 			"dev": true,
 			"requires": {
-				"whatwg-encoding": "1.0.5"
+				"whatwg-encoding": "^1.0.1"
 			}
 		},
 		"html-tags": {
@@ -6865,6 +7537,29 @@
 				"readable-stream": "3.4.0"
 			}
 		},
+		"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"
+			},
+			"dependencies": {
+				"inherits": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+				}
+			}
+		},
+		"http-parser-js": {
+			"version": "0.4.10",
+			"resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz",
+			"integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q="
+		},
 		"http-signature": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
@@ -6897,7 +7592,7 @@
 			"integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
 			"dev": true,
 			"requires": {
-				"postcss": "7.0.17"
+				"postcss": "^7.0.14"
 			}
 		},
 		"ieee754": {
@@ -7305,7 +8000,6 @@
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
 			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-			"dev": true,
 			"requires": {
 				"isobject": "3.0.1"
 			}
@@ -7325,8 +8019,7 @@
 		"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
+			"integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
 		},
 		"is-regex": {
 			"version": "1.0.4",
@@ -7405,8 +8098,7 @@
 		"isarray": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-			"dev": true
+			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
 		},
 		"isexe": {
 			"version": "2.0.0",
@@ -7416,8 +8108,7 @@
 		"isobject": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-			"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-			"dev": true
+			"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
 		},
 		"isstream": {
 			"version": "0.1.2",
@@ -7460,9 +8151,9 @@
 			"integrity": "sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==",
 			"dev": true,
 			"requires": {
-				"istanbul-lib-coverage": "2.0.5",
-				"make-dir": "2.1.0",
-				"supports-color": "6.1.0"
+				"istanbul-lib-coverage": "^2.0.5",
+				"make-dir": "^2.1.0",
+				"supports-color": "^6.1.0"
 			},
 			"dependencies": {
 				"supports-color": {
@@ -7471,7 +8162,7 @@
 					"integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
 					"dev": true,
 					"requires": {
-						"has-flag": "3.0.0"
+						"has-flag": "^3.0.0"
 					}
 				}
 			}
@@ -7482,11 +8173,11 @@
 			"integrity": "sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==",
 			"dev": true,
 			"requires": {
-				"debug": "4.1.1",
-				"istanbul-lib-coverage": "2.0.5",
-				"make-dir": "2.1.0",
-				"rimraf": "2.6.3",
-				"source-map": "0.6.1"
+				"debug": "^4.1.1",
+				"istanbul-lib-coverage": "^2.0.5",
+				"make-dir": "^2.1.0",
+				"rimraf": "^2.6.3",
+				"source-map": "^0.6.1"
 			},
 			"dependencies": {
 				"debug": {
@@ -7495,7 +8186,7 @@
 					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
 					"requires": {
-						"ms": "2.1.2"
+						"ms": "^2.1.1"
 					}
 				},
 				"ms": {
@@ -7512,201 +8203,94 @@
 			"integrity": "sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==",
 			"dev": true,
 			"requires": {
-				"handlebars": "4.1.2"
+				"handlebars": "^4.1.2"
 			}
 		},
 		"jest": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/jest/-/jest-24.8.0.tgz",
-			"integrity": "sha512-o0HM90RKFRNWmAWvlyV8i5jGZ97pFwkeVoGvPW1EtLTgJc2+jcuqcbbqcSZLE/3f2S5pt0y2ZBETuhpWNl1Reg==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/jest/-/jest-24.9.0.tgz",
+			"integrity": "sha512-YvkBL1Zm7d2B1+h5fHEOdyjCG+sGMz4f8D86/0HiqJ6MB4MnDc8FgP5vdWsGnemOQro7lnYo8UakZ3+5A0jxGw==",
 			"dev": true,
 			"requires": {
-				"import-local": "2.0.0",
-				"jest-cli": "24.8.0"
+				"import-local": "^2.0.0",
+				"jest-cli": "^24.9.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
-				},
-				"cliui": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-					"integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
-					"dev": true,
-					"requires": {
-						"string-width": "2.1.1",
-						"strip-ansi": "4.0.0",
-						"wrap-ansi": "2.1.0"
-					}
-				},
-				"get-caller-file": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-					"integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
-					"dev": true
-				},
 				"jest-cli": {
-					"version": "24.8.0",
-					"resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-24.8.0.tgz",
-					"integrity": "sha512-+p6J00jSMPQ116ZLlHJJvdf8wbjNbZdeSX9ptfHX06/MSNaXmKihQzx5vQcw0q2G6JsdVkUIdWbOWtSnaYs3yA==",
+					"version": "24.9.0",
+					"resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-24.9.0.tgz",
+					"integrity": "sha512-+VLRKyitT3BWoMeSUIHRxV/2g8y9gw91Jh5z2UmXZzkZKpbC08CSehVxgHUwTpy+HwGcns/tqafQDJW7imYvGg==",
 					"dev": true,
 					"requires": {
-						"@jest/core": "24.8.0",
-						"@jest/test-result": "24.8.0",
-						"@jest/types": "24.8.0",
-						"chalk": "2.4.2",
-						"exit": "0.1.2",
-						"import-local": "2.0.0",
-						"is-ci": "2.0.0",
-						"jest-config": "24.8.0",
-						"jest-util": "24.8.0",
-						"jest-validate": "24.8.0",
-						"prompts": "2.1.0",
-						"realpath-native": "1.1.0",
-						"yargs": "12.0.5"
-					}
-				},
-				"require-main-filename": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-					"integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
-					"dev": true
-				},
-				"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"
-					}
-				},
-				"wrap-ansi": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-					"integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-					"dev": true,
-					"requires": {
-						"string-width": "1.0.2",
-						"strip-ansi": "3.0.1"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "2.1.1",
-							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-							"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-							"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": {
-								"number-is-nan": "1.0.1"
-							}
-						},
-						"string-width": {
-							"version": "1.0.2",
-							"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-							"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-							"dev": true,
-							"requires": {
-								"code-point-at": "1.1.0",
-								"is-fullwidth-code-point": "1.0.0",
-								"strip-ansi": "3.0.1"
-							}
-						},
-						"strip-ansi": {
-							"version": "3.0.1",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-							"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "2.1.1"
-							}
-						}
+						"@jest/core": "^24.9.0",
+						"@jest/test-result": "^24.9.0",
+						"@jest/types": "^24.9.0",
+						"chalk": "^2.0.1",
+						"exit": "^0.1.2",
+						"import-local": "^2.0.0",
+						"is-ci": "^2.0.0",
+						"jest-config": "^24.9.0",
+						"jest-util": "^24.9.0",
+						"jest-validate": "^24.9.0",
+						"prompts": "^2.0.1",
+						"realpath-native": "^1.1.0",
+						"yargs": "^13.3.0"
 					}
 				},
 				"yargs": {
-					"version": "12.0.5",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
-					"integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
+					"version": "13.3.0",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz",
+					"integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==",
 					"dev": true,
 					"requires": {
-						"cliui": "4.1.0",
-						"decamelize": "1.2.0",
-						"find-up": "3.0.0",
-						"get-caller-file": "1.0.3",
-						"os-locale": "3.1.0",
-						"require-directory": "2.1.1",
-						"require-main-filename": "1.0.1",
-						"set-blocking": "2.0.0",
-						"string-width": "2.1.1",
-						"which-module": "2.0.0",
-						"y18n": "4.0.0",
-						"yargs-parser": "11.1.1"
-					}
-				},
-				"yargs-parser": {
-					"version": "11.1.1",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
-					"integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
-					"dev": true,
-					"requires": {
-						"camelcase": "5.3.1",
-						"decamelize": "1.2.0"
+						"cliui": "^5.0.0",
+						"find-up": "^3.0.0",
+						"get-caller-file": "^2.0.1",
+						"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.1"
 					}
 				}
 			}
 		},
 		"jest-changed-files": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-24.8.0.tgz",
-			"integrity": "sha512-qgANC1Yrivsq+UrLXsvJefBKVoCsKB0Hv+mBb6NMjjZ90wwxCDmU3hsCXBya30cH+LnPYjwgcU65i6yJ5Nfuug==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-24.9.0.tgz",
+			"integrity": "sha512-6aTWpe2mHF0DhL28WjdkO8LyGjs3zItPET4bMSeXU6T3ub4FPMw+mcOcbdGXQOAfmLcxofD23/5Bl9Z4AkFwqg==",
 			"dev": true,
 			"requires": {
-				"@jest/types": "24.8.0",
-				"execa": "1.0.0",
-				"throat": "4.1.0"
+				"@jest/types": "^24.9.0",
+				"execa": "^1.0.0",
+				"throat": "^4.0.0"
 			}
 		},
 		"jest-config": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/jest-config/-/jest-config-24.8.0.tgz",
-			"integrity": "sha512-Czl3Nn2uEzVGsOeaewGWoDPD8GStxCpAe0zOYs2x2l0fZAgPbCr3uwUkgNKV3LwE13VXythM946cd5rdGkkBZw==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/jest-config/-/jest-config-24.9.0.tgz",
+			"integrity": "sha512-RATtQJtVYQrp7fvWg6f5y3pEFj9I+H8sWw4aKxnDZ96mob5i5SD6ZEGWgMLXQ4LE8UurrjbdlLWdUeo+28QpfQ==",
 			"dev": true,
 			"requires": {
-				"@babel/core": "7.5.5",
-				"@jest/test-sequencer": "24.8.0",
-				"@jest/types": "24.8.0",
-				"babel-jest": "24.8.0",
-				"chalk": "2.4.2",
-				"glob": "7.1.4",
-				"jest-environment-jsdom": "24.8.0",
-				"jest-environment-node": "24.8.0",
-				"jest-get-type": "24.8.0",
-				"jest-jasmine2": "24.8.0",
-				"jest-regex-util": "24.3.0",
-				"jest-resolve": "24.8.0",
-				"jest-util": "24.8.0",
-				"jest-validate": "24.8.0",
-				"micromatch": "3.1.10",
-				"pretty-format": "24.8.0",
-				"realpath-native": "1.1.0"
+				"@babel/core": "^7.1.0",
+				"@jest/test-sequencer": "^24.9.0",
+				"@jest/types": "^24.9.0",
+				"babel-jest": "^24.9.0",
+				"chalk": "^2.0.1",
+				"glob": "^7.1.1",
+				"jest-environment-jsdom": "^24.9.0",
+				"jest-environment-node": "^24.9.0",
+				"jest-get-type": "^24.9.0",
+				"jest-jasmine2": "^24.9.0",
+				"jest-regex-util": "^24.3.0",
+				"jest-resolve": "^24.9.0",
+				"jest-util": "^24.9.0",
+				"jest-validate": "^24.9.0",
+				"micromatch": "^3.1.10",
+				"pretty-format": "^24.9.0",
+				"realpath-native": "^1.1.0"
 			},
 			"dependencies": {
 				"braces": {
@@ -7715,16 +8299,16 @@
 					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
 					"dev": true,
 					"requires": {
-						"arr-flatten": "1.1.0",
-						"array-unique": "0.3.2",
-						"extend-shallow": "2.0.1",
-						"fill-range": "4.0.0",
-						"isobject": "3.0.1",
-						"repeat-element": "1.1.3",
-						"snapdragon": "0.8.2",
-						"snapdragon-node": "2.1.1",
-						"split-string": "3.1.0",
-						"to-regex": "3.0.2"
+						"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": {
@@ -7733,7 +8317,7 @@
 							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 							"dev": true,
 							"requires": {
-								"is-extendable": "0.1.1"
+								"is-extendable": "^0.1.0"
 							}
 						}
 					}
@@ -7744,10 +8328,10 @@
 					"integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
 					"dev": true,
 					"requires": {
-						"extend-shallow": "2.0.1",
-						"is-number": "3.0.0",
-						"repeat-string": "1.6.1",
-						"to-regex-range": "2.1.1"
+						"extend-shallow": "^2.0.1",
+						"is-number": "^3.0.0",
+						"repeat-string": "^1.6.1",
+						"to-regex-range": "^2.1.0"
 					},
 					"dependencies": {
 						"extend-shallow": {
@@ -7756,7 +8340,7 @@
 							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 							"dev": true,
 							"requires": {
-								"is-extendable": "0.1.1"
+								"is-extendable": "^0.1.0"
 							}
 						}
 					}
@@ -7773,7 +8357,7 @@
 					"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
 					"dev": true,
 					"requires": {
-						"kind-of": "3.2.2"
+						"kind-of": "^3.0.2"
 					},
 					"dependencies": {
 						"kind-of": {
@@ -7782,7 +8366,7 @@
 							"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
 							"dev": true,
 							"requires": {
-								"is-buffer": "1.1.6"
+								"is-buffer": "^1.1.5"
 							}
 						}
 					}
@@ -7793,19 +8377,19 @@
 					"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
 					"dev": true,
 					"requires": {
-						"arr-diff": "4.0.0",
-						"array-unique": "0.3.2",
-						"braces": "2.3.2",
-						"define-property": "2.0.2",
-						"extend-shallow": "3.0.2",
-						"extglob": "2.0.4",
-						"fragment-cache": "0.2.1",
-						"kind-of": "6.0.2",
-						"nanomatch": "1.2.13",
-						"object.pick": "1.3.0",
-						"regex-not": "1.0.2",
-						"snapdragon": "0.8.2",
-						"to-regex": "3.0.2"
+						"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"
 					}
 				},
 				"to-regex-range": {
@@ -7814,97 +8398,97 @@
 					"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
 					"dev": true,
 					"requires": {
-						"is-number": "3.0.0",
-						"repeat-string": "1.6.1"
+						"is-number": "^3.0.0",
+						"repeat-string": "^1.6.1"
 					}
 				}
 			}
 		},
 		"jest-diff": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.8.0.tgz",
-			"integrity": "sha512-wxetCEl49zUpJ/bvUmIFjd/o52J+yWcoc5ZyPq4/W1LUKGEhRYDIbP1KcF6t+PvqNrGAFk4/JhtxDq/Nnzs66g==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz",
+			"integrity": "sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==",
 			"dev": true,
 			"requires": {
-				"chalk": "2.4.2",
-				"diff-sequences": "24.3.0",
-				"jest-get-type": "24.8.0",
-				"pretty-format": "24.8.0"
+				"chalk": "^2.0.1",
+				"diff-sequences": "^24.9.0",
+				"jest-get-type": "^24.9.0",
+				"pretty-format": "^24.9.0"
 			}
 		},
 		"jest-docblock": {
-			"version": "24.3.0",
-			"resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-24.3.0.tgz",
-			"integrity": "sha512-nlANmF9Yq1dufhFlKG9rasfQlrY7wINJbo3q01tu56Jv5eBU5jirylhF2O5ZBnLxzOVBGRDz/9NAwNyBtG4Nyg==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-24.9.0.tgz",
+			"integrity": "sha512-F1DjdpDMJMA1cN6He0FNYNZlo3yYmOtRUnktrT9Q37njYzC5WEaDdmbynIgy0L/IvXvvgsG8OsqhLPXTpfmZAA==",
 			"dev": true,
 			"requires": {
-				"detect-newline": "2.1.0"
+				"detect-newline": "^2.1.0"
 			}
 		},
 		"jest-each": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/jest-each/-/jest-each-24.8.0.tgz",
-			"integrity": "sha512-NrwK9gaL5+XgrgoCsd9svsoWdVkK4gnvyhcpzd6m487tXHqIdYeykgq3MKI1u4I+5Zf0tofr70at9dWJDeb+BA==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/jest-each/-/jest-each-24.9.0.tgz",
+			"integrity": "sha512-ONi0R4BvW45cw8s2Lrx8YgbeXL1oCQ/wIDwmsM3CqM/nlblNCPmnC3IPQlMbRFZu3wKdQ2U8BqM6lh3LJ5Bsog==",
 			"dev": true,
 			"requires": {
-				"@jest/types": "24.8.0",
-				"chalk": "2.4.2",
-				"jest-get-type": "24.8.0",
-				"jest-util": "24.8.0",
-				"pretty-format": "24.8.0"
+				"@jest/types": "^24.9.0",
+				"chalk": "^2.0.1",
+				"jest-get-type": "^24.9.0",
+				"jest-util": "^24.9.0",
+				"pretty-format": "^24.9.0"
 			}
 		},
 		"jest-environment-jsdom": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.8.0.tgz",
-			"integrity": "sha512-qbvgLmR7PpwjoFjM/sbuqHJt/NCkviuq9vus9NBn/76hhSidO+Z6Bn9tU8friecegbJL8gzZQEMZBQlFWDCwAQ==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz",
+			"integrity": "sha512-Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA==",
 			"dev": true,
 			"requires": {
-				"@jest/environment": "24.8.0",
-				"@jest/fake-timers": "24.8.0",
-				"@jest/types": "24.8.0",
-				"jest-mock": "24.8.0",
-				"jest-util": "24.8.0",
-				"jsdom": "11.12.0"
+				"@jest/environment": "^24.9.0",
+				"@jest/fake-timers": "^24.9.0",
+				"@jest/types": "^24.9.0",
+				"jest-mock": "^24.9.0",
+				"jest-util": "^24.9.0",
+				"jsdom": "^11.5.1"
 			}
 		},
 		"jest-environment-node": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-24.8.0.tgz",
-			"integrity": "sha512-vIGUEScd1cdDgR6sqn2M08sJTRLQp6Dk/eIkCeO4PFHxZMOgy+uYLPMC4ix3PEfM5Au/x3uQ/5Tl0DpXXZsJ/Q==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-24.9.0.tgz",
+			"integrity": "sha512-6d4V2f4nxzIzwendo27Tr0aFm+IXWa0XEUnaH6nU0FMaozxovt+sfRvh4J47wL1OvF83I3SSTu0XK+i4Bqe7uA==",
 			"dev": true,
 			"requires": {
-				"@jest/environment": "24.8.0",
-				"@jest/fake-timers": "24.8.0",
-				"@jest/types": "24.8.0",
-				"jest-mock": "24.8.0",
-				"jest-util": "24.8.0"
+				"@jest/environment": "^24.9.0",
+				"@jest/fake-timers": "^24.9.0",
+				"@jest/types": "^24.9.0",
+				"jest-mock": "^24.9.0",
+				"jest-util": "^24.9.0"
 			}
 		},
 		"jest-get-type": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.8.0.tgz",
-			"integrity": "sha512-RR4fo8jEmMD9zSz2nLbs2j0zvPpk/KCEz3a62jJWbd2ayNo0cb+KFRxPHVhE4ZmgGJEQp0fosmNz84IfqM8cMQ==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz",
+			"integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==",
 			"dev": true
 		},
 		"jest-haste-map": {
-			"version": "24.8.1",
-			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.8.1.tgz",
-			"integrity": "sha512-SwaxMGVdAZk3ernAx2Uv2sorA7jm3Kx+lR0grp6rMmnY06Kn/urtKx1LPN2mGTea4fCT38impYT28FfcLUhX0g==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.9.0.tgz",
+			"integrity": "sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==",
 			"dev": true,
 			"requires": {
-				"@jest/types": "24.8.0",
-				"anymatch": "2.0.0",
-				"fb-watchman": "2.0.0",
-				"fsevents": "1.2.9",
-				"graceful-fs": "4.2.0",
-				"invariant": "2.2.4",
-				"jest-serializer": "24.4.0",
-				"jest-util": "24.8.0",
-				"jest-worker": "24.6.0",
-				"micromatch": "3.1.10",
-				"sane": "4.1.0",
-				"walker": "1.0.7"
+				"@jest/types": "^24.9.0",
+				"anymatch": "^2.0.0",
+				"fb-watchman": "^2.0.0",
+				"fsevents": "^1.2.7",
+				"graceful-fs": "^4.1.15",
+				"invariant": "^2.2.4",
+				"jest-serializer": "^24.9.0",
+				"jest-util": "^24.9.0",
+				"jest-worker": "^24.9.0",
+				"micromatch": "^3.1.10",
+				"sane": "^4.0.3",
+				"walker": "^1.0.7"
 			},
 			"dependencies": {
 				"braces": {
@@ -7913,16 +8497,16 @@
 					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
 					"dev": true,
 					"requires": {
-						"arr-flatten": "1.1.0",
-						"array-unique": "0.3.2",
-						"extend-shallow": "2.0.1",
-						"fill-range": "4.0.0",
-						"isobject": "3.0.1",
-						"repeat-element": "1.1.3",
-						"snapdragon": "0.8.2",
-						"snapdragon-node": "2.1.1",
-						"split-string": "3.1.0",
-						"to-regex": "3.0.2"
+						"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": {
@@ -7931,7 +8515,7 @@
 							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 							"dev": true,
 							"requires": {
-								"is-extendable": "0.1.1"
+								"is-extendable": "^0.1.0"
 							}
 						}
 					}
@@ -7942,10 +8526,10 @@
 					"integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
 					"dev": true,
 					"requires": {
-						"extend-shallow": "2.0.1",
-						"is-number": "3.0.0",
-						"repeat-string": "1.6.1",
-						"to-regex-range": "2.1.1"
+						"extend-shallow": "^2.0.1",
+						"is-number": "^3.0.0",
+						"repeat-string": "^1.6.1",
+						"to-regex-range": "^2.1.0"
 					},
 					"dependencies": {
 						"extend-shallow": {
@@ -7954,7 +8538,7 @@
 							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 							"dev": true,
 							"requires": {
-								"is-extendable": "0.1.1"
+								"is-extendable": "^0.1.0"
 							}
 						}
 					}
@@ -7971,7 +8555,7 @@
 					"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
 					"dev": true,
 					"requires": {
-						"kind-of": "3.2.2"
+						"kind-of": "^3.0.2"
 					},
 					"dependencies": {
 						"kind-of": {
@@ -7980,7 +8564,7 @@
 							"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
 							"dev": true,
 							"requires": {
-								"is-buffer": "1.1.6"
+								"is-buffer": "^1.1.5"
 							}
 						}
 					}
@@ -7991,19 +8575,19 @@
 					"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
 					"dev": true,
 					"requires": {
-						"arr-diff": "4.0.0",
-						"array-unique": "0.3.2",
-						"braces": "2.3.2",
-						"define-property": "2.0.2",
-						"extend-shallow": "3.0.2",
-						"extglob": "2.0.4",
-						"fragment-cache": "0.2.1",
-						"kind-of": "6.0.2",
-						"nanomatch": "1.2.13",
-						"object.pick": "1.3.0",
-						"regex-not": "1.0.2",
-						"snapdragon": "0.8.2",
-						"to-regex": "3.0.2"
+						"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"
 					}
 				},
 				"to-regex-range": {
@@ -8012,71 +8596,72 @@
 					"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
 					"dev": true,
 					"requires": {
-						"is-number": "3.0.0",
-						"repeat-string": "1.6.1"
+						"is-number": "^3.0.0",
+						"repeat-string": "^1.6.1"
 					}
 				}
 			}
 		},
 		"jest-jasmine2": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.8.0.tgz",
-			"integrity": "sha512-cEky88npEE5LKd5jPpTdDCLvKkdyklnaRycBXL6GNmpxe41F0WN44+i7lpQKa/hcbXaQ+rc9RMaM4dsebrYong==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz",
+			"integrity": "sha512-Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw==",
 			"dev": true,
 			"requires": {
-				"@babel/traverse": "7.5.0",
-				"@jest/environment": "24.8.0",
-				"@jest/test-result": "24.8.0",
-				"@jest/types": "24.8.0",
-				"chalk": "2.4.2",
-				"co": "4.6.0",
-				"expect": "24.8.0",
-				"is-generator-fn": "2.1.0",
-				"jest-each": "24.8.0",
-				"jest-matcher-utils": "24.8.0",
-				"jest-message-util": "24.8.0",
-				"jest-runtime": "24.8.0",
-				"jest-snapshot": "24.8.0",
-				"jest-util": "24.8.0",
-				"pretty-format": "24.8.0",
-				"throat": "4.1.0"
+				"@babel/traverse": "^7.1.0",
+				"@jest/environment": "^24.9.0",
+				"@jest/test-result": "^24.9.0",
+				"@jest/types": "^24.9.0",
+				"chalk": "^2.0.1",
+				"co": "^4.6.0",
+				"expect": "^24.9.0",
+				"is-generator-fn": "^2.0.0",
+				"jest-each": "^24.9.0",
+				"jest-matcher-utils": "^24.9.0",
+				"jest-message-util": "^24.9.0",
+				"jest-runtime": "^24.9.0",
+				"jest-snapshot": "^24.9.0",
+				"jest-util": "^24.9.0",
+				"pretty-format": "^24.9.0",
+				"throat": "^4.0.0"
 			}
 		},
 		"jest-leak-detector": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.8.0.tgz",
-			"integrity": "sha512-cG0yRSK8A831LN8lIHxI3AblB40uhv0z+SsQdW3GoMMVcK+sJwrIIyax5tu3eHHNJ8Fu6IMDpnLda2jhn2pD/g==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz",
+			"integrity": "sha512-tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA==",
 			"dev": true,
 			"requires": {
-				"pretty-format": "24.8.0"
+				"jest-get-type": "^24.9.0",
+				"pretty-format": "^24.9.0"
 			}
 		},
 		"jest-matcher-utils": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.8.0.tgz",
-			"integrity": "sha512-lex1yASY51FvUuHgm0GOVj7DCYEouWSlIYmCW7APSqB9v8mXmKSn5+sWVF0MhuASG0bnYY106/49JU1FZNl5hw==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz",
+			"integrity": "sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==",
 			"dev": true,
 			"requires": {
-				"chalk": "2.4.2",
-				"jest-diff": "24.8.0",
-				"jest-get-type": "24.8.0",
-				"pretty-format": "24.8.0"
+				"chalk": "^2.0.1",
+				"jest-diff": "^24.9.0",
+				"jest-get-type": "^24.9.0",
+				"pretty-format": "^24.9.0"
 			}
 		},
 		"jest-message-util": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.8.0.tgz",
-			"integrity": "sha512-p2k71rf/b6ns8btdB0uVdljWo9h0ovpnEe05ZKWceQGfXYr4KkzgKo3PBi8wdnd9OtNh46VpNIJynUn/3MKm1g==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz",
+			"integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==",
 			"dev": true,
 			"requires": {
-				"@babel/code-frame": "7.0.0",
-				"@jest/test-result": "24.8.0",
-				"@jest/types": "24.8.0",
-				"@types/stack-utils": "1.0.1",
-				"chalk": "2.4.2",
-				"micromatch": "3.1.10",
-				"slash": "2.0.0",
-				"stack-utils": "1.0.2"
+				"@babel/code-frame": "^7.0.0",
+				"@jest/test-result": "^24.9.0",
+				"@jest/types": "^24.9.0",
+				"@types/stack-utils": "^1.0.1",
+				"chalk": "^2.0.1",
+				"micromatch": "^3.1.10",
+				"slash": "^2.0.0",
+				"stack-utils": "^1.0.1"
 			},
 			"dependencies": {
 				"braces": {
@@ -8085,16 +8670,16 @@
 					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
 					"dev": true,
 					"requires": {
-						"arr-flatten": "1.1.0",
-						"array-unique": "0.3.2",
-						"extend-shallow": "2.0.1",
-						"fill-range": "4.0.0",
-						"isobject": "3.0.1",
-						"repeat-element": "1.1.3",
-						"snapdragon": "0.8.2",
-						"snapdragon-node": "2.1.1",
-						"split-string": "3.1.0",
-						"to-regex": "3.0.2"
+						"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": {
@@ -8103,7 +8688,7 @@
 							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 							"dev": true,
 							"requires": {
-								"is-extendable": "0.1.1"
+								"is-extendable": "^0.1.0"
 							}
 						}
 					}
@@ -8114,10 +8699,10 @@
 					"integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
 					"dev": true,
 					"requires": {
-						"extend-shallow": "2.0.1",
-						"is-number": "3.0.0",
-						"repeat-string": "1.6.1",
-						"to-regex-range": "2.1.1"
+						"extend-shallow": "^2.0.1",
+						"is-number": "^3.0.0",
+						"repeat-string": "^1.6.1",
+						"to-regex-range": "^2.1.0"
 					},
 					"dependencies": {
 						"extend-shallow": {
@@ -8126,7 +8711,7 @@
 							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 							"dev": true,
 							"requires": {
-								"is-extendable": "0.1.1"
+								"is-extendable": "^0.1.0"
 							}
 						}
 					}
@@ -8143,7 +8728,7 @@
 					"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
 					"dev": true,
 					"requires": {
-						"kind-of": "3.2.2"
+						"kind-of": "^3.0.2"
 					},
 					"dependencies": {
 						"kind-of": {
@@ -8152,7 +8737,7 @@
 							"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
 							"dev": true,
 							"requires": {
-								"is-buffer": "1.1.6"
+								"is-buffer": "^1.1.5"
 							}
 						}
 					}
@@ -8163,19 +8748,19 @@
 					"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
 					"dev": true,
 					"requires": {
-						"arr-diff": "4.0.0",
-						"array-unique": "0.3.2",
-						"braces": "2.3.2",
-						"define-property": "2.0.2",
-						"extend-shallow": "3.0.2",
-						"extglob": "2.0.4",
-						"fragment-cache": "0.2.1",
-						"kind-of": "6.0.2",
-						"nanomatch": "1.2.13",
-						"object.pick": "1.3.0",
-						"regex-not": "1.0.2",
-						"snapdragon": "0.8.2",
-						"to-regex": "3.0.2"
+						"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"
 					}
 				},
 				"to-regex-range": {
@@ -8184,19 +8769,19 @@
 					"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
 					"dev": true,
 					"requires": {
-						"is-number": "3.0.0",
-						"repeat-string": "1.6.1"
+						"is-number": "^3.0.0",
+						"repeat-string": "^1.6.1"
 					}
 				}
 			}
 		},
 		"jest-mock": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.8.0.tgz",
-			"integrity": "sha512-6kWugwjGjJw+ZkK4mDa0Df3sDlUTsV47MSrT0nGQ0RBWJbpODDQ8MHDVtGtUYBne3IwZUhtB7elxHspU79WH3A==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz",
+			"integrity": "sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==",
 			"dev": true,
 			"requires": {
-				"@jest/types": "24.8.0"
+				"@jest/types": "^24.9.0"
 			}
 		},
 		"jest-pnp-resolver": {
@@ -8206,224 +8791,117 @@
 			"dev": true
 		},
 		"jest-regex-util": {
-			"version": "24.3.0",
-			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.3.0.tgz",
-			"integrity": "sha512-tXQR1NEOyGlfylyEjg1ImtScwMq8Oh3iJbGTjN7p0J23EuVX1MA8rwU69K4sLbCmwzgCUbVkm0FkSF9TdzOhtg==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz",
+			"integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==",
 			"dev": true
 		},
 		"jest-resolve": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.8.0.tgz",
-			"integrity": "sha512-+hjSzi1PoRvnuOICoYd5V/KpIQmkAsfjFO71458hQ2Whi/yf1GDeBOFj8Gxw4LrApHsVJvn5fmjcPdmoUHaVKw==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz",
+			"integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==",
 			"dev": true,
 			"requires": {
-				"@jest/types": "24.8.0",
-				"browser-resolve": "1.11.3",
-				"chalk": "2.4.2",
-				"jest-pnp-resolver": "1.2.1",
-				"realpath-native": "1.1.0"
+				"@jest/types": "^24.9.0",
+				"browser-resolve": "^1.11.3",
+				"chalk": "^2.0.1",
+				"jest-pnp-resolver": "^1.2.1",
+				"realpath-native": "^1.1.0"
 			}
 		},
 		"jest-resolve-dependencies": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-24.8.0.tgz",
-			"integrity": "sha512-hyK1qfIf/krV+fSNyhyJeq3elVMhK9Eijlwy+j5jqmZ9QsxwKBiP6qukQxaHtK8k6zql/KYWwCTQ+fDGTIJauw==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-24.9.0.tgz",
+			"integrity": "sha512-Fm7b6AlWnYhT0BXy4hXpactHIqER7erNgIsIozDXWl5dVm+k8XdGVe1oTg1JyaFnOxarMEbax3wyRJqGP2Pq+g==",
 			"dev": true,
 			"requires": {
-				"@jest/types": "24.8.0",
-				"jest-regex-util": "24.3.0",
-				"jest-snapshot": "24.8.0"
+				"@jest/types": "^24.9.0",
+				"jest-regex-util": "^24.3.0",
+				"jest-snapshot": "^24.9.0"
 			}
 		},
 		"jest-runner": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-24.8.0.tgz",
-			"integrity": "sha512-utFqC5BaA3JmznbissSs95X1ZF+d+4WuOWwpM9+Ak356YtMhHE/GXUondZdcyAAOTBEsRGAgH/0TwLzfI9h7ow==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-24.9.0.tgz",
+			"integrity": "sha512-KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg==",
 			"dev": true,
 			"requires": {
-				"@jest/console": "24.7.1",
-				"@jest/environment": "24.8.0",
-				"@jest/test-result": "24.8.0",
-				"@jest/types": "24.8.0",
-				"chalk": "2.4.2",
-				"exit": "0.1.2",
-				"graceful-fs": "4.2.0",
-				"jest-config": "24.8.0",
-				"jest-docblock": "24.3.0",
-				"jest-haste-map": "24.8.1",
-				"jest-jasmine2": "24.8.0",
-				"jest-leak-detector": "24.8.0",
-				"jest-message-util": "24.8.0",
-				"jest-resolve": "24.8.0",
-				"jest-runtime": "24.8.0",
-				"jest-util": "24.8.0",
-				"jest-worker": "24.6.0",
-				"source-map-support": "0.5.12",
-				"throat": "4.1.0"
+				"@jest/console": "^24.7.1",
+				"@jest/environment": "^24.9.0",
+				"@jest/test-result": "^24.9.0",
+				"@jest/types": "^24.9.0",
+				"chalk": "^2.4.2",
+				"exit": "^0.1.2",
+				"graceful-fs": "^4.1.15",
+				"jest-config": "^24.9.0",
+				"jest-docblock": "^24.3.0",
+				"jest-haste-map": "^24.9.0",
+				"jest-jasmine2": "^24.9.0",
+				"jest-leak-detector": "^24.9.0",
+				"jest-message-util": "^24.9.0",
+				"jest-resolve": "^24.9.0",
+				"jest-runtime": "^24.9.0",
+				"jest-util": "^24.9.0",
+				"jest-worker": "^24.6.0",
+				"source-map-support": "^0.5.6",
+				"throat": "^4.0.0"
 			}
 		},
 		"jest-runtime": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.8.0.tgz",
-			"integrity": "sha512-Mq0aIXhvO/3bX44ccT+czU1/57IgOMyy80oM0XR/nyD5zgBcesF84BPabZi39pJVA6UXw+fY2Q1N+4BiVUBWOA==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.9.0.tgz",
+			"integrity": "sha512-8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw==",
 			"dev": true,
 			"requires": {
-				"@jest/console": "24.7.1",
-				"@jest/environment": "24.8.0",
-				"@jest/source-map": "24.3.0",
-				"@jest/transform": "24.8.0",
-				"@jest/types": "24.8.0",
-				"@types/yargs": "12.0.12",
-				"chalk": "2.4.2",
-				"exit": "0.1.2",
-				"glob": "7.1.4",
-				"graceful-fs": "4.2.0",
-				"jest-config": "24.8.0",
-				"jest-haste-map": "24.8.1",
-				"jest-message-util": "24.8.0",
-				"jest-mock": "24.8.0",
-				"jest-regex-util": "24.3.0",
-				"jest-resolve": "24.8.0",
-				"jest-snapshot": "24.8.0",
-				"jest-util": "24.8.0",
-				"jest-validate": "24.8.0",
-				"realpath-native": "1.1.0",
-				"slash": "2.0.0",
-				"strip-bom": "3.0.0",
-				"yargs": "12.0.5"
+				"@jest/console": "^24.7.1",
+				"@jest/environment": "^24.9.0",
+				"@jest/source-map": "^24.3.0",
+				"@jest/transform": "^24.9.0",
+				"@jest/types": "^24.9.0",
+				"@types/yargs": "^13.0.0",
+				"chalk": "^2.0.1",
+				"exit": "^0.1.2",
+				"glob": "^7.1.3",
+				"graceful-fs": "^4.1.15",
+				"jest-config": "^24.9.0",
+				"jest-haste-map": "^24.9.0",
+				"jest-message-util": "^24.9.0",
+				"jest-mock": "^24.9.0",
+				"jest-regex-util": "^24.3.0",
+				"jest-resolve": "^24.9.0",
+				"jest-snapshot": "^24.9.0",
+				"jest-util": "^24.9.0",
+				"jest-validate": "^24.9.0",
+				"realpath-native": "^1.1.0",
+				"slash": "^2.0.0",
+				"strip-bom": "^3.0.0",
+				"yargs": "^13.3.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
-				},
-				"cliui": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-					"integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
-					"dev": true,
-					"requires": {
-						"string-width": "2.1.1",
-						"strip-ansi": "4.0.0",
-						"wrap-ansi": "2.1.0"
-					}
-				},
-				"get-caller-file": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-					"integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
-					"dev": true
-				},
-				"require-main-filename": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-					"integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
-					"dev": true
-				},
-				"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"
-					}
-				},
-				"wrap-ansi": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-					"integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-					"dev": true,
-					"requires": {
-						"string-width": "1.0.2",
-						"strip-ansi": "3.0.1"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "2.1.1",
-							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-							"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-							"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": {
-								"number-is-nan": "1.0.1"
-							}
-						},
-						"string-width": {
-							"version": "1.0.2",
-							"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-							"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-							"dev": true,
-							"requires": {
-								"code-point-at": "1.1.0",
-								"is-fullwidth-code-point": "1.0.0",
-								"strip-ansi": "3.0.1"
-							}
-						},
-						"strip-ansi": {
-							"version": "3.0.1",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-							"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "2.1.1"
-							}
-						}
-					}
-				},
 				"yargs": {
-					"version": "12.0.5",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
-					"integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
+					"version": "13.3.0",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz",
+					"integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==",
 					"dev": true,
 					"requires": {
-						"cliui": "4.1.0",
-						"decamelize": "1.2.0",
-						"find-up": "3.0.0",
-						"get-caller-file": "1.0.3",
-						"os-locale": "3.1.0",
-						"require-directory": "2.1.1",
-						"require-main-filename": "1.0.1",
-						"set-blocking": "2.0.0",
-						"string-width": "2.1.1",
-						"which-module": "2.0.0",
-						"y18n": "4.0.0",
-						"yargs-parser": "11.1.1"
-					}
-				},
-				"yargs-parser": {
-					"version": "11.1.1",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
-					"integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
-					"dev": true,
-					"requires": {
-						"camelcase": "5.3.1",
-						"decamelize": "1.2.0"
+						"cliui": "^5.0.0",
+						"find-up": "^3.0.0",
+						"get-caller-file": "^2.0.1",
+						"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.1"
 					}
 				}
 			}
 		},
 		"jest-serializer": {
-			"version": "24.4.0",
-			"resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.4.0.tgz",
-			"integrity": "sha512-k//0DtglVstc1fv+GY/VHDIjrtNjdYvYjMlbLUed4kxrE92sIUewOi5Hj3vrpB8CXfkJntRPDRjCrCvUhBdL8Q==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.9.0.tgz",
+			"integrity": "sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ==",
 			"dev": true
 		},
 		"jest-serializer-vue": {
@@ -8436,82 +8914,91 @@
 			}
 		},
 		"jest-snapshot": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.8.0.tgz",
-			"integrity": "sha512-5ehtWoc8oU9/cAPe6fez6QofVJLBKyqkY2+TlKTOf0VllBB/mqUNdARdcjlZrs9F1Cv+/HKoCS/BknT0+tmfPg==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.9.0.tgz",
+			"integrity": "sha512-uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "7.5.0",
-				"@jest/types": "24.8.0",
-				"chalk": "2.4.2",
-				"expect": "24.8.0",
-				"jest-diff": "24.8.0",
-				"jest-matcher-utils": "24.8.0",
-				"jest-message-util": "24.8.0",
-				"jest-resolve": "24.8.0",
-				"mkdirp": "0.5.1",
-				"natural-compare": "1.4.0",
-				"pretty-format": "24.8.0",
-				"semver": "5.7.0"
+				"@babel/types": "^7.0.0",
+				"@jest/types": "^24.9.0",
+				"chalk": "^2.0.1",
+				"expect": "^24.9.0",
+				"jest-diff": "^24.9.0",
+				"jest-get-type": "^24.9.0",
+				"jest-matcher-utils": "^24.9.0",
+				"jest-message-util": "^24.9.0",
+				"jest-resolve": "^24.9.0",
+				"mkdirp": "^0.5.1",
+				"natural-compare": "^1.4.0",
+				"pretty-format": "^24.9.0",
+				"semver": "^6.2.0"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				}
 			}
 		},
 		"jest-util": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.8.0.tgz",
-			"integrity": "sha512-DYZeE+XyAnbNt0BG1OQqKy/4GVLPtzwGx5tsnDrFcax36rVE3lTA5fbvgmbVPUZf9w77AJ8otqR4VBbfFJkUZA==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.9.0.tgz",
+			"integrity": "sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==",
 			"dev": true,
 			"requires": {
-				"@jest/console": "24.7.1",
-				"@jest/fake-timers": "24.8.0",
-				"@jest/source-map": "24.3.0",
-				"@jest/test-result": "24.8.0",
-				"@jest/types": "24.8.0",
-				"callsites": "3.1.0",
-				"chalk": "2.4.2",
-				"graceful-fs": "4.2.0",
-				"is-ci": "2.0.0",
-				"mkdirp": "0.5.1",
-				"slash": "2.0.0",
-				"source-map": "0.6.1"
+				"@jest/console": "^24.9.0",
+				"@jest/fake-timers": "^24.9.0",
+				"@jest/source-map": "^24.9.0",
+				"@jest/test-result": "^24.9.0",
+				"@jest/types": "^24.9.0",
+				"callsites": "^3.0.0",
+				"chalk": "^2.0.1",
+				"graceful-fs": "^4.1.15",
+				"is-ci": "^2.0.0",
+				"mkdirp": "^0.5.1",
+				"slash": "^2.0.0",
+				"source-map": "^0.6.0"
 			}
 		},
 		"jest-validate": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-24.8.0.tgz",
-			"integrity": "sha512-+/N7VOEMW1Vzsrk3UWBDYTExTPwf68tavEPKDnJzrC6UlHtUDU/fuEdXqFoHzv9XnQ+zW6X3qMZhJ3YexfeLDA==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz",
+			"integrity": "sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==",
 			"dev": true,
 			"requires": {
-				"@jest/types": "24.8.0",
-				"camelcase": "5.3.1",
-				"chalk": "2.4.2",
-				"jest-get-type": "24.8.0",
-				"leven": "2.1.0",
-				"pretty-format": "24.8.0"
+				"@jest/types": "^24.9.0",
+				"camelcase": "^5.3.1",
+				"chalk": "^2.0.1",
+				"jest-get-type": "^24.9.0",
+				"leven": "^3.1.0",
+				"pretty-format": "^24.9.0"
 			}
 		},
 		"jest-watcher": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-24.8.0.tgz",
-			"integrity": "sha512-SBjwHt5NedQoVu54M5GEx7cl7IGEFFznvd/HNT8ier7cCAx/Qgu9ZMlaTQkvK22G1YOpcWBLQPFSImmxdn3DAw==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-24.9.0.tgz",
+			"integrity": "sha512-+/fLOfKPXXYJDYlks62/4R4GoT+GU1tYZed99JSCOsmzkkF7727RqKrjNAxtfO4YpGv11wybgRvCjR73lK2GZw==",
 			"dev": true,
 			"requires": {
-				"@jest/test-result": "24.8.0",
-				"@jest/types": "24.8.0",
-				"@types/yargs": "12.0.12",
-				"ansi-escapes": "3.2.0",
-				"chalk": "2.4.2",
-				"jest-util": "24.8.0",
-				"string-length": "2.0.0"
+				"@jest/test-result": "^24.9.0",
+				"@jest/types": "^24.9.0",
+				"@types/yargs": "^13.0.0",
+				"ansi-escapes": "^3.0.0",
+				"chalk": "^2.0.1",
+				"jest-util": "^24.9.0",
+				"string-length": "^2.0.0"
 			}
 		},
 		"jest-worker": {
-			"version": "24.6.0",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.6.0.tgz",
-			"integrity": "sha512-jDwgW5W9qGNvpI1tNnvajh0a5IE/PuGLFmHk6aR/BZFz8tSgGw17GsDPXAJ6p91IvYDjOw8GpFbvvZGAK+DPQQ==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz",
+			"integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==",
 			"dev": true,
 			"requires": {
-				"merge-stream": "1.0.1",
-				"supports-color": "6.1.0"
+				"merge-stream": "^2.0.0",
+				"supports-color": "^6.1.0"
 			},
 			"dependencies": {
 				"supports-color": {
@@ -8520,7 +9007,7 @@
 					"integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
 					"dev": true,
 					"requires": {
-						"has-flag": "3.0.0"
+						"has-flag": "^3.0.0"
 					}
 				}
 			}
@@ -8676,32 +9163,32 @@
 			"integrity": "sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==",
 			"dev": true,
 			"requires": {
-				"abab": "2.0.0",
-				"acorn": "5.7.3",
-				"acorn-globals": "4.3.2",
-				"array-equal": "1.0.0",
-				"cssom": "0.3.8",
-				"cssstyle": "1.3.0",
-				"data-urls": "1.1.0",
-				"domexception": "1.0.1",
-				"escodegen": "1.11.1",
-				"html-encoding-sniffer": "1.0.2",
-				"left-pad": "1.3.0",
-				"nwsapi": "2.1.4",
+				"abab": "^2.0.0",
+				"acorn": "^5.5.3",
+				"acorn-globals": "^4.1.0",
+				"array-equal": "^1.0.0",
+				"cssom": ">= 0.3.2 < 0.4.0",
+				"cssstyle": "^1.0.0",
+				"data-urls": "^1.0.0",
+				"domexception": "^1.0.1",
+				"escodegen": "^1.9.1",
+				"html-encoding-sniffer": "^1.0.2",
+				"left-pad": "^1.3.0",
+				"nwsapi": "^2.0.7",
 				"parse5": "4.0.0",
-				"pn": "1.1.0",
-				"request": "2.88.0",
-				"request-promise-native": "1.0.7",
-				"sax": "1.2.4",
-				"symbol-tree": "3.2.4",
-				"tough-cookie": "2.5.0",
-				"w3c-hr-time": "1.0.1",
-				"webidl-conversions": "4.0.2",
-				"whatwg-encoding": "1.0.5",
-				"whatwg-mimetype": "2.3.0",
-				"whatwg-url": "6.5.0",
-				"ws": "5.2.2",
-				"xml-name-validator": "3.0.0"
+				"pn": "^1.1.0",
+				"request": "^2.87.0",
+				"request-promise-native": "^1.0.5",
+				"sax": "^1.2.4",
+				"symbol-tree": "^3.2.2",
+				"tough-cookie": "^2.3.4",
+				"w3c-hr-time": "^1.0.1",
+				"webidl-conversions": "^4.0.2",
+				"whatwg-encoding": "^1.0.3",
+				"whatwg-mimetype": "^2.1.0",
+				"whatwg-url": "^6.4.1",
+				"ws": "^5.2.0",
+				"xml-name-validator": "^3.0.0"
 			},
 			"dependencies": {
 				"acorn": {
@@ -8824,9 +9311,9 @@
 			"dev": true
 		},
 		"leven": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz",
-			"integrity": "sha1-wuep93IJTe6dNCAq6KzORoeHVYA=",
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+			"integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
 			"dev": true
 		},
 		"levn": {
@@ -8857,6 +9344,11 @@
 				"react-dom": "16.8.6"
 			}
 		},
+		"livereload-js": {
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.4.0.tgz",
+			"integrity": "sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw=="
+		},
 		"load-json-file": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
@@ -9114,6 +9606,14 @@
 				"yallist": "2.1.2"
 			}
 		},
+		"lru-queue": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
+			"integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
+			"requires": {
+				"es5-ext": "~0.10.2"
+			}
+		},
 		"make-dir": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
@@ -9124,6 +9624,19 @@
 				"semver": "5.7.0"
 			}
 		},
+		"make-error": {
+			"version": "1.3.5",
+			"resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz",
+			"integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g=="
+		},
+		"make-error-cause": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/make-error-cause/-/make-error-cause-1.2.2.tgz",
+			"integrity": "sha1-3wOI/NCzeBbf8KX7gQiTl3fcvJ0=",
+			"requires": {
+				"make-error": "^1.2.0"
+			}
+		},
 		"makeerror": {
 			"version": "1.0.11",
 			"resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
@@ -9159,6 +9672,11 @@
 			"integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
 			"dev": true
 		},
+		"map-stream": {
+			"version": "0.0.7",
+			"resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
+			"integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg="
+		},
 		"map-visit": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
@@ -9295,6 +9813,21 @@
 				"p-is-promise": "2.1.0"
 			}
 		},
+		"memoizee": {
+			"version": "0.4.14",
+			"resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz",
+			"integrity": "sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==",
+			"requires": {
+				"d": "1",
+				"es5-ext": "^0.10.45",
+				"es6-weak-map": "^2.0.2",
+				"event-emitter": "^0.3.5",
+				"is-promise": "^2.1",
+				"lru-queue": "0.1",
+				"next-tick": "1",
+				"timers-ext": "^0.1.5"
+			}
+		},
 		"memory-fs": {
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
@@ -9455,39 +9988,10 @@
 			}
 		},
 		"merge-stream": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
-			"integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
-			"dev": true,
-			"requires": {
-				"readable-stream": "2.3.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.2",
-						"inherits": "2.0.4",
-						"isarray": "1.0.0",
-						"process-nextick-args": "2.0.1",
-						"safe-buffer": "5.1.2",
-						"string_decoder": "1.1.1",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"string_decoder": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "5.1.2"
-					}
-				}
-			}
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+			"integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+			"dev": true
 		},
 		"micromatch": {
 			"version": "4.0.2",
@@ -9508,17 +10012,20 @@
 				"brorand": "^1.0.1"
 			}
 		},
+		"mime": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+			"integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
+		},
 		"mime-db": {
 			"version": "1.40.0",
 			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
-			"integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==",
-			"dev": true
+			"integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
 		},
 		"mime-types": {
 			"version": "2.1.24",
 			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
 			"integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
-			"dev": true,
 			"requires": {
 				"mime-db": "1.40.0"
 			}
@@ -9622,6 +10129,22 @@
 			"resolved": "https://registry.npmjs.org/mkdirp2/-/mkdirp2-1.0.4.tgz",
 			"integrity": "sha512-Q2PKB4ZR4UPtjLl76JfzlgSCUZhSV1AXQgAZa1qt5RiaALFjP/CDrGvFBrOz7Ck6McPcwMAxTsJvWOUjOU8XMw=="
 		},
+		"mold-source-map": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/mold-source-map/-/mold-source-map-0.4.0.tgz",
+			"integrity": "sha1-z2fgsxxHq5uttcnCVlGGISe7gxc=",
+			"requires": {
+				"convert-source-map": "^1.1.0",
+				"through": "~2.2.7"
+			},
+			"dependencies": {
+				"through": {
+					"version": "2.2.7",
+					"resolved": "https://registry.npmjs.org/through/-/through-2.2.7.tgz",
+					"integrity": "sha1-bo4hIAGR1OtqmfbwEN9Gqhxusr0="
+				}
+			}
+		},
 		"move-concurrently": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
@@ -9678,11 +10201,21 @@
 			"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
 			"dev": true
 		},
+		"negotiator": {
+			"version": "0.6.2",
+			"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
+			"integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
+		},
 		"neo-async": {
 			"version": "2.6.1",
 			"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
 			"integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="
 		},
+		"next-tick": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+			"integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw="
+		},
 		"nextcloud-axios": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/nextcloud-axios/-/nextcloud-axios-0.2.0.tgz",
@@ -9851,16 +10384,16 @@
 			"dev": true
 		},
 		"node-notifier": {
-			"version": "5.4.0",
-			"resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.0.tgz",
-			"integrity": "sha512-SUDEb+o71XR5lXSTyivXd9J7fCloE3SyP4lSgt3lU2oSANiox+SxlNRGPjDKrwU1YN3ix2KN/VGGCg0t01rttQ==",
+			"version": "5.4.3",
+			"resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.3.tgz",
+			"integrity": "sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==",
 			"dev": true,
 			"requires": {
-				"growly": "1.3.0",
-				"is-wsl": "1.1.0",
-				"semver": "5.7.0",
-				"shellwords": "0.1.1",
-				"which": "1.3.1"
+				"growly": "^1.3.0",
+				"is-wsl": "^1.1.0",
+				"semver": "^5.5.0",
+				"shellwords": "^0.1.1",
+				"which": "^1.3.0"
 			}
 		},
 		"node-releases": {
@@ -9975,7 +10508,6 @@
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
 			"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-			"dev": true,
 			"requires": {
 				"remove-trailing-separator": "1.1.0"
 			}
@@ -10181,6 +10713,14 @@
 				"has": "1.0.3"
 			}
 		},
+		"on-finished": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+			"integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+			"requires": {
+				"ee-first": "1.1.1"
+			}
+		},
 		"once": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -10286,7 +10826,7 @@
 			"integrity": "sha1-kw89Et0fUOdDRFeiLNbwSsatf3E=",
 			"dev": true,
 			"requires": {
-				"p-reduce": "1.0.0"
+				"p-reduce": "^1.0.0"
 			}
 		},
 		"p-finally": {
@@ -10432,6 +10972,11 @@
 				"json-parse-better-errors": "1.0.2"
 			}
 		},
+		"parse-node-version": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
+			"integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA=="
+		},
 		"parse-passwd": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
@@ -10446,6 +10991,11 @@
 				"@types/node": "12.6.2"
 			}
 		},
+		"parseurl": {
+			"version": "1.3.3",
+			"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+			"integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
+		},
 		"pascalcase": {
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
@@ -10773,7 +11323,7 @@
 			"integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
 			"dev": true,
 			"requires": {
-				"postcss": "7.0.17"
+				"postcss": "^7.0.5"
 			}
 		},
 		"postcss-modules-local-by-default": {
@@ -10782,10 +11332,10 @@
 			"integrity": "sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ==",
 			"dev": true,
 			"requires": {
-				"icss-utils": "4.1.1",
-				"postcss": "7.0.17",
-				"postcss-selector-parser": "6.0.2",
-				"postcss-value-parser": "4.0.0"
+				"icss-utils": "^4.1.1",
+				"postcss": "^7.0.16",
+				"postcss-selector-parser": "^6.0.2",
+				"postcss-value-parser": "^4.0.0"
 			}
 		},
 		"postcss-modules-scope": {
@@ -10794,8 +11344,8 @@
 			"integrity": "sha512-91Rjps0JnmtUB0cujlc8KIKCsJXWjzuxGeT/+Q2i2HXKZ7nBUeF9YQTZZTNvHVoNYj1AthsjnGLtqDUE0Op79A==",
 			"dev": true,
 			"requires": {
-				"postcss": "7.0.17",
-				"postcss-selector-parser": "6.0.2"
+				"postcss": "^7.0.6",
+				"postcss-selector-parser": "^6.0.0"
 			}
 		},
 		"postcss-modules-values": {
@@ -10804,8 +11354,8 @@
 			"integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==",
 			"dev": true,
 			"requires": {
-				"icss-utils": "4.1.1",
-				"postcss": "7.0.17"
+				"icss-utils": "^4.0.0",
+				"postcss": "^7.0.6"
 			}
 		},
 		"postcss-reporter": {
@@ -10912,15 +11462,15 @@
 			"integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==",
 			"dev": true,
 			"requires": {
-				"cssesc": "3.0.0",
-				"indexes-of": "1.0.1",
-				"uniq": "1.0.1"
+				"cssesc": "^3.0.0",
+				"indexes-of": "^1.0.1",
+				"uniq": "^1.0.1"
 			}
 		},
 		"postcss-value-parser": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.0.tgz",
-			"integrity": "sha512-ESPktioptiSUchCKgggAkzdmkgzKfmp0EU8jXH+5kbIUB+unr0Y4CY9SRMvibuvYUBjNh1ACLbxqYNpdTQOteQ==",
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz",
+			"integrity": "sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==",
 			"dev": true
 		},
 		"prelude-ls": {
@@ -11029,15 +11579,15 @@
 			}
 		},
 		"pretty-format": {
-			"version": "24.8.0",
-			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.8.0.tgz",
-			"integrity": "sha512-P952T7dkrDEplsR+TuY7q3VXDae5Sr7zmQb12JU/NDQa/3CH7/QW0yvqLcGN6jL+zQFKaoJcPc+yJxMTGmosqw==",
+			"version": "24.9.0",
+			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
+			"integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
 			"dev": true,
 			"requires": {
-				"@jest/types": "24.8.0",
-				"ansi-regex": "4.1.0",
-				"ansi-styles": "3.2.1",
-				"react-is": "16.8.6"
+				"@jest/types": "^24.9.0",
+				"ansi-regex": "^4.0.0",
+				"ansi-styles": "^3.2.0",
+				"react-is": "^16.8.4"
 			}
 		},
 		"private": {
@@ -11055,8 +11605,7 @@
 		"process-nextick-args": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-			"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-			"dev": true
+			"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
 		},
 		"progress": {
 			"version": "2.0.3",
@@ -11071,13 +11620,13 @@
 			"dev": true
 		},
 		"prompts": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/prompts/-/prompts-2.1.0.tgz",
-			"integrity": "sha512-+x5TozgqYdOwWsQFZizE/Tra3fKvAoy037kOyU6cgz84n8f6zxngLOV4O32kTwt9FcLCxAqw0P/c8rOr9y+Gfg==",
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/prompts/-/prompts-2.2.1.tgz",
+			"integrity": "sha512-VObPvJiWPhpZI6C5m60XOzTfnYg/xc/an+r9VYymj9WJW3B/DIH+REzjpAACPf8brwPeP+7vz3bIim3S+AaMjw==",
 			"dev": true,
 			"requires": {
-				"kleur": "3.0.3",
-				"sisteransi": "1.0.2"
+				"kleur": "^3.0.3",
+				"sisteransi": "^1.0.3"
 			}
 		},
 		"prop-types": {
@@ -11170,8 +11719,7 @@
 		"qs": {
 			"version": "6.5.2",
 			"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-			"integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-			"dev": true
+			"integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
 		},
 		"querystring": {
 			"version": "0.2.0",
@@ -11235,6 +11783,27 @@
 				"safe-buffer": "^5.1.0"
 			}
 		},
+		"range-parser": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+			"integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
+		},
+		"raw-body": {
+			"version": "1.1.7",
+			"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz",
+			"integrity": "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=",
+			"requires": {
+				"bytes": "1",
+				"string_decoder": "0.10"
+			},
+			"dependencies": {
+				"string_decoder": {
+					"version": "0.10.31",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
+				}
+			}
+		},
 		"raw-loader": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-3.1.0.tgz",
@@ -11700,8 +12269,7 @@
 		"remove-trailing-separator": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-			"integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-			"dev": true
+			"integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
 		},
 		"repeat-element": {
 			"version": "1.1.3",
@@ -11780,7 +12348,7 @@
 			"integrity": "sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==",
 			"dev": true,
 			"requires": {
-				"lodash": "4.17.14"
+				"lodash": "^4.17.11"
 			}
 		},
 		"request-promise-native": {
@@ -11790,8 +12358,8 @@
 			"dev": true,
 			"requires": {
 				"request-promise-core": "1.1.2",
-				"stealthy-require": "1.1.1",
-				"tough-cookie": "2.5.0"
+				"stealthy-require": "^1.1.1",
+				"tough-cookie": "^2.3.3"
 			}
 		},
 		"require-directory": {
@@ -11882,8 +12450,7 @@
 		"resolve-url": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-			"integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-			"dev": true
+			"integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
 		},
 		"restore-cursor": {
 			"version": "2.0.0",
@@ -11957,6 +12524,11 @@
 			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
 			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
 		},
+		"safe-json-parse": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-1.0.1.tgz",
+			"integrity": "sha1-PnZyPjjf3aE8mx0poeB//uSzC1c="
+		},
 		"safe-regex": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
@@ -12383,9 +12955,9 @@
 			"integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
 			"dev": true,
 			"requires": {
-				"ajv": "6.10.2",
-				"ajv-errors": "1.0.1",
-				"ajv-keywords": "3.4.1"
+				"ajv": "^6.1.0",
+				"ajv-errors": "^1.0.0",
+				"ajv-keywords": "^3.1.0"
 			}
 		},
 		"scss-tokenizer": {
@@ -12414,12 +12986,146 @@
 			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
 			"integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
 		},
+		"send": {
+			"version": "0.16.2",
+			"resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
+			"integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+			"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": {
+				"debug": {
+					"version": "2.6.9",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
+				"statuses": {
+					"version": "1.4.0",
+					"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
+					"integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="
+				}
+			}
+		},
 		"serialize-javascript": {
 			"version": "1.7.0",
 			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.7.0.tgz",
 			"integrity": "sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==",
 			"dev": true
 		},
+		"serve-index": {
+			"version": "1.9.1",
+			"resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+			"integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
+			"requires": {
+				"accepts": "~1.3.4",
+				"batch": "0.6.1",
+				"debug": "2.6.9",
+				"escape-html": "~1.0.3",
+				"http-errors": "~1.6.2",
+				"mime-types": "~2.1.17",
+				"parseurl": "~1.3.2"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "2.6.9",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+					"requires": {
+						"ms": "2.0.0"
+					}
+				}
+			}
+		},
+		"serve-static": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
+			"integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+			"requires": {
+				"encodeurl": "~1.0.2",
+				"escape-html": "~1.0.3",
+				"parseurl": "~1.3.3",
+				"send": "0.17.1"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "2.6.9",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+					"requires": {
+						"ms": "2.0.0"
+					},
+					"dependencies": {
+						"ms": {
+							"version": "2.0.0",
+							"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+							"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+						}
+					}
+				},
+				"http-errors": {
+					"version": "1.7.3",
+					"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
+					"integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==",
+					"requires": {
+						"depd": "~1.1.2",
+						"inherits": "2.0.4",
+						"setprototypeof": "1.1.1",
+						"statuses": ">= 1.5.0 < 2",
+						"toidentifier": "1.0.0"
+					}
+				},
+				"mime": {
+					"version": "1.6.0",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+					"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
+				},
+				"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=="
+				},
+				"send": {
+					"version": "0.17.1",
+					"resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
+					"integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+					"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.7.2",
+						"mime": "1.6.0",
+						"ms": "2.1.1",
+						"on-finished": "~2.3.0",
+						"range-parser": "~1.2.1",
+						"statuses": "~1.5.0"
+					}
+				},
+				"setprototypeof": {
+					"version": "1.1.1",
+					"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+					"integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
+				}
+			}
+		},
 		"set-blocking": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
@@ -12454,6 +13160,11 @@
 			"integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
 			"dev": true
 		},
+		"setprototypeof": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+			"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
+		},
 		"sha.js": {
 			"version": "2.4.11",
 			"resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
@@ -12504,9 +13215,9 @@
 			"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
 		},
 		"sisteransi": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.2.tgz",
-			"integrity": "sha512-ZcYcZcT69nSLAR2oLN2JwNmLkJEKGooFMCdvOkFrToUt/WfcRWqhIg4P4KwY4dmLbuyXIx4o4YmPsvMRJYJd/w==",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.3.tgz",
+			"integrity": "sha512-SbEG75TzH8G7eVXFSN5f9EExILKfly7SUvVY5DhhYLvfhKqhDFY0OzevWa/zwak0RLRfWS5AvfMWpd9gJvr5Yg==",
 			"dev": true
 		},
 		"slash": {
@@ -12689,7 +13400,6 @@
 			"version": "0.5.2",
 			"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
 			"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-			"dev": true,
 			"requires": {
 				"atob": "2.1.2",
 				"decode-uri-component": "0.2.0",
@@ -12711,8 +13421,12 @@
 		"source-map-url": {
 			"version": "0.4.0",
 			"resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
-			"integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
-			"dev": true
+			"integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM="
+		},
+		"sparkles": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
+			"integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw=="
 		},
 		"spdx-correct": {
 			"version": "3.1.0",
@@ -12824,6 +13538,11 @@
 				}
 			}
 		},
+		"statuses": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+			"integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
+		},
 		"stdout-stream": {
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
@@ -12985,8 +13704,8 @@
 			"integrity": "sha1-1A27aGo6zpYMHP/KVivyxF+DY+0=",
 			"dev": true,
 			"requires": {
-				"astral-regex": "1.0.0",
-				"strip-ansi": "4.0.0"
+				"astral-regex": "^1.0.0",
+				"strip-ansi": "^4.0.0"
 			},
 			"dependencies": {
 				"ansi-regex": {
@@ -13001,11 +13720,16 @@
 					"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
 					"dev": true,
 					"requires": {
-						"ansi-regex": "3.0.0"
+						"ansi-regex": "^3.0.0"
 					}
 				}
 			}
 		},
+		"string-template": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz",
+			"integrity": "sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0="
+		},
 		"string-width": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -13049,6 +13773,11 @@
 			"integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
 			"dev": true
 		},
+		"strip-bom-string": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz",
+			"integrity": "sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI="
+		},
 		"strip-eof": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
@@ -13725,9 +14454,9 @@
 			"integrity": "sha1-JLFUOXOrRCiW2a02fdnL2/r+kYs="
 		},
 		"terser": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/terser/-/terser-4.1.2.tgz",
-			"integrity": "sha512-jvNoEQSPXJdssFwqPSgWjsOrb+ELoE+ILpHPKXC83tIxOlh2U75F1KuB2luLD/3a6/7K3Vw5pDn+hvu0C4AzSw==",
+			"version": "4.1.4",
+			"resolved": "https://registry.npmjs.org/terser/-/terser-4.1.4.tgz",
+			"integrity": "sha512-+ZwXJvdSwbd60jG0Illav0F06GDJF0R4ydZ21Q3wGAFKoBGyJGo34F63vzJHgvYxc1ukOtIjvwEvl9MkjzM6Pg==",
 			"dev": true,
 			"requires": {
 				"commander": "^2.20.0",
@@ -13805,7 +14534,6 @@
 			"version": "2.0.5",
 			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
 			"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-			"dev": true,
 			"requires": {
 				"readable-stream": "~2.3.6",
 				"xtend": "~4.0.1"
@@ -13815,7 +14543,6 @@
 					"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",
@@ -13830,22 +14557,48 @@
 					"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"
 					}
 				}
 			}
 		},
+		"time-stamp": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
+			"integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM="
+		},
 		"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==",
+			"version": "2.0.11",
+			"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
+			"integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
 			"dev": true,
 			"requires": {
 				"setimmediate": "^1.0.4"
 			}
 		},
+		"timers-ext": {
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
+			"integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
+			"requires": {
+				"es5-ext": "~0.10.46",
+				"next-tick": "1"
+			}
+		},
+		"tiny-lr": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz",
+			"integrity": "sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==",
+			"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"
+			}
+		},
 		"tmp": {
 			"version": "0.0.33",
 			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@@ -13919,14 +14672,19 @@
 				"is-number": "7.0.0"
 			}
 		},
+		"toidentifier": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+			"integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
+		},
 		"tough-cookie": {
 			"version": "2.5.0",
 			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
 			"integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
 			"dev": true,
 			"requires": {
-				"psl": "1.2.0",
-				"punycode": "2.1.1"
+				"psl": "^1.1.28",
+				"punycode": "^2.1.1"
 			}
 		},
 		"tr46": {
@@ -13935,7 +14693,7 @@
 			"integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
 			"dev": true,
 			"requires": {
-				"punycode": "2.1.1"
+				"punycode": "^2.1.0"
 			}
 		},
 		"traverse": {
@@ -13944,9 +14702,16 @@
 			"integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc="
 		},
 		"tributejs": {
-			"version": "3.7.1",
-			"resolved": "https://registry.npmjs.org/tributejs/-/tributejs-3.7.1.tgz",
-			"integrity": "sha512-GsRnD7w7u4BgrzYm/9ZskuVpVTVtY83WrLA5PtBl2oOYTQFGVVVHS7vAGwgmO0iStXzEa6LlVUiB4dsEUYo2ug=="
+			"version": "3.7.2",
+			"resolved": "https://registry.npmjs.org/tributejs/-/tributejs-3.7.2.tgz",
+			"integrity": "sha512-UDEKYW/G9AtROvk0aTnhO4L4JtHJUZXDKmD2SD3GTqCa/Z5Czw5gSbEKWQeYJ1Iof0VWdaD35K2bHxz2xePtww==",
+			"requires": {
+				"exorcist": "^1.0.1",
+				"gulp-connect": "^5.7.0",
+				"gulp-rename": "^1.4.0",
+				"gulp-sourcemaps": "^2.6.5",
+				"gulp-uglify": "^3.0.2"
+			}
 		},
 		"trim": {
 			"version": "0.0.1",
@@ -14046,6 +14811,11 @@
 				}
 			}
 		},
+		"type": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/type/-/type-1.0.1.tgz",
+			"integrity": "sha512-MAM5dBMJCJNKs9E7JXo4CXRAansRfG0nlJxW7Wf6GZzSOvH31zClSaHdIMWLehe/EGMBkqeC55rrkaOr5Oo7Nw=="
+		},
 		"type-check": {
 			"version": "0.3.2",
 			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
@@ -14081,7 +14851,6 @@
 			"version": "3.6.0",
 			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz",
 			"integrity": "sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==",
-			"optional": true,
 			"requires": {
 				"commander": "2.20.0",
 				"source-map": "0.6.1"
@@ -14221,6 +14990,11 @@
 				"unist-util-is": "3.0.0"
 			}
 		},
+		"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",
@@ -14279,8 +15053,7 @@
 		"urix": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-			"integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-			"dev": true
+			"integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
 		},
 		"url": {
 			"version": "0.11.0",
@@ -14338,6 +15111,11 @@
 				"object.getownpropertydescriptors": "2.0.3"
 			}
 		},
+		"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",
@@ -14410,6 +15188,21 @@
 				"unist-util-stringify-position": "1.1.2"
 			}
 		},
+		"vinyl-sourcemaps-apply": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz",
+			"integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=",
+			"requires": {
+				"source-map": "^0.5.1"
+			},
+			"dependencies": {
+				"source-map": {
+					"version": "0.5.7",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+				}
+			}
+		},
 		"vm-browserify": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz",
@@ -14566,9 +15359,9 @@
 			"integrity": "sha512-bhP7MlgJQ8TIkZJXAfDf78uJO+mEI3CaLABLjv0WNzr4CcGRGPIAItyWYnP6LsPA4Oq0WE+suidNs6dgpO4RHg=="
 		},
 		"vue-router": {
-			"version": "3.0.7",
-			"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.0.7.tgz",
-			"integrity": "sha512-utJ+QR3YlIC/6x6xq17UMXeAfxEvXA0VKD3PiSio7hBOZNusA1jXcbxZxVEfJunLp48oonjTepY8ORoIlRx/EQ=="
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.2.tgz",
+			"integrity": "sha512-WssQEHSEvIS1/CI4CO2T8LJdoK4Q9Ngox28K7FDNMTfzNTk2WS5D0dDlqYCaPG+AG4Z8wJkn1KrBc7AhspZJUQ=="
 		},
 		"vue-style-loader": {
 			"version": "4.1.2",
@@ -14659,7 +15452,7 @@
 			"integrity": "sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=",
 			"dev": true,
 			"requires": {
-				"browser-process-hrtime": "0.1.3"
+				"browser-process-hrtime": "^0.1.2"
 			}
 		},
 		"walk-back": {
@@ -14694,9 +15487,9 @@
 			"dev": true
 		},
 		"webpack": {
-			"version": "4.39.1",
-			"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.39.1.tgz",
-			"integrity": "sha512-/LAb2TJ2z+eVwisldp3dqTEoNhzp/TLCZlmZm3GGGAlnfIWDgOEE758j/9atklNLfRyhKbZTCOIoPqLJXeBLbQ==",
+			"version": "4.39.2",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.39.2.tgz",
+			"integrity": "sha512-AKgTfz3xPSsEibH00JfZ9sHXGUwIQ6eZ9tLN8+VLzachk1Cw2LVmy+4R7ZiwTa9cZZ15tzySjeMui/UnSCAZhA==",
 			"dev": true,
 			"requires": {
 				"@webassemblyjs/ast": "1.8.5",
@@ -14724,12 +15517,6 @@
 				"webpack-sources": "^1.4.1"
 			},
 			"dependencies": {
-				"acorn": {
-					"version": "6.2.1",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.1.tgz",
-					"integrity": "sha512-JD0xT5FCRDNyjDda3Lrg/IxFscp9q4tiYtxE1/nOzlKCk7hIRuYjhq1kCNkbPjMRMZuFq20HNQn1I9k8Oj0E+Q==",
-					"dev": true
-				},
 				"braces": {
 					"version": "2.3.2",
 					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
@@ -14891,15 +15678,30 @@
 			}
 		},
 		"webpack-sources": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.1.tgz",
-			"integrity": "sha512-XSz38193PTo/1csJabKaV4b53uRVotlMgqJXm3s3eje0Bu6gQTxYDqpD38CmQfDBA+gN+QqaGjasuC8I/7eW3Q==",
+			"version": "1.4.3",
+			"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+			"integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
 			"dev": true,
 			"requires": {
 				"source-list-map": "^2.0.0",
 				"source-map": "~0.6.1"
 			}
 		},
+		"websocket-driver": {
+			"version": "0.7.3",
+			"resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz",
+			"integrity": "sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==",
+			"requires": {
+				"http-parser-js": ">=0.4.0 <0.4.11",
+				"safe-buffer": ">=5.1.0",
+				"websocket-extensions": ">=0.1.1"
+			}
+		},
+		"websocket-extensions": {
+			"version": "0.1.3",
+			"resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
+			"integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg=="
+		},
 		"whatwg-encoding": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
@@ -14921,9 +15723,9 @@
 			"integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
 			"dev": true,
 			"requires": {
-				"lodash.sortby": "4.7.0",
-				"tr46": "1.0.1",
-				"webidl-conversions": "4.0.2"
+				"lodash.sortby": "^4.7.0",
+				"tr46": "^1.0.1",
+				"webidl-conversions": "^4.0.2"
 			}
 		},
 		"which": {
@@ -15039,7 +15841,7 @@
 			"integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
 			"dev": true,
 			"requires": {
-				"async-limiter": "1.0.0"
+				"async-limiter": "~1.0.0"
 			}
 		},
 		"x-is-string": {
diff --git a/package.json b/package.json
index 48dcae9a..99cbe77d 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
 		"linkifyjs": "^2.1.8",
 		"nextcloud-axios": "^0.2.0",
 		"nextcloud-vue": "^0.11.4",
-		"tributejs": "^3.7.1",
+		"tributejs": "^3.7.2",
 		"twemoji": "^12.0.1",
 		"uuid": "^3.3.2",
 		"v-tooltip": "^3.0.0-alpha.11",
@@ -40,7 +40,7 @@
 		"vue-contenteditable-directive": "^1.2.0",
 		"vue-emoji-picker": "^1.0.1",
 		"vue-infinite-loading": "^2.4.4",
-		"vue-router": "^3.0.7",
+		"vue-router": "^3.1.2",
 		"vue-tribute": "^1.0.3",
 		"vue-twemoji": "^1.0.1",
 		"vuex": "^3.1.1",
@@ -59,11 +59,11 @@
 		"@babel/plugin-syntax-dynamic-import": "^7.2.0",
 		"@babel/preset-env": "^7.5.5",
 		"@vue/test-utils": "^1.0.0-beta.29",
-		"acorn": "^6.2.1",
+		"acorn": "^6.3.0",
 		"babel-eslint": "^10.0.2",
-		"babel-jest": "^24.8.0",
+		"babel-jest": "^24.9.0",
 		"babel-loader": "^8.0.6",
-		"css-loader": "^3.1.0",
+		"css-loader": "^3.2.0",
 		"eslint": "^5.16.0",
 		"eslint-config-standard": "^12.0.0",
 		"eslint-friendly-formatter": "^4.0.1",
@@ -73,8 +73,8 @@
 		"eslint-plugin-promise": "^4.2.1",
 		"eslint-plugin-standard": "^4.0.0",
 		"eslint-plugin-vue": "^5.2.3",
-		"file-loader": "^4.1.0",
-		"jest": "^24.8.0",
+		"file-loader": "^4.2.0",
+		"jest": "^24.9.0",
 		"jest-serializer-vue": "^2.0.2",
 		"node-sass": "^4.12.0",
 		"prettier-eslint": "^9.0.0",
@@ -87,7 +87,7 @@
 		"vue-loader": "^15.7.1",
 		"vue-style-loader": "^4.1.1",
 		"vue-template-compiler": "^2.6.10",
-		"webpack": "^4.39.1",
+		"webpack": "^4.39.2",
 		"webpack-cli": "^3.3.6",
 		"webpack-merge": "^4.2.1"
 	},
diff --git a/src/App.vue b/src/App.vue
index ea008365..e0198c44 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -210,6 +210,9 @@ export default {
 			this.$store.dispatch('fetchCurrentAccountInfo', this.cloudId)
 		}
 
+		if (OCA.Push && OCA.Push.isEnabled()) {
+			OCA.Push.addCallback(this.fromPushApp, 'social')
+		}
 	},
 	methods: {
 		hideInfo() {
@@ -226,6 +229,22 @@ export default {
 		},
 		resetSearch() {
 			this.searchTerm = ''
+		},
+		fromPushApp: function(data) {
+			// FIXME: might be better to use Timeline.type() ?
+			let timeline = 'home'
+			if (this.$route.name === 'tags') {
+				timeline = 'tags'
+			} else if (this.$route.params.type) {
+				timeline = this.$route.params.type
+			}
+
+			if (data.source === 'timeline.home' && timeline === 'home') {
+				this.$store.dispatch('addToTimeline', [data.payload])
+			}
+			if (data.source === 'timeline.direct' && timeline === 'direct') {
+				this.$store.dispatch('addToTimeline', [data.payload])
+			}
 		}
 	}
 }
diff --git a/src/components/Composer.vue b/src/components/Composer.vue
index c5bfab8a..9cbb85d2 100644
--- a/src/components/Composer.vue
+++ b/src/components/Composer.vue
@@ -323,11 +323,6 @@
 		vertical-align: middle;
 		margin-top: -1px;
 	}
-	img.emoji {
-		margin: 3px;
-		width: 16px;
-		vertical-align: text-bottom;
-	}
 	.hashtag {
 		text-decoration: underline;
 	}
diff --git a/src/components/TimelinePost.vue b/src/components/TimelinePost.vue
index afa8bb5a..16461dbf 100644
--- a/src/components/TimelinePost.vue
+++ b/src/components/TimelinePost.vue
@@ -7,20 +7,25 @@
 				:disable-tooltip="true" />
 		</div>
 		<div class="post-content">
-			<div class="post-author-wrapper">
-				<router-link v-if="item.actor_info" :to="{ name: 'profile', params: { account: item.local ? item.actor_info.preferredUsername : item.actor_info.account }}">
-					<span class="post-author">
-						{{ userDisplayName(item.actor_info) }}
-					</span>
-					<span class="post-author-id">
-						@{{ item.actor_info.account }}
-					</span>
-				</router-link>
-				<a v-else :href="item.attributedTo">
-					<span class="post-author-id">
-						{{ item.attributedTo }}
-					</span>
-				</a>
+			<div class="post-header">
+				<div class="post-author-wrapper">
+					<router-link v-if="item.actor_info" :to="{ name: 'profile', params: { account: item.local ? item.actor_info.preferredUsername : item.actor_info.account }}">
+						<span class="post-author">
+							{{ userDisplayName(item.actor_info) }}
+						</span>
+						<span class="post-author-id">
+							@{{ item.actor_info.account }}
+						</span>
+					</router-link>
+					<a v-else :href="item.attributedTo">
+						<span class="post-author-id">
+							{{ item.attributedTo }}
+						</span>
+					</a>
+				</div>
+				<div :data-timestamp="timestamp" class="post-timestamp live-relative-timestamp">
+					{{ relativeTimestamp }}
+				</div>
 			</div>
 			<!-- eslint-disable-next-line vue/no-v-html -->
 			<div class="post-message" v-html="formatedMessage" />
@@ -41,11 +46,6 @@
 				</div>
 			</div>
 		</div>
-		<div>
-			<div :data-timestamp="timestamp" class="post-timestamp live-relative-timestamp">
-				{{ relativeTimestamp }}
-			</div>
-		</div>
 	</div>
 </template>
 
@@ -246,6 +246,12 @@ export default {
 		flex-grow: 1;
 	}
 
+	.post-header {
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+	}
+
 	.post-timestamp {
 		opacity: .7;
 	}
diff --git a/src/store/timeline.js b/src/store/timeline.js
index 72c29677..f140da91 100644
--- a/src/store/timeline.js
+++ b/src/store/timeline.js
@@ -199,6 +199,9 @@ const actions = {
 			context.commit('addToTimeline', response.data.result)
 			return response.data
 		})
+	},
+	addToTimeline(context, data) {
+		context.commit('addToTimeline', data)
 	}
 }