diff --git a/.gitignore b/.gitignore
index 0e550acbbb..b8dc2b176e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,7 +23,6 @@ speed-measure-plugin.json
 *.launch
 .settings/
 *.sublime-workspace
-.history/*
 
 # IDE - VSCode
 .vscode/*
@@ -31,6 +30,7 @@ speed-measure-plugin.json
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
+.history/*
 
 # misc
 /.sass-cache
@@ -39,13 +39,13 @@ speed-measure-plugin.json
 /typings
 
 # logs
-logs
 *.log
+logs
 npm-debug.log*
+testem.log
 yarn-debug.log*
 yarn-error.log*
 /libpeerconnection.log
-testem.log
 
 # e2e
 /e2e/*.js
diff --git a/.travis.yml b/.travis.yml
index 1254ad8058..7352f80905 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ cache:
 before_install:
     # install custom version of yarn & export executable
     # see https://yarnpkg.com/en/docs/install-ci#travis-tab
-    - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.15.2
+    - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.16.0
     - export PATH=$HOME/.yarn/bin:$PATH
 
 install:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c00114588..c84b64fe83 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,101 @@
-# Change Log
+# Changelog
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [0.6.0](https://github.com/webern-unibas-ch/awg-app/compare/v0.5.4...v0.6.0) (2019-07-19)
+
+### Bug Fixes
+
+-   **app:** add 404 fallback route ([c0ade9b](https://github.com/webern-unibas-ch/awg-app/commit/c0ade9b))
+-   **app:** fix errors after update to Angular 8 ([2771649](https://github.com/webern-unibas-ch/awg-app/commit/2771649))
+-   **app:** get correct section of meta data for remaining views ([80bbe10](https://github.com/webern-unibas-ch/awg-app/commit/80bbe10))
+-   **app:** patch issue with CustomHammerConfig of ngx-gallery ([cb1a0d4](https://github.com/webern-unibas-ch/awg-app/commit/cb1a0d4))
+-   **app:** remove temporary workaround with static ngInjectableDef ([962ffeb](https://github.com/webern-unibas-ch/awg-app/commit/962ffeb))
+-   **app:** use onPush CD strategy on dumb components if possible ([f42f706](https://github.com/webern-unibas-ch/awg-app/commit/f42f706)), closes [#2](https://github.com/webern-unibas-ch/awg-app/issues/2)
+-   **contact:** get correct section of meta data for contact view ([5d5a754](https://github.com/webern-unibas-ch/awg-app/commit/5d5a754))
+-   **core:** fix missing space in copyright desc ([17f0865](https://github.com/webern-unibas-ch/awg-app/commit/17f0865))
+-   **core:** fix visibility of centered navbar-brand ([c879bec](https://github.com/webern-unibas-ch/awg-app/commit/c879bec))
+-   **core:** get only page meta data for footer and navbar ([2f51775](https://github.com/webern-unibas-ch/awg-app/commit/2f51775))
+-   **core:** use better default values for clearing subjects ([9f65f13](https://github.com/webern-unibas-ch/awg-app/commit/9f65f13))
+-   **core:** use MetaPerson class for authors and editors ([ff7df06](https://github.com/webern-unibas-ch/awg-app/commit/ff7df06))
+-   **edition:** remove unnecessary toggle methods ([7f4b303](https://github.com/webern-unibas-ch/awg-app/commit/7f4b303))
+-   **edition:** return only first emit of EditionDataService observables ([6e02f0b](https://github.com/webern-unibas-ch/awg-app/commit/6e02f0b))
+-   **edition:** use async pipe for data in report component ([075a97e](https://github.com/webern-unibas-ch/awg-app/commit/075a97e))
+-   **edition:** use CDS.onPush for report component's children ([a31483d](https://github.com/webern-unibas-ch/awg-app/commit/a31483d))
+-   **search:** add bottom pagination in search result list ([6668f87](https://github.com/webern-unibas-ch/awg-app/commit/6668f87))
+-   **search:** avoid bindings to pass static strings to native attributes ([945e259](https://github.com/webern-unibas-ch/awg-app/commit/945e259))
+-   **search:** change snapshot path to get current url in search overview ([46995ff](https://github.com/webern-unibas-ch/awg-app/commit/46995ff))
+-   **search:** clear search info on destroy of SearchResultListComponent ([c9ef240](https://github.com/webern-unibas-ch/awg-app/commit/c9ef240))
+-   **search:** fix ngIfs in nested children templates of resource detail ([90d64ac](https://github.com/webern-unibas-ch/awg-app/commit/90d64ac))
+-   **search:** improve communication btw overview and info ([357872e](https://github.com/webern-unibas-ch/awg-app/commit/357872e))
+-   **search:** improve handling of resource detail requests ([431f9ab](https://github.com/webern-unibas-ch/awg-app/commit/431f9ab))
+-   **search:** improve handling of searchResponseWithQuery subscription ([9be21c6](https://github.com/webern-unibas-ch/awg-app/commit/9be21c6))
+-   **search:** improve linked objects component ([4e1347e](https://github.com/webern-unibas-ch/awg-app/commit/4e1347e))
+-   **search:** improve search form building ([c2cab36](https://github.com/webern-unibas-ch/awg-app/commit/c2cab36))
+-   **search:** move interceptor providers into separate file ([d9c7d2d](https://github.com/webern-unibas-ch/awg-app/commit/d9c7d2d))
+-   **search:** move resource detail header out of tabset ([522c867](https://github.com/webern-unibas-ch/awg-app/commit/522c867))
+-   **search:** provide loading status as observable ([ca41c8d](https://github.com/webern-unibas-ch/awg-app/commit/ca41c8d))
+-   **search:** remove unused conversion service from resource detail ([5e377b3](https://github.com/webern-unibas-ch/awg-app/commit/5e377b3))
+-   **search:** set search parameter nRows to 25 per default ([39b3f63](https://github.com/webern-unibas-ch/awg-app/commit/39b3f63))
+-   **search:** simplify subscription to search result list data ([a9374d2](https://github.com/webern-unibas-ch/awg-app/commit/a9374d2))
+-   **search:** subscribe to resource data instead of async pipe ([c8dab3f](https://github.com/webern-unibas-ch/awg-app/commit/c8dab3f))
+-   **search:** use `this` instead of `super` in data api service ([42bac0a](https://github.com/webern-unibas-ch/awg-app/commit/42bac0a))
+-   **search:** use async pipe for data in bibliography component ([05ff800](https://github.com/webern-unibas-ch/awg-app/commit/05ff800))
+-   **search:** use async pipe for data in bibliography detail ([a95a45b](https://github.com/webern-unibas-ch/awg-app/commit/a95a45b))
+-   **search:** use async pipe for data in resource detail ([7ae1372](https://github.com/webern-unibas-ch/awg-app/commit/7ae1372))
+-   **search:** use enum for SearchParam view types ([7e53fa5](https://github.com/webern-unibas-ch/awg-app/commit/7e53fa5))
+-   **search:** use getter for httpGetUrl in resourceDetail & searchPanel ([272d618](https://github.com/webern-unibas-ch/awg-app/commit/272d618))
+-   **search:** use id tracker for search result list ([b9ebaa2](https://github.com/webern-unibas-ch/awg-app/commit/b9ebaa2))
+-   **search:** use loading spinner for resource detail ([23b1272](https://github.com/webern-unibas-ch/awg-app/commit/23b1272)), closes [#5](https://github.com/webern-unibas-ch/awg-app/issues/5)
+-   **search:** use SearchResponseWithQuery to update search params ([adb3d48](https://github.com/webern-unibas-ch/awg-app/commit/adb3d48))
+-   **shared:** add optional 'toHtml' property to property json ([f7a3de5](https://github.com/webern-unibas-ch/awg-app/commit/f7a3de5))
+-   **shared:** update compile html module & component ([73a9526](https://github.com/webern-unibas-ch/awg-app/commit/73a9526))
+-   **side-info:** add getter/setter for osm urls in contact-info ([d578987](https://github.com/webern-unibas-ch/awg-app/commit/d578987))
+-   **side-info:** get osm urls in contact-info from AppConfig ([f106c5f](https://github.com/webern-unibas-ch/awg-app/commit/f106c5f))
+-   **side-info:** make address & osm map of contact-info shared components ([8846558](https://github.com/webern-unibas-ch/awg-app/commit/8846558))
+-   **side-info:** make resource info data update immutable ([d248703](https://github.com/webern-unibas-ch/awg-app/commit/d248703))
+-   **side-info:** remove nested subscription from resource-info ([779965f](https://github.com/webern-unibas-ch/awg-app/commit/779965f))
+-   **side-info:** set edition info header from component ([15eb693](https://github.com/webern-unibas-ch/awg-app/commit/15eb693))
+-   **side-info:** use async pipe for data in search info ([c7c9791](https://github.com/webern-unibas-ch/awg-app/commit/c7c9791))
+
+### Build System
+
+-   **app:** add compodoc and format check scripts to package.json ([92a6852](https://github.com/webern-unibas-ch/awg-app/commit/92a6852))
+-   **app:** add compodoc build to build scripts in package.json ([f3047b5](https://github.com/webern-unibas-ch/awg-app/commit/f3047b5))
+-   **app:** configure karma.conf.js to run tests in order ([19cec04](https://github.com/webern-unibas-ch/awg-app/commit/19cec04))
+-   **app:** remove core-js and update dependencies ([f25fcd3](https://github.com/webern-unibas-ch/awg-app/commit/f25fcd3))
+-   **app:** update angular (^8.0.3) and cli (~8.0.6) ([001474e](https://github.com/webern-unibas-ch/awg-app/commit/001474e))
+-   **app:** update dependencies after upgrade to Angular 8 ([0b00a91](https://github.com/webern-unibas-ch/awg-app/commit/0b00a91))
+-   **app:** update dependency font-awesome ([bcc0f07](https://github.com/webern-unibas-ch/awg-app/commit/bcc0f07))
+-   **app:** update remaining dependencies after upgrade to Angular 8 ([aeb5bfa](https://github.com/webern-unibas-ch/awg-app/commit/aeb5bfa))
+
+### Features
+
+-   **app:** add compodoc for code documentation ([8945988](https://github.com/webern-unibas-ch/awg-app/commit/8945988))
+-   **app:** update angular (^8.0.2) and cli (~8.0.3) ([3844e27](https://github.com/webern-unibas-ch/awg-app/commit/3844e27))
+-   **contact:** add documentation section and link to Github repo ([3688358](https://github.com/webern-unibas-ch/awg-app/commit/3688358))
+-   **core:** add loading interceptor to set load status ([7669bad](https://github.com/webern-unibas-ch/awg-app/commit/7669bad))
+-   **core:** split meta object into sections and provide service method ([555fd11](https://github.com/webern-unibas-ch/awg-app/commit/555fd11))
+
+### Tests
+
+-   **app:** fix broken tests - ongoing ([42d8a5d](https://github.com/webern-unibas-ch/awg-app/commit/42d8a5d))
+-   **app:** fix broken tests after changes ([db2630f](https://github.com/webern-unibas-ch/awg-app/commit/db2630f))
+-   **app:** fix tests with HttpTestingController ([6743f2c](https://github.com/webern-unibas-ch/awg-app/commit/6743f2c))
+-   **app:** move nativeElement in own variable in tests ([70dba2d](https://github.com/webern-unibas-ch/awg-app/commit/70dba2d))
+-   **core:** extend navbar tests ([6410bf8](https://github.com/webern-unibas-ch/awg-app/commit/6410bf8))
+-   **home:** adjust tests for home-view component ([573ccd9](https://github.com/webern-unibas-ch/awg-app/commit/573ccd9))
+-   **page-not-found:** fix broken tests after renaming of variables ([6db4d3c](https://github.com/webern-unibas-ch/awg-app/commit/6db4d3c))
+-   **search:** add service method to searchResultList test after changes ([36512fb](https://github.com/webern-unibas-ch/awg-app/commit/36512fb))
+-   **search:** add TwelveToneSpinnerStub to resource detail test ([0dd7ee2](https://github.com/webern-unibas-ch/awg-app/commit/0dd7ee2))
+-   **search:** fix broken tests after switch to CD.OnPush - ongoing ([cb8a968](https://github.com/webern-unibas-ch/awg-app/commit/cb8a968))
+-   **search:** fix broken tests after switch to CD.OnPush - ongoing ([01e7fdc](https://github.com/webern-unibas-ch/awg-app/commit/01e7fdc))
+-   **search:** use SearchPramsViewTypes in search result list ([7793172](https://github.com/webern-unibas-ch/awg-app/commit/7793172))
+-   **side-info:** add header test for structure-info ([4a18b67](https://github.com/webern-unibas-ch/awg-app/commit/4a18b67))
+-   **side-info:** add test for contact-info and its child components ([48434d6](https://github.com/webern-unibas-ch/awg-app/commit/48434d6))
+-   **side-info:** add tests for edition-info component ([b08216c](https://github.com/webern-unibas-ch/awg-app/commit/b08216c))
+-   **side-info:** add tests for structure info component ([1a8bbaf](https://github.com/webern-unibas-ch/awg-app/commit/1a8bbaf))
+
 ## [0.5.4](https://github.com/webern-unibas-ch/awg-app/compare/v0.5.3...v0.5.4) (2019-04-09)
 
 ### Bug Fixes
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000000..61fd733aa3
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+-   Using welcoming and inclusive language
+-   Being respectful of differing viewpoints and experiences
+-   Gracefully accepting constructive criticism
+-   Focusing on what is best for the community
+-   Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+-   The use of sexualized language or imagery and unwelcome sexual attention or
+    advances
+-   Trolling, insulting/derogatory comments, and personal or political attacks
+-   Public or private harassment
+-   Publishing others' private information, such as a physical or electronic
+    address, without explicit permission
+-   Other conduct which could reasonably be considered inappropriate in a
+    professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies within all project spaces, and it also applies when
+an individual is representing the project or its community in public spaces.
+Examples of representing a project or community include using an official
+project e-mail address, posting via an official social media account, or acting
+as an appointed representative at an online or offline event. Representation of
+a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at `info-awg (at) unibas.ch`. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000000..32afd1b26c
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,125 @@
+# Contributing
+
+When contributing to this repository, please first discuss the change you wish to make via issue,
+email, or any other method with the owners of this repository before making a change.
+
+Please note that this project is released with a [Code of Conduct](CODE_OF_CONDUCT.md), please follow it in all your interactions with the project.
+
+## Table of Contents
+
+-   [Contribution process](#contribution-process)
+    -   [Branching / Git flow](#branching--git-flow)
+    -   [Commit Message Schema](#commit-message-schema)
+    -   [Release Versioning Convention](#release-versioning-convention)
+-   [Angular quick start guide](#quick-start-guide)
+    -   [Prerequisites](#prerequisites)
+    -   [Development server](#development-server)
+    -   [Code scaffolding](#code-scaffolding)
+    -   [Build](#build)
+    -   [Running unit tests](#running-unit-tests)
+    -   [Running end-to-end tests](#running-end-to-end-tests)
+    -   [Further help](#further-help)
+-   [Code of Conduct](#code-of-conduct)
+
+## Contribution process
+
+### Branching / Git flow
+
+This project uses the [Gitflow Workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow) which defines a strict branching model designed around the project releases. Therefore the following branch structure is used
+
+-   `master` (stores the official release history; all commits are tagged with a version number)
+-   `develop` (serves as an integration branch for features; gets released into `release/xxx`)
+-   `feature/XXX` (main branch for developing new features; gets branched from and merged into `develop`, never interacts with `master`)
+-   `release/xxx` (used to prepare a release with latest features from `develop`; gets merged into `master`)
+-   `hotfix/xxx` (used to quickly patch production releases; forked from and merged directly into `master`)
+
+To initialize the GitFlow workflow execute `git flow init` inside your local copy of the repository.
+
+To provide a new feature or changes to the code, create a new feature branch from develop and make a pull request when ready. Keep care of the [Commit Message Schema](#commit-message-schema) described below.
+
+For more information about pull requests go check out the GitHub Help [About pull requests](https://help.github.com/en/articles/about-pull-requests).
+
+### Commit Message Schema
+
+This project follows the [Conventional Commits Specification](https://conventionalcommits.org) using [commitlint](https://conventional-changelog.github.io/commitlint/#/) based on the [Angular configuration](https://github.com/conventional-changelog/commitlint/tree/master/@commitlint/config-angular) (further explanation can be found in the [Angular commit-message-guidelines](https://github.com/angular/angular/blob/master/CONTRIBUTING.md#-commit-message-guidelines)).
+
+Using these conventions leads to more readable messages that are easy to follow when looking through the project history. But also, we use the git commit messages to autogenerate the [CHANGELOG](https://github.com/webern-unibas-ch/awg-app/blob/master/LICENSE.md) and automate versions by means of [standard-version](https://github.com/conventional-changelog/standard-version) (see "Release Versioning Convention" section below).
+
+When writing commit messages, we stick to this schema:
+
+```
+<type>(<scope>): <subject>
+<BLANK LINE>
+<body>
+<BLANK LINE>
+<footer>
+```
+
+The **header** is mandatory, and **type** and **scope** of the header must be one of the following:
+
+Types:
+
+-   `build` (changes that affect the build system or external dependencies; no production code changes),
+-   `ci` (changes to Continuous Integration, no production code changes)
+-   `docs` (changes to the documentation, no production code changes),
+-   `feat` (new feature for the user),
+-   `fix` (bug fix for the user),
+-   `perf` (code change that improves performance),
+-   `refactor` (refactoring production code, eg. renaming a variable),
+-   `revert` (reverting a former commit),
+-   `style` (formatting, etc; no production code changes),
+-   `test` (adding missing tests, refactoring tests; no production code changes)
+
+Scopes (specific to this project, not part of the Angular convention):
+
+-   `app`
+-   `home`
+-   `edition`
+-   `search`
+-   `structure`
+-   `contact`
+
+Example:
+
+```
+feat(edition): add route for resource creation
+
+- add path for multipart request
+- adapt handling of resources responder
+```
+
+### Release Versioning Convention
+
+We use the git commit messages to autogenerate the [CHANGELOG](https://github.com/webern-unibas-ch/awg-app/blob/master/CHANGELOG.md) and automate versions by means of [standard-version](https://github.com/conventional-changelog/standard-version).
+
+## Angular quick start guide
+
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 8.0.3. Check there for necessary prerequisites (which comprise `Node` and `npm`or `yarn`).
+
+### Development server
+
+Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
+
+### Code scaffolding
+
+Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
+
+### Build
+
+Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.
+
+### Running unit tests
+
+Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
+
+### Running end-to-end tests
+
+Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
+
+### Further help
+
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
+
+## Code of Conduct
+
+See [CODE_OF_CONDUCT.md](CODE_OF_CONDUCT.md).
diff --git a/README.md b/README.md
index 34f51d88eb..0c8b71a2bb 100644
--- a/README.md
+++ b/README.md
@@ -3,125 +3,15 @@
 ![GitHub package.json version](https://img.shields.io/github/package-json/v/webern-unibas-ch/awg-app.svg)
 [![Build Status](https://travis-ci.org/webern-unibas-ch/awg-app.svg?branch=master)](https://travis-ci.org/webern-unibas-ch/awg-app)
 [![codecov](https://codecov.io/gh/webern-unibas-ch/awg-app/branch/master/graph/badge.svg)](https://codecov.io/gh/webern-unibas-ch/awg-app)
+[![compodoc](https://edition.anton-webern.ch/compodoc/images/coverage-badge-documentation.svg)](https://edition.anton-webern.ch/compodoc/index.html)
 [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
+[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v1.4%20adopted-ff69b4.svg)](code-of-conduct.md)
 
 A prototype web application for the online edition of the [Anton Webern Gesamtausgabe](https://www.anton-webern.ch), located at the Musicological Seminar of the University of Basel. It is written in [Angular](https://angular.io/) and runs on [edition.anton-webern.ch](https://edition.anton-webern.ch).
 
-## Table of Contents
-
--   [Contributing](#contributing)
-    -   [Quick start guide](#quick-start-guide)
-        -   [Prerequisites](#prerequisites)
-        -   [Development server](#development-server)
-        -   [Code scaffolding](#code-scaffolding)
-        -   [Build](#build)
-        -   [Running unit tests](#running-unit-tests)
-        -   [Running end-to-end tests](#running-end-to-end-tests)
-        -   [Further help](#further-help)
-    -   [Branching / Git flow](#branching--git-flow)
-    -   [Commit Message Schema](#commit-message-schema)
-    -   [Release Versioning Convention](#release-versioning-convention)
--   [License](#license)
-
 ## Contributing
 
-## Quick start guide
-
-### Prerequisites
-
-This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.3.6 (for installation instructions see the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/packages/angular/cli/README.md)).
-
-Both the Angular CLI and generated project have dependencies that require Node 8.9 or higher, together
-with NPM 5.5.1 or higher.
-
-### Development server
-
-Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
-
-### Code scaffolding
-
-Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
-
-### Build
-
-Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.
-
-### Running unit tests
-
-Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
-
-### Running end-to-end tests
-
-Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
-
-### Further help
-
-To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
-
-## Branching / Git flow
-
-This project uses the [Gitflow Workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow) which defines a strict branching model designed around the project release. Therefore the following branch structure is used
-
--   `master` (stores the official release history; all commits are tagged with a version number)
--   `develop` (serves as an integration branch for features; gets released into `release/xxx`)
--   `feature/XXX` (main branch for developing new features; gets merged into `develop`, never interacts with `master`)
--   `release/xxx` (used to prepare a release with latest features from `develop`; gets merged into `master`)
--   `hotfix/xxx` (used to quickly patch production releases; forked from and merged directly into `master`)
-
-To initialize the GitFlow workflow execute `git flow init` inside your local copy of the repository.
-
-## Commit Message Schema
-
-This project follows the [Conventional Commits Specification](https://conventionalcommits.org) using [commitlint](https://conventional-changelog.github.io/commitlint/#/) based on the [Angular configuration](https://github.com/conventional-changelog/commitlint/tree/master/@commitlint/config-angular) (further explanation can be found in the [Angular commit-message-guidelines](https://github.com/angular/angular/blob/master/CONTRIBUTING.md#-commit-message-guidelines)).
-
-Using these conventions leads to more readable messages that are easy to follow when looking through the project history. But also, we use the git commit messages to autogenerate the [CHANGELOG](https://github.com/webern-unibas-ch/awg-app/blob/master/LICENSE.md) and automate versions by means of [standard-version](https://github.com/conventional-changelog/standard-version) (see "Release Versioning Convention" section below).
-
-When writing commit messages, we stick to this schema:
-
-```
-<type>(<scope>): <subject>
-<BLANK LINE>
-<body>
-<BLANK LINE>
-<footer>
-```
-
-The **header** is mandatory, and **type** and **scope** of the header must be one of the following:
-
-Types:
-
--   `build` (changes that affect the build system or external dependencies; no production code changes),
--   `ci` (changes to Continuous Integration, no production code changes)
--   `docs` (changes to the documentation, no production code changes),
--   `feat` (new feature for the user),
--   `fix` (bug fix for the user),
--   `perf` (code change that improves performance),
--   `refactor` (refactoring production code, eg. renaming a variable),
--   `revert` (reverting a former commit),
--   `style` (formatting, etc; no production code changes),
--   `test` (adding missing tests, refactoring tests; no production code changes)
-
-Scopes (specific to this project, not part of the Angular convention):
-
--   `app`
--   `home`
--   `edition`
--   `search`
--   `structure`
--   `contact`
-
-Example:
-
-```
-feat(edition): add route for resource creation
-
-- add path for multipart request
-- adapt handling of resources responder
-```
-
-## Release Versioning Convention
-
-We use the git commit messages to autogenerate the [CHANGELOG](https://github.com/webern-unibas-ch/awg-app/blob/master/CHANGELOG.md) and automate versions by means of [standard-version](https://github.com/conventional-changelog/standard-version).
+Please read our [CODE_OF_CONDUCT.md](CODE_OF_CONDUCT.md) and [CONTRIBUTING.md](CONTRIBUTING.md) to see how you may contribute to this project.
 
 ## License
 
diff --git a/angular.json b/angular.json
index 9d9929827d..491ed35a0c 100644
--- a/angular.json
+++ b/angular.json
@@ -4,11 +4,11 @@
     "newProjectRoot": "projects",
     "projects": {
         "awg-app": {
+            "projectType": "application",
+            "schematics": {},
             "root": "",
             "sourceRoot": "src",
-            "projectType": "application",
             "prefix": "awg",
-            "schematics": {},
             "architect": {
                 "build": {
                     "builder": "@angular-devkit/build-angular:browser",
@@ -16,12 +16,12 @@
                         "outputPath": "dist",
                         "index": "src/index.html",
                         "main": "src/main.ts",
-                        "tsConfig": "src/tsconfig.app.json",
                         "polyfills": "src/polyfills.ts",
+                        "tsConfig": "tsconfig.app.json",
                         "assets": ["src/favicon.ico", "src/assets"],
+                        "aot": false,
                         "styles": [
                             "node_modules/bootstrap/dist/css/bootstrap.min.css",
-                            "node_modules/font-awesome/css/font-awesome.css",
                             "src/index.style.css",
                             "src/styles.css"
                         ],
@@ -80,13 +80,12 @@
                     "options": {
                         "main": "src/test.ts",
                         "polyfills": "src/polyfills.ts",
-                        "tsConfig": "src/tsconfig.spec.json",
-                        "karmaConfig": "src/karma.conf.js",
+                        "tsConfig": "tsconfig.spec.json",
+                        "karmaConfig": "karma.conf.js",
                         "sourceMap": true,
                         "styles": [
                             "src/index.style.css",
                             "node_modules/bootstrap/dist/css/bootstrap.min.css",
-                            "node_modules/font-awesome/css/font-awesome.css",
                             "src/styles.css"
                         ],
                         "scripts": [
@@ -100,17 +99,10 @@
                 "lint": {
                     "builder": "@angular-devkit/build-angular:tslint",
                     "options": {
-                        "tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"],
+                        "tsConfig": ["tsconfig.app.json", "tsconfig.spec.json", "e2e/tsconfig.json"],
                         "exclude": ["**/node_modules/**"]
                     }
-                }
-            }
-        },
-        "awg-app-e2e": {
-            "root": "e2e/",
-            "projectType": "application",
-            "prefix": "",
-            "architect": {
+                },
                 "e2e": {
                     "builder": "@angular-devkit/build-angular:protractor",
                     "options": {
@@ -122,25 +114,9 @@
                             "devServerTarget": "awg-app:serve:production"
                         }
                     }
-                },
-                "lint": {
-                    "builder": "@angular-devkit/build-angular:tslint",
-                    "options": {
-                        "tsConfig": "e2e/tsconfig.e2e.json",
-                        "exclude": ["**/node_modules/**"]
-                    }
                 }
             }
         }
     },
-    "defaultProject": "awg-app",
-    "schematics": {
-        "@schematics/angular:component": {
-            "prefix": "awg",
-            "styleext": "css"
-        },
-        "@schematics/angular:directive": {
-            "prefix": "awg"
-        }
-    }
+    "defaultProject": "awg-app"
 }
diff --git a/browserslist b/browserslist
new file mode 100644
index 0000000000..3cb56d1006
--- /dev/null
+++ b/browserslist
@@ -0,0 +1,12 @@
+# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
+# For additional information regarding the format and rule options, please see:
+# https://github.com/browserslist/browserslist#queries
+
+# You can see what browsers were selected by your queries by running:
+#   npx browserslist
+
+> 0.5%
+last 2 versions
+Firefox ESR
+not dead
+IE 9-11 # For IE 9-11 support, remove 'not'.
diff --git a/commitlint.config.js b/commitlint.config.js
index 83da762533..dcbc6a0df7 100644
--- a/commitlint.config.js
+++ b/commitlint.config.js
@@ -11,11 +11,14 @@ module.exports = {
                 'core',
                 'shared',
                 'side-info',
+                'views',
                 'home',
                 'edition',
                 'search',
                 'structure',
                 'contact',
+                'page-not-found',
+                'testing',
                 'README',
                 'CHANGELOG',
                 'LICENSE',
diff --git a/e2e/tsconfig.e2e.json b/e2e/tsconfig.json
similarity index 100%
rename from e2e/tsconfig.e2e.json
rename to e2e/tsconfig.json
diff --git a/src/karma.conf.js b/karma.conf.js
similarity index 90%
rename from src/karma.conf.js
rename to karma.conf.js
index a3dbd1e0ec..96debd9e3a 100644
--- a/src/karma.conf.js
+++ b/karma.conf.js
@@ -13,6 +13,9 @@ module.exports = function(config) {
             require('@angular-devkit/build-angular/plugins/karma')
         ],
         client: {
+            jasmine: {
+                random: false
+            },
             captureConsole: true,
             clearContext: false // leave Jasmine Spec Runner output visible in browser
         },
@@ -22,14 +25,14 @@ module.exports = function(config) {
             terminal: true
         },
         coverageIstanbulReporter: {
-            dir: require('path').join(__dirname, '../coverage/'),
+            dir: require('path').join(__dirname, './coverage/'),
             reports: ['html', 'lcovonly', 'text-summary'],
             fixWebpackSourcePaths: true
         },
-        logLevel: config.LOG_LOG,
         reporters: ['progress', 'kjhtml'],
         port: 9876,
         colors: true,
+        logLevel: config.LOG_INFO,
         autoWatch: true,
         browsers: ['Chrome'],
         singleRun: false,
diff --git a/package.json b/package.json
index 47550e6221..9b9c5846b2 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,12 @@
 {
     "name": "awg-app",
-    "version": "0.5.4",
+    "version": "0.6.0",
     "license": "MIT",
     "author": {
         "name": "Stefan Münnich",
         "email": "<stefan.muennich@unibas.ch>"
     },
-    "description": "Prototype web application for the online edition of the Anton Webern Gesamtausgabe (Musicological Seminar of the University of Basel)",
+    "description": "Prototype Web Application for the Online Edition of the Anton Webern Gesamtausgabe (Musicological Seminar of the University of Basel)",
     "keywords": [
         "angular",
         "anton-webern",
@@ -31,15 +31,19 @@
         "test:ci": "yarn test:cov --watch=false --browsers=ChromeHeadless",
         "lint": "ng lint awg-app",
         "tslint-check": "tslint-config-prettier-check ./tslint.json",
+        "format:check": "prettier --check \"src/**/*.ts\"",
         "format:fix": "pretty-quick --staged",
+        "serve:doc": "yarn compodoc -p tsconfig.app.json --theme Readthedocs -d dist/compodoc -s -w",
+        "build:doc": "yarn compodoc -p tsconfig.app.json --theme Readthedocs -d dist/compodoc",
         "build": "ng build",
         "build:prod": "yarn build --prod --aot=false",
-        "postbuild:prod": "gzipper ./dist",
+        "postbuild:prod": "run-s gzip:dist build:doc",
         "build:gh": "cross-var yarn build:prod --base-href $npm_package_homepage",
+        "gzip:dist": "gzipper ./dist",
         "prewpanalyzer": "yarn build:prod --statsJson",
         "wpanalyzer": "webpack-bundle-analyzer dist/stats.json",
         "presourcemap": "yarn build:prod --sourceMap",
-        "sourcemap": "source-map-explorer [dist/main.*.js dist/5.*js dist/6.*js dist/7.*js dist/8.*js]",
+        "sourcemap": "source-map-explorer dist/*.js",
         "build:css": "./themes/bin/build-css",
         "watch:css": "./themes/bin/watch-css",
         "build:css-win": "node-sass --include-path src/assets/themes/scss src/assets/themes/scss/main.scss src/assets/themes/css/main.css",
@@ -77,78 +81,69 @@
         "arrowParens": "avoid"
     },
     "dependencies": {
-        "@angular/animations": "^7.2.9",
-        "@angular/common": "^7.2.9",
-        "@angular/compiler": "^7.2.9",
-        "@angular/core": "^7.2.9",
-        "@angular/forms": "^7.2.9",
-        "@angular/http": "^7.2.9",
-        "@angular/platform-browser": "^7.2.9",
-        "@angular/platform-browser-dynamic": "^7.2.9",
-        "@angular/platform-server": "^7.2.9",
-        "@angular/router": "^7.2.9",
-        "@fortawesome/angular-fontawesome": "^0.3.0",
-        "@fortawesome/fontawesome-svg-core": "^1.2.15",
-        "@fortawesome/free-solid-svg-icons": "^5.7.2",
-        "@ng-bootstrap/ng-bootstrap": "^4.1.0",
+        "@angular/animations": "^8.0.3",
+        "@angular/common": "^8.0.3",
+        "@angular/compiler": "^8.0.3",
+        "@angular/core": "^8.0.3",
+        "@angular/forms": "^8.0.3",
+        "@angular/platform-browser": "^8.0.3",
+        "@angular/platform-browser-dynamic": "^8.0.3",
+        "@angular/platform-server": "^8.0.3",
+        "@angular/router": "^8.0.3",
+        "@fortawesome/angular-fontawesome": "^0.4.0",
+        "@fortawesome/fontawesome-svg-core": "^1.2.19",
+        "@fortawesome/free-solid-svg-icons": "^5.9.0",
+        "@ng-bootstrap/ng-bootstrap": "^4.2.1",
         "bootstrap": "^4.3.1",
-        "core-js": "^2.5.4",
-        "font-awesome": "^4.7.0",
-        "json2typescript": "^1.2.0",
-        "ngx-gallery": "^5.9.1",
+        "json2typescript": "^1.2.3",
+        "ngx-gallery": "git://github.com/musicEnfanthen/ngx-gallery-dist-patch",
         "ngx-json-viewer": "^2.4.0",
-        "rxjs": "~6.3.3",
+        "rxjs": "~6.5.2",
         "snapsvg": "^0.5.1",
         "tslib": "^1.9.0",
-        "zone.js": "~0.8.26"
+        "zone.js": "~0.9.1"
     },
     "devDependencies": {
-        "@angular-devkit/build-angular": "~0.13.0",
-        "@angular/cli": "~7.3.6",
-        "@angular/compiler-cli": "^7.2.9",
-        "@angular/language-service": "^7.2.9",
-        "@commitlint/cli": "^7.5.2",
-        "@commitlint/config-angular": "^7.5.0",
-        "@types/jasmine": "~2.8.8",
+        "@angular-devkit/build-angular": "~0.800.6",
+        "@angular/cli": "~8.0.6",
+        "@angular/compiler-cli": "^8.0.3",
+        "@angular/language-service": "^8.0.3",
+        "@commitlint/cli": "^8.0.0",
+        "@commitlint/config-angular": "^8.0.0",
+        "@compodoc/compodoc": "^1.1.9",
+        "@types/jasmine": "~3.3.8",
         "@types/jasminewd2": "~2.0.3",
         "@types/node": "~8.9.4",
         "angular-cli-ghpages": "^0.5.3",
-        "codelyzer": "~4.5.0",
-        "conventional-recommended-bump": "^4.0.4",
+        "codelyzer": "^5.0.0",
+        "conventional-recommended-bump": "^5.0.0",
         "cross-var": "^1.1.0",
-        "gzipper": "^2.2.0",
-        "husky": "^1.3.1",
-        "jasmine-core": "~2.99.1",
+        "gzipper": "^2.8.0",
+        "husky": "^2.4.1",
+        "jasmine-core": "~3.4.0",
         "jasmine-spec-reporter": "~4.2.1",
-        "karma": "~4.0.0",
+        "karma": "~4.1.0",
         "karma-chrome-launcher": "~2.2.0",
         "karma-coverage-istanbul-reporter": "~2.0.1",
-        "karma-jasmine": "~1.1.2",
-        "karma-jasmine-html-reporter": "^0.2.2",
-        "node-sass": "^4.11.0",
-        "nodemon": "^1.18.10",
+        "karma-jasmine": "~2.0.1",
+        "karma-jasmine-html-reporter": "^1.4.0",
+        "node-sass": "^4.12.0",
+        "nodemon": "^1.19.1",
         "npm-run-all": "^4.1.5",
-        "prettier": "1.16.4",
-        "pretty-quick": "^1.10.0",
+        "prettier": "1.18.2",
+        "pretty-quick": "^1.11.1",
         "protractor": "~5.4.0",
-        "source-map-explorer": "^1.8.0",
-        "standard-version": "^5.0.2",
+        "source-map-explorer": "^2.0.1",
+        "standard-version": "^6.0.1",
         "ts-node": "~7.0.0",
-        "tslint": "~5.11.0",
+        "tslint": "~5.15.0",
         "tslint-config-prettier": "^1.18.0",
-        "typescript": "~3.2.4",
-        "webpack-bundle-analyzer": "^3.1.0"
+        "typescript": "~3.4.5",
+        "webpack-bundle-analyzer": "^3.3.2"
     },
     "engines": {
         "node": ">= 8.9.0",
         "npm": ">= 5.5.1",
         "yarn": "^1.10.0"
-    },
-    "browserslist": [
-        "> 0.5%",
-        "last 2 versions",
-        "Firefox ESR",
-        "not dead",
-        "IE 9-11"
-    ]
+    }
 }
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index a3ce60fedd..dc82a77c55 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -4,22 +4,38 @@ import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
 import { HomeViewComponent } from './views/home-view/home-view.component';
 import { PageNotFoundViewComponent } from './views/page-not-found-view/page-not-found-view.component';
 
+/* routes of the AppModule */
 const appRoutes: Routes = [
     // eager loaded
     { path: 'home', component: HomeViewComponent },
 
     // lazy loaded
-    { path: 'contact', loadChildren: './views/contact-view/contact.module#ContactModule' },
-    { path: 'data', loadChildren: './views/data-view/data.module#DataModule' },
-    { path: 'edition', loadChildren: './views/edition-view/edition.module#EditionModule' },
+    { path: 'contact', loadChildren: () => import('./views/contact-view/contact.module').then(m => m.ContactModule) },
+    { path: 'data', loadChildren: () => import('./views/data-view/data.module').then(m => m.DataModule) },
+    { path: 'edition', loadChildren: () => import('./views/edition-view/edition.module').then(m => m.EditionModule) },
     { path: 'editions', redirectTo: 'edition', pathMatch: 'full' },
-    { path: 'structure', loadChildren: './views/structure-view/structure.module#StructureModule' },
+    {
+        path: 'structure',
+        loadChildren: () => import('./views/structure-view/structure.module').then(m => m.StructureModule)
+    },
 
     // default routes
     { path: '', redirectTo: 'home', pathMatch: 'full' },
-    { path: '**', component: PageNotFoundViewComponent }
+    { path: '404', component: PageNotFoundViewComponent },
+    { path: '**', redirectTo: '404', pathMatch: 'full' }
 ];
 
+/**
+ * Routed components of the {@link AppModule}:
+ * {@link HomeViewComponent} and {@link PageNotFoundViewComponent}.
+ */
+export const routedAppComponents = [HomeViewComponent, PageNotFoundViewComponent];
+
+/**
+ * Main app module routing.
+ *
+ * It activates the appRoutes, esp. lazy-loaded View Modules.
+ */
 @NgModule({
     imports: [
         RouterModule.forRoot(appRoutes, {
@@ -33,5 +49,3 @@ const appRoutes: Routes = [
     exports: [RouterModule]
 })
 export class AppRoutingModule {}
-
-export const routedComponents = [HomeViewComponent, PageNotFoundViewComponent];
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 58b7dff06d..1c1d7e9840 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,15 +1,26 @@
 import { Component } from '@angular/core';
 import { NavigationEnd, Router } from '@angular/router';
 
+/**
+ * The main component of the AWG App.
+ *
+ * It contains the {@link NavbarComponent}, {@link ViewContainerComponent} and {@link FooterComponent}.
+ */
 @Component({
     selector: 'awg-app',
     templateUrl: './app.component.html',
     styleUrls: ['./app.component.css']
 })
 export class AppComponent {
+    /**
+     * Constructor of the AppComponent.
+     *
+     * It declares a private router instance to catch GoogleAnalytics pageview events,
+     * see {@link https://codeburst.io/using-google-analytics-with-angular-25c93bffaa18}.
+     *
+     * @param {Router} router Instance of the Angular router.
+     */
     constructor(private router: Router) {
-        // configuration for GoogleAnalytics pageview events
-        // cf. https://codeburst.io/using-google-analytics-with-angular-25c93bffaa18
         this.router.events.subscribe(event => {
             if (event instanceof NavigationEnd) {
                 (window as any).ga('set', 'page', event.urlAfterRedirects);
diff --git a/src/app/app.config.ts b/src/app/app.config.ts
index d42f431851..4fced24519 100644
--- a/src/app/app.config.ts
+++ b/src/app/app.config.ts
@@ -1,26 +1,110 @@
-import { appVersion, appVersionReleaseDate, appHomepage } from './app.globals';
+import { appHomepage, appVersion, appVersionReleaseDate } from './app.globals';
 
+/**
+ * App config with accessors to app-wide constants.
+ */
 export class AppConfig {
+    /**
+     * Getter for the URL of the Salsah API endpoint
+     * ({@link https://www.salsah.org}).
+     *
+     * @returns {string}
+     */
     public static get API_ENDPOINT(): string {
         const root = 'https://www.salsah.org/';
         const api = 'api/';
         return root + api;
     }
 
-    public static get WEBERN_HOME() {
-        const url = 'https://www.anton-webern.ch/';
-        return url;
+    /**
+     * Getter for the url of the AWG edition website (awg-app).
+     *
+     * @returns {string}
+     */
+    public static get AWG_APP_URL(): string {
+        return appHomepage;
     }
 
-    public static get EDITION_HOME(): string {
-        return appHomepage;
+    /**
+     * Getter for the URL of the compodoc documentation
+     * of the AWG edition website (awg-app).
+     * ({@link compodoc/index.html}).
+     *
+     * @returns {string}
+     */
+    public static get AWG_APP_COMPODOC_URL(): string {
+        return 'compodoc/index.html';
+    }
+
+    /**
+     * Getter for the URL of the GitHub repository
+     * of the AWG edition website (awg-app).
+     * ({@link https://github.com/webern-unibas-ch/awg-app}).
+     *
+     * @returns {string}
+     */
+    public static get AWG_APP_GITHUB_URL(): string {
+        return 'https://github.com/webern-unibas-ch/awg-app';
     }
 
-    public static get VERSION(): string {
+    /**
+     * Getter for the latest version of the AWG edition website (awg-app).
+     *
+     * @returns {string}
+     */
+    public static get AWG_APP_VERSION(): string {
         return appVersion;
     }
 
-    public static get VERSION_RELEASE_DATE(): string {
+    /**
+     * Getter for the release date of the latest version of the AWG edition website (awg-app).
+     *
+     * @returns {string}
+     */
+    public static get AWG_APP_VERSION_RELEASE_DATE(): string {
         return appVersionReleaseDate;
     }
+
+    /**
+     * Getter for the name of the AWG.
+     *
+     * @returns {string}
+     */
+    public static get AWG_PROJECT_NAME(): string {
+        return 'Anton Webern Gesamtausgabe';
+    }
+
+    /**
+     * Getter for the URL of the AWG project website
+     * ({@link https://anton-webern.ch}).
+     *
+     * @returns {string}
+     */
+    public static get AWG_PROJECT_URL(): string {
+        return 'https://www.anton-webern.ch/';
+    }
+
+    /**
+     * Getter for the unsanitized OSM emebed link.
+     *
+     * @returns {string}
+     */
+    public static get UNSAFE_OSM_EMBED_URL(): string {
+        const osmRoot = 'https://www.openstreetmap.org/export/embed.html';
+        const osmId =
+            '?bbox=7.582175731658936%2C47.55789611508066%2C7.586840093135835%2C47.56003739001212&layer=mapnik&marker=47.55896585846639%2C7.584506571292877';
+
+        return osmRoot + osmId;
+    }
+
+    /**
+     * Getter for the unsanitized OSM external link.
+     *
+     * @returns {string}
+     */
+    public static get UNSAFE_OSM_LINK_URL() {
+        const osmLinkRoot = 'https://www.openstreetmap.org/';
+        const osmLinkId = '?mlat=47.55897&amp;mlon=7.58451#map=19/47.55897/7.58451';
+        return osmLinkRoot + osmLinkId;
+    }
 }
diff --git a/src/app/app.globals.ts b/src/app/app.globals.ts
index 825a1539c0..cd6c76a15e 100644
--- a/src/app/app.globals.ts
+++ b/src/app/app.globals.ts
@@ -1,5 +1,17 @@
 // THIS IS AN AUTO-GENERATED FILE. DO NOT CHANGE IT MANUALLY!
-// Generated last time on Tue Apr  9 23:10:55     2019
-export const appVersion = '0.5.4';
-export const appVersionReleaseDate = '09. April 2019';
+// Generated last time on Fri Jul 19 14:01:50 CEST 2019
+
+/**
+ * The latest version of the AWG App
+ */
+export const appVersion = '0.6.0';
+
+/**
+ * The release date of the latest version of the AWG App
+ */
+export const appVersionReleaseDate = '19. Juli 2019';
+
+/**
+ * The URL of the AWG App
+ */
 export const appHomepage = 'https://edition.anton-webern.ch/';
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 48e169287e..a6dfa9464b 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -5,20 +5,27 @@ import { registerLocaleData } from '@angular/common';
 import localeDeDE from '@angular/common/locales/de';
 
 //
-// main app modules & routes
+// main app modules
 import { AppComponent } from './app.component';
-import { AppRoutingModule, routedComponents } from './app-routing.module';
 import { CoreModule } from '@awg-core/core.module';
 import { SharedModule } from '@awg-shared/shared.module';
 import { SideInfoModule } from '@awg-side-info/side-info.module';
 
-//
-//  load and register the used locale file
+/* Routing Module */
+import { AppRoutingModule, routedAppComponents } from './app-routing.module';
+
+/* load and register the used locale file */
 registerLocaleData(localeDeDE);
 
+/**
+ * The bootstrapping app module.
+ *
+ * It embeds the {@link AppComponent} and its [routing definition]{@link AppRoutingModule}
+ * as well as the {@link CoreModule}, {@link SharedModule} and {@link SideInfoModule}.
+ */
 @NgModule({
     imports: [BrowserModule, HttpClientModule, CoreModule, SharedModule, SideInfoModule, AppRoutingModule],
-    declarations: [AppComponent, routedComponents],
+    declarations: [AppComponent, routedAppComponents],
     providers: [{ provide: LOCALE_ID, useValue: 'de-DE' }], // change global LOCALE-ID
     bootstrap: [AppComponent]
 })
diff --git a/src/app/core/core-models/geo-names.model.ts b/src/app/core/core-models/geo-names.model.ts
index b82eadc10c..a92d930dc0 100644
--- a/src/app/core/core-models/geo-names.model.ts
+++ b/src/app/core/core-models/geo-names.model.ts
@@ -1,14 +1,57 @@
 import { GeoDataItemJson } from '@awg-shared/api-objects';
 
+/**
+ * The GeoNames class.
+ *
+ * It is used in the context of the data view
+ * to store the data for a geonames reference
+ * and to provide the html to display a
+ * geonames location.
+ */
 export class GeoNames {
+    /**
+     * The geonames id.
+     */
     gnid: string;
+
+    /**
+     * The short label of a geonames location.
+     */
     shortLabel: string;
+
+    /**
+     * The long label of a geonames location.
+     */
     longLabel: string;
+
+    /**
+     * The latitude of a geonames location.
+     */
     latitude: string;
+
+    /**
+     * The longitude of a geonames location.
+     */
     longitude: string;
+
+    /**
+     * The wikipedia link of a geonames location.
+     */
     wiki: string;
+
+    /**
+     * The generated html to display a geonames location in the app.
+     */
     html: string;
 
+    /**
+     * Constructor of the GeoNames class.
+     *
+     * It initializes the class with values from
+     * the given (SALSAH) API´s GeoDataItemJson response.
+     *
+     * @param {GeoDataItemJson[]} geoDataArray The given geo data array.
+     */
     constructor(geoDataArray: GeoDataItemJson[]) {
         this.longLabel = geoDataArray[0].label;
         for (let j = 1; j < geoDataArray.length; j++) {
diff --git a/src/app/core/core-models/index.ts b/src/app/core/core-models/index.ts
index f3bd1a1392..8dcf01f50d 100644
--- a/src/app/core/core-models/index.ts
+++ b/src/app/core/core-models/index.ts
@@ -9,6 +9,6 @@
 
 import { GeoNames } from './geo-names.model';
 import { Logo, Logos } from './logos.model';
-import { Meta } from './meta.model';
+import { Meta, MetaContact, MetaEdition, MetaPage, MetaStructure, MetaSectionTypes } from './meta.model';
 
-export { GeoNames, Logo, Logos, Meta };
+export { GeoNames, Logo, Logos, Meta, MetaContact, MetaEdition, MetaPage, MetaStructure, MetaSectionTypes };
diff --git a/src/app/core/core-models/logos.model.ts b/src/app/core/core-models/logos.model.ts
index 91cb468cfe..8e1d226d32 100644
--- a/src/app/core/core-models/logos.model.ts
+++ b/src/app/core/core-models/logos.model.ts
@@ -1,10 +1,40 @@
+/**
+ * The Logo class.
+ *
+ * It is used in the context of the app framework
+ * to store the data for a single logo.
+ */
 export class Logo {
+    /**
+     * The id of the logo.
+     */
     id: string;
+
+    /**
+     * The image source (url) of the logo.
+     */
     src: string;
+
+    /**
+     * The alternative image text of the logo.
+     */
     alt: string;
+
+    /**
+     * The href attribute (url) of the logo (triggered on click).
+     */
     href: string;
 }
 
+/**
+ * The Logos class.
+ *
+ * It is used in the context of the app framework
+ * to store the data for all logos.
+ */
 export class Logos {
+    /**
+     * The array of logos.
+     */
     [key: string]: Logo;
 }
diff --git a/src/app/core/core-models/meta.model.ts b/src/app/core/core-models/meta.model.ts
index 9bbe4f99e4..4ad7d807cb 100644
--- a/src/app/core/core-models/meta.model.ts
+++ b/src/app/core/core-models/meta.model.ts
@@ -1,18 +1,222 @@
-export class Meta {
-    page: {
-        yearStart: number;
-        yearRecent: number;
-        editionUrl: string;
-        webernUrl: string;
-        version: string;
-        versionReleaseDate: string;
+/**
+ * The MetaSectionTypes enumeration.
+ *
+ * It stores the possible meta data section types.
+ */
+export enum MetaSectionTypes {
+    page = 'page',
+    edition = 'edition',
+    structure = 'structure',
+    contact = 'contact'
+}
+
+/**
+ * The MetaPerson class.
+ *
+ * It is used to store the meta data about a Person.
+ */
+export class MetaPerson {
+    /**
+     * The name of the person.
+     */
+    name: string;
+
+    /**
+     * The contact (webadress) of a person.
+     */
+    contactUrl: string;
+}
+
+/**
+ * The MetaPage class.
+ *
+ * It is used in the context of the app framework
+ * to store the meta data for the main framework.
+ */
+export class MetaPage {
+    /**
+     * The start year for the copyright information.
+     */
+    yearStart: number;
+
+    /**
+     * The recent year for the copyright information.
+     */
+    yearCurrent: number;
+
+    /**
+     * The url to the GitHub repository of the AWG edition website (awg-app).
+     */
+    githubUrl: string;
+
+    /**
+     * The url to the compodoc documentation of the AWG edition website (awg-app).
+     */
+    compodocUrl: string;
+
+    /**
+     * The url to the AWG edition homepage (awg-app).
+     */
+    awgAppUrl: string;
+
+    /**
+     * The name of the AWG.
+     */
+    awgProjectName: string;
+
+    /**
+     * The url to the AWG project homepage.
+     */
+    awgProjectUrl: string;
+
+    /**
+     * The latest version of the AWG edition website (awg-app).
+     */
+    version: string;
+
+    /**
+     * The release date of the latest version of the AWG edition website (awg-app).
+     */
+    versionReleaseDate: string;
+}
+
+/**
+ * The MetaEdition class.
+ *
+ * It is used in the context of the edition view
+ * to store the meta data about the edition.
+ */
+export class MetaEdition {
+    /**
+     * The editors of an edition.
+     */
+    editors: MetaPerson[];
+
+    /**
+     * The last modification date of an edition.
+     */
+    lastModified: string;
+}
+
+/**
+ * The MetaStructure class.
+ *
+ * It is used in the context of the structure view
+ * to store the meta data about the structure overview.
+ */
+export class MetaStructure {
+    /**
+     * The authors of the structure overview.
+     */
+    authors: MetaPerson[];
+
+    /**
+     * The last modification date of the structure overview.
+     */
+    lastModified: string;
+}
+
+/**
+ * The MetaContact class.
+ *
+ * It is used in the context of the contact view
+ * to store the meta data about contact information.
+ */
+export class MetaContact {
+    /**
+     * The address info of the contact info.
+     */
+    address: {
+        /**
+         * The institution name of the address info.
+         */
+        institution: string;
+
+        /**
+         * The street of the address info.
+         */
+        street: string;
+
+        /**
+         * The postal code of the address info.
+         */
+        postalCode: string;
+
+        /**
+         * The city of the address info.
+         */
+        city: string;
+
+        /**
+         * The country of the address info.
+         */
+        country: string;
     };
-    edition: {
-        editors: string;
-        lastModified: string;
+
+    /**
+     * The phone info of the contact info.
+     */
+    phone: {
+        /**
+         * The label of the phone info.
+         * @example Telefon:
+         */
+        label: string;
+
+        /**
+         * The number of the phone info.
+         */
+        number: string;
     };
-    structure: {
-        author: string;
-        lastModified: string;
+
+    /**
+     * The email info of the contact info.
+     */
+    email: {
+        /**
+         * The label of the email info.
+         * @example Email:
+         */
+        label: string;
+
+        /**
+         * The mailto of the email info.
+         * @example mailto:my_email@host.com
+         */
+        mailto: string;
+
+        /**
+         * The safe string of the email info.
+         * @example my_email [at] host [dot] com
+         */
+        safeString: string;
     };
 }
+
+/**
+ * The Meta class.
+ *
+ * It is used in the context of the app framework
+ * to store the meta data for different parts of the app.
+ */
+export class Meta {
+    /**
+     * The meta data for the main app framework.
+     */
+    page: MetaPage;
+
+    /**
+     * The meta data for the edition view.
+     */
+    edition: MetaEdition;
+
+    /**
+     * The meta data for the structure view.
+     */
+    structure: MetaStructure;
+
+    /**
+     * The meta data for the contact view.
+     */
+    contact: MetaContact;
+}
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index 4e7bbffe95..32a4bdacb4 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -6,10 +6,13 @@ import { FooterModule } from './footer/footer.module';
 import { NavbarComponent } from './navbar/navbar.component';
 import { ViewContainerComponent } from './view-container/view-container.component';
 
+import { httpInterceptorProviders } from './interceptors';
+
 @NgModule({
     imports: [SharedModule, FooterModule],
     declarations: [NavbarComponent, ViewContainerComponent],
-    exports: [NavbarComponent, ViewContainerComponent, FooterModule]
+    exports: [NavbarComponent, ViewContainerComponent, FooterModule],
+    providers: [httpInterceptorProviders]
 })
 export class CoreModule {
     constructor(
diff --git a/src/app/core/footer/footer-copyright/footer-copyright.component.html b/src/app/core/footer/footer-copyright/footer-copyright.component.html
index 6ffa4eacf3..a6c1eeca5f 100644
--- a/src/app/core/footer/footer-copyright/footer-copyright.component.html
+++ b/src/app/core/footer/footer-copyright/footer-copyright.component.html
@@ -1,3 +1,6 @@
 <div class="awg-copyright-desc">
-    &copy; <span id="awg-copyright-period">{{ metaData?.page?.yearStart }}–{{ metaData?.page?.yearRecent }}</span> <br class="d-sm-none" /> Anton Webern Gesamtausgabe
+    &copy; <span id="awg-copyright-period">{{ pageMetaData?.yearStart }}–{{ pageMetaData?.yearCurrent }}</span
+    >&nbsp;
+    <br class="d-md-none" />
+    <span class="awg-project-name">{{ pageMetaData?.awgProjectName }}</span>
 </div>
diff --git a/src/app/core/footer/footer-copyright/footer-copyright.component.spec.ts b/src/app/core/footer/footer-copyright/footer-copyright.component.spec.ts
index 839c385521..e00cc7a1ac 100644
--- a/src/app/core/footer/footer-copyright/footer-copyright.component.spec.ts
+++ b/src/app/core/footer/footer-copyright/footer-copyright.component.spec.ts
@@ -3,7 +3,7 @@ import { DebugElement } from '@angular/core';
 
 import { getAndExpectDebugElementByCss } from '@testing/expect-helper';
 
-import { Meta } from '@awg-core/core-models';
+import { Meta, MetaPage, MetaSectionTypes } from '@awg-core/core-models';
 import { METADATA } from '@awg-core/mock-data';
 
 import { FooterCopyrightComponent } from './footer-copyright.component';
@@ -14,7 +14,7 @@ describe('FooterCopyrightComponent (DONE)', () => {
     let compDe: DebugElement;
     let compEl: any;
 
-    let expectedMetaData: Meta;
+    let expectedPageMetaData: MetaPage;
 
     beforeEach(async(() => {
         TestBed.configureTestingModule({
@@ -29,7 +29,7 @@ describe('FooterCopyrightComponent (DONE)', () => {
         compEl = compDe.nativeElement;
 
         // test data
-        expectedMetaData = METADATA;
+        expectedPageMetaData = METADATA[MetaSectionTypes.page];
     });
 
     it('should create', () => {
@@ -37,8 +37,8 @@ describe('FooterCopyrightComponent (DONE)', () => {
     });
 
     describe('BEFORE initial data binding', () => {
-        it('should not have metaData', () => {
-            expect(component.metaData).toBeUndefined('should be undefined');
+        it('should not have pageMetaData', () => {
+            expect(component.pageMetaData).toBeUndefined('should be undefined');
         });
 
         describe('VIEW', () => {
@@ -46,11 +46,20 @@ describe('FooterCopyrightComponent (DONE)', () => {
                 getAndExpectDebugElementByCss(compDe, 'div.awg-copyright-desc', 1, 1);
             });
 
-            it('... should not render metaData yet', () => {
+            it('... should not render copyright period yet', () => {
                 const copyDes = getAndExpectDebugElementByCss(compDe, '#awg-copyright-period', 1, 1);
+                const copyEl = copyDes[0].nativeElement;
+
+                expect(copyEl.textContent).toBeDefined();
+                expect(copyEl.textContent).toBe('', 'should be empty string');
+            });
+
+            it('... should not render project name yet', () => {
+                const nameDes = getAndExpectDebugElementByCss(compDe, '.awg-project-name', 1, 1);
+                const nameEl = nameDes[0].nativeElement;
 
-                expect(copyDes[0].nativeElement.textContent).toBeDefined();
-                expect(copyDes[0].nativeElement.textContent).toBe('', 'should be empty string');
+                expect(nameEl.textContent).toBeDefined();
+                expect(nameEl.textContent).toBe('', 'should be empty string');
             });
         });
     });
@@ -58,26 +67,36 @@ describe('FooterCopyrightComponent (DONE)', () => {
     describe('AFTER initial data binding', () => {
         beforeEach(() => {
             // simulate the parent setting the input properties
-            component.metaData = expectedMetaData;
+            component.pageMetaData = expectedPageMetaData;
 
             // trigger initial data binding
             fixture.detectChanges();
         });
 
         describe('VIEW', () => {
-            it('should render values', () => {
-                const expectedYearStart = expectedMetaData.page.yearStart;
-                const expectedYearRecent = expectedMetaData.page.yearRecent;
+            it('should render copyright period', () => {
+                const expectedYearStart = expectedPageMetaData.yearStart;
+                const expectedYearCurrent = expectedPageMetaData.yearCurrent;
 
                 const copyDes = getAndExpectDebugElementByCss(compDe, '#awg-copyright-period', 1, 1);
                 const copyEl = copyDes[0].nativeElement;
 
                 expect(copyEl.textContent).toBeDefined();
                 expect(copyEl.textContent).toContain(
-                    expectedYearStart + '–' + expectedYearRecent,
-                    `should contain ${expectedYearStart}-${expectedYearRecent}`
+                    expectedYearStart + '–' + expectedYearCurrent,
+                    `should contain ${expectedYearStart}-${expectedYearCurrent}`
                 );
             });
+
+            it('should render project name', () => {
+                const expectedProjectName = expectedPageMetaData.awgProjectName;
+
+                const nameDes = getAndExpectDebugElementByCss(compDe, '.awg-project-name', 1, 1);
+                const nameEl = nameDes[0].nativeElement;
+
+                expect(nameEl.textContent).toBeDefined();
+                expect(nameEl.textContent).toContain(expectedProjectName, `should contain ${expectedProjectName}`);
+            });
         });
     });
 });
diff --git a/src/app/core/footer/footer-copyright/footer-copyright.component.ts b/src/app/core/footer/footer-copyright/footer-copyright.component.ts
index e63395d2a6..9371f40c8a 100644
--- a/src/app/core/footer/footer-copyright/footer-copyright.component.ts
+++ b/src/app/core/footer/footer-copyright/footer-copyright.component.ts
@@ -1,17 +1,24 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
 
-import { Meta } from '@awg-core/core-models';
+import { MetaPage } from '@awg-core/core-models';
 
+/**
+ * The FooterCopyright component.
+ *
+ * It contains the copyright section of the footer.
+ */
 @Component({
     selector: 'awg-footer-copyright',
     templateUrl: './footer-copyright.component.html',
-    styleUrls: ['./footer-copyright.component.css']
+    styleUrls: ['./footer-copyright.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class FooterCopyrightComponent implements OnInit {
+export class FooterCopyrightComponent {
+    /**
+     * Input variable: pageMetaData.
+     *
+     * It keeps the page meta data for the component.
+     */
     @Input()
-    metaData: Meta;
-
-    constructor() {}
-
-    ngOnInit() {}
+    pageMetaData: MetaPage;
 }
diff --git a/src/app/core/footer/footer-declaration/footer-declaration.component.html b/src/app/core/footer/footer-declaration/footer-declaration.component.html
index 9bf832a746..75b83362ea 100644
--- a/src/app/core/footer/footer-declaration/footer-declaration.component.html
+++ b/src/app/core/footer/footer-declaration/footer-declaration.component.html
@@ -3,18 +3,22 @@
 </p>
 <p class="awg-version-desc">
     <a
-        href="https://github.com/webern-unibas-ch/awg-app/blob/v{{ metaData?.page?.version }}/CHANGELOG.md"
+        href="https://github.com/webern-unibas-ch/awg-app/blob/v{{ pageMetaData?.version }}/CHANGELOG.md"
         target="_blank"
         rel="noopener noreferrer"
     >
-        Version <span id="awg-version">{{ metaData?.page?.version }}</span> &#9671;
-        <span id="awg-version-date">{{ metaData?.page?.versionReleaseDate }}</span>
+        Version <span id="awg-version">{{ pageMetaData?.version }}</span> &#9671;
+        <span id="awg-version-date">{{ pageMetaData?.versionReleaseDate }}</span>
     </a>
 </p>
 <p id="awg-contact-link">
     <small>
-        <a id="awg-imp" [routerLink]="['/contact']" fragment="awg-masthead">
+        <a id="awg-imp" [routerLink]="['/contact']" fragment="awg-imprint">
             Impressum
         </a>
+        |
+        <a id="awg-doc" [routerLink]="['/contact']" fragment="awg-documentation">
+            Dokumentation
+        </a>
     </small>
 </p>
diff --git a/src/app/core/footer/footer-declaration/footer-declaration.component.spec.ts b/src/app/core/footer/footer-declaration/footer-declaration.component.spec.ts
index ac42153b86..32052ce05b 100644
--- a/src/app/core/footer/footer-declaration/footer-declaration.component.spec.ts
+++ b/src/app/core/footer/footer-declaration/footer-declaration.component.spec.ts
@@ -5,7 +5,7 @@ import { click } from '@testing/click-helper';
 import { getAndExpectDebugElementByCss, getAndExpectDebugElementByDirective } from '@testing/expect-helper';
 import { RouterLinkStubDirective } from '@testing/router-stubs';
 
-import { Meta } from '@awg-core/core-models';
+import { MetaPage, MetaSectionTypes } from '@awg-core/core-models';
 import { METADATA } from '@awg-core/mock-data';
 
 import { FooterDeclarationComponent } from './footer-declaration.component';
@@ -18,7 +18,7 @@ describe('FooterDeclarationComponent (DONE)', () => {
     let linkDes: DebugElement[];
     let routerLinks;
 
-    let expectedMetaData: Meta;
+    let expectedPageMetaData: MetaPage;
 
     beforeEach(async(() => {
         TestBed.configureTestingModule({
@@ -33,7 +33,7 @@ describe('FooterDeclarationComponent (DONE)', () => {
         compEl = compDe.nativeElement;
 
         // test data
-        expectedMetaData = METADATA;
+        expectedPageMetaData = METADATA[MetaSectionTypes.page];
     });
 
     it('should create', () => {
@@ -41,8 +41,8 @@ describe('FooterDeclarationComponent (DONE)', () => {
     });
 
     describe('BEFORE initial data binding', () => {
-        it('should not have metaData', () => {
-            expect(component.metaData).toBeUndefined('should be undefined');
+        it('should not have pageMetaData', () => {
+            expect(component.pageMetaData).toBeUndefined('should be undefined');
         });
 
         describe('VIEW', () => {
@@ -50,7 +50,7 @@ describe('FooterDeclarationComponent (DONE)', () => {
                 getAndExpectDebugElementByCss(compDe, 'p', 3, 3);
             });
 
-            it('... should not render metaData yet', () => {
+            it('... should not render pageMetaData yet', () => {
                 // find debug elements
                 const versionDes = getAndExpectDebugElementByCss(compDe, '#awg-version', 1, 1);
                 const versionDateDes = getAndExpectDebugElementByCss(compDe, '#awg-version-date', 1, 1);
@@ -72,7 +72,7 @@ describe('FooterDeclarationComponent (DONE)', () => {
     describe('AFTER initial data binding', () => {
         beforeEach(() => {
             // simulate the parent setting the input properties
-            component.metaData = expectedMetaData;
+            component.pageMetaData = expectedPageMetaData;
 
             // trigger initial data binding
             fixture.detectChanges();
@@ -80,8 +80,8 @@ describe('FooterDeclarationComponent (DONE)', () => {
 
         describe('VIEW', () => {
             it('should render values', () => {
-                const expectedVersion = expectedMetaData.page.version;
-                const expectedVersionDate = expectedMetaData.page.versionReleaseDate;
+                const expectedVersion = expectedPageMetaData.version;
+                const expectedVersionDate = expectedPageMetaData.versionReleaseDate;
 
                 // find debug elements
                 const versionDes = getAndExpectDebugElementByCss(compDe, '#awg-version', 1, 1);
@@ -102,27 +102,40 @@ describe('FooterDeclarationComponent (DONE)', () => {
         describe('[routerLink]', () => {
             beforeEach(() => {
                 // find DebugElements with an attached RouterLinkStubDirective
-                linkDes = getAndExpectDebugElementByDirective(compDe, RouterLinkStubDirective, 1, 1);
+                linkDes = getAndExpectDebugElementByDirective(compDe, RouterLinkStubDirective, 2, 2);
 
                 // get attached link directive instances using each DebugElement's injector
                 routerLinks = linkDes.map(de => de.injector.get(RouterLinkStubDirective));
             });
 
-            it('... can get routerLink from template', () => {
-                expect(routerLinks.length).toBe(1, 'should have 1 routerLink');
+            it('... can get routerLinks from template', () => {
+                expect(routerLinks.length).toBe(2, 'should have 2 routerLinks');
                 expect(routerLinks[0].linkParams).toEqual(['/contact']);
+                expect(routerLinks[1].linkParams).toEqual(['/contact']);
             });
 
-            it('... can click Contact link in template', () => {
-                const contactLinkDe = linkDes[0]; // contact link DebugElement
-                const contactLink = routerLinks[0]; // contact link directive
+            it('... can click imprint link in template', () => {
+                const imprintLinkDe = linkDes[0]; // contact link DebugElement
+                const imprintLink = routerLinks[0]; // contact link directive
 
-                expect(contactLink.navigatedTo).toBeNull('should not have navigated yet');
+                expect(imprintLink.navigatedTo).toBeNull('should not have navigated yet');
 
-                click(contactLinkDe);
+                click(imprintLinkDe);
                 fixture.detectChanges();
 
-                expect(contactLink.navigatedTo).toEqual(['/contact']);
+                expect(imprintLink.navigatedTo).toEqual(['/contact']);
+            });
+
+            it('... can click documentation link in template', () => {
+                const documentationLinkDe = linkDes[1]; // contact link DebugElement
+                const documentationLink = routerLinks[1]; // contact link directive
+
+                expect(documentationLink.navigatedTo).toBeNull('should not have navigated yet');
+
+                click(documentationLinkDe);
+                fixture.detectChanges();
+
+                expect(documentationLink.navigatedTo).toEqual(['/contact']);
             });
         });
     });
diff --git a/src/app/core/footer/footer-declaration/footer-declaration.component.ts b/src/app/core/footer/footer-declaration/footer-declaration.component.ts
index 22bc88bd1e..1c4cf2dfc9 100644
--- a/src/app/core/footer/footer-declaration/footer-declaration.component.ts
+++ b/src/app/core/footer/footer-declaration/footer-declaration.component.ts
@@ -1,17 +1,25 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
 
-import { Meta } from '@awg-core/core-models';
+import { MetaPage } from '@awg-core/core-models';
 
+/**
+ * The FooterDeclaration component.
+ *
+ * It contains the declaration section of the footer
+ * with version number, release date and impressum.
+ */
 @Component({
     selector: 'awg-footer-declaration',
     templateUrl: './footer-declaration.component.html',
-    styleUrls: ['./footer-declaration.component.css']
+    styleUrls: ['./footer-declaration.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class FooterDeclarationComponent implements OnInit {
+export class FooterDeclarationComponent {
+    /**
+     * Input variable: pageMetaData.
+     *
+     * It keeps the page meta data for the component.
+     */
     @Input()
-    metaData: Meta;
-
-    constructor() {}
-
-    ngOnInit() {}
+    pageMetaData: MetaPage;
 }
diff --git a/src/app/core/footer/footer-logo/footer-logo.component.ts b/src/app/core/footer/footer-logo/footer-logo.component.ts
index f1e6af19d4..2cdc776fb4 100644
--- a/src/app/core/footer/footer-logo/footer-logo.component.ts
+++ b/src/app/core/footer/footer-logo/footer-logo.component.ts
@@ -1,17 +1,24 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
 
 import { Logo } from '@awg-core/core-models';
 
+/**
+ * The FooterLogo component.
+ *
+ * It contains a footer logo.
+ */
 @Component({
     selector: 'awg-footer-logo',
     templateUrl: './footer-logo.component.html',
-    styleUrls: ['./footer-logo.component.css']
+    styleUrls: ['./footer-logo.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class FooterLogoComponent implements OnInit {
+export class FooterLogoComponent {
+    /**
+     * Input variable: logo.
+     *
+     * It keeps the logo data for the component.
+     */
     @Input()
     logo: Logo;
-
-    constructor() {}
-
-    ngOnInit() {}
 }
diff --git a/src/app/core/footer/footer-poweredby/footer-poweredby.component.html b/src/app/core/footer/footer-poweredby/footer-poweredby.component.html
index b904c532b9..1167af038f 100644
--- a/src/app/core/footer/footer-poweredby/footer-poweredby.component.html
+++ b/src/app/core/footer/footer-poweredby/footer-poweredby.component.html
@@ -1,3 +1,6 @@
 <div class="awg-powered-by text-lowercase">
-    Built with <br class="d-sm-none" /> <awg-footer-logo [logo]="logos?.angular" class="icon"></awg-footer-logo> and <awg-footer-logo [logo]="logos?.bootstrap" class="icon"></awg-footer-logo>
+    Built on <awg-footer-logo [logo]="logos?.github" class="icon"></awg-footer-logo>
+    <br class="d-md-none" />
+    with <awg-footer-logo [logo]="logos?.angular" class="icon"></awg-footer-logo> and
+    <awg-footer-logo [logo]="logos?.bootstrap" class="icon"></awg-footer-logo>
 </div>
diff --git a/src/app/core/footer/footer-poweredby/footer-poweredby.component.spec.ts b/src/app/core/footer/footer-poweredby/footer-poweredby.component.spec.ts
index 76754ee769..cfde76dfdd 100644
--- a/src/app/core/footer/footer-poweredby/footer-poweredby.component.spec.ts
+++ b/src/app/core/footer/footer-poweredby/footer-poweredby.component.spec.ts
@@ -35,18 +35,6 @@ describe('FooterPoweredbyComponent (DONE)', () => {
 
         // test data
         expectedLogos = {
-            unibas: {
-                id: 'unibaslogo',
-                src: 'assets/img/logos/uni.svg',
-                alt: 'Logo Uni Basel',
-                href: 'https://www.unibas.ch'
-            },
-            snf: {
-                id: 'snflogo',
-                src: 'assets/img/logos/snf.png',
-                alt: 'Logo SNF',
-                href: 'http://www.snf.ch'
-            },
             angular: {
                 id: 'angularlogo',
                 src: 'assets/img/logos/angular.svg',
@@ -58,6 +46,24 @@ describe('FooterPoweredbyComponent (DONE)', () => {
                 src: 'assets/img/logos/ng-bootstrap.svg',
                 alt: 'Logo ng-Bootstrap',
                 href: 'https://ng-bootstrap.github.io/'
+            },
+            github: {
+                id: 'githublogo',
+                src: 'assets/img/logos/github.svg',
+                alt: 'Logo GitHub',
+                href: 'https://github.com/webern-unibas-ch/awg-app'
+            },
+            snf: {
+                id: 'snflogo',
+                src: 'assets/img/logos/snf.png',
+                alt: 'Logo SNF',
+                href: 'http://www.snf.ch'
+            },
+            unibas: {
+                id: 'unibaslogo',
+                src: 'assets/img/logos/uni.svg',
+                alt: 'Logo Uni Basel',
+                href: 'https://www.unibas.ch'
             }
         };
     });
@@ -76,8 +82,8 @@ describe('FooterPoweredbyComponent (DONE)', () => {
                 getAndExpectDebugElementByCss(compDe, 'div.awg-powered-by', 1, 1);
             });
 
-            it('... should contain 2 footer logo components (stubbed)', () => {
-                getAndExpectDebugElementByDirective(compDe, FooterLogoStubComponent, 2, 2);
+            it('... should contain 3 footer logo components (stubbed)', () => {
+                getAndExpectDebugElementByDirective(compDe, FooterLogoStubComponent, 3, 3);
             });
         });
     });
@@ -91,25 +97,28 @@ describe('FooterPoweredbyComponent (DONE)', () => {
             fixture.detectChanges();
         });
 
-        it('should have logo', () => {
+        it('should have logos', () => {
             expect(component.logos).toBeDefined();
             expect(component.logos).toBe(expectedLogos);
         });
 
         describe('VIEW', () => {
             it('... should pass down logos to footer logo components', () => {
-                const footerLogoDes = getAndExpectDebugElementByDirective(compDe, FooterLogoStubComponent, 2, 2);
+                const footerLogoDes = getAndExpectDebugElementByDirective(compDe, FooterLogoStubComponent, 3, 3);
                 const footerLogoCmps = footerLogoDes.map(
                     de => de.injector.get(FooterLogoStubComponent) as FooterLogoStubComponent
                 );
 
-                expect(footerLogoCmps.length).toBe(2, 'should have 2 logo components');
+                expect(footerLogoCmps.length).toBe(3, 'should have 3 logo components');
 
                 expect(footerLogoCmps[0].logo).toBeTruthy();
-                expect(footerLogoCmps[0].logo).toEqual(expectedLogos.angular, 'should have angular logo');
+                expect(footerLogoCmps[0].logo).toEqual(expectedLogos.github, 'should have github logo');
 
                 expect(footerLogoCmps[1].logo).toBeTruthy();
-                expect(footerLogoCmps[1].logo).toEqual(expectedLogos.bootstrap, 'should have bootstrap logo');
+                expect(footerLogoCmps[1].logo).toEqual(expectedLogos.angular, 'should have angular logo');
+
+                expect(footerLogoCmps[2].logo).toBeTruthy();
+                expect(footerLogoCmps[2].logo).toEqual(expectedLogos.bootstrap, 'should have bootstrap logo');
             });
         });
     });
diff --git a/src/app/core/footer/footer-poweredby/footer-poweredby.component.ts b/src/app/core/footer/footer-poweredby/footer-poweredby.component.ts
index ee2c7ded99..25171fab7e 100644
--- a/src/app/core/footer/footer-poweredby/footer-poweredby.component.ts
+++ b/src/app/core/footer/footer-poweredby/footer-poweredby.component.ts
@@ -1,17 +1,24 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
 
 import { Logos } from '@awg-core/core-models';
 
+/**
+ * The FooterPoweredBy component.
+ *
+ * It contains the poweredby section of the footer.
+ */
 @Component({
     selector: 'awg-footer-poweredby',
     templateUrl: './footer-poweredby.component.html',
-    styleUrls: ['./footer-poweredby.component.css']
+    styleUrls: ['./footer-poweredby.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class FooterPoweredbyComponent implements OnInit {
+export class FooterPoweredbyComponent {
+    /**
+     * Input variable: logos.
+     *
+     * It keeps the logos data for the component.
+     */
     @Input()
     logos: Logos;
-
-    constructor() {}
-
-    ngOnInit() {}
 }
diff --git a/src/app/core/footer/footer.component.html b/src/app/core/footer/footer.component.html
index cabfa8ab8c..39efd46b5b 100644
--- a/src/app/core/footer/footer.component.html
+++ b/src/app/core/footer/footer.component.html
@@ -2,7 +2,7 @@
     <!-- main top footer -->
     <div class="row awg-footer-top">
         <div class="col-md-8">
-            <awg-footer-declaration [metaData]="metaData"></awg-footer-declaration>
+            <awg-footer-declaration [pageMetaData]="pageMetaData"></awg-footer-declaration>
         </div>
 
         <div class="col-6 col-md-2 order-md-first mb-4 mt-md-4">
@@ -16,7 +16,7 @@
     <!-- secondary bottom footer -->
     <div class="row awg-footer-bottom text-muted">
         <div class="col-6 col-sm-8 text-left">
-            <awg-footer-copyright [metaData]="metaData"></awg-footer-copyright>
+            <awg-footer-copyright [pageMetaData]="pageMetaData"></awg-footer-copyright>
         </div>
         <div class="col-6 col-sm-4 text-right my-auto">
             <awg-footer-poweredby [logos]="logos"></awg-footer-poweredby>
diff --git a/src/app/core/footer/footer.component.spec.ts b/src/app/core/footer/footer.component.spec.ts
index 532139ba06..40f156faa1 100644
--- a/src/app/core/footer/footer.component.spec.ts
+++ b/src/app/core/footer/footer.component.spec.ts
@@ -4,7 +4,7 @@ import { Component, DebugElement, Input } from '@angular/core';
 
 import { getAndExpectDebugElementByCss, getAndExpectDebugElementByDirective } from '@testing/expect-helper';
 
-import { Logo, Logos, Meta } from '@awg-core/core-models';
+import { Logo, Logos, MetaPage, MetaSectionTypes } from '@awg-core/core-models';
 import { LOGOSDATA, METADATA } from '@awg-core/mock-data';
 import { CoreService } from '@awg-core/services';
 
@@ -14,13 +14,13 @@ import { FooterComponent } from './footer.component';
 @Component({ selector: 'awg-footer-copyright', template: '' })
 class FooterCopyrightStubComponent {
     @Input()
-    metaData: Meta;
+    pageMetaData: MetaPage;
 }
 
 @Component({ selector: 'awg-footer-declaration', template: '' })
 class FooterDeclarationStubComponent {
     @Input()
-    metaData: Meta;
+    pageMetaData: MetaPage;
 }
 
 @Component({ selector: 'awg-footer-logo', template: '' })
@@ -43,13 +43,13 @@ describe('FooterComponent (DONE)', () => {
 
     let mockCoreService: Partial<CoreService>;
 
-    let expectedMetaData: Meta;
+    let expectedPageMetaData: MetaPage;
     let expectedLogos: Logos;
 
     beforeEach(async(() => {
         // stub service for test purposes
         mockCoreService = {
-            getMetaData: () => expectedMetaData,
+            getMetaDataSection: sectionType => METADATA[sectionType],
             getLogos: () => expectedLogos
         };
 
@@ -73,7 +73,7 @@ describe('FooterComponent (DONE)', () => {
 
         // test data
         expectedLogos = LOGOSDATA;
-        expectedMetaData = METADATA;
+        expectedPageMetaData = METADATA[MetaSectionTypes.page];
 
         // spies on component functions
         // `.and.callThrough` will track the spy down the nested describes, see
@@ -90,18 +90,21 @@ describe('FooterComponent (DONE)', () => {
         expect(mockCoreService === coreService).toBe(false);
 
         // changing the stub service has no effect on the injected service
-        const changedMetaData = new Meta();
-        changedMetaData.page = {
+        let changedPageMetaData = new MetaPage();
+        changedPageMetaData = {
             yearStart: 2015,
-            yearRecent: 2017,
-            editionUrl: '',
-            webernUrl: '',
+            yearCurrent: 2017,
+            awgAppUrl: '',
+            compodocUrl: '',
+            githubUrl: '',
+            awgProjectName: '',
+            awgProjectUrl: '',
             version: '1.0.0',
             versionReleaseDate: '8. November 2016'
         };
-        mockCoreService.getMetaData = () => changedMetaData;
+        mockCoreService.getMetaDataSection = () => changedPageMetaData;
 
-        expect(coreService.getMetaData()).toBe(expectedMetaData);
+        expect(coreService.getMetaDataSection(MetaSectionTypes.page)).toBe(expectedPageMetaData);
     });
 
     describe('BEFORE initial data binding', () => {
@@ -110,8 +113,8 @@ describe('FooterComponent (DONE)', () => {
                 expect(component.provideMetaData).not.toHaveBeenCalled();
             });
 
-            it('... should not have metaData', () => {
-                expect(component.metaData).toBeUndefined('should be undefined');
+            it('... should not have pageMetaData', () => {
+                expect(component.pageMetaData).toBeUndefined('should be undefined');
             });
 
             it('... should not have logos', () => {
@@ -157,8 +160,8 @@ describe('FooterComponent (DONE)', () => {
 
     describe('AFTER initial data binding', () => {
         beforeEach(() => {
-            // simulate the parent setting the input properties
-            component.metaData = expectedMetaData;
+            // mock the call to the meta service in #provideMetaData
+            component.pageMetaData = mockCoreService.getMetaDataSection(MetaSectionTypes.page);
 
             // trigger initial data binding
             fixture.detectChanges();
@@ -170,8 +173,8 @@ describe('FooterComponent (DONE)', () => {
             });
 
             it('... should return metadata', () => {
-                expect(component.metaData).toBeDefined();
-                expect(component.metaData).toBe(expectedMetaData);
+                expect(component.pageMetaData).toBeDefined();
+                expect(component.pageMetaData).toBe(expectedPageMetaData);
             });
 
             it('... should return logos', () => {
@@ -182,7 +185,7 @@ describe('FooterComponent (DONE)', () => {
 
         describe('VIEW', () => {
             describe('main top footer', () => {
-                it('... should pass down metaData to footer declaration component', () => {
+                it('... should pass down pageMetaData to footer declaration component', () => {
                     const footerDeclarationDes = getAndExpectDebugElementByDirective(
                         compDe,
                         FooterDeclarationStubComponent,
@@ -193,8 +196,8 @@ describe('FooterComponent (DONE)', () => {
                         FooterDeclarationStubComponent
                     ) as FooterDeclarationStubComponent;
 
-                    expect(footerDeclarationCmp.metaData).toBeTruthy();
-                    expect(footerDeclarationCmp.metaData).toEqual(expectedMetaData, 'should have metaData');
+                    expect(footerDeclarationCmp.pageMetaData).toBeTruthy();
+                    expect(footerDeclarationCmp.pageMetaData).toEqual(expectedPageMetaData, 'should have pageMetaData');
                 });
 
                 it('... should pass down logos to footer logo components', () => {
@@ -214,7 +217,7 @@ describe('FooterComponent (DONE)', () => {
             });
 
             describe('secondary bottom footer', () => {
-                it('... should pass down metaData to footer copyright component', () => {
+                it('... should pass down pageMetaData to footer copyright component', () => {
                     const footerCopyrightDes = getAndExpectDebugElementByDirective(
                         compDe,
                         FooterCopyrightStubComponent,
@@ -225,8 +228,8 @@ describe('FooterComponent (DONE)', () => {
                         FooterCopyrightStubComponent
                     ) as FooterCopyrightStubComponent;
 
-                    expect(footerCopyrightCmp.metaData).toBeTruthy();
-                    expect(footerCopyrightCmp.metaData).toEqual(expectedMetaData, 'should have metaData');
+                    expect(footerCopyrightCmp.pageMetaData).toBeTruthy();
+                    expect(footerCopyrightCmp.pageMetaData).toEqual(expectedPageMetaData, 'should have pageMetaData');
                 });
 
                 it('... should pass down logos to footer poweredby component', () => {
diff --git a/src/app/core/footer/footer.component.ts b/src/app/core/footer/footer.component.ts
index e4f3ab19e0..6ec0022d00 100644
--- a/src/app/core/footer/footer.component.ts
+++ b/src/app/core/footer/footer.component.ts
@@ -1,25 +1,67 @@
 import { Component, OnInit } from '@angular/core';
 
-import { Logos, Meta } from '@awg-core/core-models';
+import { Logos, MetaSectionTypes, MetaPage } from '@awg-core/core-models';
 import { CoreService } from '@awg-core/services';
 
+/**
+ * The Footer component.
+ *
+ * It contains the footer section of the app
+ * with the {@link FooterDeclarationComponent},
+ * {@link FooterCopyrightComponent},
+ * {@link FooterPoweredbyComponent}
+ * and {@link FooterLogoComponent}.
+ */
 @Component({
     selector: 'awg-footer',
     templateUrl: './footer.component.html',
     styleUrls: ['./footer.component.css']
 })
 export class FooterComponent implements OnInit {
-    metaData: Meta;
+    /**
+     * Public variable: pageMetaData.
+     *
+     * It keeps the page meta data for the footer.
+     */
+    pageMetaData: MetaPage;
+
+    /**
+     * Public variable: logos.
+     *
+     * It keeps the logos for the footer.
+     */
     logos: Logos;
 
+    /**
+     * Constructor of the FooterComponent.
+     *
+     * It declares a private CoreService instance
+     * to get the meta data and logos.
+     *
+     * @param {CoreService} coreService Instance of the CoreService.
+     */
     constructor(private coreService: CoreService) {}
 
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {
         this.provideMetaData();
     }
 
+    /**
+     * Public method: provideMetaData.
+     *
+     * It calls the CoreService to provide
+     * the meta data and logos for the footer.
+     *
+     * @returns {void} Sets the pageMetaData and logos variables.
+     */
     provideMetaData(): void {
-        this.metaData = this.coreService.getMetaData();
+        this.pageMetaData = this.coreService.getMetaDataSection(MetaSectionTypes.page);
         this.logos = this.coreService.getLogos();
     }
 }
diff --git a/src/app/views/data-view/interceptors/caching.interceptor.spec.ts b/src/app/core/interceptors/caching/caching.interceptor.spec.ts
similarity index 89%
rename from src/app/views/data-view/interceptors/caching.interceptor.spec.ts
rename to src/app/core/interceptors/caching/caching.interceptor.spec.ts
index 38d80166f9..adb5b22262 100644
--- a/src/app/views/data-view/interceptors/caching.interceptor.spec.ts
+++ b/src/app/core/interceptors/caching/caching.interceptor.spec.ts
@@ -2,7 +2,7 @@ import { TestBed, inject } from '@angular/core/testing';
 
 import { CachingInterceptor } from './caching.interceptor';
 
-describe('CachingInterceptorService', () => {
+describe('CachingInterceptor', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             providers: [CachingInterceptor]
diff --git a/src/app/views/data-view/interceptors/caching.interceptor.ts b/src/app/core/interceptors/caching/caching.interceptor.ts
similarity index 74%
rename from src/app/views/data-view/interceptors/caching.interceptor.ts
rename to src/app/core/interceptors/caching/caching.interceptor.ts
index 2a0a77f0d4..24a6494340 100644
--- a/src/app/views/data-view/interceptors/caching.interceptor.ts
+++ b/src/app/core/interceptors/caching/caching.interceptor.ts
@@ -13,14 +13,38 @@ import { catchError, tap } from 'rxjs/operators';
 
 import { HttpCacheService } from '@awg-views/data-view/services';
 
-@Injectable({
-    providedIn: 'root'
-})
+/**
+ * The Caching interceptor.
+ *
+ * It implements the `HttpInterceptor`
+ * to intercept outgoing http requests and
+ * to delegate them to the {@link HttpCacheService}.
+ */
+@Injectable()
 export class CachingInterceptor implements HttpInterceptor {
+    /**
+     * Constructor of the CachingInterceptor.
+     *
+     * It declares a private {@link HttpCacheService} instance
+     * to handle the caching of http responses.
+     *
+     * @param {HttpCacheService} cache Instance of the HttpCacheService.
+     */
     constructor(private cache: HttpCacheService) {}
 
     // private cache = {};
 
+    /**
+     * Public method: intercept.
+     *
+     * It intercepts outgoing http requests and
+     * delegates them to the {@link HttpCacheService}.
+     *
+     * @param {HttpRequest<any>} req An HttpRequest to be intercepted.
+     * @param {HttpHandler} next An HttpHandler.
+     *
+     * @returns {Observable<HttpEvent<any>>} An HttpEvent observable.
+     */
     intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
         // TODO: rm
         // console.log('------------> CachingInterceptor');
diff --git a/src/app/core/interceptors/index.ts b/src/app/core/interceptors/index.ts
new file mode 100644
index 0000000000..8e34447d14
--- /dev/null
+++ b/src/app/core/interceptors/index.ts
@@ -0,0 +1,11 @@
+/**
+ *
+ *              DataInterceptors
+ *
+ * This file exports interceptors that are used
+ * for the data (search) view.
+ *
+ */
+import { httpInterceptorProviders } from './interceptor-providers';
+
+export { httpInterceptorProviders };
diff --git a/src/app/core/interceptors/interceptor-providers.ts b/src/app/core/interceptors/interceptor-providers.ts
new file mode 100644
index 0000000000..76d3923968
--- /dev/null
+++ b/src/app/core/interceptors/interceptor-providers.ts
@@ -0,0 +1,25 @@
+import { HTTP_INTERCEPTORS } from '@angular/common/http';
+
+import { CachingInterceptor } from './caching/caching.interceptor';
+import { LoadingInterceptor } from './loading/loading.interceptor';
+
+/**
+ * httpInterceptorProviders for the data (search) view.
+ *
+ * They allow to intercept and cache the search requests
+ * using the {@link CachingInterceptor} and to
+ * update the loading status using the {@link LoadingInterceptor}.
+ *
+ */
+export const httpInterceptorProviders = [
+    {
+        provide: HTTP_INTERCEPTORS,
+        useClass: CachingInterceptor,
+        multi: true
+    },
+    {
+        provide: HTTP_INTERCEPTORS,
+        useClass: LoadingInterceptor,
+        multi: true
+    }
+];
diff --git a/src/app/core/interceptors/loading/loading.interceptor.spec.ts b/src/app/core/interceptors/loading/loading.interceptor.spec.ts
new file mode 100644
index 0000000000..a67e246ce4
--- /dev/null
+++ b/src/app/core/interceptors/loading/loading.interceptor.spec.ts
@@ -0,0 +1,15 @@
+import { TestBed, inject } from '@angular/core/testing';
+
+import { LoadingInterceptor } from './loading.interceptor';
+
+describe('LoadingInterceptor', () => {
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            providers: [LoadingInterceptor]
+        });
+    });
+
+    it('should be created', inject([LoadingInterceptor], (service: LoadingInterceptor) => {
+        expect(service).toBeTruthy();
+    }));
+});
diff --git a/src/app/core/interceptors/loading/loading.interceptor.ts b/src/app/core/interceptors/loading/loading.interceptor.ts
new file mode 100644
index 0000000000..bf65a273b4
--- /dev/null
+++ b/src/app/core/interceptors/loading/loading.interceptor.ts
@@ -0,0 +1,130 @@
+import { Injectable } from '@angular/core';
+import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest, HttpResponse } from '@angular/common/http';
+
+import { Observable } from 'rxjs';
+
+import { LoadingService } from '@awg-core/services';
+
+/**
+ * The Loading interceptor.
+ *
+ * It implements the `HttpInterceptor`
+ * to intercept outgoing http pendingRequests and
+ * to delegate a loading status to the  {@link LoadingService}.
+ *
+ * @see Jørn Are Hatlelid: Loading-status in Angular done right, April 18, 2018.
+ * {@link https://medium.com/grensesnittet/loading-status-in-angular-done-right-aeed09cfbea6}.
+ */
+@Injectable()
+export class LoadingInterceptor implements HttpInterceptor {
+    /**
+     * Private variable: pendingRequests.
+     *
+     * It stores the array of pending requests.
+     */
+    private pendingRequests: HttpRequest<any>[] = [];
+
+    /**
+     * Constructor of the LoadingInterceptor.
+     *
+     * It declares a private {@link LoadingService} instance
+     * to handle the loading status.
+     *
+     * @param {LoadingService} loadingService Instance of the LoadingService.
+     */
+    constructor(private loadingService: LoadingService) {}
+
+    /**
+     * Private method: decreaseRequest.
+     *
+     * It removes a given http request from the pendingRequests array
+     * and sets the loading status of the {@link LoadingService}
+     * depending on the pending requests.
+     *
+     * @param {HttpRequest<any>} req The given HttpRequest to be removed.
+     *
+     * @returns {void} Sets the loading status.
+     */
+    private decreaseRequest(req: HttpRequest<any>): void {
+        // find index position of request in pending requests array
+        const i = this.pendingRequests.indexOf(req);
+
+        /*
+        console.log('------------> ');
+        console.log('i', i);
+        console.log('length BEFORE', this.pendingRequests.length);
+        console.log('pendingRequests', [...this.pendingRequests]);
+        console.log(req.urlWithParams);
+        */
+
+        if (i >= 0) {
+            // remove the request from the array
+            this.pendingRequests.splice(i, 1);
+        }
+
+        /*
+        console.log('length AFTER', this.pendingRequests.length);
+        console.log('loading > ', this.pendingRequests.length > 0);
+        */
+
+        // update loading status depending on the pending requests
+        this.loadingService.updateLoadingStatus(this.pendingRequests.length > 0);
+    }
+
+    /**
+     * Public method: intercept.
+     *
+     * It intercepts outgoing http requests and
+     * delegates them to the {@link LoadingService}.
+     *
+     * @param {HttpRequest<any>} req An HttpRequest to be intercepted.
+     * @param {HttpHandler} next An HttpHandler.
+     *
+     * @returns {Observable<HttpEvent<any>>} An HttpEvent observable.
+     */
+    intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
+        // console.log('LOADINGINTERCEPTOR ------------>');
+
+        // store the request
+        this.pendingRequests.push(req);
+
+        // console.log('REQ', req);
+
+        // start loading and update status
+        this.loadingService.updateLoadingStatus(true);
+
+        // create a new observable to return instead of the original
+        return new Observable(observer => {
+            // subscribe to the original observable to ensure the HttpRequest is made
+            const subscription = next.handle(req).subscribe(
+                event => {
+                    if (event instanceof HttpResponse) {
+                        // console.warn('------------> event', event.url);
+                        this.decreaseRequest(req);
+                        observer.next(event);
+                    }
+                },
+                err => {
+                    // console.warn('------------> err', err);
+                    this.decreaseRequest(req);
+                    observer.error(err);
+                },
+                () => {
+                    // console.warn('------------> complete');
+                    if (this.pendingRequests.length > 0) {
+                        this.decreaseRequest(req);
+                    }
+                    observer.complete();
+                }
+            );
+            // return teardown logic in case of cancelled requests
+            return () => {
+                // console.warn('------------> teardown');
+                if (this.pendingRequests.length > 0) {
+                    this.decreaseRequest(req);
+                }
+                subscription.unsubscribe();
+            };
+        });
+    }
+}
diff --git a/src/app/core/mock-data/logos.data.ts b/src/app/core/mock-data/logos.data.ts
index 69f72d5ff5..44ca695d6d 100644
--- a/src/app/core/mock-data/logos.data.ts
+++ b/src/app/core/mock-data/logos.data.ts
@@ -1,18 +1,13 @@
 import { Logos } from '@awg-core/core-models';
 
+/**
+ * Object constant with a set of logos.
+ *
+ * It provides metadata for the logos used in the app.
+ *
+ * Available logos: `unibas`, `snf`, `angular`, `bootstrap`.
+ */
 export const LOGOSDATA: Logos = {
-    unibas: {
-        id: 'unibaslogo',
-        src: 'assets/img/logos/uni.svg',
-        alt: 'Logo Uni Basel',
-        href: 'https://www.unibas.ch'
-    },
-    snf: {
-        id: 'snflogo',
-        src: 'assets/img/logos/snf.png',
-        alt: 'Logo SNF',
-        href: 'http://www.snf.ch'
-    },
     angular: {
         id: 'angularlogo',
         src: 'assets/img/logos/angular.svg',
@@ -24,5 +19,23 @@ export const LOGOSDATA: Logos = {
         src: 'assets/img/logos/ng-bootstrap.svg',
         alt: 'Logo ng-Bootstrap',
         href: 'https://ng-bootstrap.github.io/'
+    },
+    github: {
+        id: 'githublogo',
+        src: 'assets/img/logos/github.svg',
+        alt: 'Logo GitHub',
+        href: 'https://github.com/webern-unibas-ch/awg-app'
+    },
+    snf: {
+        id: 'snflogo',
+        src: 'assets/img/logos/snf.png',
+        alt: 'Logo SNF',
+        href: 'http://www.snf.ch'
+    },
+    unibas: {
+        id: 'unibaslogo',
+        src: 'assets/img/logos/uni.svg',
+        alt: 'Logo Uni Basel',
+        href: 'https://www.unibas.ch'
     }
 };
diff --git a/src/app/core/mock-data/meta.data.ts b/src/app/core/mock-data/meta.data.ts
index 44407d8263..b6275d31f8 100644
--- a/src/app/core/mock-data/meta.data.ts
+++ b/src/app/core/mock-data/meta.data.ts
@@ -1,24 +1,87 @@
 import { AppConfig } from '@awg-app/app.config';
-import { Meta } from '@awg-core/core-models';
+import { Meta, MetaContact, MetaEdition, MetaPage, MetaStructure } from '@awg-core/core-models';
 
-export const METADATA: Meta = {
-    page: {
-        yearStart: 2015,
-        yearRecent: new Date().getFullYear(),
-        editionUrl: AppConfig.EDITION_HOME,
-        webernUrl: AppConfig.WEBERN_HOME,
-        version: AppConfig.VERSION,
-        versionReleaseDate: AppConfig.VERSION_RELEASE_DATE
+/**
+ * Object constant for page metadata.
+ *
+ * It provides metadata used for the page framework.
+ */
+const METAPAGE: MetaPage = {
+    yearStart: 2015,
+    yearCurrent: new Date().getFullYear(),
+    awgAppUrl: AppConfig.AWG_APP_URL,
+    compodocUrl: AppConfig.AWG_APP_COMPODOC_URL,
+    githubUrl: AppConfig.AWG_APP_GITHUB_URL,
+    version: AppConfig.AWG_APP_VERSION,
+    versionReleaseDate: AppConfig.AWG_APP_VERSION_RELEASE_DATE,
+    awgProjectUrl: AppConfig.AWG_PROJECT_URL,
+    awgProjectName: AppConfig.AWG_PROJECT_NAME
+};
+
+/**
+ * Object constant for edition metadata.
+ *
+ * It provides metadata used for the edition view.
+ */
+const METAEDITION: MetaEdition = {
+    editors: [
+        {
+            name: 'Thomas Ahrend',
+            contactUrl: AppConfig.AWG_PROJECT_URL + 'index.php?id=3'
+        }
+    ],
+    lastModified: '29. Januar 2016'
+};
+
+/**
+ * Object constant for edition metadata.
+ *
+ * It provides metadata used for the structure view.
+ */
+const METASTRUCTURE: MetaStructure = {
+    authors: [
+        {
+            name: 'Stefan Münnich',
+            contactUrl: AppConfig.AWG_PROJECT_URL + 'index.php?id=3'
+        }
+    ],
+    lastModified: '29. Januar 2016'
+};
+
+/**
+ * Object constant for contact metadata.
+ *
+ * It provides metadata used for the contact view.
+ */
+const METACONTACT: MetaContact = {
+    address: {
+        institution: 'Musikwissenschaftliches Seminar der Universität Basel',
+        street: 'Petersgraben 27/29',
+        postalCode: 'CH-4051',
+        city: 'Basel',
+        country: 'Schweiz'
     },
-    edition: {
-        editors:
-            '<a href="' +
-            AppConfig.WEBERN_HOME +
-            'index.php?id=3" target="_blank" ref="noopener noreferrer">Thomas Ahrend</a>',
-        lastModified: '29. Januar 2016'
+    phone: {
+        label: 'Telefon:',
+        number: '+41 (0)61 207 28 21'
     },
-    structure: {
-        author: 'Stefan Münnich',
-        lastModified: '29. Januar 2016'
+    email: {
+        label: 'E-Mail:',
+        mailto: 'mailto:info-awg@unibas.ch',
+        safeString: 'info-awg [at] unibas [dot] ch'
     }
 };
+
+/**
+ * Object constant for metadata.
+ *
+ * It provides metadata used throughout different parts of the app.
+ *
+ * Available main sections: `page`, `edition`, `structure`, `contact`.
+ */
+export const METADATA: Meta = {
+    page: METAPAGE,
+    edition: METAEDITION,
+    structure: METASTRUCTURE,
+    contact: METACONTACT
+};
diff --git a/src/app/core/navbar/navbar.component.html b/src/app/core/navbar/navbar.component.html
index ea4a788c70..9845073b73 100644
--- a/src/app/core/navbar/navbar.component.html
+++ b/src/app/core/navbar/navbar.component.html
@@ -3,7 +3,7 @@
     <!-- length of 3 cols (4 on md), do not display on sm devices, no right margin, auto vertical align -->
     <a
         class="navbar-brand col-3 col-md-4 col-xl-3 d-sm-none d-md-inline mr-0 my-auto"
-        href="{{ metaData?.page?.webernUrl }}"
+        href="{{ pageMetaData?.awgProjectUrl }}"
         target="_blank"
         ref="noopener noreferrer"
     >
@@ -13,7 +13,7 @@
         </span>
     </a>
 
-    <!-- Toggler button -->
+    <!-- Toggle button -->
     <button
         type="button"
         class="navbar-toggler"
@@ -92,8 +92,8 @@ <h6 class="dropdown-header">Kritischer Bericht</h6>
         <!-- END left navbar -->
         <!-- brand to display on center on sm devices, auto vertical align -->
         <a
-            class="navbar-brand col-3 col-md-4 col-xl-3 d-sm-none d-md-inline mr-0 my-auto"
-            href="{{ metaData?.page?.webernUrl }}"
+            class="navbar-brand col-3 col-md-4 col-xl-3 d-sm-inline d-md-none mr-0 my-auto"
+            href="{{ pageMetaData?.awgProjectUrl }}"
             target="_blank"
             ref="noopener noreferrer"
         >
@@ -103,7 +103,7 @@ <h6 class="dropdown-header">Kritischer Bericht</h6>
             </span>
         </a>
 
-        <!-- rigth nav links, auto vertical align -->
+        <!-- right nav links, auto vertical align -->
         <ul class="navbar-nav my-auto">
             <li class="nav-item">
                 <a class="nav-link" [routerLink]="['/data/search', 'fulltext']" routerLinkActive="active">
diff --git a/src/app/core/navbar/navbar.component.spec.ts b/src/app/core/navbar/navbar.component.spec.ts
index e72f9a9134..2daeccc0b9 100644
--- a/src/app/core/navbar/navbar.component.spec.ts
+++ b/src/app/core/navbar/navbar.component.spec.ts
@@ -8,6 +8,11 @@ import { RouterLinkStubDirective } from '@testing/router-stubs';
 
 import { NgbCollapseModule, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { faEnvelope, faFileAlt, faHome, faNetworkWired, faSearch } from '@fortawesome/free-solid-svg-icons';
+
+import { MetaPage, MetaSectionTypes } from '@awg-core/core-models';
+import { METADATA } from '@awg-core/mock-data';
+import { CoreService } from '@awg-core/services';
 
 import { NavbarComponent } from './navbar.component';
 
@@ -19,12 +24,21 @@ describe('NavbarComponent (DONE)', () => {
     let linkDes: DebugElement[];
     let routerLinks;
 
+    let mockCoreService: Partial<CoreService>;
+
+    let expectedPageMetaData: MetaPage;
     let expectedIsCollapsed: boolean;
 
     beforeEach(async(() => {
+        // stub service for test purposes
+        mockCoreService = {
+            getMetaDataSection: () => expectedPageMetaData
+        };
+
         TestBed.configureTestingModule({
             imports: [FontAwesomeModule, NgbCollapseModule, NgbDropdownModule],
-            declarations: [NavbarComponent, RouterLinkStubDirective]
+            declarations: [NavbarComponent, RouterLinkStubDirective],
+            providers: [{ provide: CoreService, useValue: mockCoreService }]
         }).compileComponents();
     }));
 
@@ -36,22 +50,64 @@ describe('NavbarComponent (DONE)', () => {
 
         // test data
         expectedIsCollapsed = true;
+        expectedPageMetaData = METADATA[MetaSectionTypes.page];
 
         // spies on component functions
         // `.and.callThrough` will track the spy down the nested describes, see
         // https://jasmine.github.io/2.0/introduction.html#section-Spies:_%3Ccode%3Eand.callThrough%3C/code%3E
+        spyOn(component, 'provideMetaData').and.callThrough();
         spyOn(component, 'toggleNav').and.callThrough();
     });
 
+    it('stub service and injected coreService should not be the same', () => {
+        const coreService = TestBed.get(CoreService);
+        expect(mockCoreService === coreService).toBe(false);
+
+        // changing the stub service has no effect on the injected service
+        let changedPageMetaData = new MetaPage();
+        changedPageMetaData = {
+            yearStart: 2015,
+            yearCurrent: 2017,
+            awgAppUrl: '',
+            compodocUrl: '',
+            githubUrl: '',
+            awgProjectName: '',
+            awgProjectUrl: '',
+            version: '1.0.0',
+            versionReleaseDate: '8. November 2016'
+        };
+        mockCoreService.getMetaDataSection = () => changedPageMetaData;
+
+        expect(coreService.getMetaDataSection()).toBe(expectedPageMetaData);
+    });
+
     it('should create', () => {
         expect(component).toBeTruthy();
     });
 
     describe('BEFORE initial data binding', () => {
+        it('should have fontawesome icons', () => {
+            expect(component.faEnvelope).toBe(faEnvelope, 'should be faEnvelope');
+            expect(component.faFileAlt).toBe(faFileAlt, 'should be faFileAlt');
+            expect(component.faHome).toBe(faHome, 'should be faHome');
+            expect(component.faNetworkWired).toBe(faNetworkWired, 'should be faNetworkWired');
+            expect(component.faSearch).toBe(faSearch, 'should be faSearch');
+        });
+
         it('should have `isCollapsed = true`', () => {
             expect(component.isCollapsed).toBe(true, 'should be true');
         });
 
+        describe('#provideMetaData', () => {
+            it('... should not have been called', () => {
+                expect(component.provideMetaData).not.toHaveBeenCalled();
+            });
+
+            it('... should not have pageMetaData', () => {
+                expect(component.pageMetaData).toBeUndefined('should be undefined');
+            });
+        });
+
         describe('#toggleNav', () => {
             it('... should not have been called', () => {
                 expect(component.toggleNav).not.toHaveBeenCalled();
@@ -93,15 +149,60 @@ describe('NavbarComponent (DONE)', () => {
             it('... should contain 1 navbar collapse', () => {
                 getAndExpectDebugElementByCss(compDe, 'nav.navbar > .navbar-collapse', 1, 1);
             });
+
+            it('... should not render awg project url in navbar-brand yet', () => {
+                const urlDes = getAndExpectDebugElementByCss(compDe, 'a.navbar-brand', 2, 2);
+                const urlEl1 = urlDes[0].nativeElement;
+                const urlEl2 = urlDes[1].nativeElement;
+
+                expect(urlEl1.href).toBeDefined();
+                expect(urlEl1.href).toBe('', 'should be empty string');
+
+                expect(urlEl2.href).toBeDefined();
+                expect(urlEl2.href).toBe('', 'should be empty string');
+            });
         });
     });
 
     describe('AFTER initial data binding', () => {
         beforeEach(() => {
+            component.pageMetaData = mockCoreService.getMetaDataSection(MetaSectionTypes.page);
+
             // trigger initial data binding
             fixture.detectChanges();
         });
 
+        describe('#provideMetaData', () => {
+            it('... should have been called', () => {
+                expect(component.provideMetaData).toHaveBeenCalled();
+            });
+
+            it('... should return metadata', () => {
+                expect(component.pageMetaData).toBeDefined();
+                expect(component.pageMetaData).toBe(expectedPageMetaData);
+            });
+        });
+
+        describe('VIEW', () => {
+            it('... should render awg project url in navbar-brand', () => {
+                const urlDes = getAndExpectDebugElementByCss(compDe, 'a.navbar-brand', 2, 2);
+                const urlEl1 = urlDes[0].nativeElement;
+                const urlEl2 = urlDes[1].nativeElement;
+
+                expect(urlEl1.href).toBeDefined();
+                expect(urlEl1.href).toBe(
+                    expectedPageMetaData.awgProjectUrl,
+                    `should be ${expectedPageMetaData.awgProjectUrl}`
+                );
+
+                expect(urlEl2.href).toBeDefined();
+                expect(urlEl2.href).toBe(
+                    expectedPageMetaData.awgProjectUrl,
+                    `should be ${expectedPageMetaData.awgProjectUrl}`
+                );
+            });
+        });
+
         describe('[routerLink]', () => {
             beforeEach(() => {
                 // find DebugElements with an attached RouterLinkStubDirective
@@ -111,7 +212,7 @@ describe('NavbarComponent (DONE)', () => {
                 routerLinks = linkDes.map(de => de.injector.get(RouterLinkStubDirective));
             });
 
-            it('... can get routerLink from template', () => {
+            it('... can get 14 routerLinks from template', () => {
                 expect(routerLinks.length).toBe(14, 'should have 14 routerLinks');
                 expect(routerLinks[0].linkParams).toEqual(['/home']);
                 expect(routerLinks[1].linkParams).toEqual(['/edition', 'intro']);
@@ -129,6 +230,54 @@ describe('NavbarComponent (DONE)', () => {
                 expect(routerLinks[13].linkParams).toEqual(['/contact']);
             });
 
+            it('... can click Home link in template', () => {
+                const homeLinkDe = linkDes[0]; // contact link DebugElement
+                const homeLink = routerLinks[0]; // contact link directive
+
+                expect(homeLink.navigatedTo).toBeNull('should not have navigated yet');
+
+                click(homeLinkDe);
+                fixture.detectChanges();
+
+                expect(homeLink.navigatedTo).toEqual(['/home']);
+            });
+
+            it('... can click Edition link in template', () => {
+                const editionLinkDe = linkDes[1]; // contact link DebugElement
+                const editionLink = routerLinks[1]; // contact link directive
+
+                expect(editionLink.navigatedTo).toBeNull('should not have navigated yet');
+
+                click(editionLinkDe);
+                fixture.detectChanges();
+
+                expect(editionLink.navigatedTo).toEqual(['/edition', 'intro']);
+            });
+
+            it('... can click Structure link in template', () => {
+                const structureLinkDe = linkDes[11]; // contact link DebugElement
+                const structureLink = routerLinks[11]; // contact link directive
+
+                expect(structureLink.navigatedTo).toBeNull('should not have navigated yet');
+
+                click(structureLinkDe);
+                fixture.detectChanges();
+
+                expect(structureLink.navigatedTo).toEqual(['/structure']);
+            });
+
+            it('... can click Data link in template', () => {
+                const dataLinkDe = linkDes[12]; // contact link DebugElement
+                const dataLink = routerLinks[12]; // contact link directive
+
+                expect(dataLink.navigatedTo).toBeNull('should not have navigated yet');
+
+                click(dataLinkDe);
+                fixture.detectChanges();
+
+                expect(dataLink.navigatedTo).toEqual(['/data/search', 'fulltext']);
+            });
+
             it('... can click Contact link in template', () => {
                 const contactLinkDe = linkDes[13]; // contact link DebugElement
                 const contactLink = routerLinks[13]; // contact link directive
diff --git a/src/app/core/navbar/navbar.component.ts b/src/app/core/navbar/navbar.component.ts
index 3b260c8468..009376600e 100644
--- a/src/app/core/navbar/navbar.component.ts
+++ b/src/app/core/navbar/navbar.component.ts
@@ -1,37 +1,110 @@
 import { Component, OnInit } from '@angular/core';
 
-import { faFileAlt, faEnvelope, faHome, faNetworkWired, faSearch } from '@fortawesome/free-solid-svg-icons';
+import { faEnvelope, faFileAlt, faHome, faNetworkWired, faSearch } from '@fortawesome/free-solid-svg-icons';
 
-import { Meta } from '@awg-core/core-models';
+import { MetaPage, MetaSectionTypes } from '@awg-core/core-models';
 import { CoreService } from '@awg-core/services';
 
+/**
+ * The Header component.
+ *
+ * It contains the header section of the app
+ * with the navigation bar, menu and brand.
+ */
 @Component({
     selector: 'awg-navbar',
     templateUrl: './navbar.component.html',
     styleUrls: ['./navbar.component.css']
 })
 export class NavbarComponent implements OnInit {
-    isCollapsed = true;
-
-    metaData: Meta;
-
-    // fontawesome icons
+    /**
+     * Public variable: faEnvelope.
+     *
+     * It instantiates fontawesome's faEnvelope icon.
+     */
     faEnvelope = faEnvelope;
+
+    /**
+     * Public variable: faFileAlt.
+     *
+     * It instantiates fontawesome's faFileAlt icon.
+     */
     faFileAlt = faFileAlt;
+
+    /**
+     * Public variable: faHome.
+     *
+     * It instantiates fontawesome's faHome icon.
+     */
     faHome = faHome;
+
+    /**
+     * Public variable: faNetworkWired.
+     *
+     * It instantiates fontawesome's faNetworkWired icon.
+     */
     faNetworkWired = faNetworkWired;
+
+    /**
+     * Public variable: faSearch.
+     *
+     * It instantiates fontawesome's faSearch icon.
+     */
     faSearch = faSearch;
 
+    /**
+     * Public variable: isCollapsed.
+     *
+     * If the header menu is collapsed or not.
+     */
+    isCollapsed = true;
+
+    /**
+     * Public variable: pageMetaData.
+     *
+     * It keeps the page meta data for the header.
+     */
+    pageMetaData: MetaPage;
+
+    /**
+     * Constructor of the HeaderComponent.
+     *
+     * It declares a private CoreService instance
+     * to get the meta data.
+     *
+     * @param {CoreService} coreService Instance of the CoreService.
+     */
     constructor(private coreService: CoreService) {}
 
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {
         this.provideMetaData();
     }
 
+    /**
+     * Public method: provideMetaData.
+     *
+     * It calls the CoreService to provide
+     * the meta data for the header.
+     *
+     * @returns {void} Sets the pageMetaData variable.
+     */
     provideMetaData(): void {
-        this.metaData = this.coreService.getMetaData();
+        this.pageMetaData = this.coreService.getMetaDataSection(MetaSectionTypes.page);
     }
 
+    /**
+     * Public method: toggleNav.
+     *
+     * It toggles the isCollapsed flag.
+     *
+     * @returns {boolean} Sets the isCollapsed flag.
+     */
     toggleNav(): boolean {
         return (this.isCollapsed = !this.isCollapsed);
     }
diff --git a/src/app/core/services/api-service/api-request.model.ts b/src/app/core/services/api-service/api-request.model.ts
index 5fab8684f1..93ef549963 100644
--- a/src/app/core/services/api-service/api-request.model.ts
+++ b/src/app/core/services/api-service/api-request.model.ts
@@ -2,14 +2,43 @@ import { HttpHeaders, HttpParams } from '@angular/common/http';
 
 import { AppConfig } from '@awg-app/app.config';
 
+/**
+ * The ApiRequest class.
+ *
+ * It is used in the context of the ApiService
+ * to store the data of an API request.
+ */
 export class ApiRequest {
+    /**
+     * The headers of an API request.
+     */
     headers: HttpHeaders;
+
+    /**
+     * The HTTP parameters of an API request.
+     */
     params: HttpParams;
+
+    /**
+     * The url of an API request.
+     *
+     * It combines the API_ENDPOINT stored in AppConfig
+     * with the given queryPath.
+     */
     url: string;
 
-    constructor(queryPath: string, params: HttpParams) {
+    /**
+     * Constructor of the ApiRequest class.
+     *
+     * It initializes the class with values
+     * from given query path and parameters.
+     *
+     * @param {string} queryPath The given query path.
+     * @param {HttpParams} queryHttpParams The given query parameters.
+     */
+    constructor(queryPath: string, queryHttpParams: HttpParams) {
         this.headers = new HttpHeaders().set('Accept', 'application/json');
-        this.params = params;
+        this.params = queryHttpParams;
         this.url = AppConfig.API_ENDPOINT + queryPath;
     }
 }
diff --git a/src/app/core/services/api-service/api-service-result.model.ts b/src/app/core/services/api-service/api-service-result.model.ts
index 1d0bab8bfd..bb93f646e2 100644
--- a/src/app/core/services/api-service/api-service-result.model.ts
+++ b/src/app/core/services/api-service/api-service-result.model.ts
@@ -18,6 +18,9 @@ import { JsonConvert, OperationMode, ValueCheckingMode } from 'json2typescript';
  * Result class used as API url response in ApiService
  */
 export class ApiServiceResult {
+    /**
+     * Configuration and instantiation of JsonConvert.
+     */
     private static jsonConvert: JsonConvert = new JsonConvert(OperationMode.ENABLE, ValueCheckingMode.ALLOW_NULL);
 
     /**
@@ -42,12 +45,13 @@ export class ApiServiceResult {
 
     /**
      * Gets the result body as instance of classObject.
+     *
      * @param classObject
-     * @returns {any}
+     *
+     * @returns {*}
      * @throws
      */
-
-    getBody(classObject?: { new (): any }): any {
+    getBody(classObject?: new () => any): any {
         // console.log(this.body);
         return ApiServiceResult.jsonConvert.deserialize(this.body, classObject);
     }
diff --git a/src/app/core/services/api-service/api.service.spec.ts b/src/app/core/services/api-service/api.service.spec.ts
index 3d86851026..e41e7787c0 100644
--- a/src/app/core/services/api-service/api.service.spec.ts
+++ b/src/app/core/services/api-service/api.service.spec.ts
@@ -85,11 +85,6 @@ describe('ApiService', () => {
             expect(apiService.serviceName).toBe(expectedServiceName);
         });
 
-        it(`... should have 'loading = false'`, () => {
-            expect(apiService.loading).toBeDefined();
-            expect(apiService.loading).toBeFalsy();
-        });
-
         it(`... should have empty 'httpGetUrl'`, () => {
             expect(apiService.httpGetUrl).toBeDefined();
             expect(apiService.httpGetUrl).toBe('');
@@ -105,15 +100,15 @@ describe('ApiService', () => {
             });
 
             // match the request url
-            const r = httpTestingController.expectOne({
+            const call = httpTestingController.expectOne({
                 url: '/foo/bar'
             });
 
             // check for GET request
-            expect(r.request.method).toEqual('GET');
+            expect(call.request.method).toEqual('GET');
 
             // respond with mocked data
-            r.flush(testData);
+            call.flush(testData);
         }));
     });
 
@@ -124,9 +119,13 @@ describe('ApiService', () => {
                 apiService.getApiResponse(UserDataJson, queryPath, queryHttpParams).subscribe();
 
                 // expect one request to url with given settings
-                const r = httpTestingController.expectOne((req: HttpRequest<any>) => {
+                const call = httpTestingController.expectOne((req: HttpRequest<any>) => {
                     return req.method === 'GET' && req.responseType === 'json' && req.url === expectedUrl;
                 }, `GET to ${expectedUrl}`);
+
+                expect(call.request.method).toEqual('GET', 'should be GET');
+                expect(call.request.responseType).toEqual('json', 'should be json');
+                expect(call.request.url).toEqual(expectedUrl, `should be ${expectedUrl}`);
             }));
 
             it(`... should apply an empty param object for HTTP GET if none is provided`, async(() => {
@@ -134,10 +133,7 @@ describe('ApiService', () => {
                 apiService.getApiResponse(UserDataJson, queryPath).subscribe();
 
                 // expect one request to url with given settings
-                const r = httpTestingController.expectOne((req: HttpRequest<any>) => {
-                    expect(req.params).toBeDefined();
-                    expect(req.params.keys().length).toBe(0);
-
+                const call = httpTestingController.expectOne((req: HttpRequest<any>) => {
                     return (
                         req.method === 'GET' &&
                         req.responseType === 'json' &&
@@ -145,6 +141,12 @@ describe('ApiService', () => {
                         req.params.keys().length === 0
                     );
                 }, `GET to ${expectedUrl} without params`);
+
+                expect(call.request.method).toEqual('GET', 'should be GET');
+                expect(call.request.responseType).toEqual('json', 'should be json');
+                expect(call.request.url).toEqual(expectedUrl, `should be ${expectedUrl}`);
+                expect(call.request.params).toBeDefined();
+                expect(call.request.params.keys().length).toBe(0, 'should be 0');
             }));
 
             it(`... should apply provided params for HTTP GET`, async(() => {
@@ -152,7 +154,7 @@ describe('ApiService', () => {
                 apiService.getApiResponse(UserDataJson, queryPath, queryHttpParams).subscribe();
 
                 // expect one request to url with given settings
-                const r = httpTestingController.expectOne((req: HttpRequest<any>) => {
+                const call = httpTestingController.expectOne((req: HttpRequest<any>) => {
                     return (
                         req.method === 'GET' &&
                         req.responseType === 'json' &&
@@ -162,6 +164,17 @@ describe('ApiService', () => {
                         req.params.get('show_nrows') === expectedNRows
                     );
                 }, `GET to ${expectedUrl} with 'searchtype=fulltext' and 'nrows=10'`);
+
+                expect(call.request.method).toEqual('GET', 'should be GET');
+                expect(call.request.responseType).toEqual('json', 'should be json');
+                expect(call.request.url).toEqual(expectedUrl, `should be ${expectedUrl}`);
+                expect(call.request.params).toBeDefined();
+                expect(call.request.params.keys().length).toBe(2, 'should be 2');
+                expect(call.request.params.get('searchtype')).toBe(
+                    expectedSearchType,
+                    `should be ${expectedSearchType}`
+                );
+                expect(call.request.params.get('show_nrows')).toBe(expectedNRows, `should be ${expectedNRows}`);
             }));
         });
 
@@ -182,12 +195,12 @@ describe('ApiService', () => {
                         });
 
                     // expect one request to url with given settings
-                    const r = httpTestingController.expectOne(
+                    const call = httpTestingController.expectOne(
                         (req: HttpRequest<any>) => req.method === 'GET' && req.url === expectedUrl
                     );
 
                     // respond with mock data
-                    r.flush(expectedApiServiceResult);
+                    call.flush(expectedApiServiceResult);
                 }));
 
                 it(`... should return a converted JSON object`, async(() => {
@@ -203,19 +216,19 @@ describe('ApiService', () => {
                         });
 
                     // expect one request to url with given settings
-                    const r = httpTestingController.expectOne(
+                    const call = httpTestingController.expectOne(
                         (req: HttpRequest<any>) => req.method === 'GET' && req.url === expectedUrl
                     );
 
                     // respond with mock data
-                    r.flush(expectedJsonResponse);
+                    call.flush(expectedJsonResponse);
                 }));
             });
 
             describe('fail', () => {
                 // see http://www.syntaxsuccess.com/viewarticle/unit-testing-rxjs-retries
                 it(`... should throw default ApiServiceError if httpGet fails with undefined handler`, done => {
-                    const expectedErrorMsg = 'failed HTTP response';
+                    const expectedErrorMsg = 'should fail HTTP response';
                     expectedApiServiceError = new ApiServiceError();
 
                     // spy on mocked http get call & throw an error
@@ -237,7 +250,7 @@ describe('ApiService', () => {
                 });
 
                 it(`... should throw specified ApiServiceError if httpGet fails with specified handler`, done => {
-                    const expectedErrorMsg = 'failed HTTP response with 500 error';
+                    const expectedErrorMsg = 'should fail HTTP response with 500 error';
                     expectedApiServiceError = createApiServiceError(500, 'Internal Server Error', true);
 
                     // spy on mocked http get call & throw an error
@@ -254,14 +267,14 @@ describe('ApiService', () => {
                     );
 
                     // expect no request to url with given settings
-                    const r = httpTestingController.expectNone(
+                    const call = httpTestingController.expectNone(
                         (req: HttpRequest<any>) => req.method === 'GET' && req.url === expectedUrl
                     );
                 });
 
-                /* test muted as long as console.error is commented out */
+                // test muted as long as console.error is commented out
                 xit(`... should log an error to the console on error`, async(() => {
-                    const expectedErrorMsg = 'failed HTTP response with 500 error';
+                    const expectedErrorMsg = 'should fail HTTP response with 500 error';
                     expectedApiServiceError = createApiServiceError(500, 'Internal Server Error');
 
                     const errorSpy = spyOn(console, 'error').and.callThrough();
@@ -276,16 +289,16 @@ describe('ApiService', () => {
                     );
 
                     // expect one request to url with given settings
-                    const r = httpTestingController.expectOne(
+                    const call = httpTestingController.expectOne(
                         (req: HttpRequest<any>) => req.method === 'GET' && req.url === expectedUrl
                     );
 
                     // respond with mock error
-                    r.flush(expectedErrorMsg, expectedApiServiceError);
+                    call.flush(expectedErrorMsg, expectedApiServiceError);
                 }));
 
                 it(`... should return 'ApiServiceError' for 401 Unauthorized`, async(() => {
-                    const expectedErrorMsg = 'failed HTTP response with 401 error';
+                    const expectedErrorMsg = 'should fail HTTP response with 401 error';
                     expectedApiServiceError = createApiServiceError(401, 'Unauthorized');
 
                     // call service function (fail)
@@ -297,16 +310,16 @@ describe('ApiService', () => {
                     );
 
                     // expect one request to url with given settings
-                    const r = httpTestingController.expectOne(
+                    const call = httpTestingController.expectOne(
                         (req: HttpRequest<any>) => req.method === 'GET' && req.url === expectedUrl
                     );
 
                     // respond with mock error
-                    r.flush(expectedErrorMsg, expectedApiServiceError);
+                    call.flush(expectedErrorMsg, expectedApiServiceError);
                 }));
 
                 it(`... should return 'ApiServiceError' for 404 Not found`, async(() => {
-                    const expectedErrorMsg = 'failed HTTP response with 404 error';
+                    const expectedErrorMsg = 'should fail HTTP response with 404 error';
                     expectedApiServiceError = createApiServiceError(404, 'Not found');
 
                     // call service function (fail)
@@ -318,12 +331,12 @@ describe('ApiService', () => {
                     );
 
                     // expect one request to url with given settings
-                    const r = httpTestingController.expectOne(
+                    const call = httpTestingController.expectOne(
                         (req: HttpRequest<any>) => req.method === 'GET' && req.url === expectedUrl
                     );
 
                     // respond with mock error
-                    r.flush(expectedErrorMsg, expectedApiServiceError);
+                    call.flush(expectedErrorMsg, expectedApiServiceError);
                 }));
             });
         });
diff --git a/src/app/core/services/api-service/api.service.ts b/src/app/core/services/api-service/api.service.ts
index 3f468b29ef..f9de2597f7 100644
--- a/src/app/core/services/api-service/api.service.ts
+++ b/src/app/core/services/api-service/api.service.ts
@@ -8,27 +8,56 @@ import { ApiServiceResult } from './api-service-result.model';
 import { ApiServiceError } from './api-service-error.model';
 import { ApiRequest } from './api-request.model';
 
+/**
+ * The Api service.
+ *
+ * It handles the calls to the given (Salsah) API viA HTTP
+ * and provides the data responses for the data view.
+ *
+ * Provided in: `root`.
+ */
 @Injectable({
     providedIn: 'root'
 })
 export class ApiService {
+    /**
+     * Public variable: serviceName.
+     *
+     * It keeps the name of the service.
+     */
     serviceName = 'ApiService';
 
+    /**
+     * Public variable: httpGetUrl.
+     *
+     * It keeps the url of the HTTP GET request.
+     */
     httpGetUrl = '';
-    loading = false;
 
+    /**
+     * Constructor of the ApiService.
+     *
+     * It declares a private {@link HttpClient} instance
+     * to handle http requests.
+     *
+     * @param {HttpClient} http Instance of the HttpClient.
+     */
     constructor(public http: HttpClient) {
         // console.log(`called ${this.serviceName} with httpClient`, http);
     }
 
     /**
-     * Returns an HTTP GET request response from the Knora API.
-     * @param {any} responseType
-     * @param {string} queryPath
-     * @param {HttpParams} queryHttpParams?
-     * @returns {Observable<any>}
+     * Public method: getApiResponse.
+     *
+     * It returns an HTTP GET request response from the given (Salsah) API.
+     *
+     * @param {*} responseJsonType The given expected response JSON type of the query.
+     * @param {string} queryPath The given path of the query.
+     * @param {HttpParams} [queryHttpParams] The given optional HTTP params for the query.
+     *
+     * @returns {Observable<any>} The observable of the API request.
      */
-    getApiResponse(responseType: any, queryPath: string, queryHttpParams?: HttpParams): Observable<any> {
+    getApiResponse(responseJsonType: any, queryPath: string, queryHttpParams?: HttpParams): Observable<any> {
         if (!queryHttpParams) {
             queryHttpParams = new HttpParams();
         }
@@ -36,7 +65,7 @@ export class ApiService {
         return this.httpGet(queryPath, queryHttpParams).pipe(
             map(
                 (result: ApiServiceResult): Observable<any> => {
-                    return result.getBody(responseType);
+                    return result.getBody(responseJsonType);
                 }
             ),
             catchError(
@@ -49,15 +78,17 @@ export class ApiService {
     }
 
     /**
-     * Performs a HTTP GET request to the Knora API.
-     * @param {string} queryPath
-     * @param {HttpParams} httpGetParams
-     * @returns {Observable<ApiServiceResult | ApiServiceError>}
+     * Private method: httpGet.
+     *
+     * Performs an HTTP GET request to the given (Salsah) API.
+     *
+     * @param {string} queryPath The given path of the query.
+     * @param {HttpParams} queryHttpParams The given HTTP params for the query.
+     *
+     * @returns {Observable<ApiServiceResult | ApiServiceError>} The observable of the api service result or error.
      */
-    private httpGet(queryPath: string, httpGetParams: HttpParams): Observable<ApiServiceResult | ApiServiceError> {
-        const apiRequest = new ApiRequest(queryPath, httpGetParams);
-
-        this.loading = true;
+    private httpGet(queryPath: string, queryHttpParams: HttpParams): Observable<ApiServiceResult | ApiServiceError> {
+        const apiRequest = new ApiRequest(queryPath, queryHttpParams);
 
         return this.http
             .get<ApiServiceResult | ApiServiceError>(apiRequest.url, {
@@ -66,13 +97,13 @@ export class ApiService {
                 headers: apiRequest.headers
             })
             .pipe(
+                // store the actual url
                 tap((response: HttpResponse<ApiServiceResult>) => {
                     this.httpGetUrl = response.url;
                 }),
+                // map the response into ApiServiceResult class
                 map(
                     (response: HttpResponse<any>): ApiServiceResult => {
-                        this.loading = false;
-
                         const apiServiceResult = new ApiServiceResult();
                         apiServiceResult.status = response.status;
                         apiServiceResult.statusText = response.statusText;
@@ -82,9 +113,9 @@ export class ApiService {
                         return apiServiceResult;
                     }
                 ),
+                // catch any errors
                 catchError(
                     (error: HttpErrorResponse): Observable<ApiServiceError> => {
-                        this.loading = false;
                         return this.handleRequestError(error);
                     }
                 )
@@ -92,37 +123,13 @@ export class ApiService {
     }
 
     /**
-     * Performs a HTTP POST request to the Knora API.
-     * @param url
-     * @param body
-     * @param options
-     * @returns {Observable<any>}
-     */
-    /*
-    private httpPost(url: string, body?: any, options?: RequestOptionsArgs): Observable<any> {
-        if (!body) body = {};
-        if (!options) options = {};
-        return this.http.post(AppConfig.API_ENDPOINT + url, body, options).map((response: Response) => {
-                try {
-                    let apiServiceResult: ApiServiceResult = new ApiServiceResult();
-                    apiServiceResult.status = response.status;
-                    apiServiceResult.statusText = response.statusText;
-                    apiServiceResult.body = response.json();
-                    return apiServiceResult;
-                } catch (e) {
-                    return this.handleError(response);
-                }
-            }).catch((error: any) => {
-                return Observable.throw(this.handleError(error));
-            });
-    }
-    */
-
-    /**
-     * handle request error in case of server error
+     * Private method: handleRequestError.
+     *
+     * It handles request errors in case of server error.
+     *
+     * @param {HttpErrorResponse} error The given error.
      *
-     * @param {HttpErrorResponse} error
-     * @returns {Observable<ApiServiceError>}
+     * @returns {Observable<ApiServiceError>} The observable of the api service error.
      */
     private handleRequestError(error: HttpErrorResponse): Observable<ApiServiceError> {
         // console.error(error);
diff --git a/src/app/core/services/conversion-service/conversion.service.ts b/src/app/core/services/conversion-service/conversion.service.ts
index f7cc6c3d70..6d00bddeb6 100644
--- a/src/app/core/services/conversion-service/conversion.service.ts
+++ b/src/app/core/services/conversion-service/conversion.service.ts
@@ -2,73 +2,89 @@ import { Injectable } from '@angular/core';
 
 import { Observable } from 'rxjs';
 
+import { NgxGalleryImage } from 'ngx-gallery';
+
 import { ApiService } from '@awg-core/services/api-service';
 import { GeoNames } from '@awg-core/core-models';
 import {
     ContextJson,
-    GeoDataJson,
     GeoDataItemJson,
-    HlistJson,
+    GeoDataJson,
     HlistItemJson,
+    HlistJson,
     IncomingItemJson,
+    PropertyJson,
     ResourceContextResponseJson,
     ResourceFullResponseJson,
     SearchResponseJson,
-    SelectionJson,
     SelectionItemJson,
+    SelectionJson,
     SubjectItemJson
 } from '@awg-shared/api-objects';
 import {
+    IResourceDataResponse,
     ResourceDetail,
-    ResourceDetailHeader,
-    ResourceDetailIncomingLinks,
-    ResourceDetailProps,
+    ResourceDetailContent,
     ResourceDetailGroupedIncomingLinks,
+    ResourceDetailHeader,
     ResourceDetailImage,
-    ResourceDetailContent
+    ResourceDetailIncomingLink,
+    ResourceDetailProperty,
+    SearchResponseWithQuery
 } from '@awg-views/data-view/models';
-
-declare var htmlConverter;
-declare var dateConverter;
-
+import { BibEntry } from '@awg-views/data-view/data-outlets/bibliography/bibliography-entry.model';
+
+/**
+ * Declared variable: htmlConverter.
+ *
+ * It provides access to the embedded htmlConverter plugin (see `/src/plugins/htmlConverter`).
+ */
+declare var htmlConverter: any;
+
+/**
+ * Declared variable: dateConverter.
+ *
+ * It provides access to the embedded dateConverter plugin (see `/src/plugins/dateConverter`).
+ */
+declare var dateConverter: any;
+
+/**
+ * The Conversion service.
+ *
+ * It handles the conversion of the HTTP response data (JSON)
+ * from the given (SALSAH) API into a form that can be
+ * displayed via HTML.
+ *
+ * Provided in: `root`.
+ */
 @Injectable({
     providedIn: 'root'
 })
 export class ConversionService extends ApiService {
-    // issue with ServiceInheritance, cf. https://stackoverflow.com/questions/50263722/angular-6-services-and-class-inheritance
-    static ngInjectableDef = undefined;
-
+    /**
+     * Public variable: filteredOut.
+     *
+     * It keeps the number of filtered duplicates of a search response list.
+     */
     filteredOut: number;
 
-    /******************************************
-     *
-     * sum up length of all arrays nested in an
-     * ResourceDetailGroupedIncomingLinks object
+    /**
+     * Public method: convertFullTextSearchResults.
      *
-     *****************************************/
-    getNestedArraysTotalItems(obj: ResourceDetailGroupedIncomingLinks): number {
-        let size = 0;
-        // iterate over object keys
-        Object.keys(obj).forEach(key => {
-            // sum up length of array nested in object
-            size += obj[key].length;
-        });
-        return size;
-    }
-
-    /******************************************
+     * It converts the results of a full text search
+     * to be displayed via HTML.
      *
-     *  convert full text search results
-     *  for displaying
+     * @param {SearchResponseJson} searchResults The given results of a search request.
      *
-     *****************************************/
-    public convertFullTextSearchResults(results: SearchResponseJson): SearchResponseJson {
-        if (!results.subjects) {
-            return results;
+     * @returns {SearchResponseJson} The converted full text search results.
+     */
+    convertFullTextSearchResults(searchResults: SearchResponseJson): SearchResponseJson {
+        if (!searchResults.subjects) {
+            return searchResults;
         }
 
         // TODO: refactor with reduce??
-        results.subjects.forEach(subject => {
+        searchResults.subjects.forEach(subject => {
             // clean value labels
             subject.valuelabel[0] = subject.valuelabel[0].replace(' (Richtext)', '');
             subject.obj_id = subject.obj_id.replace('_-_local', '');
@@ -88,7 +104,7 @@ export class ConversionService extends ApiService {
                     // replace salsah links
                     htmlstr = this.replaceSalsahLink(htmlstr);
 
-                    // strip & replace <p>-tags for displaying objt
+                    // strip & replace <p>-tags for displaying
                     htmlstr = this.replaceParagraphTags(htmlstr);
 
                     subject.value[0] = htmlstr;
@@ -96,27 +112,32 @@ export class ConversionService extends ApiService {
             }
         });
         // remove duplicates from response
-        results.subjects = this.distinctSubjectItemArray(results.subjects);
-        return results;
+        searchResults.subjects = this.distinctSubjects(searchResults.subjects);
+        return searchResults;
     }
 
-    /******************************************
+    /**
+     * Public method: prepareFullTextSearchResultText.
+     *
+     * It prepares the fulltext search result text
+     * to be displayed in the search info.
      *
-     *  prepare fulltext search result string
-     * v
-     *****************************************/
-    public prepareFullTextSearchResultText(
-        searchData: SearchResponseJson,
-        searchValue: string,
-        searchUrl: string
-    ): string {
+     * @param {SearchResponseWithQuery} searchResponseWithQuery The given results and query of a search request.
+     * @param {string} searchUrl The given url of a search request.
+     *
+     * @returns {string} The text to be displayed.
+     */
+    prepareFullTextSearchResultText(searchResponseWithQuery: SearchResponseWithQuery, searchUrl: string): string {
         let resText: string;
 
-        if (searchData.subjects) {
-            const length = searchData.subjects.length;
+        const searchResults = { ...searchResponseWithQuery.data };
+        const searchValue = searchResponseWithQuery.query;
+
+        if (searchResults.subjects) {
+            const length = searchResults.subjects.length;
             const resString: string = length === 1 ? `Resultat` : `Resultate`;
             // resText = `${length}/${searchData.nhits} `;
-            resText = `${searchData.nhits} `;
+            resText = `${searchResults.nhits} `;
             resText += `${resString} für "${searchValue}"`;
 
             if (this.filteredOut > 0) {
@@ -130,19 +151,23 @@ export class ConversionService extends ApiService {
         return resText;
     }
 
-    /******************************************
+    /**
+     * Public method: convertObjectProperties.
+     *
+     * It converts object properties of a resource request
+     * to be displayed in the bibliography detail view.
      *
-     * convert object properties for displaying
+     * @param {ResourceFullResponseJson} resourceFullResponseData The given resource data.
      *
-     *****************************************/
-    public convertObjectProperties(data: ResourceFullResponseJson) {
+     * @returns {BibEntry} The converted resource object.
+     */
+    convertObjectProperties(resourceFullResponseData: ResourceFullResponseJson): BibEntry {
         const convObj = {};
-        console.log('convertdata: ', data);
         // add lastmod state
-        convObj['lastmod'] = data.resinfo.lastmod;
+        convObj['lastmod'] = resourceFullResponseData.resinfo.lastmod;
 
-        Object.keys(data.props).forEach((key: string) => {
-            const prop = data.props[key];
+        Object.keys(resourceFullResponseData.props).forEach((key: string) => {
+            const prop = resourceFullResponseData.props[key];
             let propValue = []; // empty text value array
 
             // check if values property is defined
@@ -160,8 +185,7 @@ export class ConversionService extends ApiService {
                         // SELECTION PULLDOWN: selection nodes have to be read seperately
                         // TODO
                         if (prop.values !== []) {
-                            propValue = this.convertSelectionValue(prop.values, prop.attributes);
-                            console.log('propValue: ', propValue);
+                            propValue = this.convertSelectionValues(prop.values, prop.attributes);
                         }
                         break; // END selection
 
@@ -189,7 +213,7 @@ export class ConversionService extends ApiService {
 
                                 // replace bibliography links
                                 if (prop.label === 'Online-Zugang') {
-                                    propValue[i] = this.replaceBiblioLink(propValue[i]);
+                                    propValue[i] = this.adjustBiblioLink(propValue[i]);
                                 }
                             }
                         }
@@ -224,124 +248,224 @@ export class ConversionService extends ApiService {
         return convObj;
     } // END convertObjectProperties (func)
 
-    public prepareResourceDetail(data: ResourceFullResponseJson, currentId: string): ResourceDetail {
-        if (data.access === 'OK') {
-            return this.prepareAccessibleResource(data, currentId);
+    /**
+     * Public method: convertResourceData.
+     *
+     * It converts a resource response from the given (SALSAH) Api
+     * to a resource detail object. It checks if the resource data
+     * is accessible and delegates it to the respective
+     * resource detail creation methods.
+     *
+     * @param {IResourceDataResponse} resourceData The given resource data.
+     * @param {string} resourceId The given id of the current resource.
+     *
+     * @returns {ResourceDetail} The converted resource detail object.
+     */
+    convertResourceData(resourceData: IResourceDataResponse, resourceId: string): ResourceDetail {
+        if (resourceData[0].access === 'OK') {
+            return this.prepareAccessibleResource(resourceData, resourceId);
         } else {
-            return this.prepareRestrictedResource(data, currentId);
+            return this.prepareRestrictedResource(resourceData, resourceId);
         }
     }
 
-    private prepareRestrictedResource(data: ResourceFullResponseJson, currentId: string): ResourceDetail {
-        const header: ResourceDetailHeader = new ResourceDetailHeader(data, currentId);
+    /**
+     * Private method: prepareRestrictedResource.
+     *
+     * It prepares header and content of a restricted resource
+     * to be displayed via HTML.
+     *
+     * @param {IResourceDataResponse} resourceData The given resource data.
+     * @param {string} resourceId The given id of the current resource.
+     *
+     * @returns {ResourceDetail} The resource detail object.
+     */
+    private prepareRestrictedResource(resourceData: IResourceDataResponse, resourceId: string): ResourceDetail {
+        const header: ResourceDetailHeader = new ResourceDetailHeader(resourceData[0], resourceId);
         const content = undefined;
 
-        const detail: ResourceDetail = new ResourceDetail(header, content);
-        return detail;
+        return new ResourceDetail(header, content);
     }
 
-    private prepareAccessibleResource(data: ResourceFullResponseJson, currentId: string): ResourceDetail {
-        // convert properties
-        data = this.convertGUISpecificProps(data);
+    /**
+     * Private method: prepareAccessibleResource.
+     *
+     * It prepares header and content of an accessible resource
+     * to be displayed via HTML.
+     *
+     * @param {IResourceDataResponse} resourceData The given resource data.
+     * @param {string} resourceId The given id of the current resource.
+     *
+     * @returns {ResourceDetail} The resource detail object.
+     */
+    private prepareAccessibleResource(resourceData: IResourceDataResponse, resourceId: string): ResourceDetail {
+        const resourceFullResponseData = resourceData[0];
+        const resourceContextData = resourceData[1];
+
+        // convert properties to be displayed via HTML
+        resourceFullResponseData.props = this.convertGUISpecificProps(resourceFullResponseData.props);
 
         // prepare parts of resourceDetail
-        const header: ResourceDetailHeader = new ResourceDetailHeader(data, currentId);
-        const content: ResourceDetailContent = {
-            props: this.prepareResourceDetailProperties(data.props),
-            images: this.prepareResourceDetailImage(currentId),
-            incoming: this.prepareResourceDetailIncomingLinks(data.incoming)
-        };
-
-        const detail: ResourceDetail = new ResourceDetail(header, content);
-        return detail;
+        const header: ResourceDetailHeader = new ResourceDetailHeader(resourceFullResponseData, resourceId);
+        const props: ResourceDetailProperty[] = this.prepareResourceDetailProperties(resourceFullResponseData.props);
+        const images: NgxGalleryImage[] = this.prepareResourceDetailImage(resourceContextData);
+        const incoming: ResourceDetailGroupedIncomingLinks[] = this.prepareResourceDetailIncomingLinks(
+            resourceFullResponseData.incoming
+        );
+        const content = new ResourceDetailContent(props, images, incoming);
+
+        return new ResourceDetail(header, content);
     }
 
-    private prepareResourceDetailImage(id: string): ResourceDetailImage[] {
+    /**
+     * Private method: prepareResourceDetailImage.
+     *
+     * It prepares the images content of an accessible resource
+     * to be displayed via HTML.
+     *
+     * @param {ResourceContextResponseJson} resourceContextData The given resource context data.
+     *
+     * @returns {NgxGalleryImage[]} The image array of the resource detail.
+     */
+    private prepareResourceDetailImage(resourceContextData: ResourceContextResponseJson): NgxGalleryImage[] {
         // id of image context for api + "/resources/{{:id}}_-_local?reqtype=context"
-        // result is an array of ResourceDetailImage
-        const output: ResourceDetailImage[] = [];
-
-        // get resource context data
-        this.getAdditionalInfoFromApi(ResourceContextResponseJson, id).subscribe(
-            (contextData: ResourceContextResponseJson) => {
-                // check for existing resource_context in response
-                // else return undefined output if necessary
-                if (!contextData.resource_context.res_id) {
-                    // console.log('ConversionService# prepareResourceDetailImage: got no resource_context id\'s from context response: ', contextData);
-                    return;
-                } else {
-                    const context: ContextJson = { ...contextData.resource_context };
-
-                    // IMAGE OBJECT (context == 2)
-                    if (context.context === 2 && context.resclass_name === 'image') {
-                        if (context.res_id.length === context.firstprop.length) {
-                            for (let i = 0; i < context.res_id.length; i++) {
-                                // build new ResourceDetailImage-Object from context and index
-                                const image = new ResourceDetailImage(context, i);
-                                output[i] = image;
-                            }
-                        } else {
-                            console.warn(
-                                'ConversionService - Array length for context objects is not consistent with firstprops length!',
-                                context
-                            );
-                            return;
-                        }
-                        // STANDARD OBJECT (context == 0 || 1)
-                    } else if (context.context < 2) {
-                        console.log('ConversionService - got no image context', context);
-                        return;
+        // result is an array of NgxGalleryImage
+        const images: NgxGalleryImage[] = [];
+
+        if (!resourceContextData.resource_context.res_id) {
+            // console.log('ConversionService# prepareResourceDetailImage: got no resource_context id\'s from context response: ', contextData);
+            return;
+        } else {
+            const context: ContextJson = { ...resourceContextData.resource_context };
+
+            // IMAGE OBJECT (context == 2)
+            // IMAGE OBJECT (context == 2)
+            if (context.context === 2 && context.resclass_name === 'image') {
+                if (
+                    context.res_id.length === context.firstprop.length ||
+                    context.res_id.length === context.locations.length
+                ) {
+                    for (let i = 0; i < context.res_id.length; i++) {
+                        // build new ResourceDetailImage-Object from context and index
+                        const image = new ResourceDetailImage(context, i);
+
+                        const gImage = new NgxGalleryImage({
+                            small: image.reductSize,
+                            medium: image.reductSize,
+                            big: image.fullSize,
+                            description: image.origname,
+                            label: image.label,
+                            url: image.fullSize
+                        });
+
+                        images.push(gImage);
                     }
+                    return images;
+                } else {
+                    console.warn(
+                        'ConversionService - Array length for context objects is not consistent with firstprops length!',
+                        context
+                    );
+                    return;
                 }
-                return output;
-            },
-            err => console.error(err)
-        );
-        return output;
-    }
+                // STANDARD OBJECT (context == 0 || 1)
+            } else if (context.context < 2) {
+                console.log('ConversionService - got no image context', context);
+                return;
+            }
+        }
 
-    private prepareResourceDetailIncomingLinks(incomingArray: IncomingItemJson[]): ResourceDetailGroupedIncomingLinks {
-        const incomingLinks: ResourceDetailIncomingLinks[] = [];
-        incomingArray.forEach(incoming => {
-            incomingLinks.push(new ResourceDetailIncomingLinks(incoming));
-        });
-        const groupedIncomingLinks: ResourceDetailGroupedIncomingLinks = this.groupByRestype(incomingLinks);
-        return groupedIncomingLinks;
+        return images;
     }
 
-    private prepareResourceDetailProperties(props) {
-        const detailProperties: ResourceDetailProps[] = [];
+    /**
+     * Private method: prepareResourceDetailIncomingLinks.
+     *
+     * It prepares and groups the incoming links content
+     * of an accessible resource to be displayed via HTML.
+     *
+     * @param {IncomingItemJson[]} incomingArray The given IncomingItemJson.
+     *
+     * @returns {ResourceDetailGroupedIncomingLinks[]} The grouped incoming links array of the resource detail.
+     */
+    private prepareResourceDetailIncomingLinks(
+        incomingArray: IncomingItemJson[]
+    ): ResourceDetailGroupedIncomingLinks[] {
+        if (!incomingArray) {
+            return;
+        }
 
-        // loop through property keys
-        Object.keys(props).forEach((key: string) => {
-            const prop: any = props[key];
+        // map incoming array items into new array (immutable)
+        const incomingLinks: ResourceDetailIncomingLink[] = incomingArray.map(
+            incoming => new ResourceDetailIncomingLink({ ...incoming })
+        );
 
-            // clean value labels
-            if (prop.label) {
-                prop.label = prop.label.replace(' (Richtext)', '');
-            }
+        // return links grouped by restype
+        return this.groupByRestype(incomingLinks);
+    }
 
-            // push default values into searchDetailProperties
-            detailProperties.push({
-                pid: prop.pid,
-                guielement: prop.guielement,
-                label: prop.label,
-                value: prop.toHtml
-            });
-        }); // END forEach props
-        return detailProperties;
+    /**
+     * Private method: prepareResourceDetailProperties.
+     *
+     * It prepares the properties content of an accessible resource
+     * to be displayed via HTML.
+     *
+     * @param {PropertyJson[]} props The given properties.
+     *
+     * @returns {ResourceDetailProperty[]} The properties array of the resource detail.
+     */
+    private prepareResourceDetailProperties(props: PropertyJson[]): ResourceDetailProperty[] {
+        if (!props) {
+            return;
+        }
+
+        // helper method to clean value labels
+        const replaceLabel = (str: string): string => str.replace(' (Richtext)', '');
+
+        // map default values into ResourceDetailProperties array
+        return Object.entries(props).map(
+            prop =>
+                new ResourceDetailProperty(
+                    prop[1].pid,
+                    prop[1].guielement,
+                    (prop[1].label = replaceLabel(prop[1].label)),
+                    prop[1].toHtml
+                )
+        );
     }
 
-    private convertGUISpecificProps(data: ResourceFullResponseJson) {
+    /**
+     * Private method: convertGUISpecificProps.
+     *
+     * It converts properties of an accessible resource
+     * to be displayed via HTML.
+     *
+     * In fact, it adds an 'toHtml' property to the props array.
+     *
+     * @param {PropertyJson[]} props The given properties.
+     *
+     * @returns {*} The converted resource data.
+     */
+    private convertGUISpecificProps(props: PropertyJson[]): any {
         // loop through all properties and add toHtml values
-        Object.keys(data.props).forEach((key: string) => {
-            const prop = this.addHtmlValues(data.props[key]);
-            data.props[key] = prop;
+        Object.keys(props).forEach((key: string) => {
+            props[key] = this.addHtmlValues(props[key]);
         });
-        return data;
+        return props;
     }
 
-    private addHtmlValues(prop, url?): [string] {
+    /**
+     * Private method: convertGUISpecificProps.
+     *
+     * It adds an 'toHtml' property to the props array
+     * of an accessible resource to be displayed via HTML.
+     *
+     * @param {*} prop The given property.
+     * @param {string} [url] A given optional url.
+     *
+     * @returns {string[]} The converted property.
+     */
+    private addHtmlValues(prop: any, url?: string): [string] {
         prop.toHtml = [];
 
         if (prop.values) {
@@ -358,12 +482,12 @@ export class ConversionService extends ApiService {
                     }
                     break; // END linkvalue
 
-                case '7': // SELECTION (pulldown): selection nodes have to be read seperately
-                    prop.toHtml = this.convertSelectionValue(prop.values, prop.attributes);
+                case '7': // SELECTION (pulldown): selection nodes have to be called separately
+                    prop.toHtml = this.convertSelectionValues(prop.values, prop.attributes);
                     break; // END selection
 
-                case '12': // HLIST: hlist nodes have to be called seperately
-                    prop.toHtml = this.convertHlistValue(prop.values, prop.attributes);
+                case '12': // HLIST: hlist nodes have to be called separately
+                    prop.toHtml = this.convertHlistValues(prop.values, prop.attributes);
                     break; // END hlist
 
                 case '14': // RICHTEXT: salsah standoff needs to be converted
@@ -372,8 +496,8 @@ export class ConversionService extends ApiService {
                     }
                     break; // END richtext
 
-                case '15': // GeoNAMES: GeoName nodes have to called seperately
-                    prop.toHtml = this.convertGeoValue(prop.values);
+                case '15': // GeoNAMES: GeoName nodes have to be called separately
+                    prop.toHtml = this.convertGeoValues(prop.values);
                     break; // END geonames
 
                 // '1' => TEXT: properties come as they are
@@ -388,23 +512,36 @@ export class ConversionService extends ApiService {
         return prop;
     }
 
-    /******************************************
+    /**
+     * Private method: convertDateValue.
+     *
+     * It converts date values of an accessible resource
+     * to be displayed via HTML.
      *
-     * convert date values
+     * Conversion goes from Julian Day Number (JDN)
+     * to Gregorian Calendar.
      *
-     *****************************************/
-    private convertDateValue(dateObj) {
+     * @param {*} dateObj The given date object.
+     *
+     * @returns {string} The converted date string.
+     */
+    private convertDateValue(dateObj: any): string {
         let date = dateConverter(dateObj);
         date = date.replace(' (G)', '');
         return date;
     }
 
-    /******************************************
+    /**
+     * Private method: convertGeoValues.
+     *
+     * It converts geonames values of an accessible resource
+     * to be displayed via HTML.
      *
-     * convert geoNames values
+     * @param {string[]} values The given property values.
      *
-     *****************************************/
-    private convertGeoValue(values): string[] {
+     * @returns {string[]} The converted geo names array.
+     */
+    private convertGeoValues(values: string[]): string[] {
         // values give reference id to api + "/geonames/{{:id}}?reqtype=node"
         // result is an array nodelist (properties: id, label, name) with nodes from 0 to n
 
@@ -419,7 +556,7 @@ export class ConversionService extends ApiService {
                 // else return empty prop if necessary
                 if (!geoNamesData.nodelist) {
                     console.log(
-                        'ConversionService# convertGeoValue: got no nodelist from geonames response: ',
+                        'ConversionService# convertGeoValues: got no nodelist from geonames response: ',
                         geoNamesData
                     );
                     return (output[index] = '');
@@ -427,7 +564,7 @@ export class ConversionService extends ApiService {
                 // snapshot of nodelist array
                 const geoDataArray: GeoDataItemJson[] = [...geoNamesData.nodelist];
 
-                // build new GeoNames-Object from nodelist array
+                // build new GeoNames-Object from geoData array
                 const geo: GeoNames = new GeoNames(geoDataArray);
 
                 // construct and return html value
@@ -438,12 +575,18 @@ export class ConversionService extends ApiService {
         return output;
     }
 
-    /******************************************
+    /**
+     * Private method: convertHlistValues.
      *
-     * convert hlist values
+     * It converts hierarchy list values of an accessible resource
+     * to be displayed via HTML.
      *
-     *****************************************/
-    private convertHlistValue(values, attributes): string[] {
+     * @param {string[]} values The given property values.
+     * @param {string} attributes The given HTML attributes.
+     *
+     * @returns {string[]} The converted hlist array.
+     */
+    private convertHlistValues(values: string[], attributes: string): string[] {
         // prop.values give reference id to
         // api + /hlists/{{:id}}
         // result is an array hlist (properties: id, label, name, level) with nodes from 0 to n
@@ -477,42 +620,62 @@ export class ConversionService extends ApiService {
         return output;
     }
 
-    /******************************************
+    /**
+     * Private method: convertLinkValue.
+     *
+     * It converts a link value of an accessible resource
+     * to be displayed via HTML.
      *
-     * convert link values
+     * @param {*} prop The given property value.
+     * @param {number} index The given index position.
      *
-     *****************************************/
-    private convertLinkValue(prop, i: number): string {
+     * @returns {string} The converted link value.
+     */
+    private convertLinkValue(prop: any, index: number): string {
         // add <a>-tag with click-directive; linktext is stored in "$&"
-        const firstValue = prop.value_firstprops[i];
+        const firstValue = prop.value_firstprops[index];
         const replaceValue =
-            '<a (click)="ref.navigateToResource(\'' + prop.values[i] + '\')">$& (' + prop.value_restype[i] + ')</a>';
-        const linkValue = firstValue.replace(firstValue, replaceValue);
-        return linkValue;
+            '<a (click)="ref.navigateToResource(\'' +
+            prop.values[index] +
+            '\')">$& (' +
+            prop.value_restype[index] +
+            ')</a>';
+        return firstValue.replace(firstValue, replaceValue);
     }
 
-    /******************************************
+    /**
+     * Private method: convertRichtextValue.
      *
-     * convert richtext values
+     * It converts a rich text value of an accessible resource
+     * to be displayed via HTML.
      *
-     *****************************************/
+     * @param {string} str The given utf8 string of a rich text property.
+     * @param {string} attr The given standoff attributes of a richtext property.
+     *
+     * @returns {string} The converted rich text value.
+     */
     private convertRichtextValue(str: string, attr: string): string {
         // convert salsah standoff to html (using plugin "htmlConverter")
-        let rtValue: string = this.convertStandoffToHTML(str, attr);
+        const rtValue: string = this.convertStandoffToHTML(str, attr);
 
         // replace salsah links
-        rtValue = this.replaceSalsahLink(rtValue);
-
-        return rtValue;
+        return this.replaceSalsahLink(rtValue);
     }
 
-    // TODO: check if it is possible to unify with hlist conversion?
-    /******************************************
+    /**
+     * Private method: convertSelectionValues.
+     *
+     * It converts selection values of an accessible resource
+     * to be displayed via HTML.
      *
-     * convert selection values
+     * @param {string[]} values The given property values.
+     * @param {string} attributes The given HTML attributes.
      *
-     *****************************************/
-    private convertSelectionValue(values, attributes): string[] {
+     * @returns {string[]} The converted selection array.
+     *
+     * @todo check if it is possible to unify with hlist conversion?
+     */
+    private convertSelectionValues(values: string[], attributes: string): string[] {
         // values give reference id to api + "/selections/{{:id}}"
         // result is an array of selection labels
 
@@ -529,7 +692,7 @@ export class ConversionService extends ApiService {
                 // else return empty prop if necessary
                 if (!selectionData.selection) {
                     console.log(
-                        'ConversionService# convertSelectionValue: got no selection from response: ',
+                        'ConversionService# convertSelectionValues: got no selection from response: ',
                         selectionData
                     );
                     return output;
@@ -550,13 +713,20 @@ export class ConversionService extends ApiService {
         return output;
     }
 
-    /******************************************
+    /**
+     * Private method: convertStandoffToHTML.
+     *
+     * It converts linear SALSAH standoff
+     * (utf8 string with standoff attributes)
+     * to html using plugin 'htmlConverter'.
      *
-     *  convert linear salsah standoff
-     *  (string with textattributes)
-     *  to html using plugin "htmlConverter"
+     * @param {string} str The given utf8 string of a rich text property.
+     * @param {string} attr The given standoff attributes of a richtext property.
      *
-     *****************************************/
+     * @returns {string} The converted standoff.
+     *
+     * @todo check if it is possible to unify with hlist conversion?
+     */
     private convertStandoffToHTML(str: string, attr: string): string {
         if (!str) {
             return;
@@ -567,54 +737,73 @@ export class ConversionService extends ApiService {
         return htmlConverter(JSON.parse(attr), str);
     }
 
-    /******************************************
+    /**
+     * Private method: getAdditionalInfoFromApi.
+     *
+     * It makes additional calls to the given (SALSAH) API
+     * to get additional resource infos in case of geoames,
+     * hlists, selections or image values.
      *
-     * get additional resource info from salsah api
+     * @param {*} responseJsonType The given json type of the API response.
+     * @param {string} id The given id of a resource.
      *
-     *****************************************/
-    private getAdditionalInfoFromApi(responseType: any, valueId: string): Observable<any> {
+     * @returns {Observable<any>} The observable of the HTTP response.
+     */
+    private getAdditionalInfoFromApi(responseJsonType: any, id: string): Observable<any> {
         let queryPath: string;
-        switch (responseType) {
+        switch (responseJsonType) {
             case GeoDataJson:
-                queryPath = 'geonames/' + valueId + '?reqtype=node';
+                queryPath = 'geonames/' + id + '?reqtype=node';
                 break;
             case HlistJson:
-                queryPath = 'hlists/' + valueId;
+                queryPath = 'hlists/' + id;
                 break;
             case ResourceContextResponseJson:
-                queryPath = 'resources/' + valueId + '_-_local?reqtype=context';
+                queryPath = 'resources/' + id + '_-_local?reqtype=context';
                 break;
             case SelectionJson:
-                queryPath = 'selections/' + valueId;
+                queryPath = 'selections/' + id;
                 break;
         }
-        return this.getApiResponse(responseType, queryPath);
+        return this.getApiResponse(responseJsonType, queryPath);
     }
 
-    /******************************************
+    /**
+     * Private method: getNodeIdFromAttributes.
      *
-     * get node id from attributes value
+     * It gets a node id from the prop.attributes
+     * of a selections or hlists value.
      *
-     *****************************************/
-    private getNodeIdFromAttributes(attributes): string {
+     * @param {string} attributes The given prop.attributes.
+     *
+     * @returns {string} id The node id.
+     */
+    private getNodeIdFromAttributes(attributes: string): string {
         // identify node id from prop.attributes
         // e.g. "hlist=17" or "selection=77"
         return attributes.split('=')[1].toString();
     }
 
-    /******************************************
+    /**
+     * Private method: adjustBiblioLink.
+     *
+     * It finds internal links in the online-access property
+     * of a bibliography link and adjusts the values
+     * to be displayed via HTML.
      *
-     *  find inner links in online-access-property
-     *  and rebuild the values for displaying
+     * @param {string} str The given link string.
+     * @example
+     * str = '(PDF) http://www.example.com/myPdf.pdf'
      *
-     *****************************************/
-    private replaceBiblioLink(str: string): string {
+     * @returns {string} The adjusted bibliography link.
+     */
+    private adjustBiblioLink(str: string): string {
         if (!str) {
             return;
         }
 
-        let tmpStr: string;
-        let nameStr: string;
+        let outStr: string;
+        let labelStr: string;
         let splitArr: string[];
         let linkRegArr: RegExpExecArray;
         const regExLink = /<a (.*?)>(.*?)<\/a>/i; // regexp for links
@@ -622,33 +811,37 @@ export class ConversionService extends ApiService {
         // check for double spaces
         str = str.replace('  ', ' ');
 
-        // split "str" behind parentheses
+        // split "str" behind closing parentheses
         splitArr = str.split(') ');
 
-        // get name of link from 1st part of "splitstr
-        nameStr = splitArr[0].replace('(', '');
+        // get label of link from 1st part of splitArr (without opening parentheses)
+        labelStr = splitArr[0].replace('(', '');
 
-        // check for link in 2nd part of "splitArr"
+        // check for link in 2nd part of splitArr
         if (regExLink.exec(splitArr[1])) {
             // ... link with <a> tag
             linkRegArr = regExLink.exec(splitArr[1]);
-            tmpStr = '<a target="_blank" ref="noopener noreferrer" ' + linkRegArr[1] + '>' + nameStr + '</a>';
-        } else if (nameStr !== 'DOI') {
+            outStr = '<a target="_blank" ref="noopener noreferrer" ' + linkRegArr[1] + '>' + labelStr + '</a>';
+        } else if (labelStr !== 'DOI') {
             // ... <a> tag is missing, add it
-            tmpStr = '<a target="_blank" ref="noopener noreferrer" href="' + splitArr[1] + '">' + nameStr + '</a>';
+            outStr = '<a target="_blank" ref="noopener noreferrer" href="' + splitArr[1] + '">' + labelStr + '</a>';
         } else {
             // no links, pure string
-            tmpStr = nameStr + ': ' + splitArr[1];
+            outStr = labelStr + ': ' + splitArr[1];
         }
-        return tmpStr;
+        return outStr;
     }
 
-    /******************************************
+    /**
+     * Private method: replaceSalsahLink.
+     *
+     * It finds internal salsah links in richtext values
+     * and replaces them with Angular click-directives.
      *
-     * find inner salsah links in richtext
-     * and replace them with click-directive
+     * @param {string} str The given richtext value.
      *
-     *****************************************/
+     * @returns {string} The adjusted richtext value.
+     */
     private replaceSalsahLink(str: string): string {
         if (!str) {
             return;
@@ -657,20 +850,19 @@ export class ConversionService extends ApiService {
         const regLink = /<a href="(http:\/\/www.salsah.org\/api\/resources\/\d{4,8})" class="salsah-link">(.*?)<\/a>/i; // regexp for salsah links
         let regArr: RegExpExecArray;
 
-        // check only for salsah links
+        // check for salsah links in str
         while (regLink.exec(str)) {
             // i.e.: as long as patLink is detected in str do...
-
             regArr = regLink.exec(str);
 
             // identify resource id
-            const res_id = regNum.exec(regArr[1])[0];
+            const resId = regNum.exec(regArr[1])[0];
 
             // replace href attribute with click-directive
-            // linktext is stored in second regexp-result p[2]
+            // linktext is stored in second regexp-result regArr[2]
             const replaceValue =
                 '<a (click)="ref.navigateToResource(\'' +
-                res_id +
+                resId +
                 '\'); $event.stopPropagation()">' +
                 regArr[2] +
                 '</a>';
@@ -680,11 +872,16 @@ export class ConversionService extends ApiService {
         return str;
     }
 
-    /******************************************
+    /**
+     * Private method: replaceParagraphTags.
+     *
+     * It removes paragraph tags in richtext values
+     * and replaces line breaks instead for multiple lines.
      *
-     * replace paragraph tags
+     * @param {string} str The given richtext value.
      *
-     *****************************************/
+     * @returns {string} The adjusted richtext value.
+     */
     private replaceParagraphTags(str: string): string {
         if (!str) {
             return;
@@ -696,46 +893,54 @@ export class ConversionService extends ApiService {
         return str;
     }
 
-    /******************************************
-     *
-     * remove duplicates from array (SubjectItemJson[])
-     *
-     *****************************************/
-    private distinctSubjectItemArray(arr: SubjectItemJson[]) {
-        /*
-         * see https://gist.github.com/telekosmos/3b62a31a5c43f40849bb#gistcomment-2137855
-         *
-         * This function checks for every array position (reduce)
-         * if the obj_id of the entry at the current position (y) is already in the array (findIndex)
-         * and if not pushes y into x that is initalized as empty array []
-         *
-         */
-        if (!arr) {
+    /**
+     * Private method: distinctSubjects.
+     *
+     * It removes duplicates from an array (SubjectItemJson[]).
+     * It checks for every array position (reduce) if the obj_id
+     * of the entry at the current position (y) is already
+     * in the array (findIndex). If that is not the case it
+     * pushes y into x which is initialized as empty array [].
+     *
+     * See also {@link https://gist.github.com/telekosmos/3b62a31a5c43f40849bb#gistcomment-2137855}.
+     *
+     * @param {SubjectItemJson[]} subjects The given subject with possible duplicates.
+     *
+     * @returns {SubjectItemJson[]} The distinct subjects.
+     */
+    private distinctSubjects(subjects: SubjectItemJson[]): SubjectItemJson[] {
+        if (!subjects) {
             return;
         }
         this.filteredOut = 0;
-        return arr.reduce(
+        return subjects.reduce(
             (x, y) => (x.findIndex(e => e.obj_id === y.obj_id) < 0 ? [...x, y] : ((this.filteredOut += 1), x)),
             []
         );
     }
 
-    /******************************************
+    /**
+     * Private method: groupByRestype.
      *
-     * group array of incoming links by restype
+     * It groups an array of incoming links
+     * by their resource type.
      *
-     *****************************************/
-    private groupByRestype(incomingLinks: ResourceDetailIncomingLinks[]): ResourceDetailGroupedIncomingLinks {
-        const groups = {};
-        // iterate over incoming links to group by restype
-        incomingLinks.forEach(link => {
-            const group = link.restype.label;
-            if (group in groups) {
-                groups[group].push(link); // push link into existing restype group
-            } else {
-                groups[group] = [link]; // create restype group and make link the first entry
-            }
-        });
-        return groups;
+     * @param {ResourceDetailIncomingLink[]} incomingLinks The given incoming links.
+     *
+     * @returns {ResourceDetailGroupedIncomingLinks} The grouped incoming links.
+     */
+    private groupByRestype(incomingLinks: ResourceDetailIncomingLink[]): ResourceDetailGroupedIncomingLinks[] {
+        if (!incomingLinks) {
+            return;
+        }
+
+        // find out and alphabetically sort all the unique restype labels
+        const restypeLabels = new Set(incomingLinks.map(incomingLink => incomingLink.restype.label).sort());
+
+        // produce a list of restypes with its incoming links
+        return Array.from(restypeLabels).map(label => ({
+            restypeLabel: label,
+            links: incomingLinks.filter(incomingLink => incomingLink.restype.label === label)
+        }));
     }
 }
diff --git a/src/app/core/services/core-service/core.service.spec.ts b/src/app/core/services/core-service/core.service.spec.ts
index d0ba1d812e..7af2e5f7a3 100644
--- a/src/app/core/services/core-service/core.service.spec.ts
+++ b/src/app/core/services/core-service/core.service.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed, inject, async } from '@angular/core/testing';
 
-import { Logos, Meta } from '@awg-core/core-models';
+import { Logos, Meta, MetaSectionTypes } from '@awg-core/core-models';
 import { METADATA, LOGOSDATA } from '@awg-core/mock-data';
 
 import { CoreService } from './core.service';
@@ -34,6 +34,48 @@ describe('CoreService (DONE)', () => {
         });
     });
 
+    describe('#getMetaDataSection', () => {
+        it(`... should return page METADATA if parameter is given`, () => {
+            const metaSection = MetaSectionTypes.page;
+
+            // call service function
+            expect(coreService.getMetaDataSection(metaSection)).toBe(
+                expectedMetaData[metaSection],
+                `should be ${expectedMetaData[metaSection]}`
+            );
+        });
+
+        it(`... should return edition METADATA if parameter is given`, () => {
+            const metaSection = MetaSectionTypes.edition;
+
+            // call service function
+            expect(coreService.getMetaDataSection(metaSection)).toBe(
+                expectedMetaData[metaSection],
+                `should be ${expectedMetaData[metaSection]}`
+            );
+        });
+
+        it(`... should return structure METADATA if parameter is given`, () => {
+            const metaSection = MetaSectionTypes.structure;
+
+            // call service function
+            expect(coreService.getMetaDataSection(metaSection)).toBe(
+                expectedMetaData[metaSection],
+                `should be ${expectedMetaData[metaSection]}`
+            );
+        });
+
+        it(`... should return contact METADATA if parameter is given`, () => {
+            const metaSection = MetaSectionTypes.contact;
+
+            // call service function
+            expect(coreService.getMetaDataSection(metaSection)).toBe(
+                expectedMetaData[metaSection],
+                `should be ${expectedMetaData[metaSection]}`
+            );
+        });
+    });
+
     describe('#getLogos', () => {
         it(`... should return LOGOS`, () => {
             // call service function
diff --git a/src/app/core/services/core-service/core.service.ts b/src/app/core/services/core-service/core.service.ts
index 2c69dd4789..1f1e78dfb9 100644
--- a/src/app/core/services/core-service/core.service.ts
+++ b/src/app/core/services/core-service/core.service.ts
@@ -1,28 +1,50 @@
 import { Injectable } from '@angular/core';
 
-import { Logos, Meta } from '@awg-core/core-models';
+import { Logos, Meta, MetaSectionTypes } from '@awg-core/core-models';
 import { LOGOSDATA, METADATA } from '@awg-core/mock-data';
 
+/**
+ * The Core service.
+ *
+ * It handles the provision of app's metadata and logos objects.
+ *
+ * Provided in: `root`.
+ */
 @Injectable({
     providedIn: 'root'
 })
 export class CoreService {
-    constructor() {}
+    /**
+     * Public method: getMetaDataSection.
+     *
+     * It provides a section of the meta data object.
+     *
+     * @params {<K extends MetaSectionTypes>} [section] The given section.
+     *
+     * @returns {Meta[K]} The section K of the metadata object.
+     */
+    getMetaDataSection<K extends MetaSectionTypes>(section: K): Meta[K] {
+        return METADATA[section];
+    }
 
-    /********************************
+    /**
+     * Public method: getMetaData.
      *
-     * get MetaData
+     * It provides the complete metadata object.
      *
-     ********************************/
+     * @returns {Meta} The complete metadata object.
+     */
     getMetaData(): Meta {
         return METADATA;
     }
 
-    /********************************
+    /**
+     * Public method: getLogos.
      *
-     * get Logos
+     * It provides the app-wide logos object.
      *
-     ********************************/
+     * @returns {Logos} The app-wide logos object.
+     */
     getLogos(): Logos {
         return LOGOSDATA;
     }
diff --git a/src/app/core/services/data-streamer/data-streamer.service.ts b/src/app/core/services/data-streamer/data-streamer.service.ts
index d897cee51f..888249e66d 100644
--- a/src/app/core/services/data-streamer/data-streamer.service.ts
+++ b/src/app/core/services/data-streamer/data-streamer.service.ts
@@ -2,53 +2,112 @@ import { Injectable } from '@angular/core';
 
 import { Observable, ReplaySubject } from 'rxjs';
 
+import { SearchResponseJson } from '@awg-shared/api-objects';
 import { SearchResponseWithQuery } from '@awg-views/data-view/models';
 
+/**
+ * The DataStreamer service.
+ *
+ * It handles the provision of search responses with queries
+ * and resource ids for the search components.
+ *
+ * Provided in: `root`.
+ */
 @Injectable({
     providedIn: 'root'
 })
 export class DataStreamerService {
-    /**************************************************
-     * ReplaySubjects that are used to stream the data
-     **************************************************/
+    /**
+     * Private variable for the replay subject´s buffer size.
+     */
     private bufferSize = 1;
 
-    private searchResponseStreamSource = new ReplaySubject<SearchResponseWithQuery>(this.bufferSize);
-    private searchResponseStream$ = this.searchResponseStreamSource.asObservable();
+    /**
+     * Private replay subject to handle search response with query.
+     */
+    private searchResponseWithQuerySubject = new ReplaySubject<SearchResponseWithQuery>(this.bufferSize);
 
-    private currentResourceIdStreamSource = new ReplaySubject<string>(this.bufferSize);
-    private currentResourceIdStream$ = this.currentResourceIdStreamSource.asObservable();
+    /**
+     * Private readonly search response with query stream as observable (`ReplaySubject`).
+     */
+    private readonly searchResponseWithQueryStream$ = this.searchResponseWithQuerySubject.asObservable();
 
-    /****************
-     *  request data
-     ****************/
-    public getCurrentSearchResults(): Observable<SearchResponseWithQuery> {
-        return this.searchResponseStream$;
+    /**
+     * Private replay subject to handle resource id.
+     */
+    private resourceIdSubject = new ReplaySubject<string>(this.bufferSize);
+
+    /**
+     * Private readonly resource id stream as observable (`ReplaySubject`).
+     */
+    private readonly resourceIdStream$ = this.resourceIdSubject.asObservable();
+
+    /**
+     * Public method: getSearchResponseWithQuery.
+     *
+     * It provides the latest search response with query
+     * from the search response with query stream.
+     *
+     * @returns {Observable<SearchResponseWithQuery>}
+     * The search response with query stream as observable.
+     */
+    getSearchResponseWithQuery(): Observable<SearchResponseWithQuery> {
+        return this.searchResponseWithQueryStream$;
     }
 
-    public getCurrentResourceId(): Observable<string> {
-        return this.currentResourceIdStream$;
+    /**
+     * Public method: getResourceId.
+     *
+     * It provides the latest resource id from the resource id stream.
+     *
+     * @returns {Observable<string>} The resource id stream as observable.
+     */
+    getResourceId(): Observable<string> {
+        return this.resourceIdStream$;
     }
 
-    /***************
-     *  update data
-     ***************/
-    public updateSearchResponseStream(results: SearchResponseWithQuery): void {
-        this.searchResponseStreamSource.next(results);
+    /**
+     * Public method: updateSearchResponseWithQuery.
+     *
+     * It updates the search response with query stream
+     * with the given searchResponseWithQuery.
+     *
+     * @returns {void} Sets the next search response with query to the stream.
+     */
+    updateSearchResponseWithQuery(searchResponseWithQuery: SearchResponseWithQuery): void {
+        this.searchResponseWithQuerySubject.next(searchResponseWithQuery);
     }
 
-    public updateCurrentResourceIdStream(id: string): void {
-        this.currentResourceIdStreamSource.next(id);
+    /**
+     * Public method: updateResourceId.
+     *
+     * It updates the resource id stream with the given id.
+     *
+     * @returns {void} Sets the next resource id to the stream.
+     */
+    updateResourceId(id: string): void {
+        this.resourceIdSubject.next(id);
     }
 
-    /**************
-     *  reset data
-     **************/
-    public clearSearchResults(): void {
-        this.searchResponseStreamSource.next(undefined);
+    /**
+     * Public method: clearSearchResults.
+     *
+     * It clears the search results with query stream.
+     *
+     * @returns {void} Clears the search results with query stream.
+     */
+    clearSearchResults(): void {
+        this.searchResponseWithQuerySubject.next(new SearchResponseWithQuery(new SearchResponseJson(), ''));
     }
 
-    public clearResourceId(): void {
-        this.currentResourceIdStreamSource.next('');
+    /**
+     * Public method: clearResourceId.
+     *
+     * It clears the resource id stream.
+     *
+     * @returns {void} Clears the resource id stream.
+     */
+    clearResourceId(): void {
+        this.resourceIdSubject.next('');
     }
 }
diff --git a/src/app/core/services/index.ts b/src/app/core/services/index.ts
index 6f3baa0f73..c9b751bdc6 100644
--- a/src/app/core/services/index.ts
+++ b/src/app/core/services/index.ts
@@ -9,8 +9,9 @@
 
 import { ApiService } from './api-service';
 import { ConversionService } from './conversion-service';
-import { DataStreamerService } from './data-streamer';
 import { CoreService } from './core-service';
+import { DataStreamerService } from './data-streamer';
+import { LoadingService } from './loading-service';
 import { SideInfoService } from './side-info-service';
 
-export { ApiService, ConversionService, DataStreamerService, CoreService, SideInfoService };
+export { ApiService, ConversionService, CoreService, DataStreamerService, LoadingService, SideInfoService };
diff --git a/src/app/core/services/loading-service/index.ts b/src/app/core/services/loading-service/index.ts
new file mode 100644
index 0000000000..05474346fa
--- /dev/null
+++ b/src/app/core/services/loading-service/index.ts
@@ -0,0 +1 @@
+export * from './loading.service';
diff --git a/src/app/core/services/loading-service/loading.service.spec.ts b/src/app/core/services/loading-service/loading.service.spec.ts
new file mode 100644
index 0000000000..6feee8135c
--- /dev/null
+++ b/src/app/core/services/loading-service/loading.service.spec.ts
@@ -0,0 +1,12 @@
+import { TestBed } from '@angular/core/testing';
+
+import { LoadingService } from './loading.service';
+
+describe('LoadingService', () => {
+    beforeEach(() => TestBed.configureTestingModule({}));
+
+    it('should be created', () => {
+        const service: LoadingService = TestBed.get(LoadingService);
+        expect(service).toBeTruthy();
+    });
+});
diff --git a/src/app/core/services/loading-service/loading.service.ts b/src/app/core/services/loading-service/loading.service.ts
new file mode 100644
index 0000000000..434fabcdec
--- /dev/null
+++ b/src/app/core/services/loading-service/loading.service.ts
@@ -0,0 +1,54 @@
+import { Injectable } from '@angular/core';
+import { BehaviorSubject, Observable } from 'rxjs';
+
+/**
+ * The Loading service.
+ *
+ * It handles the loading status of outgoing http requests
+ * that is set by the {@link LoadingInterceptor}
+ * and it provides the status in a public variable
+ * that can be subscribed by components.
+ *
+ * Provided in: `root`.
+ */
+@Injectable({
+    providedIn: 'root'
+})
+export class LoadingService {
+    /**
+     * Private behavior subject to handle loading status.
+     */
+    private isLoadingSubject = new BehaviorSubject<boolean>(false);
+
+    /**
+     * Private readonly isLoading stream as observable (`BehaviorSubject`).
+     */
+    private readonly isLoading$ = this.isLoadingSubject.asObservable();
+
+    /**
+     * Constructor of the LoadingService.
+     */
+    constructor() {}
+
+    /**
+     * Public method: getLoadingStatus.
+     *
+     * It provides the latest loading status from the isLoading stream.
+     *
+     * @returns {Observable<boolean>} The isLoading stream as observable.
+     */
+    getLoadingStatus(): Observable<boolean> {
+        return this.isLoading$;
+    }
+
+    /**
+     * Public method: updateLoadingStatus.
+     *
+     * It updates the isLoading stream with the given boolean value.
+     *
+     * @returns {void} Sets the next boolean value to the stream.
+     */
+    updateLoadingStatus(isLoading: boolean): void {
+        this.isLoadingSubject.next(isLoading);
+    }
+}
diff --git a/src/app/core/services/side-info-service/side-info.service.ts b/src/app/core/services/side-info-service/side-info.service.ts
index 643958da7a..994cf06e1c 100644
--- a/src/app/core/services/side-info-service/side-info.service.ts
+++ b/src/app/core/services/side-info-service/side-info.service.ts
@@ -1,47 +1,104 @@
 import { Injectable } from '@angular/core';
 
-import { Subject, Observable } from 'rxjs';
+import { Subject, Observable, BehaviorSubject } from 'rxjs';
 
 import { SearchInfo } from '@awg-side-info/side-info-models';
 
+/**
+ * The SideInfo service.
+ *
+ * It handles the provision of data and
+ * titles for the side info components.
+ *
+ * Provided in: `root`.
+ */
 @Injectable({
     providedIn: 'root'
 })
 export class SideInfoService {
-    private sideInfoData: Subject<any> = new Subject<any>(); // observable string source
-    private sideInfoData$ = this.sideInfoData.asObservable(); // Observable string stream for subscription
-
-    private searchInfoTitle: Subject<any> = new Subject<string>(); // observable string source
-    private searchInfoTitle$ = this.searchInfoTitle.asObservable(); // Observable string stream for subscription
-
-    /**********************************
-     **
-     **  get data from sideInfo
-     **
-     **********************************/
-    public getSideInfoData(): Observable<any> {
-        return this.sideInfoData$;
+    /**
+     * Private subject to handle search info data.
+     */
+    private searchInfoDataSubject: Subject<SearchInfo> = new BehaviorSubject<SearchInfo>(new SearchInfo('---', '---'));
+
+    /**
+     * Readonly search info data stream as observable (`Subject`).
+     */
+    readonly searchInfoDataStream$ = this.searchInfoDataSubject.asObservable();
+
+    /**
+     * Private behavior subject to handle search info title.
+     */
+    private searchInfoTitleSubject: Subject<string> = new BehaviorSubject<string>('');
+
+    /**
+     * Readonly search info title stream as observable (`BehaviorSubject`).
+     */
+    readonly searchInfoTitleStream$ = this.searchInfoTitleSubject.asObservable();
+
+    /**
+     * Public method: getSearchInfoData.
+     *
+     * It provides the latest data from the search info data stream.
+     *
+     * @returns {Observable<SearchInfo>} The search info data stream as observable.
+     */
+    getSearchInfoData(): Observable<SearchInfo> {
+        return this.searchInfoDataStream$;
+    }
+
+    /**
+     * Public method: getSearchInfoTitle.
+     *
+     * It provides the latest title from the search info title stream.
+     *
+     * @returns {Observable<string>} The search info title stream as observable.
+     */
+    getSearchInfoTitle(): Observable<string> {
+        return this.searchInfoTitleStream$;
     }
 
-    public getSearchInfoTitle(): Observable<string> {
-        return this.searchInfoTitle$;
+    /**
+     * Public method: updateSearchInfoData.
+     *
+     * It updates the side info data stream with the given data (`searchInfo`).
+     *
+     * @returns {void} Sets the next searchInfo to the side info data stream.
+     */
+    updateSearchInfoData(searchInfo: SearchInfo): void {
+        this.searchInfoDataSubject.next(searchInfo);
     }
 
-    /**********************************
-     **
-     **  update sideInfo data
-     **
-     **********************************/
-    public updateSideInfoData(data: any): void {
-        this.sideInfoData.next(data);
+    /**
+     * Public method: updateSearchInfoTitle.
+     *
+     * It updates the search info title stream with the given title.
+     *
+     * @returns {void} Sets the next title to the search info title stream.
+     */
+    updateSearchInfoTitle(title: string): void {
+        this.searchInfoTitleSubject.next(title);
     }
 
-    public updateSearchInfoData(searchInfo: SearchInfo) {
-        this.sideInfoData.next(searchInfo);
+    /**
+     * Public method: clearSearchInfoData.
+     *
+     * It clears the search info data stream.
+     *
+     * @returns {void} Clears the search info data stream.
+     */
+    clearSearchInfoData(): void {
+        this.searchInfoDataSubject.next(new SearchInfo('---', '---'));
     }
 
-    public updateSearchInfoTitle(title: string) {
-        console.log('updateSearchInfoTitle: title: ', title);
-        this.searchInfoTitle.next(title);
+    /**
+     * Public method: clearSearchInfoTitle.
+     *
+     * It clears the search info title stream.
+     *
+     * @returns {void} Clears the search info title stream.
+     */
+    clearSearchInfoTitle(): void {
+        this.searchInfoTitleSubject.next('');
     }
 }
diff --git a/src/app/core/view-container/view-container.component.html b/src/app/core/view-container/view-container.component.html
index 6c2aeb8493..ab726f2d29 100644
--- a/src/app/core/view-container/view-container.component.html
+++ b/src/app/core/view-container/view-container.component.html
@@ -1,11 +1,11 @@
 <div class="container-fluid text-left">
     <div class="row">
-        <div class="col-md-4 col-xl-3 mt-4 awg-sidenav text-center">
-            <router-outlet name="side"></router-outlet>
-        </div>
-
         <div class="col-md-8 col-xl-9 my-4 awg-maincontent text-left">
             <router-outlet></router-outlet>
         </div>
+
+        <div class="col-md-4 col-xl-3 order-first mt-4 awg-sidenav text-center">
+            <router-outlet name="side"></router-outlet>
+        </div>
     </div>
 </div>
diff --git a/src/app/core/view-container/view-container.component.spec.ts b/src/app/core/view-container/view-container.component.spec.ts
index ebf61b405f..d564d016a5 100644
--- a/src/app/core/view-container/view-container.component.spec.ts
+++ b/src/app/core/view-container/view-container.component.spec.ts
@@ -40,8 +40,8 @@ describe('ViewContainerComponent (DONE)', () => {
                 const divEl0 = divDes[0].nativeElement;
                 const divEl1 = divDes[1].nativeElement;
 
-                expect(divEl0).toHaveCssClass('awg-sidenav');
-                expect(divEl1).toHaveCssClass('awg-maincontent');
+                expect(divEl0).toHaveCssClass('awg-maincontent');
+                expect(divEl1).toHaveCssClass('awg-sidenav');
             });
 
             it('... should contain two router outlets (stubbed)', () => {
@@ -51,42 +51,15 @@ describe('ViewContainerComponent (DONE)', () => {
             it('... should contain only one named router outlet (stubbed)', () => {
                 const routletDes = getAndExpectDebugElementByDirective(compDe, RouterOutletStubComponent, 2, 2);
 
-                // first outlet should be named 'side'
+                // main outlet should not be named
                 expect(routletDes[0].attributes).toBeDefined();
-                expect(routletDes[0].attributes.name).toBeDefined();
-                expect(routletDes[0].attributes.name).toBe('side', 'should have name `side`');
+                expect(routletDes[0].attributes.name).not.toBeDefined();
 
-                // second outlet should not be named
+                // secondary outlet should be named 'side'
                 expect(routletDes[1].attributes).toBeDefined();
-                expect(routletDes[1].attributes.name).not.toBeDefined();
+                expect(routletDes[1].attributes.name).toBeDefined();
+                expect(routletDes[1].attributes.name).toBe('side', 'should have name `side`');
             });
         });
     });
-
-    describe('AFTER initial data binding', () => {
-        beforeEach(() => {
-            // trigger initial data binding
-            fixture.detectChanges();
-        });
-
-        it('... should still have all elements', () => {
-            const divDes = getAndExpectDebugElementByCss(compDe, 'div.container-fluid > div.row > div', 2, 2);
-            const routletDes = getAndExpectDebugElementByDirective(compDe, RouterOutletStubComponent, 2, 2);
-
-            const divEl0 = divDes[0].nativeElement;
-            const divEl1 = divDes[1].nativeElement;
-
-            expect(divEl0).toHaveCssClass('awg-sidenav');
-            expect(divEl1).toHaveCssClass('awg-maincontent');
-
-            // first outlet should be named 'side'
-            expect(routletDes[0].attributes).toBeDefined();
-            expect(routletDes[0].attributes.name).toBeDefined();
-            expect(routletDes[0].attributes.name).toBe('side', 'should have name `side`');
-
-            // second outlet should not be named
-            expect(routletDes[1].attributes).toBeDefined();
-            expect(routletDes[1].attributes.name).not.toBeDefined();
-        });
-    });
 });
diff --git a/src/app/core/view-container/view-container.component.ts b/src/app/core/view-container/view-container.component.ts
index ef608f3060..fedd08dfe1 100644
--- a/src/app/core/view-container/view-container.component.ts
+++ b/src/app/core/view-container/view-container.component.ts
@@ -1,12 +1,16 @@
-import { Component, OnInit } from '@angular/core';
+import { Component } from '@angular/core';
 
+/**
+ * The ViewContainer component.
+ *
+ * It contains the views section of the app and
+ * declares the main outlet that loads the
+ * views components and the secondary outlet ('side')
+ * that loads the side-info components.
+ */
 @Component({
     selector: 'awg-view-container',
     templateUrl: './view-container.component.html',
     styleUrls: ['./view-container.component.css']
 })
-export class ViewContainerComponent implements OnInit {
-    constructor() {}
-
-    ngOnInit() {}
-}
+export class ViewContainerComponent {}
diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-file-nav/edition-svg-file-nav.component.css b/src/app/shared/address/address.component.css
similarity index 100%
rename from src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-file-nav/edition-svg-file-nav.component.css
rename to src/app/shared/address/address.component.css
diff --git a/src/app/shared/address/address.component.html b/src/app/shared/address/address.component.html
new file mode 100644
index 0000000000..258bc4c86d
--- /dev/null
+++ b/src/app/shared/address/address.component.html
@@ -0,0 +1,31 @@
+<address>
+    <p id="awg-address-header" class="caps">
+        <strong>
+            <a href="{{ pageMetaData?.awgProjectUrl }}" target="_blank" rel="noopener noreferrer">{{
+                pageMetaData?.awgProjectName
+            }}</a>
+        </strong>
+    </p>
+    <p class="awg-address-content">
+        <span id="awg-address-institution">{{ contactMetaData?.address?.institution }}</span>
+        <br />
+        <span id="awg-address-street">{{ contactMetaData?.address?.street }}</span>
+        <br />
+        <span id="awg-address-postal-city"
+            >{{ contactMetaData?.address?.postalCode }}&nbsp;{{ contactMetaData?.address?.city }}</span
+        >
+        <br />
+        <span id="awg-address-country">{{ contactMetaData?.address?.country }}</span>
+    </p>
+    <p class="awg-address-content">
+        <span id="awg-address-phone"
+            >{{ contactMetaData?.phone?.label }}&nbsp;{{ contactMetaData?.phone?.number }}</span
+        >
+        <br />
+        <span id="awg-address-email"
+            >{{ contactMetaData?.email?.label }}&nbsp;<a href="{{ contactMetaData?.email?.mailto }}">{{
+                contactMetaData?.email?.safeString
+            }}</a></span
+        >
+    </p>
+</address>
diff --git a/src/app/shared/address/address.component.spec.ts b/src/app/shared/address/address.component.spec.ts
new file mode 100644
index 0000000000..ef7fc38612
--- /dev/null
+++ b/src/app/shared/address/address.component.spec.ts
@@ -0,0 +1,246 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { DebugElement } from '@angular/core';
+
+import { getAndExpectDebugElementByCss } from '@testing/expect-helper';
+
+import { MetaContact, MetaPage, MetaSectionTypes } from '@awg-core/core-models';
+import { METADATA } from '@awg-core/mock-data';
+
+import { AddressComponent } from './address.component';
+
+describe('AddressComponent (DONE)', () => {
+    let component: AddressComponent;
+    let fixture: ComponentFixture<AddressComponent>;
+    let compDe: DebugElement;
+    let compEl: any;
+
+    let expectedPageMetaData: MetaPage;
+    let expectedContactMetaData: MetaContact;
+
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            declarations: [AddressComponent]
+        }).compileComponents();
+    }));
+
+    beforeEach(() => {
+        fixture = TestBed.createComponent(AddressComponent);
+        component = fixture.componentInstance;
+        compDe = fixture.debugElement;
+        compEl = compDe.nativeElement;
+
+        // test data
+        expectedPageMetaData = METADATA[MetaSectionTypes.page];
+        expectedContactMetaData = METADATA[MetaSectionTypes.contact];
+    });
+
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
+
+    describe('BEFORE initial data binding', () => {
+        it('should not have `pageMetaData` input', () => {
+            expect(component.pageMetaData).toBeUndefined('should be undefined');
+        });
+
+        it('should not have `contactMetaData` input', () => {
+            expect(component.contactMetaData).toBeUndefined('should be undefined');
+        });
+
+        describe('VIEW', () => {
+            it('... should contain one address field with 3 ´p´ elements', () => {
+                getAndExpectDebugElementByCss(compDe, 'address', 1, 1);
+                getAndExpectDebugElementByCss(compDe, 'address p', 3, 3);
+
+                getAndExpectDebugElementByCss(compDe, 'address p#awg-address-header', 1, 1);
+                getAndExpectDebugElementByCss(compDe, 'address p.awg-address-content', 2, 2);
+            });
+
+            it('... should not render the address header information yet', () => {
+                const headerDes = getAndExpectDebugElementByCss(compDe, 'address p#awg-address-header a', 1, 1);
+                const headerEl = headerDes[0].nativeElement;
+
+                expect(headerEl.href).toBeDefined();
+                expect(headerEl.href).toBe('', `should be empty string`);
+
+                expect(headerEl.textContent).toBeDefined();
+                expect(headerEl.textContent).toBe('', `should be empty string`);
+            });
+
+            it('... should not render the address content information yet', () => {
+                const contentDes = getAndExpectDebugElementByCss(compDe, 'address p.awg-address-content', 2, 2);
+                const content0Des = contentDes[0];
+                const content1Des = contentDes[1];
+
+                // content1
+                const insitutionDes = getAndExpectDebugElementByCss(content0Des, '#awg-address-institution', 1, 1);
+                const streetDes = getAndExpectDebugElementByCss(content0Des, '#awg-address-street', 1, 1);
+                const postalCityDes = getAndExpectDebugElementByCss(content0Des, '#awg-address-postal-city', 1, 1);
+                const countryDes = getAndExpectDebugElementByCss(content0Des, '#awg-address-country', 1, 1);
+
+                const institutionEl = insitutionDes[0].nativeElement;
+                const streetEl = streetDes[0].nativeElement;
+                const postalCityEl = postalCityDes[0].nativeElement;
+                const countryEl = countryDes[0].nativeElement;
+
+                // content 2
+                const phoneDes = getAndExpectDebugElementByCss(content1Des, '#awg-address-phone', 1, 1);
+                const emailDes = getAndExpectDebugElementByCss(content1Des, '#awg-address-email a', 1, 1);
+
+                const phoneEl = phoneDes[0].nativeElement;
+                const emailEl = emailDes[0].nativeElement;
+
+                expect(institutionEl.textContent).toBeDefined();
+                expect(institutionEl.textContent).toBe('', `should be empty string`);
+
+                expect(streetEl.textContent).toBeDefined();
+                expect(streetEl.textContent).toBe('', `should be empty string`);
+
+                expect(postalCityEl.textContent).toBeDefined();
+                expect(postalCityEl.textContent).toBe('', `should be empty string`);
+
+                expect(countryEl.textContent).toBeDefined();
+                expect(countryEl.textContent).toBe('', `should be empty string`);
+
+                expect(phoneEl.textContent).toBeDefined();
+                expect(phoneEl.textContent).toBe('', `should be empty string`);
+
+                expect(emailEl.href).toBeDefined();
+                expect(emailEl.href).toBe('', `should be empty string`);
+                expect(emailEl.textContent).toBeDefined();
+                expect(emailEl.textContent).toBe('', `should be empty string`);
+            });
+        });
+    });
+
+    describe('AFTER initial data binding', () => {
+        beforeEach(() => {
+            // simulate the parent setting the input properties
+            component.pageMetaData = expectedPageMetaData;
+            component.contactMetaData = expectedContactMetaData;
+
+            // trigger initial data binding
+            fixture.detectChanges();
+        });
+
+        describe('VIEW', () => {
+            it('... should render the address header information', () => {
+                const headerDes = getAndExpectDebugElementByCss(compDe, 'address p#awg-address-header a', 1, 1);
+                const headerEl = headerDes[0].nativeElement;
+
+                expect(headerEl.href).toBeDefined();
+                expect(headerEl.href).toBe(
+                    expectedPageMetaData.awgProjectUrl,
+                    `should be ${expectedPageMetaData.awgProjectUrl}`
+                );
+
+                expect(headerEl.textContent).toBeDefined();
+                expect(headerEl.textContent).toBe(
+                    expectedPageMetaData.awgProjectName,
+                    `should be ${expectedPageMetaData.awgProjectName}`
+                );
+            });
+
+            it('... should render the address content institution information', () => {
+                const institutionDes = getAndExpectDebugElementByCss(
+                    compDe,
+                    'address p.awg-address-content span#awg-address-institution',
+                    1,
+                    1
+                );
+                const institutionEl = institutionDes[0].nativeElement;
+
+                expect(institutionEl.textContent).toBeDefined();
+                expect(institutionEl.textContent).toBe(
+                    expectedContactMetaData.address.institution,
+                    `should be ${expectedContactMetaData.address.institution}`
+                );
+            });
+
+            it('... should render the address content street information', () => {
+                const streetDes = getAndExpectDebugElementByCss(
+                    compDe,
+                    'address p.awg-address-content span#awg-address-street',
+                    1,
+                    1
+                );
+                const streetEl = streetDes[0].nativeElement;
+
+                expect(streetEl.textContent).toBeDefined();
+                expect(streetEl.textContent).toBe(
+                    expectedContactMetaData.address.street,
+                    `should be ${expectedContactMetaData.address.street}`
+                );
+            });
+
+            it('... should render the address content postal city information', () => {
+                const postalCityDes = getAndExpectDebugElementByCss(
+                    compDe,
+                    'address p.awg-address-content span#awg-address-postal-city',
+                    1,
+                    1
+                );
+                const postalCityEl = postalCityDes[0].nativeElement;
+
+                const expectedPostalCity =
+                    expectedContactMetaData.address.postalCode + '\xA0' + expectedContactMetaData.address.city;
+
+                expect(postalCityEl.textContent).toBeDefined();
+                expect(postalCityEl.textContent).toBe(expectedPostalCity, `should be ${expectedPostalCity}`);
+            });
+
+            it('... should render the address content country information', () => {
+                const countryDes = getAndExpectDebugElementByCss(
+                    compDe,
+                    'address p.awg-address-content span#awg-address-country',
+                    1,
+                    1
+                );
+                const countryEl = countryDes[0].nativeElement;
+
+                expect(countryEl.textContent).toBeDefined();
+                expect(countryEl.textContent).toBe(
+                    expectedContactMetaData.address.country,
+                    `should be ${expectedContactMetaData.address.country}`
+                );
+            });
+
+            it('... should render the address content phone information', () => {
+                const phoneDes = getAndExpectDebugElementByCss(
+                    compDe,
+                    'address p.awg-address-content span#awg-address-phone',
+                    1,
+                    1
+                );
+                const phoneEl = phoneDes[0].nativeElement;
+
+                const expectedPhone =
+                    expectedContactMetaData.phone.label + '\xA0' + expectedContactMetaData.phone.number;
+
+                expect(phoneEl.textContent).toBeDefined();
+                expect(phoneEl.textContent).toBe(expectedPhone, `should be ${expectedPhone}`);
+            });
+
+            it('... should render the address content email information', () => {
+                const emailDes = getAndExpectDebugElementByCss(
+                    compDe,
+                    'address p.awg-address-content span#awg-address-email a',
+                    1,
+                    1
+                );
+                const emailEl = emailDes[0].nativeElement;
+
+                expect(emailEl.href).toBeDefined();
+                expect(emailEl.href).toBe(
+                    expectedContactMetaData.email.mailto,
+                    `should be ${expectedContactMetaData.email.mailto}`
+                );
+                expect(emailEl.textContent).toBeDefined();
+                expect(emailEl.textContent).toBe(
+                    expectedContactMetaData.email.safeString,
+                    `should be ${expectedContactMetaData.email.safeString}`
+                );
+            });
+        });
+    });
+});
diff --git a/src/app/shared/address/address.component.ts b/src/app/shared/address/address.component.ts
new file mode 100644
index 0000000000..b3218dd4e6
--- /dev/null
+++ b/src/app/shared/address/address.component.ts
@@ -0,0 +1,33 @@
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { MetaContact, MetaPage } from '@awg-core/core-models';
+
+/**
+ * The Address component.
+ *
+ * It contains an address field to be
+ * filled from meta data information and to be
+ * provided via the {@link SharedModule}.
+ */
+@Component({
+    selector: 'awg-address',
+    templateUrl: './address.component.html',
+    styleUrls: ['./address.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class AddressComponent {
+    /**
+     * Input variable: pageMetaData.
+     *
+     * It keeps the page meta data for the address.
+     */
+    @Input()
+    pageMetaData: MetaPage;
+
+    /**
+     * Input variable: contactMetaData.
+     *
+     * It keeps the contact meta data for the address.
+     */
+    @Input()
+    contactMetaData: MetaContact;
+}
diff --git a/src/app/shared/api-objects/basic-message-components/src/project-item-json.ts b/src/app/shared/api-objects/basic-message-components/src/project-item-json.ts
index fadddb42fb..ca18559c9f 100644
--- a/src/app/shared/api-objects/basic-message-components/src/project-item-json.ts
+++ b/src/app/shared/api-objects/basic-message-components/src/project-item-json.ts
@@ -29,14 +29,14 @@ export class ProjectItemJson {
     public basepath: string = undefined;
 
     /**
-     *
+     * The institution a project belongs to
      * @param belongsToInstitution: any
      */
     @JsonProperty('belongsToInstitution', null)
     public belongsToInstitution: any = undefined;
 
     /**
-     *
+     * A named data graph
      * @param dataNamedGraph
      */
     @JsonProperty('dataNamedGraph', String)
@@ -50,6 +50,7 @@ export class ProjectItemJson {
     public description: string = undefined;
 
     /**
+     * Option for users to self join a project
      * @param hasSelfJoinEnabled: boolean
      */
     @JsonProperty('hasSelfJoinEnabled', Boolean)
diff --git a/src/app/shared/api-objects/basic-message-components/src/userdata-json.ts b/src/app/shared/api-objects/basic-message-components/src/userdata-json.ts
index a3441664ae..be6e5d4295 100644
--- a/src/app/shared/api-objects/basic-message-components/src/userdata-json.ts
+++ b/src/app/shared/api-objects/basic-message-components/src/userdata-json.ts
@@ -20,27 +20,59 @@ import { JsonObject, JsonProperty } from 'json2typescript';
  */
 @JsonObject
 export class UserDataJson {
+    /**
+     * Email of a user
+     * @param email: string | null
+     */
     @JsonProperty('email', String, true)
     public email: string = undefined;
 
+    /**
+     * First name of a user
+     * @param givenName: string | null
+     */
     @JsonProperty('firstname', String, true)
     public givenName: string = undefined;
 
+    /**
+     * Last name of a user
+     * @param familyName: string | null
+     */
     @JsonProperty('lastname', String, true)
     public familyName: string = undefined;
 
+    /**
+     * Default language for a user
+     * @param lang: string | null
+     */
     @JsonProperty('lang', String, true)
     public lang: string = undefined;
 
+    /**
+     * Password of a user
+     * @param password: string | null
+     */
     @JsonProperty('password', String, true)
     public password: string = undefined;
 
+    /**
+     * Status of a user
+     * @param status: boolean | null
+     */
     @JsonProperty('status', Boolean, true)
     public status: boolean = undefined;
 
+    /**
+     * Token for a user
+     * @param token: string | null
+     */
     @JsonProperty('token', String, true)
     public token: string = undefined;
 
+    /**
+     * Id of a user
+     * @param user_id: string | null
+     */
     @JsonProperty('user_id', String, true)
     public user_id: string = undefined;
 }
diff --git a/src/app/shared/api-objects/resource-response-formats/index.ts b/src/app/shared/api-objects/resource-response-formats/index.ts
index 58baaa3ea9..bca6a0982f 100644
--- a/src/app/shared/api-objects/resource-response-formats/index.ts
+++ b/src/app/shared/api-objects/resource-response-formats/index.ts
@@ -23,6 +23,7 @@
 
 import { ContextJson } from './src/context-json';
 import { IncomingItemJson } from './src/incoming-item-json';
+import { PropertyJson } from './src/property-json';
 import { PropertyTypesInResourceClassResponseJson } from './src/property-types-in-resource-class-response-json';
 import { ResourceContextResponseJson } from './src/resource-context-response-json';
 import { ResourceFullResponseJson } from './src/resource-full-response-json';
@@ -37,6 +38,7 @@ import { VocabularyResponseJson } from './src/vocabulary-response-json';
 export {
     ContextJson,
     IncomingItemJson,
+    PropertyJson,
     PropertyTypesInResourceClassResponseJson,
     ResourceContextResponseJson,
     ResourceFullResponseJson,
diff --git a/src/app/shared/api-objects/resource-response-formats/src/property-json.ts b/src/app/shared/api-objects/resource-response-formats/src/property-json.ts
index bf1c364979..d8eec8f5fe 100644
--- a/src/app/shared/api-objects/resource-response-formats/src/property-json.ts
+++ b/src/app/shared/api-objects/resource-response-formats/src/property-json.ts
@@ -22,14 +22,30 @@ import {
     StringOrNumber
 } from '@awg-shared/api-objects/basic-message-components';
 
+/**
+ * Represents a property value
+ * @used by PropertyJson
+ */
 @JsonObject
 export class PropertyJsonValue {
+    /**
+     * UTF-8 string of the property value
+     * @param utf8str: string | null
+     */
     @JsonProperty('utf8str', String)
     public utf8str: string = undefined;
 
+    /**
+     * Text attribute of the property value
+     * @param textattr: string | null
+     */
     @JsonProperty('textattr', String)
     public textattr: string = undefined;
 
+    /**
+     * Resource reference of the property value
+     * @param resource_reference: string[] | null
+     */
     @JsonProperty('resource_reference', [String])
     public resource_reference: string[] = undefined;
 }
@@ -171,6 +187,21 @@ export class PropertyJson {
     @JsonProperty('valuetype_id', String)
     public valuetype_id: string = undefined;
 
+    /**
+     * The property's html serialization.
+     * @param toHtml: Array<string> OPTIONAL
+     * TODO
+     */
+    @JsonProperty('toHtml', [String], true)
+    public toHtml: string[] = undefined;
+
+    /**
+     * Public method: getValuesAsPropertyJsonValues
+     *
+     * Converts the property's values to a PropertyJsonValue array.
+     *
+     * @returns {PropertyJsonValue[]} The property json value array.
+     */
     public getValuesAsPropertyJsonValues(): PropertyJsonValue[] {
         try {
             const jsonConvert: JsonConvert = new JsonConvert();
diff --git a/src/app/shared/api-objects/resource-response-formats/src/resource-properties-response-json.ts b/src/app/shared/api-objects/resource-response-formats/src/resource-properties-response-json.ts
index 639025dac9..bdb4bbc81f 100644
--- a/src/app/shared/api-objects/resource-response-formats/src/resource-properties-response-json.ts
+++ b/src/app/shared/api-objects/resource-response-formats/src/resource-properties-response-json.ts
@@ -26,14 +26,18 @@ import { PropJson } from './prop-json';
 export class ResourcePropertiesResponseJson extends BasicResponseJson {
     /**
      * A map of property type IRIs to property instances
+     *
      * @param properties: object
-     * * @type [index: string]: prop
+     * @type [index: string]: prop
      * TODO
      */
     @JsonProperty('properties', [PropJson])
     public properties: IndexedPropJson[] = undefined;
 }
 
+/**
+ * Represents a IndexedPropJson
+ */
 interface IndexedPropJson {
     [index: string]: PropJson;
 }
diff --git a/src/app/shared/api-objects/search-response-formats/src/thumb-max-json.ts b/src/app/shared/api-objects/search-response-formats/src/thumb-max-json.ts
index 5ddf7036e2..c1bd61bc93 100644
--- a/src/app/shared/api-objects/search-response-formats/src/thumb-max-json.ts
+++ b/src/app/shared/api-objects/search-response-formats/src/thumb-max-json.ts
@@ -14,7 +14,7 @@
 
 import { JsonObject, JsonProperty } from 'json2typescript';
 
-/*
+/**
  * Represents maximal dimensions of preview representations
  * @used by SearchResponseJson
  */
diff --git a/src/app/shared/compile-html/compile-html.component.ts b/src/app/shared/compile-html/compile-html.component.ts
index d4a4b7b588..7716c9ba5d 100644
--- a/src/app/shared/compile-html/compile-html.component.ts
+++ b/src/app/shared/compile-html/compile-html.component.ts
@@ -1,4 +1,5 @@
 /* tslint:disable:no-input-rename */
+/* tslint:disable:component-selector */
 
 /************************************************
  *
@@ -16,7 +17,6 @@ import {
     Component,
     Input,
     Injectable,
-    OnInit,
     OnChanges,
     SimpleChanges,
     Type,
@@ -27,95 +27,204 @@ import {
 } from '@angular/core';
 import { CommonModule } from '@angular/common';
 
-let singletonDefaultModule: NgModule;
-
 import { cloneDeep } from 'lodash';
 
+/**
+ * compileHtml.reverse(str)
+ *
+ * @param {string} str
+ * @returns {string}
+ */
+const reverse = (str: string): string =>
+    str
+        .split('')
+        .reverse()
+        .join('');
+
+/**
+ * compileHtml.random()
+ *
+ * @returns {string}
+ */
+const random = (): string => {
+    return (Math.floor(Math.random() * (99999999999999999 - 10000000000000000)) + 10000000000000000).toString(16);
+};
+
+/**
+ * compileHtml.currentIdTime
+ */
+let currentIdTime: number;
+
+/**
+ * compileHtml.currentId
+ */
+let currentId = 0;
+
+/**
+ * compileHtml.nextId()
+ *
+ * @returns {string} A randomly generated id for the dynamic component's selector.
+ */
+const nextId = (): string => {
+    const now = Date.now();
+    if (currentIdTime !== now) {
+        currentId = 0;
+        currentIdTime = now;
+    }
+    const comingId = ++currentId;
+    const randomHex = reverse(random()).padStart(15, '0');
+    const timeHex = reverse(currentIdTime.toString(16).padStart(12, '0'));
+    const comingIdHex = reverse(comingId.toString(16).padStart(3, '0'));
+    const newId = `compile-html-${timeHex}${comingIdHex}${randomHex}`;
+    return newId;
+};
+
+/**
+ * The CompileHtml component.
+ *
+ * It is declared as a Component, but used like a directive.
+ * It allows the dynamic creation of a component and is needed
+ * for the secondary compilation of HTML code.
+ *
+ * It does not allow for AOT compilation so far.
+ *
+ * Idea, code and usage is inspired, adapted or taken from:
+ * * [**patrikx3-angular-compile**](https://github.com/patrikx3/angular-compile) Build v1.1.113-149 on 02/26/2017, 7:43:58 PM
+ * [Corifeus](http://github.com/patrikx3/corifeus) by [Patrik Laszlo](http://patrikx3.tk)
+ *
+ * Provided in: `root`.
+ */
 @Component({
     selector: '[compile-html]',
     template: `
-        <span
-            *ngIf="
-                html !== undefined &&
-                html !== null &&
-                html.trim() !== '' &&
-                dynamicComponent !== undefined &&
-                dynamicModule !== undefined
-            "
-        >
+        <ng-container *ngIf="html !== undefined && html !== null && html.trim() !== ''">
             <ng-container *ngComponentOutlet="dynamicComponent; ngModuleFactory: dynamicModule"></ng-container>
-        </span>
+        </ng-container>
     `
 })
 @Injectable()
-export class CompileHtmlComponent implements OnInit, OnChanges {
+export class CompileHtmlComponent implements OnChanges {
+    /**
+     * Input variable: compile-html.
+     *
+     * It keeps the html template for the dynamic component.
+     */
     @Input('compile-html')
     html: string;
+
+    /**
+     * Input variable: compile-html-ref.
+     *
+     * It keeps the reference to the dynamic component.
+     */
     @Input('compile-html-ref')
     ref: any;
+
+    /**
+     * Input variable: compile-html-error-handler.
+     *
+     * It keeps the custom error handler for the dynamic component.
+     */
     @Input('compile-html-error-handler')
     errorHandler: (ex: any) => void = console.error;
+
+    /**
+     * Input variable: compile-html-module.
+     *
+     * It keeps the custom module for the dynamic component.
+     */
     @Input('compile-html-module')
     module: NgModule;
+
+    /**
+     * Input variable: compile-html-imports.
+     *
+     * It keeps the custom imports for the dynamic component.
+     */
     @Input('compile-html-imports')
     imports: Array<Type<any> | ModuleWithProviders | any[]>;
 
+    /**
+     * Public variable: dynamicComponent.
+     *
+     * It keeps the component that is to be created dynamically.
+     */
     dynamicComponent: any;
+
+    /**
+     * Public variable: dynamicModule.
+     *
+     * It keeps the module declarations for the component that is to be created dynamically.
+     */
     dynamicModule: NgModuleFactory<any> | any;
 
-    constructor(
-        //      private container: ViewContainerRef,
-        //      private service: CompileService
-        private compiler: Compiler
-    ) {}
+    /**
+     * Constructor of the CompileHtmlComponent.
+     *
+     * It declares a private {@link Compiler}
+     * instance for the dynamic compilation of a given component.
+     *
+     * @param {Compiler} compiler Instance of the Compiler.
+     */
+    constructor(private compiler: Compiler) {}
 
-    // reassign singletonDefaultModule (justify use of 'let') - unused
-    static reset() {
-        singletonDefaultModule = {};
+    /**
+     * Angular life cycle hook: ngOnChanges.
+     *
+     * It checks for changes of the given input.
+     *
+     * @param {SimpleChanges} changes The changes of the input.
+     */
+    ngOnChanges(changes: SimpleChanges) {
+        this.update();
     }
 
-    async update() {
-        if (this.html === undefined || this.html.trim() === '') {
-            //            this.container.clear();
-            this.dynamicComponent = undefined;
-            this.dynamicModule = undefined;
-            return;
-        }
-        /*
-                const cacheKey = this.html;
-                if (Object.keys(cache).indexOf(cacheKey) > -1) {
-                    return cache[cacheKey];
-                }
-        */
+    /**
+     * Public method: update.
+     *
+     * It updates the [dynamicComponent]{@link CompileHtmlComponent#dynamicComponent}
+     * and [dynamicModule]{@link CompileHtmlComponent#dynamicModule}
+     * and triggers their creation methods.
+     *
+     * @returns {void} The new dynamic component and its module.
+     */
+    update(): void {
         try {
+            if (this.html === undefined || this.html === null || this.html.trim() === '') {
+                //            this.container.clear();
+                this.dynamicComponent = undefined;
+                this.dynamicModule = undefined;
+                return;
+            }
+
             this.dynamicComponent = this.createNewComponent(this.html, this.ref);
             this.dynamicModule = this.compiler.compileModuleSync(this.createComponentModule(this.dynamicComponent));
-            //            cache[cacheKey] = this.dynamicComponent;
         } catch (e) {
-            this.errorHandler(e);
+            if (this.errorHandler === undefined) {
+                throw e;
+            } else {
+                this.errorHandler(e);
+            }
         }
-        /*
-        await this.service.compile({
-            template: this.html,
-            container: this.container,
-            ref: this.ref,
-            imports: this.imports,
-            module: this.module
-        })
-        */
     }
 
+    /**
+     * Private method: createComponentModule.
+     *
+     * It creates the module for the dynamic component.
+     *
+     * @params {*} componentType The component type to be created.
+     *
+     * @returns The RuntimeComponentModule.
+     */
     private createComponentModule(componentType: any) {
         let module: NgModule = {};
 
         if (this.module !== undefined) {
             module = cloneDeep(this.module);
-        } else if (singletonDefaultModule !== undefined && singletonDefaultModule !== null) {
-            module = cloneDeep(singletonDefaultModule);
         }
         module.imports = module.imports || [];
         module.imports.push(CommonModule);
-        //        module.imports.push( BrowserModule );
         if (this.imports !== undefined) {
             module.imports = module.imports.concat(this.imports);
         }
@@ -130,9 +239,19 @@ export class CompileHtmlComponent implements OnInit, OnChanges {
         return RuntimeComponentModule;
     }
 
+    /**
+     * Private method: createNewComponent.
+     *
+     * It creates the the dynamic component.
+     *
+     * @params {string} html The given html template for the component.
+     * @params {*} ref The reference to the component type to be created.
+     *
+     * @returns The DynamicComponent.
+     */
     private createNewComponent(html: string, ref: any) {
         @Component({
-            selector: 'dynamic-component',
+            selector: nextId(),
             template: html
         })
         class DynamicComponent {
@@ -141,13 +260,4 @@ export class CompileHtmlComponent implements OnInit, OnChanges {
 
         return DynamicComponent;
     }
-
-    async ngOnInit() {
-        this.update();
-    }
-
-    async ngOnChanges(changes: SimpleChanges) {
-        // fixme only update with the required changes
-        this.update();
-    }
 }
diff --git a/src/app/shared/compile-html/compile-html.model.ts b/src/app/shared/compile-html/compile-html.model.ts
deleted file mode 100644
index e6237f48a9..0000000000
--- a/src/app/shared/compile-html/compile-html.model.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/************************************************
- *
- *               CREDITS
- *
- * This code is inspired, adapted or taken from:
- *
- * [**P3X-NG2-COMPILE-HTML**](https://patrikx3.github.com/ng2-compile-html) Build v1.1.132-230 on 3/17/2017, 7:43:58 PM
- * [Corifeus](http://github.com/patrikx3/corifeus) by [Patrik Laszlo](http://patrikx3.tk)
- *
- *
- ************************************************/
-
-import { ViewContainerRef } from '@angular/core';
-
-export interface CompileHtmlModel {
-    template: string;
-    container: ViewContainerRef;
-    imports?: any[];
-    ref?: any;
-}
diff --git a/src/app/shared/compile-html/compile-html.module.ts b/src/app/shared/compile-html/compile-html.module.ts
index f4cd6037df..ac064f73e2 100644
--- a/src/app/shared/compile-html/compile-html.module.ts
+++ b/src/app/shared/compile-html/compile-html.module.ts
@@ -10,27 +10,20 @@
  *
  ************************************************/
 
-import { NgModule, ModuleWithProviders } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 
 import { CompileHtmlComponent } from './compile-html.component';
 
-export class CompileServiceConfig {
-    module: NgModule;
-}
-
-// exports = component
+/**
+ * The compile html module.
+ *
+ * It embeds the {@link CompileHtmlComponent}.
+ */
 @NgModule({
     imports: [CommonModule],
     declarations: [CompileHtmlComponent],
     exports: [CompileHtmlComponent],
     entryComponents: []
 })
-export class CompileHtmlModule {
-    static forRoot(config: CompileServiceConfig): ModuleWithProviders {
-        return {
-            ngModule: CompileHtmlModule,
-            providers: [{ provide: CompileServiceConfig, useValue: config }]
-        };
-    }
-}
+export class CompileHtmlModule {}
diff --git a/src/app/shared/heading/heading.component.ts b/src/app/shared/heading/heading.component.ts
index 1d229a0614..4f28480f70 100644
--- a/src/app/shared/heading/heading.component.ts
+++ b/src/app/shared/heading/heading.component.ts
@@ -1,17 +1,31 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
 
+/**
+ * The Heading component.
+ *
+ * It contains a configurable h2 heading
+ * that is provided via the {@link SharedModule}.
+ */
 @Component({
     selector: 'awg-heading',
     templateUrl: 'heading.component.html',
-    styleUrls: ['heading.component.css']
+    styleUrls: ['heading.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class HeadingComponent implements OnInit {
+export class HeadingComponent {
+    /**
+     * Input variable: title.
+     *
+     * It keeps the title of the heading.
+     */
     @Input()
     title: string;
+
+    /**
+     * Input variable: id.
+     *
+     * It keeps the id of the heading.
+     */
     @Input()
     id: string;
-
-    constructor() {}
-
-    ngOnInit() {}
 }
diff --git a/src/app/shared/json-viewer/json-viewer.component.ts b/src/app/shared/json-viewer/json-viewer.component.ts
index 69e441735f..31f7a2eb38 100644
--- a/src/app/shared/json-viewer/json-viewer.component.ts
+++ b/src/app/shared/json-viewer/json-viewer.component.ts
@@ -1,20 +1,39 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
 
 import { ResourceFullResponseJson } from '@awg-shared/api-objects';
 import { ResourceDetail } from '@awg-views/data-view/models';
 
+/**
+ * The JsonViewer component.
+ *
+ * It contains a json viewer template
+ * (a tabbed card to display json data)
+ * that is provided via the {@link SharedModule}.
+ *
+ * First tab shows formatted view using ngx-json-viewer
+ * and second tab shows plain view using
+ * the built-in Angular json filter.
+ */
 @Component({
     selector: 'awg-json-viewer',
     templateUrl: './json-viewer.component.html',
-    styleUrls: ['./json-viewer.component.css']
+    styleUrls: ['./json-viewer.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class JsonViewerComponent implements OnInit {
+export class JsonViewerComponent {
+    /**
+     * Input variable: jsonViewerData.
+     *
+     * It keeps the data for the json viewer.
+     */
     @Input()
     jsonViewerData: ResourceDetail | ResourceFullResponseJson;
+
+    /**
+     * Input variable: jsonViewerHeader.
+     *
+     * It keeps the header for the json viewer.
+     */
     @Input()
     jsonViewerHeader: string;
-
-    constructor() {}
-
-    ngOnInit() {}
 }
diff --git a/src/app/shared/modal/modal.component.html b/src/app/shared/modal/modal.component.html
index 22d3a14643..190928fc9d 100644
--- a/src/app/shared/modal/modal.component.html
+++ b/src/app/shared/modal/modal.component.html
@@ -1,12 +1,14 @@
 <ng-template #modalTemplate let-modal>
     <div class="modal-header">
-        <h4 class="modal-title" id="modal-basic-title">Hinweis</h4>
+        <h4 class="modal-title" id="modal-basic-title">{{ modalTitle }}</h4>
         <button type="button" class="close" aria-label="Close" (click)="modal.dismiss()">
             <span aria-hidden="true">&times;</span>
         </button>
     </div>
     <div class="modal-body" [compile-html]="modalContent" [compile-html-ref]="this"></div>
     <div class="modal-footer">
-        <button type="button" class="btn btn-outline-dark awg-modal-button" ngbAutofocus (click)="modal.close()">Schließen</button>
+        <button type="button" class="btn btn-outline-dark awg-modal-button" ngbAutofocus (click)="modal.close()">
+            {{ modalCloseLabel }}
+        </button>
     </div>
 </ng-template>
diff --git a/src/app/shared/modal/modal.component.ts b/src/app/shared/modal/modal.component.ts
index 956a38e330..5f33cd40b5 100644
--- a/src/app/shared/modal/modal.component.ts
+++ b/src/app/shared/modal/modal.component.ts
@@ -1,7 +1,14 @@
 import { Component, ViewChild } from '@angular/core';
 import { ModalDismissReasons, NgbModal } from '@ng-bootstrap/ng-bootstrap';
 
-const MODAL_TEXT = {
+/**
+ * Object constant with a set of modal texts.
+ *
+ * It provides the text snippets to be used in a modal.
+ *
+ * Available snippet keys: `sourceNotA`, `sheetComingSoon`, `editionComingSoon`, `M198`.
+ */
+const MODALCONTENTSNIPPETS = {
     sourceNotA:
         '<p>Die Beschreibung der weiteren Quellenbestandteile von <strong>A</strong> sowie der Quellen <strong>B</strong> bis <strong>G1</strong> einschließlich der darin gegebenenfalls enthaltenen Korrekturen erfolgt im Zusammenhang der vollständigen Edition der <i>Vier Lieder</i> op. 12 in AWG I/5.</p>',
     sheetComingSoon:
@@ -12,23 +19,104 @@ const MODAL_TEXT = {
         '<p>Das Fragment „<em>Schien mir’s als ich sah die Sonne</em>“ (M 198) für Chor und Orchester wird in AWG II/3 ediert.</p>'
 };
 
+/**
+ * The Modal component.
+ *
+ * It contains a modal template that is
+ * provided via the {@link SharedModule}.
+ */
 @Component({
     selector: 'awg-modal',
     templateUrl: './modal.component.html',
     styleUrls: ['./modal.component.css']
 })
 export class ModalComponent {
-    @ViewChild('modalTemplate')
+    /**
+     * ViewChild variable: modalTemplate.
+     *
+     * It keeps the reference to the HTML template.
+     */
+    @ViewChild('modalTemplate', { static: false })
     modalTemplate;
 
+    /**
+     * Public variable: modalTitle.
+     *
+     * It keeps the title of the modal
+     * to be displayed in the header.
+     */
+    modalTitle = 'Hinweis';
+
+    /**
+     * Public variable: modalCloseLabel.
+     *
+     * It keeps the label for the
+     * closing button of the modal
+     * to be displayed in the footer.
+     */
+    modalCloseLabel = 'Schließen';
+
+    /**
+     * Public variable: modalContent.
+     *
+     * It keeps the content of the modal
+     * to be displayed in the body.
+     */
     modalContent: string;
+
+    /**
+     * Public variable: closeResult.
+     *
+     * It keeps a message after the
+     * closing event of the modal.
+     */
     closeResult: string;
 
+    /**
+     * Constructor of the ModalComponent.
+     *
+     * It declares a private NgbModal instance
+     * to handle the modal.
+     *
+     * @param {NgbModal} modalService Instance of the NgbModal.
+     */
     constructor(private modalService: NgbModal) {}
 
-    open(identifier: string): void {
+    /**
+     * Private static method: getDismissReason.
+     *
+     * It gets the dismiss reason message
+     * of the closing event of the modal.
+     *
+     * @param {*} reason The given reason.
+     * @returns {string} The dismiss reason message.
+     */
+    private static getDismissReason(reason: any): string {
+        if (reason === ModalDismissReasons.ESC) {
+            return 'by pressing ESC';
+        } else if (reason === ModalDismissReasons.BACKDROP_CLICK) {
+            return 'by clicking on a backdrop';
+        } else {
+            return `with: ${reason}`;
+        }
+    }
+
+    /**
+     * Public method: open.
+     *
+     * It opens the modal with the text snippet
+     * represented by the given snippet key.
+     *
+     * Snippet key must be an existing key of MODALCONTENTSNIPPETS.
+     *
+     * @param {string} modalContentSnippetKey The given snippet key.
+     * @returns {void} Opens the modal.
+     */
+    open(modalContentSnippetKey: string): void {
         // get modal text
-        this.modalContent = MODAL_TEXT[identifier];
+        this.modalContent = MODALCONTENTSNIPPETS[modalContentSnippetKey]
+            ? MODALCONTENTSNIPPETS[modalContentSnippetKey]
+            : '';
 
         // open modalTemplate via modalService
         this.modalService.open(this.modalTemplate, { ariaLabelledBy: 'awg-modal' }).result.then(
@@ -36,18 +124,8 @@ export class ModalComponent {
                 this.closeResult = `Closed with: ${result}`;
             },
             reason => {
-                this.closeResult = `Dismissed ${this.getDismissReason(reason)}`;
+                this.closeResult = `Dismissed ${ModalComponent.getDismissReason(reason)}`;
             }
         );
     }
-
-    private getDismissReason(reason: any): string {
-        if (reason === ModalDismissReasons.ESC) {
-            return 'by pressing ESC';
-        } else if (reason === ModalDismissReasons.BACKDROP_CLICK) {
-            return 'by clicking on a backdrop';
-        } else {
-            return `with: ${reason}`;
-        }
-    }
 }
diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-file/edition-svg-file.component.css b/src/app/shared/open-street-map/open-street-map.component.css
similarity index 100%
rename from src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-file/edition-svg-file.component.css
rename to src/app/shared/open-street-map/open-street-map.component.css
diff --git a/src/app/shared/open-street-map/open-street-map.component.html b/src/app/shared/open-street-map/open-street-map.component.html
new file mode 100644
index 0000000000..5e53f7e327
--- /dev/null
+++ b/src/app/shared/open-street-map/open-street-map.component.html
@@ -0,0 +1,14 @@
+<iframe
+    id="awg-osm-embed-map"
+    width="{{ osmIFrameSettings.width }}"
+    height="{{ osmIFrameSettings.height }}"
+    scrolling="{{ osmIFrameSettings.scrolling }}"
+    [src]="osmEmbedUrl"
+>
+</iframe>
+
+<div id="awg-osm-link">
+    <small>
+        <a [href]="osmLinkUrl" target="_blank" rel="noopener noreferrer">{{ osmLinkLabel }}</a>
+    </small>
+</div>
diff --git a/src/app/shared/open-street-map/open-street-map.component.spec.ts b/src/app/shared/open-street-map/open-street-map.component.spec.ts
new file mode 100644
index 0000000000..798eb0c0f0
--- /dev/null
+++ b/src/app/shared/open-street-map/open-street-map.component.spec.ts
@@ -0,0 +1,148 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { DebugElement, SecurityContext } from '@angular/core';
+import { BrowserModule, DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
+
+import { getAndExpectDebugElementByCss } from '@testing/expect-helper';
+
+import { OpenStreetMapComponent } from './open-street-map.component';
+
+describe('OpenStreetMapComponent (DONE)', () => {
+    let component: OpenStreetMapComponent;
+    let fixture: ComponentFixture<OpenStreetMapComponent>;
+    let compDe: DebugElement;
+    let compEl: any;
+
+    let domSanitizer: DomSanitizer;
+
+    let expectedUnsafeOsmEmbedUrl: string;
+    let expectedUnsafeOsmLinkUrl: string;
+    let expectedOsmEmbedUrl: SafeResourceUrl;
+    let expectedOsmLinkUrl: SafeResourceUrl;
+    let expectedOsmLinkLabel: string;
+    let expectedOsmIFrameSettings: { width; height; scrolling };
+
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            imports: [BrowserModule],
+            declarations: [OpenStreetMapComponent]
+        }).compileComponents();
+    }));
+
+    beforeEach(() => {
+        fixture = TestBed.createComponent(OpenStreetMapComponent);
+        component = fixture.componentInstance;
+        compDe = fixture.debugElement;
+        compEl = compDe.nativeElement;
+
+        domSanitizer = TestBed.get(DomSanitizer);
+
+        // test data
+        expectedOsmLinkLabel = 'Größere Karte anzeigen';
+        expectedOsmIFrameSettings = {
+            width: '100%',
+            height: '350',
+            scrolling: 'no'
+        };
+
+        // unsafe link values for open streets map
+        expectedUnsafeOsmEmbedUrl =
+            'https://www.openstreetmap.org/export/embed.html?bbox=7.582175731658936%2C47.55789611508066%2C7.586840093135835%2C47.56003739001212&layer=mapnik&marker=47.55896585846639%2C7.584506571292877';
+        expectedUnsafeOsmLinkUrl =
+            'https://www.openstreetmap.org/?mlat=47.55897&amp;mlon=7.58451#map=19/47.55897/7.58451';
+
+        // bypass the unsafe values
+        expectedOsmEmbedUrl = domSanitizer.bypassSecurityTrustResourceUrl(expectedUnsafeOsmEmbedUrl);
+        expectedOsmLinkUrl = domSanitizer.bypassSecurityTrustResourceUrl(expectedUnsafeOsmLinkUrl);
+    });
+
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
+
+    describe('BEFORE initial data binding', () => {
+        it('should not have `osmEmbedUrl` input', () => {
+            expect(component.osmEmbedUrl).toBeUndefined('should be undefined');
+        });
+
+        it('should not have `osmLinkUrl` input', () => {
+            expect(component.osmLinkUrl).toBeUndefined('should be undefined');
+        });
+
+        it('should have `osmLinkLabel`', () => {
+            expect(component.osmLinkLabel).toBeDefined();
+            expect(component.osmLinkLabel).toBe(expectedOsmLinkLabel, `should be ${expectedOsmLinkLabel}`);
+        });
+
+        it('should have `osmIFrameSettings`', () => {
+            expect(component.osmIFrameSettings).toBeDefined();
+            expect(component.osmIFrameSettings).toEqual(
+                expectedOsmIFrameSettings,
+                `should equal ${expectedOsmIFrameSettings}`
+            );
+        });
+
+        describe('VIEW', () => {
+            it('... should contain one iframe', () => {
+                getAndExpectDebugElementByCss(compDe, 'iframe#awg-osm-embed-map', 1, 1);
+            });
+
+            it('... should contain one div with link', () => {
+                getAndExpectDebugElementByCss(compDe, 'div#awg-osm-link a', 1, 1);
+            });
+
+            it('... should not render the osm map yet', () => {
+                const mapDes = getAndExpectDebugElementByCss(compDe, 'iframe#awg-osm-embed-map', 1, 1);
+                const mapEl = mapDes[0].nativeElement;
+
+                expect(mapEl.src).toBeDefined();
+                expect(mapEl.src).toBe('', `should be empty string`);
+            });
+
+            it('... should not render the link to OSM homepage yet', () => {
+                const linkDes = getAndExpectDebugElementByCss(compDe, 'div#awg-osm-link a', 1, 1);
+                const linkEl = linkDes[0].nativeElement;
+
+                expect(linkEl.href).toBeDefined();
+                expect(linkEl.href).toBe('', `should be empty string`);
+            });
+        });
+    });
+
+    describe('AFTER initial data binding', () => {
+        beforeEach(() => {
+            // simulate the parent setting the input properties
+            // it gets the bypassed links (SafeResourceUrl)
+            component.osmEmbedUrl = expectedOsmEmbedUrl;
+            component.osmLinkUrl = expectedOsmLinkUrl;
+
+            // trigger initial data binding
+            fixture.detectChanges();
+        });
+
+        describe('VIEW', () => {
+            it('... should render the osm map', () => {
+                const mapDes = getAndExpectDebugElementByCss(compDe, 'iframe#awg-osm-embed-map', 1, 1);
+                const mapEl = mapDes[0].nativeElement;
+
+                // sanitize the bypassed value
+                const sanitizedEmbedUrl = domSanitizer.sanitize(SecurityContext.RESOURCE_URL, expectedOsmEmbedUrl);
+                // check for the src attribute to contain the sanitized SafeResourceUrl
+                expect(mapEl.src).toBeDefined();
+                expect(mapEl.src).toBe(sanitizedEmbedUrl, `should be ${sanitizedEmbedUrl}`);
+                expect(mapEl.src).toBe(expectedUnsafeOsmEmbedUrl, `should be ${expectedUnsafeOsmEmbedUrl}`);
+            });
+
+            it('... should render the link to OSM homepage', () => {
+                const linkDes = getAndExpectDebugElementByCss(compDe, 'div#awg-osm-link a', 1, 1);
+                const linkEl = linkDes[0].nativeElement;
+
+                // sanitize the bypassed value
+                const sanitizedLinkUrl = domSanitizer.sanitize(SecurityContext.RESOURCE_URL, expectedOsmLinkUrl);
+                // check for the href attribute to contain the sanitized SafeResourceUrl
+                expect(linkEl.href).toBeDefined();
+                expect(linkEl.href).toBe(sanitizedLinkUrl, `should be ${sanitizedLinkUrl}`);
+                expect(linkEl.href).toBe(expectedUnsafeOsmLinkUrl, `should be ${expectedUnsafeOsmLinkUrl}`);
+            });
+        });
+    });
+});
diff --git a/src/app/shared/open-street-map/open-street-map.component.ts b/src/app/shared/open-street-map/open-street-map.component.ts
new file mode 100644
index 0000000000..8272713210
--- /dev/null
+++ b/src/app/shared/open-street-map/open-street-map.component.ts
@@ -0,0 +1,50 @@
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { SafeResourceUrl } from '@angular/platform-browser';
+
+/**
+ * The OpenStreetMap component.
+ *
+ * It contains an iframe with an Open Street Map (osm)
+ * that is provided via the {@link SharedModule}.
+ */
+@Component({
+    selector: 'awg-open-street-map',
+    templateUrl: './open-street-map.component.html',
+    styleUrls: ['./open-street-map.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class OpenStreetMapComponent {
+    /**
+     * Input variable: osmEmbedUrl.
+     *
+     * It keeps the sanitized link to embed the OSM map.
+     */
+    @Input()
+    osmEmbedUrl: SafeResourceUrl;
+
+    /**
+     * Input variable: osmLinkUrl.
+     *
+     * It keeps the sanitized link to the OSM page.
+     */
+    @Input()
+    osmLinkUrl: SafeResourceUrl;
+
+    /**
+     * Public variable: osmLinkLabel.
+     *
+     * It keeps the label for the sanitized link to the OSM page.
+     */
+    osmLinkLabel = 'Größere Karte anzeigen';
+
+    /**
+     * Public variable: osmIFrameSettings.
+     *
+     * It keeps the settings for the OSM iframe.
+     */
+    osmIFrameSettings = {
+        width: '100%',
+        height: '350',
+        scrolling: 'no'
+    };
+}
diff --git a/src/app/shared/order-by/order-by.pipe.ts b/src/app/shared/order-by/order-by.pipe.ts
index a615c3c415..cac5ff999c 100644
--- a/src/app/shared/order-by/order-by.pipe.ts
+++ b/src/app/shared/order-by/order-by.pipe.ts
@@ -14,10 +14,24 @@
 
 import { Pipe, PipeTransform } from '@angular/core';
 
+/**
+ * The order by pipe.
+ *
+ * It orders the elements of an input array by property id and direction.
+ *
+ * __Usage :__
+ *   `*ngFor="let subject of searchResponse?.subjects | orderBy: {property: 'obj_id', direction: 1}"`
+ */
 @Pipe({
     name: 'orderBy'
 })
 export class OrderByPipe implements PipeTransform {
+    /**
+     * Transform method of the OrderByPipe.
+     *
+     * @param {Array<any>} array The input array with the data to be piped.
+     * @param {*} [args] The optional arguments to be ordered by. Needs `property` and optional `direction`.
+     */
     transform(array: Array<any>, args?: any): any {
         return array.sort((a, b) => {
             if (!args.property) {
diff --git a/src/app/shared/router-link-button-group/router-link-button-group.component.html b/src/app/shared/router-link-button-group/router-link-button-group.component.html
index f925dd608d..9fc52f3b3a 100644
--- a/src/app/shared/router-link-button-group/router-link-button-group.component.html
+++ b/src/app/shared/router-link-button-group/router-link-button-group.component.html
@@ -1,10 +1,14 @@
 <div class="btn-group awg-btn-group d-flex" role="group" aria-label="Router link button group">
-    <button type="button" class="btn btn-default w-100" *ngFor="let button of buttonArray"
-            [routerLink]="[button?.root, button?.link]"
-            queryParamsHandling="preserve"
-            routerLinkActive="active"
-            [disabled]="button?.disabled"
-            (click)="onButtonSelect(button)">
+    <button
+        type="button"
+        class="btn btn-default w-100"
+        *ngFor="let button of buttonArray"
+        [routerLink]="[button?.root, button?.link]"
+        queryParamsHandling="preserve"
+        routerLinkActive="active"
+        [disabled]="button?.disabled"
+        (click)="selectButton(button)"
+    >
         {{ button?.label }}
     </button>
 </div>
diff --git a/src/app/shared/router-link-button-group/router-link-button-group.component.spec.ts b/src/app/shared/router-link-button-group/router-link-button-group.component.spec.ts
index f657aac400..f8680ee557 100644
--- a/src/app/shared/router-link-button-group/router-link-button-group.component.spec.ts
+++ b/src/app/shared/router-link-button-group/router-link-button-group.component.spec.ts
@@ -49,7 +49,7 @@ describe('RouterLinkButtonGroupComponent (DONE)', () => {
         // spies on component functions
         // `.and.callThrough` will track the spy down the nested describes, see
         // https://jasmine.github.io/2.0/introduction.html#section-Spies:_%3Ccode%3Eand.callThrough%3C/code%3E
-        selectButtonSpy = spyOn(component, 'onButtonSelect').and.callThrough();
+        selectButtonSpy = spyOn(component, 'selectButton').and.callThrough();
         emitSpy = spyOn(component.selectButtonRequest, 'emit').and.callThrough();
     });
 
@@ -64,7 +64,7 @@ describe('RouterLinkButtonGroupComponent (DONE)', () => {
 
         describe('#onButtonSelect', () => {
             it('... should not have been called', () => {
-                expect(component.onButtonSelect).not.toHaveBeenCalled();
+                expect(component.selectButton).not.toHaveBeenCalled();
             });
         });
 
@@ -95,30 +95,33 @@ describe('RouterLinkButtonGroupComponent (DONE)', () => {
 
             it('... should disable buttons if necessary', () => {
                 const btnDes = getAndExpectDebugElementByCss(compDe, 'button.btn', 3, 3);
+                const btn0El = btnDes[0].nativeElement;
+                const btn1El = btnDes[1].nativeElement;
+                const btn2El = btnDes[2].nativeElement;
 
-                expect(btnDes[0].nativeElement.disabled).toBe(
-                    expectedButtonArray[0].disabled,
-                    'should not be disabled'
-                );
-                expect(btnDes[1].nativeElement.disabled).toBe(expectedButtonArray[1].disabled, 'should be disabled');
-                expect(btnDes[2].nativeElement.disabled).toBe(expectedButtonArray[2].disabled, 'should be disabled');
+                expect(btn0El.disabled).toBe(expectedButtonArray[0].disabled, 'should not be disabled');
+                expect(btn1El.disabled).toBe(expectedButtonArray[1].disabled, 'should be disabled');
+                expect(btn2El.disabled).toBe(expectedButtonArray[2].disabled, 'should be disabled');
             });
 
             it('... should render button labels', () => {
                 const btnDes = getAndExpectDebugElementByCss(compDe, 'button.btn', 3, 3);
+                const btn0El = btnDes[0].nativeElement;
+                const btn1El = btnDes[1].nativeElement;
+                const btn2El = btnDes[2].nativeElement;
 
-                expect(btnDes[0].nativeElement.textContent).toBeDefined();
-                expect(btnDes[0].nativeElement.textContent).toMatch(
+                expect(btn0El.textContent).toBeDefined();
+                expect(btn0El.textContent).toMatch(
                     expectedButtonArray[0].label,
                     `should be ${expectedButtonArray[0].label}`
                 );
-                expect(btnDes[1].nativeElement.textContent).toBeDefined();
-                expect(btnDes[1].nativeElement.textContent).toMatch(
+                expect(btn1El.textContent).toBeDefined();
+                expect(btn1El.textContent).toMatch(
                     expectedButtonArray[1].label,
                     `should be ${expectedButtonArray[1].label}`
                 );
-                expect(btnDes[2].nativeElement.textContent).toBeDefined();
-                expect(btnDes[2].nativeElement.textContent).toMatch(
+                expect(btn2El.textContent).toBeDefined();
+                expect(btn2El.textContent).toMatch(
                     expectedButtonArray[2].label,
                     `should be ${expectedButtonArray[2].label}`
                 );
diff --git a/src/app/shared/router-link-button-group/router-link-button-group.component.ts b/src/app/shared/router-link-button-group/router-link-button-group.component.ts
index 41ff8e4dc4..c30e7bcd47 100644
--- a/src/app/shared/router-link-button-group/router-link-button-group.component.ts
+++ b/src/app/shared/router-link-button-group/router-link-button-group.component.ts
@@ -1,23 +1,48 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
 
 import { RouterLinkButton } from './router-link-button.model';
 
+/**
+ * The RouterLinkButtonGroup component.
+ *
+ * It contains grouped router link buttons
+ * that are provided via the {@link SharedModule}.
+ */
 @Component({
     selector: 'awg-router-link-button-group',
     templateUrl: './router-link-button-group.component.html',
-    styleUrls: ['./router-link-button-group.component.css']
+    styleUrls: ['./router-link-button-group.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class RouterLinkButtonGroupComponent implements OnInit {
+export class RouterLinkButtonGroupComponent {
+    /**
+     * Input variable: buttonArray.
+     *
+     * It keeps the array of router link buttons.
+     */
     @Input()
     buttonArray: RouterLinkButton[];
+
+    /**
+     * Output variable: selectButtonRequest.
+     *
+     * It keeps an event emitter for the selected router link button.
+     */
     @Output()
     selectButtonRequest: EventEmitter<RouterLinkButton> = new EventEmitter<RouterLinkButton>();
 
-    constructor() {}
-
-    ngOnInit() {}
-
-    onButtonSelect(routerLinkButton: RouterLinkButton): void {
+    /**
+     * Public method: selectButton.
+     *
+     * It emits a selected router link button
+     * to the {@link selectButtonRequest}.
+     *
+     * @param {RouterLinkButton} routerLinkButton
+     * The given router link button.
+     * @returns {void}
+     * Emits the selected router link button.
+     */
+    selectButton(routerLinkButton: RouterLinkButton): void {
         this.selectButtonRequest.emit(routerLinkButton);
     }
 }
diff --git a/src/app/shared/router-link-button-group/router-link-button.model.ts b/src/app/shared/router-link-button-group/router-link-button.model.ts
index 1027e06cb9..1523827945 100644
--- a/src/app/shared/router-link-button-group/router-link-button.model.ts
+++ b/src/app/shared/router-link-button-group/router-link-button.model.ts
@@ -1,3 +1,46 @@
+/**
+ * The RouterLinkButton class.
+ *
+ * It is used in the context of the app framework
+ * to store the data for a router link button.
+ */
 export class RouterLinkButton {
-    constructor(public root: string, public link: string, public label: string, public disabled: boolean) {}
+    /**
+     * The router link root.
+     */
+    root: string;
+
+    /**
+     * The router link.
+     */
+    link: string;
+
+    /**
+     * The label of a router link button.
+     */
+    label: string;
+
+    /**
+     * If a router link button is disabled or not.
+     */
+    disabled: boolean;
+
+    /**
+     * Constructor of the RouterLinkButton class.
+     *
+     * It initializes the class with values
+     * from a given query and number of hits
+     * of a search.
+     *
+     * @param {string} root The given router link root.
+     * @param {string} link The given router link.
+     * @param {string} label The given label.
+     * @param {string} disabled The given disabled flag.
+     */
+    constructor(root: string, link: string, label: string, disabled: boolean) {
+        this.root = root;
+        this.link = link;
+        this.label = label;
+        this.disabled = disabled;
+    }
 }
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index a834724f32..2cb9ef388e 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -22,9 +22,11 @@ import { NgxJsonViewerModule } from 'ngx-json-viewer';
 
 //
 // shared components
+import { AddressComponent } from './address/address.component';
 import { HeadingComponent } from './heading/heading.component';
 import { JsonViewerComponent } from './json-viewer/json-viewer.component';
 import { ModalComponent } from './modal/modal.component';
+import { OpenStreetMapComponent } from './open-street-map/open-street-map.component';
 import { RouterLinkButtonGroupComponent } from './router-link-button-group/router-link-button-group.component';
 import { TwelveToneSpinnerComponent } from './twelve-tone-spinner/twelve-tone-spinner.component';
 
@@ -32,6 +34,11 @@ import { TwelveToneSpinnerComponent } from './twelve-tone-spinner/twelve-tone-sp
 // shared pipes
 import { OrderByPipe } from './order-by/order-by.pipe';
 
+/**
+ * The shared module.
+ *
+ * It embeds all the components used by different modules.
+ */
 @NgModule({
     imports: [
         CommonModule,
@@ -52,9 +59,11 @@ import { OrderByPipe } from './order-by/order-by.pipe';
         NgxJsonViewerModule
     ],
     declarations: [
+        AddressComponent,
         HeadingComponent,
         JsonViewerComponent,
         ModalComponent,
+        OpenStreetMapComponent,
         RouterLinkButtonGroupComponent,
         TwelveToneSpinnerComponent,
         OrderByPipe
@@ -77,12 +86,14 @@ import { OrderByPipe } from './order-by/order-by.pipe';
         NgxGalleryModule,
         NgxJsonViewerModule,
 
+        AddressComponent,
         HeadingComponent,
         JsonViewerComponent,
         ModalComponent,
-        OrderByPipe,
+        OpenStreetMapComponent,
         RouterLinkButtonGroupComponent,
-        TwelveToneSpinnerComponent
+        TwelveToneSpinnerComponent,
+        OrderByPipe
     ]
 })
 export class SharedModule {}
diff --git a/src/app/shared/twelve-tone-spinner/twelve-tone-spinner.component.html b/src/app/shared/twelve-tone-spinner/twelve-tone-spinner.component.html
index 83100f7a68..35766faa89 100644
--- a/src/app/shared/twelve-tone-spinner/twelve-tone-spinner.component.html
+++ b/src/app/shared/twelve-tone-spinner/twelve-tone-spinner.component.html
@@ -1,6 +1,6 @@
 <div class="twelveTone-spinner">
     <div class="twelveTone-loadText twelveTone-child">
-        <p>loading</p>
+        <p>{{ spinnerMessage }}</p>
     </div>
     <div class="twelveTone-note1 twelveTone-child"></div>
     <div class="twelveTone-note2 twelveTone-child"></div>
diff --git a/src/app/shared/twelve-tone-spinner/twelve-tone-spinner.component.ts b/src/app/shared/twelve-tone-spinner/twelve-tone-spinner.component.ts
index db2552f18a..b8cc101a0d 100644
--- a/src/app/shared/twelve-tone-spinner/twelve-tone-spinner.component.ts
+++ b/src/app/shared/twelve-tone-spinner/twelve-tone-spinner.component.ts
@@ -1,12 +1,24 @@
-import { Component, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component } from '@angular/core';
 
+/**
+ * The TwelveToneSpinner component.
+ *
+ * It contains the loading spinner of the app
+ * (an animated twelve tone cycle)
+ * that is provided via the {@link SharedModule}.
+ */
 @Component({
     selector: 'awg-twelve-tone-spinner',
     templateUrl: './twelve-tone-spinner.component.html',
-    styleUrls: ['./twelve-tone-spinner.component.css']
+    styleUrls: ['./twelve-tone-spinner.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class TwelveToneSpinnerComponent implements OnInit {
-    constructor() {}
-
-    ngOnInit() {}
+export class TwelveToneSpinnerComponent {
+    /**
+     * Public variable: spinnerMessage.
+     *
+     * It contains the message to be displayed
+     * while the spinner is active.
+     */
+    spinnerMessage = 'loading';
 }
diff --git a/src/app/side-info/contact-info/contact-info.component.html b/src/app/side-info/contact-info/contact-info.component.html
index bdcba87772..7ce2f3884f 100644
--- a/src/app/side-info/contact-info/contact-info.component.html
+++ b/src/app/side-info/contact-info/contact-info.component.html
@@ -1,38 +1,8 @@
 <!-- sideinfo: contact -->
 <div class="card">
     <div class="card-body bg-light">
-        <h2>Kontakt</h2>
-        <br />
-        <address>
-            <span class="caps">
-                <strong>
-                    <a href="{{ metaData?.page?.webernUrl }}" target="_blank" rel="noopener noreferrer">
-                        Anton Webern Gesamtausgabe
-                    </a>
-                </strong>
-            </span>
-            <br />
-            <br />
-            Musikwissenschaftliches Seminar der Universität Basel<br />
-            Petersgraben 27/29<br />
-            CH-4051 Basel<br />
-            Schweiz<br />
-            <br />
-            Telefon: +41 (0)61 267 28 08<br />
-            E-Mail: <a href="mailto:info-awg@unibas.ch">info-awg [at] unibas [dot] ch</a><br />
-        </address>
-        <iframe
-            width="100%"
-            height="auto"
-            frameborder="0"
-            scrolling="no"
-            marginheight="0"
-            marginwidth="0"
-            [src]="osmUrl"
-            style="border: 1px solid black"
-        >
-        </iframe>
-        <br />
-        <small><a [href]="osmLinkUrl" target="_blank" rel="noopener noreferrer">Größere Karte anzeigen</a></small>
+        <h5 id="awg-contact-info-header" class="mb-3">{{ contactInfoHeader }}</h5>
+        <awg-address [pageMetaData]="pageMetaData" [contactMetaData]="contactMetaData"></awg-address>
+        <awg-open-street-map [osmEmbedUrl]="osmEmbedUrl" [osmLinkUrl]="osmLinkUrl"></awg-open-street-map>
     </div>
 </div>
diff --git a/src/app/side-info/contact-info/contact-info.component.spec.ts b/src/app/side-info/contact-info/contact-info.component.spec.ts
index 0c0c7f4f68..e170290d35 100644
--- a/src/app/side-info/contact-info/contact-info.component.spec.ts
+++ b/src/app/side-info/contact-info/contact-info.component.spec.ts
@@ -1,24 +1,267 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { Component, DebugElement, Input } from '@angular/core';
+import { BrowserModule, DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
+
+import { getAndExpectDebugElementByCss, getAndExpectDebugElementByDirective } from '@testing/expect-helper';
+
+import { MetaContact, MetaPage, MetaSectionTypes } from '@awg-core/core-models';
+import { METADATA } from '@awg-core/mock-data';
+import { CoreService } from '@awg-core/services';
 
 import { ContactInfoComponent } from './contact-info.component';
 
-describe('ContactInfoComponent', () => {
+// mock address component
+@Component({ selector: 'awg-address', template: '' })
+class AddressStubComponent {
+    @Input()
+    pageMetaData: MetaPage;
+    @Input()
+    contactMetaData: MetaContact;
+}
+
+// mock open street map component
+@Component({ selector: 'awg-open-street-map', template: '' })
+class OpenStreetMapStubComponent {
+    @Input()
+    osmEmbedUrl: SafeResourceUrl;
+    @Input()
+    osmLinkUrl: SafeResourceUrl;
+}
+
+describe('ContactInfoComponent (DONE)', () => {
     let component: ContactInfoComponent;
     let fixture: ComponentFixture<ContactInfoComponent>;
+    let compDe: DebugElement;
+    let compEl;
+
+    let domSanitizer: DomSanitizer;
+
+    let mockCoreService: Partial<CoreService>;
+
+    let expectedPageMetaData: MetaPage;
+    let expectedContactMetaData: MetaContact;
+
+    let expectedUnsafeOsmEmbedUrl: string;
+    let expectedUnsafeOsmLinkUrl: string;
+    let expectedOsmEmbedUrl: SafeResourceUrl;
+    let expectedOsmLinkUrl: SafeResourceUrl;
+
+    const expectedContactInfoHeader = 'Kontakt';
 
     beforeEach(async(() => {
+        // mock service for test purposes
+        mockCoreService = { getMetaDataSection: key => METADATA[key] };
+
         TestBed.configureTestingModule({
-            declarations: [ContactInfoComponent]
+            imports: [BrowserModule],
+            declarations: [ContactInfoComponent, AddressStubComponent, OpenStreetMapStubComponent],
+            providers: [{ provide: CoreService, useValue: mockCoreService }]
         }).compileComponents();
     }));
 
     beforeEach(() => {
         fixture = TestBed.createComponent(ContactInfoComponent);
         component = fixture.componentInstance;
-        fixture.detectChanges();
+        compDe = fixture.debugElement;
+        compEl = compDe.nativeElement;
+
+        domSanitizer = TestBed.get(DomSanitizer);
+
+        // test data
+        expectedPageMetaData = METADATA[MetaSectionTypes.page];
+        expectedContactMetaData = METADATA[MetaSectionTypes.contact];
+
+        // unsafe link values for open streets map
+        expectedUnsafeOsmEmbedUrl =
+            'https://www.openstreetmap.org/export/embed.html?bbox=7.582175731658936%2C47.55789611508066%2C7.586840093135835%2C47.56003739001212&layer=mapnik&marker=47.55896585846639%2C7.584506571292877';
+        expectedUnsafeOsmLinkUrl =
+            'https://www.openstreetmap.org/?mlat=47.55897&amp;mlon=7.58451#map=19/47.55897/7.58451';
+
+        // bypass the unsafe values
+        expectedOsmEmbedUrl = domSanitizer.bypassSecurityTrustResourceUrl(expectedUnsafeOsmEmbedUrl);
+        expectedOsmLinkUrl = domSanitizer.bypassSecurityTrustResourceUrl(expectedUnsafeOsmLinkUrl);
+
+        // spies on component functions
+        // `.and.callThrough` will track the spy down the nested describes, see
+        // https://jasmine.github.io/2.0/introduction.html#section-Spies:_%3Ccode%3Eand.callThrough%3C/code%3E
+        spyOn(component, 'provideMetaData').and.callThrough();
+        spyOn(component, 'sanitizeUrls').and.callThrough();
     });
 
     it('should be created', () => {
         expect(component).toBeTruthy();
     });
+
+    it('stub service and injected coreService should not be the same', () => {
+        const coreService = TestBed.get(CoreService);
+        expect(mockCoreService === coreService).toBe(false);
+
+        // changing the mock service has no effect on the injected service
+        let changedPageMetaData = new MetaPage();
+        changedPageMetaData = {
+            yearStart: 2015,
+            yearCurrent: 2018,
+            awgAppUrl: '',
+            compodocUrl: '',
+            githubUrl: '',
+            awgProjectUrl: '',
+            awgProjectName: '',
+            version: '0.2.1',
+            versionReleaseDate: '20. Oktober 2018'
+        };
+        mockCoreService.getMetaDataSection = () => changedPageMetaData;
+        expect(coreService.getMetaDataSection(MetaSectionTypes.page)).toBe(expectedPageMetaData);
+    });
+
+    describe('BEFORE initial data binding', () => {
+        it('should have contact info header', () => {
+            expect(component.contactInfoHeader).toBeDefined();
+            expect(component.contactInfoHeader).toBe(expectedContactInfoHeader);
+        });
+
+        it('should not have metadata nor open street map links', () => {
+            expect(component.pageMetaData).toBeUndefined('should be undefined');
+            expect(component.contactMetaData).toBeUndefined('should be undefined');
+            expect(component.osmEmbedUrl).toBeUndefined('should be undefined');
+            expect(component.osmLinkUrl).toBeUndefined('should be undefined');
+        });
+
+        describe('#provideMetaData', () => {
+            it('... should not have been called', () => {
+                expect(component.provideMetaData).not.toHaveBeenCalled();
+            });
+        });
+
+        describe('#sanitizeUrls', () => {
+            it('... should not have been called', () => {
+                expect(component.sanitizeUrls).not.toHaveBeenCalled();
+            });
+        });
+
+        describe('VIEW', () => {
+            it('... should contain 1 div.card with div.card-body', () => {
+                getAndExpectDebugElementByCss(compDe, 'div.card', 1, 1);
+                getAndExpectDebugElementByCss(compDe, 'div.card div.card-body', 1, 1);
+            });
+
+            it('... should contain one `h5` header in div.card-body', () => {
+                getAndExpectDebugElementByCss(compDe, 'div.card-body h5#awg-contact-info-header', 1, 1);
+            });
+
+            it('... should not render `contactInfoHeader` yet', () => {
+                const headerDes = getAndExpectDebugElementByCss(compDe, 'h5#awg-contact-info-header', 1, 1);
+                const headerEl = headerDes[0].nativeElement;
+
+                expect(headerEl).toBeDefined();
+                expect(headerEl.textContent).toBe('', 'should be empty string');
+            });
+
+            it('... should contain one address component (stubbed)', () => {
+                getAndExpectDebugElementByDirective(compDe, AddressStubComponent, 1, 1);
+            });
+
+            it('... should contain one OpenStreetMap component (stubbed)', () => {
+                getAndExpectDebugElementByDirective(compDe, OpenStreetMapStubComponent, 1, 1);
+            });
+
+            it('... should not pass down `pageMetaData` and `contactMetaData` to address component', () => {
+                const addressDes = getAndExpectDebugElementByDirective(compDe, AddressStubComponent, 1, 1);
+                const addressCmp = addressDes[0].injector.get(AddressStubComponent) as AddressStubComponent;
+
+                expect(addressCmp.pageMetaData).toBeUndefined();
+                expect(addressCmp.contactMetaData).toBeUndefined();
+            });
+
+            it('... should not pass down `osmEmbedUrl` and `osmLinkUrl` to OpenStreetMap component', () => {
+                const osmDes = getAndExpectDebugElementByDirective(compDe, OpenStreetMapStubComponent, 1, 1);
+                const osmCmp = osmDes[0].injector.get(OpenStreetMapStubComponent) as OpenStreetMapStubComponent;
+
+                expect(osmCmp.osmEmbedUrl).toBeUndefined();
+                expect(osmCmp.osmLinkUrl).toBeUndefined();
+            });
+        });
+    });
+
+    describe('AFTER initial data binding', () => {
+        beforeEach(() => {
+            // mock the call to the DomSanitizer in #sanitizeUrls
+            // it sets the bypassed links (SafeResourceUrl)
+            component.osmEmbedUrl = expectedOsmEmbedUrl;
+            component.osmLinkUrl = expectedOsmLinkUrl;
+
+            // mock the call to the meta service in #provideMetaData
+            component.pageMetaData = mockCoreService.getMetaDataSection(MetaSectionTypes.page);
+            component.contactMetaData = mockCoreService.getMetaDataSection(MetaSectionTypes.contact);
+
+            // trigger initial data binding
+            fixture.detectChanges();
+        });
+
+        describe('#provideMetaData', () => {
+            it('... should have been called', () => {
+                expect(component.provideMetaData).toHaveBeenCalled();
+            });
+
+            it('... should return pageMetaData', () => {
+                expect(component.pageMetaData).toBeDefined();
+                expect(component.pageMetaData).toBe(expectedPageMetaData, `should be ${expectedPageMetaData}`);
+            });
+
+            it('... should return contactMetaData', () => {
+                expect(component.contactMetaData).toBeDefined();
+                expect(component.contactMetaData).toBe(expectedContactMetaData, `should be ${expectedContactMetaData}`);
+            });
+        });
+
+        describe('#sanitizeUrls', () => {
+            it('... should have been called', () => {
+                expect(component.sanitizeUrls).toHaveBeenCalled();
+            });
+
+            it('... should return osmEmbedUrl', () => {
+                expect(component.osmEmbedUrl).toBeDefined();
+                expect(component.osmEmbedUrl).toEqual(expectedOsmEmbedUrl, `should equal ${expectedOsmEmbedUrl}`);
+            });
+
+            it('... should return osmLinkUrl', () => {
+                expect(component.osmLinkUrl).toBeDefined();
+                expect(component.osmLinkUrl).toEqual(expectedOsmLinkUrl, `should equal ${expectedOsmLinkUrl}`);
+            });
+        });
+
+        describe('VIEW', () => {
+            it('... should render `contactInfoHeader`', () => {
+                const headerDes = getAndExpectDebugElementByCss(compDe, 'h5#awg-contact-info-header', 1, 1);
+                const headerEl = headerDes[0].nativeElement;
+
+                expect(headerEl).toBeDefined();
+                expect(headerEl.textContent).toBe(expectedContactInfoHeader, `should be ${expectedContactInfoHeader}`);
+            });
+
+            it('... should pass down `pageMetaData` and `contactMetaData` to address component', () => {
+                const addressDes = getAndExpectDebugElementByDirective(compDe, AddressStubComponent, 1, 1);
+                const addressCmp = addressDes[0].injector.get(AddressStubComponent) as AddressStubComponent;
+
+                expect(addressCmp.pageMetaData).toBeTruthy();
+                expect(addressCmp.pageMetaData).toBe(expectedPageMetaData, `should be ${expectedPageMetaData}`);
+
+                expect(addressCmp.contactMetaData).toBeTruthy();
+                expect(addressCmp.contactMetaData).toBe(
+                    expectedContactMetaData,
+                    `should be ${expectedContactMetaData}`
+                );
+            });
+
+            it('... should pass down `osmEmbedUrl` and `osmLinkUrl` to OpenStreetMap component', () => {
+                const osmDes = getAndExpectDebugElementByDirective(compDe, OpenStreetMapStubComponent, 1, 1);
+                const osmCmp = osmDes[0].injector.get(OpenStreetMapStubComponent) as OpenStreetMapStubComponent;
+
+                expect(osmCmp.osmEmbedUrl).toBeTruthy();
+                expect(osmCmp.osmEmbedUrl).toEqual(expectedOsmEmbedUrl, `should equal ${expectedOsmEmbedUrl}`);
+
+                expect(osmCmp.osmLinkUrl).toBeTruthy();
+                expect(osmCmp.osmLinkUrl).toEqual(expectedOsmLinkUrl, `should equal ${expectedOsmLinkUrl}`);
+            });
+        });
+    });
 });
diff --git a/src/app/side-info/contact-info/contact-info.component.ts b/src/app/side-info/contact-info/contact-info.component.ts
index 2cb26431d6..71d1b91bff 100644
--- a/src/app/side-info/contact-info/contact-info.component.ts
+++ b/src/app/side-info/contact-info/contact-info.component.ts
@@ -1,40 +1,132 @@
-import { Component, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
 
-import { Meta } from '@awg-core/core-models';
+import { AppConfig } from '@awg-app/app.config';
+import { MetaContact, MetaPage, MetaSectionTypes } from '@awg-core/core-models';
 import { CoreService } from '@awg-core/services';
 
+/**
+ * The ContactInfo component.
+ *
+ * It contains the side-info section of the contact view
+ * showing contact information and an Open Street Map (OSM).
+ */
 @Component({
     selector: 'awg-contact-info',
     templateUrl: './contact-info.component.html',
-    styleUrls: ['./contact-info.component.css']
+    styleUrls: ['./contact-info.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class ContactInfoComponent implements OnInit {
-    private osmRoot = 'https://www.openstreetmap.org/export/embed.html';
-    private osmId =
-        '?bbox=7.582175731658936%2C47.55789611508066%2C7.586840093135835%2C47.56003739001212&amp;layer=mapnik&amp;marker=47.55896585846639%2C7.584506571292877';
-    private osmLinkRoot = 'https://www.openstreetmap.org/';
-    private osmLinkId = '?mlat=47.55897&amp;mlon=7.58451#map=19/47.55897/7.58451';
+    /**
+     * Public variable: contactInfoHeader.
+     *
+     * It keeps the header for the contact-info.
+     */
+    contactInfoHeader = 'Kontakt';
 
-    unsafeOsmUrl: string;
-    unsafeOsmLinkUrl: string;
-    osmUrl: SafeResourceUrl;
-    osmLinkUrl: SafeResourceUrl;
+    /**
+     * Public variable: contactMetaData.
+     *
+     * It keeps the contact meta data for the contact-info.
+     */
+    contactMetaData: MetaContact;
 
-    metaData: Meta;
+    /**
+     * Public variable: pageMetaData.
+     *
+     * It keeps the page meta data for the contact-info.
+     */
+    pageMetaData: MetaPage;
 
+    /**
+     * Private variable: _osmEmbedUrl.
+     *
+     * It keeps the sanitized link to embed the OSM map.
+     */
+    private _osmEmbedUrl: SafeResourceUrl;
+
+    /**
+     * Private variable: _osmLinkUrl.
+     *
+     * It keeps the sanitized link to the OSM page.
+     */
+    private _osmLinkUrl: SafeResourceUrl;
+
+    /**
+     * Getter for the sanitized OSM embed link.
+     */
+    get osmEmbedUrl() {
+        return this._osmEmbedUrl;
+    }
+
+    /**
+     * Setter for the sanitized OSM embed link.
+     */
+    set osmEmbedUrl(url: SafeResourceUrl) {
+        this._osmEmbedUrl = url;
+    }
+
+    /**
+     * Getter for the sanitized OSM external link.
+     */
+    get osmLinkUrl() {
+        return this._osmLinkUrl;
+    }
+
+    /**
+     * Setter for the sanitized OSM external link.
+     */
+    set osmLinkUrl(url: SafeResourceUrl) {
+        this._osmLinkUrl = url;
+    }
+
+    /**
+     * Constructor of the ContactInfoComponent.
+     *
+     * It declares a private CoreService instance
+     * to get the meta data and a private DomSanitizer instance.
+     *
+     * @param {CoreService} coreService Instance of the CoreService.
+     * @param {DomSanitizer} sanitizer Instance of the Angular DomSanitizer.
+     */
     constructor(private coreService: CoreService, private sanitizer: DomSanitizer) {}
 
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {
-        this.unsafeOsmUrl = this.osmRoot + this.osmId;
-        this.unsafeOsmLinkUrl = this.osmLinkRoot + this.osmLinkId;
-        this.osmUrl = this.sanitizer.bypassSecurityTrustResourceUrl(this.unsafeOsmUrl);
-        this.osmLinkUrl = this.sanitizer.bypassSecurityTrustResourceUrl(this.unsafeOsmLinkUrl);
-
         this.provideMetaData();
+        this.sanitizeUrls();
     }
 
+    /**
+     * Public method: provideMetaData.
+     *
+     * It calls the CoreService to provide
+     * the meta data for the contact-info.
+     *
+     * @returns {void} Sets the pageMetaData variable.
+     */
     provideMetaData(): void {
-        this.metaData = this.coreService.getMetaData();
+        this.pageMetaData = this.coreService.getMetaDataSection(MetaSectionTypes.page);
+        this.contactMetaData = this.coreService.getMetaDataSection(MetaSectionTypes.contact);
+    }
+
+    /**
+     * Public method: sanitizeUrls.
+     *
+     * It sanitizes the URLs and links
+     * for the OpenStreetMap
+     * using the Angular DomSanitizer.
+     *
+     * @returns {void} Sanitizes the URLs.
+     */
+    sanitizeUrls(): void {
+        this.osmEmbedUrl = this.sanitizer.bypassSecurityTrustResourceUrl(AppConfig.UNSAFE_OSM_EMBED_URL);
+        this.osmLinkUrl = this.sanitizer.bypassSecurityTrustResourceUrl(AppConfig.UNSAFE_OSM_LINK_URL);
     }
 }
diff --git a/src/app/side-info/edition-info/edition-info.component.html b/src/app/side-info/edition-info/edition-info.component.html
index 99384a3c57..b1d8dcacd0 100644
--- a/src/app/side-info/edition-info/edition-info.component.html
+++ b/src/app/side-info/edition-info/edition-info.component.html
@@ -1,19 +1,28 @@
 <!-- sideinfo: edition -->
 <div class="card">
     <div class="card-body bg-light">
-        <p class="bold">
-            AWG I/5 <i>Vier Lieder</i> op. 12 <a [routerLink]="['/edition', 'intro']">Skizzen</a>
-            <br>
-        </p>
+        <h5 id="awg-edition-info-header">
+            {{ editionInfoHeader.section }}
+            <br />
+            <i>{{ editionInfoHeader.title }}</i
+            >&nbsp;{{ editionInfoHeader.catalogueType }}&nbsp;{{ editionInfoHeader.catalogueNumber }}
+            <br />
+            <a [routerLink]="['/edition', 'intro']">{{ editionInfoHeader.part }}</a>
+        </h5>
         <p>&#9671;</p>
         <p>
-            [Beispieledition ausgewählter Skizzen zu op. 12 Nr. 1]
+            {{ editionInfoHeader.description }}
         </p>
         <p>&#9671;</p>
         <p>
-            Ediert von <span [innerHTML]="metaData?.edition?.editors"></span>
-            <br>
-            Versionsdatum: <span class="version">{{ metaData?.edition?.lastModified }}</span>
+            Ediert von
+            <span class="awg-edition-info-editors"
+                ><a href="{{ (editionMetaData?.editors)[0].contactUrl }}" target="_blank" rel="noopener noreferrer">{{
+                    (editionMetaData?.editors)[0].name
+                }}</a></span
+            >
+            <br />
+            Versionsdatum: <span id="awg-edition-info-lastmodified">{{ editionMetaData?.lastModified }}</span>
         </p>
     </div>
 </div>
diff --git a/src/app/side-info/edition-info/edition-info.component.spec.ts b/src/app/side-info/edition-info/edition-info.component.spec.ts
index f2d58078fc..c51279509c 100644
--- a/src/app/side-info/edition-info/edition-info.component.spec.ts
+++ b/src/app/side-info/edition-info/edition-info.component.spec.ts
@@ -2,26 +2,176 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { DebugElement } from '@angular/core';
 
-import { EditionInfoComponent } from './edition-info.component';
 import { RouterLinkStubDirective } from 'testing/router-stubs';
 
-describe('EditionInfoComponent', () => {
+import { MetaEdition, MetaSectionTypes } from '@awg-core/core-models';
+import { CoreService } from '@awg-core/services';
+
+import { EditionInfoComponent } from './edition-info.component';
+import { METADATA } from '@awg-core/mock-data';
+import { getAndExpectDebugElementByCss } from '@testing/expect-helper';
+
+describe('EditionInfoComponent (DONE)', () => {
     let component: EditionInfoComponent;
     let fixture: ComponentFixture<EditionInfoComponent>;
+    let compDe: DebugElement;
+    let compEl: any;
+
+    let mockCoreService: Partial<CoreService>;
+
+    let expectedEditionMetaData: MetaEdition;
+    let expectedEditionInfoHeader;
 
     beforeEach(async(() => {
+        // stub service for test purposes
+        mockCoreService = {
+            getMetaDataSection: key => METADATA[key]
+        };
+
         TestBed.configureTestingModule({
-            declarations: [EditionInfoComponent, RouterLinkStubDirective]
+            declarations: [EditionInfoComponent, RouterLinkStubDirective],
+            providers: [{ provide: CoreService, useValue: mockCoreService }]
         }).compileComponents();
     }));
 
     beforeEach(() => {
         fixture = TestBed.createComponent(EditionInfoComponent);
         component = fixture.componentInstance;
-        fixture.detectChanges();
+
+        compDe = fixture.debugElement;
+        compEl = compDe.nativeElement;
+
+        // test data
+        expectedEditionMetaData = METADATA[MetaSectionTypes.edition];
+        expectedEditionInfoHeader = {
+            section: 'AWG I/5',
+            title: 'Vier Lieder',
+            catalogueType: 'op.',
+            catalogueNumber: '12',
+            part: 'Skizzen',
+            description: '[Beispieledition ausgewählter Skizzen zu op. 12 Nr. 1]'
+        };
+
+        // spies on component functions
+        // `.and.callThrough` will track the spy down the nested describes, see
+        // https://jasmine.github.io/2.0/introduction.html#section-Spies:_%3Ccode%3Eand.callThrough%3C/code%3E
+        spyOn(component, 'provideMetaData').and.callThrough();
     });
 
     it('should create', () => {
         expect(component).toBeTruthy();
     });
+
+    it('stub service and injected coreService should not be the same', () => {
+        const coreService = TestBed.get(CoreService);
+        expect(mockCoreService === coreService).toBe(false);
+
+        // changing the stub service has no effect on the injected service
+        let changedEditionMetaData = new MetaEdition();
+        changedEditionMetaData = {
+            editors: [
+                {
+                    name: 'Test Editor',
+                    contactUrl: 'www.example.com/test-editor'
+                }
+            ],
+            lastModified: '2017'
+        };
+        mockCoreService.getMetaDataSection = () => changedEditionMetaData;
+
+        expect(coreService.getMetaDataSection(MetaSectionTypes.edition)).toBe(expectedEditionMetaData);
+    });
+
+    describe('BEFORE initial data binding', () => {
+        it('... should have editionInfoHeader', () => {
+            expect(component.editionInfoHeader).toBeDefined();
+            expect(component.editionInfoHeader).toEqual(
+                expectedEditionInfoHeader,
+                `should equal ${expectedEditionInfoHeader}`
+            );
+        });
+
+        describe('#provideMetaData', () => {
+            it('... should not have been called', () => {
+                expect(component.provideMetaData).not.toHaveBeenCalled();
+            });
+
+            it('... should not have structureMetaData', () => {
+                expect(component.editionMetaData).toBeUndefined('should be undefined');
+            });
+        });
+
+        describe('VIEW', () => {
+            it('... should contain 1 div.card with div.card-body', () => {
+                getAndExpectDebugElementByCss(compDe, 'div.card', 1, 1);
+                getAndExpectDebugElementByCss(compDe, 'div.card div.card-body', 1, 1);
+            });
+
+            it('... should contain one `h5` header and 4 `p` elements in div.card-body', () => {
+                getAndExpectDebugElementByCss(compDe, 'div.card-body h5#awg-edition-info-header', 1, 1);
+                getAndExpectDebugElementByCss(compDe, 'div.card-body p', 4, 4);
+            });
+
+            it('... should not render editor information yet', () => {
+                const editorDes = getAndExpectDebugElementByCss(compDe, 'span.awg-edition-info-editors a', 1, 1);
+                const editorEl = editorDes[0].nativeElement;
+
+                expect(editorEl).toBeDefined();
+                expect(editorEl.href).toBe('', 'should be empty string');
+                expect(editorEl.innerHTML).toBe('', 'should be empty string');
+            });
+
+            it('... should not render last modification date yet', () => {
+                const dateDes = getAndExpectDebugElementByCss(compDe, 'span#awg-edition-info-lastmodified', 1, 1);
+                const dateEl = dateDes[0].nativeElement;
+
+                expect(dateEl.textContent).toBeDefined();
+                expect(dateEl.textContent).toBe('', 'should be empty string');
+            });
+        });
+    });
+
+    describe('AFTER initial data binding', () => {
+        beforeEach(() => {
+            // mock the call to the meta service in #provideMetaData
+            component.editionMetaData = mockCoreService.getMetaDataSection(MetaSectionTypes.edition);
+
+            // trigger initial data binding
+            fixture.detectChanges();
+        });
+
+        describe('#provideMetaData', () => {
+            it('... should have been called', () => {
+                expect(component.provideMetaData).toHaveBeenCalled();
+            });
+
+            it('... should return editionMetaData', () => {
+                expect(component.editionMetaData).toBeDefined();
+                expect(component.editionMetaData).toBe(expectedEditionMetaData);
+            });
+        });
+
+        describe('VIEW', () => {
+            it('should render editor information', () => {
+                const expectedEditor = expectedEditionMetaData.editors[0];
+
+                const editorDes = getAndExpectDebugElementByCss(compDe, 'span.awg-edition-info-editors a', 1, 1);
+                const editorEl = editorDes[0].nativeElement;
+
+                expect(editorEl).toBeDefined();
+                expect(editorEl.href).toBe(expectedEditor.contactUrl, `should be ${expectedEditor.contactUrl}`);
+                expect(editorEl.innerHTML).toBe(expectedEditor.name, `should be ${expectedEditor.name}`);
+            });
+
+            it('should render last modification date', () => {
+                const expectedLastModified = expectedEditionMetaData.lastModified;
+
+                const lastmodDes = getAndExpectDebugElementByCss(compDe, 'span#awg-edition-info-lastmodified', 1, 1);
+                const lastmodEl = lastmodDes[0].nativeElement;
+
+                expect(lastmodEl.textContent).toBeDefined();
+                expect(lastmodEl.textContent).toContain(expectedLastModified, `should contain ${expectedLastModified}`);
+            });
+        });
+    });
 });
diff --git a/src/app/side-info/edition-info/edition-info.component.ts b/src/app/side-info/edition-info/edition-info.component.ts
index 7703e87f47..1b82663df7 100644
--- a/src/app/side-info/edition-info/edition-info.component.ts
+++ b/src/app/side-info/edition-info/edition-info.component.ts
@@ -1,23 +1,70 @@
-import { Component, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 
-import { Meta } from '@awg-core/core-models';
+import { MetaEdition, MetaSectionTypes } from '@awg-core/core-models';
 import { CoreService } from '@awg-core/services';
 
+/**
+ * The EditionInfo component.
+ *
+ * It contains the side-info section of the edition view.
+ */
 @Component({
     selector: 'awg-edition-info',
     templateUrl: './edition-info.component.html',
-    styleUrls: ['./edition-info.component.css']
+    styleUrls: ['./edition-info.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class EditionInfoComponent implements OnInit {
-    metaData: Meta;
+    /**
+     * Public variable: editionInfoHeader.
+     *
+     * It keeps the header information for the edition-info.
+     */
+    editionInfoHeader = {
+        section: 'AWG I/5',
+        title: 'Vier Lieder',
+        catalogueType: 'op.',
+        catalogueNumber: '12',
+        part: 'Skizzen',
+        description: '[Beispieledition ausgewählter Skizzen zu op. 12 Nr. 1]'
+    };
 
+    /**
+     * Public variable: editionMetaData.
+     *
+     * It keeps the meta data for the edition info.
+     */
+    editionMetaData: MetaEdition;
+
+    /**
+     * Constructor of the EditionInfoComponent.
+     *
+     * It declares a private CoreService instance
+     * to get the meta data.
+     *
+     * @param {CoreService} coreService Instance of the CoreService.
+     */
     constructor(private coreService: CoreService) {}
 
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {
         this.provideMetaData();
     }
 
+    /**
+     * Public method: provideMetaData.
+     *
+     * It calls the CoreService to provide
+     * the meta data for the edition info.
+     *
+     * @returns {void} Sets the editionMetaData variable.
+     */
     provideMetaData(): void {
-        this.metaData = this.coreService.getMetaData();
+        this.editionMetaData = this.coreService.getMetaDataSection(MetaSectionTypes.edition);
     }
 }
diff --git a/src/app/side-info/resource-info/resource-info.component.html b/src/app/side-info/resource-info/resource-info.component.html
index 78a8c5e870..bb7210afdd 100644
--- a/src/app/side-info/resource-info/resource-info.component.html
+++ b/src/app/side-info/resource-info/resource-info.component.html
@@ -14,33 +14,48 @@
 ************************************************/ -->
 
 <!-- sideinfo: resource -->
-<div class="card" *ngIf="resourceInfo">
+<div class="card" *ngIf="resourceInfoData">
     <div class="card-header d-flex">
         <div class="ml-3 mr-1 my-auto">
-            <button type="button" class="btn btn-outline-info btn-sm" ngbTooltip="Zur Suche" tooltipClass="d-none d-md-inline d-lg-none" (click)="navigateToSearchResults()">
+            <button
+                type="button"
+                class="btn btn-outline-info btn-sm"
+                ngbTooltip="Zur Suche"
+                tooltipClass="d-none d-md-inline d-lg-none"
+                (click)="navigateToSearchPanel()"
+            >
                 <fa-icon [icon]="faArrowLeft"></fa-icon>
-                <span class="awg-resource-info-btn-text d-md-none d-lg-inline ml-2" >Zur Suche</span>
+                <span class="awg-resource-info-btn-text d-md-none d-lg-inline ml-2">Zur Suche</span>
             </button>
         </div>
         <div class="text-center mx-auto">
             <strong class="text-muted small">Aktueller Suchbegriff</strong>
-            <br>
-            <span *ngIf="resourceInfo?.searchResults?.query; else noQuery">{{ resourceInfo?.searchResults?.query }}</span>
+            <br />
+            <span *ngIf="resourceInfoData?.searchResults?.query; else noQuery">{{
+                resourceInfoData?.searchResults?.query
+            }}</span>
             <ng-template #noQuery>
                 <span>---</span>
             </ng-template>
         </div>
-    </div><!-- end card-header -->
+    </div>
+    <!-- end card-header -->
     <div class="card-body bg-light">
         <!-- search results -->
-        <div *ngIf="resourceInfo?.searchResults?.size">
+        <div *ngIf="resultSize">
             <ul class="list-group awg-resource-info-list-group">
                 <!-- previous resource -->
-                <a *ngIf="resourceInfo?.resources?.previous; else noPrevious; let previous" class="list-group-item list-group-item-action flex-column awg-list-group-item text-left" (click)="navigateToResource(previous?.id)">
+                <a
+                    *ngIf="resourceInfoData?.resources?.previous; else noPrevious; let previous"
+                    class="list-group-item list-group-item-action flex-column awg-list-group-item text-left"
+                    (click)="navigateToResource(previous?.id)"
+                >
                     <div>
                         <strong class="text-muted small">
                             <fa-icon [icon]="faChevronLeft"></fa-icon>
-                            <span class="awg-resource-info-btn-text ml-2">Vorheriges Ergebnis ({{ previous?.displayIndex }}/{{ resultSize }})</span>
+                            <span class="awg-resource-info-btn-text ml-2"
+                                >Vorheriges Ergebnis ({{ previous?.displayIndex }}/{{ resultSize }})</span
+                            >
                         </strong>
                     </div>
                     <div>
@@ -53,7 +68,10 @@
                     </div>
                 </a>
                 <ng-template #noPrevious>
-                    <a *ngIf="resourceInfo?.resources?.current?.displayIndex === 1" class="list-group-item list-group-item-danger flex-column awg-list-group-item text-left">
+                    <a
+                        *ngIf="resourceInfoData?.resources?.current?.displayIndex === 1"
+                        class="list-group-item list-group-item-danger flex-column awg-list-group-item text-left"
+                    >
                         <div>
                             <strong class="text-muted small">
                                 <fa-icon [icon]="faTimesCircle"></fa-icon>
@@ -70,35 +88,61 @@
                     </a>
                 </ng-template>
 
-
                 <!-- current resource -->
-                <li class="list-group-item list-group-item-info" *ngIf="resourceInfo?.resources?.current; let current">
-                    <strong class="text-muted small mb-1">Angezeigtes Ergebnis ({{ current?.displayIndex }}/{{ resultSize }})</strong>
+                <li
+                    class="list-group-item list-group-item-info"
+                    *ngIf="resourceInfoData?.resources?.current; let current"
+                >
+                    <strong class="text-muted small mb-1"
+                        >Angezeigtes Ergebnis ({{ current?.displayIndex }}/{{ resultSize }})</strong
+                    >
 
-                    <form [formGroup]="resourceInfoForm">
+                    <form [formGroup]="resourceInfoFormGroup">
                         <div class="input-group input-group-sm">
                             <div class="input-group-prepend">
-                                <button type="submit" [ngClass]="{'btn': true, 'btn-outline-success': resourceInfoForm.valid, 'btn-outline-danger': resourceInfoForm.invalid}" id="awg-resource-info-input-group-text" [disabled]="resourceInfoIndex.value === current?.displayIndex || !resourceInfoForm?.valid" (click)="findResourceByIndex()">Gehe zu</button>
+                                <button
+                                    type="submit"
+                                    [ngClass]="{
+                                        btn: true,
+                                        'btn-outline-success': resourceInfoFormGroup.valid,
+                                        'btn-outline-danger': resourceInfoFormGroup.invalid
+                                    }"
+                                    id="awg-resource-info-input-group-text"
+                                    [disabled]="
+                                        resourceInfoIndex === current?.displayIndex || !resourceInfoFormGroup?.valid
+                                    "
+                                    (click)="navigateToResourceByIndex(resourceInfoIndex)"
+                                >
+                                    Gehe zu
+                                </button>
                             </div>
-                            <input type="number"
-                                   class="form-control"
-                                   formControlName="resourceInfoIndex"
-                                   id="awg-resource-info-input"
-                                   aria-label="Index of search result"
-                                   aria-describedby="awg-resource-info-input-group-text"
-                                   size="4"
-                                   min="1"
-                                   [max]="resultSize"
-                                   required>
+                            <input
+                                type="number"
+                                class="form-control"
+                                formControlName="resourceInfoIndex"
+                                id="awg-resource-info-input"
+                                aria-label="Index of search result"
+                                aria-describedby="awg-resource-info-input-group-text"
+                                size="4"
+                                min="1"
+                                [max]="resultSize"
+                                required
+                            />
                         </div>
                     </form>
                 </li>
 
                 <!-- next resource -->
-                <a *ngIf="resourceInfo?.resources?.next; else noNext; let next" class="list-group-item list-group-item-action flex-column awg-list-group-item text-right" (click)="navigateToResource(next?.id)">
+                <a
+                    *ngIf="resourceInfoData?.resources?.next; else noNext; let next"
+                    class="list-group-item list-group-item-action flex-column awg-list-group-item text-right"
+                    (click)="navigateToResource(next?.id)"
+                >
                     <div class="mb-1">
                         <strong class="text-muted small">
-                            <span class="awg-resource-info-btn-text mr-2">Nächstes Ergebnis ({{ next?.displayIndex }}/{{ resultSize }})</span>
+                            <span class="awg-resource-info-btn-text mr-2"
+                                >Nächstes Ergebnis ({{ next?.displayIndex }}/{{ resultSize }})</span
+                            >
                             <fa-icon [icon]="faChevronRight"></fa-icon>
                         </strong>
                     </div>
@@ -112,7 +156,10 @@
                     </div>
                 </a>
                 <ng-template #noNext>
-                    <a *ngIf="resourceInfo?.resources?.current?.displayIndex === resultSize" class="list-group-item list-group-item-danger flex-column awg-list-group-item text-right">
+                    <a
+                        *ngIf="resourceInfoData?.resources?.current?.displayIndex === resultSize"
+                        class="list-group-item list-group-item-danger flex-column awg-list-group-item text-right"
+                    >
                         <div>
                             <strong class="text-muted small">
                                 <fa-icon [icon]="faTimesCircle"></fa-icon>
@@ -128,11 +175,16 @@
                         </div>
                     </a>
                 </ng-template>
-
             </ul>
-        </div><!-- end ngIf: resourceInfo?.searchResults?.size -->
-    </div><!-- end card-body -->
+        </div>
+        <!-- end ngIf: resultSize -->
+    </div>
+    <!-- end card-body -->
     <div class="card-footer text-muted small">
-        Design and structure of this resource view adapted from <<a href ="https://arachne.dainst.org/">iDAI.object arachne</a>> (11/2017)
-    </div><!-- end card-footer -->
-</div><!-- end card.ngIf: resourceInfo -->
+        Design and structure of this resource view adapted from <<a href="https://arachne.dainst.org/"
+            >iDAI.object arachne</a
+        >> (11/2017)
+    </div>
+    <!-- end card-footer -->
+</div>
+<!-- end card.ngIf: resourceInfo -->
diff --git a/src/app/side-info/resource-info/resource-info.component.ts b/src/app/side-info/resource-info/resource-info.component.ts
index 4ba3629649..3fccd1d8cb 100644
--- a/src/app/side-info/resource-info/resource-info.component.ts
+++ b/src/app/side-info/resource-info/resource-info.component.ts
@@ -3,6 +3,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { Router } from '@angular/router';
 
 import { Subscription } from 'rxjs';
+import { switchMap } from 'rxjs/operators';
 
 import { faArrowLeft, faChevronLeft, faChevronRight, faTimesCircle } from '@fortawesome/free-solid-svg-icons';
 
@@ -10,158 +11,295 @@ import { DataStreamerService } from '@awg-core/services';
 import { SearchResponseWithQuery } from '@awg-views/data-view/models';
 import { ResourceInfo, ResourceInfoResource } from '@awg-side-info/side-info-models';
 
+/**
+ * The ResourceInfo component.
+ *
+ * It contains the side-info section of the data (search) view
+ * showing information about search results.
+ */
 @Component({
     selector: 'awg-resource-info',
     templateUrl: './resource-info.component.html',
     styleUrls: ['./resource-info.component.css']
 })
 export class ResourceInfoComponent implements OnInit, OnDestroy {
-    currentIdSubscription: Subscription;
-    searchResponseSubscription: Subscription;
-
-    resourceInfo: ResourceInfo = new ResourceInfo();
-    resourceInfoForm: FormGroup;
+    /**
+     * Public variable: resourceInfoDataSubscription.
+     *
+     * It keeps the subscription for the resource info data.
+     */
+    resourceInfoDataSubscription: Subscription;
 
+    /**
+     * Public variable: faArrowLeft.
+     *
+     * It instantiates fontawesome's faArrowLeft icon.
+     */
     faArrowLeft = faArrowLeft;
+
+    /**
+     * Public variable: faChevronLeft.
+     *
+     * It instantiates fontawesome's faChevronLeft icon.
+     */
     faChevronLeft = faChevronLeft;
+
+    /**
+     * Public variable: faChevronRight.
+     *
+     * It instantiates fontawesome's faChevronRight icon.
+     */
     faChevronRight = faChevronRight;
+
+    /**
+     * Public variable: faTimesCircle.
+     *
+     * It instantiates fontawesome's faTimesCircle icon.
+     */
     faTimesCircle = faTimesCircle;
 
-    currentId: string;
+    /**
+     * Public variable: goToIndex.
+     *
+     * It keeps the index position .
+     */
     goToIndex: number;
-    resultSize: number;
-    searchResults: SearchResponseWithQuery;
 
-    constructor(private router: Router, private streamerService: DataStreamerService, private fb: FormBuilder) {}
+    /**
+     * Public variable: resourceId.
+     *
+     * It keeps the current resource id.
+     */
+    resourceId: string;
 
-    ngOnInit() {
-        this.getCurrentResourceIdFromSubscription();
-    }
+    /**
+     * Public variable: resourceInfoData.
+     *
+     * It keeps the data for the resource info,
+     * i.e. search results and current, next & previous resource.
+     */
+    resourceInfoData: ResourceInfo = new ResourceInfo();
 
-    buildForm(index: number, resultSize: number): void {
-        this.resourceInfoForm = this.fb.group({
-            resourceInfoIndex: [
-                index || '',
-                Validators.compose([Validators.required, Validators.min(1), Validators.max(resultSize)])
-            ]
-        });
-    }
+    /**
+     * Public variable: resourceInfoFormGroup.
+     *
+     * It keeps the form group of the resource info.
+     */
+    resourceInfoFormGroup: FormGroup;
 
-    /*
-     * Getter function for resource info index
+    /**
+     * Public variable: resultSize.
+     *
+     * It keeps a shortcout for the length of the
+     * resourceInfoData.searchResults.data.subjects array.
      */
-    get resourceInfoIndex() {
-        return this.resourceInfoForm.get('resourceInfoIndex');
-    }
+    resultSize: number;
 
-    getCurrentResourceIdFromSubscription(): void {
-        // subscribe to streamer service
-        this.currentIdSubscription = this.streamerService.getCurrentResourceId().subscribe(
-            (id: string) => {
-                // update id from streamer service
-                this.currentId = id;
-
-                // get search results
-                this.getCurrentSearchResultsFromSubscription();
-            },
-            error => {
-                console.log('RESOURCE-INFO: Got no sideInfoData from Subscription!', error as any);
-            }
-        );
+    /**
+     * Constructor of the ResourceInfoComponent.
+     *
+     * It declares a private FormBuilder instance,
+     * a private Router instance and a private
+     * DataStreamerService instance
+     * to get the streamed search results.
+     *
+     * @param {FormBuilder} fb Instance of the FormBuilder.
+     * @param {Router} router Instance of the Router.
+     * @param {DataStreamerService} streamerService Instance of the DataStreamerService.
+     */
+    constructor(private fb: FormBuilder, private router: Router, private streamerService: DataStreamerService) {}
+
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
+    ngOnInit() {
+        this.subscribeResourceInfoData();
     }
 
-    getCurrentSearchResultsFromSubscription(): void {
+    /**
+     * Public method: subscribeResourceInfoData.
+     *
+     * It calls the DataStreamerService to get
+     * the current resource id and loads it
+     * into resourceId. Then it gets the
+     * search result data and loads it
+     * into resourceInfo data object.
+     *
+     * @returns {void} Subscribes to StreamerService.
+     */
+    subscribeResourceInfoData(): void {
         // subscribe to streamer service
-        this.searchResponseSubscription = this.streamerService.getCurrentSearchResults().subscribe(
-            (res: SearchResponseWithQuery) => {
-                // update search results from streamer service
-                this.searchResults = { ...res };
-
-                // load search results into resourceInfo object
-                this.resourceInfo.searchResults = {
-                    query: this.searchResults.query,
-                    size: this.searchResults.data.subjects.length,
-                    subjects: this.searchResults.data.subjects
-                };
-
-                // find resource with current id in search results
-                this.findResourceInSearchResultsById(this.currentId);
-            },
-            error => {
-                console.log('RESOURCE-INFO: Got no sideInfoData from Subscription!', error as any);
-            }
-        );
-    }
+        this.resourceInfoDataSubscription = this.streamerService
+            .getResourceId()
+            .pipe(
+                switchMap(id => {
+                    // update id from streamer service
+                    this.resourceId = id;
 
-    findResourceInSearchResultsById(id: string): void {
-        // find index position of currentSubject in searchResults.subjects array
-        const arrayIndex = this.resourceInfo.searchResults.subjects.findIndex(subject => subject.obj_id === id);
+                    // return search response with query from streamer service
+                    return this.streamerService.getSearchResponseWithQuery();
+                })
+            )
+            .subscribe(
+                (res: SearchResponseWithQuery) => {
+                    // deep clone search results from streamer service
+                    const response = { ...res };
 
-        // update resource info data
-        this.updateSideInfoResources(arrayIndex);
+                    // update resource Info
+                    this.updateResourceInfo(this.resourceId, response);
+
+                    // build the form
+                    this.buildForm(this.goToIndex, this.resultSize);
+                },
+                error => {
+                    console.log('RESOURCE-INFO: Got no sideInfoData from Subscription!', error as any);
+                }
+            );
     }
 
-    updateSideInfoResources(index: number): void {
-        // some shortcuts
-        this.goToIndex = index + 1;
+    /**
+     * Public method: updateResourceInfo.
+     *
+     * It updates the current resource info data.
+     *
+     * @returns {void} Sets the resourceInfoData.
+     */
+    updateResourceInfo(id: string, response: SearchResponseWithQuery): void {
+        // find index position of resource with given id in search results
+        const index = this.findIndexPositionInSearchResultsById(id, response);
+
+        // shortcuts for indices
         const nextIndex = index + 1;
         const prevIndex = index - 1;
-        const subjects = this.resourceInfo.searchResults.subjects;
-        this.resultSize = subjects.length;
 
-        // current subject and its neighbours
+        // shortcuts for current subject and its neighbours
+        const subjects = response.data.subjects;
         const current = subjects[index];
         const next = subjects[nextIndex];
         const prev = subjects[prevIndex];
 
-        // update resourceInfo.resources
-        this.resourceInfo.resources = {
-            current: current ? new ResourceInfoResource(current, index) : undefined,
-            next: next ? new ResourceInfoResource(next, nextIndex) : undefined,
-            previous: prev ? new ResourceInfoResource(prev, prevIndex) : undefined
+        // set result length and goToIndex
+        this.resultSize = subjects.length;
+        this.goToIndex = index + 1;
+
+        // update resourceInfoData (immutable)
+        this.resourceInfoData = {
+            searchResults: response,
+            resources: {
+                current: current ? new ResourceInfoResource(current, index) : undefined,
+                next: next ? new ResourceInfoResource(next, nextIndex) : undefined,
+                previous: prev ? new ResourceInfoResource(prev, prevIndex) : undefined
+            }
         };
+    }
 
-        this.buildForm(this.goToIndex, this.resultSize);
+    /**
+     * Public method: buildForm.
+     *
+     * It builds the form group to display the resource
+     * depending on the given index position and result size.
+     *
+     * @param {number} index The given index position
+     * of the resource to be displayed.
+     * @param {number} resultSize The given length of the
+     * search result subjects array.
+     * @returns {void} Sets the resourceInfoData.resources.
+     */
+    buildForm(index: number, resultSize: number): void {
+        this.resourceInfoFormGroup = this.fb.group({
+            resourceInfoIndex: [
+                index || '',
+                Validators.compose([Validators.required, Validators.min(1), Validators.max(resultSize)])
+            ]
+        });
+    }
+
+    /**
+     * Public method: findIndexPositionInSearchResultsById.
+     *
+     * It looks for the index position of the given resource id
+     * in the search response subjects array.
+     *
+     * @param {string} id The given resource id.
+     * @param {SearchResponseWithQuery} response The given search response.
+     * @returns {number} The array index position.
+     */
+    findIndexPositionInSearchResultsById(id: string, response: SearchResponseWithQuery): number {
+        // shortcut for search result subjects
+        const subjects = response.data.subjects;
+
+        // compare given id with obj_id of subjects in searchResults.subjects array
+        return subjects.findIndex(subject => subject.obj_id === id);
     }
 
-    findResourceByIndex(): void {
-        // get current form index
-        const formIndex = this.resourceInfoIndex.value;
+    /**
+     * Getter for the current index position of the form group.
+     */
+    get resourceInfoIndex(): number {
+        return this.resourceInfoFormGroup.get('resourceInfoIndex').value;
+    }
 
-        // find resource id of search result at array position formIndex - 1 ()
-        const id = this.resourceInfo.searchResults.subjects[formIndex - 1].obj_id;
+    /**
+     * Public method: navigateToResourceByIndex.
+     *
+     * It looks for the id of a subject in the search results subjects array
+     * at the given index position and triggers the navigation method.
+     *
+     * @param {string} formIndex The given index position of the form group.
+     * @returns {void Triggers the navigation.
+     */
+    navigateToResourceByIndex(formIndex: number): void {
+        // find resource id of subject at array position formIndex - 1
+        const subjects = this.resourceInfoData.searchResults.data.subjects;
+        const id = subjects[formIndex - 1].obj_id;
 
         // navigate to resource with resource id
         this.navigateToResource(id);
     }
 
-    /*
-     * Navigate to resource id
+    /**
+     * Public method: navigateToResource.
+     *
+     * It navigates to the '/data/resource' route
+     * with the given id.
+     *
+     * @param {string} id The given resource id.
+     * @returns {void} Navigates to the resource.
      */
     navigateToResource(id: string): void {
         this.router.navigate(['/data/resource', id]);
     }
 
-    /*
-     * Navigate back to SearchPanel
+    /**
+     * Public method: navigateToSearchPanel.
+     *
+     * It navigates back to the '/data/search/fulltext' route
+     * (search panel) with the current query string if given.
+     *
+     * @returns {void} Navigates to the search panel.
      */
-    navigateToSearchResults(): void {
-        const queryStr = this.resourceInfo.searchResults ? this.resourceInfo.searchResults.query : '';
+    navigateToSearchPanel(): void {
+        const queryStr = this.resourceInfoData.searchResults ? this.resourceInfoData.searchResults.query : '';
         this.router.navigate(['/data/search/fulltext'], {
             queryParams: { query: queryStr }
         });
     }
 
-    /*
-     * Destroy subscriptions
+    /**
+     * Angular life cycle hook: ngOnDestroy.
+     *
+     * It calls the containing methods
+     * when destroying the component.
+     *
+     * Destroys subscriptions.
      */
     ngOnDestroy() {
         // prevent memory leak when component destroyed
-        if (this.currentIdSubscription) {
-            this.currentIdSubscription.unsubscribe();
-        }
-        if (this.searchResponseSubscription) {
-            this.searchResponseSubscription.unsubscribe();
+        if (this.resourceInfoDataSubscription) {
+            this.resourceInfoDataSubscription.unsubscribe();
         }
     }
 }
diff --git a/src/app/side-info/search-info/search-info.component.html b/src/app/side-info/search-info/search-info.component.html
index b9e573757d..04053cb371 100644
--- a/src/app/side-info/search-info/search-info.component.html
+++ b/src/app/side-info/search-info/search-info.component.html
@@ -1,16 +1,18 @@
 <!-- sideinfo: search -->
 <div class="card">
     <div class="card-body bg-light">
-        <p class="bold">
-            {{ searchInfoTitle }}
-        </p>
+        <h5 id="awg-search-info-header" *ngIf="searchInfoHeader$ | async as searchInfoHeader">
+            {{ searchInfoHeader }}
+        </h5>
         <p>&#9671;</p>
         <p>
-            <strong>Suchbegriff:</strong> {{ searchInfo ? searchInfo?.query : '---' }}
+            <strong>Suchbegriff: </strong
+            ><span *ngIf="searchInfoData$ | async as searchInfoData">{{ searchInfoData?.query }}</span>
         </p>
         <p>&#9671;</p>
         <p>
-            <strong>Suchergebnisse:</strong> {{ searchInfo ? searchInfo?.nhits : '---' }}
+            <strong>Suchergebnisse: </strong
+            ><span *ngIf="searchInfoData$ | async as searchInfoData">{{ searchInfoData?.nhits }}</span>
         </p>
     </div>
 </div>
diff --git a/src/app/side-info/search-info/search-info.component.ts b/src/app/side-info/search-info/search-info.component.ts
index 42123eeddc..a7f8d5f386 100644
--- a/src/app/side-info/search-info/search-info.component.ts
+++ b/src/app/side-info/search-info/search-info.component.ts
@@ -1,64 +1,70 @@
-import { AfterViewChecked, ChangeDetectorRef, Component, OnDestroy } from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 
-import { Subscription } from 'rxjs';
+import { Observable } from 'rxjs';
 
-import { SearchInfo } from '@awg-side-info/side-info-models';
 import { SideInfoService } from '@awg-core/services';
+import { SearchInfo } from '@awg-side-info/side-info-models';
 
+/**
+ * The SearchInfo component.
+ *
+ * It contains the side-info section of the data (search) view
+ * showing information about search results.
+ */
 @Component({
     selector: 'awg-search-info',
     templateUrl: './search-info.component.html',
-    styleUrls: ['./search-info.component.css']
+    styleUrls: ['./search-info.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class SearchInfoComponent implements AfterViewChecked, OnDestroy {
-    sideInfoDataSubscription: Subscription;
-    sideInfoTitleSubscription: Subscription;
-
-    searchInfo: SearchInfo;
-    searchInfoTitle: string;
-
-    constructor(private sideInfoService: SideInfoService, private cdRef: ChangeDetectorRef) {}
+export class SearchInfoComponent implements OnInit {
+    /**
+     * Public variable: searchInfoData$.
+     *
+     * Observable that keeps the information about the search
+     * to be displayed, i.e. the query and number of hits.
+     */
+    searchInfoData$: Observable<SearchInfo>;
 
-    ngAfterViewChecked() {
-        this.getSideInfoTitle();
-        this.getSideInfoData();
-    }
-
-    getSideInfoTitle() {
-        this.sideInfoTitleSubscription = this.sideInfoService.getSearchInfoTitle().subscribe(
-            (title: string) => {
-                this.searchInfoTitle = title;
-            },
-            error => {
-                console.log('SEARCH-INFO: Got no sideInfoData from Subscription!', error as any);
-            }
-        );
-    }
+    /**
+     * Public variable: searchInfoHeader$.
+     *
+     * Observable that keeps the header for the search-info.
+     */
+    searchInfoHeader$: Observable<string>;
 
-    getSideInfoData() {
-        // get sideInfoData from service
-        this.sideInfoDataSubscription = this.sideInfoService.getSideInfoData().subscribe(
-            (searchInfo: SearchInfo) => {
-                this.searchInfo = new SearchInfo(searchInfo.query, searchInfo.nhits);
+    /**
+     * Constructor of the SearchInfoComponent.
+     *
+     * It declares a private SideInfoService instance
+     * to get the search results and
+     * a private ChangeDetectorRef instance.
+     *
+     * @param {SideInfoService} sideInfoService Instance of the SideInfoService.
+     */
+    constructor(private sideInfoService: SideInfoService) {}
 
-                // detect changes only if component is not in destroy phase, compare: https://stackoverflow.com/a/46605947
-                if (!this.cdRef['destroyed']) {
-                    this.cdRef.detectChanges();
-                }
-            },
-            error => {
-                console.log('SEARCH-INFO: Got no sideInfoData from Subscription!', error as any);
-            }
-        );
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
+    ngOnInit(): void {
+        this.getSearchInfoData();
     }
 
-    ngOnDestroy() {
-        // prevent memory leak when component destroyed
-        if (this.sideInfoDataSubscription) {
-            this.sideInfoDataSubscription.unsubscribe();
-        }
-        if (this.sideInfoTitleSubscription) {
-            this.sideInfoTitleSubscription.unsubscribe();
-        }
+    /**
+     * Public method: getSearchInfoData.
+     *
+     * It calls the SideInfoService to provide
+     * the data for the search-info header and data.
+     *
+     * @returns {void} Sets the searchInfoHeader
+     * and searchInfoData observables.
+     */
+    getSearchInfoData(): void {
+        this.searchInfoHeader$ = this.sideInfoService.getSearchInfoTitle();
+        this.searchInfoData$ = this.sideInfoService.getSearchInfoData();
     }
 }
diff --git a/src/app/side-info/side-info-models/index.ts b/src/app/side-info/side-info-models/index.ts
index 369f4b5a95..aec7b55d7b 100644
--- a/src/app/side-info/side-info-models/index.ts
+++ b/src/app/side-info/side-info-models/index.ts
@@ -9,15 +9,6 @@
 
 import { ResourceInfo } from './resource-info.model';
 import { ResourceInfoResource, CurrentResource, NextResource, PreviousResource } from './resource-info-resources.model';
-import { ResourceInfoSearchResults } from './resource-info-search-results.model';
 import { SearchInfo } from './search-info.model';
 
-export {
-    ResourceInfo,
-    ResourceInfoResource,
-    CurrentResource,
-    NextResource,
-    PreviousResource,
-    ResourceInfoSearchResults,
-    SearchInfo
-};
+export { ResourceInfo, ResourceInfoResource, CurrentResource, NextResource, PreviousResource, SearchInfo };
diff --git a/src/app/side-info/side-info-models/resource-info-resources.model.ts b/src/app/side-info/side-info-models/resource-info-resources.model.ts
index bda105b471..28c6490ea5 100644
--- a/src/app/side-info/side-info-models/resource-info-resources.model.ts
+++ b/src/app/side-info/side-info-models/resource-info-resources.model.ts
@@ -1,13 +1,50 @@
 import { SubjectItemJson } from '@awg-shared/api-objects';
 
+/**
+ * The ResourceInfoResource class.
+ *
+ * It is used in the context of the resource info
+ * to store the data of a resource.
+ */
 export class ResourceInfoResource {
     // resource: SubjectItemJson;
+
+    /**
+     * The array index position of a resource
+     * in the search result list.
+     */
     arrayIndex: number;
+
+    /**
+     * The display index position of a resource (arrayIndex +1).
+     */
     displayIndex: number;
+
+    /**
+     * The id of a resource.
+     */
     id: string;
+
+    /**
+     * The title of a resource.
+     */
     title: string;
+
+    /**
+     * The subtitle of a resource.
+     */
     subtitle: string;
 
+    /**
+     * Constructor of the SearchInfo class.
+     *
+     * It initializes the class with values
+     * from a given SubjectItemJson and
+     * index position in a search result list.
+     *
+     * @param {SubjectItemJson} resource The given SubjectItemJson.
+     * @param {number} index The given index position.
+     */
     constructor(resource: SubjectItemJson, index: number) {
         // this.resource = resource;
         this.id = resource.obj_id;
@@ -16,14 +53,34 @@ export class ResourceInfoResource {
         this.arrayIndex = index;
         this.displayIndex = this.arrayIndex + 1;
     }
-
-    public getResourceInfo() {
-        return `Hello, resource with id ${this.id} at index ${this.arrayIndex}`;
-    }
 }
 
+/**
+ * The CurrentResource class.
+ *
+ * It is used in the context of the resource info
+ * to store the data of the current resource.
+ *
+ * It extends ResourceInfoResource class.
+ */
 export class CurrentResource extends ResourceInfoResource {}
 
+/**
+ * The NextResource class.
+ *
+ * It is used in the context of the resource info
+ * to store the data of the next resource.
+ *
+ * It extends ResourceInfoResource class.
+ */
 export class NextResource extends ResourceInfoResource {}
 
+/**
+ * The PreviousResource class.
+ *
+ * It is used in the context of the resource info
+ * to store the data of the previous resource.
+ *
+ * It extends ResourceInfoResource class.
+ */
 export class PreviousResource extends ResourceInfoResource {}
diff --git a/src/app/side-info/side-info-models/resource-info-search-results.model.ts b/src/app/side-info/side-info-models/resource-info-search-results.model.ts
deleted file mode 100644
index 3c99f8a4e8..0000000000
--- a/src/app/side-info/side-info-models/resource-info-search-results.model.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { SubjectItemJson } from '@awg-shared/api-objects';
-
-export class ResourceInfoSearchResults {
-    query: string;
-    size: number;
-    subjects: SubjectItemJson[];
-}
diff --git a/src/app/side-info/side-info-models/resource-info.model.ts b/src/app/side-info/side-info-models/resource-info.model.ts
index a6e3b73219..e448d38429 100644
--- a/src/app/side-info/side-info-models/resource-info.model.ts
+++ b/src/app/side-info/side-info-models/resource-info.model.ts
@@ -1,11 +1,42 @@
-import { CurrentResource, NextResource, PreviousResource, ResourceInfoResource } from './resource-info-resources.model';
-import { ResourceInfoSearchResults } from './resource-info-search-results.model';
+import { ResourceInfoResource } from './resource-info-resources.model';
+import { SearchResponseWithQuery } from '@awg-views/data-view/models';
 
+/**
+ * The ResourceInfo class.
+ *
+ * It is used in the context of the resource info
+ * to store the data of the search results.
+ */
 export class ResourceInfo {
-    searchResults: ResourceInfoSearchResults;
-    resources: {
-        current: ResourceInfoResource;
-        next: ResourceInfoResource;
-        previous: ResourceInfoResource;
-    };
+    /**
+     * The list of results of a search.
+     */
+    searchResults: SearchResponseWithQuery;
+
+    /**
+     * The actually displayed resources.
+     */
+    resources: IResourceInfoResources;
+}
+
+/**
+ * The IResourceInfoResources interface.
+ *
+ * It represents the resource info resources.
+ */
+export interface IResourceInfoResources {
+    /**
+     * The current resource.
+     */
+    current: ResourceInfoResource;
+
+    /**
+     * The next resource.
+     */
+    next: ResourceInfoResource;
+
+    /**
+     * The previous resource.
+     */
+    previous: ResourceInfoResource;
 }
diff --git a/src/app/side-info/side-info-models/search-info.model.ts b/src/app/side-info/side-info-models/search-info.model.ts
index d3b8ccbd7c..a8714a90ff 100644
--- a/src/app/side-info/side-info-models/search-info.model.ts
+++ b/src/app/side-info/side-info-models/search-info.model.ts
@@ -1,7 +1,30 @@
+/**
+ * The SearchInfo class.
+ *
+ * It is used in the context of the search info
+ * to store the data to inform about a search.
+ */
 export class SearchInfo {
+    /**
+     * The query string of a search.
+     */
     query: string;
+
+    /**
+     * The number of hits of a search.
+     */
     nhits: string;
 
+    /**
+     * Constructor of the SearchInfo class.
+     *
+     * It initializes the class with values
+     * from a given query and number of hits
+     * of a search.
+     *
+     * @param {string} query The given query string.
+     * @param {string} nhits The given number of hits.
+     */
     constructor(query: string, nhits: string) {
         this.query = query;
         this.nhits = nhits;
diff --git a/src/app/side-info/side-info-routing.module.ts b/src/app/side-info/side-info-routing.module.ts
index c095f3b9a7..886e69355b 100644
--- a/src/app/side-info/side-info-routing.module.ts
+++ b/src/app/side-info/side-info-routing.module.ts
@@ -7,6 +7,7 @@ import { ResourceInfoComponent } from './resource-info/resource-info.component';
 import { SearchInfoComponent } from './search-info/search-info.component';
 import { StructureInfoComponent } from './structure-info/structure-info.component';
 
+/* routes of the SideInfoModule */
 const sideInfoRoutes: Routes = [
     { path: 'contactInfo', component: ContactInfoComponent, outlet: 'side' },
     { path: 'editionInfo', component: EditionInfoComponent, outlet: 'side' },
@@ -15,16 +16,27 @@ const sideInfoRoutes: Routes = [
     { path: 'structureInfo', component: StructureInfoComponent, outlet: 'side' }
 ];
 
-@NgModule({
-    imports: [RouterModule.forChild(sideInfoRoutes)],
-    exports: [RouterModule]
-})
-export class SideInfoRoutingModule {}
-
-export const routedComponents = [
+/**
+ * Routed components of the {@link SideInfoModule}:
+ * {@link ContactInfoComponent}, {@link EditionInfoComponent},
+ * {@link ResourceInfoComponent}, {@link SearchInfoComponent},
+ * {@link StructureInfoComponent}.
+ */
+export const routedSideInfoComponents = [
     ContactInfoComponent,
     EditionInfoComponent,
     ResourceInfoComponent,
     SearchInfoComponent,
     StructureInfoComponent
 ];
+
+/**
+ * Side info module routing.
+ *
+ * It activates the sideInfoRoutes.
+ */
+@NgModule({
+    imports: [RouterModule.forChild(sideInfoRoutes)],
+    exports: [RouterModule]
+})
+export class SideInfoRoutingModule {}
diff --git a/src/app/side-info/side-info.module.ts b/src/app/side-info/side-info.module.ts
index f905da3fa0..9e6ba2dff4 100644
--- a/src/app/side-info/side-info.module.ts
+++ b/src/app/side-info/side-info.module.ts
@@ -1,10 +1,18 @@
 import { NgModule } from '@angular/core';
 import { SharedModule } from '@awg-shared/shared.module';
 
-import { SideInfoRoutingModule, routedComponents } from './side-info-routing.module';
+/* Routing Module */
+import { SideInfoRoutingModule, routedSideInfoComponents } from './side-info-routing.module';
 
+/**
+ * The side info module.
+ *
+ * It embeds the side info components and their
+ * [routing definition]{@link SideInfoRoutingModule}
+ * as well as the {@link SharedModule}.
+ */
 @NgModule({
     imports: [SharedModule, SideInfoRoutingModule],
-    declarations: [routedComponents]
+    declarations: [routedSideInfoComponents]
 })
 export class SideInfoModule {}
diff --git a/src/app/side-info/structure-info/structure-info.component.html b/src/app/side-info/structure-info/structure-info.component.html
index 6e73f94039..f03351580e 100644
--- a/src/app/side-info/structure-info/structure-info.component.html
+++ b/src/app/side-info/structure-info/structure-info.component.html
@@ -1,17 +1,19 @@
 <!-- sideinfo: structure -->
 <div class="card">
     <div class="card-body bg-light">
-        <p class="bold">
-            Strukturmodell
-            <br>
-        </p>
+        <h5 id="awg-structure-info-header">{{ structureInfoHeader }}</h5>
         <p>&#9671;</p>
         <p>
-            Konzept/Grafik: {{ author }}
+            Konzept/Grafik:
+            <span class="awg-structure-info-author">
+                <a href="{{ (structureMetaData?.authors)[0].contactUrl }}" target="_blank" rel="noopener noreferrer">{{
+                    (structureMetaData?.authors)[0].name
+                }}</a>
+            </span>
         </p>
         <p>&#9671;</p>
         <p>
-            Versionsdatum: <span class="version">{{ lastModified }}</span>
+            Versionsdatum: <span id="awg-structure-info-lastmodified">{{ structureMetaData?.lastModified }}</span>
         </p>
     </div>
 </div>
diff --git a/src/app/side-info/structure-info/structure-info.component.spec.ts b/src/app/side-info/structure-info/structure-info.component.spec.ts
index 0110955d42..aab53cd8b5 100644
--- a/src/app/side-info/structure-info/structure-info.component.spec.ts
+++ b/src/app/side-info/structure-info/structure-info.component.spec.ts
@@ -1,24 +1,186 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { DebugElement } from '@angular/core';
+
+import { getAndExpectDebugElementByCss } from '@testing/expect-helper';
+
+import { MetaStructure, MetaSectionTypes } from '@awg-core/core-models';
+import { METADATA } from '@awg-core/mock-data';
+import { CoreService } from '@awg-core/services';
 
 import { StructureInfoComponent } from './structure-info.component';
 
-describe('StructureInfoComponent', () => {
+describe('StructureInfoComponent (DONE)', () => {
     let component: StructureInfoComponent;
     let fixture: ComponentFixture<StructureInfoComponent>;
+    let compDe: DebugElement;
+    let compEl: any;
+
+    let mockCoreService: Partial<CoreService>;
+
+    let expectedStructureMetaData: MetaStructure;
+    const expectedStructureInfoHeader = 'Strukturmodell';
 
     beforeEach(async(() => {
+        // stub service for test purposes
+        mockCoreService = {
+            getMetaDataSection: key => METADATA[key]
+        };
+
         TestBed.configureTestingModule({
-            declarations: [StructureInfoComponent]
+            declarations: [StructureInfoComponent],
+            providers: [{ provide: CoreService, useValue: mockCoreService }]
         }).compileComponents();
     }));
 
     beforeEach(() => {
         fixture = TestBed.createComponent(StructureInfoComponent);
         component = fixture.componentInstance;
-        fixture.detectChanges();
+
+        compDe = fixture.debugElement;
+        compEl = compDe.nativeElement;
+
+        // test data
+        expectedStructureMetaData = METADATA[MetaSectionTypes.structure];
+
+        // spies on component functions
+        // `.and.callThrough` will track the spy down the nested describes, see
+        // https://jasmine.github.io/2.0/introduction.html#section-Spies:_%3Ccode%3Eand.callThrough%3C/code%3E
+        spyOn(component, 'provideMetaData').and.callThrough();
     });
 
-    it('should be created', () => {
+    it('should create', () => {
         expect(component).toBeTruthy();
     });
+
+    it('stub service and injected coreService should not be the same', () => {
+        const coreService = TestBed.get(CoreService);
+        expect(mockCoreService === coreService).toBe(false);
+
+        // changing the stub service has no effect on the injected service
+        let changedStructureMetaData = new MetaStructure();
+        changedStructureMetaData = {
+            authors: [
+                {
+                    name: 'Test Author',
+                    contactUrl: 'www.example.com/test-author'
+                }
+            ],
+            lastModified: '2017'
+        };
+        mockCoreService.getMetaDataSection = () => changedStructureMetaData;
+
+        expect(coreService.getMetaDataSection(MetaSectionTypes.structure)).toBe(expectedStructureMetaData);
+    });
+
+    describe('BEFORE initial data binding', () => {
+        it('... should have structureInfoHeader', () => {
+            expect(component.structureInfoHeader).toBeDefined();
+            expect(component.structureInfoHeader).toBe(
+                expectedStructureInfoHeader,
+                `should be ${expectedStructureInfoHeader}`
+            );
+        });
+
+        describe('#provideMetaData', () => {
+            it('... should not have been called', () => {
+                expect(component.provideMetaData).not.toHaveBeenCalled();
+            });
+
+            it('... should not have structureMetaData', () => {
+                expect(component.structureMetaData).toBeUndefined('should be undefined');
+            });
+        });
+
+        describe('VIEW', () => {
+            it('... should contain 1 div.card with div.card-body', () => {
+                getAndExpectDebugElementByCss(compDe, 'div.card', 1, 1);
+                getAndExpectDebugElementByCss(compDe, 'div.card div.card-body', 1, 1);
+            });
+
+            it('... should contain one `h5` header and 4 `p` elements in div.card-body', () => {
+                getAndExpectDebugElementByCss(compDe, 'div.card-body h5#awg-structure-info-header', 1, 1);
+                getAndExpectDebugElementByCss(compDe, 'div.card-body p', 4, 4);
+            });
+
+            it('... should not render `structureInfoHeader` yet', () => {
+                const headerDes = getAndExpectDebugElementByCss(compDe, 'h5#awg-structure-info-header', 1, 1);
+                const headerEl = headerDes[0].nativeElement;
+
+                expect(headerEl).toBeDefined();
+                expect(headerEl.textContent).toBe('', 'should be empty string');
+            });
+
+            it('... should not render author information yet', () => {
+                const authorDes = getAndExpectDebugElementByCss(compDe, 'span.awg-structure-info-author a', 1, 1);
+                const authorEl = authorDes[0].nativeElement;
+
+                expect(authorEl).toBeDefined();
+                expect(authorEl.href).toBe('', 'should be empty string');
+                expect(authorEl.innerHTML).toBe('', 'should be empty string');
+            });
+
+            it('... should not render last modification date yet', () => {
+                const dateDes = getAndExpectDebugElementByCss(compDe, 'span#awg-structure-info-lastmodified', 1, 1);
+                const dateEl = dateDes[0].nativeElement;
+
+                expect(dateEl.textContent).toBeDefined();
+                expect(dateEl.textContent).toBe('', 'should be empty string');
+            });
+        });
+    });
+
+    describe('AFTER initial data binding', () => {
+        beforeEach(() => {
+            // mock the call to the meta service in #provideMetaData
+            component.structureMetaData = mockCoreService.getMetaDataSection(MetaSectionTypes.structure);
+
+            // trigger initial data binding
+            fixture.detectChanges();
+        });
+
+        describe('#provideMetaData', () => {
+            it('... should have been called', () => {
+                expect(component.provideMetaData).toHaveBeenCalled();
+            });
+
+            it('... should return structureMetaData', () => {
+                expect(component.structureMetaData).toBeDefined();
+                expect(component.structureMetaData).toBe(expectedStructureMetaData);
+            });
+        });
+
+        describe('VIEW', () => {
+            it('... should render `structureInfoHeader`', () => {
+                const headerDes = getAndExpectDebugElementByCss(compDe, 'h5#awg-structure-info-header', 1, 1);
+                const headerEl = headerDes[0].nativeElement;
+
+                expect(headerEl).toBeDefined();
+                expect(headerEl.textContent).toBe(
+                    expectedStructureInfoHeader,
+                    `should be ${expectedStructureInfoHeader}`
+                );
+            });
+
+            it('should render author information', () => {
+                const expectedAuthor = expectedStructureMetaData.authors[0];
+
+                const authorDes = getAndExpectDebugElementByCss(compDe, 'span.awg-structure-info-author a', 1, 1);
+                const authorEl = authorDes[0].nativeElement;
+
+                expect(authorEl).toBeDefined();
+                expect(authorEl.href).toBe(expectedAuthor.contactUrl, `should be ${expectedAuthor.contactUrl}`);
+                expect(authorEl.innerHTML).toBe(expectedAuthor.name, `should be ${expectedAuthor.name}`);
+            });
+
+            it('should render last modification date', () => {
+                const expectedLastModified = expectedStructureMetaData.lastModified;
+
+                const lastmodDes = getAndExpectDebugElementByCss(compDe, 'span#awg-structure-info-lastmodified', 1, 1);
+                const lastmodEl = lastmodDes[0].nativeElement;
+
+                expect(lastmodEl.textContent).toBeDefined();
+                expect(lastmodEl.textContent).toContain(expectedLastModified, `should contain ${expectedLastModified}`);
+            });
+        });
+    });
 });
diff --git a/src/app/side-info/structure-info/structure-info.component.ts b/src/app/side-info/structure-info/structure-info.component.ts
index f8c183197e..23dc971f2b 100644
--- a/src/app/side-info/structure-info/structure-info.component.ts
+++ b/src/app/side-info/structure-info/structure-info.component.ts
@@ -1,27 +1,64 @@
-import { Component, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 
-import { Meta } from '@awg-core/core-models';
+import { MetaSectionTypes, MetaStructure } from '@awg-core/core-models';
 import { CoreService } from '@awg-core/services';
 
+/**
+ * The StructureInfo component.
+ *
+ * It contains the side-info section of the structure view
+ * showing author and last modification date information.
+ */
 @Component({
     selector: 'awg-structure-info',
     templateUrl: './structure-info.component.html',
-    styleUrls: ['./structure-info.component.css']
+    styleUrls: ['./structure-info.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class StructureInfoComponent implements OnInit {
-    meta: Meta;
-    author: string;
-    lastModified: string;
+    /**
+     * Public variable: structureInfoHeader.
+     *
+     * It keeps the header for the structure-info.
+     */
+    structureInfoHeader = 'Strukturmodell';
 
+    /**
+     * Public variable: structureMetaData.
+     *
+     * It keeps the meta data for the structure info.
+     */
+    structureMetaData: MetaStructure;
+
+    /**
+     * Constructor of the StructureInfoComponent.
+     *
+     * It declares a private CoreService instance
+     * to get the meta data.
+     *
+     * @param {CoreService} coreService Instance of the CoreService.
+     */
     constructor(private coreService: CoreService) {}
 
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {
         this.provideMetaData();
     }
 
+    /**
+     * Public method: provideMetaData.
+     *
+     * It calls the CoreService to provide
+     * the meta data for the structure info.
+     *
+     * @returns {void} Sets the structureMetaData variable.
+     */
     provideMetaData(): void {
-        this.meta = this.coreService.getMetaData();
-        this.author = this.meta.structure.author;
-        this.lastModified = this.meta.structure.lastModified;
+        this.structureMetaData = this.coreService.getMetaDataSection(MetaSectionTypes.structure);
     }
 }
diff --git a/src/app/views/contact-view/contact-routing.module.ts b/src/app/views/contact-view/contact-routing.module.ts
index 85c89fecec..5384420be5 100644
--- a/src/app/views/contact-view/contact-routing.module.ts
+++ b/src/app/views/contact-view/contact-routing.module.ts
@@ -3,6 +3,7 @@ import { Routes, RouterModule } from '@angular/router';
 
 import { ContactViewComponent } from '@awg-views/contact-view/contact-view.component';
 
+/* routes of the ContactModule */
 const contactRoutes: Routes = [
     {
         path: '',
@@ -10,10 +11,19 @@ const contactRoutes: Routes = [
     }
 ];
 
+/**
+ * Routed components of the {@link ContactModule}:
+ * {@link ContactViewComponent}.
+ */
+export const routedContactComponents = [ContactViewComponent];
+
+/**
+ * Contact module routing.
+ *
+ * It activates the contactRoutes.
+ */
 @NgModule({
     imports: [RouterModule.forChild(contactRoutes)],
     exports: [RouterModule]
 })
 export class ContactRoutingModule {}
-
-export const routedComponents = [ContactViewComponent];
diff --git a/src/app/views/contact-view/contact-view.component.html b/src/app/views/contact-view/contact-view.component.html
index e588c51f67..40afd48e62 100644
--- a/src/app/views/contact-view/contact-view.component.html
+++ b/src/app/views/contact-view/contact-view.component.html
@@ -1,6 +1,6 @@
 <!-- content: contact -->
 
-<!-- heading -->
+<!-- citation -->
 <!-- citation heading -->
 <awg-heading [title]="citationTitle" [id]="citationId"></awg-heading>
 
@@ -10,59 +10,82 @@
 
     <p class="italic">Website:</p>
     <p class="awg-citation-text">
-        Anton Webern Gesamtausgabe. Projekt-Website:
-        <a target="_blank" ref="noopener noreferrer" href="{{ metaData?.page?.webernUrl }}">
-            {{ metaData?.page?.webernUrl }} </a
+        {{ pageMetaData.awgProjectName }}. Projekt-Website:
+        <a target="_blank" ref="noopener noreferrer" href="{{ pageMetaData?.awgProjectUrl }}">
+            {{ pageMetaData?.awgProjectUrl }} </a
         >, abgerufen am <span class="awg-citation-date">{{ today | date: dateFormat }}</span
         >.
     </p>
 
     <p class="italic">Online-Edition:</p>
     <p class="awg-citation-text">
-        Anton Webern Gesamtausgabe. Online-Edition (Version
-        <span class="awg-citation-version">{{ metaData?.page?.version }}</span> vom
-        <span class="awg-citation-version-release">{{ metaData?.page?.versionReleaseDate }}</span
+        {{ pageMetaData.awgProjectName }}. Online-Edition (Version
+        <span class="awg-citation-version">{{ pageMetaData?.version }}</span> vom
+        <span class="awg-citation-version-release">{{ pageMetaData?.versionReleaseDate }}</span
         >):
-        <a target="_blank" ref="noopener noreferrer" href="{{ metaData?.page?.editionUrl }}">
-            {{ metaData?.page?.editionUrl }} </a
+        <a target="_blank" ref="noopener noreferrer" href="{{ pageMetaData?.awgAppUrl }}">
+            {{ pageMetaData?.awgAppUrl }} </a
         >, abgerufen am <span class="awg-citation-date">{{ today | date: dateFormat }}</span
         >.
     </p>
 </div>
 
-<!-- masthead -->
-<!-- masthead heading -->
-<awg-heading [title]="mastHeadTitle" [id]="mastHeadId"></awg-heading>
+<!-- documentation -->
+<!-- documentation heading -->
+<awg-heading [title]="documentationTitle" [id]="documentationId"></awg-heading>
 
-<!-- masthead description -->
-<div class="awg-masthead-description">
+<!-- documentation description -->
+<div class="awg-documentation-description mb-5">
+    <p class="awg-documentation-text">
+        <span class="caps">GitHub:</span><br />
+        Repository unter:
+        <a target="_blank" ref="noopener noreferrer" href="{{ pageMetaData?.githubUrl }}">
+            {{ pageMetaData?.githubUrl }}
+        </a>
+    </p>
+
+    <p class="awg-documentation-text">
+        <span class="caps">Compodoc:</span><br />
+        Dokumentation von Struktur und Funktionalitäten der Angular App:
+        <a id="awg-compodoc" href="{{ pageMetaData?.compodocUrl }} " target="_blank" rel="noopener noreferrer">
+            awg-app documentation
+        </a>
+    </p>
+</div>
+
+<!-- imprint -->
+<!-- imprint heading -->
+<awg-heading [title]="imprintTitle" [id]="imprintId"></awg-heading>
+
+<!-- imprint description -->
+<div class="awg-imprint-description">
     <p>
         <span class="caps">Herausgeber:</span><br />
-        Anton Webern Gesamtausgabe<br />
-        Musikwissenschaftliches Seminar der Universität Basel<br />
-        Petersgraben 27/29<br />
-        CH-4051 Basel<br />
-        Schweiz<br /><br />
+        {{ pageMetaData.awgProjectName }}<br />
+        {{ contactMetaData.address.institution }}<br />
+        {{ contactMetaData.address.street }}<br />
+        {{ contactMetaData.address.postalCode }}&nbsp;{{ contactMetaData.address.city }}<br />
+        {{ contactMetaData.address.country }}<br /><br />
     </p>
 
     <p>
         <span class="caps">Konzept:</span><br />
-        Anton Webern Gesamtausgabe<br /><br />
+        {{ pageMetaData.awgProjectName }}<br /><br />
     </p>
     <p>
         <span class="caps">Texte/Inhalte:</span><br />
-        Die Verantwortung für die Inhalte der Website liegt bei der Anton Webern Gesamtausgabe. Bei inhaltlichen Fragen
-        wenden Sie sich bitte an die unter Kontakt angegebene Adresse.<br /><br />
+        Die Verantwortung für die Inhalte der Website liegt bei der {{ pageMetaData.awgProjectName }}. Bei inhaltlichen
+        Fragen wenden Sie sich bitte an die unter Kontakt angegebene Adresse.<br /><br />
     </p>
     <p>
         <span class="caps">Materialien, Notentexte und Bilder (vgl. Lizenzierung):</span><br />
-        Digitales Archiv der Anton Webern Gesamtausgabe<br />
-        Online-Edition der Anton Webern Gesamtausgabe<br /><br />
+        Digitales Archiv der {{ pageMetaData.awgProjectName }}<br />
+        Online-Edition der {{ pageMetaData.awgProjectName }}<br /><br />
     </p>
     <p>
         <span class="caps">Programmierung &amp; Webdesign:</span><br />
         Stefan Münnich<br />
-        Wissenschaftlicher Mitarbeiter der Anton Webern Gesamtausgabe, Basel<br /><a
+        Wissenschaftlicher Mitarbeiter der {{ pageMetaData.awgProjectName }}, Basel<br /><a
             href="mailto:stefan.muennich@unibas.ch"
             >stefan.muennich [at] unibas [dot] ch</a
         ><br /><br />
@@ -74,21 +97,21 @@
     <p><span class="caps">Disclaimer/Haftungserklärung:</span><br /></p>
     <p class="italic">Urheberrecht und Lizenzierung:</p>
     <p>
-        Sämtliche im Rahmen der Anton Webern Gesamtausgabe erarbeiteten und auf ihrer Website oder ihrer Online-Edition
-        veröffentlichten Inhalte sowie auch alle Inhalte, die von der Website oder der Online-Edition der Anton Webern
-        Gesamtausgabe aus auf der wissenschaftlichen Plattform KNORA/SALSAH (Projektbereich der Anton Webern
-        Gesamtausgabe) für den Nutzer zugänglich sind, sind urheberrechtlich geschützt und werden – sofern nicht anders
-        deklariert – zu den Bedingungen der Creative Commons-Lizenz „Namensnennung – Nicht kommerziell – Keine
+        Sämtliche im Rahmen der {{ pageMetaData.awgProjectName }} erarbeiteten und auf ihrer Website oder ihrer
+        Online-Edition veröffentlichten Inhalte sowie auch alle Inhalte, die von der Website oder der Online-Edition der
+        Anton Webern Gesamtausgabe aus auf der wissenschaftlichen Plattform KNORA/SALSAH (Projektbereich der Anton
+        Webern Gesamtausgabe) für den Nutzer zugänglich sind, sind urheberrechtlich geschützt und werden – sofern nicht
+        anders deklariert – zu den Bedingungen der Creative Commons-Lizenz „Namensnennung – Nicht kommerziell – Keine
         Bearbeitungen 4.0 International" (<a
             target="_blank"
             ref="noopener noreferrer"
             href="https://creativecommons.org/licenses/by-nc-nd/4.0/deed.de"
             >CC-BY-NC-ND-4.0</a
         >) zur Verfügung gestellt. Jede davon abweichende Verwertung bedarf der vorherigen schriftlichen Zustimmung
-        durch den jeweiligen Rechteinhaber. Allfällige Bewilligungsgesuche sind an die Anton Webern Gesamtausgabe zu
-        richten (Kontakt). Alle Rechte an zugänglich gemachten externen Bildinhalten verbleiben bei den
-        Privateigentümern bzw. den archivierenden Institutionen, bei denen die Rechte für eine allfällige
-        Weiterverwendung einzuholen sind.
+        durch den jeweiligen Rechteinhaber. Allfällige Bewilligungsgesuche sind an die
+        {{ pageMetaData.awgProjectName }} zu richten (Kontakt). Alle Rechte an zugänglich gemachten externen
+        Bildinhalten verbleiben bei den Privateigentümern bzw. den archivierenden Institutionen, bei denen die Rechte
+        für eine allfällige Weiterverwendung einzuholen sind.
     </p>
 
     <p>
@@ -100,31 +123,31 @@
 
     <p class="italic">Externe Links:</p>
     <p>
-        Die Anton Webern Gesamtausgabe hat keinen Einfluss auf und übernimmt keine Verantwortung für die Inhalte der von
-        ihrer Website, von ihrer Online-Edition oder von der wissenschaftlichen Plattform KNORA/SALSAH (Projektbereich
-        der Anton Webern Gesamtausgabe) aus verlinkten externen Internetseiten. Eine Prüfung bei der Verlinkung ergab
-        keine strafbaren Inhalte auf diesen Seiten. Alle Linkangaben sind ohne Gewähr. Seitenaufrufe externer Seiten
-        über diese Links erfolgen auf eigene Gefahr. Dies gilt für alle Links auf der Website und der Online-Edition der
-        Anton Webern Gesamtausgabe sowie auf der wissenschaftlichen Plattform KNORA/SALSAH (Projektbereich der Anton
-        Webern Gesamtausgabe).
+        Die {{ pageMetaData.awgProjectName }} hat keinen Einfluss auf und übernimmt keine Verantwortung für die Inhalte
+        der von ihrer Website, von ihrer Online-Edition oder von der wissenschaftlichen Plattform KNORA/SALSAH
+        (Projektbereich der {{ pageMetaData.awgProjectName }}) aus verlinkten externen Internetseiten. Eine Prüfung bei
+        der Verlinkung ergab keine strafbaren Inhalte auf diesen Seiten. Alle Linkangaben sind ohne Gewähr.
+        Seitenaufrufe externer Seiten über diese Links erfolgen auf eigene Gefahr. Dies gilt für alle Links auf der
+        Website und der Online-Edition der {{ pageMetaData.awgProjectName }} sowie auf der wissenschaftlichen Plattform
+        KNORA/SALSAH (Projektbereich der Anton Webern Gesamtausgabe).
     </p>
 
     <p class="italic">Haftungserklärung:</p>
     <p>
-        Die Anton Webern Gesamtausgabe bemüht sich um richtige und aktualisierte Informationen auf ihrer Website und
-        ihrer Online-Edition, übernimmt jedoch keinerlei Garantien oder Zusicherungen betreffend der Vollständigkeit der
-        auf dieser enthaltenen bzw. referenzierten Informationen. Prinzipiell erfolgen Zugang, Benutzung und
-        Inanspruchnahme der Dienstleistungen der Website der Anton Webern Gesamtausgabe ausschließlich auf eigenes
-        Risiko des Nutzers. Weder die Gesamtausgabe noch eine von ihr beigezogene, in Herstellung, Informationseingabe
-        und Informationsvermittlung der Website involvierte Hilfsperson sind in irgendeiner Form haftbar für etwaige
-        Schäden, die im Zusammenhang mit Zugang, Benutzung oder möglichen Störungen beim Gebrauch der Website auftreten
-        könnten.
+        Die {{ pageMetaData.awgProjectName }} bemüht sich um richtige und aktualisierte Informationen auf ihrer Website
+        und ihrer Online-Edition, übernimmt jedoch keinerlei Garantien oder Zusicherungen betreffend der Vollständigkeit
+        der auf dieser enthaltenen bzw. referenzierten Informationen. Prinzipiell erfolgen Zugang, Benutzung und
+        Inanspruchnahme der Dienstleistungen der Website der {{ pageMetaData.awgProjectName }} ausschließlich auf
+        eigenes Risiko des Nutzers. Weder die Gesamtausgabe noch eine von ihr beigezogene, in Herstellung,
+        Informationseingabe und Informationsvermittlung der Website involvierte Hilfsperson sind in irgendeiner Form
+        haftbar für etwaige Schäden, die im Zusammenhang mit Zugang, Benutzung oder möglichen Störungen beim Gebrauch
+        der Website auftreten könnten.
     </p>
 
     <p class="italic">Google Analytics:</p>
     <p>
-        Die Anton Webern Gesamtausgabe setzt auf Grundlage ihrer berechtigten Interessen (d.h. Interesse an der Analyse
-        und Optimierung unseres Onlineangebotes im Sinne des Art.
+        Die {{ pageMetaData.awgProjectName }} setzt auf Grundlage ihrer berechtigten Interessen (d.h. Interesse an der
+        Analyse und Optimierung unseres Onlineangebotes im Sinne des Art.
         <a target="_blank" ref="noopener noreferrer" href="https://dejure.org/gesetze/DSGVO/6.html">6</a> Abs. 1 lit. f.
         DSGVO) Google Analytics, einen Webanalysedienst der Google LLC („Google“) ein. Google verwendet Cookies. Die
         durch das Cookie erzeugten Informationen über Benutzung des Onlineangebotes durch die Nutzer werden in der Regel
@@ -150,10 +173,10 @@
     </p>
 
     <p>
-        Die Anton Webern Gesamtausgabe setzt Google Analytics nur mit aktivierter IP-Anonymisierung ein. Das bedeutet,
-        die IP-Adresse der Nutzer wird von Google innerhalb von Mitgliedstaaten der Europäischen Union oder in anderen
-        Vertragsstaaten des Abkommens über den Europäischen Wirtschaftsraum gekürzt. Nur in Ausnahmefällen wird die
-        volle IP-Adresse an einen Server von Google in den USA übertragen und dort gekürzt.
+        Die {{ pageMetaData.awgProjectName }} setzt Google Analytics nur mit aktivierter IP-Anonymisierung ein. Das
+        bedeutet, die IP-Adresse der Nutzer wird von Google innerhalb von Mitgliedstaaten der Europäischen Union oder in
+        anderen Vertragsstaaten des Abkommens über den Europäischen Wirtschaftsraum gekürzt. Nur in Ausnahmefällen wird
+        die volle IP-Adresse an einen Server von Google in den USA übertragen und dort gekürzt.
     </p>
 
     <p>
diff --git a/src/app/views/contact-view/contact-view.component.spec.ts b/src/app/views/contact-view/contact-view.component.spec.ts
index 05b2ac2d45..24f0422e7d 100644
--- a/src/app/views/contact-view/contact-view.component.spec.ts
+++ b/src/app/views/contact-view/contact-view.component.spec.ts
@@ -3,7 +3,6 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { Component, DebugElement, Input } from '@angular/core';
 import { DatePipe } from '@angular/common';
 import { Router } from '@angular/router';
-import Spy = jasmine.Spy;
 
 import {
     expectSpyCall,
@@ -11,11 +10,12 @@ import {
     getAndExpectDebugElementByDirective
 } from '@testing/expect-helper';
 
-import { Meta } from '@awg-core/core-models';
+import { MetaContact, MetaPage, MetaSectionTypes } from '@awg-core/core-models';
 import { METADATA } from '@awg-core/mock-data';
 import { CoreService } from '@awg-core/services';
 
 import { ContactViewComponent } from './contact-view.component';
+import Spy = jasmine.Spy;
 
 // mock heading component
 @Component({ selector: 'awg-heading', template: '' })
@@ -39,16 +39,20 @@ describe('ContactViewComponent (DONE)', () => {
     let mockRouter;
 
     let expectedToday;
-    let expectedMetaData: Meta;
-    const expectedMastHeadTitle = 'Impressum';
-    const expectedMastHeadId = 'awg-masthead';
+    let expectedPageMetaData: MetaPage;
+    let expectedContactMetaData: MetaContact;
+
+    const expectedImprintTitle = 'Impressum';
+    const expectedImprintId = 'awg-imprint';
     const expectedCitationTitle = 'Zitation';
     const expectedCitationId = 'awg-citation';
+    const expectedDocumentationTitle = 'Dokumentation';
+    const expectedDocumentationId = 'awg-documentation';
     const expectedDateFormat = 'd. MMMM yyyy';
 
     beforeEach(async(() => {
         // mock service for test purposes
-        mockCoreService = { getMetaData: () => expectedMetaData };
+        mockCoreService = { getMetaDataSection: key => METADATA[key] };
 
         // router spy object
         mockRouter = jasmine.createSpyObj('Router', ['navigate']);
@@ -66,7 +70,8 @@ describe('ContactViewComponent (DONE)', () => {
         compEl = compDe.nativeElement;
 
         // test data
-        expectedMetaData = METADATA;
+        expectedPageMetaData = METADATA[MetaSectionTypes.page];
+        expectedContactMetaData = METADATA[MetaSectionTypes.contact];
 
         // spies on component functions
         // `.and.callThrough` will track the spy down the nested describes, see
@@ -84,26 +89,29 @@ describe('ContactViewComponent (DONE)', () => {
         expect(mockCoreService === coreService).toBe(false);
 
         // changing the mock service has no effect on the injected service
-        const changedMetaData = new Meta();
-        changedMetaData.page = {
+        let changedPageMetaData = new MetaPage();
+        changedPageMetaData = {
             yearStart: 2015,
-            yearRecent: 2018,
-            editionUrl: '',
-            webernUrl: '',
+            yearCurrent: 2018,
+            awgAppUrl: '',
+            compodocUrl: '',
+            githubUrl: '',
+            awgProjectUrl: '',
+            awgProjectName: '',
             version: '0.2.1',
             versionReleaseDate: '20. Oktober 2018'
         };
-        mockCoreService.getMetaData = () => changedMetaData;
-        expect(coreService.getMetaData()).toBe(expectedMetaData);
+        mockCoreService.getMetaDataSection = () => changedPageMetaData;
+        expect(coreService.getMetaDataSection(MetaSectionTypes.page)).toBe(expectedPageMetaData);
     });
 
     describe('BEFORE initial data binding', () => {
-        it('should have masthead title and id', () => {
-            expect(component.mastHeadTitle).toBeDefined();
-            expect(component.mastHeadTitle).toBe(expectedMastHeadTitle);
+        it('should have imprint title and id', () => {
+            expect(component.imprintTitle).toBeDefined();
+            expect(component.imprintTitle).toBe(expectedImprintTitle);
 
-            expect(component.mastHeadId).toBeDefined();
-            expect(component.mastHeadId).toBe(expectedMastHeadId);
+            expect(component.imprintId).toBeDefined();
+            expect(component.imprintId).toBe(expectedImprintId);
         });
 
         it('should have citation title and id', () => {
@@ -114,6 +122,14 @@ describe('ContactViewComponent (DONE)', () => {
             expect(component.citationId).toBe(expectedCitationId);
         });
 
+        it('should have documentation title and id', () => {
+            expect(component.documentationTitle).toBeDefined();
+            expect(component.documentationTitle).toBe(expectedDocumentationTitle);
+
+            expect(component.documentationId).toBeDefined();
+            expect(component.documentationId).toBe(expectedDocumentationId);
+        });
+
         it('should have dateFormat', () => {
             expect(component.dateFormat).toBeDefined();
             expect(component.dateFormat).toBe(expectedDateFormat);
@@ -132,13 +148,14 @@ describe('ContactViewComponent (DONE)', () => {
         });
 
         it('should not have metadata nor `today`', () => {
-            expect(component.metaData).toBeUndefined('should be undefined');
+            expect(component.pageMetaData).toBeUndefined('should be undefined');
+            expect(component.contactMetaData).toBeUndefined('should be undefined');
             expect(component.today).toBeUndefined('should be undefined');
         });
 
         describe('VIEW', () => {
-            it('... should contain two heading component (stubbed)', () => {
-                getAndExpectDebugElementByDirective(compDe, HeadingStubComponent, 2, 2);
+            it('... should contain 3 heading components (stubbed)', () => {
+                getAndExpectDebugElementByDirective(compDe, HeadingStubComponent, 3, 3);
             });
 
             it('... should contain 1 `div.awg-citation-description` with 5 `p` elements', () => {
@@ -146,9 +163,14 @@ describe('ContactViewComponent (DONE)', () => {
                 getAndExpectDebugElementByCss(compDe, 'div.awg-citation-description > p', 5, 5);
             });
 
-            it('... should contain 1 `div.awg-masthead-description` with 5 `p` elements', () => {
-                getAndExpectDebugElementByCss(compDe, 'div.awg-masthead-description', 1, 1);
-                getAndExpectDebugElementByCss(compDe, 'div.awg-masthead-description > p', 5, 5);
+            it('... should contain 1 `div.awg-documentation-description` with 2 `p` elements', () => {
+                getAndExpectDebugElementByCss(compDe, 'div.awg-documentation-description', 1, 1);
+                getAndExpectDebugElementByCss(compDe, 'div.awg-documentation-description > p', 2, 2);
+            });
+
+            it('... should contain 1 `div.awg-imprint-description` with 5 `p` elements', () => {
+                getAndExpectDebugElementByCss(compDe, 'div.awg-imprint-description', 1, 1);
+                getAndExpectDebugElementByCss(compDe, 'div.awg-imprint-description > p', 5, 5);
             });
 
             it('... should contain 1 `div#awg-disclaimer` with 17 `p` elements', () => {
@@ -157,7 +179,7 @@ describe('ContactViewComponent (DONE)', () => {
             });
 
             it('... should not pass down `title` and `id` to heading components', () => {
-                const headingDes = getAndExpectDebugElementByDirective(compDe, HeadingStubComponent, 2, 2);
+                const headingDes = getAndExpectDebugElementByDirective(compDe, HeadingStubComponent, 3, 3);
                 const headingCmps = headingDes.map(de => de.injector.get(HeadingStubComponent) as HeadingStubComponent);
 
                 expect(headingCmps[0].title).toBeUndefined();
@@ -165,6 +187,9 @@ describe('ContactViewComponent (DONE)', () => {
 
                 expect(headingCmps[1].title).toBeUndefined();
                 expect(headingCmps[1].id).toBeUndefined();
+
+                expect(headingCmps[2].title).toBeUndefined();
+                expect(headingCmps[2].id).toBeUndefined();
             });
 
             it('... should not render `version`, `versionReleaseDate` and `today` yet', () => {
@@ -197,7 +222,8 @@ describe('ContactViewComponent (DONE)', () => {
     describe('AFTER initial data binding', () => {
         beforeEach(() => {
             // mock the call to the meta service in #provideMetaData
-            component.metaData = mockCoreService.getMetaData();
+            component.pageMetaData = mockCoreService.getMetaDataSection(MetaSectionTypes.page);
+            component.contactMetaData = mockCoreService.getMetaDataSection(MetaSectionTypes.contact);
 
             // spy on Date.now() returning a mocked (fixed) date
             expectedToday = Date.now();
@@ -258,8 +284,11 @@ describe('ContactViewComponent (DONE)', () => {
             });
 
             it('... should return metadata', () => {
-                expect(component.metaData).toBeDefined();
-                expect(component.metaData).toBe(expectedMetaData);
+                expect(component.pageMetaData).toBeDefined();
+                expect(component.pageMetaData).toBe(expectedPageMetaData);
+
+                expect(component.contactMetaData).toBeDefined();
+                expect(component.contactMetaData).toBe(expectedContactMetaData);
             });
         });
 
@@ -271,7 +300,7 @@ describe('ContactViewComponent (DONE)', () => {
 
         describe('VIEW', () => {
             it('... should pass down `title` and `id` to heading components', () => {
-                const headingDes = getAndExpectDebugElementByDirective(compDe, HeadingStubComponent, 2, 2);
+                const headingDes = getAndExpectDebugElementByDirective(compDe, HeadingStubComponent, 3, 3);
                 const headingCmps = headingDes.map(de => de.injector.get(HeadingStubComponent) as HeadingStubComponent);
 
                 expect(headingCmps[0].title).toBeTruthy();
@@ -281,10 +310,19 @@ describe('ContactViewComponent (DONE)', () => {
                 expect(headingCmps[0].id).toBe(expectedCitationId, `should have id: ${expectedCitationId}`);
 
                 expect(headingCmps[1].title).toBeTruthy();
-                expect(headingCmps[1].title).toBe(expectedMastHeadTitle, `should have title: ${expectedMastHeadTitle}`);
+                expect(headingCmps[1].title).toBe(
+                    expectedDocumentationTitle,
+                    `should have title: ${expectedDocumentationTitle}`
+                );
 
                 expect(headingCmps[1].id).toBeTruthy();
-                expect(headingCmps[1].id).toBe(expectedMastHeadId, `should have id: ${expectedMastHeadId}`);
+                expect(headingCmps[1].id).toBe(expectedDocumentationId, `should have id: ${expectedDocumentationId}`);
+
+                expect(headingCmps[2].title).toBeTruthy();
+                expect(headingCmps[2].title).toBe(expectedImprintTitle, `should have title: ${expectedImprintTitle}`);
+
+                expect(headingCmps[2].id).toBeTruthy();
+                expect(headingCmps[2].id).toBe(expectedImprintId, `should have id: ${expectedImprintId}`);
             });
 
             it('... should render `version`, `versionReleaseDate` and `today`', () => {
@@ -305,14 +343,14 @@ describe('ContactViewComponent (DONE)', () => {
                 // check output
                 expect(versionEl).toBeDefined();
                 expect(versionEl.textContent).toContain(
-                    expectedMetaData.page.version,
-                    `should contain ${expectedMetaData.page.version}`
+                    expectedPageMetaData.version,
+                    `should contain ${expectedPageMetaData.version}`
                 );
 
                 expect(releaseEl).toBeDefined();
                 expect(releaseEl.textContent).toContain(
-                    expectedMetaData.page.versionReleaseDate,
-                    `should contain ${expectedMetaData.page.versionReleaseDate}`
+                    expectedPageMetaData.versionReleaseDate,
+                    `should contain ${expectedPageMetaData.versionReleaseDate}`
                 );
 
                 expect(dateEl0).toBeDefined();
diff --git a/src/app/views/contact-view/contact-view.component.ts b/src/app/views/contact-view/contact-view.component.ts
index 67031fc915..bd6575b296 100644
--- a/src/app/views/contact-view/contact-view.component.ts
+++ b/src/app/views/contact-view/contact-view.component.ts
@@ -1,37 +1,135 @@
-import { Component, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 
 import { CoreService } from '@awg-core/services';
-import { Meta } from '@awg-core/core-models';
+import { MetaContact, MetaPage, MetaSectionTypes } from '@awg-core/core-models';
 
+/**
+ * The ContactView component.
+ *
+ * It contains the contact view section of the app
+ * with multiple  {@link HeadingComponent}s and
+ * sections for citation, documentation and imprint.
+ */
 @Component({
     selector: 'awg-contact-view',
     templateUrl: './contact-view.component.html',
-    styleUrls: ['./contact-view.component.css']
+    styleUrls: ['./contact-view.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class ContactViewComponent implements OnInit {
-    mastHeadTitle = 'Impressum';
-    mastHeadId = 'awg-masthead';
+    /**
+     * Public variable: imprintTitle.
+     *
+     * It keeps the title of the imprint section.
+     */
+    imprintTitle = 'Impressum';
 
+    /**
+     * Public variable: imprintId.
+     *
+     * It keeps the id of the imprint section.
+     */
+    imprintId = 'awg-imprint';
+
+    /**
+     * Public variable: citationTitle.
+     *
+     * It keeps the title of the citation section.
+     */
     citationTitle = 'Zitation';
+    /**
+     * Public variable: citationId.
+     *
+     * It keeps the id of the citation section.
+     */
     citationId = 'awg-citation';
 
-    metaData: Meta;
+    /**
+     * Public variable: documentationTitle.
+     *
+     * It keeps the title of the documentation section.
+     */
+    documentationTitle = 'Dokumentation';
+
+    /**
+     * Public variable: documentationId.
+     *
+     * It keeps the id of the documentation section.
+     */
+    documentationId = 'awg-documentation';
+
+    /**
+     * Public variable: contactMetaData.
+     *
+     * It keeps the contact meta data for the contact view.
+     */
+    contactMetaData: MetaContact;
+
+    /**
+     * Public variable: pageMetaData.
+     *
+     * It keeps the page meta data for the contact view.
+     */
+    pageMetaData: MetaPage;
+
+    /**
+     * Public variable: today.
+     *
+     * It keeps the current date for the contact view.
+     */
     today: number;
+
+    /**
+     * Public variable: dateFormat.
+     *
+     * It keeps the date format for the contact view.
+     */
     dateFormat = 'd. MMMM yyyy';
 
+    /**
+     * Constructor of the ContactViewComponent.
+     *
+     * It declares a private CoreService instance
+     * to get the meta data and a private Router instance.
+     *
+     * @param {CoreService} coreService Instance of the CoreService.
+     * @param {Router} router Instance of the Angular router.
+     */
     constructor(private coreService: CoreService, private router: Router) {}
 
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {
         this.routeToSidenav();
         this.provideMetaData();
         this.today = Date.now();
     }
 
+    /**
+     * Public method: provideMetaData.
+     *
+     * It calls the CoreService to provide
+     * the meta data for the contact view.
+     *
+     * @returns {void} Sets the pageMetaData variable.
+     */
     provideMetaData(): void {
-        this.metaData = this.coreService.getMetaData();
+        this.pageMetaData = this.coreService.getMetaDataSection(MetaSectionTypes.page);
+        this.contactMetaData = this.coreService.getMetaDataSection(MetaSectionTypes.contact);
     }
 
+    /**
+     * Public method: routeToSidenav.
+     *
+     * It activates the secondary outlet with the contact-info.
+     *
+     * @returns {void} Activates the contact-info side outlet.
+     */
     routeToSidenav(): void {
         // opens the side-info outlet while preserving the router fragment for scrolling
         this.router.navigate([{ outlets: { side: 'contactInfo' } }], {
diff --git a/src/app/views/contact-view/contact.module.ts b/src/app/views/contact-view/contact.module.ts
index 1d73e72581..74e3f50e21 100644
--- a/src/app/views/contact-view/contact.module.ts
+++ b/src/app/views/contact-view/contact.module.ts
@@ -1,10 +1,18 @@
 import { NgModule } from '@angular/core';
 import { SharedModule } from '@awg-shared/shared.module';
 
-import { ContactRoutingModule, routedComponents } from './contact-routing.module';
+/* Routing Module */
+import { ContactRoutingModule, routedContactComponents } from './contact-routing.module';
 
+/**
+ * The contact module.
+ *
+ * It embeds the {@link ContactViewComponent} and its
+ * [routing definition]{@link ContactRoutingModule}
+ * as well as the {@link SharedModule}.
+ */
 @NgModule({
     imports: [SharedModule, ContactRoutingModule],
-    declarations: [routedComponents]
+    declarations: [routedContactComponents]
 })
 export class ContactModule {}
diff --git a/src/app/views/data-view/data-outlets/bibliography/bibliography-detail/bibliography-detail.component.html b/src/app/views/data-view/data-outlets/bibliography/bibliography-detail/bibliography-detail.component.html
index e6d39f7076..780d792362 100644
--- a/src/app/views/data-view/data-outlets/bibliography/bibliography-detail/bibliography-detail.component.html
+++ b/src/app/views/data-view/data-outlets/bibliography/bibliography-detail/bibliography-detail.component.html
@@ -1 +1 @@
-<span [innerHtml]="bibItemDetail?.converted | bibFormat"></span>
+<span [innerHtml]="bibEntry$ | async | bibFormat"></span>
diff --git a/src/app/views/data-view/data-outlets/bibliography/bibliography-detail/bibliography-detail.component.spec.ts b/src/app/views/data-view/data-outlets/bibliography/bibliography-detail/bibliography-detail.component.spec.ts
index 9dd985b08b..f7ae3e7c4a 100644
--- a/src/app/views/data-view/data-outlets/bibliography/bibliography-detail/bibliography-detail.component.spec.ts
+++ b/src/app/views/data-view/data-outlets/bibliography/bibliography-detail/bibliography-detail.component.spec.ts
@@ -4,7 +4,7 @@ import { Observable, of as observableOf } from 'rxjs';
 
 import { BibliographyDetailComponent } from './bibliography-detail.component';
 import { BibliographyFormatPipe } from '../bibliography-format.pipe';
-import { BibEntry } from '../bibliography-entry';
+import { BibEntry } from '../bibliography-entry.model';
 
 import { BibliographyService } from '@awg-views/data-view/services';
 import { ConversionService } from '@awg-core/services';
@@ -34,7 +34,7 @@ describe('BibliographyDetailComponent', () => {
         // stub conversionService to return convertedBibItemDetail
         expectedConvertedBibItemDetail = new BibEntry('Test', 'Monographie', 'Tim Test', 'Testbuch', '2018');
         mockConversionService = {
-            convertObjectProperties: (data: ResourceFullResponseJson) => expectedConvertedBibItemDetail
+            convertObjectProperties: (resourceData: ResourceFullResponseJson) => expectedConvertedBibItemDetail
         };
 
         TestBed.configureTestingModule({
@@ -49,6 +49,9 @@ describe('BibliographyDetailComponent', () => {
     beforeEach(() => {
         fixture = TestBed.createComponent(BibliographyDetailComponent);
         component = fixture.componentInstance;
+
+        // test data
+        expectedObjId = '1234';
     });
 
     it('should create', () => {
@@ -56,25 +59,21 @@ describe('BibliographyDetailComponent', () => {
     });
 
     describe('BEFORE initial data binding', () => {
-        it('should not get objId input', () => {
+        it('should not have objId input', () => {
             expect(component.objId).toBeUndefined('should be undefined');
         });
     });
 
     describe('AFTER initial data binding', () => {
         beforeEach(() => {
-            // mock the inputs supplied by the parent component
-            expectedObjId = '1234';
-
             // simulate the parent setting the input properties
             component.objId = expectedObjId;
-            component.bibItemDetail.converted = expectedConvertedBibItemDetail;
 
             // trigger initial data binding
             fixture.detectChanges();
         });
 
-        it('should get objId input', () => {
+        it('should have objId input', () => {
             expect(component.objId).toBe(expectedObjId);
         });
     });
diff --git a/src/app/views/data-view/data-outlets/bibliography/bibliography-detail/bibliography-detail.component.ts b/src/app/views/data-view/data-outlets/bibliography/bibliography-detail/bibliography-detail.component.ts
index da5b127040..415c729aa3 100644
--- a/src/app/views/data-view/data-outlets/bibliography/bibliography-detail/bibliography-detail.component.ts
+++ b/src/app/views/data-view/data-outlets/bibliography/bibliography-detail/bibliography-detail.component.ts
@@ -1,45 +1,75 @@
-import { Component, OnInit, OnDestroy, Input } from '@angular/core';
+import { Component, OnInit, Input } from '@angular/core';
 
-import { Subscription } from 'rxjs';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 import { ResourceFullResponseJson } from '@awg-shared/api-objects';
-
 import { BibliographyService } from '@awg-views/data-view/services';
-import { ConversionService } from '@awg-core/services/conversion-service/conversion.service';
-
-class BibItemDetail {
-    subscription: Subscription;
-    body: ResourceFullResponseJson;
-    converted: any; // TODO#change to Type: BibEntry
-}
+import { ConversionService } from '@awg-core/services';
+import { BibEntry } from '../bibliography-entry.model';
 
+/**
+ * The BibliographyDetail component.
+ *
+ * It contains the bibliography item detail
+ * of the search view of the app.
+ */
 @Component({
     selector: 'awg-bibliography-detail',
     templateUrl: './bibliography-detail.component.html',
     styleUrls: ['./bibliography-detail.component.css']
 })
-export class BibliographyDetailComponent implements OnInit, OnDestroy {
+export class BibliographyDetailComponent implements OnInit {
+    /**
+     * Input variable: objId.
+     *
+     * It keeps the id of a resource object.
+     */
     @Input()
     objId: string;
 
-    bibItemDetail: BibItemDetail = new BibItemDetail();
+    /**
+     * Public variable: bibEntry$.
+     *
+     * Observable that keeps the bibEntry for the bibliography detail.
+     */
+    bibEntry$: Observable<BibEntry>;
 
+    /**
+     * Constructor of the BibliographyDetailComponent.
+     *
+     * It declares a private BibliographyService instance
+     * to get the bibliography item detail
+     * and a private ConversionService instance.
+     *
+     * @param {BibliographyService} bibliographyService Instance of the BibliographyService.
+     * @param {ConversionService} conversionService Instance of the ConversionService.
+     */
     constructor(private bibliographyService: BibliographyService, private conversionService: ConversionService) {}
 
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {
-        this.getBibItemDetails(this.objId);
-    }
-
-    getBibItemDetails(id: string): void {
-        this.bibItemDetail.subscription = this.bibliographyService.getBibliographyItemDetail(id).subscribe(data => {
-            this.bibItemDetail.body = { ...data };
-            this.bibItemDetail.converted = this.conversionService.convertObjectProperties(this.bibItemDetail.body);
-        });
+        this.getBibEntry(this.objId);
     }
 
-    ngOnDestroy() {
-        if (this.bibItemDetail.subscription) {
-            this.bibItemDetail.subscription.unsubscribe();
-        }
+    /**
+     * Public method: getBibEntry.
+     *
+     * It calls the BibliographyService to provide
+     * the data for the bibliography entry.
+     *
+     * @returns {void} Sets the bibEntry observable.
+     */
+    getBibEntry(id: string): void {
+        this.bibEntry$ = this.bibliographyService.getBibliographyItemDetail(id).pipe(
+            map((data: ResourceFullResponseJson) => {
+                return this.conversionService.convertObjectProperties(data);
+            })
+        );
     }
 }
diff --git a/src/app/views/data-view/data-outlets/bibliography/bibliography-entry.model.ts b/src/app/views/data-view/data-outlets/bibliography/bibliography-entry.model.ts
new file mode 100644
index 0000000000..75a0084a19
--- /dev/null
+++ b/src/app/views/data-view/data-outlets/bibliography/bibliography-entry.model.ts
@@ -0,0 +1,53 @@
+/* tslint:disable variable-name */
+
+/**
+ * The BibEntry class.
+ *
+ * It is used in the context of the bibliography
+ * to store the data of a bibliographic entry.
+ */
+export class BibEntry {
+    /**
+     * Constructor of the BibEntry class.
+     *
+     * It initializes the class with values
+     * from a given bibliographic item.
+     *
+     * @param {string} Kurztitel The given short title.
+     * @param {string} Typ The given type.
+     * @param {string} Author The given author.
+     * @param {string} Titel_selbst The given dependent title.
+     * @param {string} Publikationsdatum The given type.
+     * @param {string} [Titel_unselbst] The given optional independent title.
+     * @param {string} [Herausgeber] The given optional editor.
+     * @param {string} [unpubliziert] The given optional unpublished flag.
+     * @param {string} [Verlagsort] The given optional publication place.
+     * @param {string} [Verlag] The given optional publisher.
+     * @param {string} [Seitenangabe] The given optional page number.
+     * @param {string} [Reihentitel] The given optional series title.
+     * @param {string} [Versionsdatum] The given optional version date.
+     * @param {string} [Status] The given optional status.
+     * @param {string} [Quelle] The given optional source.
+     * @param {string} [Standort] The given optional location.
+     * @param {string} [Kommentar] The given optional comment.
+     */
+    constructor(
+        Kurztitel: string,
+        Typ: string,
+        Author: string,
+        Titel_selbst: string,
+        Publikationsdatum: string,
+        Titel_unselbst?: string,
+        Herausgeber?: string,
+        unpubliziert?: string,
+        Verlagsort?: string,
+        Verlag?: string,
+        Seitenangabe?: string,
+        Reihentitel?: string,
+        Versionsdatum?: string,
+        Status?: string,
+        Quelle?: string,
+        Standort?: string,
+        Kommentar?: string
+    ) {}
+}
diff --git a/src/app/views/data-view/data-outlets/bibliography/bibliography-entry.ts b/src/app/views/data-view/data-outlets/bibliography/bibliography-entry.ts
deleted file mode 100644
index d3617eb303..0000000000
--- a/src/app/views/data-view/data-outlets/bibliography/bibliography-entry.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/* tslint:disable variable-name */
-
-export class BibEntry {
-    constructor(
-        public Kurztitel: string,
-        public Typ: string,
-        public Author: string,
-        public Titel_selbst: string,
-        public Publikationsdatum: string,
-        public Titel_unselbst?: string,
-        public Herausgeber?: string,
-        public unpubliziert?: string,
-        public Verlagsort?: string,
-        public Verlag?: string,
-        public Seitenangabe?: string,
-        public Reihentitel?: string,
-        public Versionsdatum?: string,
-        public Status?: string,
-        public Quelle?: string,
-        public Standort?: string,
-        public Kommentar?: string
-    ) {}
-}
diff --git a/src/app/views/data-view/data-outlets/bibliography/bibliography-format.pipe.ts b/src/app/views/data-view/data-outlets/bibliography/bibliography-format.pipe.ts
index 5a70152bfc..cdac53b714 100644
--- a/src/app/views/data-view/data-outlets/bibliography/bibliography-format.pipe.ts
+++ b/src/app/views/data-view/data-outlets/bibliography/bibliography-format.pipe.ts
@@ -1,13 +1,38 @@
 import { Pipe, PipeTransform } from '@angular/core';
 
-import { BibEntry } from './bibliography-entry';
+import { BibEntry } from './bibliography-entry.model';
 
+/**
+ * The bibliography format pipe.
+ *
+ * It converts a {@link BibEntry} input into a formatted `BibEntry`.
+ *
+ * __Usage :__
+ *   `{{ bibEntry | bibFormat }}`
+ */
 @Pipe({
     name: 'bibFormat'
 })
 export class BibliographyFormatPipe implements PipeTransform {
+    /**
+     * Private variable: entry.
+     *
+     * It keeps the input BibEntry.
+     */
     private entry: BibEntry;
+
+    /**
+     * Private variable: formattedEntry.
+     *
+     * It keeps the formatted BibEntry.
+     */
     private formattedEntry: BibEntry;
+
+    /**
+     * Private array: formatFieldArr.
+     *
+     * It keeps the fields to be formatted.
+     */
     private formatFieldArr: Array<string> = [
         'Author',
         'Titel_unselbst',
@@ -20,17 +45,34 @@ export class BibliographyFormatPipe implements PipeTransform {
         'Seitenangabe'
     ];
 
+    /**
+     * Transform method of the BibliographyFormatPipe.
+     *
+     * @param {BibEntry} bibItem The input BibEntry to be piped.
+     *
+     * @returns {*} The formatted BibEntry.
+     */
     transform(bibItem: BibEntry): any {
         if (!bibItem) {
             return null;
         }
         this.entry = bibItem;
         this.formattedEntry = this.getFormatFields('edit', this.entry);
-        this.getFilteredValues(this.formattedEntry);
+        this.getFormattedValues(this.formattedEntry);
 
         return this.getFormatFields('output', this.formattedEntry);
     }
 
+    /**
+     * Private function: getFormatFields.
+     *
+     * It gets the fields to be formatted from {@link formatFieldArr}.
+     *
+     * @param {string} opt Options to be set: `output` or `edit`
+     * @param {BibEntry} entry The input BibEntry.
+     *
+     * @returns {*}
+     */
     private getFormatFields(opt: string, entry: BibEntry): any {
         let output: string | object = {};
         for (let i = 0; i < this.formatFieldArr.length; i++) {
@@ -45,50 +87,71 @@ export class BibliographyFormatPipe implements PipeTransform {
         return output;
     }
 
-    private getFilteredValues(entry: BibEntry) {
+    /**
+     * Private function: getFormattedValues.
+     *
+     * It separates the BibEntries object key-value pairs
+     * by their keys and requests them to be converted.
+     *
+     * @param {BibEntry} entry The input BibEntry.
+     *
+     * @returns {*}
+     */
+    private getFormattedValues(entry: BibEntry): any {
         Object.keys(entry).forEach(key => {
-            entry[key] = this.getFilteredValueByKey(entry, key);
+            entry[key] = this.getFormattedValueByKey(entry, key);
         });
         return entry;
     }
 
-    private getFilteredValueByKey(entry: BibEntry, key: string): string {
+    /**
+     * Private function: getFormattedValueByKey.
+     *
+     * It requests the designated conversion
+     * methods for the values of the BibEntry.
+     *
+     * @param {BibEntry} entry The input BibEntry.
+     * @param {string} key The key of a BibEntry key-value pair.
+     *
+     * @returns {string}
+     */
+    private getFormattedValueByKey(entry: BibEntry, key: string): string {
         let value = '';
         switch (key) {
             case 'Kurztitel':
-                value = this.filterBibTitleShort(entry[key]);
+                value = this.formatBibTitleShort(entry[key]);
                 break;
             case 'Author':
-                value = this.filterBibAuthor(entry[key]);
+                value = this.formatBibAuthor(entry[key]);
                 break;
             case 'Titel_selbst':
-                value = this.filterBibTitleIndep(entry[key]);
+                value = this.formatBibTitleIndep(entry[key]);
                 break;
             case 'Titel_unselbst':
-                value = this.filterBibTitleDep(entry[key]);
+                value = this.formatBibTitleDep(entry[key]);
                 break;
             case 'Herausgeber':
-                value = this.filterBibEditor(entry[key]);
+                value = this.formatBibEditor(entry[key]);
                 break;
             case 'unpubliziert':
-                value = this.filterBibUnpublished(entry[key]);
+                value = this.formatBibUnpublished(entry[key]);
                 break;
             case 'Verlagsort':
-                value = this.filterBibPubPlace(entry[key]);
+                value = this.formatBibPubPlace(entry[key]);
                 break;
             /* done in pubplace
              case 'publisher':
-             value = this.filterBibPublisher(bibItem[key]);
+             value = this.formatBibPublisher(bibItem[key]);
              break;
              */
             case 'Publikationsdatum':
-                value = this.filterBibPubDate(entry[key]);
+                value = this.formatBibPubDate(entry[key]);
                 break;
             case 'Reihentitel':
-                value = this.filterBibTitleSeries(entry[key]);
+                value = this.formatBibTitleSeries(entry[key]);
                 break;
             case 'Seitenangabe':
-                value = this.filterBibPages(entry[key]);
+                value = this.formatBibPages(entry[key]);
                 break;
             default:
                 value = entry[key];
@@ -96,13 +159,29 @@ export class BibliographyFormatPipe implements PipeTransform {
         return value;
     }
 
-    private filterBibTitleShort(shortTitle: string) {
-        const title: string = !shortTitle ? '' : shortTitle + ' | ';
-        return title;
+    /**
+     * Private function: formatBibTitleShort.
+     *
+     * It converts the short title of the BibEntry.
+     *
+     * @param {string} shortTitle The short title of the BibEntry.
+     *
+     * @returns {string} The formatted short title.
+     */
+    private formatBibTitleShort(shortTitle: string): string {
+        return !shortTitle ? '' : shortTitle + ' | ';
     }
 
-    // filter for authors in bibliography
-    private filterBibAuthor(authors: string | object) {
+    /**
+     * Private function: formatBibAuthor.
+     *
+     * It converts the author(s) of the BibEntry.
+     *
+     * @param {string} authors The author(s) of the BibEntry.
+     *
+     * @returns {string} The formatted author(s).
+     */
+    private formatBibAuthor(authors: string | object): string {
         if (!authors) {
             return '';
         }
@@ -126,24 +205,42 @@ export class BibliographyFormatPipe implements PipeTransform {
         return formattedAuthor;
     }
 
-    // filter for independent titles in bibliography
-    private filterBibTitleIndep(indepTitle: string) {
-        const formattedTitle: string = !indepTitle
-            ? ''
-            : this.entry['Typ'] !== 'Zeitschriftenartikel'
-            ? indepTitle + ', '
-            : indepTitle;
-        return formattedTitle;
+    /**
+     * Private function: formatBibTitleIndep.
+     *
+     * It converts the independent title(s) of the BibEntry.
+     *
+     * @param {string} indepTitle The independent title(s) of the BibEntry.
+     *
+     * @returns {string} The formatted independent title(s).
+     */
+    private formatBibTitleIndep(indepTitle: string): string {
+        return !indepTitle ? '' : this.entry['Typ'] !== 'Zeitschriftenartikel' ? indepTitle + ', ' : indepTitle;
     }
 
-    // filter for dependent titles in bibliography
-    private filterBibTitleDep(depTitle: string) {
-        const formattedTitle: string = !depTitle ? '' : '„' + depTitle + '“, in: ';
-        return formattedTitle;
+    /**
+     * Private function: formatBibTitleDep.
+     *
+     * It converts the dependent title(s) of the BibEntry.
+     *
+     * @param {string} depTitle The dependent title(s) of the BibEntry.
+     *
+     * @returns {string} The formatted dependent title(s).
+     */
+    private formatBibTitleDep(depTitle: string): string {
+        return !depTitle ? '' : '„' + depTitle + '“, in: ';
     }
 
-    // filter for editors in bibliography
-    private filterBibEditor(editors: string | object) {
+    /**
+     * Private function: formatBibEditor.
+     *
+     * It converts the editor(s) of the BibEntry.
+     *
+     * @param {string} editors The editor(s) of the BibEntry.
+     *
+     * @returns {string} The formatted editor(s).
+     */
+    private formatBibEditor(editors: string | object): string {
         if (!editors) {
             return '';
         }
@@ -155,7 +252,7 @@ export class BibliographyFormatPipe implements PipeTransform {
             // get further editor names
             const l: number = Object.keys(editors).length;
             for (let i = 1; i < l; i++) {
-                // last name seperated by "und", others by comma
+                // last name separated by "und", others by comma
                 const divider = i === l - 1 ? ' und ' : ', ';
                 formattedEditor += this.splitName(editors[i], divider);
             }
@@ -167,14 +264,29 @@ export class BibliographyFormatPipe implements PipeTransform {
         return formattedEditor;
     }
 
-    // filter for unpublished literature in bibliography
-    private filterBibUnpublished(unpub: string) {
-        const type: string = !unpub ? '' : unpub + ' ';
-        return type;
+    /**
+     * Private function: formatBibUnpublished.
+     *
+     * It converts the unpublished literature type (if any) of the BibEntry.
+     *
+     * @param {string} unpub The unpublished literature type of the BibEntry.
+     *
+     * @returns {string} The formatted unpublished literature type.
+     */
+    private formatBibUnpublished(unpub: string): string {
+        return !unpub ? '' : unpub + ' ';
     }
 
-    // filter for publication place in bilbiography
-    private filterBibPubPlace(pubPlace: string | object) {
+    /**
+     * Private function: formatBibPubPlace.
+     *
+     * It converts the publication place and publisher of the BibEntry.
+     *
+     * @param {string} pubPlace The publication place of the BibEntry.
+     *
+     * @returns {string} The formatted publication place and publisher.
+     */
+    private formatBibPubPlace(pubPlace: string | object): string {
         const pub = this.entry['Verlag'] ? this.entry['Verlag'] : null;
         if (!pubPlace) {
             // no place but publisher
@@ -250,25 +362,57 @@ export class BibliographyFormatPipe implements PipeTransform {
         return out;
     }
 
-    // filter for publisher in bibliography
-    private filterBibPublisher(pub: string) {
+    /**
+     * Private function: formatBibPublisher.
+     *
+     * It converts the publisher of the BibEntry.
+     *
+     * @param {string} pub The publisher of the BibEntry.
+     *
+     * @returns {string} The formatted publisher.
+     *
+     * DONE IN {@link formatBibPubPlace}.
+     */
+    private formatBibPublisher(pub: string): string {
         return '';
     }
 
-    // filter for date in bibliography
-    private filterBibPubDate(pubDate: string) {
-        const date = this.entry['Typ'] === 'Zeitschriftenartikel' ? ' (' + pubDate + ')' : ' ' + pubDate;
-        return date;
+    /**
+     * Private function: formatBibPubDate.
+     *
+     * It converts the publication date of the BibEntry.
+     *
+     * @param {string} pubDate The publication date of the BibEntry.
+     *
+     * @returns {string} The formatted publication date.
+     */
+    private formatBibPubDate(pubDate: string) {
+        return this.entry['Typ'] === 'Zeitschriftenartikel' ? ' (' + pubDate + ')' : ' ' + pubDate;
     }
 
-    // filter for series titles in bibliography
-    private filterBibTitleSeries(seriesTitle: string) {
-        const title: string = !seriesTitle ? '' : ' (' + seriesTitle + ')';
-        return title;
+    /**
+     * Private function: formatBibTitleSeries.
+     *
+     * It converts the series title of the BibEntry.
+     *
+     * @param {string} seriesTitle The series title of the BibEntry.
+     *
+     * @returns {string} The formatted series title.
+     */
+    private formatBibTitleSeries(seriesTitle: string): string {
+        return !seriesTitle ? '' : ' (' + seriesTitle + ')';
     }
 
-    // filter for pages in bibliography
-    private filterBibPages(pageNum: string | object) {
+    /**
+     * Private function: formatBibPages.
+     *
+     * It converts the page numbers of the BibEntry.
+     *
+     * @param {string} pageNum The page numbers of the BibEntry.
+     *
+     * @returns {string} The formatted page numbers.
+     */
+    private formatBibPages(pageNum: string | object): string {
         if (!pageNum) {
             return '';
         }
@@ -286,8 +430,18 @@ export class BibliographyFormatPipe implements PipeTransform {
         return pages;
     }
 
-    // splits array with names and defines the order of items (according to bibliography style)
-    private splitName(name, pre_delimiter) {
+    /**
+     * Private function: splitName.
+     *
+     * It splits a comma-separated name and defines the order
+     * of items (according to bibliography style).
+     *
+     * @param {string} name A name to be converted.
+     * @param {string} pre_delimiter The delimiter to appear before a name, e.g. a comma.
+     *
+     * @returns {string} The splitted name(s).
+     */
+    private splitName(name: string, pre_delimiter: string): string {
         let tmp = [];
         if (name.match(',')) {
             tmp = name.split(', ');
diff --git a/src/app/views/data-view/data-outlets/bibliography/bibliography-list/bibliography-list.component.html b/src/app/views/data-view/data-outlets/bibliography/bibliography-list/bibliography-list.component.html
index fd301782cb..ff72242ead 100644
--- a/src/app/views/data-view/data-outlets/bibliography/bibliography-list/bibliography-list.component.html
+++ b/src/app/views/data-view/data-outlets/bibliography/bibliography-list/bibliography-list.component.html
@@ -1,11 +1,12 @@
 <!-- content: bibliography list -->
 <ul class="bibliography">
-    <li *ngFor="let bibItem of bibList; trackBy: trackByItemId"
+    <li
+        *ngFor="let bibItem of bibList; trackBy: trackById"
         [class.selected]="bibItem === selectedBibItem"
-        (click)="selectItem(bibItem)">
-            <span class="badge">{{ bibItem.value[0] }}</span>
-            <awg-bibliography-detail *ngIf="bibItem.obj_id === selectedBibItem.obj_id"
-                [objId]="bibItem.obj_id">
-            </awg-bibliography-detail>
+        (click)="onItemSelect(bibItem)"
+    >
+        <span class="badge">{{ bibItem.value[0] }}</span>
+        <awg-bibliography-detail *ngIf="bibItem.obj_id === selectedBibItem.obj_id" [objId]="bibItem.obj_id">
+        </awg-bibliography-detail>
     </li>
 </ul>
diff --git a/src/app/views/data-view/data-outlets/bibliography/bibliography-list/bibliography-list.component.ts b/src/app/views/data-view/data-outlets/bibliography/bibliography-list/bibliography-list.component.ts
index f29dd44f28..86b1f9d42a 100644
--- a/src/app/views/data-view/data-outlets/bibliography/bibliography-list/bibliography-list.component.ts
+++ b/src/app/views/data-view/data-outlets/bibliography/bibliography-list/bibliography-list.component.ts
@@ -2,28 +2,77 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 
 import { SubjectItemJson } from '@awg-shared/api-objects';
 
+/**
+ * The BibliographyList component.
+ *
+ * It contains the bibliography list
+ * of the search view of the app with a
+ * {@link BibliographyDetailComponent}.
+ */
 @Component({
     selector: 'awg-bibliography-list',
     templateUrl: './bibliography-list.component.html',
     styleUrls: ['./bibliography-list.component.css']
 })
 export class BibliographyListComponent implements OnInit {
+    /**
+     * Input variable: bibList.
+     *
+     * It keeps the subject array of bibliography items.
+     */
     @Input()
     bibList: SubjectItemJson[];
+
+    /**
+     * Output variable: selectItemRequest.
+     *
+     * It keeps an event emitter for the selected bibliography item.
+     */
     @Output()
     selectItemRequest: EventEmitter<SubjectItemJson> = new EventEmitter();
-    selectedBibItem: SubjectItemJson = new SubjectItemJson();
 
-    constructor() {}
+    /**
+     * Public variable: selectedBibItem.
+     *
+     * It keeps the selected bibliography item.
+     */
+    selectedBibItem: SubjectItemJson = new SubjectItemJson();
 
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {}
 
-    selectItem(item: SubjectItemJson) {
+    /**
+     * Public method: onItemSelect.
+     *
+     * It emits a selected bibliography item
+     * to the {@link selectItemRequest}.
+     *
+     * @param {SubjectItemJson} item The given bibliography item.
+     *
+     * @returns {void} Emits the selected bibliography item.
+     */
+    onItemSelect(item: SubjectItemJson) {
         this.selectedBibItem = item;
         this.selectItemRequest.emit(item);
     }
 
-    trackByItemId(item): string {
+    /**
+     * Public method: trackById.
+     *
+     * It returns a unique identifier of a given item.
+     * Angular uses the value returned from
+     * tracking function to track items identity.
+     *
+     * @param {string} item The given item.
+     *
+     * @returns {string} The identifier of the item.
+     */
+    trackById(item): string {
         return item.obj_id;
     }
 }
diff --git a/src/app/views/data-view/data-outlets/bibliography/bibliography-routing.module.ts b/src/app/views/data-view/data-outlets/bibliography/bibliography-routing.module.ts
index cf475d976d..313acb4d6e 100644
--- a/src/app/views/data-view/data-outlets/bibliography/bibliography-routing.module.ts
+++ b/src/app/views/data-view/data-outlets/bibliography/bibliography-routing.module.ts
@@ -4,6 +4,7 @@ import { RouterModule, Routes } from '@angular/router';
 import { BibliographyComponent } from './bibliography.component';
 import { BibliographyDetailComponent } from './bibliography-detail/bibliography-detail.component';
 
+/* routes of the BibliographyModule */
 const bibliographyRoutes: Routes = [
     {
         path: '',
@@ -12,10 +13,19 @@ const bibliographyRoutes: Routes = [
     }
 ];
 
+/**
+ * Routed components of the {@link BibliographyModule}:
+ * {@link BibliographyComponent} and {@link BibliographyDetailComponent}.
+ */
+export const routedBibliographyComponents = [BibliographyComponent, BibliographyDetailComponent];
+
+/**
+ * Bibliography module routing.
+ *
+ * It activates the bibliographyRoutes.
+ */
 @NgModule({
     imports: [RouterModule.forChild(bibliographyRoutes)],
     exports: [RouterModule]
 })
 export class BibliographyRoutingModule {}
-
-export const routedComponents = [BibliographyComponent, BibliographyDetailComponent];
diff --git a/src/app/views/data-view/data-outlets/bibliography/bibliography-search/bibliography-search.component.ts b/src/app/views/data-view/data-outlets/bibliography/bibliography-search/bibliography-search.component.ts
index f11de3bc17..2d38e63d98 100644
--- a/src/app/views/data-view/data-outlets/bibliography/bibliography-search/bibliography-search.component.ts
+++ b/src/app/views/data-view/data-outlets/bibliography/bibliography-search/bibliography-search.component.ts
@@ -1,12 +1,17 @@
-import { Component, OnInit } from '@angular/core';
+import { Component } from '@angular/core';
 
+/**
+ * The BibliographySearch component.
+ *
+ * It will contain the search form
+ * of the bibliography section
+ * of the search view of the app.
+ *
+ * Not used at the moment.
+ */
 @Component({
     selector: 'awg-bibliography-search',
     templateUrl: './bibliography-search.component.html',
     styleUrls: ['./bibliography-search.component.css']
 })
-export class BibliographySearchComponent implements OnInit {
-    constructor() {}
-
-    ngOnInit() {}
-}
+export class BibliographySearchComponent {}
diff --git a/src/app/views/data-view/data-outlets/bibliography/bibliography.component.html b/src/app/views/data-view/data-outlets/bibliography/bibliography.component.html
index 2fc06794b1..0721078df0 100644
--- a/src/app/views/data-view/data-outlets/bibliography/bibliography.component.html
+++ b/src/app/views/data-view/data-outlets/bibliography/bibliography.component.html
@@ -1,9 +1,11 @@
 <!-- content: bibliography -->
 <awg-bibliography-search></awg-bibliography-search>
 
-<p>Lade ... {{ bibList?.length }} von {{ bibListResponse?.nhits }} Einträgen</p>
+<p>Lade ... {{ (bibList$ | async)?.subjects.length }} von {{ nhits }} Einträgen</p>
 
-<awg-bibliography-list *ngIf="isBibListLoaded && bibList"
-    [bibList]="bibList"
-    (selectItemRequest)="onItemSelect($event)">
+<awg-bibliography-list
+    *ngIf="isBibListLoaded && (bibList$ | async) as bibList"
+    [bibList]="bibList.subjects"
+    (selectItemRequest)="onItemSelect($event)"
+>
 </awg-bibliography-list>
diff --git a/src/app/views/data-view/data-outlets/bibliography/bibliography.component.ts b/src/app/views/data-view/data-outlets/bibliography/bibliography.component.ts
index 21285f8f70..cdd81b53f0 100644
--- a/src/app/views/data-view/data-outlets/bibliography/bibliography.component.ts
+++ b/src/app/views/data-view/data-outlets/bibliography/bibliography.component.ts
@@ -2,54 +2,100 @@ import { Component, OnInit } from '@angular/core';
 
 import { BibliographyService } from '@awg-views/data-view/services';
 import { SearchResponseJson, SubjectItemJson } from '@awg-shared/api-objects';
+import { map, tap } from 'rxjs/operators';
+import { Observable } from 'rxjs';
 
+/**
+ * The Bibliography component.
+ *
+ * It contains the bibliography section
+ * of the search view of the app
+ * with a {@link BibliographySearchComponent} and
+ * a {@link BibliographyListComponent} .
+ */
 @Component({
     selector: 'awg-bibliography',
     templateUrl: './bibliography.component.html',
     styleUrls: ['./bibliography.component.css']
 })
 export class BibliographyComponent implements OnInit {
-    bibListResponse: SearchResponseJson = new SearchResponseJson();
-    bibList: SubjectItemJson[];
+    /**
+     * Public variable: bibList$.
+     *
+     * Observable that keeps the subject array of bibliography items.
+     */
+    bibList$: Observable<SearchResponseJson>;
+
+    /**
+     * Public variable: nhits.
+     *
+     * It keeps the result number of a
+     * bibliography search response.
+     */
+    nhits: string | number;
+
+    /**
+     * Public variable: selectedBibItem.
+     *
+     * It keeps the selected bibliography item.
+     */
     selectedBibItem: SubjectItemJson;
+
+    /**
+     * Public variable: isBibListLoaded.
+     *
+     * If the blist of bibliography items is loaded.
+     */
     isBibListLoaded = false;
 
+    /**
+     * Constructor of the BibliographyComponent.
+     *
+     * It declares a private BibliographyService instance
+     * to get the list of bibliography items.
+     *
+     * @param {BibliographyService} bibliographyService Instance of the BibliographyService.
+     */
     constructor(private bibliographyService: BibliographyService) {}
 
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {
         this.getBibList();
     }
 
+    /**
+     * Public method: getBibList.
+     *
+     * It calls the BibliographyService to provide
+     * the bibliography items.
+     *
+     * @returns {void} Sets the bibListResponse variable.
+     */
     getBibList(): void {
-        this.bibliographyService.getBibliographyList().subscribe((data: SearchResponseJson) => {
-            this.bibListResponse = { ...data };
-
-            // TODO: handle request with more than 1000 entries
-            console.log('BibComp # bibListResponse', this.bibListResponse);
-
-            this.bibList = this.bibListResponse.subjects.slice(1, 20);
-            this.isBibListLoaded = true;
-        });
+        // TODO: handle request with more than 1000 entries
+        this.bibList$ = this.bibliographyService.getBibliographyList().pipe(
+            tap((data: SearchResponseJson) => {
+                this.nhits = data.nhits;
+                this.isBibListLoaded = true;
+            })
+        );
     }
 
+    /**
+     * Public method: onItemSelect.
+     *
+     * It sets a given bibliography item
+     * as {@link selectedBibItem}.
+     *
+     * @param {SubjectItemJson} item The given bibliography item.
+     * @returns {void} Sets the selectedBibItem variable.
+     */
     onItemSelect(item: SubjectItemJson): void {
         this.selectedBibItem = item;
     }
-
-    /*
-        gotoDetail(id: string): void {
-            let link = ['/search', 'bibliography/detail', id];
-            this.router.navigate(link);
-        }
-    */
-    /*
-     delete(bibItem: BibEntry): void {
-     this.bibliographyService
-     .delete(bibItem.id)
-     .then(() => {
-     this.bibList = this.bibList.filter(b => b !== bibItem);
-     if (this.selectedBibItem === bibItem) { this.selectedBibItem = null; }
-     });
-     }
-     */
 }
diff --git a/src/app/views/data-view/data-outlets/bibliography/bibliography.module.ts b/src/app/views/data-view/data-outlets/bibliography/bibliography.module.ts
index 37f00933c8..868860b78b 100644
--- a/src/app/views/data-view/data-outlets/bibliography/bibliography.module.ts
+++ b/src/app/views/data-view/data-outlets/bibliography/bibliography.module.ts
@@ -1,14 +1,33 @@
 import { NgModule } from '@angular/core';
 import { SharedModule } from '@awg-shared/shared.module';
-import { BibliographyRoutingModule, routedComponents } from './bibliography-routing.module';
 
 import { BibliographySearchComponent } from './bibliography-search/bibliography-search.component';
 import { BibliographyListComponent } from './bibliography-list/bibliography-list.component';
 import { BibliographyFormatPipe } from './bibliography-format.pipe';
 
+/* Routing Module */
+import { BibliographyRoutingModule, routedBibliographyComponents } from './bibliography-routing.module';
+
+/**
+ * The bibliography module.
+ *
+ * It embeds the bibliography components and their [routing definition]{@link BibliographyRoutingModule},
+ * the {@link BibliographySearchComponent}, {@link BibliographyListComponent}, {@link BibliographyFormatPipe}
+ * as well as the {@link SharedModule}.
+ */
 @NgModule({
     imports: [SharedModule, BibliographyRoutingModule],
-    declarations: [routedComponents, BibliographySearchComponent, BibliographyListComponent, BibliographyFormatPipe],
-    exports: [routedComponents, BibliographySearchComponent, BibliographyListComponent, BibliographyFormatPipe]
+    declarations: [
+        routedBibliographyComponents,
+        BibliographySearchComponent,
+        BibliographyListComponent,
+        BibliographyFormatPipe
+    ],
+    exports: [
+        routedBibliographyComponents,
+        BibliographySearchComponent,
+        BibliographyListComponent,
+        BibliographyFormatPipe
+    ]
 })
 export class BibliographyModule {}
diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-header/resource-detail-header.component.css b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-header/resource-detail-header.component.css
index 528d6e48bf..9f010b5ae7 100644
--- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-header/resource-detail-header.component.css
+++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-header/resource-detail-header.component.css
@@ -14,7 +14,7 @@
 
 /* resource header */
 .resource-header {
-    margin: 1rem 0;
+    margin: 1rem 0 0 0;
     border-bottom: 1px solid #ddd;
 }
 
diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-header/resource-detail-header.component.ts b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-header/resource-detail-header.component.ts
index f1a14c1a89..91318944a7 100644
--- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-header/resource-detail-header.component.ts
+++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-header/resource-detail-header.component.ts
@@ -1,25 +1,62 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 
 import { ResourceDetailHeader } from '@awg-views/data-view/models';
 
+/**
+ * The ResourceDetailHeader component.
+ *
+ * It contains the header section of a resource detail
+ * of the data view of the app.
+ */
 @Component({
     selector: 'awg-resource-detail-header',
     templateUrl: './resource-detail-header.component.html',
-    styleUrls: ['./resource-detail-header.component.css']
+    styleUrls: ['./resource-detail-header.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class ResourceDetailHeaderComponent implements OnInit {
+    /**
+     * Input variable: header.
+     *
+     * It keeps the header for the resource detail.
+     */
     @Input()
     header: ResourceDetailHeader;
+
+    /**
+     * Input variable: resourceUrl.
+     *
+     * It keeps the url for the resource detail.
+     */
     @Input()
     resourceUrl: string;
+
+    /**
+     * Output variable: resourceRequest.
+     *
+     * It keeps an event emitter for the selected id of a resource.
+     */
     @Output()
     resourceRequest: EventEmitter<string> = new EventEmitter();
 
-    constructor() {}
-
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {}
 
-    navigateToResource(id?: string) {
+    /**
+     * Public method: navigateToResource.
+     *
+     * It emits a given id of a selected resource
+     * to the {@link resourceRequest}.
+     *
+     * @param {string} id The given resource id.
+     * @returns {void} Emits the id.
+     */
+    navigateToResource(id?: string): void {
         if (!id) {
             return;
         }
diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/imageobjects/imageobjects.component.css b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/imageobjects/imageobjects.component.css
index ecde2151a1..93cd25cdb2 100644
--- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/imageobjects/imageobjects.component.css
+++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/imageobjects/imageobjects.component.css
@@ -4,23 +4,23 @@
 }
 
 /* image preview */
-ngx-gallery /deep/ .ngx-gallery-image-wrapper {
+ngx-gallery ::ng-deep .ngx-gallery-image-wrapper {
     background-color: #e7e7e7;
 }
 
 /* arrows */
-ngx-gallery /deep/ .ngx-gallery-arrow {
+ngx-gallery ::ng-deep .ngx-gallery-arrow {
     color: black;
 }
-ngx-gallery /deep/ .ngx-gallery-arrow.ngx-gallery-disabled {
+ngx-gallery ::ng-deep .ngx-gallery-arrow.ngx-gallery-disabled {
     display: none;
 }
 
 /* thumbnails */
-ngx-gallery /deep/ .ngx-gallery-thumbnail {
+ngx-gallery ::ng-deep .ngx-gallery-thumbnail {
     opacity: 0.3;
 }
-ngx-gallery /deep/ .ngx-gallery-thumbnail.ngx-gallery-active,
-ngx-gallery /deep/ .ngx-gallery-thumbnail:hover {
+ngx-gallery ::ng-deep .ngx-gallery-thumbnail.ngx-gallery-active,
+ngx-gallery ::ng-deep .ngx-gallery-thumbnail:hover {
     opacity: 1;
 }
diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/imageobjects/imageobjects.component.html b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/imageobjects/imageobjects.component.html
index 42c375a16d..59448e167f 100644
--- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/imageobjects/imageobjects.component.html
+++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/imageobjects/imageobjects.component.html
@@ -13,15 +13,17 @@
 *
 ************************************************/ -->
 <!-- resourceDetailData content: image objects -->
-<div class="awg-image-obj mb-3">
-
+<div class="awg-image-obj mb-3" *ngIf="images?.length > 0">
     <!-- header -->
-    <h5>Abbildungen (<span id="awg-image-number">{{ galleryImages?.length }}</span>)</h5>
+    <h5>
+        Abbildungen (<span id="awg-image-number">{{ images?.length }}</span
+        >)
+    </h5>
 
     <!-- image slider -->
     <div class="card awg-image-slider">
-
-            <ngx-gallery *ngIf="galleryImages.length > 0" [options]="galleryOptions" [images]="galleryImages"></ngx-gallery>
-
-    </div><!-- end DIV image-slider -->
-</div><!-- end DIV image-obj -->
+        <ngx-gallery [options]="galleryOptions" [images]="images"></ngx-gallery>
+    </div>
+    <!-- end DIV image-slider -->
+</div>
+<!-- end DIV image-obj -->
diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/imageobjects/imageobjects.component.spec.ts b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/imageobjects/imageobjects.component.spec.ts
index 4fc2899c73..ecd4ac67f6 100644
--- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/imageobjects/imageobjects.component.spec.ts
+++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/imageobjects/imageobjects.component.spec.ts
@@ -1,15 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { DebugElement, SimpleChange } from '@angular/core';
-import Spy = jasmine.Spy;
+import { DebugElement } from '@angular/core';
 
 import { JsonConvert } from 'json2typescript';
 import { NgxGalleryImage, NgxGalleryComponent, NgxGalleryOptions, NgxGalleryModule } from 'ngx-gallery';
 
-import {
-    expectSpyCall,
-    getAndExpectDebugElementByCss,
-    getAndExpectDebugElementByDirective
-} from '@testing/expect-helper';
+import { getAndExpectDebugElementByCss, getAndExpectDebugElementByDirective } from '@testing/expect-helper';
 import { mockContextJson } from '@testing/mock-data';
 
 import { ResourceDetailImage } from '@awg-views/data-view/models';
@@ -23,16 +18,12 @@ describe('ResourceDetailHtmlContentImageobjectsComponent', () => {
     let compDe: DebugElement;
     let compEl: any;
 
-    let setImagesSpy: Spy;
-    let setOptionsSpy: Spy;
-
     // json object
     let jsonConvert: JsonConvert;
     let context: ContextJson;
 
     let expectedGalleryOptions: NgxGalleryOptions[];
-    let expectedGalleryImages: NgxGalleryImage[];
-    let expectedImages: ResourceDetailImage[];
+    let expectedImages: NgxGalleryImage[];
 
     beforeEach(async(() => {
         TestBed.configureTestingModule({
@@ -52,8 +43,6 @@ describe('ResourceDetailHtmlContentImageobjectsComponent', () => {
         context = jsonConvert.deserializeObject(mockContextJson, ContextJson);
 
         // test data
-        expectedImages = [new ResourceDetailImage(context, 0), new ResourceDetailImage(context, 1)];
-
         expectedGalleryOptions = [
             new NgxGalleryOptions({
                 width: '100%',
@@ -72,8 +61,9 @@ describe('ResourceDetailHtmlContentImageobjectsComponent', () => {
             })
         ];
 
-        expectedGalleryImages = [];
-        expectedImages.forEach(image => {
+        const images = [new ResourceDetailImage(context, 0), new ResourceDetailImage(context, 1)];
+        expectedImages = [];
+        images.forEach(image => {
             const gImage = {
                 small: image.reductSize,
                 medium: image.reductSize,
@@ -82,14 +72,8 @@ describe('ResourceDetailHtmlContentImageobjectsComponent', () => {
                 label: image.label,
                 url: image.fullSize
             };
-            expectedGalleryImages.push(gImage);
+            expectedImages.push(gImage);
         });
-
-        // spies on component functions
-        // `.and.callThrough` will track the spy down the nested describes, see
-        // https://jasmine.github.io/2.0/introduction.html#section-Spies:_%3Ccode%3Eand.callThrough%3C/code%3E
-        setImagesSpy = spyOn(component, 'setImages').and.callThrough();
-        setOptionsSpy = spyOn(component, 'setOptions').and.callThrough();
     });
 
     it('should create', () => {
@@ -101,49 +85,17 @@ describe('ResourceDetailHtmlContentImageobjectsComponent', () => {
             expect(component.images).toBeUndefined('should be undefined');
         });
 
-        describe('#setOptions', () => {
-            it('... should not have been called', () => {
-                expect(setOptionsSpy).not.toHaveBeenCalled();
-            });
-        });
-
-        describe('#setImages', () => {
-            it('... should not have been called', () => {
-                expect(setImagesSpy).not.toHaveBeenCalled();
-            });
-        });
-
-        it('should not have `galleryOptions` or `galleryImages`', () => {
-            expect(component.galleryOptions).toBeUndefined('should be undefined');
-            expect(component.galleryImages).toBeUndefined('should be undefined');
+        it('should have galleryOptions', () => {
+            expect(component.galleryOptions).toBeDefined('should be defined');
+            expect(component.galleryOptions).toEqual(
+                jasmine.arrayContaining(expectedGalleryOptions),
+                `should equal expectedGalleryOptions: ${expectedGalleryOptions}`
+            );
         });
 
         describe('VIEW', () => {
-            it('... should contain one div.awg-image-obj', () => {
-                getAndExpectDebugElementByCss(compDe, 'div.awg-image-obj', 1, 1);
-            });
-
-            it('... should contain one header showing no number of images yet', () => {
-                // header debug element
-                const headerDes = getAndExpectDebugElementByCss(compDe, 'div.awg-image-obj > h5', 1, 1);
-                // size debug element
-                const sizeDes = getAndExpectDebugElementByCss(headerDes[0], 'span#awg-image-number', 1, 1);
-                const sizeEl = sizeDes[0].nativeElement;
-
-                // check size output
-                expect(sizeEl.textContent).toBeDefined();
-                expect(sizeEl.textContent).toBe('', 'should be empty');
-            });
-
-            it('... should contain one div.awg-image-slider with no ngx-gallery yet', () => {
-                const sliderDes = getAndExpectDebugElementByCss(
-                    compDe,
-                    'div.awg-image-obj > div.awg-image-slider',
-                    1,
-                    1
-                );
-
-                getAndExpectDebugElementByDirective(sliderDes[0], NgxGalleryComponent, 0, 0);
+            it('... should contain no div.awg-image-obj', () => {
+                getAndExpectDebugElementByCss(compDe, 'div.awg-image-obj', 0, 0);
             });
         });
     });
@@ -162,106 +114,11 @@ describe('ResourceDetailHtmlContentImageobjectsComponent', () => {
             expect(component.images).toBe(expectedImages, `should be expectedImages: ${expectedImages}`);
         });
 
-        it('should have galleryOptions', () => {
-            expect(component.galleryOptions).toBeDefined('should be defined');
-            expect(component.galleryOptions).toEqual(
-                jasmine.arrayContaining(expectedGalleryOptions),
-                `should equal expectedGalleryOptions: ${expectedGalleryOptions}`
-            );
-        });
-
-        it('should have galleryImages', () => {
-            expect(component.galleryImages).toBeDefined('should be defined');
-            expect(component.galleryImages).toEqual(
-                expectedGalleryImages,
-                `should equal expectedGalleryImages: ${expectedGalleryImages}`
-            );
-        });
-
-        describe('#setOptions', () => {
-            it('... should have been called', () => {
-                expectSpyCall(setOptionsSpy, 1);
-            });
-        });
-
-        describe('#setImages', () => {
-            it('... should have been called', () => {
-                expectSpyCall(setImagesSpy, 1);
-            });
-
-            it('... should do nothing on first onChanges', () => {
-                const newExpectedImages: ResourceDetailImage[] = [
-                    new ResourceDetailImage(context, 1),
-                    new ResourceDetailImage(context, 0),
-                    new ResourceDetailImage(context, 1)
-                ];
-
-                // simulate the parent changing the input properties for the first time
-                component.images = newExpectedImages;
-
-                // trigger ngOnChanges
-                component.ngOnChanges({ images: new SimpleChange(null, component.images, true) });
-                fixture.detectChanges();
-
-                // spy has been called only once with ngOnInit
-                expectSpyCall(setImagesSpy, 1);
-
-                // output has not changed
-                expect(component.galleryImages).toEqual(
-                    expectedGalleryImages,
-                    `should be still expectedGalleryImages: ${expectedGalleryImages}`
-                );
-            });
-
-            it('... should change galleryImages on input change', () => {
-                const newExpectedImages: ResourceDetailImage[] = [
-                    new ResourceDetailImage(context, 1),
-                    new ResourceDetailImage(context, 0),
-                    new ResourceDetailImage(context, 1)
-                ];
-
-                // simulate the parent changing the input properties for the first time
-                component.images = newExpectedImages;
-
-                const newExpectedGalleryImages: NgxGalleryImage[] = [];
-                newExpectedImages.forEach(image => {
-                    const gImage = {
-                        small: image.reductSize,
-                        medium: image.reductSize,
-                        big: image.fullSize,
-                        description: image.origname,
-                        label: image.label,
-                        url: image.fullSize
-                    };
-                    newExpectedGalleryImages.push(gImage);
-                });
-
-                // trigger ngOnChanges
-                component.ngOnChanges({ images: new SimpleChange(null, component.images, false) });
-                fixture.detectChanges();
-
-                // spy has been called twice now
-                expectSpyCall(setImagesSpy, 2);
-
-                // output has not changed
-                expect(component.galleryImages).toEqual(
-                    newExpectedGalleryImages,
-                    `should be newExpectedGalleryImages: ${newExpectedGalleryImages}`
-                );
-
-                // get debug and native element of NgxGalleryComponent
-                const galleryDes = getAndExpectDebugElementByDirective(compDe, NgxGalleryComponent, 1, 1);
-                const galleryCmp = galleryDes[0].injector.get(NgxGalleryComponent) as NgxGalleryComponent;
-
-                expect(galleryCmp.images).toBeDefined();
-                expect(galleryCmp.images).toEqual(
-                    newExpectedGalleryImages,
-                    `should equal expectedGalleryImages: ${expectedGalleryImages}`
-                );
+        describe('VIEW', () => {
+            it('... should contain one div.awg-image-obj', () => {
+                getAndExpectDebugElementByCss(compDe, 'div.awg-image-obj', 1, 1);
             });
-        });
 
-        describe('VIEW', () => {
             it('... should contain one header showing number of images', () => {
                 // header debug element
                 const headerDes = getAndExpectDebugElementByCss(compDe, 'div.awg-image-obj > h5', 1, 1);
@@ -288,7 +145,7 @@ describe('ResourceDetailHtmlContentImageobjectsComponent', () => {
                 getAndExpectDebugElementByDirective(sliderDes[0], NgxGalleryComponent, 1, 1);
             });
 
-            it('... should pass down `galleryImages` and `galleryOptions` to NgxGalleryComponent', () => {
+            it('... should pass down `images` and `galleryOptions` to NgxGalleryComponent', () => {
                 // get debug and native element of NgxGalleryComponent
                 const galleryDes = getAndExpectDebugElementByDirective(compDe, NgxGalleryComponent, 1, 1);
                 const galleryCmp = galleryDes[0].injector.get(NgxGalleryComponent) as NgxGalleryComponent;
@@ -301,8 +158,8 @@ describe('ResourceDetailHtmlContentImageobjectsComponent', () => {
 
                 expect(galleryCmp.images).toBeDefined();
                 expect(galleryCmp.images).toEqual(
-                    expectedGalleryImages,
-                    `should equal expectedGalleryImages: ${expectedGalleryImages}`
+                    expectedImages,
+                    `should equal expectedGalleryImages: ${expectedImages}`
                 );
             });
         });
diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/imageobjects/imageobjects.component.ts b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/imageobjects/imageobjects.component.ts
index 250d9b149e..510da74e15 100644
--- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/imageobjects/imageobjects.component.ts
+++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/imageobjects/imageobjects.component.ts
@@ -1,67 +1,57 @@
-import { Component, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
 
-import { NgxGalleryOptions, NgxGalleryImage } from 'ngx-gallery';
-
-import { ResourceDetailImage } from '@awg-views/data-view/models';
+import { NgxGalleryImage, NgxGalleryOptions } from 'ngx-gallery';
 
+/**
+ * The ResourceDetailHtmlContentImageobjects component.
+ *
+ * It displays the images of a resource detail
+ * of the data view of the app
+ * with an image slider of the ngx.gallery library.
+ */
 @Component({
     selector: 'awg-resource-detail-html-content-imageobjects',
     templateUrl: './imageobjects.component.html',
-    styleUrls: ['./imageobjects.component.css']
+    styleUrls: ['./imageobjects.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class ResourceDetailHtmlContentImageobjectsComponent implements OnInit, OnChanges {
+export class ResourceDetailHtmlContentImageobjectsComponent implements OnInit {
+    /**
+     * Input variable: images.
+     *
+     * It keeps the images for the ngx-gallery
+     * of the resource detail.
+     */
     @Input()
-    images: ResourceDetailImage[];
-
-    galleryOptions: NgxGalleryOptions[];
-    galleryImages: NgxGalleryImage[];
-
-    constructor() {}
-
-    ngOnInit() {
-        this.setOptions();
-
-        this.setImages();
-    }
-
-    ngOnChanges(changes: SimpleChanges) {
-        if (!changes['images'].isFirstChange()) {
-            this.setImages();
-        }
-    }
-
-    setOptions() {
-        this.galleryOptions = [
-            new NgxGalleryOptions({
-                width: '100%',
-                height: '100%',
-                imageBullets: true,
-                imageSize: 'contain',
-                thumbnailSize: 'contain',
-                thumbnailsColumns: 4,
-                thumbnailMargin: 5,
-                thumbnailsMargin: 0,
-                previewCloseOnClick: true,
-                previewCloseOnEsc: true,
-                previewZoom: true,
-                previewRotate: true
-            })
-        ];
-    }
-
-    setImages() {
-        this.galleryImages = [];
-        this.images.forEach(image => {
-            const gImage = {
-                small: image.reductSize,
-                medium: image.reductSize,
-                big: image.fullSize,
-                description: image.origname,
-                label: image.label,
-                url: image.fullSize
-            };
-
-            this.galleryImages.push(gImage);
-        });
-    }
+    images: NgxGalleryImage[];
+
+    /**
+     * Public variable: galleryOptions.
+     *
+     * It keeps the options array for the ngx-gallery.
+     */
+    galleryOptions: NgxGalleryOptions[] = [
+        new NgxGalleryOptions({
+            width: '100%',
+            height: '100%',
+            imageBullets: true,
+            imageSize: 'contain',
+            thumbnailSize: 'contain',
+            thumbnailsColumns: 4,
+            thumbnailMargin: 5,
+            thumbnailsMargin: 0,
+            previewCloseOnClick: true,
+            previewCloseOnEsc: true,
+            previewZoom: true,
+            previewRotate: true
+        })
+    ];
+
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
+    ngOnInit() {}
 }
diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/linkedobjects/linkedobjects.component.html b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/linkedobjects/linkedobjects.component.html
index cfd5952016..ff6ca5f589 100644
--- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/linkedobjects/linkedobjects.component.html
+++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/linkedobjects/linkedobjects.component.html
@@ -18,36 +18,42 @@ <h5>
         <!-- TODO: link to linked objects overview
         <a (click)="navigateToSearchResults()">
         -->
-        Verknüpfte Objekte (<span id ="awg-incoming-size" *ngIf="incoming">{{ totalNumber }}</span>)
+        Verknüpfte Objekte (<span id="awg-incoming-size" *ngIf="incomingGroups">{{ totalNumber }}</span
+        >)
         <!--
         </a>
         -->
     </h5>
 
     <ngb-accordion [closeOthers]="true">
-        <ngb-panel id="incoming-linkgroup-{{i}}" class="awg-linked-obj-incoming-linkgroup" *ngFor="let linkGroup of incoming | keyvalue; let i = index">
+        <ngb-panel
+            id="incoming-linkgroup-{{ i }}"
+            class="awg-linked-obj-incoming-linkgroup"
+            *ngFor="let restypeGroup of incomingGroups; let i = index"
+        >
             <ng-template ngbPanelTitle>
                 <span class="awg-linked-obj-title-group">
-                    <span class="badge badge-info mr-2">{{ linkGroup?.value.length }}</span>
-                    <span class="awg-linked-obj-title single-line">{{ linkGroup?.key }}</span>
+                    <span class="badge badge-info mr-2">{{ restypeGroup?.links?.length }}</span>
+                    <span class="awg-linked-obj-title single-line">{{ restypeGroup?.restypeLabel }}</span>
                 </span>
             </ng-template>
             <ng-template ngbPanelContent>
                 <table class="table table-sm table-hover borderless awg-linked-obj-table mb-0">
                     <tbody>
-                    <tr *ngFor="let link of linkGroup.value">
-                        <td>
-                            <a class="awg-linked-obj-link" (click)="navigateToResource(link?.id)">
-                                <img [src]="link?.restype.icon" alt="icon">
-                                &nbsp;[<span class="awg-linked-obj-link-id">{{ link?.id }}</span>]&nbsp;
-                                <span class="awg-linked-obj-link-value">{{ link?.value }}</span>
-                            </a>
-                        </td>
-                    </tr>
+                        <tr *ngFor="let link of restypeGroup.links">
+                            <td>
+                                <a class="awg-linked-obj-link" (click)="navigateToResource(link?.id)">
+                                    <img [src]="link?.restype?.icon" alt="icon" />
+                                    &nbsp;[<span class="awg-linked-obj-link-id">{{ link?.id }}</span
+                                    >]&nbsp;
+                                    <span class="awg-linked-obj-link-value">{{ link?.value }}</span>
+                                </a>
+                            </td>
+                        </tr>
                     </tbody>
                 </table>
             </ng-template>
         </ngb-panel>
     </ngb-accordion>
-
-</div><!-- end DIV linkedObj -->
+</div>
+<!-- end DIV linkedObj -->
diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/linkedobjects/linkedobjects.component.spec.ts b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/linkedobjects/linkedobjects.component.spec.ts
index 3602de25c0..92d015101a 100644
--- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/linkedobjects/linkedobjects.component.spec.ts
+++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/linkedobjects/linkedobjects.component.spec.ts
@@ -1,14 +1,13 @@
 import { async, ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing';
-import { DebugElement, SimpleChange, ɵdefaultKeyValueDiffers as defaultKeyValueDiffers } from '@angular/core';
-import { KeyValuePipe } from '@angular/common';
+import { DebugElement } from '@angular/core';
 import Spy = jasmine.Spy;
 
 import { click, clickAndAwaitChanges } from '@testing/click-helper';
 import { expectSpyCall, getAndExpectDebugElementByCss } from '@testing/expect-helper';
 
 import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
-import { ConversionService } from '@awg-core/services';
-import { ResourceDetailGroupedIncomingLinks, ResourceDetailIncomingLinks } from '@awg-views/data-view/models';
+
+import { ResourceDetailGroupedIncomingLinks, ResourceDetailIncomingLink } from '@awg-views/data-view/models';
 
 import { ResourceDetailHtmlContentLinkedobjectsComponent } from './linkedobjects.component';
 
@@ -28,35 +27,20 @@ describe('ResourceDetailHtmlContentLinkedobjectsComponent (DONE)', () => {
     let compDe: DebugElement;
     let compEl: any;
 
-    let keyValuePipe: KeyValuePipe;
-
-    let updateTotalNumberSpy: Spy;
+    let totalNumberSpy: Spy;
     let navigateToResourceSpy: Spy;
     let emitSpy: Spy;
 
-    let expectedIncoming: ResourceDetailGroupedIncomingLinks;
-    let incomingLink1: ResourceDetailIncomingLinks;
-    let incomingLink2: ResourceDetailIncomingLinks;
-    let incomingLink3: ResourceDetailIncomingLinks;
+    let expectedIncoming: ResourceDetailGroupedIncomingLinks[];
+    let incomingLink1: ResourceDetailIncomingLink;
+    let incomingLink2: ResourceDetailIncomingLink;
+    let incomingLink3: ResourceDetailIncomingLink;
     const expectedTotalItems = 5;
 
-    const mockConversionService = {
-        getNestedArraysTotalItems: (obj: ResourceDetailGroupedIncomingLinks): number => {
-            let size = 0;
-            // iterate over object keys
-            Object.keys(obj).forEach(key => {
-                // sum up length of array nested in object
-                size += obj[key].length;
-            });
-            return size;
-        }
-    };
-
     beforeEach(async(() => {
         TestBed.configureTestingModule({
             imports: [NgbAccordionModule],
-            declarations: [ResourceDetailHtmlContentLinkedobjectsComponent],
-            providers: [{ provide: ConversionService, useValue: mockConversionService }]
+            declarations: [ResourceDetailHtmlContentLinkedobjectsComponent]
         }).compileComponents();
     }));
 
@@ -69,7 +53,7 @@ describe('ResourceDetailHtmlContentLinkedobjectsComponent (DONE)', () => {
         // test data
         incomingLink1 = {
             id: '',
-            value: 'testvalue1',
+            value: 'testexpectedLinkValue1',
             restype: { id: '1234', label: 'test-type1', icon: '/assets/img/logos/angular.png' }
         };
         incomingLink2 = {
@@ -83,19 +67,18 @@ describe('ResourceDetailHtmlContentLinkedobjectsComponent (DONE)', () => {
             restype: { id: '1236', label: 'test-type3', icon: '/assets/img/logos/awg.png' }
         };
 
-        expectedIncoming = new ResourceDetailGroupedIncomingLinks();
-        expectedIncoming = {
-            testkey1: [incomingLink1, incomingLink2],
-            testkey2: [incomingLink1, incomingLink2, incomingLink3]
-        };
-
-        // set mockService to return default value
-        mockConversionService.getNestedArraysTotalItems(expectedIncoming);
+        expectedIncoming = [
+            {
+                restypeLabel: 'testkey1',
+                links: [incomingLink1, incomingLink2]
+            },
+            { restypeLabel: 'testkey2', links: [incomingLink1, incomingLink2, incomingLink3] }
+        ];
 
         // spies on component functions
         // `.and.callThrough` will track the spy down the nested describes, see
         // https://jasmine.github.io/2.0/introduction.html#section-Spies:_%3Ccode%3Eand.callThrough%3C/code%3E
-        updateTotalNumberSpy = spyOn(component, 'updateTotalNumber').and.callThrough();
+        totalNumberSpy = spyOnProperty(component, 'totalNumber', 'get').and.callThrough();
         navigateToResourceSpy = spyOn(component, 'navigateToResource').and.callThrough();
         emitSpy = spyOn(component.resourceRequest, 'emit').and.callThrough();
     });
@@ -105,12 +88,13 @@ describe('ResourceDetailHtmlContentLinkedobjectsComponent (DONE)', () => {
     });
 
     describe('BEFORE initial data binding', () => {
-        it('should have totalNumber = 0', () => {
-            expect(component.totalNumber).toBe(0, 'should be 0');
+        it('should not have `incomingGroups` inputs', () => {
+            expect(component.incomingGroups).toBeUndefined('should be undefined');
         });
 
-        it('should not have `incoming` inputs', () => {
-            expect(component.incoming).toBeUndefined('should be undefined');
+        it('should have totalNumber = 0', () => {
+            expect(component.totalNumber).toBeDefined();
+            expect(component.totalNumber).toBe(0, 'should be 0');
         });
 
         describe('VIEW', () => {
@@ -125,7 +109,7 @@ describe('ResourceDetailHtmlContentLinkedobjectsComponent (DONE)', () => {
                 getAndExpectDebugElementByCss(headerDes[0], 'span#awg-incoming-size', 0, 0);
             });
 
-            it('... should contain one ngb-accordion (empty yet))', () => {
+            it('... should contain one ngb-accordion without panels yet', () => {
                 // ngb-accordion debug element
                 const accordionDes = getAndExpectDebugElementByCss(compDe, 'div.awg-linked-obj > ngb-accordion', 1, 1);
 
@@ -134,12 +118,6 @@ describe('ResourceDetailHtmlContentLinkedobjectsComponent (DONE)', () => {
             });
         });
 
-        describe('#updateTotalNumber', () => {
-            it('... should not have been called', () => {
-                expect(updateTotalNumberSpy).not.toHaveBeenCalled();
-            });
-        });
-
         describe('#navigateToResource', () => {
             it('... should not have been called', () => {
                 expect(navigateToResourceSpy).not.toHaveBeenCalled();
@@ -151,17 +129,46 @@ describe('ResourceDetailHtmlContentLinkedobjectsComponent (DONE)', () => {
     describe('AFTER initial data binding', () => {
         beforeEach(() => {
             // simulate the parent setting the input properties
-            component.incoming = expectedIncoming;
+            component.incomingGroups = expectedIncoming;
 
             // trigger initial data binding
             fixture.detectChanges();
         });
 
-        it('should have `incoming` inputs', () => {
-            expect(component.incoming).toBeDefined('should be defined');
-            expect(component.incoming).toBe(expectedIncoming, `should be expectedIncoming: ${expectedIncoming}`);
+        it('should have `incomingGroups` inputs', () => {
+            expect(component.incomingGroups).toBeDefined('should be defined');
+            expect(component.incomingGroups).toBe(expectedIncoming, `should be expectedIncoming: ${expectedIncoming}`);
         });
 
+        it('... should have updated totalNumber with number of nested items in `incomingGroups`', fakeAsync(() => {
+            expectSpyCall(totalNumberSpy, 1);
+
+            expect(component.totalNumber).toBe(
+                expectedTotalItems,
+                `should be expectedTotalItems: ${expectedTotalItems}`
+            );
+        }));
+
+        it('... should recalculate total number on input changes (second & more)', fakeAsync(() => {
+            const newExpectedIncomingGroups: ResourceDetailGroupedIncomingLinks[] = [
+                {
+                    restypeLabel: 'testkey1',
+                    links: [incomingLink1, incomingLink2, incomingLink3, incomingLink1]
+                }
+            ];
+            const newExpectedTotalItems = newExpectedIncomingGroups[0].links.length;
+
+            // simulate the parent changing the input properties
+            // no fixture detect changes needed because totalNumber is a getter()
+            component.incomingGroups = newExpectedIncomingGroups;
+
+            // output has changed
+            expect(component.totalNumber).toBe(
+                newExpectedTotalItems,
+                `should be newExpectedTotalItems: ${newExpectedTotalItems}`
+            );
+        }));
+
         describe('VIEW', () => {
             it('... should contain one header showing number of items', () => {
                 // size debug elements
@@ -176,8 +183,8 @@ describe('ResourceDetailHtmlContentLinkedobjectsComponent (DONE)', () => {
                 // check size output
                 expect(sizeEl.textContent).toBeDefined();
                 expect(sizeEl.textContent).toContain(
-                    expectedTotalItems.toString(),
-                    `should contain expectedTotalItems: ${expectedTotalItems}`
+                    component.totalNumber,
+                    `should contain expectedTotalItems: ${component.totalNumber}`
                 );
             });
 
@@ -206,11 +213,9 @@ describe('ResourceDetailHtmlContentLinkedobjectsComponent (DONE)', () => {
                 );
             });
 
-            it('... should render incoming group length and key in panel header (div.card-header)', () => {
+            it('... should render incoming group length as badges in panel header (div.card-header)', () => {
                 // header debug element
                 const panelHeaderDes = getAndExpectDebugElementByCss(compDe, 'div.card > div.card-header', 2, 2);
-
-                // badge debug elements
                 const badgeDes0 = getAndExpectDebugElementByCss(
                     panelHeaderDes[0],
                     'span.badge',
@@ -226,19 +231,32 @@ describe('ResourceDetailHtmlContentLinkedobjectsComponent (DONE)', () => {
                     'in second panel'
                 );
 
-                // badge native elements
                 const badge0El = badgeDes0[0].nativeElement;
                 const badge1El = badgeDes1[0].nativeElement;
 
-                // key debug elements
-                const keyDes0 = getAndExpectDebugElementByCss(
+                expect(badge0El.textContent).toBeDefined();
+                expect(badge0El.textContent).toContain(
+                    expectedIncoming[0].links.length,
+                    `should contain ${expectedIncoming[0].links.length}`
+                );
+                expect(badge1El.textContent).toBeDefined();
+                expect(badge1El.textContent).toContain(
+                    expectedIncoming[1].links.length,
+                    `should contain ${expectedIncoming[1].links.length}`
+                );
+            });
+
+            it('... should render restype label in panel header (div.card-header)', () => {
+                // header debug element
+                const panelHeaderDes = getAndExpectDebugElementByCss(compDe, 'div.card > div.card-header', 2, 2);
+                const labelDes0 = getAndExpectDebugElementByCss(
                     panelHeaderDes[0],
                     'span.awg-linked-obj-title',
                     1,
                     1,
                     'in first panel'
                 );
-                const keyDes1 = getAndExpectDebugElementByCss(
+                const labelDes1 = getAndExpectDebugElementByCss(
                     panelHeaderDes[1],
                     'span.awg-linked-obj-title',
                     1,
@@ -246,36 +264,18 @@ describe('ResourceDetailHtmlContentLinkedobjectsComponent (DONE)', () => {
                     'in second panel'
                 );
 
-                // key native elements
-                const key0El = keyDes0[0].nativeElement;
-                const key1El = keyDes1[0].nativeElement;
-
-                // create pipe
-                keyValuePipe = new KeyValuePipe(defaultKeyValueDiffers);
-                const pipedExpectedIncoming = keyValuePipe.transform(expectedIncoming);
-
-                // check badge output
-                expect(badge0El.textContent).toBeDefined();
-                expect(badge0El.textContent).toContain(
-                    pipedExpectedIncoming[0].value.length.toString(),
-                    `should contain ${pipedExpectedIncoming[0].value.length}`
-                );
-                expect(badge1El.textContent).toBeDefined();
-                expect(badge1El.textContent).toContain(
-                    pipedExpectedIncoming[1].value.length.toString(),
-                    `should contain ${pipedExpectedIncoming[1].value.length}`
-                );
+                const label0El = labelDes0[0].nativeElement;
+                const label1El = labelDes1[0].nativeElement;
 
-                // check key output
-                expect(key0El.textContent).toBeDefined();
-                expect(key0El.textContent).toContain(
-                    pipedExpectedIncoming[0].key,
-                    `should contain ${pipedExpectedIncoming[0].key}`
+                expect(label0El.textContent).toBeDefined();
+                expect(label0El.textContent).toContain(
+                    expectedIncoming[0].restypeLabel,
+                    `should contain ${expectedIncoming[0].restypeLabel}`
                 );
-                expect(key1El.textContent).toBeDefined();
-                expect(key1El.textContent).toContain(
-                    pipedExpectedIncoming[1].key,
-                    `should contain ${pipedExpectedIncoming[1].key}`
+                expect(label0El.textContent).toBeDefined();
+                expect(label1El.textContent).toContain(
+                    expectedIncoming[1].restypeLabel,
+                    `should contain ${expectedIncoming[1].restypeLabel}`
                 );
             });
 
@@ -350,143 +350,101 @@ describe('ResourceDetailHtmlContentLinkedobjectsComponent (DONE)', () => {
                 expectOpenPanelBody(compDe, 1, 'opened (second panel)');
             });
 
-            it('... should render incomingLinks in table of panel content (div.card-body)', () => {
-                const id0 = expectedIncoming['testkey1'][0].id;
-                const id1 = expectedIncoming['testkey1'][1].id;
-                const value0 = expectedIncoming['testkey1'][0].value;
-                const value1 = expectedIncoming['testkey1'][1].value;
-
-                // button debug elements
-                const buttonDes = getAndExpectDebugElementByCss(
-                    compDe,
-                    'div.card > div.card-header button.btn-link',
-                    2,
-                    2
-                );
-
-                // first button's native element to click on
-                const button0El = buttonDes[0].nativeElement;
-
-                // open first panel
-                click(button0El as HTMLElement);
-                fixture.detectChanges();
-
-                expectOpenPanelBody(compDe, 0, 'should have first panel opened');
-
-                // table debug elements
-                const tableDes = getAndExpectDebugElementByCss(compDe, 'table.awg-linked-obj-table', 1, 1);
-
-                // img
-                const imgDes = getAndExpectDebugElementByCss(tableDes[0], 'a.awg-linked-obj-link > img', 2, 2);
-                const icon0 = expectedIncoming['testkey1'][0].restype.icon;
-                const icon1 = expectedIncoming['testkey1'][1].restype.icon;
-
-                // spanId
-                const spanIdDes = getAndExpectDebugElementByCss(
-                    tableDes[0],
-                    'a.awg-linked-obj-link > span.awg-linked-obj-link-id',
-                    2,
-                    2
-                );
-
-                // spanValue
-                const spanValueDes = getAndExpectDebugElementByCss(
-                    tableDes[0],
-                    'a.awg-linked-obj-link > span.awg-linked-obj-link-value',
-                    2,
-                    2
-                );
-
-                // native elements
-                const imgEl0 = imgDes[0].nativeElement;
-                const imgEl1 = imgDes[1].nativeElement;
-
-                const spanIdEl0 = spanIdDes[0].nativeElement;
-                const spanIdEl1 = spanIdDes[1].nativeElement;
-
-                const spanValueEl0 = spanValueDes[0].nativeElement;
-                const spanValueEl1 = spanValueDes[1].nativeElement;
-
-                // check img output
-                expect(imgEl0.src).toBeDefined();
-                expect(imgEl0.src).toContain(icon0, `should contain icon0: ${icon0}`);
-
-                expect(imgEl1.src).toBeDefined();
-                expect(imgEl1.src).toContain(icon1, `should contain icon1: ${icon1}`);
-
-                // check id output
-                expect(spanIdEl0.textContent).toBeDefined();
-                expect(spanIdEl0.textContent).toBe(id0, `should be id0: ${id0}`);
-
-                expect(spanIdEl1.textContent).toBeDefined();
-                expect(spanIdEl1.textContent).toContain(id1, `should contain id1: ${id1}`);
-
-                // check value output
-                expect(spanValueEl0.textContent).toBeDefined();
-                expect(spanValueEl0.textContent).toContain(value0, `should contain value0: ${value0}`);
-
-                expect(spanValueEl1.textContent).toBeDefined();
-                expect(spanValueEl1.textContent).toContain(value1, `should contain value1: ${value1}`);
+            describe('... should render panel content (div.card-body)', () => {
+                let tableDes: DebugElement[];
+
+                beforeEach(() => {
+                    /**
+                     * Click button to open first panel and get inner table
+                     */
+
+                    // button debug elements
+                    const buttonDes = getAndExpectDebugElementByCss(
+                        compDe,
+                        'div.card > div.card-header button.btn-link',
+                        2,
+                        2
+                    );
+
+                    // first button's native element to click on
+                    const button0El = buttonDes[0].nativeElement;
+
+                    // open first panel
+                    click(button0El as HTMLElement);
+                    fixture.detectChanges();
+
+                    expectOpenPanelBody(compDe, 0, 'should have first panel opened');
+
+                    // table debug elements
+                    tableDes = getAndExpectDebugElementByCss(compDe, 'table.awg-linked-obj-table', 1, 1);
+                });
+
+                it('... should render restype icon', () => {
+                    const expectedIcon0 = expectedIncoming[0].links[0].restype.icon;
+                    const expectedIcon1 = expectedIncoming[0].links[1].restype.icon;
+
+                    const imgDes = getAndExpectDebugElementByCss(tableDes[0], 'a.awg-linked-obj-link > img', 2, 2);
+
+                    const imgEl0 = imgDes[0].nativeElement;
+                    const imgEl1 = imgDes[1].nativeElement;
+
+                    expect(imgEl0.src).toBeDefined();
+                    expect(imgEl0.src).toContain(expectedIcon0, `should contain expectedIcon0: ${expectedIcon0}`);
+
+                    expect(imgEl1.src).toBeDefined();
+                    expect(imgEl1.src).toContain(expectedIcon1, `should contain expectedIcon1: ${expectedIcon1}`);
+                });
+
+                it('... should render restpye id', () => {
+                    const expectedId0 = expectedIncoming[0].links[0].id;
+                    const expectedId1 = expectedIncoming[0].links[1].id;
+
+                    const idDes = getAndExpectDebugElementByCss(
+                        tableDes[0],
+                        'a.awg-linked-obj-link > span.awg-linked-obj-link-id',
+                        2,
+                        2
+                    );
+
+                    const idEl0 = idDes[0].nativeElement;
+                    const idEl1 = idDes[1].nativeElement;
+
+                    expect(idEl0.textContent).toBeDefined();
+                    expect(idEl0.textContent).toBe(expectedId0, `should be expectedId0: ${expectedId0}`);
+
+                    expect(idEl1.textContent).toBeDefined();
+                    expect(idEl1.textContent).toContain(expectedId1, `should contain expectedId1: ${expectedId1}`);
+                });
+
+                it('... should render link value', () => {
+                    const expectedLinkValue0 = expectedIncoming[0].links[0].value;
+                    const expectedLinkValue1 = expectedIncoming[0].links[1].value;
+
+                    const linkValueDes = getAndExpectDebugElementByCss(
+                        tableDes[0],
+                        'a.awg-linked-obj-link > span.awg-linked-obj-link-value',
+                        2,
+                        2
+                    );
+
+                    const linkValueEl0 = linkValueDes[0].nativeElement;
+                    const linkValueEl1 = linkValueDes[1].nativeElement;
+
+                    expect(linkValueEl0.textContent).toBeDefined();
+                    expect(linkValueEl0.textContent).toContain(
+                        expectedLinkValue0,
+                        `should contain expectedLinkValue0: ${expectedLinkValue0}`
+                    );
+
+                    expect(linkValueEl1.textContent).toBeDefined();
+                    expect(linkValueEl1.textContent).toContain(
+                        expectedLinkValue1,
+                        `should contain expectedLinkValue1: ${expectedLinkValue1}`
+                    );
+                });
             });
         });
 
-        describe('#updateTotalNumber', () => {
-            it('... should have been called', fakeAsync(() => {
-                expectSpyCall(updateTotalNumberSpy, 1);
-            }));
-
-            it('... should have updated totalNumber with number of nested array items', fakeAsync(() => {
-                expectSpyCall(updateTotalNumberSpy, 1);
-
-                expect(component.totalNumber).toBe(
-                    expectedTotalItems,
-                    `should be expectedTotalItems: ${expectedTotalItems}`
-                );
-            }));
-
-            it('... should do nothing on first onChanges', fakeAsync(() => {
-                const newExpectedIncoming: ResourceDetailGroupedIncomingLinks = {
-                    testkey1: [incomingLink1, incomingLink2]
-                };
-
-                // simulate the parent changing the input properties for the first time
-                component.incoming = newExpectedIncoming;
-
-                // trigger ngOnChanges
-                component.ngOnChanges({ incoming: new SimpleChange(null, component.incoming, true) });
-                fixture.detectChanges();
-
-                // spy has been called only once with ngOnInit
-                expectSpyCall(updateTotalNumberSpy, 1);
-
-                // output has not changed
-                expect(component.totalNumber).toBe(
-                    expectedTotalItems,
-                    `should be still expectedTotalItems: ${expectedTotalItems}`
-                );
-            }));
-
-            it('... should recalculate total number on input changes (second & more)', fakeAsync(() => {
-                const newExpectedIncoming: ResourceDetailGroupedIncomingLinks = {
-                    testkey1: [incomingLink1, incomingLink2, incomingLink3]
-                };
-                const newTotalItems = newExpectedIncoming['testkey1'].length;
-
-                // simulate the parent changing the input properties for the first time
-                component.incoming = newExpectedIncoming;
-
-                // trigger ngOnChanges
-                component.ngOnChanges({ incoming: new SimpleChange(null, component.incoming, false) });
-                fixture.detectChanges();
-
-                // spy has been called twice now
-                expectSpyCall(updateTotalNumberSpy, 2);
-
-                // output has changed
-                expect(component.totalNumber).toBe(newTotalItems, `should be newTotalItems: ${newTotalItems}`);
-            }));
-        });
-
         describe('#navigateToResource', () => {
             beforeEach(fakeAsync(() => {
                 // open second panel
diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/linkedobjects/linkedobjects.component.ts b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/linkedobjects/linkedobjects.component.ts
index f8f8ca1d3a..d2ff11bfcf 100644
--- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/linkedobjects/linkedobjects.component.ts
+++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/linkedobjects/linkedobjects.component.ts
@@ -1,33 +1,53 @@
-import { Component, EventEmitter, Input, OnInit, OnChanges, Output, SimpleChanges } from '@angular/core';
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
 
-import { ConversionService } from '@awg-core/services/conversion-service';
 import { ResourceDetailGroupedIncomingLinks } from '@awg-views/data-view/models';
 
+/**
+ * The ResourceDetailHtmlContentLinkedobjects component.
+ *
+ * It displays the incoming links of a resource detail and
+ * their total number.
+ */
 @Component({
     selector: 'awg-resource-detail-html-content-linkedobjects',
     templateUrl: './linkedobjects.component.html',
-    styleUrls: ['./linkedobjects.component.css']
+    styleUrls: ['./linkedobjects.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class ResourceDetailHtmlContentLinkedobjectsComponent implements OnInit, OnChanges {
+export class ResourceDetailHtmlContentLinkedobjectsComponent {
+    /**
+     * Input variable: incomingGroups.
+     *
+     * It keeps the grouped incoming links array.
+     */
     @Input()
-    incoming: ResourceDetailGroupedIncomingLinks;
+    incomingGroups: ResourceDetailGroupedIncomingLinks[];
+
+    /**
+     * Output variable: resourceRequest.
+     *
+     * It keeps an event emitter for the resource request.
+     */
     @Output()
     resourceRequest: EventEmitter<string> = new EventEmitter();
 
-    totalNumber = 0;
-
-    constructor(private conversionService: ConversionService) {}
-
-    ngOnInit() {
-        this.updateTotalNumber();
-    }
-
-    ngOnChanges(changes: SimpleChanges) {
-        if (!changes['incoming'].isFirstChange()) {
-            this.updateTotalNumber();
-        }
+    /**
+     * Getter for the total number of incoming links.
+     */
+    get totalNumber() {
+        return this.getNestedArraysTotalItems(this.incomingGroups) || 0;
     }
 
+    /**
+     * Public method: navigateToResource.
+     *
+     * It emits the given id to be handed
+     * to the parent component.
+     *
+     * @param {string} id The given resource id.
+     *
+     * @returns {void} Emits the id.
+     */
     navigateToResource(id?: string): void {
         if (!id) {
             return;
@@ -36,12 +56,27 @@ export class ResourceDetailHtmlContentLinkedobjectsComponent implements OnInit,
         this.resourceRequest.emit(id);
     }
 
-    updateTotalNumber() {
-        this.totalNumber = this.getNestedArraysTotalItems(this.incoming);
-    }
+    /**
+     * Private method: getNestedArraysTotalItems.
+     *
+     * It sums up the total items (length) of all arrays
+     * nested in an ResourceDetailGroupedIncomingLinks
+     * array.
+     *
+     * @param {ResourceDetailGroupedIncomingLinks[]} groupedLinksArr The given grouped incoming links array.
+     *
+     * @returns {number} The number of total items (length) of the nested array.
+     */
+    private getNestedArraysTotalItems(groupedLinksArr: ResourceDetailGroupedIncomingLinks[]): number {
+        if (!groupedLinksArr) {
+            return;
+        }
+
+        // callback for reduce function
+        // adds curValue to the previous result of the calculation (prevRes))
+        const reducer = (prevRes: number, curValue: number): number => prevRes + curValue;
 
-    private getNestedArraysTotalItems(obj: ResourceDetailGroupedIncomingLinks): number {
-        // sum up length of all arrays nested in linked objects object
-        return this.conversionService.getNestedArraysTotalItems(obj);
+        // map the length of every nested link array into the reducer function; default initial value: 0
+        return groupedLinksArr.map(groupedLink => groupedLink.links.length).reduce(reducer, 0);
     }
 }
diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/props/props.component.html b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/props/props.component.html
index ad94db404e..2e7d081ced 100644
--- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/props/props.component.html
+++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/props/props.component.html
@@ -3,15 +3,15 @@
     <h4 class="awg-props-title ml-0">Objektdaten</h4>
     <ul *ngFor="let prop of props">
         <li id="breakLine" *ngIf="prop?.label === metaBreakLine">
-            <hr>
+            <hr />
         </li>
-        <li class="awg-prop" *ngIf="prop?.value[0]">
+        <li class="awg-prop" *ngIf="(prop?.values)[0]">
             <!-- value label -->
             <strong class="awg-prop-label" *ngIf="prop?.label">
                 {{ prop?.label }}
             </strong>
             <!-- value content -->
-            <ul *ngFor="let value of prop?.value">
+            <ul *ngFor="let value of prop?.values">
                 <li class="awg-prop-value" *ngIf="value">
                     <span [compile-html]="value" [compile-html-ref]="this"></span>
                 </li>
diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/props/props.component.spec.ts b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/props/props.component.spec.ts
index adeb8264e9..fa7dd70023 100644
--- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/props/props.component.spec.ts
+++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/props/props.component.spec.ts
@@ -10,7 +10,7 @@ import {
 } from '@testing/expect-helper';
 
 import { CompileHtmlComponent } from '@awg-shared/compile-html';
-import { ResourceDetailProps } from '@awg-views/data-view/models';
+import { ResourceDetailProperty } from '@awg-views/data-view/models';
 
 import { ResourceDetailHtmlContentPropsComponent } from './props.component';
 
@@ -23,7 +23,7 @@ describe('ResourceDetailHtmlContentPropsComponent (DONE)', () => {
     let navigateToResourceSpy: Spy;
     let emitSpy: Spy;
 
-    let expectedProps: ResourceDetailProps[];
+    let expectedProps: ResourceDetailProperty[];
     let expectedMetaBreakLine: string;
 
     beforeEach(async(() => {
@@ -42,30 +42,17 @@ describe('ResourceDetailHtmlContentPropsComponent (DONE)', () => {
         expectedMetaBreakLine = 'Versionsdatum';
 
         const prop1Value1 = `<a (click)="ref.navigateToResource()">Op. 28</a>: Skizzen zu einem "1. Satz"<a (click)="ref.navigateToResource(\'28\')"> (später 2. Satz [<a (click)="ref.navigateToResource(330)">M 330</a>])`;
-        const props1: ResourceDetailProps = {
-            pid: '0',
-            guielement: 'text',
-            label: 'prop1',
-            value: [prop1Value1, 'prop1-value2']
-        };
-        const props2: ResourceDetailProps = {
-            pid: '1',
-            guielement: 'date',
-            label: 'Versionsdatum',
-            value: ['2019']
-        };
-        const props3: ResourceDetailProps = {
-            pid: '2',
-            guielement: 'richtext',
-            label: 'prop2',
-            value: ['prop2-value1', 'prop2-value2', 'prop2-value3']
-        };
-        const props4: ResourceDetailProps = {
-            pid: '3',
-            guielement: 'text',
-            label: 'prop1',
-            value: []
-        };
+        const props1: ResourceDetailProperty = new ResourceDetailProperty('0', 'text', 'prop1', [
+            prop1Value1,
+            'prop1-value2'
+        ]);
+        const props2: ResourceDetailProperty = new ResourceDetailProperty('1', 'date', 'Versionsdatum', ['2019']);
+        const props3: ResourceDetailProperty = new ResourceDetailProperty('2', 'richtext', 'prop2', [
+            'prop2-value1',
+            'prop2-value2',
+            'prop2-value3'
+        ]);
+        const props4: ResourceDetailProperty = new ResourceDetailProperty('3', 'text', 'prop1', []);
         expectedProps = [props1, props2, props3, props4];
 
         // spies on component functions
@@ -148,9 +135,9 @@ describe('ResourceDetailHtmlContentPropsComponent (DONE)', () => {
             it('... should contain inner ul elements according to each props.value.length', () => {
                 const outerLiDes = getAndExpectDebugElementByCss(compDe, 'ul > li.awg-prop', 3, 3);
 
-                const expectedLength0 = expectedProps[0].value.length;
-                const expectedLength1 = expectedProps[1].value.length;
-                const expectedLength2 = expectedProps[2].value.length;
+                const expectedLength0 = expectedProps[0].values.length;
+                const expectedLength1 = expectedProps[1].values.length;
+                const expectedLength2 = expectedProps[2].values.length;
 
                 getAndExpectDebugElementByCss(outerLiDes[0], 'ul', expectedLength0, expectedLength0);
                 getAndExpectDebugElementByCss(outerLiDes[1], 'ul', expectedLength1, expectedLength1);
diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/props/props.component.ts b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/props/props.component.ts
index b6c506ff15..2f1441e016 100644
--- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/props/props.component.ts
+++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/props/props.component.ts
@@ -1,24 +1,62 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 
-import { ResourceDetailProps } from '@awg-views/data-view/models';
+import { ResourceDetailProperty } from '@awg-views/data-view/models';
 
+/**
+ * The ResourceDetailHtmlContentProps component.
+ *
+ * It displays the properties of a resource detail
+ * of the data view of the app.
+ */
 @Component({
     selector: 'awg-resource-detail-html-content-props',
     templateUrl: './props.component.html',
-    styleUrls: ['./props.component.css']
+    styleUrls: ['./props.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class ResourceDetailHtmlContentPropsComponent implements OnInit {
+    /**
+     * Input variable: props.
+     *
+     * It keeps the properties for the resource detail.
+     */
     @Input()
-    props: ResourceDetailProps[];
+    props: ResourceDetailProperty[];
+
+    /**
+     * Output variable: resourceRequest.
+     *
+     * It keeps an event emitter for the selected id of a resource.
+     */
     @Output()
     resourceRequest: EventEmitter<string> = new EventEmitter();
 
+    /**
+     * Public variable: metaBreakLine.
+     *
+     * It keeps the property key for a breakline
+     * between the resource detail properties.
+     */
     metaBreakLine = 'Versionsdatum';
 
-    constructor() {}
-
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {}
 
+    /**
+     * Public method: navigateToResource.
+     *
+     * It emits a given id of a selected resource
+     * to the {@link resourceRequest}.
+     *
+     * @param {string} id The given resource id.
+     *
+     * @returns {void} Emits the id.
+     */
     navigateToResource(id?: string): void {
         if (!id) {
             return;
diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/resource-detail-html-content.component.html b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/resource-detail-html-content.component.html
index 477e177381..d3fd0a9222 100644
--- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/resource-detail-html-content.component.html
+++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/resource-detail-html-content.component.html
@@ -15,31 +15,28 @@
 <!-- resourceDetailData content -->
 <div class="awg-resource-content">
     <div class="row">
-
         <!-- object properties -->
         <div class="col-lg-8">
-            <awg-resource-detail-html-content-props *ngIf="content?.props"
-                                                    [props]="content?.props"
-                                                    (resourceRequest)="navigateToResource($event)">
+            <awg-resource-detail-html-content-props
+                [props]="content?.props"
+                (resourceRequest)="navigateToResource($event)"
+            >
             </awg-resource-detail-html-content-props>
         </div>
 
         <!-- right side nav objects -->
         <div class="col-lg-4 mt-3 mt-lg-0 mb-3">
             <div class="sidenav-right">
-
                 <!-- image objects -->
-                <awg-resource-detail-html-content-imageobjects *ngIf="content?.images.length > 0"
-                                                               [images]="content?.images">
+                <awg-resource-detail-html-content-imageobjects [images]="content?.images">
                 </awg-resource-detail-html-content-imageobjects>
 
-
                 <!-- connected objects -->
-                <awg-resource-detail-html-content-linkedobjects *ngIf="content?.incoming"
-                                                                [incoming]="content?.incoming"
-                                                                (resourceRequest)="navigateToResource($event)">
+                <awg-resource-detail-html-content-linkedobjects
+                    [incomingGroups]="content?.incoming"
+                    (resourceRequest)="navigateToResource($event)"
+                >
                 </awg-resource-detail-html-content-linkedobjects>
-
             </div>
         </div>
     </div>
diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/resource-detail-html-content.component.spec.ts b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/resource-detail-html-content.component.spec.ts
index 57c46c29c9..6459afbb72 100644
--- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/resource-detail-html-content.component.spec.ts
+++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/resource-detail-html-content.component.spec.ts
@@ -3,6 +3,7 @@ import { Component, DebugElement, EventEmitter, Input, Output } from '@angular/c
 import Spy = jasmine.Spy;
 
 import { JsonConvert } from 'json2typescript';
+import { NgxGalleryImage } from 'ngx-gallery';
 
 import {
     expectSpyCall,
@@ -16,7 +17,7 @@ import {
     ResourceDetailContent,
     ResourceDetailGroupedIncomingLinks,
     ResourceDetailImage,
-    ResourceDetailProps
+    ResourceDetailProperty
 } from '@awg-views/data-view/models';
 
 import { ResourceDetailHtmlContentComponent } from './resource-detail-html-content.component';
@@ -25,7 +26,7 @@ import { ResourceDetailHtmlContentComponent } from './resource-detail-html-conte
 @Component({ selector: 'awg-resource-detail-html-content-props', template: '' })
 class ResourceDetailHtmlContentPropsStubComponent {
     @Input()
-    props: ResourceDetailProps[];
+    props: ResourceDetailProperty[];
     @Output()
     resourceRequest: EventEmitter<string> = new EventEmitter();
 }
@@ -33,13 +34,13 @@ class ResourceDetailHtmlContentPropsStubComponent {
 @Component({ selector: 'awg-resource-detail-html-content-imageobjects', template: '' })
 class ResourceDetailHtmlContentImageobjectsStubComponent {
     @Input()
-    images: ResourceDetailImage[];
+    images: NgxGalleryImage[];
 }
 
 @Component({ selector: 'awg-resource-detail-html-content-linkedobjects', template: '' })
 class ResourceDetailHtmlContentLinkedobjectsStubComponent {
     @Input()
-    incoming: ResourceDetailGroupedIncomingLinks;
+    incomingGroups: ResourceDetailGroupedIncomingLinks[];
     @Output()
     resourceRequest: EventEmitter<string> = new EventEmitter();
 }
@@ -85,11 +86,11 @@ describe('ResourceDetailHtmlContentComponent (DONE)', () => {
             new ResourceDetailImage(context, 0),
             new ResourceDetailImage(context, 1)
         ];
-        const incoming = new ResourceDetailGroupedIncomingLinks();
-        const props: ResourceDetailProps[] = [
-            { pid: '1', guielement: 'text', label: 'Test-Label', value: ['Test1', 'Test2'] }
+        const incoming = [new ResourceDetailGroupedIncomingLinks()];
+        const props: ResourceDetailProperty[] = [
+            new ResourceDetailProperty('1', 'text', 'Test-Label', ['Test1', 'Test2'])
         ];
-        expectedContent = { props, images, incoming };
+        expectedContent = new ResourceDetailContent(props, images, incoming);
 
         // spies on component functions
         // `.and.callThrough` will track the spy down the nested describes, see
@@ -129,16 +130,16 @@ describe('ResourceDetailHtmlContentComponent (DONE)', () => {
                 getAndExpectDebugElementByCss(compDe, 'div.col-lg-4 > div.sidenav-right', 1, 1);
             });
 
-            it('... should not contain ResourceDetailHtmlContentPropsComponent (stubbed)', () => {
-                getAndExpectDebugElementByDirective(compDe, ResourceDetailHtmlContentPropsStubComponent, 0, 0);
+            it('... should contain one ResourceDetailHtmlContentPropsComponent (stubbed)', () => {
+                getAndExpectDebugElementByDirective(compDe, ResourceDetailHtmlContentPropsStubComponent, 1, 1);
             });
 
-            it('... should not contain ResourceDetailHtmlContentImageobjectsComponent (stubbed)', () => {
-                getAndExpectDebugElementByDirective(compDe, ResourceDetailHtmlContentImageobjectsStubComponent, 0, 0);
+            it('... should contain one ResourceDetailHtmlContentImageobjectsComponent (stubbed)', () => {
+                getAndExpectDebugElementByDirective(compDe, ResourceDetailHtmlContentImageobjectsStubComponent, 1, 1);
             });
 
-            it('... should not contain ResourceDetailHtmlContentLinkedobjectsComponent (stubbed)', () => {
-                getAndExpectDebugElementByDirective(compDe, ResourceDetailHtmlContentLinkedobjectsStubComponent, 0, 0);
+            it('... should contain one ResourceDetailHtmlContentLinkedobjectsComponent (stubbed)', () => {
+                getAndExpectDebugElementByDirective(compDe, ResourceDetailHtmlContentLinkedobjectsStubComponent, 1, 1);
             });
         });
     });
@@ -158,51 +159,6 @@ describe('ResourceDetailHtmlContentComponent (DONE)', () => {
         });
 
         describe('VIEW', () => {
-            it('... should contain one ResourceDetailHtmlContentPropsComponent (stubbed)', () => {
-                getAndExpectDebugElementByDirective(compDe, ResourceDetailHtmlContentPropsStubComponent, 1, 1);
-            });
-
-            it('... should contain one ResourceDetailHtmlContentImageobjectsComponent (stubbed)', () => {
-                getAndExpectDebugElementByDirective(compDe, ResourceDetailHtmlContentImageobjectsStubComponent, 1, 1);
-            });
-
-            it('... should contain one ResourceDetailHtmlContentLinkedobjectsComponent (stubbed)', () => {
-                getAndExpectDebugElementByDirective(compDe, ResourceDetailHtmlContentLinkedobjectsStubComponent, 1, 1);
-            });
-
-            it('... should contain one ResourceDetailHtmlContentPropsComponent (stubbed) only if props provided', () => {
-                getAndExpectDebugElementByDirective(compDe, ResourceDetailHtmlContentPropsStubComponent, 1, 1);
-
-                // provide data without props property
-                expectedContent.props = null;
-                component.content = expectedContent;
-                fixture.detectChanges();
-
-                getAndExpectDebugElementByDirective(compDe, ResourceDetailHtmlContentPropsStubComponent, 0, 0);
-            });
-
-            it('... should contain one ResourceDetailHtmlContentImageobjectsComponent (stubbed) only if images provided', () => {
-                getAndExpectDebugElementByDirective(compDe, ResourceDetailHtmlContentImageobjectsStubComponent, 1, 1);
-
-                // provide data without images property
-                expectedContent.images = [];
-                component.content = expectedContent;
-                fixture.detectChanges();
-
-                getAndExpectDebugElementByDirective(compDe, ResourceDetailHtmlContentImageobjectsStubComponent, 0, 0);
-            });
-
-            it('... should contain one ResourceDetailHtmlContentLinkedobjectsComponent (stubbed) only if incoming provided', () => {
-                getAndExpectDebugElementByDirective(compDe, ResourceDetailHtmlContentLinkedobjectsStubComponent, 1, 1);
-
-                // provide data without incoming property
-                expectedContent.incoming = null;
-                component.content = expectedContent;
-                fixture.detectChanges();
-
-                getAndExpectDebugElementByDirective(compDe, ResourceDetailHtmlContentLinkedobjectsStubComponent, 0, 0);
-            });
-
             it('... should pass down `content.props` to ResourceDetailHtmlContentPropsComponent', () => {
                 // get debug and native element of stubbed child
                 const propsDes = getAndExpectDebugElementByDirective(
@@ -247,8 +203,8 @@ describe('ResourceDetailHtmlContentComponent (DONE)', () => {
                     ResourceDetailHtmlContentLinkedobjectsStubComponent
                 ) as ResourceDetailHtmlContentLinkedobjectsStubComponent;
 
-                expect(incomingCmp.incoming).toBeDefined();
-                expect(incomingCmp.incoming).toBe(expectedContent.incoming);
+                expect(incomingCmp.incomingGroups).toBeDefined();
+                expect(incomingCmp.incomingGroups).toBe(expectedContent.incoming);
             });
         });
 
diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/resource-detail-html-content.component.ts b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/resource-detail-html-content.component.ts
index 568283bb28..aef9274aa7 100644
--- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/resource-detail-html-content.component.ts
+++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/resource-detail-html-content.component.ts
@@ -1,22 +1,57 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 
 import { ResourceDetailContent } from '@awg-views/data-view/models';
 
+/**
+ * The ResourceDetailHtmlContent component.
+ *
+ * It contains the content section of a resource detail
+ * of the data view of the app
+ * with a {@link ResourceDetailHtmlContentPropsComponent},
+ * a {@link ResourceDetailHtmlContentImageobjectsComponent}
+ * and the {@link ResourceDetailHtmlContentLinkedobjectsComponent}.
+ */
 @Component({
     selector: 'awg-resource-detail-html-content',
     templateUrl: './resource-detail-html-content.component.html',
-    styleUrls: ['./resource-detail-html-content.component.css']
+    styleUrls: ['./resource-detail-html-content.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class ResourceDetailHtmlContentComponent implements OnInit {
+    /**
+     * Input variable: content.
+     *
+     * It keeps the html content for the resource detail.
+     */
     @Input()
     content: ResourceDetailContent;
+
+    /**
+     * Output variable: resourceRequest.
+     *
+     * It keeps an event emitter for the selected id of a resource.
+     */
     @Output()
     resourceRequest: EventEmitter<string> = new EventEmitter();
 
-    constructor() {}
-
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {}
 
+    /**
+     * Public method: navigateToResource.
+     *
+     * It emits a given id of a selected resource
+     * to the {@link resourceRequest}.
+     *
+     * @param {string} id The given resource id.
+     *
+     * @returns {void} Emits the id.
+     */
     navigateToResource(id?: string): void {
         if (!id) {
             return;
diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html.component.html b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html.component.html
index 71649a85a7..e5956ea95f 100644
--- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html.component.html
+++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html.component.html
@@ -1,8 +1,7 @@
 <!-- resourceDetailData content -->
-<awg-resource-detail-html-content *ngIf="resourceDetailData?.content"
+<awg-resource-detail-html-content
+    *ngIf="resourceDetailData?.content"
     [content]="resourceDetailData?.content"
-    (resourceRequest)="navigateToResource($event)">
+    (resourceRequest)="navigateToResource($event)"
+>
 </awg-resource-detail-html-content>
-
-
-
diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html.component.spec.ts b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html.component.spec.ts
index 6639755ce6..eba549fd2c 100644
--- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html.component.spec.ts
+++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html.component.spec.ts
@@ -11,7 +11,7 @@ import {
     ResourceDetailGroupedIncomingLinks,
     ResourceDetailHeader,
     ResourceDetailImage,
-    ResourceDetailProps
+    ResourceDetailProperty
 } from '@awg-views/data-view/models';
 
 import { ResourceDetailHtmlComponent } from './resource-detail-html.component';
@@ -51,9 +51,9 @@ describe('ResourceDetailHtmlComponent (DONE)', () => {
         // test data
         const header: ResourceDetailHeader = { objID: '1234', icon: '', type: '', title: 'Test', lastmod: '' };
         const images: ResourceDetailImage[] = [];
-        const incoming = new ResourceDetailGroupedIncomingLinks();
-        const props: ResourceDetailProps[] = [
-            { pid: '1', guielement: 'text', label: 'Test-Label', value: ['Test1', 'Test2'] }
+        const incoming = [new ResourceDetailGroupedIncomingLinks()];
+        const props: ResourceDetailProperty[] = [
+            new ResourceDetailProperty('1', 'text', 'Test-Label', ['Test1', 'Test2'])
         ];
         const content: ResourceDetailContent = { props, images, incoming };
 
@@ -90,21 +90,12 @@ describe('ResourceDetailHtmlComponent (DONE)', () => {
     });
 
     describe('AFTER initial data binding', () => {
-        let htmlContentDes: DebugElement[];
-        let htmlContentCmp: any;
-
         beforeEach(() => {
             // simulate the parent setting the input properties
             component.resourceDetailData = expectedResourceDetailData;
 
             // trigger initial data binding
             fixture.detectChanges();
-
-            // get debug and native element of stubbed child
-            htmlContentDes = getAndExpectDebugElementByDirective(compDe, ResourceDetailHtmlContentStubComponent, 1, 1);
-            htmlContentCmp = htmlContentDes[0].injector.get(
-                ResourceDetailHtmlContentStubComponent
-            ) as ResourceDetailHtmlContentStubComponent;
         });
 
         it('should have `resourceDetailData` inputs', () => {
@@ -114,7 +105,7 @@ describe('ResourceDetailHtmlComponent (DONE)', () => {
 
         describe('VIEW', () => {
             it('should contain resource detail html content component (stubbed)', () => {
-                htmlContentDes = getAndExpectDebugElementByDirective(
+                const htmlContentDes = getAndExpectDebugElementByDirective(
                     compDe,
                     ResourceDetailHtmlContentStubComponent,
                     1,
@@ -123,7 +114,7 @@ describe('ResourceDetailHtmlComponent (DONE)', () => {
             });
 
             it('should contain resource detail html content component (stubbed) only if content provided', () => {
-                htmlContentDes = getAndExpectDebugElementByDirective(
+                const firstContentDes = getAndExpectDebugElementByDirective(
                     compDe,
                     ResourceDetailHtmlContentStubComponent,
                     1,
@@ -131,14 +122,38 @@ describe('ResourceDetailHtmlComponent (DONE)', () => {
                 );
 
                 // provide data without content property
-                expectedResourceDetailData.content = null;
+                expectedResourceDetailData = new ResourceDetail(undefined, undefined);
+
+                // simulate the host parent setting the new input properties
                 component.resourceDetailData = expectedResourceDetailData;
                 fixture.detectChanges();
 
-                getAndExpectDebugElementByDirective(compDe, ResourceDetailHtmlContentStubComponent, 0, 0);
+                // TODO: should be 0
+                //  check angular defect with testing under ChangeDetectionStrategy.OnPush : https://github.com/angular/angular/issues/12313
+
+                const newContentDes = getAndExpectDebugElementByDirective(
+                    compDe,
+                    ResourceDetailHtmlContentStubComponent,
+                    1,
+                    1
+                );
+                const newContentEl = newContentDes[0].nativeElement;
+
+                expect(newContentEl.innerHTML).toBeDefined();
+                expect(newContentEl.innerHTML).toBe('', 'should be empty string');
             });
 
             it('... should pass down `resourceDetailData` to resource detail html content component', () => {
+                const htmlContentDes = getAndExpectDebugElementByDirective(
+                    compDe,
+                    ResourceDetailHtmlContentStubComponent,
+                    1,
+                    1
+                );
+                const htmlContentCmp = htmlContentDes[0].injector.get(
+                    ResourceDetailHtmlContentStubComponent
+                ) as ResourceDetailHtmlContentStubComponent;
+
                 expect(htmlContentCmp.content).toBeDefined();
                 expect(htmlContentCmp.content).toBe(expectedResourceDetailData.content);
             });
@@ -146,6 +161,16 @@ describe('ResourceDetailHtmlComponent (DONE)', () => {
 
         describe('#navigateToResource', () => {
             it('... should trigger on event from ResourceDetailHtmlContentComponent', fakeAsync(() => {
+                const htmlContentDes = getAndExpectDebugElementByDirective(
+                    compDe,
+                    ResourceDetailHtmlContentStubComponent,
+                    1,
+                    1
+                );
+                const htmlContentCmp = htmlContentDes[0].injector.get(
+                    ResourceDetailHtmlContentStubComponent
+                ) as ResourceDetailHtmlContentStubComponent;
+
                 let id;
 
                 // undefined
@@ -168,6 +193,16 @@ describe('ResourceDetailHtmlComponent (DONE)', () => {
             }));
 
             it('... should not emit anything if no id is provided', fakeAsync(() => {
+                const htmlContentDes = getAndExpectDebugElementByDirective(
+                    compDe,
+                    ResourceDetailHtmlContentStubComponent,
+                    1,
+                    1
+                );
+                const htmlContentCmp = htmlContentDes[0].injector.get(
+                    ResourceDetailHtmlContentStubComponent
+                ) as ResourceDetailHtmlContentStubComponent;
+
                 htmlContentCmp.resourceRequest.emit(undefined);
 
                 // id is undefined
@@ -176,6 +211,16 @@ describe('ResourceDetailHtmlComponent (DONE)', () => {
             }));
 
             it('... should emit provided resource id (as string) on click', fakeAsync(() => {
+                const htmlContentDes = getAndExpectDebugElementByDirective(
+                    compDe,
+                    ResourceDetailHtmlContentStubComponent,
+                    1,
+                    1
+                );
+                const htmlContentCmp = htmlContentDes[0].injector.get(
+                    ResourceDetailHtmlContentStubComponent
+                ) as ResourceDetailHtmlContentStubComponent;
+
                 let id;
 
                 // number
diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html.component.ts b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html.component.ts
index 5275216701..fc9ea6dbaf 100644
--- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html.component.ts
+++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html.component.ts
@@ -1,23 +1,55 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 
 import { ResourceDetail } from '@awg-views/data-view/models';
 
+/**
+ * The ResourceDetailHtml component.
+ *
+ * It contains the html representation
+ * of a resource detail of the data view of the app
+ * with a {@link ResourceDetailHtmlContentComponent}.
+ */
 @Component({
     selector: 'awg-resource-detail-html',
     templateUrl: './resource-detail-html.component.html',
-    styleUrls: ['./resource-detail-html.component.css']
+    styleUrls: ['./resource-detail-html.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class ResourceDetailHtmlComponent implements OnInit {
+    /**
+     * Input variable: resourceDetailData.
+     *
+     * It keeps the header for the resource detail.
+     */
     @Input()
     resourceDetailData: ResourceDetail;
+
+    /**
+     * Output variable: resourceRequest.
+     *
+     * It keeps an event emitter for the selected id of a resource.
+     */
     @Output()
     resourceRequest: EventEmitter<string> = new EventEmitter();
 
-    constructor() {}
-
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {}
 
-    navigateToResource(id?: string) {
+    /**
+     * Public method: navigateToResource.
+     *
+     * It emits a given id of a selected resource
+     * to the {@link resourceRequest}.
+     *
+     * @param {string} id The given resource id.
+     * @returns {void} Emits the id.
+     */
+    navigateToResource(id?: string): void {
         if (!id) {
             return;
         }
diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-json-converted/resource-detail-json-converted.component.html b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-json-converted/resource-detail-json-converted.component.html
index e4eef4e498..f4654cb809 100644
--- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-json-converted/resource-detail-json-converted.component.html
+++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-json-converted/resource-detail-json-converted.component.html
@@ -1,4 +1,5 @@
 <awg-json-viewer
-    [jsonViewerHeader]="'Converted JSON response from Salsah-API'"
-    [jsonViewerData]="resourceJsonConvertedData">
+    jsonViewerHeader="Converted JSON response from Salsah-API"
+    [jsonViewerData]="resourceJsonConvertedData"
+>
 </awg-json-viewer>
diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-json-converted/resource-detail-json-converted.component.spec.ts b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-json-converted/resource-detail-json-converted.component.spec.ts
index d43bb3eabf..680e658b65 100644
--- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-json-converted/resource-detail-json-converted.component.spec.ts
+++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-json-converted/resource-detail-json-converted.component.spec.ts
@@ -41,7 +41,7 @@ describe('ResourceDetailJsonConvertedComponent (DONE)', () => {
         // test data
         expectedData = new ResourceDetail(
             { objID: '', icon: '', type: '', title: 'test', lastmod: '2019' },
-            new ResourceDetailContent()
+            new ResourceDetailContent(undefined, undefined, undefined)
         );
         expectedData.header = { objID: '', icon: '', type: '', title: 'test', lastmod: '2019' };
     });
diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-json-converted/resource-detail-json-converted.component.ts b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-json-converted/resource-detail-json-converted.component.ts
index f6e0a1100e..6398441ea5 100644
--- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-json-converted/resource-detail-json-converted.component.ts
+++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-json-converted/resource-detail-json-converted.component.ts
@@ -1,17 +1,34 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
 
 import { ResourceDetail } from '@awg-views/data-view/models';
 
+/**
+ * The ResourceDetailJsonConverted component.
+ *
+ * It contains the converted json representation
+ * of a resource detail of the data view of the app
+ * with a {@link JsonViewerComponent}.
+ */
 @Component({
     selector: 'awg-resource-detail-json-converted',
     templateUrl: './resource-detail-json-converted.component.html',
-    styleUrls: ['./resource-detail-json-converted.component.css']
+    styleUrls: ['./resource-detail-json-converted.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class ResourceDetailJsonConvertedComponent implements OnInit {
+    /**
+     * Input variable: resourceJsonConvertedData.
+     *
+     * It keeps the converted json data for the resource detail.
+     */
     @Input()
     resourceJsonConvertedData: ResourceDetail;
 
-    constructor() {}
-
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {}
 }
diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-json-raw/resource-detail-json-raw.component.html b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-json-raw/resource-detail-json-raw.component.html
index 083ead3c19..228495f18b 100644
--- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-json-raw/resource-detail-json-raw.component.html
+++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-json-raw/resource-detail-json-raw.component.html
@@ -1,5 +1,2 @@
-<awg-json-viewer
-    [jsonViewerHeader]="'Raw JSON response from Salsah-API'"
-    [jsonViewerData]="resourceJsonRawData">
+<awg-json-viewer jsonViewerHeader="Raw JSON response from Salsah-API" [jsonViewerData]="resourceJsonRawData">
 </awg-json-viewer>
-
diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-json-raw/resource-detail-json-raw.component.ts b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-json-raw/resource-detail-json-raw.component.ts
index 47b5e880c9..030b5bdfdf 100644
--- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-json-raw/resource-detail-json-raw.component.ts
+++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-json-raw/resource-detail-json-raw.component.ts
@@ -1,17 +1,34 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
 
 import { ResourceFullResponseJson } from '@awg-shared/api-objects';
 
+/**
+ * The ResourceDetailJsonRaw component.
+ *
+ * It contains the raw json representation
+ * of a resource detail of the data view of the app
+ * with a {@link JsonViewerComponent}.
+ */
 @Component({
     selector: 'awg-resource-detail-json-raw',
     templateUrl: './resource-detail-json-raw.component.html',
-    styleUrls: ['./resource-detail-json-raw.component.css']
+    styleUrls: ['./resource-detail-json-raw.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class ResourceDetailJsonRawComponent implements OnInit {
+    /**
+     * Input variable: resourceJsonRawData.
+     *
+     * It keeps the raw json data for the resource detail.
+     */
     @Input()
     resourceJsonRawData: ResourceFullResponseJson;
 
-    constructor() {}
-
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {}
 }
diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail.component.css b/src/app/views/data-view/data-outlets/resource-detail/resource-detail.component.css
index bf5434c93f..b105315b01 100644
--- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail.component.css
+++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail.component.css
@@ -27,3 +27,7 @@
         white-space: nowrap;
     }
 }
+
+ngb-tabset ::ng-deep .tab-pane.active {
+    margin: 2rem 0;
+}
diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail.component.html b/src/app/views/data-view/data-outlets/resource-detail/resource-detail.component.html
index 203f16cf42..2af6044f38 100644
--- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail.component.html
+++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail.component.html
@@ -1,87 +1,77 @@
 <!-- resource detail box -->
-<div class="awg-resource-detail-tabs" *ngIf="resourceData; else error">
 
-    <ngb-tabset>
-        <!-- html -->
-        <ngb-tab id="html" class="awg-resource-detail-long-tab">
-            <ng-template ngbTabTitle>
-                {{ tabTitle?.html }}
-            </ng-template>
-            <ng-template ngbTabContent>
-                <!-- resourceDetailData header -->
-                <awg-resource-detail-header *ngIf="resourceData?.html?.header"
-                                            [header]="resourceData?.html?.header"
-                                            [resourceUrl]="resourceUrl"
-                                            (resourceRequest)="navigateToResource($event)">
-                </awg-resource-detail-header>
-
-                <!-- html visualisation -->
-                <awg-resource-detail-html *ngIf="resourceData?.html"
-                                          [resourceDetailData]="resourceData?.html"
-                                          (resourceRequest)="navigateToResource($event)">
-                </awg-resource-detail-html>
-            </ng-template>
-        </ngb-tab>
+<!-- loading spinner -->
+<div *ngIf="isLoading$ | async; else notLoading">
+    <awg-twelve-tone-spinner></awg-twelve-tone-spinner>
+</div>
 
-        <!-- JSON converted -->
-        <ngb-tab id="converted" title="{{ tabTitle?.converted }}" class="awg-resource-detail-short-tab">
-            <ng-template ngbTabContent>
-                <!-- resourceDetailData header -->
-                <awg-resource-detail-header *ngIf="resourceData?.html?.header"
-                                            [header]="resourceData?.html?.header"
-                                            [resourceUrl]="resourceUrl"
-                                            (resourceRequest)="navigateToResource($event)">
-                </awg-resource-detail-header>
+<ng-template #notLoading>
+    <!-- error message -->
+    <div class="errorMessage" *ngIf="errorMessage">
+        <p>Die Anfrage "{{ errorMessage?.route }}" ist fehlgeschlagen.</p>
+        <p>Fehlermeldung: "{{ errorMessage?.statusText || errorMessage }}".</p>
+        <p>Möglicherweise gab es ein Problem mit der Internetverbindung oder dem verwendeten Suchbegriff.</p>
+    </div>
 
-                <!-- converted json visualisation -->
-                <awg-resource-detail-json-converted *ngIf="resourceData?.jsonConverted"
-                                                    [resourceJsonConvertedData]="resourceData?.jsonConverted">
-                </awg-resource-detail-json-converted>
-            </ng-template>
-        </ngb-tab>
+    <!-- async data -->
+    <div class="awg-resource-detail-tabs" *ngIf="resourceData">
+        <!-- resourceDetailData header -->
+        <awg-resource-detail-header
+            *ngIf="resourceData.detail.header"
+            [header]="resourceData.detail.header"
+            [resourceUrl]="httpGetUrl"
+            (resourceRequest)="navigateToResource($event)"
+        ></awg-resource-detail-header>
 
-        <!-- JSON raw -->
-        <ngb-tab id="raw" title="{{ tabTitle?.raw }}" class="awg-resource-detail-short-tab">
-            <ng-template ngbTabContent>
-                <!-- resourceDetailData header -->
-                <awg-resource-detail-header *ngIf="resourceData?.html?.header"
-                                            [header]="resourceData?.html?.header"
-                                            [resourceUrl]="resourceUrl"
-                                            (resourceRequest)="navigateToResource($event)">
-                </awg-resource-detail-header>
+        <ngb-tabset>
+            <!-- html -->
+            <ngb-tab id="html" class="awg-resource-detail-long-tab">
+                <ng-template ngbTabTitle>
+                    {{ tabTitles?.html }}
+                </ng-template>
+                <ng-template ngbTabContent>
+                    <!-- html visualisation -->
+                    <awg-resource-detail-html
+                        [resourceDetailData]="resourceData.detail"
+                        (resourceRequest)="navigateToResource($event)"
+                    >
+                    </awg-resource-detail-html>
+                </ng-template>
+            </ngb-tab>
 
-                <!-- raw json visualisation -->
-                <awg-resource-detail-json-raw *ngIf="resourceData?.jsonRaw"
-                                              [resourceJsonRawData]="resourceData?.jsonRaw">
-                </awg-resource-detail-json-raw>
-            </ng-template>
-        </ngb-tab>
+            <!-- JSON converted -->
+            <ngb-tab id="converted" title="{{ tabTitles?.converted }}" class="awg-resource-detail-short-tab">
+                <ng-template ngbTabContent>
+                    <!-- converted json visualisation -->
+                    <awg-resource-detail-json-converted [resourceJsonConvertedData]="resourceData.jsonConverted">
+                    </awg-resource-detail-json-converted>
+                </ng-template>
+            </ngb-tab>
 
-    </ngb-tabset>
+            <!-- JSON raw -->
+            <ngb-tab id="raw" title="{{ tabTitles?.raw }}" class="awg-resource-detail-short-tab">
+                <ng-template ngbTabContent>
+                    <!-- raw json visualisation -->
+                    <awg-resource-detail-json-raw [resourceJsonRawData]="resourceData.jsonRaw">
+                    </awg-resource-detail-json-raw>
+                </ng-template>
+            </ngb-tab>
+        </ngb-tabset>
+    </div>
 
     <!--
     TODO: remove
     <ul class="nav nav-tabs nav-justified" role="tablist">
-        <li class="active awg-resource-detail-long-tab"><a data-toggle="tab" href="#html">{{ tabTitle?.html }}</a></li>
+        <li class="active awg-resource-detail-long-tab"><a data-toggle="tab" href="#html">{{ tabTitles?.html }}</a></li>
         <li class="dropdown awg-resource-detail-short-tab">
             <a href="#" data-toggle="dropdown" class="dropdown-toggle">
                 {{ '{' }} JSON {{ '}' }} <b class="caret"></b>
             </a>
             <ul class="dropdown-menu dropdown-menu-right">
-                <li><a data-toggle="tab" href="#converted">{{ tabTitle?.converted }}</a></li>
-                <li><a data-toggle="tab" href="#raw">{{ tabTitle?.raw }}</a></li>
+                <li><a data-toggle="tab" href="#converted">{{ tabTitles?.converted }}</a></li>
+                <li><a data-toggle="tab" href="#raw">{{ tabTitles?.raw }}</a></li>
             </ul>
         </li>
     </ul>
-
     -->
-
-</div>
-
-<ng-template #error>
-    <div class="errorMessage" *ngIf="errorMessage">
-        <p>Die Anfrage "{{ errorMessage?.route }}" ist fehlgeschlagen.</p>
-        <p>Fehlermeldung: "{{ errorMessage?.statusText }}".</p>
-        <p>Möglicherweise gab es ein Problem mit der Internetverbindung oder dem verwendeten Suchbegriff.</p>
-    </div>
 </ng-template>
diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail.component.spec.ts b/src/app/views/data-view/data-outlets/resource-detail/resource-detail.component.spec.ts
index 2ea00c111e..081ec14865 100644
--- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail.component.spec.ts
+++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail.component.spec.ts
@@ -1,14 +1,20 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { Component, DebugElement, Input } from '@angular/core';
+import { Component, DebugElement, EventEmitter, Input, Output } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
+
 import { ActivatedRouteStub } from '@testing/router-stubs';
-import { NgbTabsetModule } from '@ng-bootstrap/ng-bootstrap';
+import { mockResourceDetail, mockResourceFullResponseJson } from '@testing/mock-data';
 
-import { ResourceDetail, ResourceDetailHeader } from '@awg-views/data-view/models';
-import { ResourceFullResponseJson } from '@awg-shared/api-objects';
+import { of as observableOf } from 'rxjs';
+import { JsonConvert } from 'json2typescript';
+import { NgbTabsetModule } from '@ng-bootstrap/ng-bootstrap';
+import Spy = jasmine.Spy;
 
+import { DataStreamerService, LoadingService } from '@awg-core/services';
 import { DataApiService } from '@awg-views/data-view/services';
-import { ConversionService, DataStreamerService } from '@awg-core/services';
+
+import { ResourceFullResponseJson } from '@awg-shared/api-objects';
+import { ResourceData, ResourceDetail, ResourceDetailHeader } from '@awg-views/data-view/models';
 
 import { ResourceDetailComponent } from './resource-detail.component';
 
@@ -19,16 +25,16 @@ class ResourceDetailHeaderStubComponent {
     header: ResourceDetailHeader;
     @Input()
     resourceUrl: string;
-
-    // TODO: handle outputs
+    @Output()
+    resourceRequest: EventEmitter<string> = new EventEmitter();
 }
 
 @Component({ selector: 'awg-resource-detail-html', template: '' })
 class ResourceDetailHtmlStubComponent {
     @Input()
     resourceDetailData: ResourceDetail;
-
-    // TODO: handle outputs
+    @Output()
+    resourceRequest: EventEmitter<string> = new EventEmitter();
 }
 
 @Component({ selector: 'awg-resource-detail-json-converted', template: '' })
@@ -43,21 +49,33 @@ class ResourceDetailJsonRawStubComponent {
     resourceJsonRawData: ResourceFullResponseJson;
 }
 
+@Component({ selector: 'awg-twelve-tone-spinner', template: '' })
+class TwelveToneSpinnerStubComponent {}
+
 describe('ResourceDetailComponent', () => {
     let component: ResourceDetailComponent;
     let fixture: ComponentFixture<ResourceDetailComponent>;
     let compDe: DebugElement;
     let compEl: any;
 
-    let mockRouter;
+    let mockRouter: Spy;
     let mockActivatedRoute: ActivatedRouteStub;
 
+    // json object
+    let jsonConvert: JsonConvert;
+    let expectedResourceFullResponseJson: ResourceFullResponseJson;
+
+    let expectedResourceData: ResourceData;
+
     beforeEach(async(() => {
         // stub services for test purposes
         // TODO: provide accurate types and service responses
-        const mockConversionService = { prepareResourceDetail: () => {} };
-        const mockSearchService = { httpGetUrl: '', getResourceDetailData: () => {} };
-        const mockStreamerService = { updateCurrentResourceIdStream: () => {} };
+        const mockDataApiService = {
+            httpGetUrl: '/testUrl',
+            getResourceData: () => observableOf(expectedResourceData)
+        };
+        const mockLoadingService = { getLoadingStatus: () => observableOf(false) };
+        const mockDataStreamerService = { updateResourceId: () => {} };
 
         // router spy object
         mockRouter = jasmine.createSpyObj('Router', ['navigate']);
@@ -71,14 +89,15 @@ describe('ResourceDetailComponent', () => {
                 ResourceDetailHeaderStubComponent,
                 ResourceDetailHtmlStubComponent,
                 ResourceDetailJsonConvertedStubComponent,
-                ResourceDetailJsonRawStubComponent
+                ResourceDetailJsonRawStubComponent,
+                TwelveToneSpinnerStubComponent
             ],
             providers: [
-                { provide: ConversionService, useValue: mockConversionService },
-                { provide: DataApiService, useValue: mockSearchService },
-                { provide: DataStreamerService, useValue: mockStreamerService },
+                { provide: ActivatedRoute, useValue: mockActivatedRoute },
                 { provide: Router, useValue: mockRouter },
-                { provide: ActivatedRoute, useValue: mockActivatedRoute }
+                { provide: DataApiService, useValue: mockDataApiService },
+                { provide: DataStreamerService, useValue: mockDataStreamerService },
+                { provide: LoadingService, useValue: mockLoadingService }
             ]
         }).compileComponents();
     }));
@@ -89,10 +108,18 @@ describe('ResourceDetailComponent', () => {
         compDe = fixture.debugElement;
         compEl = compDe.nativeElement;
 
-        /*
-        mockActivatedRoute.setParamMap({ id: '1234' });
-        mockActivatedRoute.paramMap.subscribe(value => console.log(value));
-        */
+        // mockActivatedRoute.setParamMap({ id: '1234' });
+        // mockActivatedRoute.paramMap.subscribe(value => console.log(value));
+
+        // convert json objects
+        jsonConvert = new JsonConvert();
+        expectedResourceFullResponseJson = jsonConvert.deserializeObject(
+            mockResourceFullResponseJson,
+            ResourceFullResponseJson
+        );
+
+        // test data
+        expectedResourceData = new ResourceData(expectedResourceFullResponseJson, mockResourceDetail);
 
         fixture.detectChanges();
     });
diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail.component.ts b/src/app/views/data-view/data-outlets/resource-detail/resource-detail.component.ts
index 3461e3a30c..97af269869 100644
--- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail.component.ts
+++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail.component.ts
@@ -1,144 +1,233 @@
-import { Component, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core';
 import { ActivatedRoute, ParamMap, Router } from '@angular/router';
 
-import { switchMap, map } from 'rxjs/operators';
+import { Observable, Subject } from 'rxjs';
+import { switchMap, takeUntil } from 'rxjs/operators';
 
 import { NgbTabsetConfig } from '@ng-bootstrap/ng-bootstrap';
 
-import { ConversionService, DataStreamerService } from '@awg-core/services';
+import { DataStreamerService, LoadingService } from '@awg-core/services';
 import { DataApiService } from '@awg-views/data-view/services';
-import { ResourceData, ResourceDetail } from '@awg-views/data-view/models';
-import { ResourceFullResponseJson } from '@awg-shared/api-objects';
 
+import { ResourceData } from '@awg-views/data-view/models';
+
+/**
+ * The ResourceDetail component.
+ *
+ * It contains the resource detail section
+ * of the data (search) view of the app
+ * with a {@link TwelveToneSpinnerComponent}
+ * and an ng-bootstrap tabset that contains
+ * the {@link ResourceDetailHeaderComponent},
+ * {@link ResourceDetailHtmlComponent},
+ * {@link ResourceDetailJsonConvertedComponent}
+ * and the {@link ResourceDetailJsonRawComponent}.
+ */
 @Component({
     selector: 'awg-resource-detail',
     templateUrl: './resource-detail.component.html',
     styleUrls: ['./resource-detail.component.css'],
-    providers: [NgbTabsetConfig]
+    providers: [NgbTabsetConfig],
+    changeDetection: ChangeDetectionStrategy.Default
 })
-export class ResourceDetailComponent implements OnInit {
-    resourceData: ResourceData;
-    resourceId: string;
-    resourceUrl: string;
-    oldId: string;
+export class ResourceDetailComponent implements OnInit, OnDestroy {
+    /**
+     * Public variable: destroy$.
+     *
+     * Subject to emit a truthy value in the ngOnDestroy lifecycle hook.
+     */
+    destroy$: Subject<boolean> = new Subject<boolean>();
 
+    /**
+     * Public variable: errorMessage.
+     *
+     * It keeps an errorMessage for the resource data subscription.
+     */
     errorMessage: any = undefined;
 
-    tabTitle = {
+    /**
+     * Public variable: oldId.
+     *
+     * It keeps the id of the previous resource detail.
+     */
+    oldId: string;
+
+    /**
+     * Public variable: resourceData.
+     *
+     * It keeps the data of the resource detail.
+     */
+    resourceData: ResourceData;
+
+    /**
+     * Public variable: resourceId.
+     *
+     * It keeps the id of the current resource detail.
+     */
+    resourceId: string;
+
+    /**
+     * Public variable: tabTitles.
+     *
+     * It keeps the titles for the tab panels.
+     */
+    tabTitles = {
         html: 'Detail',
         raw: 'JSON (raw)',
         converted: 'JSON (converted)'
     };
 
+    /**
+     * Getter for the httpGetUrl of the {@link DataApiService}.
+     */
+    get httpGetUrl(): string {
+        return this.dataApiService.httpGetUrl;
+    }
+
+    /**
+     * Getter for the loading status observable of the {@link LoadingService}.
+     */
+    get isLoading$(): Observable<boolean> {
+        return this.loadingService.getLoadingStatus();
+    }
+
+    /**
+     * Constructor of the ResourceDetailComponent.
+     *
+     * It declares private instances of the Angular ActivatedRoute,
+     * the Angular Router, the DataApiService, the DataStreamerService,
+     * the LoadingService, and a configuration object for the
+     * ng-bootstrap tabset.
+     *
+     * @param {ActivatedRoute} route Instance of the Angular ActivatedRoute.
+     * @param {Router} router Instance of the Angular Router.
+     * @param {DataApiService} dataApiService Instance of the DataApiService.
+     * @param {DataStreamerService} dataStreamerService Instance of the DataStreamerService.
+     * @param {LoadingService} loadingService Instance of the LoadingService.
+     * @param {NgbTabsetConfig} config Instance of the NgbTabsetConfig.
+     */
     constructor(
         private route: ActivatedRoute,
         private router: Router,
-        private conversionService: ConversionService,
-        private searchService: DataApiService,
-        private streamerService: DataStreamerService,
+        private dataApiService: DataApiService,
+        private dataStreamerService: DataStreamerService,
+        private loadingService: LoadingService,
         config: NgbTabsetConfig
     ) {
         config.justify = 'justified';
     }
 
-    /*
-     * Scroll to Top of Window
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
      */
-    static scrollToTop() {
-        window.scrollTo(0, 0);
-    }
-
     ngOnInit() {
+        this.routeToSidenav();
         this.getResourceData();
-        this.activateSidenav();
     }
 
-    getResourceData() {
+    /**
+     * Public method: getResourceData.
+     *
+     * It gets the resource id from the route params
+     * and fetches the corresponding resource data
+     * from the {@link DataApiService}.
+     *
+     * @returns {void} Sets the resource data.
+     */
+    getResourceData(): void {
         // observe route params
         this.route.paramMap
             .pipe(
                 switchMap((params: ParamMap) => {
-                    // store resource id
-                    this.resourceId = params.get('id');
-
-                    // fetch data
-                    return this.searchService.getResourceDetailData(params.get('id')).pipe(
-                        map((resourceBody: ResourceFullResponseJson) => {
-                            // update current resource params (url and id) via streamer service
-                            this.updateResourceParams();
-
-                            // prepare resource detail
-                            return this.prepareResourceDetail(resourceBody);
-                        })
-                    );
-                })
+                    // short cut for id param
+                    const id = params.get('id');
+
+                    // update current resource id via streamer service
+                    this.updateResourceId(id);
+
+                    // fetch resource data depending on param id
+                    return this.dataApiService.getResourceData(id);
+                }),
+                takeUntil(this.destroy$)
             )
             .subscribe(
-                (resourceData: ResourceData) => {
-                    this.resourceData = resourceData;
-
-                    // scroll to Top of Page
-                    ResourceDetailComponent.scrollToTop();
+                (data: ResourceData) => {
+                    // subscribe to resource data to trigger loading service
+                    this.resourceData = data;
                 },
-                error => {
-                    this.errorMessage = error as any;
-                }
+                err => (this.errorMessage = err)
             );
     }
 
-    updateResourceParams() {
-        // update current id
-        this.updateResourceId();
-
-        // update url for resource
-        this.updateCurrentUrl();
-    }
+    /**
+     * Public method: updateResourceId.
+     *
+     * It updates the resource id in the component
+     * and the streamer service.
+     *
+     * @param {string} id The given resource id.
+     *
+     * @returns {void} Sets the resource id.
+     */
+    updateResourceId(id: string): void {
+        // store current resource id
+        this.resourceId = id;
 
-    updateResourceId() {
         // share current id via streamer service
-        this.streamerService.updateCurrentResourceIdStream(this.resourceId);
+        this.dataStreamerService.updateResourceId(id);
     }
 
-    updateCurrentUrl() {
-        // get url from search service
-        this.resourceUrl = this.searchService.httpGetUrl;
-    }
-
-    prepareResourceDetail(resourceBody: ResourceFullResponseJson): ResourceData {
-        if (Object.keys(resourceBody).length === 0 && resourceBody.constructor === Object) {
-            return;
-        }
-
-        // convert data for displaying resource detail
-        const html: ResourceDetail = this.conversionService.prepareResourceDetail(resourceBody, this.resourceId);
-
-        // return new resource data
-        return (this.resourceData = new ResourceData(resourceBody, html));
-    }
-
-    /*
-     * Navigate to ResourceDetail:
-     * if nextId is emitted, use nextId for navigation, else navigate to oldId (backButton)
-     * if oldId not exists (first call), use resourceId
+    /**
+     * Public method: navigateToResource.
+     *
+     * It navigates to the '/data/resource' route
+     * with the given id.
+     *
+     * If nextId is emitted, use nextId for navigation,
+     * else navigate to oldId (backButton). If oldId
+     * not exists (first call), use resourceId.
+     *
+     * @param {string} [id] The given resource id.
+     * @returns {void} Navigates to the resource.
      */
-    navigateToResource(nextId?: string): void {
-        const showId = nextId ? nextId : this.oldId ? this.oldId : this.resourceId;
+    navigateToResource(id?: string): void {
+        const nextId = id ? id : this.oldId ? this.oldId : this.resourceId;
+
         // save resourceId as oldId
         this.oldId = this.resourceId;
-        // update resourceId
-        this.resourceId = showId;
 
         // navigate to new resource
-        this.router.navigate(['/data/resource', +this.resourceId]);
+        this.router.navigate(['/data/resource', +nextId]);
     }
 
-    /*
-     * Activate Sidenav: ResourceInfo
+    /**
+     * Public method: routeToSidenav.
+     *
+     * It activates the secondary outlet with the resource-info.
+     *
+     * @returns {void} Activates the resource-info side outlet.
      */
-    activateSidenav(): void {
+    routeToSidenav(): void {
         this.router.navigate([{ outlets: { side: 'resourceInfo' } }], {
             preserveFragment: true,
             queryParamsHandling: 'preserve'
         });
     }
+
+    /**
+     * Angular life cycle hook: ngOnDestroy.
+     *
+     * It calls the containing methods
+     * when destroying the component.
+     */
+    ngOnDestroy() {
+        // emit truthy value to end all subscriptions
+        this.destroy$.next(true);
+
+        // Now let's also unsubscribe from the subject itself:
+        this.destroy$.unsubscribe();
+    }
 }
diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail.module.ts b/src/app/views/data-view/data-outlets/resource-detail/resource-detail.module.ts
index 4699edc5a2..cf0ea05186 100644
--- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail.module.ts
+++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail.module.ts
@@ -10,6 +10,12 @@ import { ResourceDetailHtmlContentPropsComponent } from './resource-detail-html/
 import { ResourceDetailJsonConvertedComponent } from './resource-detail-json-converted/resource-detail-json-converted.component';
 import { ResourceDetailJsonRawComponent } from './resource-detail-json-raw/resource-detail-json-raw.component';
 
+/**
+ * The resource detail module.
+ *
+ * It embeds the resource detail components
+ * as well as the {@link SharedModule}.
+ */
 @NgModule({
     imports: [SharedModule],
     declarations: [
diff --git a/src/app/views/data-view/data-outlets/search-overview.component.spec.ts b/src/app/views/data-view/data-outlets/search-overview.component.spec.ts
index 58cd4900b6..61d74d0a76 100644
--- a/src/app/views/data-view/data-outlets/search-overview.component.spec.ts
+++ b/src/app/views/data-view/data-outlets/search-overview.component.spec.ts
@@ -1,19 +1,16 @@
 /* tslint:disable:no-unused-variable */
 import { async, ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing';
 import { Component, DebugElement, EventEmitter, Input, Output } from '@angular/core';
+
 import Spy = jasmine.Spy;
+import { expectSpyCall, getAndExpectDebugElementByDirective } from '@testing/expect-helper';
 
-import {
-    expectSpyCall,
-    getAndExpectDebugElementByCss,
-    getAndExpectDebugElementByDirective
-} from '@testing/expect-helper';
 import { RouterOutletStubComponent } from '@testing/router-stubs';
-
 import { SideInfoService } from '@awg-core/services';
-import { RouterLinkButton } from '@awg-shared/router-link-button-group/router-link-button.model';
 
+import { RouterLinkButton } from '@awg-shared/router-link-button-group/router-link-button.model';
 import { SearchOverviewComponent } from './search-overview.component';
+import { ActivatedRoute } from '@angular/router';
 
 // mock components
 @Component({ selector: 'awg-router-link-button-group', template: '' })
@@ -30,22 +27,57 @@ describe('SearchOverviewComponent (DONE)', () => {
     let compDe: DebugElement;
     let compEl: any;
 
-    let expectedButtonArray: RouterLinkButton[];
+    let expectedButtonArray: RouterLinkButton[] = [
+        new RouterLinkButton('/data/search', 'fulltext', 'Volltext-Suche', false),
+        new RouterLinkButton('/data/search', 'timeline', 'Timeline', true),
+        new RouterLinkButton('/data/search', 'bibliography', 'Bibliographie', true)
+    ];
+
+    let mockActivatedRoute;
+    let mockActivatedRoutePath: string;
 
     let selectButtonSpy: Spy;
-    let updateSearchInfoTitleSpy: Spy;
+    let updateSearchInfoTitleFromPathSpy: Spy;
+    let service_updateSearchInfoTitleSpy: Spy;
+    let service_clearSearchInfoDataSpy: Spy;
 
     beforeEach(async(() => {
         // create a fake service object with a `updateSearchInfoTitle()` spy
-        const sideInfoService = jasmine.createSpyObj('SideInfoService', ['updateSearchInfoTitle']);
+        const mockSideInfoService = jasmine.createSpyObj('SideInfoService', [
+            'updateSearchInfoTitle',
+            'clearSearchInfoData'
+        ]);
 
         // spies on service
-        updateSearchInfoTitleSpy = sideInfoService.updateSearchInfoTitle.and.callThrough();
+        service_updateSearchInfoTitleSpy = mockSideInfoService.updateSearchInfoTitle.and.callThrough();
+        service_clearSearchInfoDataSpy = mockSideInfoService.clearSearchInfoData.and.callThrough();
+
+        // mocked activated route
+        // see https://gist.github.com/benjamincharity/3d25cd2c95b6ecffadb18c3d4dbbd80b
+        mockActivatedRoute = {
+            snapshot: {
+                children: [
+                    {
+                        url: [
+                            {
+                                path: 'fulltext'
+                            }
+                        ]
+                    }
+                ]
+            }
+        };
+        mockActivatedRoutePath = mockActivatedRoute.snapshot.children[0].url[0].path;
 
         TestBed.configureTestingModule({
-            imports: [],
             declarations: [SearchOverviewComponent, RouterLinkButtonGroupStubComponent, RouterOutletStubComponent],
-            providers: [{ provide: SideInfoService, useValue: sideInfoService }]
+            providers: [
+                { provide: SideInfoService, useValue: mockSideInfoService },
+                {
+                    provide: ActivatedRoute,
+                    useValue: mockActivatedRoute
+                }
+            ]
         }).compileComponents();
     }));
 
@@ -66,6 +98,7 @@ describe('SearchOverviewComponent (DONE)', () => {
         // `.and.callThrough` will track the spy down the nested describes, see
         // https://jasmine.github.io/2.0/introduction.html#section-Spies:_%3Ccode%3Eand.callThrough%3C/code%3E
         selectButtonSpy = spyOn(component, 'onButtonSelect').and.callThrough();
+        updateSearchInfoTitleFromPathSpy = spyOn(component, 'updateSearchInfoTitleFromPath').and.callThrough();
     });
 
     it('should create', () => {
@@ -73,19 +106,32 @@ describe('SearchOverviewComponent (DONE)', () => {
     });
 
     describe('BEFORE initial data binding', () => {
-        it('should not have `searchButtonArray`', () => {
-            expect(component.searchButtonArray).toBeUndefined('should be undefined');
+        it('should have `searchButtonArray`', () => {
+            expect(component.searchButtonArray).toBeDefined('should be defined');
+            expect(component.searchButtonArray).toEqual(expectedButtonArray, `should equal ${expectedButtonArray}`);
         });
 
-        describe('#onButtonSelect', () => {
+        describe('#updateSearchInfoTitleFromPath', () => {
             it('... should not have been called', () => {
-                expect(component.onButtonSelect).not.toHaveBeenCalled();
+                expectSpyCall(updateSearchInfoTitleFromPathSpy, 0);
             });
         });
 
-        describe('SideInfoService# updateSearchInfoTitle', () => {
+        describe('#onButtonSelect', () => {
             it('... should not have been called', () => {
-                expect(updateSearchInfoTitleSpy).not.toHaveBeenCalled();
+                expectSpyCall(selectButtonSpy, 0);
+            });
+
+            describe('SideInfoService# updateSearchInfoTitle', () => {
+                it('... should not have been called', () => {
+                    expect(service_updateSearchInfoTitleSpy).not.toHaveBeenCalled();
+                });
+            });
+
+            describe('SideInfoService# clearSearchInfoData', () => {
+                it('... should not have been called', () => {
+                    expect(service_clearSearchInfoDataSpy).not.toHaveBeenCalled();
+                });
             });
         });
 
@@ -106,16 +152,7 @@ describe('SearchOverviewComponent (DONE)', () => {
             fixture.detectChanges();
         });
 
-        it('should have `searchButtonArray`', () => {
-            expect(component.searchButtonArray).toBeDefined('should be defined');
-            expect(component.searchButtonArray).toEqual(expectedButtonArray, `should equal ${expectedButtonArray}`);
-        });
-
         describe('VIEW', () => {
-            it('... should contain one router outlet (stubbed)', () => {
-                getAndExpectDebugElementByDirective(compDe, RouterOutletStubComponent, 1, 1);
-            });
-
             it('... should contain one RouterLinkButtonGroupComponent', () => {
                 getAndExpectDebugElementByDirective(compDe, RouterLinkButtonGroupStubComponent, 1, 1);
             });
@@ -131,6 +168,29 @@ describe('SearchOverviewComponent (DONE)', () => {
             });
         });
 
+        describe('#updateSearchInfoTitleFromPath', () => {
+            it('... should have been called', () => {
+                expectSpyCall(updateSearchInfoTitleFromPathSpy, 1);
+            });
+
+            it('... should update search info title from path', () => {
+                expectSpyCall(updateSearchInfoTitleFromPathSpy, 1);
+
+                const path = mockActivatedRoutePath;
+
+                // filter searchButtonArray
+                const expectedButton = expectedButtonArray.filter(button => {
+                    return button.link === path;
+                });
+
+                if (expectedButton.length === 1) {
+                    expectSpyCall(service_updateSearchInfoTitleSpy, 1, expectedButton[0].label);
+                } else {
+                    expectSpyCall(service_updateSearchInfoTitleSpy, 0);
+                }
+            });
+        });
+
         describe('#onButtonSelect', () => {
             it('... should not have been called', () => {
                 expect(component.onButtonSelect).not.toHaveBeenCalled();
@@ -158,63 +218,154 @@ describe('SearchOverviewComponent (DONE)', () => {
                 expectSpyCall(selectButtonSpy, 3, expectedButtonArray[2]);
             }));
 
-            it('... should not do anything if no RouterLinkButton provided', fakeAsync(() => {
-                const buttonDes = getAndExpectDebugElementByDirective(compDe, RouterLinkButtonGroupStubComponent, 1, 1);
-                const buttonCmp = buttonDes[0].injector.get(
-                    RouterLinkButtonGroupStubComponent
-                ) as RouterLinkButtonGroupStubComponent;
+            describe('... should not do anything if no RouterLinkButton provided', () => {
+                // first call was on init
 
                 let noRouterLinkButton;
 
-                // emit undefined
-                noRouterLinkButton = undefined;
-                buttonCmp.selectButtonRequest.emit(noRouterLinkButton);
-
-                expectSpyCall(selectButtonSpy, 1, noRouterLinkButton);
-                expect(updateSearchInfoTitleSpy).not.toHaveBeenCalled();
-
-                // emit null
-                noRouterLinkButton = null;
-                buttonCmp.selectButtonRequest.emit(noRouterLinkButton);
-
-                expectSpyCall(selectButtonSpy, 2, noRouterLinkButton);
-                expect(updateSearchInfoTitleSpy).not.toHaveBeenCalled();
-
-                // emit empty string
-                noRouterLinkButton = '';
-                buttonCmp.selectButtonRequest.emit(noRouterLinkButton);
-
-                expectSpyCall(selectButtonSpy, 3, noRouterLinkButton);
-                expect(updateSearchInfoTitleSpy).not.toHaveBeenCalled();
-
-                // emit string
-                noRouterLinkButton = 'test';
-                buttonCmp.selectButtonRequest.emit(noRouterLinkButton);
+                it('... not with undefined', () => {
+                    const buttonDes = getAndExpectDebugElementByDirective(
+                        compDe,
+                        RouterLinkButtonGroupStubComponent,
+                        1,
+                        1
+                    );
+                    const buttonCmp = buttonDes[0].injector.get(
+                        RouterLinkButtonGroupStubComponent
+                    ) as RouterLinkButtonGroupStubComponent;
+
+                    // emit undefined
+                    noRouterLinkButton = undefined;
+                    buttonCmp.selectButtonRequest.emit(noRouterLinkButton);
+
+                    expectSpyCall(selectButtonSpy, 1, noRouterLinkButton);
+                    expectSpyCall(service_updateSearchInfoTitleSpy, 1);
+                });
+
+                it('... not with null', () => {
+                    const buttonDes = getAndExpectDebugElementByDirective(
+                        compDe,
+                        RouterLinkButtonGroupStubComponent,
+                        1,
+                        1
+                    );
+                    const buttonCmp = buttonDes[0].injector.get(
+                        RouterLinkButtonGroupStubComponent
+                    ) as RouterLinkButtonGroupStubComponent;
+
+                    // emit null
+                    noRouterLinkButton = null;
+                    buttonCmp.selectButtonRequest.emit(noRouterLinkButton);
+
+                    expectSpyCall(selectButtonSpy, 1, noRouterLinkButton);
+                    expectSpyCall(service_updateSearchInfoTitleSpy, 1);
+                });
+
+                it('... not with empty string', () => {
+                    const buttonDes = getAndExpectDebugElementByDirective(
+                        compDe,
+                        RouterLinkButtonGroupStubComponent,
+                        1,
+                        1
+                    );
+                    const buttonCmp = buttonDes[0].injector.get(
+                        RouterLinkButtonGroupStubComponent
+                    ) as RouterLinkButtonGroupStubComponent;
+
+                    // emit empty string
+                    noRouterLinkButton = '';
+                    buttonCmp.selectButtonRequest.emit(noRouterLinkButton);
+
+                    expectSpyCall(selectButtonSpy, 1, noRouterLinkButton);
+                    expectSpyCall(service_updateSearchInfoTitleSpy, 1);
+                });
+
+                it('... not with string', () => {
+                    const buttonDes = getAndExpectDebugElementByDirective(
+                        compDe,
+                        RouterLinkButtonGroupStubComponent,
+                        1,
+                        1
+                    );
+                    const buttonCmp = buttonDes[0].injector.get(
+                        RouterLinkButtonGroupStubComponent
+                    ) as RouterLinkButtonGroupStubComponent;
+
+                    // emit string
+                    noRouterLinkButton = 'test';
+                    buttonCmp.selectButtonRequest.emit(noRouterLinkButton);
+
+                    expectSpyCall(selectButtonSpy, 1, noRouterLinkButton);
+                    expectSpyCall(service_updateSearchInfoTitleSpy, 1);
+                });
+
+                it('... not with number', () => {
+                    const buttonDes = getAndExpectDebugElementByDirective(
+                        compDe,
+                        RouterLinkButtonGroupStubComponent,
+                        1,
+                        1
+                    );
+                    const buttonCmp = buttonDes[0].injector.get(
+                        RouterLinkButtonGroupStubComponent
+                    ) as RouterLinkButtonGroupStubComponent;
+
+                    // emit number
+                    noRouterLinkButton = 12;
+                    buttonCmp.selectButtonRequest.emit(noRouterLinkButton);
+
+                    expectSpyCall(selectButtonSpy, 1, noRouterLinkButton);
+                    expectSpyCall(service_updateSearchInfoTitleSpy, 1);
+                });
+
+                it('... not with router link button without label', () => {
+                    const buttonDes = getAndExpectDebugElementByDirective(
+                        compDe,
+                        RouterLinkButtonGroupStubComponent,
+                        1,
+                        1
+                    );
+                    const buttonCmp = buttonDes[0].injector.get(
+                        RouterLinkButtonGroupStubComponent
+                    ) as RouterLinkButtonGroupStubComponent;
+
+                    // emit router link button without label
+                    noRouterLinkButton = new RouterLinkButton('/data/search', 'fulltext', undefined, false);
+                    buttonCmp.selectButtonRequest.emit(noRouterLinkButton);
+
+                    expectSpyCall(selectButtonSpy, 1, noRouterLinkButton);
+                    expectSpyCall(service_updateSearchInfoTitleSpy, 1);
+                });
+            });
 
-                expectSpyCall(selectButtonSpy, 4, noRouterLinkButton);
-                expect(updateSearchInfoTitleSpy).not.toHaveBeenCalled();
+            it('... should call SideInfoService# clearSearchInfoData', fakeAsync(() => {
+                // emit button 1
+                component.onButtonSelect(expectedButtonArray[0]);
+                expectSpyCall(service_clearSearchInfoDataSpy, 1);
 
-                // emit number
-                noRouterLinkButton = 12;
-                buttonCmp.selectButtonRequest.emit(noRouterLinkButton);
+                // emit button 2
+                component.onButtonSelect(expectedButtonArray[1]);
+                expectSpyCall(service_clearSearchInfoDataSpy, 2);
 
-                expectSpyCall(selectButtonSpy, 5, noRouterLinkButton);
-                expect(updateSearchInfoTitleSpy).not.toHaveBeenCalled();
+                // emit button 3
+                component.onButtonSelect(expectedButtonArray[2]);
+                expectSpyCall(service_clearSearchInfoDataSpy, 3);
             }));
 
-            it('... should update SideInfoService#updateSearchInfoTitle', fakeAsync(() => {
+            it('... should call SideInfoService# updateSearchInfoTitle', fakeAsync(() => {
+                // first call was on init
+
                 // emit button 1
                 component.onButtonSelect(expectedButtonArray[0]);
-                expectSpyCall(updateSearchInfoTitleSpy, 1, expectedButtonArray[0].label);
+                expectSpyCall(service_updateSearchInfoTitleSpy, 2, expectedButtonArray[0].label);
 
                 // emit button 2
                 component.onButtonSelect(expectedButtonArray[1]);
-                expectSpyCall(updateSearchInfoTitleSpy, 2, expectedButtonArray[1].label);
+                expectSpyCall(service_updateSearchInfoTitleSpy, 3, expectedButtonArray[1].label);
 
                 // emit button 3
-                // trigger click with click helper & wait for changes
                 component.onButtonSelect(expectedButtonArray[2]);
-                expectSpyCall(updateSearchInfoTitleSpy, 3, expectedButtonArray[2].label);
+                expectSpyCall(service_updateSearchInfoTitleSpy, 4, expectedButtonArray[2].label);
             }));
         });
     });
diff --git a/src/app/views/data-view/data-outlets/search-overview.component.ts b/src/app/views/data-view/data-outlets/search-overview.component.ts
index e6c2664637..98635b983a 100644
--- a/src/app/views/data-view/data-outlets/search-overview.component.ts
+++ b/src/app/views/data-view/data-outlets/search-overview.component.ts
@@ -3,34 +3,97 @@ import { Component, OnInit } from '@angular/core';
 import { RouterLinkButton } from '@awg-shared/router-link-button-group/router-link-button.model';
 
 import { SideInfoService } from '@awg-core/services';
+import { ActivatedRoute } from '@angular/router';
 
+/**
+ * The SearchOverview component.
+ *
+ * It contains the overview section
+ * of the data (search) view of the app
+ * with a {@link RouterLinkButtonGroupComponent} and
+ * another router outlet for the data (search) routes.
+ */
 @Component({
     selector: 'awg-search-overview',
     templateUrl: './search-overview.component.html',
     styleUrls: ['./search-overview.component.css']
 })
 export class SearchOverviewComponent implements OnInit {
-    searchButtonArray: RouterLinkButton[];
+    /**
+     * Public variable: searchButtonArray.
+     *
+     * It keeps the array for the search router link buttons.
+     */
+    searchButtonArray: RouterLinkButton[] = [
+        new RouterLinkButton('/data/search', 'fulltext', 'Volltext-Suche', false),
+        new RouterLinkButton('/data/search', 'timeline', 'Timeline', true),
+        new RouterLinkButton('/data/search', 'bibliography', 'Bibliographie', true)
+    ];
 
-    constructor(private sideInfoService: SideInfoService) {}
+    /**
+     * Constructor of the SearchOverviewComponent.
+     *
+     * It declares a private SideInfoService instance
+     * to update the search info title and a private
+     * ActivatedRoute instance.
+     *
+     * @param {SideInfoService} sideInfoService Instance of the SideInfoService.
+     * @param {ActivatedRoute} route Instance of the ActivatedRoute.
+     */
+    constructor(private sideInfoService: SideInfoService, private route: ActivatedRoute) {}
 
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {
-        this.searchButtonArray = [
-            new RouterLinkButton('/data/search', 'fulltext', 'Volltext-Suche', false),
-            new RouterLinkButton('/data/search', 'timeline', 'Timeline', true),
-            new RouterLinkButton('/data/search', 'bibliography', 'Bibliographie', true)
-        ];
+        this.updateSearchInfoTitleFromPath();
     }
 
-    onButtonSelect(routerLinkButton: RouterLinkButton) {
-        if (routerLinkButton && routerLinkButton instanceof RouterLinkButton) {
-            this.updateSearchInfoTitle(routerLinkButton.label);
-        } else {
-            return;
+    /**
+     * Public method: updateSearchInfoTitleFromPath.
+     *
+     * It gets the current url path
+     * and sets  the search info title
+     * from it via the SideInfoService.
+     *
+     * @returns {void} Updates the search info title.
+     */
+    updateSearchInfoTitleFromPath(): void {
+        // get snapshot from current url path
+        const path = this.route.snapshot.children[0].url[0].path;
+
+        // filter searchButtonArray
+        const selectedButton = this.searchButtonArray.filter(button => {
+            return button.link === path;
+        });
+
+        // update side info title if path is in array
+        if (selectedButton.length === 1) {
+            this.sideInfoService.updateSearchInfoTitle(selectedButton[0].label);
         }
     }
 
-    private updateSearchInfoTitle(title: string) {
-        this.sideInfoService.updateSearchInfoTitle(title);
+    /**
+     * Public method: onButtonSelect.
+     *
+     * It calls the updateSearchInfoTitle method to emit
+     * a selected button label to the SideInfoService.
+     *
+     * @param {RouterLinkButton} routerLinkButton
+     * The given router link button.
+     *
+     * @returns {void} Updates the search info title.
+     */
+    onButtonSelect(routerLinkButton: RouterLinkButton): void {
+        const isButton = routerLinkButton instanceof RouterLinkButton;
+
+        if (!routerLinkButton || !isButton || !routerLinkButton.label) {
+            return;
+        }
+        this.sideInfoService.clearSearchInfoData();
+        this.sideInfoService.updateSearchInfoTitle(routerLinkButton.label);
     }
 }
diff --git a/src/app/views/data-view/data-outlets/search-panel/search-form/search-form.component.html b/src/app/views/data-view/data-outlets/search-panel/search-form/search-form.component.html
index c799bc1fbe..a529fb861e 100644
--- a/src/app/views/data-view/data-outlets/search-panel/search-form/search-form.component.html
+++ b/src/app/views/data-view/data-outlets/search-panel/search-form/search-form.component.html
@@ -8,19 +8,22 @@
                         <fa-icon [icon]="faSearch"></fa-icon>
                     </div>
                 </div>
-                <input title="search"
-                       type="search"
-                       id="awg-search-input"
-                       class="form-control"
-                       formControlName="searchValueControl"
-                       aria-label="Search input" aria-describedby="search-icon"
-                       placeholder="{{ searchFormStrings.placeholder }}"
-                       required>
+                <input
+                    title="Search"
+                    type="search"
+                    id="awg-search-input"
+                    class="form-control"
+                    formControlName="searchValueControl"
+                    aria-label="Search input"
+                    aria-describedby="search-icon"
+                    placeholder="{{ searchFormStrings.placeholder }}"
+                    required
+                />
             </div>
-            <div *ngIf="searchForm.invalid || searchForm.hasError('required')" class="alert alert-danger">
+            <div *ngIf="searchValueControl.invalid && !searchValueControl.pristine" class="alert alert-danger">
+                <p *ngIf="searchValueControl.hasError('required') || searchValueControl.errors.minlength"></p>
                 {{ searchFormStrings.errorMessage }}
             </div>
         </div>
     </div>
 </form>
-
diff --git a/src/app/views/data-view/data-outlets/search-panel/search-form/search-form.component.spec.ts b/src/app/views/data-view/data-outlets/search-panel/search-form/search-form.component.spec.ts
index 247a74b133..36b4302c12 100644
--- a/src/app/views/data-view/data-outlets/search-panel/search-form/search-form.component.spec.ts
+++ b/src/app/views/data-view/data-outlets/search-panel/search-form/search-form.component.spec.ts
@@ -1,7 +1,8 @@
 /* tslint:disable:no-unused-variable */
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { DebugElement } from '@angular/core';
-import { ReactiveFormsModule } from '@angular/forms';
+import { FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms';
+
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 
 import { SearchFormComponent } from './search-form.component';
@@ -12,10 +13,17 @@ describe('SearchFormComponent', () => {
     let compDe: DebugElement;
     let compEl: any;
 
+    // create new instance of FormBuilder
+    // see 'Karma formGroup expects a FormGroup instance. Please pass one in',
+    // https://medium.com/@charlesprobaker/karma-testing-a-formgroup-instance-a0a90de831d4
+    // https://stackoverflow.com/a/48671534
+    const formBuilder: FormBuilder = new FormBuilder();
+
     beforeEach(async(() => {
         TestBed.configureTestingModule({
             imports: [FontAwesomeModule, ReactiveFormsModule],
-            declarations: [SearchFormComponent]
+            declarations: [SearchFormComponent],
+            providers: [{ provide: FormBuilder, useValue: formBuilder }]
         }).compileComponents();
     }));
 
@@ -25,6 +33,11 @@ describe('SearchFormComponent', () => {
         compDe = fixture.debugElement;
         compEl = compDe.nativeElement;
 
+        // pass in the form dynamically
+        component.searchForm = formBuilder.group({
+            searchValueControl: ['', Validators.compose([Validators.required, Validators.minLength(3)])]
+        });
+
         fixture.detectChanges();
     });
 
diff --git a/src/app/views/data-view/data-outlets/search-panel/search-form/search-form.component.ts b/src/app/views/data-view/data-outlets/search-panel/search-form/search-form.component.ts
index 5f265a06e0..fe777a7f8c 100644
--- a/src/app/views/data-view/data-outlets/search-panel/search-form/search-form.component.ts
+++ b/src/app/views/data-view/data-outlets/search-panel/search-form/search-form.component.ts
@@ -1,69 +1,153 @@
-import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, Output } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 
-import { distinctUntilChanged, debounceTime, filter } from 'rxjs/operators';
+import { debounceTime, distinctUntilChanged, filter } from 'rxjs/operators';
 
 import { faSearch } from '@fortawesome/free-solid-svg-icons';
 
+/**
+ * The SearchForm component.
+ *
+ * It contains the search form section
+ * of the data (search) view of the app
+ * with a reactive form group.
+ */
 @Component({
     selector: 'awg-search-form',
     templateUrl: './search-form.component.html',
-    styleUrls: ['./search-form.component.css']
+    styleUrls: ['./search-form.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class SearchFormComponent implements OnChanges {
+    /**
+     * Input variable: searchValue.
+     *
+     * It keeps the search value from the search panel parent.
+     */
     @Input()
     searchValue: string;
+
+    /**
+     * Output variable: searchRequest.
+     *
+     * It keeps an event emitter for the search string.
+     */
     @Output()
     searchRequest: EventEmitter<string> = new EventEmitter();
 
+    /**
+     * Public variable: faSearch.
+     *
+     * It instantiates fontawesome's faSearch icon.
+     */
     faSearch = faSearch;
 
+    /**
+     * Public variable: searchForm.
+     *
+     * It keeps the reactive form group: searchForm.
+     */
     searchForm: FormGroup;
+
+    /**
+     * Public variable: searchFormString.
+     *
+     * It keeps the default texts for the search form.
+     */
     searchFormStrings = {
         label: 'Search Input',
         placeholder: 'Volltextsuche in der Webern-Datenbank …',
         errorMessage: 'Es wird ein Suchbegriff mit mindestens 3 Zeichen benötigt!'
     };
 
-    constructor(private fb: FormBuilder) {
-        // building form in constructor is necessary
-        // to check for input changes in ngOnChanges
-        this.buildForm(this.searchValue);
+    /**
+     * Getter for the search value control value.
+     */
+    get searchValueControl() {
+        return this.searchForm.get('searchValueControl');
     }
 
-    // check for input changes
-    ngOnChanges(changes: SimpleChanges) {
-        if (changes['searchValue']) {
-            // set input value to search form
-            this.searchForm.patchValue({ searchValueControl: this.searchValue });
-        }
+    /**
+     * Constructor of the SearchFormComponent.
+     *
+     * It declares a private FormBuilder instance
+     * and initializes the form group.
+     *
+     * @param {FormBuilder} formBuilder Instance of the FormBuilder.
+     */
+    constructor(private formBuilder: FormBuilder) {
+        this.createFormGroup();
+        this.listenToUserInputChange();
     }
 
-    // build search form
-    buildForm(searchValue: string) {
-        this.searchForm = this.fb.group({
-            searchValueControl: [searchValue || '', Validators.compose([Validators.required, Validators.minLength(3)])]
-        });
+    /**
+     * Angular life cycle hook: ngOnChanges.
+     *
+     * It checks for changes of the given input.
+     */
+    ngOnChanges() {
+        this.setSearchValueFromInput();
+    }
 
-        this.checkForUserInputChange();
+    /**
+     * Public method: createFormGroup.
+     *
+     * It creates the search form using the reactive FormBuilder
+     * with a formGroup and a search value control.
+     *
+     * @returns {void} Creates the search form.
+     */
+    createFormGroup(): void {
+        this.searchForm = this.formBuilder.group({
+            searchValueControl: ['', Validators.compose([Validators.required, Validators.minLength(3)])]
+        });
     }
 
-    // check for changing search values
-    checkForUserInputChange(): void {
-        this.searchForm
-            .get('searchValueControl')
-            .valueChanges.pipe(
+    /**
+     * Public method: listenToUserInputChange.
+     *
+     * It listens to the user's input changes
+     * in the search value control and triggers
+     * the onSearch method with the new search value.
+     *
+     * @returns {void} Listens to changing search values.
+     */
+    listenToUserInputChange(): void {
+        this.searchValueControl.valueChanges
+            .pipe(
+                // at least 3 characters
                 filter(x => x.length >= 3),
+                // do not check changes before half a second
                 debounceTime(500),
+                // do not check unchanged values
                 distinctUntilChanged()
             )
-            .subscribe((query: string) => {
-                this.onSearch(query);
-            });
+            .subscribe((query: string) => this.onSearch(query));
+    }
+
+    /**
+     * Public method: setSearchValueFromInput.
+     *
+     * It sets the value of the search value control
+     * from the searchValue input.
+     *
+     * Needed to catch search values given in the URL.
+     *
+     * @returns {void} Sets the search value control.
+     */
+    setSearchValueFromInput(): void {
+        this.searchValueControl.setValue(this.searchValue);
     }
 
-    // emit query to search panel
-    onSearch(query: string) {
+    /**
+     * Public method: onSearch.
+     *
+     * It emits a search query to the {@link searchRequest}.
+     *
+     * @param {string} query The given search query.
+     * @returns {void} Emits the search query.
+     */
+    onSearch(query: string): void {
         this.searchRequest.emit(query);
     }
 }
diff --git a/src/app/views/data-view/data-outlets/search-panel/search-panel.component.html b/src/app/views/data-view/data-outlets/search-panel/search-panel.component.html
index a3acfce670..fea27f2741 100644
--- a/src/app/views/data-view/data-outlets/search-panel/search-panel.component.html
+++ b/src/app/views/data-view/data-outlets/search-panel/search-panel.component.html
@@ -1,33 +1,26 @@
 <!-- content: search panel -->
 
-<awg-search-form
-    [searchValue]="searchParams.query"
-    (searchRequest)="onSearch($event)">
-</awg-search-form>
+<awg-search-form [searchValue]="searchParams?.query" (searchRequest)="onSearch($event)"> </awg-search-form>
 
+<!-- loading spinner -->
+<div *ngIf="isLoading$ | async; else notLoading">
+    <awg-twelve-tone-spinner></awg-twelve-tone-spinner>
+</div>
 
-<ng-container *ngIf="searchParams?.query">
-    <awg-search-result-list *ngIf="!isLoadingData; else loading"
-                            [searchParams]="searchParams"
-                            [searchUrl]="searchUrl"
-                            (pageChangeRequest)="onPageChange($event)"
-                            (rowChangeRequest)="onRowChange($event)"
-                            (viewChangeRequest)="onViewChange($event)">
-    </awg-search-result-list>
-
-    <ng-template #loading>
-        <ng-container *ngIf="!errorMessage; else error">
-            <!-- loading spinner -->
-            <awg-twelve-tone-spinner></awg-twelve-tone-spinner>
-        </ng-container>
-    </ng-template>
-</ng-container>
-
-
-<ng-template #error>
+<ng-template #notLoading>
     <div class="errorMessage" *ngIf="errorMessage">
         <p>Die Anfrage "{{ errorMessage?.route }}" ist fehlgeschlagen.</p>
         <p>Fehlermeldung: "{{ errorMessage?.statusText || errorMessage }}".</p>
         <p>Möglicherweise gab es ein Problem mit der Internetverbindung oder dem verwendeten Suchbegriff.</p>
     </div>
+
+    <awg-search-result-list
+        *ngIf="searchParams?.query"
+        [searchParams]="searchParams"
+        [searchUrl]="httpGetUrl"
+        (pageChangeRequest)="onPageChange($event)"
+        (rowNumberChangeRequest)="onRowNumberChange($event)"
+        (viewChangeRequest)="onViewChange($event)"
+    >
+    </awg-search-result-list>
 </ng-template>
diff --git a/src/app/views/data-view/data-outlets/search-panel/search-panel.component.spec.ts b/src/app/views/data-view/data-outlets/search-panel/search-panel.component.spec.ts
index df9bb754bf..56ca3f7cdf 100644
--- a/src/app/views/data-view/data-outlets/search-panel/search-panel.component.spec.ts
+++ b/src/app/views/data-view/data-outlets/search-panel/search-panel.component.spec.ts
@@ -1,19 +1,25 @@
 /* tslint:disable:no-unused-variable */
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { Component, DebugElement, Input } from '@angular/core';
+import { Component, DebugElement, EventEmitter, Input, Output } from '@angular/core';
+import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 
-import { SearchPanelComponent } from './search-panel.component';
+import { of as observableOf } from 'rxjs';
+
+import { ActivatedRouteStub } from '@testing/router-stubs';
+
 import { DataApiService } from '@awg-views/data-view/services';
-import { ConversionService, DataStreamerService } from '@awg-core/services';
+import { ConversionService, DataStreamerService, LoadingService } from '@awg-core/services';
 import { SearchParams } from '@awg-views/data-view/models';
 
+import { SearchPanelComponent } from './search-panel.component';
+
 @Component({ selector: 'awg-search-form', template: '' })
 class SearchFormStubComponent {
     @Input()
     searchValue: string;
-
-    // TODO: handle outputs
+    @Output()
+    searchRequest: EventEmitter<string> = new EventEmitter();
 }
 
 @Component({ selector: 'awg-search-result-list', template: '' })
@@ -22,6 +28,12 @@ class SearchResultListStubComponent {
     searchParams: SearchParams;
     @Input()
     searchUrl: string;
+    @Output()
+    pageChangeRequest: EventEmitter<string> = new EventEmitter();
+    @Output()
+    rowChangeRequest: EventEmitter<string> = new EventEmitter();
+    @Output()
+    viewChangeRequest: EventEmitter<string> = new EventEmitter();
 }
 
 @Component({ selector: 'awg-twelve-tone-spinner', template: '' })
@@ -33,10 +45,23 @@ describe('SearchPanelComponent', () => {
     let compDe: DebugElement;
     let compEl: any;
 
+    let mockRouter;
+    let mockActivatedRoute: ActivatedRouteStub;
+
     // stub services for test purposes
     const mocConversionService = { convertFullTextSearchResults: () => {} };
-    const mockdataApiService = { httpGetUrl: '/testUrl', getFulltextSearchData: () => {} };
-    const mockStreamerService = { updateSearchResponseStream: () => {} };
+    const mockDataApiService = { httpGetUrl: '/testUrl', getFulltextSearchData: () => observableOf({}) };
+    const mockLoadingService = { getLoadingStatus: () => observableOf(false) };
+    const mockDataStreamerService = { updateSearchResponseWithQuery: () => {} };
+
+    // router spy object
+    mockRouter = {
+        url: '/test-url',
+        events: observableOf(new NavigationEnd(0, 'http://localhost:4200/test-url', 'http://localhost:4200/test-url')),
+        navigate: jasmine.createSpy('navigate')
+    };
+    // mocked activated route
+    mockActivatedRoute = new ActivatedRouteStub();
 
     beforeEach(async(() => {
         TestBed.configureTestingModule({
@@ -48,9 +73,12 @@ describe('SearchPanelComponent', () => {
                 TwelveToneSpinnerStubComponent
             ],
             providers: [
+                { provide: ActivatedRoute, useValue: mockActivatedRoute },
+                { provide: Router, useValue: mockRouter },
                 { provide: ConversionService, useValue: mocConversionService },
-                { provide: DataApiService, useValue: mockdataApiService },
-                { provide: DataStreamerService, useValue: mockStreamerService }
+                { provide: DataApiService, useValue: mockDataApiService },
+                { provide: DataStreamerService, useValue: mockDataStreamerService },
+                { provide: LoadingService, useValue: mockLoadingService }
             ]
         }).compileComponents();
     }));
diff --git a/src/app/views/data-view/data-outlets/search-panel/search-panel.component.ts b/src/app/views/data-view/data-outlets/search-panel/search-panel.component.ts
index ec8dab4b1c..b6c7fd7903 100644
--- a/src/app/views/data-view/data-outlets/search-panel/search-panel.component.ts
+++ b/src/app/views/data-view/data-outlets/search-panel/search-panel.component.ts
@@ -1,126 +1,276 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { ActivatedRoute, NavigationEnd, ParamMap, Router } from '@angular/router';
 
-import { Subscription } from 'rxjs';
+import { Observable, Subject, Subscription } from 'rxjs';
+import { filter, map, takeUntil } from 'rxjs/operators';
 
-import { ConversionService, DataStreamerService } from '@awg-core/services';
+import { ConversionService, DataStreamerService, LoadingService } from '@awg-core/services';
 import { DataApiService } from '@awg-views/data-view/services';
 
 import { SearchResponseJson } from '@awg-shared/api-objects';
-import { SearchParams, SearchResponseWithQuery } from '@awg-views/data-view/models';
-
+import { SearchParams, SearchParamsViewTypes, SearchResponseWithQuery } from '@awg-views/data-view/models';
+
+/**
+ * The SearchPanel component.
+ *
+ * It contains the search panel section
+ * of the data (search) view of the app
+ * with a {@link TwelveToneSpinnerComponent},
+ * the {@link SearchFormComponent}
+ * and the {@link SearchResultListComponent}.
+ */
 @Component({
     selector: 'awg-search-panel',
     templateUrl: './search-panel.component.html',
     styleUrls: ['./search-panel.component.css']
 })
 export class SearchPanelComponent implements OnInit, OnDestroy {
-    navigationSubscription: Subscription;
-
-    searchUrl = '';
+    /**
+     * Public variable: destroy$.
+     *
+     * Subject to emit a truthy value in the ngOnDestroy lifecycle hook.
+     */
+    destroy$: Subject<boolean> = new Subject<boolean>();
+
+    /**
+     * Public variable: currentQueryParams.
+     *
+     * It keeps the current ParamMap from the query url.
+     */
     currentQueryParams: ParamMap;
 
+    /**
+     * Public variable: searchParams.
+     *
+     * It keeps the default parameters for the search.
+     */
     searchParams: SearchParams = {
         query: '',
-        nRows: '10',
+        nRows: '25',
         startAt: '0',
-        view: 'table'
+        view: SearchParamsViewTypes.table
     };
 
-    errorMessage: any;
-    isLoadingData = false;
+    /**
+     * Getter for the httpGetUrl of the {@link DataApiService}.
+     */
+    get httpGetUrl(): string {
+        return this.dataApiService.httpGetUrl;
+    }
+
+    /**
+     * Getter for the loading status observable of the {@link LoadingService}.
+     */
+    get isLoading$(): Observable<boolean> {
+        return this.loadingService.getLoadingStatus();
+    }
+
+    /**
+     * Public variable: errorMessage.
+     *
+     * It keeps an errorMessage for the search response subscription.
+     */
+    errorMessage: any = undefined;
+
+    /**
+     * Public variable: viewChanged.
+     *
+     * If the view has changed.
+     */
     viewChanged = false;
 
+    /**
+     * Constructor of the SearchPanelComponent.
+     *
+     * It declares private instances of the Angular ActivatedRoute,
+     * the Angular Router, the ConversionService, the DataApiService,
+     * the DataStreamerService, and the LoadingService.
+     *
+     * @param {ActivatedRoute} route Instance of the Angular ActivatedRoute.
+     * @param {Router} router Instance of the Angular Router.
+     * @param {ConversionService} conversionService Instance of the ConversionService.
+     * @param {DataApiService} dataApiService Instance of the DataApiService.
+     * @param {DataStreamerService} dataStreamerService Instance of the DataStreamerService.
+     * @param {LoadingService} loadingService Instance of the LoadingService.
+     */
     constructor(
         private route: ActivatedRoute,
         private router: Router,
         private conversionService: ConversionService,
         private dataApiService: DataApiService,
-        private streamerService: DataStreamerService
+        private dataStreamerService: DataStreamerService,
+        private loadingService: LoadingService
     ) {}
 
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {
-        this.navigationSubscription = this.subscribeToDataApiService();
+        this.getFulltextSearchData();
     }
 
-    // switch the load status
-    changeLoadingStatus(status: boolean) {
-        this.isLoadingData = status;
-    }
-
-    // start loading activities
-    onLoadingStart(): void {
-        this.changeLoadingStatus(true);
-    }
+    /**
+     * Public method: getFulltextSearchData.
+     *
+     * It gets the query parameters from the route's query params
+     * and fetches the corresponding fulltext search data
+     * from the {@link DataApiService}.
+     *
+     * @returns {void} Sets the search data.
+     *
+     * @todo Refactor nested subscription.
+     */
+    getFulltextSearchData(): void {
+        this.router.events.pipe(takeUntil(this.destroy$)).subscribe(
+            (e: any) => {
+                // check for end of navigation
+                if (e instanceof NavigationEnd) {
+                    // snapshot of current route query params
+                    const qp = this.route.snapshot.queryParamMap;
+
+                    if (qp !== this.currentQueryParams) {
+                        this.currentQueryParams = qp;
+
+                        if (qp.keys.length < 4) {
+                            // update search params
+                            this.updateSearchParamsFromRoute(qp, true);
+                        } else {
+                            // update search params from route if available
+                            this.updateSearchParamsFromRoute(qp, false);
 
-    // end loading activities
-    onLoadingEnd(): void {
-        this.changeLoadingStatus(false);
+                            if (this.searchParams.query && !this.viewChanged) {
+                                // fetch search data
+                                return this.dataApiService.getFulltextSearchData(this.searchParams).subscribe(
+                                    (searchResponse: SearchResponseJson) => {
+                                        // share search data via streamer service
+                                        const searchResponseWithQuery: SearchResponseWithQuery = new SearchResponseWithQuery(
+                                            searchResponse,
+                                            this.searchParams.query
+                                        );
+                                        this.dataStreamerService.updateSearchResponseWithQuery(searchResponseWithQuery);
+                                    },
+                                    error => {
+                                        this.errorMessage = error as any;
+                                    }
+                                );
+                            } else {
+                                // console.log('No search query!');
+                            }
+                        }
+                    } else {
+                        // console.log('Routed on same page with same query params');
+                    }
+                }
+            },
+            error => {
+                this.errorMessage = error as any;
+            }
+        );
     }
 
-    // new startPosition after page change request
+    /**
+     * Public method: onPageChange.
+     *
+     * It sets a new start position value in the searchParams
+     * after a page change request and triggers the
+     * {@link routeToSelf} method.
+     *
+     * @param {string} requestedStartAt The given start position.
+     *
+     * @returns {void} Sets the search params and routes to itself.
+     */
     onPageChange(requestedStartAt: string): void {
         if (requestedStartAt !== this.searchParams.startAt) {
             // view has not changed
             this.viewChanged = false;
 
-            const sp: SearchParams = {
+            this.searchParams = {
                 query: this.searchParams.query,
                 nRows: this.searchParams.nRows,
                 startAt: requestedStartAt,
                 view: this.searchParams.view
             };
             // route to new params
-            this.routeToSelf(sp);
+            this.routeToSelf(this.searchParams);
         }
     }
 
-    // new row number after row change request
-    onRowChange(requestedRows: string): void {
+    /**
+     * Public method: onRowNumberChange.
+     *
+     * It sets new row number value in the searchParams
+     * after a row change request and triggers the
+     * {@link routeToSelf} method.
+     *
+     * @param {string} requestedRows The given row.
+     *
+     * @returns {void} Sets the search params and routes to itself.
+     */
+    onRowNumberChange(requestedRows: string): void {
         if (requestedRows !== this.searchParams.nRows) {
             // view has not changed
             this.viewChanged = false;
 
-            // reset start position
-            this.searchParams.startAt = '0';
-
-            const sp: SearchParams = {
+            this.searchParams = {
                 query: this.searchParams.query,
                 nRows: requestedRows,
-                startAt: this.searchParams.startAt,
+                startAt: '0',
                 view: this.searchParams.view
             };
 
             // route to new params
-            this.routeToSelf(sp);
+            this.routeToSelf(this.searchParams);
         }
     }
 
-    // new row number after row change request
+    /**
+     * Public method: onViewChange.
+     *
+     * It sets new view type value in the searchParams
+     * after a view change request and triggers the
+     * {@link routeToSelf} method.
+     *
+     * @param {string} requestedView The given view.
+     *
+     * @returns {void} Sets the search params and routes to itself.
+     */
     onViewChange(requestedView: string): void {
         if (requestedView !== this.searchParams.view) {
             // view has changed
             this.viewChanged = true;
 
-            const sp: SearchParams = {
+            this.searchParams = {
                 query: this.searchParams.query,
                 nRows: this.searchParams.nRows,
                 startAt: this.searchParams.startAt,
-                view: requestedView
+                view: SearchParamsViewTypes[requestedView]
             };
 
             // route to new params
-            this.routeToSelf(sp);
+            this.routeToSelf(this.searchParams);
         }
     }
 
-    // new query after search request
+    /**
+     * Public method: onSearch.
+     *
+     * It sets new query value in the searchParams
+     * after a search request and triggers the
+     * {@link routeToSelf} method.
+     *
+     * @param {string} requestedQuery The given search query.
+     *
+     * @returns {void} Sets the search params and routes to itself.
+     */
     onSearch(requestedQuery: string): void {
         if (requestedQuery !== this.searchParams.query) {
             // view has not changed
             this.viewChanged = false;
 
-            const sp: SearchParams = {
+            this.searchParams = {
                 query: requestedQuery,
                 nRows: this.searchParams.nRows,
                 startAt: this.searchParams.startAt,
@@ -128,11 +278,19 @@ export class SearchPanelComponent implements OnInit, OnDestroy {
             };
 
             // route to new search params
-            this.routeToSelf(sp);
+            this.routeToSelf(this.searchParams);
         }
     }
 
-    // route to self to set new params
+    /**
+     * Public method: routeToSelf.
+     *
+     * It navigates to itself to set
+     * new search parameters.
+     *
+     * @param {SearchParams} sp The given search parameters.
+     * @returns {void} Navigates to itself.
+     */
     routeToSelf(sp: SearchParams) {
         this.router.navigate([], {
             relativeTo: this.route,
@@ -141,104 +299,48 @@ export class SearchPanelComponent implements OnInit, OnDestroy {
         });
     }
 
-    subscribeToDataApiService(): Subscription {
-        return this.router.events.subscribe((e: any) => {
-            // check for end of navigation
-            if (e instanceof NavigationEnd) {
-                // snapshot of current route query params
-                const qp = this.route.snapshot.queryParamMap;
-
-                if (qp !== this.currentQueryParams) {
-                    this.currentQueryParams = qp;
-
-                    if (qp.keys.length < 4) {
-                        const sp: SearchParams = {
-                            query: qp.get('query') || this.searchParams.query,
-                            nRows: qp.get('nrows') || this.searchParams.nRows,
-                            startAt: qp.get('startAt') || this.searchParams.startAt,
-                            view: qp.get('view') || this.searchParams.view
-                        };
-                        this.routeToSelf(sp);
-                    } else {
-                        // update search params from route if available
-                        this.updateSearchParamsFromRoute(qp);
-
-                        if (this.searchParams.query && !this.viewChanged) {
-                            // start loading
-                            this.onLoadingStart();
-
-                            // fetch search data
-                            return this.dataApiService
-                                .getFulltextSearchData(
-                                    this.searchParams.query,
-                                    this.searchParams.nRows,
-                                    this.searchParams.startAt
-                                )
-                                .subscribe(
-                                    (searchResponse: SearchResponseJson) => {
-                                        // update url for search
-                                        this.updateCurrentUrl();
-
-                                        // share search data via streamer service
-                                        this.updateStreamerService(searchResponse, this.searchParams.query);
-
-                                        // end loading
-                                        this.onLoadingEnd();
-                                    },
-                                    error => {
-                                        this.errorMessage = error as any;
-                                    }
-                                );
-                        } else {
-                            // console.log('No search query!');
-                        }
-                    }
-                } else {
-                    // console.log('Routed on same page with same query params');
-                }
-            }
-        });
-    }
-
-    updateCurrentUrl() {
-        // get url from search service
-        this.searchUrl = this.dataApiService.httpGetUrl;
-    }
-
-    // update search params from route
-    updateSearchParamsFromRoute(params: ParamMap) {
+    /**
+     * Public method: updateSearchParamsFromRoute.
+     *
+     * It updates the searchParams from the query params
+     * of the current route and routes to the component
+     * itself again if 'routing' is truthy.
+     *
+     * @param {ParamMap} params The given url query params.
+     * @param {boolean} routing If the search parameters should be set
+     * by routing to the component itself again.
+     *
+     * @returns {void} Sets the search params and routes to itself if routing is truthy.
+     */
+    updateSearchParamsFromRoute(params: ParamMap, routing: boolean) {
         if (!params) {
             return;
         }
 
-        if (params.get('query') && params.get('query') !== this.searchParams.query) {
-            this.searchParams.query = params.get('query');
-        }
-        if (params.get('nrows') && params.get('nrows') !== this.searchParams.nRows) {
-            this.searchParams.nRows = params.get('nrows');
-        }
-        if (params.get('startAt') && params.get('startAt') !== this.searchParams.startAt) {
-            this.searchParams.startAt = params.get('startAt');
-        }
-        if (
-            params.get('view') &&
-            (params.get('view') === 'table' || params.get('view') === 'grid') &&
-            params.get('view') !== this.searchParams.view
-        ) {
-            this.searchParams.view = params.get('view');
-        }
-    }
+        // update search params (immutable)
+        this.searchParams = {
+            query: params.get('query') || this.searchParams.query,
+            nRows: params.get('nrows') || this.searchParams.nRows,
+            startAt: params.get('startAt') || this.searchParams.startAt,
+            view: SearchParamsViewTypes[params.get('view')] || this.searchParams.view
+        };
 
-    // update search data via streamer service
-    updateStreamerService(searchResponse: SearchResponseJson, query: string) {
-        const searchResponseWithQuery: SearchResponseWithQuery = new SearchResponseWithQuery(searchResponse, query);
-        this.streamerService.updateSearchResponseStream(searchResponseWithQuery);
+        if (routing) {
+            this.routeToSelf(this.searchParams);
+        }
     }
 
+    /**
+     * Angular life cycle hook: ngOnDestroy.
+     *
+     * It calls the containing methods
+     * when destroying the component.
+     */
     ngOnDestroy() {
-        // prevent memory leak when component destroyed
-        if (this.navigationSubscription) {
-            this.navigationSubscription.unsubscribe();
-        }
+        // emit truthy value to end all subscriptions
+        this.destroy$.next(true);
+
+        // Now let's also unsubscribe from the subject itself:
+        this.destroy$.unsubscribe();
     }
 }
diff --git a/src/app/views/data-view/data-outlets/search-panel/search-result-list/search-result-list.component.html b/src/app/views/data-view/data-outlets/search-panel/search-result-list/search-result-list.component.html
index 0122a6d524..b7331d3e4a 100644
--- a/src/app/views/data-view/data-outlets/search-panel/search-result-list/search-result-list.component.html
+++ b/src/app/views/data-view/data-outlets/search-panel/search-result-list/search-result-list.component.html
@@ -1,28 +1,49 @@
 <!-- content: search results -->
-<div class="awg-search-results" *ngIf="searchResponse">
-
+<div class="awg-search-results" *ngIf="searchResponseWithQuery?.data">
     <!-- header -->
     <div class="row d-flex justify-content-between mb-4 awg-search-results-header">
         <div class="col-6 mr-auto awg-search-results-header-icons">
             <div class="btn-group">
-                <form [formGroup]="radioViewForm">
-                    <div class="btn-group btn-group-toggle" ngbRadioGroup name="radioSearchResultView" formControlName="radioViewControl">
+                <form [formGroup]="searchResultControlForm">
+                    <div
+                        class="btn-group btn-group-toggle"
+                        ngbRadioGroup
+                        name="searchResultView"
+                        formControlName="searchResultViewControl"
+                    >
                         <label ngbButtonLabel class="btn-outline-info" ngbTooltip="Table view">
-                            <input ngbButton type="radio" value="table" [disabled]="+searchResponse?.nhits === 0">
+                            <input ngbButton type="radio" value="table" [disabled]="isNoResults()" />
                             <fa-icon [icon]="faTable"></fa-icon>
                         </label>
                         <label ngbButtonLabel class="btn-outline-info" ngbTooltip="Grid view">
-                            <input ngbButton type="radio" value="grid" [disabled]="+searchResponse?.nhits === 0">
+                            <input ngbButton type="radio" value="grid" [disabled]="isNoResults()" />
                             <fa-icon [icon]="faGripHorizontal"></fa-icon>
                         </label>
                     </div>
                 </form>
                 <div class="btn-group">
-                    <button type="button" class="btn btn-outline-info" disabled aria-disabled="true"><span class="d-none d-lg-inline">Hits per page: </span>{{ searchParams?.nRows }}</button>
-                    <div class="btn-group" ngbDropdown role="group" aria-label="Button group with nested dropdown for row number">
-                        <button class="btn btn-info dropdown-toggle-split" ngbDropdownToggle [disabled]="+searchResponse?.nhits === 0"></button>
+                    <button type="button" class="btn btn-outline-info" disabled aria-disabled="true">
+                        <span class="d-none d-lg-inline">Hits per page: </span>{{ searchParams?.nRows }}
+                    </button>
+                    <div
+                        class="btn-group"
+                        ngbDropdown
+                        role="group"
+                        aria-label="Button group with nested dropdown for row number"
+                    >
+                        <button
+                            class="btn btn-info dropdown-toggle-split"
+                            ngbDropdownToggle
+                            [disabled]="isNoResults()"
+                        ></button>
                         <div class="dropdown-menu" ngbDropdownMenu>
-                            <button class="dropdown-item" *ngFor="let rowNumber of rowNumberArray" (click)="onRowChange(rowNumber)">{{ rowNumber }}</button>
+                            <button
+                                class="dropdown-item"
+                                *ngFor="let rowNumber of rowNumbers"
+                                (click)="onRowNumberChange(rowNumber)"
+                            >
+                                {{ rowNumber }}
+                            </button>
                         </div>
                     </div>
                 </div>
@@ -33,54 +54,60 @@
         </div>
     </div>
 
-
-    <ng-container *ngIf="searchResponse?.subjects && +searchResponse?.nhits > 0">
-
-        <ngb-pagination class="d-flex justify-content-center"
-                        [(page)]="page"
-                        [pageSize]="pageSize"
-                        [collectionSize]="searchResponse?.nhits"
-                        [maxSize]="4"
-                        [boundaryLinks]="true"
-                        (pageChange)="onPageChange($event)">
+    <ng-container *ngIf="searchResponseWithQuery?.data?.subjects && !isNoResults()">
+        <!-- top pagination -->
+        <ngb-pagination
+            class="d-flex justify-content-center"
+            [(page)]="page"
+            [pageSize]="pageSize"
+            [collectionSize]="+searchResponseWithQuery?.data?.nhits"
+            [maxSize]="4"
+            [boundaryLinks]="true"
+            (pageChange)="onPageChange($event)"
+        >
         </ngb-pagination>
 
         <!-- table with searchResults -->
-        <div *ngIf="searchParams?.view === 'table'" class="table-responsive">
+        <div *ngIf="!isGridView()" class="table-responsive">
             <table class="table table-sm awg-search-result-table">
                 <thead>
-                <tr class="d-flex">
-                    <th class="col-6 col-sm-4 col-md-5 col-lg-4 col-xl-3">Typ</th>
-                    <th class="col-6 col-sm-8 col-md-7 col-lg-8 col-xl-9">Ressource</th>
-                </tr>
+                    <tr class="d-flex">
+                        <th class="col-6 col-sm-4 col-md-5 col-lg-4 col-xl-3">Typ</th>
+                        <th class="col-6 col-sm-8 col-md-7 col-lg-8 col-xl-9">Ressource</th>
+                    </tr>
                 </thead>
                 <tbody>
-                <!-- show searchResultDetail by clicking on single entry -->
-                <tr class="d-flex" *ngFor="let subject of searchResponse?.subjects | orderBy: {property: 'obj_id', direction: 1}" (click)="navigateToResource(subject?.obj_id)" [class.active]="isActiveResource(subject?.obj_id)">
-                    <td class="col-6 col-sm-4 col-md-5 col-lg-4 col-xl-3">
+                    <!-- show searchResultDetail by clicking on single entry -->
+                    <tr
+                        class="d-flex"
+                        *ngFor="let subject of searchResponseWithQuery?.data?.subjects; trackBy: trackById"
+                        (click)="navigateToResource(subject?.obj_id)"
+                        [class.active]="isActiveResource(subject?.obj_id)"
+                    >
+                        <td class="col-6 col-sm-4 col-md-5 col-lg-4 col-xl-3">
                             <span class="badge">
-                                <img [attr.src]=subject?.iconsrc alt="iconsrc">
+                                <img [attr.src]="subject?.iconsrc" alt="iconsrc" />
                                 <small>&nbsp;{{ subject?.iconlabel }}</small>
                             </span>
-                    </td>
-                    <td class="col-6 col-sm-8 col-md-7 col-lg-8 col-xl-9">
-                        <span [compile-html]="subject?.value[0]" [compile-html-ref]="this"></span>
-                    </td>
-                </tr>
+                        </td>
+                        <td class="col-6 col-sm-8 col-md-7 col-lg-8 col-xl-9">
+                            <span [compile-html]="(subject?.value)[0]" [compile-html-ref]="this"></span>
+                        </td>
+                    </tr>
                 </tbody>
             </table>
         </div>
 
         <!-- grid with searchResults -->
-        <div class="card-columns" *ngIf="searchParams?.view === 'grid'">
-            <div class="card" *ngFor="let subject of searchResponse?.subjects | orderBy: {property: 'obj_id', direction: 1}">
+        <div *ngIf="isGridView()" class="card-columns">
+            <div class="card" *ngFor="let subject of searchResponseWithQuery?.data?.subjects; trackBy: trackById">
                 <div class="card-header">
-                    <img [attr.src]=subject?.iconsrc alt="iconsrc">
+                    <img [attr.src]="subject?.iconsrc" alt="iconsrc" />
                     &nbsp;{{ subject?.iconlabel }}
                 </div>
                 <div class="card-body">
                     <h5 class="card-title">
-                        <span [compile-html]="subject?.value[0]" [compile-html-ref]="this"></span>
+                        <span [compile-html]="(subject?.value)[0]" [compile-html-ref]="this"></span>
                     </h5>
                     <button type="button" class="btn btn-outline-info" (click)="navigateToResource(subject?.obj_id)">
                         Mehr ...
@@ -89,5 +116,16 @@ <h5 class="card-title">
             </div>
         </div>
 
+        <!-- bottom pagination -->
+        <ngb-pagination
+            class="d-flex justify-content-center"
+            [(page)]="page"
+            [pageSize]="pageSize"
+            [collectionSize]="+searchResponseWithQuery?.data?.nhits"
+            [maxSize]="4"
+            [boundaryLinks]="true"
+            (pageChange)="onPageChange($event)"
+        >
+        </ngb-pagination>
     </ng-container>
 </div>
diff --git a/src/app/views/data-view/data-outlets/search-panel/search-result-list/search-result-list.component.spec.ts b/src/app/views/data-view/data-outlets/search-panel/search-result-list/search-result-list.component.spec.ts
index dc6a1faa40..bede151479 100644
--- a/src/app/views/data-view/data-outlets/search-panel/search-result-list/search-result-list.component.spec.ts
+++ b/src/app/views/data-view/data-outlets/search-panel/search-result-list/search-result-list.component.spec.ts
@@ -12,7 +12,7 @@ import { OrderByPipe } from '@awg-shared/order-by/order-by.pipe';
 
 import { ConversionService, DataStreamerService, SideInfoService } from '@awg-core/services';
 
-import { SearchParams, SearchResponseWithQuery } from '@awg-views/data-view/models';
+import { SearchParams, SearchParamsViewTypes, SearchResponseWithQuery } from '@awg-views/data-view/models';
 import { SearchResponseJson } from '@awg-shared/api-objects';
 
 import { SearchResultListComponent } from './search-result-list.component';
@@ -23,7 +23,7 @@ describe('SearchResultListComponent', () => {
 
     let mockConversionService: Partial<ConversionService>;
     let mockSideInfoService: Partial<SideInfoService>;
-    let getCurrentSearchResultsSpy: Observable<SearchResponseWithQuery>;
+    let getSearchResponseWithQuerySpy: Observable<SearchResponseWithQuery>;
 
     let expectedSearchResponseWithQuery: SearchResponseWithQuery;
     let expectedSearchResultText: string;
@@ -34,22 +34,24 @@ describe('SearchResultListComponent', () => {
         expectedSearchResponseWithQuery = new SearchResponseWithQuery(new SearchResponseJson(), ''); // TODO: provide real test data
         expectedSearchResultText = ''; // TODO: provide real test data
 
-        // create a fake StreamerService object with a `getCurrentSearchResults()` spy
-        const mockStreamerService = jasmine.createSpyObj('StreamerService', ['getCurrentSearchResults']);
+        // create a fake DataStreamerService object with a `getSearchResponseWithQuery()` spy
+        const mockDataStreamerService = jasmine.createSpyObj('DataStreamerService', ['getSearchResponseWithQuery']);
         // make the spies return a synchronous Observable with the test data
-        getCurrentSearchResultsSpy = mockStreamerService.getCurrentSearchResults.and.returnValue(observableOf()); // TODO: provide real test data
+        getSearchResponseWithQuerySpy = mockDataStreamerService.getSearchResponseWithQuery.and.returnValue(
+            observableOf()
+        ); // TODO: provide real test data
 
         // mock services
         mockConversionService = {
             prepareFullTextSearchResultText: () => expectedSearchResultText
         };
-        mockSideInfoService = { updateSearchInfoData: () => {} }; // TODO: provide real test data
+        mockSideInfoService = { updateSearchInfoData: () => {}, clearSearchInfoData: () => {} }; // TODO: provide real test data
 
         TestBed.configureTestingModule({
             imports: [FontAwesomeModule, NgbPaginationModule, ReactiveFormsModule, RouterTestingModule],
             declarations: [SearchResultListComponent, CompileHtmlComponent, OrderByPipe],
             providers: [
-                { provide: DataStreamerService, useValue: mockStreamerService },
+                { provide: DataStreamerService, useValue: mockDataStreamerService },
                 { provide: ConversionService, useValue: mockConversionService },
                 { provide: SideInfoService, useValue: mockSideInfoService }
             ]
@@ -61,7 +63,7 @@ describe('SearchResultListComponent', () => {
         component = fixture.componentInstance;
 
         expectedSearchParams = new SearchParams();
-        expectedSearchParams.view = 'table';
+        expectedSearchParams.view = SearchParamsViewTypes.table;
 
         component.searchParams = expectedSearchParams;
         fixture.detectChanges();
diff --git a/src/app/views/data-view/data-outlets/search-panel/search-result-list/search-result-list.component.ts b/src/app/views/data-view/data-outlets/search-panel/search-result-list/search-result-list.component.ts
index 477d262d9c..16add3a271 100644
--- a/src/app/views/data-view/data-outlets/search-panel/search-result-list/search-result-list.component.ts
+++ b/src/app/views/data-view/data-outlets/search-panel/search-result-list/search-result-list.component.ts
@@ -1,92 +1,285 @@
-import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { Router } from '@angular/router';
 
-import { Subscription } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { Observable, Subject, Subscription } from 'rxjs';
+import { takeUntil } from 'rxjs/operators';
 
-import { faTable, faGripHorizontal } from '@fortawesome/free-solid-svg-icons';
+import { faGripHorizontal, faTable } from '@fortawesome/free-solid-svg-icons';
 
 import { SearchInfo } from '@awg-side-info/side-info-models';
-import { SearchResponseJson } from '@awg-shared/api-objects';
-import { SearchParams, SearchResponseWithQuery } from '@awg-views/data-view/models';
+import { SearchParams, SearchParamsViewTypes, SearchResponseWithQuery } from '@awg-views/data-view/models';
 
 import { ConversionService, DataStreamerService, SideInfoService } from '@awg-core/services';
 
+/**
+ * The SearchResultList component.
+ *
+ * It contains the search result list section
+ * of the data (search) view of the app
+ * with a control header, a Paginator
+ * and the results in table or grid view.
+ */
 @Component({
     selector: 'awg-search-result-list',
     templateUrl: './search-result-list.component.html',
-    styleUrls: ['./search-result-list.component.css']
+    styleUrls: ['./search-result-list.component.css'],
+    changeDetection: ChangeDetectionStrategy.Default
 })
 export class SearchResultListComponent implements OnInit, OnDestroy {
+    /**
+     * Input variable: searchUrl.
+     *
+     * It keeps the url of the search request.
+     */
     @Input()
     searchUrl: string;
+
+    /**
+     * Input variable: searchParams.
+     *
+     * It keeps the parameters of the search request.
+     */
     @Input()
     searchParams: SearchParams;
+
+    /**
+     * Output variable: pageChangeRequest.
+     *
+     * It keeps an event emitter for the selected
+     * start position (startAt) of the paginator
+     * of the search result list.
+     */
     @Output()
     pageChangeRequest: EventEmitter<string> = new EventEmitter();
+
+    /**
+     * Output variable: rowNumberChangeRequest.
+     *
+     * It keeps an event emitter for the selected row number (nRows)
+     * to be displayed in the search result list.
+     */
     @Output()
-    rowChangeRequest: EventEmitter<string> = new EventEmitter();
+    rowNumberChangeRequest: EventEmitter<string> = new EventEmitter();
+
+    /**
+     * Output variable: viewChangeRequest.
+     *
+     * It keeps an event emitter for the selected view type of the search result list.
+     */
     @Output()
     viewChangeRequest: EventEmitter<string> = new EventEmitter();
 
+    /**
+     * Private variable: selectedResourceId.
+     *
+     * It keeps the id of the selected resource.
+     */
+    private selectedResourceId: string;
+
+    /**
+     * variable: destroy$.
+     *
+     * Subject to emit a truthy value in the ngOnDestroy lifecycle hook.
+     */
+    destroy$: Subject<boolean> = new Subject<boolean>();
+
+    /**
+     * Public variable: errorMessage.
+     *
+     * It keeps an errorMessage for the searchResponseWithQuery subscription.
+     */
     errorMessage: any = undefined;
-    currentId: string;
 
-    radioViewForm: FormGroup;
+    /**
+     * Public variable: searchResultControlForm.
+     *
+     * It keeps the reactive form group: searchResultControlForm.
+     */
+    searchResultControlForm: FormGroup;
+
+    /**
+     * Public variable: page.
+     *
+     * It keeps the current page of the Paginator.
+     */
     page: number;
+
+    /**
+     * Public variable: pageSize.
+     *
+     * It keeps the total page size of the Paginator.
+     */
     pageSize: number;
-    rowNumberArray = [5, 10, 25, 50, 100, 200];
 
-    streamerServiceSubscription: Subscription;
-    searchResponse: SearchResponseJson;
+    /**
+     * Public variable: rowNumbers.
+     *
+     * It keeps the array of possible row numbers.
+     */
+    rowNumbers = [5, 10, 25, 50, 100, 200];
+
+    /**
+     * Public variable: searchResponseWithQuery.
+     *
+     * It keeps the query and response of the search request.
+     */
+    searchResponseWithQuery: SearchResponseWithQuery;
+
+    /**
+     * Public variable: searchResultText.
+     *
+     * It keeps the info message about the search results.
+     */
     searchResultText: string;
-    searchValue: string;
 
+    /**
+     * Public variable: faGripHorizontal.
+     *
+     * It instantiates fontawesome's faGripHorizontal icon.
+     */
     faGripHorizontal = faGripHorizontal;
+
+    /**
+     * Public variable: faTable.
+     *
+     * It instantiates fontawesome's faTable icon.
+     */
     faTable = faTable;
 
+    /**
+     * Constructor of the SearchResultListComponent.
+     *
+     * It declares private instances of the Angular FormBuilder,
+     * the Angular Router, the ConversionService,
+     * the DataStreamerService, and the SideInfoService.
+     *
+     * @param {FormBuilder} formBuilder Instance of the FormBuilder.
+     * @param {Router} router Instance of the Angular Router.
+     * @param {ConversionService} conversionService Instance of the ConversionService.
+     * @param {DataStreamerService} dataStreamerService Instance of the DataStreamerService.
+     * @param {SideInfoService} sideInfoService Instance of the SideInfoService.
+     */
     constructor(
-        private fb: FormBuilder,
+        private formBuilder: FormBuilder,
         private router: Router,
         private conversionService: ConversionService,
-        private sideInfoService: SideInfoService,
-        private streamerService: DataStreamerService
+        private dataStreamerService: DataStreamerService,
+        private sideInfoService: SideInfoService
     ) {}
 
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {
-        this.streamerServiceSubscription = this.subscribeToStreamerService();
-        if (this.searchParams.view && (this.searchParams.view === 'table' || this.searchParams.view === 'grid')) {
-            this.buildForm(this.searchParams.view);
+        this.getSearchResponseWithQueryData();
+
+        if (
+            this.searchParams.view &&
+            (this.searchParams.view === SearchParamsViewTypes.table ||
+                this.searchParams.view === SearchParamsViewTypes.grid)
+        ) {
+            this.createFormGroup(this.searchParams.view);
         }
     }
 
-    // build radio view form
-    buildForm(view: string) {
-        this.radioViewForm = this.fb.group({
-            radioViewControl: view
+    /**
+     * Public method: createFormGroup.
+     *
+     * It creates the search result control form
+     * using the reactive FormBuilder with a formGroup
+     * and a search view control.
+     *
+     * @param {SearchParamsViewTypes} view The given view type.
+     *
+     * @returns {void} Creates the search view control form.
+     */
+    createFormGroup(view: SearchParamsViewTypes): void {
+        this.searchResultControlForm = this.formBuilder.group({
+            searchResultViewControl: SearchParamsViewTypes[view]
         });
 
-        this.checkForUserInputChanges();
+        this.listenToUserInputChange();
     }
 
-    // check for changing view values
-    checkForUserInputChanges(): void {
-        this.radioViewForm.get('radioViewControl').valueChanges.subscribe((view: string) => {
+    /**
+     * Public method: listenToUserInputChange.
+     *
+     * It listens to the user's input changes
+     * in the view control and triggers the
+     * onViewChange method with the new view type.
+     *
+     * @returns {void} Listens to changing view type.
+     */
+    listenToUserInputChange(): void {
+        this.searchResultControlForm.get('searchResultViewControl').valueChanges.subscribe((view: string) => {
             this.onViewChange(view);
         });
     }
 
+    /**
+     * Public method: isActiveResource.
+     *
+     * It compares a given resource id
+     * with the current selectedResourceId.
+     *
+     * @param {string} id The given resource id.
+     *
+     * @returns {boolean} The boolean value of the comparison result.
+     */
     isActiveResource(id: string): boolean {
-        return this.currentId === id;
+        return this.selectedResourceId === id;
+    }
+
+    /**
+     * Public method: isGridView.
+     *
+     * It checks if the current view type is 'grid'.
+     *
+     * @returns {boolean} The boolean value of the check result.
+     */
+    isGridView(): boolean {
+        return this.searchParams.view === SearchParamsViewTypes.grid;
     }
 
+    /**
+     * Public method: isNoResults.
+     *
+     * It checks if the current search response data has null results.
+     *
+     * @returns {boolean} The boolean value of the check result.
+     */
+    isNoResults(): boolean {
+        return +this.searchResponseWithQuery.data.nhits === 0;
+    }
+
+    /**
+     * Public method: navigateToResource.
+     *
+     * It navigates to the '/data/resource' route
+     * with the given id.
+     *
+     * @param {string} id The given resource id.
+     * @returns {void} Navigates to the resource.
+     */
     navigateToResource(id: string): void {
-        this.currentId = id;
-        this.router.navigate(['/data/resource', this.currentId]);
+        this.selectedResourceId = id;
+        this.router.navigate(['/data/resource', this.selectedResourceId]);
     }
 
-    // emit page change to search panel
+    /**
+     * Public method: onPageChange.
+     *
+     * It emits the new start position of the Paginator
+     * from a given page number to the {@link pageChangeRequest}.
+     *
+     * @param {number} pageNumber The given number of the page.
+     *
+     * @returns {void} Emits the new start position.
+     */
     onPageChange(pageNumber: number): void {
         const nRowsNumber = +this.searchParams.nRows;
         const newStartPosition = pageNumber * nRowsNumber - nRowsNumber;
@@ -94,17 +287,42 @@ export class SearchResultListComponent implements OnInit, OnDestroy {
         this.pageChangeRequest.emit(String(newStartPosition));
     }
 
-    // emit row change to search panel
-    onRowChange(rowNumber: number): void {
-        this.rowChangeRequest.emit(String(rowNumber));
+    /**
+     * Public method: onRowNumberChange.
+     *
+     * It emits the new number of rows to be displayed
+     * to the {@link rowNumberChangeRequest}.
+     *
+     * @param {number} rowNumber The given number of rows.
+     *
+     * @returns {void} Emits the new number of rows.
+     */
+    onRowNumberChange(rowNumber: number): void {
+        this.rowNumberChangeRequest.emit(String(rowNumber));
     }
 
-    // emit view change to search panel
+    /**
+     * Public method: onViewChange.
+     *
+     * It emits the new view type
+     * to the {@link viewChangeRequest}.
+     *
+     * @param {string} view The given view type.
+     *
+     * @returns {void} Emits the new view type.
+     */
     onViewChange(view: string): void {
         this.viewChangeRequest.emit(view);
     }
 
-    // set values for pagination
+    /**
+     * Public method: setPagination.
+     *
+     * It sets and calculates the page and pageSize
+     * values needed for the Paginator.
+     *
+     * @returns {void} Sets the Paginator values.
+     */
     setPagination(): void {
         const nRowsNumber = +this.searchParams.nRows;
         const startAtNumber = +this.searchParams.startAt;
@@ -113,61 +331,93 @@ export class SearchResultListComponent implements OnInit, OnDestroy {
         this.page = Math.floor(startAtNumber / nRowsNumber) + 1;
     }
 
-    subscribeToStreamerService(): Subscription {
-        return this.streamerService
-            .getCurrentSearchResults()
-            .pipe(
-                map((searchResponseWithQuery: SearchResponseWithQuery) => {
-                    // update current search params (url, text, sideinfo) via streamer service
-                    this.updateSearchParams(searchResponseWithQuery);
-
-                    return searchResponseWithQuery.data;
-                })
-            )
-            .subscribe(
-                (searchResponse: SearchResponseJson) => {
-                    this.searchResponse = searchResponse;
-
-                    this.setPagination();
-                },
-                error => {
-                    this.errorMessage = error as any;
-                    console.log('SearchResultList# searchResultData subscription error: ', this.errorMessage);
-                }
-            );
-    }
+    /**
+     * Public method: getSearchResponseWithQueryData.
+     *
+     * It gets the query and search response data
+     * from the {@link DataStreamerService}.
+     *
+     * @returns {void} Sets the search response with query data.
+     */
+    getSearchResponseWithQueryData(): void {
+        // cold request to streamer service
+        const searchResponseWithQuery$: Observable<
+            SearchResponseWithQuery
+        > = this.dataStreamerService.getSearchResponseWithQuery().pipe(takeUntil(this.destroy$));
 
-    // update search params
-    updateSearchParams(response: SearchResponseWithQuery): void {
-        // update current search values
-        this.updateCurrentValues(response);
+        // subscribe to response to handle changes
+        searchResponseWithQuery$.subscribe(
+            (searchResponseWithQuery: SearchResponseWithQuery) => {
+                // update current search params (url, text, sideinfo) via streamer service
+                this.updateSearchParams(searchResponseWithQuery);
 
-        // update side info
-        this.updateSearchInfoService();
+                this.setPagination();
+            },
+            error => {
+                this.errorMessage = error as any;
+                console.log('SearchResultList# searchResultData subscription error: ', this.errorMessage);
+            }
+        );
     }
 
-    // update current search values
-    updateCurrentValues(response: SearchResponseWithQuery): void {
-        // get current search value
-        this.searchValue = response.query;
-        // prepare result text for fulltext search
+    /**
+     * Public method: trackById.
+     *
+     * It returns a unique identifier of a given item.
+     * Angular uses the value returned from
+     * tracking function to track items identity.
+     *
+     * @param {string} item The given item.
+     * @returns {string} The identifier of the item.
+     */
+    trackById(item): string {
+        return item.obj_id;
+    }
+
+    /**
+     * Public method: updateSearchParams.
+     *
+     * It stores the given query and response of the search request
+     * and updates the info message and search info.
+     *
+     * @param {SearchResponseWithQuery} searchResponseWithQuery
+     * The given query and response of the search request.
+     *
+     * @returns {void} Updates the search params.
+     */
+    updateSearchParams(searchResponseWithQuery: SearchResponseWithQuery): void {
+        if (!searchResponseWithQuery) {
+            return;
+        }
+
+        // store search response and query
+        this.searchResponseWithQuery = { ...searchResponseWithQuery };
+
+        // update info message about the search results
         this.searchResultText = this.conversionService.prepareFullTextSearchResultText(
-            response.data,
-            this.searchValue,
+            searchResponseWithQuery,
             this.searchUrl
         );
-    }
 
-    // update data for searchInfo via sideinfo service
-    updateSearchInfoService(): void {
-        const searchInfo: SearchInfo = new SearchInfo(this.searchValue, this.searchResultText);
+        // update data for searchInfo via SideInfoService
+        const searchInfo: SearchInfo = new SearchInfo(this.searchResponseWithQuery.query, this.searchResultText);
         this.sideInfoService.updateSearchInfoData(searchInfo);
     }
 
+    /**
+     * Angular life cycle hook: ngOnDestroy.
+     *
+     * It calls the containing methods
+     * when destroying the component.
+     */
     ngOnDestroy() {
-        // prevent memory leak when component destroyed
-        if (this.streamerServiceSubscription) {
-            this.streamerServiceSubscription.unsubscribe();
-        }
+        // clear search info
+        this.sideInfoService.clearSearchInfoData();
+
+        // emit truthy value to end all subscriptions
+        this.destroy$.next(true);
+
+        // Now let's also unsubscribe from the subject itself:
+        this.destroy$.unsubscribe();
     }
 }
diff --git a/src/app/views/data-view/data-outlets/timeline/timeline.component.html b/src/app/views/data-view/data-outlets/timeline/timeline.component.html
index 074a72da23..be408cbf40 100644
--- a/src/app/views/data-view/data-outlets/timeline/timeline.component.html
+++ b/src/app/views/data-view/data-outlets/timeline/timeline.component.html
@@ -1,8 +1,9 @@
 <p class="help-block">
-    Datenbank-Suche nach Ereignissen mit heutigem Tagesdatum. Der erstmalige Aufruf kann einige Sekunden Ladezeit beanspruchen.
+    Datenbank-Suche nach Ereignissen mit heutigem Tagesdatum. Der erstmalige Aufruf kann einige Sekunden Ladezeit
+    beanspruchen.
 </p>
 <button class="btn btn-default" (click)="getTodaysEvents()">
-    Webern-Chronologie vom {{date.day}}.{{date.month}}.
+    Webern-Chronologie vom {{ date.day }}.{{ date.month }}.
 </button>
 
 <!--
@@ -37,8 +38,8 @@ <h3 data-ng-if="date.searchStart && date.searchEnd">
                                     <p data-ng-if="event.value">
                                         [{{event.objID}}] {{event.value.valueString}} <small><a data-ng-click="showObject(event.objID)">[mehr…]</a></small>
                                     </p>
-                                </timeline-panel-body>
-                                <!-- <timeline-panel-footer>
+                                </timeline-panel-body> -->
+<!-- <timeline-panel-footer>
 
                                 </timeline-panel-footer> -->
 <!--
diff --git a/src/app/views/data-view/data-outlets/timeline/timeline.component.ts b/src/app/views/data-view/data-outlets/timeline/timeline.component.ts
index ff85d722de..2eb91f3c52 100644
--- a/src/app/views/data-view/data-outlets/timeline/timeline.component.ts
+++ b/src/app/views/data-view/data-outlets/timeline/timeline.component.ts
@@ -2,24 +2,65 @@ import { Component, OnInit } from '@angular/core';
 
 import { TimelineDate } from '@awg-views/data-view/models/timeline-date.model';
 
+/**
+ * The Timeline component.
+ *
+ * It contains the timeline section
+ * of the data view of the app
+ * that displays a timeline of chronology events
+ * of the current date.
+ */
 @Component({
     selector: 'awg-timeline',
     templateUrl: './timeline.component.html',
     styleUrls: ['./timeline.component.css']
 })
 export class TimelineComponent implements OnInit {
+    /**
+     * Public variable: side.
+     *
+     * It sets the side position of the timeline.
+     */
     side = '';
 
-    now: Date = new Date();
-    date: TimelineDate = new TimelineDate(this.now);
+    /**
+     * Public variable: today.
+     *
+     * It keeps the current date for the timeline.
+     */
+    today: Date = new Date();
 
-    constructor() {}
+    /**
+     * Public variable: date.
+     *
+     * It keeps the current date data for the timeline.
+     */
+    date: TimelineDate = new TimelineDate(this.today);
 
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {
         this.getTodaysEvents();
     }
 
-    getTodaysEvents() {
+    /**
+     * Public method: getTodaysEvents.
+     *
+     * It calls the given (SALSAH) API
+     * to get the chronology events
+     * of the current date.
+     *
+     * NOT USED.
+     *
+     * IMPLEMENTATION FOR FUTURE USE.
+     *
+     * @returns {void} Prints a message to the console.
+     */
+    getTodaysEvents(): void {
         console.log('Timeline: called func getTodaysEvents');
     }
 }
diff --git a/src/app/views/data-view/data-routing.module.ts b/src/app/views/data-view/data-routing.module.ts
index e3fc5b0a68..c1b41604c8 100644
--- a/src/app/views/data-view/data-routing.module.ts
+++ b/src/app/views/data-view/data-routing.module.ts
@@ -7,6 +7,7 @@ import { SearchOverviewComponent } from './data-outlets/search-overview.componen
 import { SearchPanelComponent } from './data-outlets/search-panel/search-panel.component';
 import { TimelineComponent } from './data-outlets/timeline/timeline.component';
 
+/* routes of the DataModule */
 const dataRoutes: Routes = [
     {
         path: '',
@@ -17,10 +18,13 @@ const dataRoutes: Routes = [
                 component: SearchOverviewComponent,
                 children: [
                     { path: 'fulltext', component: SearchPanelComponent },
-                    { path: 'timeline', component: TimelineComponent },
                     { path: 'detail/:id', redirectTo: 'resource/:id' }, // absolute redirect (replacement of route) to resource/:id,
-                    // TODO: lazy loaded bibliography path muted for now
-                    // { path: 'bibliography', loadChildren: './data-outlets/bibliography/bibliography.module#BibliographyModule'}
+                    { path: 'timeline', component: TimelineComponent },
+                    {
+                        path: 'bibliography',
+                        loadChildren: () =>
+                            import('./data-outlets/bibliography/bibliography.module').then(m => m.BibliographyModule)
+                    },
                     { path: '', pathMatch: 'full', redirectTo: 'fulltext' }
                 ]
             }
@@ -29,16 +33,27 @@ const dataRoutes: Routes = [
     { path: 'resource/:id', component: ResourceDetailComponent }
 ];
 
-@NgModule({
-    imports: [RouterModule.forChild(dataRoutes)],
-    exports: [RouterModule]
-})
-export class DataRoutingModule {}
-
-export const routedComponents = [
+/**
+ * Routed components of the {@link DataModule}:
+ * {@link DataViewComponent}, {@link SearchOverviewComponent},
+ * {@link SearchPanelComponent}, {@link ResourceDetailComponent}
+ * and {@link TimelineComponent}.
+ */
+export const routedDataComponents = [
     DataViewComponent,
     SearchOverviewComponent,
     SearchPanelComponent,
     ResourceDetailComponent,
     TimelineComponent
 ];
+
+/**
+ * Data module routing.
+ *
+ * It activates the dataRoutes, also the lazy-loaded bibliography module.
+ */
+@NgModule({
+    imports: [RouterModule.forChild(dataRoutes)],
+    exports: [RouterModule]
+})
+export class DataRoutingModule {}
diff --git a/src/app/views/data-view/data-view.component.html b/src/app/views/data-view/data-view.component.html
index d5b298c8fc..14ab0a370a 100644
--- a/src/app/views/data-view/data-view.component.html
+++ b/src/app/views/data-view/data-view.component.html
@@ -8,6 +8,5 @@
     BETA: Suche momentan noch mit eingeschränkter Funktionalität
 </div>
 
-<!-- search routes -->
+<!-- data (search) routes -->
 <router-outlet></router-outlet>
-
diff --git a/src/app/views/data-view/data-view.component.ts b/src/app/views/data-view/data-view.component.ts
index 375f7f4700..04cf37fa33 100644
--- a/src/app/views/data-view/data-view.component.ts
+++ b/src/app/views/data-view/data-view.component.ts
@@ -1,21 +1,61 @@
 import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 
+/**
+ * The DataView component.
+ *
+ * It contains the data view section of the app
+ * with an {@link HeadingComponent} and
+ * another router outlet for the data (search) routes.
+ */
 @Component({
     selector: 'awg-data',
     templateUrl: './data-view.component.html',
     styleUrls: ['./data-view.component.css']
 })
 export class DataViewComponent implements OnInit {
-    public searchTitle = 'Suche';
-    public searchId = 'search';
+    /**
+     * Public variable: searchTitle.
+     *
+     * It keeps the title for the heading component
+     * of the data view section.
+     */
+    searchTitle = 'Suche';
 
+    /**
+     * Public variable: searchId.
+     *
+     * It keeps the id for the heading component
+     * of the data view section.
+     */
+    searchId = 'search';
+
+    /**
+     * Constructor of the DataViewComponent.
+     *
+     * It declares a private Router instance.
+     *
+     * @param {Router} router Instance of the Angular router.
+     */
     constructor(private router: Router) {}
 
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {
         this.routeToSidenav();
     }
 
+    /**
+     * Public method: routeToSidenav.
+     *
+     * It activates the secondary outlet with the search-info.
+     *
+     * @returns {void} Activates the search-info side outlet.
+     */
     routeToSidenav(): void {
         // opens the side-info outlet while preserving the router fragment for scrolling
         this.router.navigate([{ outlets: { side: 'searchInfo' } }], {
diff --git a/src/app/views/data-view/data.module.ts b/src/app/views/data-view/data.module.ts
index 70074f88d0..18f4c93870 100644
--- a/src/app/views/data-view/data.module.ts
+++ b/src/app/views/data-view/data.module.ts
@@ -2,18 +2,24 @@ import { NgModule } from '@angular/core';
 
 import { SharedModule } from '@awg-shared/shared.module';
 
-import { httpInterceptorProviders } from './interceptors';
-
 import { ResourceDetailModule } from './data-outlets/resource-detail/resource-detail.module';
-import { DataRoutingModule, routedComponents } from './data-routing.module';
 // bibliography module is lazy loaded, so not imported here
 
 import { SearchFormComponent } from './data-outlets/search-panel/search-form/search-form.component';
 import { SearchResultListComponent } from './data-outlets/search-panel/search-result-list/search-result-list.component';
 
+/* Routing Module */
+import { DataRoutingModule, routedDataComponents } from './data-routing.module';
+
+/**
+ * The data module.
+ *
+ * It embeds the data components and their [routing definition]{@link DataRoutingModule},
+ * the {@link SearchFormComponent}, {@link SearchResultListComponent},
+ * as well as the {@link ResourceDetailModule} and {@link SharedModule}.
+ */
 @NgModule({
     imports: [SharedModule, ResourceDetailModule, DataRoutingModule],
-    declarations: [routedComponents, SearchFormComponent, SearchResultListComponent],
-    providers: [httpInterceptorProviders]
+    declarations: [routedDataComponents, SearchFormComponent, SearchResultListComponent]
 })
 export class DataModule {}
diff --git a/src/app/views/data-view/interceptors/index.ts b/src/app/views/data-view/interceptors/index.ts
deleted file mode 100644
index 5dff9babc9..0000000000
--- a/src/app/views/data-view/interceptors/index.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- *
- *              SearchInterceptors
- *
- * This file exports interceptors that are used
- * for the Search view.
- *
- */
-
-import { HTTP_INTERCEPTORS } from '@angular/common/http';
-
-import { CachingInterceptor } from './caching.interceptor';
-
-export const httpInterceptorProviders = [
-    {
-        provide: HTTP_INTERCEPTORS,
-        useClass: CachingInterceptor,
-        multi: true
-    }
-];
diff --git a/src/app/views/data-view/models/index.ts b/src/app/views/data-view/models/index.ts
index 84c94080f4..db9a1a82c5 100644
--- a/src/app/views/data-view/models/index.ts
+++ b/src/app/views/data-view/models/index.ts
@@ -7,26 +7,28 @@
  *
  */
 
-import { ResourceData } from './resource-data.model';
+import { ResourceData, IResourceDataResponse } from './resource-data.model';
 import { ResourceDetail } from './resource-detail.model';
 import { ResourceDetailContent } from './resource-detail-content.model';
 import { ResourceDetailHeader } from './resource-detail-header.model';
 import { ResourceDetailImage } from './resource-detail-image.model';
-import { ResourceDetailIncomingLinks } from './resource-detail-incoming-links.model';
-import { ResourceDetailProps } from './resource-detail-props.model';
+import { ResourceDetailIncomingLink } from './resource-detail-incoming-link.model';
+import { ResourceDetailProperty } from './resource-detail-property.model';
 import { ResourceDetailGroupedIncomingLinks } from './resource-detail-grouped-incoming-links.model';
-import { SearchParams } from './search-params.model';
+import { SearchParams, SearchParamsViewTypes } from './search-params.model';
 import { SearchResponseWithQuery } from './search-response-with-query.model';
 
 export {
+    IResourceDataResponse,
     ResourceData,
     ResourceDetail,
     ResourceDetailContent,
     ResourceDetailHeader,
     ResourceDetailImage,
-    ResourceDetailIncomingLinks,
-    ResourceDetailProps,
+    ResourceDetailIncomingLink,
+    ResourceDetailProperty,
     ResourceDetailGroupedIncomingLinks,
     SearchParams,
+    SearchParamsViewTypes,
     SearchResponseWithQuery
 };
diff --git a/src/app/views/data-view/models/resource-data.model.ts b/src/app/views/data-view/models/resource-data.model.ts
index f6eac178c9..b34303becb 100644
--- a/src/app/views/data-view/models/resource-data.model.ts
+++ b/src/app/views/data-view/models/resource-data.model.ts
@@ -1,19 +1,66 @@
 import { ResourceDetail } from './resource-detail.model';
-import { ResourceFullResponseJson } from '@awg-shared/api-objects/index';
 
+import { ResourceContextResponseJson, ResourceFullResponseJson } from '@awg-shared/api-objects/index';
+
+/**
+ * The IResourceDataResponse interface.
+ *
+ * It represents the interface array
+ * for a resource data response
+ * of a resource detail.
+ */
+export interface IResourceDataResponse extends Array<ResourceFullResponseJson | ResourceContextResponseJson> {
+    /**
+     * The ResourceFullResponseJson data of a resource detail.
+     */
+    0: ResourceFullResponseJson;
+
+    /**
+     * The ResourceContextResponseJson data of a resource detail.
+     */
+    1: ResourceContextResponseJson;
+}
+
+/**
+ * The ResourceData class.
+ *
+ * It is used in the context of the resource detail view
+ * to store the data for the resource data.
+ */
 export class ResourceData {
+    /**
+     * The json response of the html converted resource data.
+     */
     jsonConverted: ResourceDetail;
+
+    /**
+     * The raw json response of the resource data.
+     */
     jsonRaw: ResourceFullResponseJson;
-    html: ResourceDetail;
 
-    constructor(body: ResourceFullResponseJson, html: ResourceDetail) {
+    /**
+     * The html converted resource data.
+     */
+    detail: ResourceDetail;
+
+    /**
+     * Constructor of the ResourceData class.
+     *
+     * It initializes the class with values
+     * from a given ResourceFullResponseJson
+     * and its html representation (resource detail).
+     *
+     * @param {ResourceFullResponseJson} resourceFullResponse The given ResourceFullResponseJson.
+     * @param {ResourceDetail} detail The given resource detail.
+     */
+    constructor(resourceFullResponse: ResourceFullResponseJson, detail: ResourceDetail) {
         // snapshot of raw json response
-        this.jsonRaw = JSON.parse(JSON.stringify(body));
+        this.jsonRaw = JSON.parse(JSON.stringify(resourceFullResponse));
 
         // converted html data
-        this.html = html;
+        this.detail = detail;
 
-        // snapshot of converted json response
-        this.jsonConverted = JSON.parse(JSON.stringify(html));
+        // snapshot of json response from converted html data
+        this.jsonConverted = JSON.parse(JSON.stringify(detail));
     }
 }
diff --git a/src/app/views/data-view/models/resource-detail-content.model.ts b/src/app/views/data-view/models/resource-detail-content.model.ts
index 1eeb8a6d81..9ab8352e03 100644
--- a/src/app/views/data-view/models/resource-detail-content.model.ts
+++ b/src/app/views/data-view/models/resource-detail-content.model.ts
@@ -1,9 +1,48 @@
 import { ResourceDetailImage } from './resource-detail-image.model';
 import { ResourceDetailGroupedIncomingLinks } from './resource-detail-grouped-incoming-links.model';
-import { ResourceDetailProps } from './resource-detail-props.model';
+import { ResourceDetailProperty } from './resource-detail-property.model';
+import { NgxGalleryImage } from 'ngx-gallery';
 
+/**
+ * The ResourceDetailContent class.
+ *
+ * It is used in the context of the resource detail view
+ * to store the data for a resource detail content.
+ */
 export class ResourceDetailContent {
-    props: ResourceDetailProps[];
-    images: ResourceDetailImage[];
-    incoming: ResourceDetailGroupedIncomingLinks;
+    /**
+     * The properties of the resource content.
+     */
+    props: ResourceDetailProperty[];
+
+    /**
+     * The images of the resource content.
+     */
+    images: NgxGalleryImage[];
+
+    /**
+     * The grouped incoming links of the resource content.
+     */
+    incoming: ResourceDetailGroupedIncomingLinks[];
+
+    /**
+     * Constructor of the ResourceDetailContent class.
+     *
+     * It initializes the class with values from
+     * given properties, images and grouped incoming links.
+     *
+     * @param {ResourceDetailProperty[]} props The given resource detail properties array.
+     * @param {NgxGalleryImage[]} images The given resource detail image array.
+     * @param {ResourceDetailGroupedIncomingLinks[]} incoming
+     * The given resource detail grouped incoming links array.
+     */
+    constructor(
+        props: ResourceDetailProperty[],
+        images: NgxGalleryImage[],
+        incoming: ResourceDetailGroupedIncomingLinks[]
+    ) {
+        this.props = props;
+        this.images = images;
+        this.incoming = incoming;
+    }
 }
diff --git a/src/app/views/data-view/models/resource-detail-grouped-incoming-links.model.ts b/src/app/views/data-view/models/resource-detail-grouped-incoming-links.model.ts
index 15c3801c09..db0d228085 100644
--- a/src/app/views/data-view/models/resource-detail-grouped-incoming-links.model.ts
+++ b/src/app/views/data-view/models/resource-detail-grouped-incoming-links.model.ts
@@ -1,5 +1,19 @@
-import { ResourceDetailIncomingLinks } from './resource-detail-incoming-links.model';
+import { ResourceDetailIncomingLink } from './resource-detail-incoming-link.model';
 
+/**
+ * The ResourceDetailGroupedIncomingLinks class.
+ *
+ * It is used in the context of the resource detail view
+ * to store and group arrays of resource detail incoming links.
+ */
 export class ResourceDetailGroupedIncomingLinks {
-    [key: string]: ResourceDetailIncomingLinks[];
+    /**
+     * The label of the resource type to be grouped.
+     */
+    restypeLabel: string;
+
+    /**
+     * The array of incoming links.
+     */
+    links: ResourceDetailIncomingLink[];
 }
diff --git a/src/app/views/data-view/models/resource-detail-header.model.ts b/src/app/views/data-view/models/resource-detail-header.model.ts
index 010400840b..e99313dd98 100644
--- a/src/app/views/data-view/models/resource-detail-header.model.ts
+++ b/src/app/views/data-view/models/resource-detail-header.model.ts
@@ -1,17 +1,43 @@
 import { ResourceFullResponseJson } from '@awg-shared/api-objects';
 
+/**
+ * The ResourceDetailHeader class.
+ *
+ * It is used in the context of the resource detail view
+ * to store the data for the resource detail header.
+ */
 export class ResourceDetailHeader {
+    /**
+     * The object id of the resource.
+     */
     objID: string;
+
+    /**
+     * The icon for the type of object of the resource.
+     */
     icon: string;
+
+    /**
+     * The type of the resource.
+     */
     type: string;
+
+    /**
+     * The title of the resource.
+     */
     title: string;
+
+    /**
+     * The last modification date of the resource.
+     */
     lastmod: string;
 
-    /******************************************
+    /**
+     * Private static method: replaceParagraphTags.
      *
-     * replace paragraph tags
-     *
-     *****************************************/
+     * It replaces paragraph tags with break lines
+     * in a resource's rich text area (here: title).
+     */
     private static replaceParagraphTags(str: string): string {
         if (!str) {
             return;
@@ -23,6 +49,16 @@ export class ResourceDetailHeader {
         return str;
     }
 
+    /**
+     * Constructor of the ResourceDetailHeader class.
+     *
+     * It initializes the class with values from a
+     * given ResourceFullResponseJson and the id
+     * of the current resource.
+     *
+     * @param {ResourceFullResponseJson} data The given ResourceFullResponseJson.
+     * @param {string} currentId The given id of the current resource.
+     */
     constructor(data: ResourceFullResponseJson, currentId: string) {
         // init values
         this.objID = '---';
diff --git a/src/app/views/data-view/models/resource-detail-image.model.ts b/src/app/views/data-view/models/resource-detail-image.model.ts
index 054a364793..624303dd75 100644
--- a/src/app/views/data-view/models/resource-detail-image.model.ts
+++ b/src/app/views/data-view/models/resource-detail-image.model.ts
@@ -1,23 +1,61 @@
 import { ContextJson } from '@awg-shared/api-objects';
 
+/**
+ * The ResourceDetailImage class.
+ *
+ * It is used in the context of the resource detail view
+ * to store the data for a resource detail image.
+ */
 export class ResourceDetailImage {
+    /**
+     * The full size of the image.
+     */
     fullSize: string;
+
+    /**
+     * The reduced size of the image.
+     */
     reductSize: string;
+
+    /**
+     * The guielement of the image.
+     */
     guielement: string;
+
+    /**
+     * The label of the image.
+     */
     label: string;
+
+    /**
+     * The original name of the image.
+     */
     origname: string;
-    res_id: string;
 
+    /**
+     * The resource id of the image.
+     */
+    resId: string;
+
+    /**
+     * Constructor of the ResourceDetailImage class.
+     *
+     * It initializes the class with values from a given ContextJson
+     * and an index position.
+     *
+     * @param {ContextJson} context The given ContextJson.
+     * @param {number} index The given index position.
+     */
     constructor(context: ContextJson, index: number) {
-        const img_size = context.locations[index];
+        const imgSize = context.locations[index];
         // find proper image solution [3] = reduction 3
-        const preview = img_size[3] ? img_size[3] : img_size[0];
+        const preview = imgSize[3] ? imgSize[3] : imgSize[0];
 
-        this.res_id = context.res_id[index];
+        this.resId = context.res_id[index];
         this.guielement = context.resclass_name;
         this.label = context.firstprop[index];
         this.origname = preview.origname;
         this.reductSize = preview.path;
-        this.fullSize = img_size[img_size.length - 1].path;
+        this.fullSize = imgSize[imgSize.length - 1].path;
     }
 }
diff --git a/src/app/views/data-view/models/resource-detail-incoming-link.model.ts b/src/app/views/data-view/models/resource-detail-incoming-link.model.ts
new file mode 100644
index 0000000000..87dc8d17a3
--- /dev/null
+++ b/src/app/views/data-view/models/resource-detail-incoming-link.model.ts
@@ -0,0 +1,56 @@
+import { IncomingItemJson } from '@awg-shared/api-objects';
+
+/**
+ * The ResourceDetailIncomingLink class.
+ *
+ * It is used in the context of the resource detail view
+ * to store the data for a resource detail incoming link.
+ */
+export class ResourceDetailIncomingLink {
+    /**
+     * The id of the incoming link.
+     */
+    id: string;
+
+    /**
+     * The value of the incoming link.
+     */
+    value: string;
+
+    /**
+     * The resource type of the incoming link.
+     */
+    restype: {
+        /**
+         * The id of the resource type of the incoming link.
+         */
+        id: string;
+
+        /**
+         * The label of the resource type of the incoming link.
+         */
+        label: string;
+
+        /**
+         * The icon (url) of the resource type of the incoming link.
+         */
+        icon: string;
+    };
+
+    /**
+     * Constructor of the ResourceDetailIncomingLink class.
+     *
+     * It initializes the class with values from a given IncomingItemJson.
+     *
+     * @param {IncomingItemJson} incoming The given IncomingItemJson.
+     */
+    constructor(incoming: IncomingItemJson) {
+        this.id = incoming.ext_res_id.id;
+        this.value = incoming.value;
+        this.restype = {
+            id: incoming.resinfo.restype_id,
+            label: incoming.resinfo.restype_label,
+            icon: incoming.resinfo.restype_iconsrc
+        };
+    }
+}
diff --git a/src/app/views/data-view/models/resource-detail-incoming-links.model.ts b/src/app/views/data-view/models/resource-detail-incoming-links.model.ts
deleted file mode 100644
index 66ec88bb07..0000000000
--- a/src/app/views/data-view/models/resource-detail-incoming-links.model.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { IncomingItemJson } from '@awg-shared/api-objects';
-
-export class ResourceDetailIncomingLinks {
-    id: string;
-    value: string;
-    restype: {
-        id: string;
-        label: string;
-        icon: string;
-    };
-
-    constructor(incoming: IncomingItemJson) {
-        this.id = incoming.ext_res_id.id;
-        this.value = incoming.value;
-        this.restype = {
-            id: incoming.resinfo.restype_id,
-            label: incoming.resinfo.restype_label,
-            icon: incoming.resinfo.restype_iconsrc
-        };
-    }
-}
diff --git a/src/app/views/data-view/models/resource-detail-property.model.ts b/src/app/views/data-view/models/resource-detail-property.model.ts
new file mode 100644
index 0000000000..90a0e858ea
--- /dev/null
+++ b/src/app/views/data-view/models/resource-detail-property.model.ts
@@ -0,0 +1,45 @@
+/**
+ * The ResourceDetailProperty class.
+ *
+ * It is used in the context of the resource detail view
+ * to store the data for a resource detail property.
+ */
+export class ResourceDetailProperty {
+    /**
+     * The id of the property.
+     */
+    pid: string;
+
+    /**
+     * The gui element of the property.
+     */
+    guielement: string;
+
+    /**
+     * The label of the property.
+     */
+    label: string;
+
+    /**
+     * The value array of the property.
+     */
+    values: string[];
+
+    /**
+     * Constructor of the ResourceDetailProperty class.
+     *
+     * It initializes the class with property id,
+     * guielement, label and values array.
+     *
+     * @param {string} pid The given property id.
+     * @param {string} guielement The given guielement.
+     * @param {string} label The given label.
+     * @param {string[]} values The given values array.
+     */
+    constructor(pid: string, guielement: string, label: string, values: string[]) {
+        this.pid = pid;
+        this.guielement = guielement;
+        this.label = label;
+        this.values = values;
+    }
+}
diff --git a/src/app/views/data-view/models/resource-detail-props.model.ts b/src/app/views/data-view/models/resource-detail-props.model.ts
deleted file mode 100644
index 696db7be05..0000000000
--- a/src/app/views/data-view/models/resource-detail-props.model.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export class ResourceDetailProps {
-    pid: string;
-    guielement: string;
-    label: string;
-    value: string[];
-}
diff --git a/src/app/views/data-view/models/resource-detail.model.ts b/src/app/views/data-view/models/resource-detail.model.ts
index 42dfcb407f..c736ad8036 100644
--- a/src/app/views/data-view/models/resource-detail.model.ts
+++ b/src/app/views/data-view/models/resource-detail.model.ts
@@ -1,10 +1,32 @@
 import { ResourceDetailHeader } from './resource-detail-header.model';
 import { ResourceDetailContent } from './resource-detail-content.model';
 
+/**
+ * The ResourceDetail class.
+ *
+ * It is used in the context of the resource detail view
+ * to store the data for a resource detail.
+ */
 export class ResourceDetail {
+    /**
+     * The header of the resource detail.
+     */
     header: ResourceDetailHeader;
+
+    /**
+     * The content of the resource detail.
+     */
     content: ResourceDetailContent;
 
+    /**
+     * Constructor of the ResourceDetail class.
+     *
+     * It initializes the class with values
+     * from a given header and content.
+     *
+     * @param {ResourceDetailHeader} header The given header.
+     * @param {ResourceDetailContent} content The given content.
+     */
     constructor(header: ResourceDetailHeader, content: ResourceDetailContent) {
         this.header = header;
         this.content = content;
diff --git a/src/app/views/data-view/models/search-params.model.ts b/src/app/views/data-view/models/search-params.model.ts
index 03dd702e23..2b3cff5f23 100644
--- a/src/app/views/data-view/models/search-params.model.ts
+++ b/src/app/views/data-view/models/search-params.model.ts
@@ -1,6 +1,37 @@
+/**
+ * The SearchParamsViewTypes enumeration.
+ *
+ * It stores the possible search params view types.
+ */
+export enum SearchParamsViewTypes {
+    table = 'table',
+    grid = 'grid'
+}
+
+/**
+ * The SearchParams class.
+ *
+ * It is used in the context of the search
+ * to store the data for search (url) params.
+ */
 export class SearchParams {
+    /**
+     * The query string.
+     */
     query: string;
+
+    /**
+     * The number of rows to return per result list page.
+     */
     nRows: string;
+
+    /**
+     * The position in the result list to start at.
+     */
     startAt: string;
-    view: string;
+
+    /**
+     * The requested view type ('table', 'grid').
+     */
+    view: SearchParamsViewTypes;
 }
diff --git a/src/app/views/data-view/models/search-response-with-query.model.ts b/src/app/views/data-view/models/search-response-with-query.model.ts
index 246de2591a..caa5403b99 100644
--- a/src/app/views/data-view/models/search-response-with-query.model.ts
+++ b/src/app/views/data-view/models/search-response-with-query.model.ts
@@ -1,9 +1,32 @@
 import { SearchResponseJson } from '@awg-shared/api-objects';
 
+/**
+ * The SearchResponseWithQuery class.
+ *
+ * It is used in the context of the search
+ * to store the data for a search response
+ * and its corresponding query string.
+ */
 export class SearchResponseWithQuery {
+    /**
+     * The search response data.
+     */
     data: SearchResponseJson;
+
+    /**
+     * The query string.
+     */
     query: string;
 
+    /**
+     * Constructor of the SearchResponseWithQuery class.
+     *
+     * It initializes the class with values from a given
+     * search response and the corresponding query string.
+     *
+     * @param {SearchResponseJson} data The given search response.
+     * @param {string} query The given query string.
+     */
     constructor(data: SearchResponseJson, query: string) {
         this.data = data;
         this.query = query;
diff --git a/src/app/views/data-view/models/timeline-date.model.ts b/src/app/views/data-view/models/timeline-date.model.ts
index ccaebe4f38..37e9dad1c0 100644
--- a/src/app/views/data-view/models/timeline-date.model.ts
+++ b/src/app/views/data-view/models/timeline-date.model.ts
@@ -1,11 +1,58 @@
+/**
+ * The TimelineDate class.
+ *
+ * It is used in the context of the timeline (search)
+ * to store the data for a timeline view.
+ */
 export class TimelineDate {
+    /**
+     * The day of the timeline date.
+     */
     day: number;
+
+    /**
+     * The month of the timeline date.
+     */
     month: number;
-    findStart: string;
-    findEnd: string;
 
+    /**
+     * The start year of the timeline date search.
+     */
+    searchStart = 1883;
+
+    /**
+     * The end year of the timeline date search.
+     */
+    endStart = 1945;
+
+    /**
+     * The start year of the timeline date results.
+     */
+    findStart: string; // awgFactory.extractYear(response.searchResults[0]);
+
+    /**
+     * The end year of the timeline date results.
+     */
+    findEnd: string; // awgFactory.extractYear(response.searchResults[response.searchResults.length-1]);
+
+    /**
+     * Constructor of the TimelineDate class.
+     *
+     * It initializes the class with values from a given Date.
+     *
+     * @param {Date} now The given date.
+     */
     constructor(now: Date) {
         this.day = now.getDate();
         this.month = now.getMonth() + 1;
     }
+
+    /*
+     * not used at the moment
+     * obj = response.searchResults (SearchResponseJson)
+     *
+    extractYear(obj) {
+        return obj.date.dateString.split(' ')[3];
+    }
+    */
 }
diff --git a/src/app/views/data-view/services/bibliography.service.spec.ts b/src/app/views/data-view/services/bibliography.service.spec.ts
index 228eff344c..4ef57ecc69 100644
--- a/src/app/views/data-view/services/bibliography.service.spec.ts
+++ b/src/app/views/data-view/services/bibliography.service.spec.ts
@@ -101,11 +101,6 @@ describe('BibliographyService (DONE)', () => {
             expect(bibliographyService.searchRoute).toBe(expectedSearchRoute);
         });
 
-        it(`... should have 'loading = false' (inherited from ApiService)`, () => {
-            expect(bibliographyService.loading).toBeDefined();
-            expect(bibliographyService.loading).toBeFalsy();
-        });
-
         it(`... should have empty 'httpGetUrl' (inherited from ApiService)`, () => {
             expect(bibliographyService.httpGetUrl).toBeDefined();
             expect(bibliographyService.httpGetUrl).toBe('');
@@ -121,15 +116,15 @@ describe('BibliographyService (DONE)', () => {
             });
 
             // match the request url
-            const r = httpTestingController.expectOne({
+            const call = httpTestingController.expectOne({
                 url: '/foo/bar'
             });
 
             // check for GET request
-            expect(r.request.method).toEqual('GET');
+            expect(call.request.method).toEqual('GET');
 
             // respond with mocked data
-            r.flush(testData);
+            call.flush(testData);
         }));
     });
 
@@ -142,9 +137,13 @@ describe('BibliographyService (DONE)', () => {
                 bibliographyService.getBibliographyList().subscribe();
 
                 // expect one request to url with given settings
-                httpTestingController.expectOne((req: HttpRequest<any>) => {
+                const call = httpTestingController.expectOne((req: HttpRequest<any>) => {
                     return req.method === 'GET' && req.responseType === 'json' && req.url === expectedUrl;
                 }, `GET to ${expectedUrl}`);
+
+                expect(call.request.method).toEqual('GET', 'should be GET');
+                expect(call.request.responseType).toEqual('json', 'should be json');
+                expect(call.request.url).toEqual(expectedUrl, `should be ${expectedUrl}`);
             }));
 
             it(`... should set filter params for GET request`, async(() => {
@@ -154,26 +153,29 @@ describe('BibliographyService (DONE)', () => {
                 bibliographyService.getBibliographyList().subscribe();
 
                 // expect one request to url with given settings
-                httpTestingController.expectOne((req: HttpRequest<any>) => {
-                    expect(req.params).toBeDefined();
-                    expect(req.params.keys().length).toBe(5, 'should be 5');
-                    expect(req.params.get('searchtype')).toBe('extended', 'should be extended');
-                    expect(req.params.get('filter_by_project')).toBe(
-                        expectedProjectId,
-                        `should be ${expectedProjectId}`
-                    );
-                    expect(req.params.get('filter_by_restype')).toBe(
-                        expectedResTypeId,
-                        `should be ${expectedResTypeId}`
-                    );
-                    expect(req.params.get('property_id')).toBe(
-                        expectedBibShortTitlePropertyId,
-                        `should be ${expectedBibShortTitlePropertyId}`
-                    );
-                    expect(req.params.get('compop')).toBe('EXISTS', `should be EXISTS`);
-
+                const call = httpTestingController.expectOne((req: HttpRequest<any>) => {
                     return req.method === 'GET' && req.responseType === 'json' && req.url === expectedUrl;
                 }, `GET to ${expectedUrl}`);
+
+                expect(call.request.method).toEqual('GET', 'should be GET');
+                expect(call.request.responseType).toEqual('json', 'should be json');
+                expect(call.request.url).toEqual(expectedUrl, `should be ${expectedUrl}`);
+                expect(call.request.params).toBeDefined();
+                expect(call.request.params.keys().length).toBe(5, 'should be 5');
+                expect(call.request.params.get('searchtype')).toBe('extended', 'should be extended');
+                expect(call.request.params.get('filter_by_project')).toBe(
+                    expectedProjectId,
+                    `should be ${expectedProjectId}`
+                );
+                expect(call.request.params.get('filter_by_restype')).toBe(
+                    expectedResTypeId,
+                    `should be ${expectedResTypeId}`
+                );
+                expect(call.request.params.get('property_id')).toBe(
+                    expectedBibShortTitlePropertyId,
+                    `should be ${expectedBibShortTitlePropertyId}`
+                );
+                expect(call.request.params.get('compop')).toBe('EXISTS', `should be EXISTS`);
             }));
 
             it(`... should call getApiResponse (via ApiService) with filter params`, async(() => {
diff --git a/src/app/views/data-view/services/bibliography.service.ts b/src/app/views/data-view/services/bibliography.service.ts
index 54b8f82ffd..f22e1da17b 100644
--- a/src/app/views/data-view/services/bibliography.service.ts
+++ b/src/app/views/data-view/services/bibliography.service.ts
@@ -6,30 +6,79 @@ import { Observable } from 'rxjs';
 import { ApiService } from '@awg-core/services';
 import { ResourceFullResponseJson, SearchResponseJson } from '@awg-shared/api-objects';
 
+/**
+ * The Bibliography service.
+ *
+ * It handles the search requests to the given (SALSAH) API
+ * for the data bibliography view and provides the bibliography data.
+ *
+ * Provided in: `root`.
+ */
 @Injectable({
     providedIn: 'root'
 })
 export class BibliographyService extends ApiService {
-    // issue with ServiceInheritance, cf. https://stackoverflow.com/questions/50263722/angular-6-services-and-class-inheritance
-    static ngInjectableDef = undefined;
-
+    /**
+     * Public variable: projectId.
+     *
+     * It keeps the SALSAH specific id of the webern project ('6').
+     */
     projectId = '6';
-    resTypeId = '126'; // test-01: 127
-    bibShortTitlePropertyId = '614'; // 614 = Bibligoraphie#Kurztitel
+
+    /**
+     * Public variable: resTypeId.
+     *
+     * It keeps the SALSAH specific id of the bibligraphy resource type ('126').
+     * For Test server test-01 it is: '127'
+     */
+    resTypeId = '126';
+
+    /**
+     * Public variable: bibShortTitlePropertyId.
+     *
+     * It keeps the SALSAH specific id of the bibligraphy's short title property ('614').
+     * 614 = Bibligoraphie#Kurztitel
+     */
+    bibShortTitlePropertyId = '614';
+
+    /**
+     * Public variable: resourcesRoute.
+     *
+     * It keeps the SALSAH specific route for a resource ('resources/').
+     */
     resourcesRoute = 'resources/';
+
+    /**
+     * Public variable: searchRoute.
+     *
+     * It keeps the SALSAH specific route for the search ('search/').
+     */
     searchRoute = 'search/';
 
+    /**
+     * Constructor of the DataApiService.
+     *
+     * It declares a public {@link HttpClient} instance
+     * to handle http requests.
+     *
+     * @param {HttpClient} http Instance of the HttpClient.
+     */
     constructor(http: HttpClient) {
         super(http);
         this.serviceName = 'BibliographyService';
     }
 
-    /**********************************
+    /**
+     * Public method: getBibliographyList.
      *
-     *  get bibliography via salsah api
+     * It sets the path and params for an extended search query
+     * to retrieve a list of bibliography entries
+     * from the given (SALSAH) API.
      *
-     **********************************/
+     * @returns {Observable<SearchResponseJson>} The observable with the SearchResponseJson data.
+     */
     getBibliographyList(): Observable<SearchResponseJson> {
+        // set path and params of query
         const queryPath: string = this.searchRoute;
         const queryHttpParams = new HttpParams()
             .set('searchtype', 'extended')
@@ -38,13 +87,28 @@ export class BibliographyService extends ApiService {
             .set('filter_by_project', this.projectId)
             .set('filter_by_restype', this.resTypeId);
 
+        // request to API
         return this.getApiResponse(SearchResponseJson, queryPath, queryHttpParams);
     }
 
+    /**
+     * Public method: getBibliographyItemDetail.
+     *
+     * It sets the path and params for a resource query
+     * to the given (SALSAH) API.
+     *
+     * @params {string} resourceId The id of the requested resource.
+     *
+     * @returns {Observable<ResourceFullResponseJson>} The observable with the ResourceFullResponseJson data.
+     *
+     * @todo Replace with {@link DataApiService#getResourceDetailData}.
+     */
     getBibliographyItemDetail(resourceId: string): Observable<ResourceFullResponseJson> {
+        // set path and params of query
         const queryPath: string = this.resourcesRoute + resourceId;
         const queryHttpParams = new HttpParams();
 
+        // request to API
         return this.getApiResponse(ResourceFullResponseJson, queryPath, queryHttpParams);
     }
 }
diff --git a/src/app/views/data-view/services/data-api.service.spec.ts b/src/app/views/data-view/services/data-api.service.spec.ts
index e1a0bdad51..d9fd1c78c5 100644
--- a/src/app/views/data-view/services/data-api.service.spec.ts
+++ b/src/app/views/data-view/services/data-api.service.spec.ts
@@ -10,17 +10,23 @@ import { of as observableOf, throwError as observableThrowError } from 'rxjs';
 import { JsonConvert } from 'json2typescript';
 
 import { expectSpyCall } from '@testing/expect-helper';
-import { mockResourceFullResponseJson, mockSearchResponseConverted, mockSearchResponseJson } from '@testing/mock-data';
+import {
+    mockResourceContextResponseJson,
+    mockResourceDetail,
+    mockResourceFullResponseJson,
+    mockSearchResponseConverted,
+    mockSearchResponseJson
+} from '@testing/mock-data';
 
 import { AppConfig } from '@awg-app/app.config';
 import { ConversionService } from '@awg-core/services';
 import { ApiServiceError } from '@awg-core/services/api-service/api-service-error.model';
-import { ResourceFullResponseJson, SearchResponseJson, UserDataJson } from '@awg-shared/api-objects';
+import { ResourceContextResponseJson, ResourceFullResponseJson, SearchResponseJson } from '@awg-shared/api-objects';
+import { ResourceData, ResourceDetail, SearchParams } from '@awg-views/data-view/models';
 
 import { DataApiService } from './data-api.service';
-import { ApiServiceResult } from '@awg-core/services/api-service/api-service-result.model';
 
-describe('DataApiService (DONE)', () => {
+describe('DataApiService', () => {
     let dataApiService: DataApiService;
 
     let httpClient: HttpClient;
@@ -33,25 +39,35 @@ describe('DataApiService (DONE)', () => {
     // json object
     let jsonConvert: JsonConvert;
     let expectedResourceFullResponseJson: ResourceFullResponseJson;
+    let expectedResourceContextResponseJson: ResourceContextResponseJson;
     let expectedSearchResponseJson: SearchResponseJson;
     let expectedSearchResponseConverted: any;
+    let expectedResourceDetail: ResourceDetail;
+    let expectedResourceData: ResourceData;
 
     const expectedProjectId = '6';
-    const expectedResourceAppendix = '_-_local';
-    const expectedResourcesRoute = 'resources/';
-    const expectedSearchRoute = 'search/';
+    const expectedResourceSuffix = '_-_local';
+    const expectedRoutes = {
+        resources: 'resources/',
+        search: 'search/',
+        geonames: 'geonames/',
+        hlists: 'hlists/',
+        selections: 'selections/'
+    };
     const apiUrl = AppConfig.API_ENDPOINT;
 
     beforeEach(() => {
         // stub service for test purposes
         mockConversionService = {
-            convertFullTextSearchResults: () => expectedSearchResponseConverted
+            convertFullTextSearchResults: () => expectedSearchResponseConverted,
+            convertResourceData: () => expectedResourceDetail
         };
 
         TestBed.configureTestingModule({
             imports: [HttpClientTestingModule],
             providers: [DataApiService, { provide: ConversionService, useValue: mockConversionService }]
         });
+
         // inject services and http client handler
         dataApiService = TestBed.get(DataApiService);
         httpClient = TestBed.get(HttpClient);
@@ -63,10 +79,16 @@ describe('DataApiService (DONE)', () => {
             mockResourceFullResponseJson,
             ResourceFullResponseJson
         );
+        expectedResourceContextResponseJson = jsonConvert.deserializeObject(
+            mockResourceContextResponseJson,
+            ResourceContextResponseJson
+        );
         expectedSearchResponseJson = jsonConvert.deserializeObject(mockSearchResponseJson, SearchResponseJson);
 
         // test data
         expectedSearchResponseConverted = mockSearchResponseConverted;
+        expectedResourceDetail = mockResourceDetail;
+        expectedResourceData = new ResourceData(expectedResourceFullResponseJson, expectedResourceDetail);
 
         // spies on service functions
         // `.and.callThrough` will track the spy down the nested describes, see
@@ -98,35 +120,27 @@ describe('DataApiService (DONE)', () => {
             const expectedServiceName = 'DataApiService';
 
             expect(dataApiService.serviceName).toBeDefined();
-            expect(dataApiService.serviceName).toBe(expectedServiceName);
+            expect(dataApiService.serviceName).toBe(expectedServiceName, `should be ${expectedServiceName}`);
         });
 
         it('... should have projectId', () => {
             expect(dataApiService.projectId).toBeDefined();
-            expect(dataApiService.projectId).toBe(expectedProjectId);
+            expect(dataApiService.projectId).toBe(expectedProjectId, `should be ${expectedProjectId}`);
         });
 
-        it('... should have resourceAppendix', () => {
-            expect(dataApiService.resourceAppendix).toBeDefined();
-            expect(dataApiService.resourceAppendix).toBe(expectedResourceAppendix);
+        it('... should have resourceSuffix', () => {
+            expect(dataApiService.resourceSuffix).toBeDefined();
+            expect(dataApiService.resourceSuffix).toBe(expectedResourceSuffix, `should be ${expectedResourceSuffix}`);
         });
 
         it('... should have routes', () => {
-            expect(dataApiService.resourcesRoute).toBeDefined();
-            expect(dataApiService.resourcesRoute).toBe(expectedResourcesRoute);
-
-            expect(dataApiService.searchRoute).toBeDefined();
-            expect(dataApiService.searchRoute).toBe(expectedSearchRoute);
-        });
-
-        it(`... should have 'loading = false' (inherited from ApiService)`, () => {
-            expect(dataApiService.loading).toBeDefined();
-            expect(dataApiService.loading).toBeFalsy();
+            expect(dataApiService.routes).toBeDefined();
+            expect(dataApiService.routes).toEqual(expectedRoutes, `should be ${expectedRoutes}`);
         });
 
         it(`... should have empty 'httpGetUrl' (inherited from ApiService)`, () => {
             expect(dataApiService.httpGetUrl).toBeDefined();
-            expect(dataApiService.httpGetUrl).toBe('');
+            expect(dataApiService.httpGetUrl).toBe('', `should be empty string`);
         });
     });
 
@@ -139,24 +153,24 @@ describe('DataApiService (DONE)', () => {
             });
 
             // match the request url
-            const r = httpTestingController.expectOne({
+            const call = httpTestingController.expectOne({
                 url: '/foo/bar'
             });
 
             // check for GET request
-            expect(r.request.method).toEqual('GET');
+            expect(call.request.method).toEqual('GET');
 
             // respond with mocked data
-            r.flush(testData);
+            call.flush(testData);
         }));
     });
 
     describe('#getFulltextSearchData', () => {
         describe('request', () => {
-            it(`... should not do anything if empty searchString is provided`, async(() => {
-                // empty string
-                const expectedSearchString = '';
-                const expectedUrl = apiUrl + expectedSearchRoute + expectedSearchString;
+            it(`... should not do anything if undefined is provided`, async(() => {
+                // undefined
+                const expectedSearchString = undefined;
+                const expectedUrl = apiUrl + expectedRoutes.search + expectedSearchString;
 
                 // call service function
                 dataApiService.getFulltextSearchData(expectedSearchString);
@@ -170,10 +184,10 @@ describe('DataApiService (DONE)', () => {
                 }, `GET to ${expectedUrl}`);
             }));
 
-            it(`... should not do anything if undefined is provided`, async(() => {
-                // undefined
-                const expectedSearchString = undefined;
-                const expectedUrl = apiUrl + expectedSearchRoute + expectedSearchString;
+            it(`... should not do anything if null is provided`, async(() => {
+                // null
+                const expectedSearchString = null;
+                const expectedUrl = apiUrl + expectedRoutes.search + expectedSearchString;
 
                 // call service function
                 dataApiService.getFulltextSearchData(expectedSearchString);
@@ -187,13 +201,14 @@ describe('DataApiService (DONE)', () => {
                 }, `GET to ${expectedUrl}`);
             }));
 
-            it(`... should not do anything if null is provided`, async(() => {
-                // null
-                const expectedSearchString = null;
-                const expectedUrl = apiUrl + expectedSearchRoute + expectedSearchString;
+            it(`... should not do anything if empty searchString is provided`, async(() => {
+                // empty string
+                const expectedSearchParams: SearchParams = new SearchParams();
+                expectedSearchParams.query = '';
+                const expectedUrl = apiUrl + expectedRoutes.search + expectedSearchParams.query;
 
                 // call service function
-                dataApiService.getFulltextSearchData(expectedSearchString);
+                dataApiService.getFulltextSearchData(expectedSearchParams);
 
                 // expect no request to getApiResponse
                 expectSpyCall(getApiResponseSpy, 0);
@@ -205,71 +220,100 @@ describe('DataApiService (DONE)', () => {
             }));
 
             it(`... should perform an HTTP GET request to the Knora API (via ApiService) with provided searchString`, async(() => {
-                const expectedSearchString = 'Test';
-                const expectedUrl = apiUrl + expectedSearchRoute + expectedSearchString;
+                const expectedSearchParams: SearchParams = new SearchParams();
+                expectedSearchParams.query = 'Test';
+                const expectedUrl = apiUrl + expectedRoutes.search + expectedSearchParams.query;
 
                 // call service function
-                dataApiService.getFulltextSearchData(expectedSearchString).subscribe();
+                dataApiService.getFulltextSearchData(expectedSearchParams).subscribe();
 
                 // expect one request to url with given settings
-                httpTestingController.expectOne((req: HttpRequest<any>) => {
+                const call = httpTestingController.expectOne((req: HttpRequest<any>) => {
                     return req.method === 'GET' && req.responseType === 'json' && req.url === expectedUrl;
                 }, `GET to ${expectedUrl}`);
+
+                expect(call.request.method).toEqual('GET', 'should be GET');
+                expect(call.request.responseType).toEqual('json', 'should be json');
+                expect(call.request.url).toEqual(expectedUrl, `should be ${expectedUrl}`);
             }));
 
             it(`... should set default params for GET request if none is provided`, async(() => {
-                const expectedSearchString = 'Test';
-                const expectedRows = '-1';
-                const expectedStartAt = '0';
-                const expectedUrl = apiUrl + expectedSearchRoute + expectedSearchString;
+                const expectedSearchParams: SearchParams = new SearchParams();
+                expectedSearchParams.query = 'Test';
+                expectedSearchParams.nRows = '-1';
+                expectedSearchParams.startAt = '0';
+
+                const expectedUrl = apiUrl + expectedRoutes.search + expectedSearchParams.query;
 
                 // call service function
-                dataApiService.getFulltextSearchData(expectedSearchString).subscribe();
+                dataApiService.getFulltextSearchData(expectedSearchParams).subscribe();
 
                 // expect one request to url with given settings
-                httpTestingController.expectOne((req: HttpRequest<any>) => {
-                    expect(req.params).toBeDefined();
-                    expect(req.params.keys().length).toBe(4, 'should be 4');
-                    expect(req.params.get('searchtype')).toBe('fulltext', 'should be fulltext');
-                    expect(req.params.get('filter_by_project')).toBe(
-                        expectedProjectId,
-                        `should be ${expectedProjectId}`
-                    );
-                    expect(req.params.get('show_nrows')).toBe(expectedRows, `should be ${expectedRows}`);
-                    expect(req.params.get('start_at')).toBe(expectedStartAt, `should be ${expectedStartAt}`);
-
+                const call = httpTestingController.expectOne((req: HttpRequest<any>) => {
                     return req.method === 'GET' && req.responseType === 'json' && req.url === expectedUrl;
                 }, `GET to ${expectedUrl}`);
+
+                expect(call.request.method).toEqual('GET', 'should be GET');
+                expect(call.request.responseType).toEqual('json', 'should be json');
+                expect(call.request.url).toEqual(expectedUrl, `should be ${expectedUrl}`);
+                expect(call.request.params).toBeDefined();
+                expect(call.request.params.keys().length).toBe(4, 'should be 4');
+                expect(call.request.params.get('searchtype')).toBe('fulltext', 'should be fulltext');
+                expect(call.request.params.get('filter_by_project')).toBe(
+                    expectedProjectId,
+                    `should be ${expectedProjectId}`
+                );
+                expect(call.request.params.get('show_nrows')).toBe(
+                    expectedSearchParams.nRows,
+                    `should be ${expectedSearchParams.nRows}`
+                );
+                expect(call.request.params.get('start_at')).toBe(
+                    expectedSearchParams.startAt,
+                    `should be ${expectedSearchParams.startAt}`
+                );
             }));
 
             it(`... should apply provided params for GET request`, async(() => {
-                const expectedSearchString = 'Test';
-                const expectedRows = '5';
-                const expectedStartAt = '20';
-                const expectedUrl = apiUrl + expectedSearchRoute + expectedSearchString;
+                const expectedSearchParams: SearchParams = new SearchParams();
+                expectedSearchParams.query = 'Test';
+                expectedSearchParams.nRows = '5';
+                expectedSearchParams.startAt = '20';
+
+                const expectedUrl = apiUrl + expectedRoutes.search + expectedSearchParams.query;
 
                 // call service function
-                dataApiService.getFulltextSearchData(expectedSearchString, expectedRows, expectedStartAt).subscribe();
+                dataApiService.getFulltextSearchData(expectedSearchParams).subscribe();
 
                 // expect one request to url with given settings
-                httpTestingController.expectOne((req: HttpRequest<any>) => {
-                    expect(req.params).toBeDefined();
-                    expect(req.params.keys().length).toBe(4, 'should be 4');
-                    expect(req.params.get('searchtype')).toBe('fulltext', 'should be fulltext');
-                    expect(req.params.get('filter_by_project')).toBe(
-                        expectedProjectId,
-                        `should be ${expectedProjectId}`
-                    );
-                    expect(req.params.get('show_nrows')).toBe(expectedRows, `should be ${expectedRows}`);
-                    expect(req.params.get('start_at')).toBe(expectedStartAt, `should be ${expectedStartAt}`);
-
+                const call = httpTestingController.expectOne((req: HttpRequest<any>) => {
                     return req.method === 'GET' && req.responseType === 'json' && req.url === expectedUrl;
                 }, `GET to ${expectedUrl}`);
+
+                expect(call.request.method).toEqual('GET', 'should be GET');
+                expect(call.request.responseType).toEqual('json', 'should be json');
+                expect(call.request.url).toEqual(expectedUrl, `should be ${expectedUrl}`);
+                expect(call.request.params).toBeDefined();
+                expect(call.request.params.keys().length).toBe(4, 'should be 4');
+                expect(call.request.params.get('searchtype')).toBe('fulltext', 'should be fulltext');
+                expect(call.request.params.get('filter_by_project')).toBe(
+                    expectedProjectId,
+                    `should be ${expectedProjectId}`
+                );
+                expect(call.request.params.get('show_nrows')).toBe(
+                    expectedSearchParams.nRows,
+                    `should be ${expectedSearchParams.nRows}`
+                );
+                expect(call.request.params.get('start_at')).toBe(
+                    expectedSearchParams.startAt,
+                    `should be ${expectedSearchParams.startAt}`
+                );
             }));
 
             it(`... should call getApiResponse (via ApiService) with search string`, async(() => {
-                const expectedSearchString = 'Test';
-                const expectedQueryPath = expectedSearchRoute + expectedSearchString;
+                const expectedSearchParams: SearchParams = new SearchParams();
+                expectedSearchParams.query = 'Test';
+
+                const expectedQueryPath = expectedRoutes.search + expectedSearchParams.query;
                 const expectedQueryHttpParams = new HttpParams()
                     .set('searchtype', 'fulltext')
                     .set('filter_by_project', '6')
@@ -278,7 +322,7 @@ describe('DataApiService (DONE)', () => {
 
                 getApiResponseSpy.and.returnValue(observableOf(expectedSearchResponseJson));
 
-                dataApiService.getFulltextSearchData(expectedSearchString).subscribe((response: SearchResponseJson) => {
+                dataApiService.getFulltextSearchData(expectedSearchParams).subscribe((response: SearchResponseJson) => {
                     expectSpyCall(getApiResponseSpy, 1, [
                         SearchResponseJson,
                         expectedQueryPath,
@@ -290,13 +334,14 @@ describe('DataApiService (DONE)', () => {
 
         describe('response', () => {
             describe('success', () => {
-                it(`... should return an Observable<SearchResponseJson> (converted)`, async(() => {
-                    const expectedSearchString = 'Test';
+                it(`... should return an SearchResponseJson observable (converted)`, async(() => {
+                    const expectedSearchParams: SearchParams = new SearchParams();
+                    expectedSearchParams.query = 'Test';
 
                     getApiResponseSpy.and.returnValue(observableOf(expectedSearchResponseConverted));
 
                     dataApiService
-                        .getFulltextSearchData(expectedSearchString)
+                        .getFulltextSearchData(expectedSearchParams)
                         .subscribe((response: SearchResponseJson) => {
                             expect(response).toEqual(expectedSearchResponseConverted);
                         });
@@ -304,9 +349,11 @@ describe('DataApiService (DONE)', () => {
             });
 
             describe('fail', () => {
-                it(`... should return an Observable<ApiServiceError>`, async(() => {
-                    const expectedSearchString = 'Test';
-                    const expectedQueryPath = expectedSearchRoute + expectedSearchString;
+                it(`... should return an ApiServiceError observable`, async(() => {
+                    const expectedSearchParams: SearchParams = new SearchParams();
+                    expectedSearchParams.query = 'Test';
+
+                    const expectedQueryPath = expectedRoutes.search + expectedSearchParams.query;
                     const expectedQueryHttpParams = new HttpParams()
                         .set('searchtype', 'fulltext')
                         .set('filter_by_project', '6')
@@ -321,7 +368,7 @@ describe('DataApiService (DONE)', () => {
 
                     getApiResponseSpy.and.returnValue(observableThrowError(expectedApiServiceError));
 
-                    dataApiService.getFulltextSearchData(expectedSearchString).subscribe(
+                    dataApiService.getFulltextSearchData(expectedSearchParams).subscribe(
                         result => fail(expectedErrorMsg),
                         (error: ApiServiceError) => {
                             expectSpyCall(getApiResponseSpy, 1, [
@@ -337,85 +384,298 @@ describe('DataApiService (DONE)', () => {
         });
     });
 
-    describe('#getResourceDetailData', () => {
+    describe('#getResourceData', () => {
         describe('request', () => {
-            it(`... should perform an HTTP GET request to the Knora API (via ApiService)`, async(() => {
-                const expectedResourceId = '11398';
-                const expectedUrl = apiUrl + expectedResourcesRoute + expectedResourceId + expectedResourceAppendix;
+            it(`... should not do anything if undefined is provided`, async(() => {
+                // undefined
+                const expectedResourceId = undefined;
+                const expectedUrl = apiUrl + expectedRoutes.resources + expectedResourceId + expectedResourceSuffix;
 
                 // call service function
-                dataApiService.getResourceDetailData(expectedResourceId).subscribe();
+                dataApiService.getResourceData(expectedResourceId);
 
-                // expect one request to url with given settings
-                httpTestingController.expectOne((req: HttpRequest<any>) => {
-                    expect(req.params).toBeDefined();
-                    expect(req.params.keys().length).toBe(0, 'should be 0');
+                // expect no request to getApiResponse
+                expectSpyCall(getApiResponseSpy, 0);
 
+                // expect no request to url with given settings
+                httpTestingController.expectNone((req: HttpRequest<any>) => {
                     return req.method === 'GET' && req.responseType === 'json' && req.url === expectedUrl;
                 }, `GET to ${expectedUrl}`);
             }));
 
-            it(`... should call getApiResponse (via ApiService) with resource id`, async(() => {
+            it(`... should not do anything if null is provided`, async(() => {
+                // null
+                const expectedResourceId = null;
+                const expectedUrl = apiUrl + expectedRoutes.resources + expectedResourceId + expectedResourceSuffix;
+
+                // call service function
+                dataApiService.getResourceData(expectedResourceId);
+
+                // expect no request to getApiResponse
+                expectSpyCall(getApiResponseSpy, 0);
+
+                // expect no request to url with given settings
+                httpTestingController.expectNone((req: HttpRequest<any>) => {
+                    return req.method === 'GET' && req.responseType === 'json' && req.url === expectedUrl;
+                }, `GET to ${expectedUrl}`);
+            }));
+
+            it(`... should not do anything if empty resource id string is provided`, async(() => {
+                // empty string
+                const expectedResourceId = '';
+                const expectedUrl = apiUrl + expectedRoutes.resources + expectedResourceId + expectedResourceSuffix;
+
+                // call service function
+                dataApiService.getResourceData(expectedResourceId);
+
+                // expect no request to getApiResponse
+                expectSpyCall(getApiResponseSpy, 0);
+
+                // expect no request to url with given settings
+                httpTestingController.expectNone((req: HttpRequest<any>) => {
+                    return req.method === 'GET' && req.responseType === 'json' && req.url === expectedUrl;
+                }, `GET to ${expectedUrl}`);
+            }));
+
+            it(`... should perform two HTTP GET requests to the Knora API (via ApiService)`, async(() => {
+                const expectedResourceId = '11398';
+                const expectedUrl = apiUrl + expectedRoutes.resources + expectedResourceId + expectedResourceSuffix;
+
+                // call service function
+                dataApiService.getResourceData(expectedResourceId).subscribe();
+
+                // expect two requests to url with given settings
+                const re = new RegExp(expectedUrl, 'g');
+                const calls = httpTestingController.match(req => {
+                    return req.url.match(re) && req.method === 'GET' && req.responseType === 'json';
+                });
+
+                expect(calls.length).toBe(2, 'should be 2 calls');
+            }));
+
+            it(`... first request to the Knora API (via ApiService) should be a ResourceFullResponse request`, async(() => {
                 const expectedResourceId = '11398';
-                const expectedQueryPath = expectedResourcesRoute + expectedResourceId + expectedResourceAppendix;
+                const expectedUrl = apiUrl + expectedRoutes.resources + expectedResourceId + expectedResourceSuffix;
+
+                // call service function
+                dataApiService.getResourceData(expectedResourceId).subscribe();
+
+                // expect two requests to url with given settings
+                const re = new RegExp(expectedUrl, 'g');
+                const calls = httpTestingController.match(req => {
+                    return req.url.match(re) && req.method === 'GET' && req.responseType === 'json';
+                });
+
+                expect(calls.length).toBe(2, 'should be 2 calls');
+
+                // call to GET https://www.salsah.org/api/resources/11398_-_local (ResourceFullResponseJson)
+                expect(calls[0].request.method).toEqual('GET', 'should be GET');
+                expect(calls[0].request.responseType).toEqual('json', 'should be json');
+                expect(calls[0].request.url).toEqual(expectedUrl, `should be ${expectedUrl}`);
+                expect(calls[0].request.params).toBeDefined();
+                expect(calls[0].request.params.keys().length).toBe(0, 'should be 0');
+            }));
+
+            it(`... second request to the Knora API (via ApiService) should be a ResourceContextResponse request`, async(() => {
+                const expectedResourceId = '11398';
+                const expectedUrl = apiUrl + expectedRoutes.resources + expectedResourceId + expectedResourceSuffix;
+
+                // call service function
+                dataApiService.getResourceData(expectedResourceId).subscribe();
+
+                // expect two requests to url with given settings
+                const re = new RegExp(expectedUrl, 'g');
+                const calls = httpTestingController.match(req => {
+                    return req.url.match(re) && req.method === 'GET' && req.responseType === 'json';
+                });
+
+                expect(calls.length).toBe(2, 'should be 2 calls');
+
+                // call to GET https://www.salsah.org/api/resources/11398_-_local?reqtype=context (ResourceContextResponseJson)
+                expect(calls[1].request.method).toEqual('GET', 'should be GET');
+                expect(calls[1].request.responseType).toEqual('json', 'should be json');
+                expect(calls[1].request.url).toEqual(expectedUrl, `should be ${expectedUrl}`);
+                expect(calls[1].request.params).toBeDefined();
+                expect(calls[1].request.params.keys().length).toBe(1, 'should be 1');
+                expect(calls[1].request.params.keys()[0]).toBe('reqtype', 'should be reqtype');
+                expect(calls[1].request.params.get('reqtype')).toBe('context', 'should be context');
+            }));
+
+            it(`... should call two times getApiResponse (via ApiService) with resource id`, async(() => {
+                const expectedResourceId = '11398';
+                const expectedQueryPath = expectedRoutes.resources + expectedResourceId + expectedResourceSuffix;
+                const expectedUrl = apiUrl + expectedQueryPath;
+
+                dataApiService.getResourceData(expectedResourceId).subscribe((response: ResourceData) => {
+                    // two calls
+                    expect(getApiResponseSpy.calls.all().length).toBe(2, 'should be 2 calls');
+                });
+
+                // expect two requests to url with given settings
+                const re = new RegExp(expectedUrl, 'g');
+                const calls = httpTestingController.match(req => {
+                    return req.url.match(re) && req.method === 'GET' && req.responseType === 'json';
+                });
+
+                calls[0].flush(expectedResourceFullResponseJson);
+                calls[1].flush(expectedResourceContextResponseJson);
+            }));
+
+            it(`... first call to getApiResponse (via ApiService) with resource id should be a ResourceFullResponse request`, async(() => {
+                const expectedResourceId = '11398';
+                const expectedQueryPath = expectedRoutes.resources + expectedResourceId + expectedResourceSuffix;
                 const expectedQueryHttpParams = new HttpParams();
+                const expectedUrl = apiUrl + expectedQueryPath;
 
-                getApiResponseSpy.and.returnValue(observableOf(expectedResourceFullResponseJson));
+                dataApiService.getResourceData(expectedResourceId).subscribe((response: ResourceData) => {
+                    // two calls
+                    expect(getApiResponseSpy.calls.all().length).toBe(2, 'should be 2 calls');
 
-                dataApiService
-                    .getResourceDetailData(expectedResourceId)
-                    .subscribe((response: ResourceFullResponseJson) => {
-                        expectSpyCall(getApiResponseSpy, 1, [
-                            ResourceFullResponseJson,
-                            expectedQueryPath,
-                            expectedQueryHttpParams
-                        ]);
-                    });
+                    // shortcut
+                    const firstCallArgs = getApiResponseSpy.calls.allArgs()[0];
+
+                    // check args of call
+                    expect(firstCallArgs[0].name).toBe(
+                        'ResourceFullResponseJson',
+                        `should be ResourceFullResponseJson`
+                    );
+                    expect(firstCallArgs[1]).toBe(expectedQueryPath, `should be ${expectedQueryPath}`);
+                    expect(firstCallArgs[2]).toEqual(
+                        expectedQueryHttpParams,
+                        `should equal ${expectedQueryHttpParams}`
+                    );
+                });
+
+                // expect two requests to url with given settings
+                const re = new RegExp(expectedUrl, 'g');
+                const calls = httpTestingController.match(req => {
+                    return req.url.match(re) && req.method === 'GET' && req.responseType === 'json';
+                });
+
+                calls[0].flush(expectedResourceFullResponseJson);
+                calls[1].flush(expectedResourceContextResponseJson);
+            }));
+
+            it(`... second call to getApiResponse (via ApiService) with resource id should be a ResourceContextResponse request`, async(() => {
+                const expectedResourceId = '11398';
+                const expectedQueryPath = expectedRoutes.resources + expectedResourceId + expectedResourceSuffix;
+                const expectedQueryHttpParams = new HttpParams().set('reqtype', 'context');
+                const expectedUrl = apiUrl + expectedQueryPath;
+
+                dataApiService.getResourceData(expectedResourceId).subscribe((response: ResourceData) => {
+                    // two calls
+                    expect(getApiResponseSpy.calls.all().length).toBe(2, 'should be 2 calls');
+
+                    // shortcut
+                    const secondCallArgs = getApiResponseSpy.calls.allArgs()[1];
+
+                    // check args of call
+                    expect(secondCallArgs[0].name).toBe(
+                        'ResourceContextResponseJson',
+                        `should be ResourceContextResponseJson`
+                    );
+                    expect(secondCallArgs[1]).toBe(expectedQueryPath, `should be ${expectedQueryPath}`);
+                    expect(secondCallArgs[2]).toEqual(
+                        expectedQueryHttpParams,
+                        `should equal ${expectedQueryHttpParams}`
+                    );
+                });
+
+                // expect two requests to url with given settings
+                const re = new RegExp(expectedUrl, 'g');
+                const calls = httpTestingController.match(req => {
+                    return req.url.match(re) && req.method === 'GET' && req.responseType === 'json';
+                });
+
+                calls[0].flush(expectedResourceFullResponseJson);
+                calls[1].flush(expectedResourceContextResponseJson);
             }));
         });
 
         describe('response', () => {
             describe('success', () => {
-                it(`... should return an Observable<ResourceFullResponseJson>`, async(() => {
-                    const expectedResourceId = '11398';
-
-                    getApiResponseSpy.and.returnValue(observableOf(expectedResourceFullResponseJson));
-
-                    dataApiService
-                        .getResourceDetailData(expectedResourceId)
-                        .subscribe((response: ResourceFullResponseJson) => {
-                            expect(response).toEqual(expectedResourceFullResponseJson);
+                describe('... should return a ResourceData observable ', () => {
+                    it(`...when both API responses succeed`, async(() => {
+                        const expectedResourceId = '11398';
+
+                        // return fork joined observables from API
+                        getApiResponseSpy.and.returnValues(
+                            observableOf(expectedResourceFullResponseJson),
+                            observableOf(expectedResourceContextResponseJson)
+                        );
+
+                        dataApiService.getResourceData(expectedResourceId).subscribe((resourceData: ResourceData) => {
+                            expect(getApiResponseSpy.calls.all().length).toBe(2, 'should be 2 calls');
+                            expect(resourceData).toEqual(expectedResourceData);
                         });
-                }));
+                    }));
+                });
             });
 
             describe('fail', () => {
-                it(`... should return an Observable<ApiServiceError>`, async(() => {
-                    const expectedResourceId = undefined;
-                    const expectedQueryPath = expectedResourcesRoute + expectedResourceId + expectedResourceAppendix;
-                    const expectedQueryHttpParams = new HttpParams();
-
-                    const expectedErrorMsg = 'failed HTTP response with 401 error';
-
-                    const expectedApiServiceError = new ApiServiceError();
-                    expectedApiServiceError.status = 401;
-                    expectedApiServiceError.url =
-                        expectedResourcesRoute + expectedResourceId + expectedResourceAppendix;
-
-                    getApiResponseSpy.and.returnValue(observableThrowError(expectedApiServiceError));
+                describe(`... should return an ApiServiceError observable`, () => {
+                    const expectedResourceId = '11398';
+                    const expectedQueryPath = expectedRoutes.resources + expectedResourceId + expectedResourceSuffix;
+                    const expectedErrorMsg = 'should fail HTTP response with 401 error';
+                    let expectedApiServiceError;
+
+                    beforeEach(() => {
+                        expectedApiServiceError = new ApiServiceError();
+                        expectedApiServiceError.status = 401;
+                        expectedApiServiceError.url = expectedQueryPath;
+                    });
 
-                    dataApiService.getResourceDetailData(expectedResourceId).subscribe(
-                        result => fail(expectedErrorMsg),
-                        (error: ApiServiceError) => {
-                            expectSpyCall(getApiResponseSpy, 1, [
-                                ResourceFullResponseJson,
-                                expectedQueryPath,
-                                expectedQueryHttpParams
-                            ]);
-                            expect(error).toEqual(expectedApiServiceError);
-                        }
-                    );
-                }));
+                    it('... when both API responses fail', async(() => {
+                        // return fork joined observables from API
+                        getApiResponseSpy.and.returnValues(
+                            observableThrowError(expectedApiServiceError),
+                            observableThrowError(expectedApiServiceError)
+                        );
+
+                        dataApiService.getResourceData(expectedResourceId).subscribe(
+                            result => fail(expectedErrorMsg),
+                            (error: ApiServiceError) => {
+                                // two calls
+                                expect(getApiResponseSpy.calls.all().length).toBe(2, 'should be 2 calls');
+                                expect(error).toEqual(expectedApiServiceError);
+                            }
+                        );
+                    }));
+
+                    it('... when first API response fails', async(() => {
+                        // return fork joined observables from API
+                        getApiResponseSpy.and.returnValues(
+                            observableThrowError(expectedApiServiceError),
+                            observableOf(expectedResourceContextResponseJson)
+                        );
+
+                        dataApiService.getResourceData(expectedResourceId).subscribe(
+                            result => fail(expectedErrorMsg),
+                            (error: ApiServiceError) => {
+                                // two calls
+                                expect(getApiResponseSpy.calls.all().length).toBe(2, 'should be 2 calls');
+                                expect(error).toEqual(expectedApiServiceError);
+                            }
+                        );
+                    }));
+
+                    it('... when second API response fails', async(() => {
+                        // return fork joined observables from API
+                        getApiResponseSpy.and.returnValues(
+                            observableOf(expectedResourceFullResponseJson),
+                            observableThrowError(expectedApiServiceError)
+                        );
+
+                        dataApiService.getResourceData(expectedResourceId).subscribe(
+                            result => fail(expectedErrorMsg),
+                            (error: ApiServiceError) => {
+                                // two calls
+                                expect(getApiResponseSpy.calls.all().length).toBe(2, 'should be 2 calls');
+                                expect(error).toEqual(expectedApiServiceError);
+                            }
+                        );
+                    }));
+                });
             });
         });
     });
diff --git a/src/app/views/data-view/services/data-api.service.ts b/src/app/views/data-view/services/data-api.service.ts
index dac9f8f33a..6634d7da11 100644
--- a/src/app/views/data-view/services/data-api.service.ts
+++ b/src/app/views/data-view/services/data-api.service.ts
@@ -1,70 +1,331 @@
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpParams } from '@angular/common/http';
 
-import { Observable } from 'rxjs';
+import { forkJoin as observableForkJoin, Observable } from 'rxjs';
+import { defaultIfEmpty, map } from 'rxjs/operators';
 
 import { ApiService, ConversionService } from '@awg-core/services/';
-import { ResourceFullResponseJson, SearchResponseJson } from '@awg-shared/api-objects';
-import { map } from 'rxjs/operators';
+import {
+    GeoDataJson,
+    HlistJson,
+    ResourceContextResponseJson,
+    ResourceFullResponseJson,
+    SearchResponseJson,
+    SelectionJson
+} from '@awg-shared/api-objects';
+import {
+    IResourceDataResponse,
+    ResourceData,
+    ResourceDetail,
+    SearchParams,
+    SearchParamsViewTypes
+} from '@awg-views/data-view/models';
 
+/**
+ * The DataApi service.
+ *
+ * It handles the search requests to the given (SALSAH) API
+ * for the data view and provides the fulltext search data
+ * and the resource detail data.
+ *
+ * Provided in: `root`.
+ */
 @Injectable({
     providedIn: 'root'
 })
 export class DataApiService extends ApiService {
-    // issue with ServiceInheritance, cf. https://stackoverflow.com/questions/50263722/angular-6-services-and-class-inheritance
-    static ngInjectableDef = undefined;
-
+    /**
+     * Public variable: projectId.
+     *
+     * It keeps the SALSAH specific id of the webern project ('6').
+     */
     projectId = '6';
-    resourceAppendix = '_-_local';
-    resourcesRoute = 'resources/';
-    searchRoute = 'search/';
 
+    /**
+     * Public variable: resourceSuffix.
+     *
+     * It keeps the SALSAH specific suffix for a resource ('_-_local').
+     */
+    resourceSuffix = '_-_local';
+
+    /**
+     * Public variable: routes.
+     *
+     * It keeps the SALSAH specific routes for
+     * resources, search, geonames, hlists and selections.
+     */
+    routes = {
+        resources: 'resources/',
+        search: 'search/',
+        geonames: 'geonames/',
+        hlists: 'hlists/',
+        selections: 'selections/'
+    };
+
+    /**
+     * Constructor of the DataApiService.
+     *
+     * It declares a public {@link HttpClient} instance
+     * to handle http requests and a private {@link ConversionService}
+     * instance for the conversion of the response data.
+     *
+     * @param {HttpClient} http Instance of the HttpClient.
+     * @param {ConversionService} conversionService Instance of the ConversionService.
+     */
     constructor(http: HttpClient, private conversionService: ConversionService) {
         super(http);
         this.serviceName = 'DataApiService';
     }
 
-    /**********************************
-     **
-     **  fulltextSearch via salsah api
-     **
-     **********************************/
-    getFulltextSearchData(searchString: string, nRows?: string, startAt?: string): Observable<SearchResponseJson> {
-        if (!searchString) {
+    /**
+     * Public method: getFulltextSearchData.
+     *
+     * It sets the path and params for a fulltext search query
+     * to retrieve all results for the searchstring
+     * from the given (SALSAH) API.
+     *
+     * @params {SearchParams} searchParams The given search parameter of the query.
+     *
+     * @returns {Observable<SearchResponseJson>} The observable with the SearchResponseJson data.
+     */
+    getFulltextSearchData(searchParams: SearchParams): Observable<SearchResponseJson> {
+        if (!searchParams || !searchParams.query) {
             return;
         }
-        if (!nRows) {
-            nRows = '-1';
-        }
-        if (!startAt) {
-            startAt = '0';
-        }
 
-        const queryPath: string = this.searchRoute + searchString;
+        // default values
+        const sp: SearchParams = {
+            query: searchParams.query,
+            nRows: searchParams.nRows || '-1',
+            startAt: searchParams.startAt || '0',
+            view: searchParams.view || SearchParamsViewTypes.table
+        };
+
+        // set path and params of query
+        const queryPath: string = this.routes.search + sp.query;
         const queryHttpParams = new HttpParams()
             .set('searchtype', 'fulltext')
             .set('filter_by_project', this.projectId)
-            .set('show_nrows', nRows)
-            .set('start_at', startAt);
+            .set('show_nrows', sp.nRows)
+            .set('start_at', sp.startAt);
+
+        // cold request to API
+        const searchData$: Observable<SearchResponseJson> = this.getApiResponse(
+            SearchResponseJson,
+            queryPath,
+            queryHttpParams
+        );
 
-        return this.getApiResponse(SearchResponseJson, queryPath, queryHttpParams).pipe(
+        // return converted search response
+        return searchData$.pipe(
+            // default empty value
+            defaultIfEmpty(new SearchResponseJson()),
+
+            // map the response to a converted search response object for HTML display
             map((searchResponse: SearchResponseJson) => {
-                // conversion of search results for HTML display
                 return this.conversionService.convertFullTextSearchResults(searchResponse);
             })
         );
     }
 
-    /***************************************
-     **
-     **  resource detail search via salsah api
-     **
-     ****************************************/
-    getResourceDetailData(resourceId: string): Observable<ResourceFullResponseJson> {
-        const queryPath: string = this.resourcesRoute + resourceId + this.resourceAppendix;
-        const queryHttpParams = new HttpParams();
-        // .set('reqtype', 'info');
-        //  .set('reqtype', 'context');
-        return this.getApiResponse(ResourceFullResponseJson, queryPath, queryHttpParams);
+    /**
+     * Public method: getResourceData.
+     *
+     * It provides the data for the resource detail view
+     * as an ResourceData observable.
+     *
+     * @params {string} resourceId The id of the requested resource.
+     *
+     * @returns {Observable<ResourceData>} The observable with the resource data.
+     */
+    getResourceData(resourceId: string): Observable<ResourceData> {
+        if (!resourceId) {
+            return;
+        }
+
+        // cold request to API
+        const fullResponseData$: Observable<ResourceFullResponseJson> = this.getResourceFullResponseData(resourceId);
+        const contextData$: Observable<ResourceContextResponseJson> = this.getResourceContextData(resourceId);
+
+        // return converted search response
+        return observableForkJoin([fullResponseData$, contextData$]).pipe(
+            // default empty value
+            defaultIfEmpty([new ResourceFullResponseJson(), new ResourceContextResponseJson()]),
+
+            // map the forkJoined response to a ResourceData object
+            map((resourceDataResponse: IResourceDataResponse) => {
+                return this.prepareResourceData(resourceDataResponse, resourceId);
+            })
+        );
+    }
+
+    /**
+     * Private method: prepareResourceData.
+     *
+     * It converts the data response of a requested resource
+     * to a ResourceData object.
+     *
+     * @params {IResourceDataResponse} resourceData The data response of the requested resource.
+     * @params {string} resourceId The id of the requested resource.
+     *
+     * @returns {ResourceData} The resource data object.
+     */
+    private prepareResourceData(resourceDataResponse: IResourceDataResponse, resourceId: string): ResourceData {
+        if (Object.keys(resourceDataResponse[0]).length === 0 && resourceDataResponse[0].constructor === Object) {
+            return new ResourceData(new ResourceFullResponseJson(), undefined);
+        }
+
+        // convert data for displaying resource detail
+        const resourceDetail: ResourceDetail = this.conversionService.convertResourceData(
+            resourceDataResponse,
+            resourceId
+        );
+
+        // return new resource data
+        return new ResourceData(resourceDataResponse[0], resourceDetail);
+    }
+
+    /**
+     * Private method: getResourceContextData.
+     *
+     * It calls the {@link getResourceDataResponseFromApi} method to
+     * provide an Observable with the ResourceContextResponseJson data.
+     *
+     * @params {string} resourceId The id of the requested resource.
+     *
+     * @returns {Observable<ResourceContextResponseJson>} The observable of the response data.
+     */
+    private getResourceContextData(resourceId: string): Observable<ResourceContextResponseJson> {
+        return this.getResourceDataResponseFromApi(ResourceContextResponseJson, resourceId);
+    }
+
+    /**
+     * Private method: getResourceFullResponseData.
+     *
+     * It calls the {@link getResourceDataResponseFromApi} method to
+     * provide an Observable with the ResourceFullResponseJson data.
+     *
+     * @params {string} resourceId The id of the requested resource.
+     *
+     * @returns {Observable<ResourceFullResponseJson>} The observable of the response data.
+     */
+    private getResourceFullResponseData(resourceId: string): Observable<ResourceFullResponseJson> {
+        return this.getResourceDataResponseFromApi(ResourceFullResponseJson, resourceId);
+    }
+
+    /**
+     * Private method: getGeoData.
+     *
+     * * It calls the {@link getResourceDataResponseFromApi} method to
+     * provide an Observable with the GeoDataJson data.
+     *
+     * NOT USED.
+     *
+     * IMPLEMENTATION FOR FUTURE USE.
+     *
+     * @params {string} resourceId The id of the requested resource.
+     *
+     * @returns {Observable<GeoDataJson>} The observable of the response data.
+     */
+    private getGeoData(resourceId: string): Observable<GeoDataJson> {
+        return this.getResourceDataResponseFromApi(GeoDataJson, resourceId);
+    }
+
+    /**
+     * Private method: getHlistData.
+     *
+     * * It calls the {@link getResourceDataResponseFromApi} method to
+     * provide an Observable with the HlistJson data.
+     *
+     * NOT USED.
+     *
+     * IMPLEMENTATION FOR FUTURE USE.
+     *
+     * @params {string} resourceId The id of the requested resource.
+     *
+     * @returns {Observable<HlistJson>} The observable of the response data.
+     */
+    private getHlistData(resourceId: string): Observable<HlistJson> {
+        return this.getResourceDataResponseFromApi(HlistJson, resourceId);
+    }
+
+    /**
+     * Private method: getSelectionsData.
+     *
+     * * It calls the {@link getResourceDataResponseFromApi} method to
+     * provide an Observable with the SelectionJson data.
+     *
+     * NOT USED.
+     *
+     * IMPLEMENTATION FOR FUTURE USE.
+     *
+     * @params {string} resourceId The id of the requested resource.
+     *
+     * @returns {Observable<SelectionJson>} The observable of the response data.
+     */
+    private getSelectionsData(resourceId: string): Observable<SelectionJson> {
+        return this.getResourceDataResponseFromApi(SelectionJson, resourceId);
+    }
+
+    /**
+     * Private method: getResourceDataResponseFromApi.
+     *
+     * It prepares the calls to the given (SALSAH) API
+     * for a resource id depending on the responseJsonType
+     * and the given resource id.
+     *
+     * @param {*} responseJsonType The given json type of the API response.
+     * @param {string} id The given id of a resource.
+     *
+     * @returns {Observable<any>} The observable of the HTTP response.
+     */
+    private getResourceDataResponseFromApi(responseJsonType: any, id: string): Observable<any> {
+        // init query path and params
+        let queryPath: string;
+        let queryHttpParams: HttpParams = new HttpParams();
+
+        // set path and params of query depending on responseJsonType
+        switch (responseJsonType) {
+            case GeoDataJson:
+                queryPath = this.routes.geonames + id;
+                queryHttpParams = queryHttpParams.set('reqtype', 'node');
+                break;
+            case HlistJson:
+                queryPath = this.routes.hlists + id;
+                break;
+            case ResourceContextResponseJson:
+                queryPath = this.routes.resources + id + this.resourceSuffix;
+                queryHttpParams = queryHttpParams.set('reqtype', 'context');
+                break;
+            case ResourceFullResponseJson:
+                queryPath = this.routes.resources + id + this.resourceSuffix;
+                break;
+            case SelectionJson:
+                queryPath = this.routes.selections + id;
+                break;
+        }
+
+        // trigger call to API
+        return this.getApiResponse(responseJsonType, queryPath, queryHttpParams);
+    }
+
+    /**
+     * Private method: getNodeIdFromAttributes.
+     *
+     * It gets a node id from the prop.attributes
+     * of a selections or hlists value.
+     *
+     * NOT USED.
+     *
+     * IMPLEMENTATION FOR FUTURE USE.
+     *
+     * @param {string} attributes The given prop.attributes.
+     *
+     * @returns {string} id The node id.
+     */
+    private getNodeIdFromAttributes(attributes: string): string {
+        // identify node id from prop.attributes
+        // e.g. "hlist=17" or "selection=77"
+        return attributes.split('=')[1].toString();
     }
 }
diff --git a/src/app/views/data-view/services/http-cache.service.ts b/src/app/views/data-view/services/http-cache.service.ts
index 752e22a0b7..2c33eb5fe4 100644
--- a/src/app/views/data-view/services/http-cache.service.ts
+++ b/src/app/views/data-view/services/http-cache.service.ts
@@ -1,30 +1,73 @@
 import { Injectable } from '@angular/core';
 import { HttpRequest, HttpResponse } from '@angular/common/http';
 
+/**
+ * The abstract class HttpCache.
+ *
+ * It provides abstract methods (get, put) to handle cached http responses.
+ */
 abstract class HttpCache {
     /**
-     * Returns a cached response, if any, or null if not present.
+     * Abstract getter for a cached response.
+     *
+     * @param {HttpRequest<any>} req An HttpRequest to be checked for.
+     *
+     * @returns {HttpResponse<any> | null} A cached response, if any, or null if not present.
      */
     abstract get(req: HttpRequest<any>): HttpResponse<any> | null;
 
     /**
-     * Adds or updates the response in the cache.
+     * Abstract setter for a cached response.
+     *
+     * @param {HttpRequest<any>} req An HttpRequest to be used as an index.
+     * @param {HttpResponse<any>} resp The HttpResponse to be stored.
+     *
+     * @returns {void} Adds or updates the response in the cache.
      */
     abstract put(req: HttpRequest<any>, resp: HttpResponse<any>): void;
 }
 
+/**
+ * The HttpCache service.
+ *
+ * It implements the abstract class {@link HttpCache}
+ * and handles cached http responses.
+ */
 @Injectable({
     providedIn: 'root'
 })
 export class HttpCacheService implements HttpCache {
-    constructor() {}
-
+    /**
+     * Private variable: cachedResponses.
+     *
+     * It keeps the cachedResponses as `Map`s of a `string`
+     * (i.e. an `HttpRequest.urlWithParams`) and an `HttpResponse`.
+     */
     private cachedResponses = new Map<string, HttpResponse<any>>();
 
+    /**
+     * Getter for a cached response.
+     *
+     * Uses the `urlWithParams` of an HttpRequest to identify a request.
+     *
+     * @param {HttpRequest<any>} req An HttpRequest to be checked for in the cached responses.
+     *
+     * @returns {HttpResponse<any> | null} A cached response or null.
+     */
     get(req: HttpRequest<any>): HttpResponse<any> | null {
         return this.cachedResponses ? this.cachedResponses[req.urlWithParams] : null;
     }
 
+    /**
+     * Setter for a cached response.
+     *
+     * Uses the `urlWithParams` of an HttpRequest to identify a request.
+     *
+     * @param {HttpRequest<any>} req An HttpRequest to be used as an index in the cached responses.
+     * @param {HttpResponse<any>} resp The HttpResponse to be stored at this index position in the cached responses.
+     *
+     * @returns {void} Caches the response.
+     */
     put(req: HttpRequest<any>, resp: HttpResponse<any>): void {
         this.cachedResponses[req.urlWithParams] = resp.clone();
     }
diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-accolade/edition-accolade.component.html b/src/app/views/edition-view/edition-outlets/edition-detail/edition-accolade/edition-accolade.component.html
index 917b90f572..e13c6ab2f5 100644
--- a/src/app/views/edition-view/edition-outlets/edition-detail/edition-accolade/edition-accolade.component.html
+++ b/src/app/views/edition-view/edition-outlets/edition-detail/edition-accolade/edition-accolade.component.html
@@ -2,30 +2,37 @@
     <ngb-panel id="awg-accolade-view" title="Edierter Notentext">
         <ng-template ngbPanelContent>
             <!-- accolade control -->
-            <awg-edition-svg-file-nav *ngIf="svgFileData && selectedSvgFile"
-                                      [svgFileData]="svgFileData"
-                                      [selectedSvgFile]="selectedSvgFile"
-                                      (selectSvgFileRequest)="selectSvgFile($event)">
-            </awg-edition-svg-file-nav>
+            <awg-edition-svg-sheet-nav
+                *ngIf="svgSheetsData && selectedSvgSheet"
+                [svgSheetsData]="svgSheetsData"
+                [selectedSvgSheet]="selectedSvgSheet"
+                (selectSvgSheetRequest)="selectSvgSheet($event)"
+            >
+            </awg-edition-svg-sheet-nav>
 
             <!-- pre-notification -->
             <awg-edition-detail-notification></awg-edition-detail-notification>
 
             <!-- svg panel -->
-            <awg-edition-svg-file *ngIf="selectedSvgFile"
-                                  [selectedSvgFile]="selectedSvgFile"
-                                  [selectedOverlay]="selectedOverlay"
-                                  (selectSvgFileRequest)="selectSvgFile($event)"
-                                  (selectTextcriticRequest)="selectTextcritic($event)">
-            </awg-edition-svg-file>
+            <awg-edition-svg-sheet
+                *ngIf="selectedSvgSheet"
+                [selectedSvgSheet]="selectedSvgSheet"
+                [selectedOverlay]="selectedOverlay"
+                (selectSvgSheetRequest)="selectSvgSheet($event)"
+                (selectOverlayRequest)="selectOverlay($event)"
+            >
+            </awg-edition-svg-sheet>
 
             <!-- table for TkA -->
             <div class="panel-footer" *ngIf="showTkA && selectedTextcritics">
-                <h4 class="mt-4">Textkritischer Kommentar ({{selectedOverlay.typeLabel}} {{selectedOverlay.id}}):</h4>
+                <h4 class="mt-4">
+                    Textkritischer Kommentar ({{ selectedOverlay.typeLabel }} {{ selectedOverlay.id }}):
+                </h4>
                 <awg-edition-tka-table
                     [selectedTextcritics]="selectedTextcritics"
                     (openModalRequest)="openModal($event)"
-                    (selectSvgFileRequest)="selectSvgFile($event)">
+                    (selectSvgSheetRequest)="selectSvgSheet($event)"
+                >
                 </awg-edition-tka-table>
             </div>
         </ng-template>
diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-accolade/edition-accolade.component.spec.ts b/src/app/views/edition-view/edition-outlets/edition-detail/edition-accolade/edition-accolade.component.spec.ts
index 59be32c972..c03c3acc07 100644
--- a/src/app/views/edition-view/edition-outlets/edition-detail/edition-accolade/edition-accolade.component.spec.ts
+++ b/src/app/views/edition-view/edition-outlets/edition-detail/edition-accolade/edition-accolade.component.spec.ts
@@ -3,7 +3,7 @@ import { Component, DebugElement, Input } from '@angular/core';
 
 import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
 
-import { EditionSvgFile, EditionSvgOverlay, Textcritics } from '@awg-views/edition-view/models';
+import { EditionSvgSheet, EditionSvgOverlay, Textcritics } from '@awg-views/edition-view/models';
 
 import { EditionAccoladeComponent } from './edition-accolade.component';
 
@@ -11,20 +11,20 @@ import { EditionAccoladeComponent } from './edition-accolade.component';
 @Component({ selector: 'awg-edition-detail-notification', template: '' })
 class EditionDetailNotificationStubComponent {}
 
-@Component({ selector: 'awg-edition-svg-file-nav', template: '' })
-class EditionSvgFileNavStubComponent {
+@Component({ selector: 'awg-edition-svg-sheet-nav', template: '' })
+class EditionSvgSheetNavStubComponent {
     @Input()
-    svgFileData: EditionSvgFile[];
+    svgSheetsData: EditionSvgSheet[];
     @Input()
-    selectedSvgFile: EditionSvgFile;
+    selectedSvgSheet: EditionSvgSheet;
 
     // TODO: handle outputs
 }
 
-@Component({ selector: 'awg-edition-svg-file', template: '' })
-class EditionSvgFileStubComponent {
+@Component({ selector: 'awg-edition-svg-sheet', template: '' })
+class EditionSvgSheetStubComponent {
     @Input()
-    selectedSvgFile: EditionSvgFile;
+    selectedSvgSheet: EditionSvgSheet;
     @Input()
     selectedOverlay: EditionSvgOverlay;
 
@@ -51,8 +51,8 @@ describe('EditionAccoladeComponent', () => {
             declarations: [
                 EditionAccoladeComponent,
                 EditionDetailNotificationStubComponent,
-                EditionSvgFileStubComponent,
-                EditionSvgFileNavStubComponent,
+                EditionSvgSheetStubComponent,
+                EditionSvgSheetNavStubComponent,
                 EditionTkaTableStubComponent
             ]
         }).compileComponents();
diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-accolade/edition-accolade.component.ts b/src/app/views/edition-view/edition-outlets/edition-detail/edition-accolade/edition-accolade.component.ts
index 0ec4dc5e49..c549d40499 100644
--- a/src/app/views/edition-view/edition-outlets/edition-detail/edition-accolade/edition-accolade.component.ts
+++ b/src/app/views/edition-view/edition-outlets/edition-detail/edition-accolade/edition-accolade.component.ts
@@ -1,53 +1,133 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 
-import { EditionSvgFile, EditionSvgOverlay, Textcritics } from '@awg-views/edition-view/models';
+import { EditionSvgSheet, EditionSvgOverlay, Textcritics } from '@awg-views/edition-view/models';
 
+/**
+ * The EditionAccolade component.
+ *
+ * It contains the edition accolade section
+ * of the edition view of the app
+ * with the {@link EditionSvgSheetNavComponent},
+ * the {@link EditionSvgSheetComponent},
+ * the {@link EditionDetailNotificationComponent}
+ * and the {@link EditionTkaTableComponent}.
+ */
 @Component({
     selector: 'awg-edition-accolade',
     templateUrl: './edition-accolade.component.html',
-    styleUrls: ['./edition-accolade.component.css']
+    styleUrls: ['./edition-accolade.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class EditionAccoladeComponent implements OnInit {
+    /**
+     * Input variable: svgSheetsData.
+     *
+     * It keeps the svg sheets data.
+     */
     @Input()
-    svgFileData: EditionSvgFile[];
+    svgSheetsData: EditionSvgSheet[];
+
+    /**
+     * Input variable: selectedOverlay.
+     *
+     * It keeps the selected svg overlay.
+     */
     @Input()
-    selectedSvgFile: EditionSvgFile;
+    selectedOverlay: EditionSvgOverlay;
+
+    /**
+     * Input variable: selectedSvgSheet.
+     *
+     * It keeps the selected svg sheet.
+     */
     @Input()
-    selectedTextcritics: Textcritics[];
+    selectedSvgSheet: EditionSvgSheet;
+
+    /**
+     * Input variable: selectedTextcritics.
+     *
+     * It keeps the selected textcritics.
+     */
     @Input()
-    selectedOverlay: EditionSvgOverlay;
+    selectedTextcritics: Textcritics[];
+
+    /**
+     * Input variable: showTkA.
+     *
+     * If the textcritics shall be displayed.
+     */
     @Input()
     showTkA: boolean;
+
+    /**
+     * Output variable: openModalRequest.
+     *
+     * It keeps an event emitter to open the modal
+     * with the selected modal text snippet.
+     */
     @Output()
     openModalRequest: EventEmitter<string> = new EventEmitter();
-    @Output()
-    selectSvgFileRequest: EventEmitter<string> = new EventEmitter();
-    @Output()
-    selectTextcriticRequest: EventEmitter<EditionSvgOverlay> = new EventEmitter();
 
-    showAccoladePanel = true;
+    /**
+     * Output variable: selectOverlayRequest.
+     *
+     * It keeps an event emitter for the selected svg overlay.
+     */
+    @Output()
+    selectOverlayRequest: EventEmitter<EditionSvgOverlay> = new EventEmitter();
 
-    constructor() {}
+    /**
+     * Output variable: selectSvgSheetRequest.
+     *
+     * It keeps an event emitter for the selected id of an svg sheet.
+     */
+    @Output()
+    selectSvgSheetRequest: EventEmitter<string> = new EventEmitter();
 
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {}
 
-    // request function to emit modal id
-    openModal(id: string) {
+    /**
+     * Public method: openModal.
+     *
+     * It emits a given id of a modal snippet text
+     * to the {@link openModalRequest}.
+     *
+     * @param {string} id The given modal snippet id.
+     * @returns {void} Emits the id.
+     */
+    openModal(id: string): void {
         this.openModalRequest.emit(id);
     }
 
-    // request function to emit selected svg file id
-    selectSvgFile(id: string) {
-        this.selectSvgFileRequest.emit(id);
-    }
-
-    // request function to emit selected textcritic's type & id
-    selectTextcritic($event: EditionSvgOverlay) {
-        this.selectTextcriticRequest.emit($event);
+    /**
+     * Public method: selectOverlay.
+     *
+     * It emits a given svg overlay
+     * to the {@link selectOverlayRequest}.
+     *
+     * @param {EditionSvgOverlay} overlay The given svg overlay.
+     * @returns {void} Emits the overlay.
+     */
+    selectOverlay(overlay: EditionSvgOverlay): void {
+        this.selectOverlayRequest.emit(overlay);
     }
 
-    // helper function to toggle panel
-    togglePanel(): boolean {
-        return (this.showAccoladePanel = !this.showAccoladePanel);
+    /**
+     * Public method: selectSvgSheet.
+     *
+     * It emits a given id of a selected svg sheet
+     * to the {@link selectSvgSheetRequest}.
+     *
+     * @param {string} id The given sheet id.
+     * @returns {void} Emits the id.
+     */
+    selectSvgSheet(id: string): void {
+        this.selectSvgSheetRequest.emit(id);
     }
 }
diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-convolute/edition-convolute.component.html b/src/app/views/edition-view/edition-outlets/edition-detail/edition-convolute/edition-convolute.component.html
index 9874dff8a6..a8235a80b3 100644
--- a/src/app/views/edition-view/edition-outlets/edition-detail/edition-convolute/edition-convolute.component.html
+++ b/src/app/views/edition-view/edition-outlets/edition-detail/edition-convolute/edition-convolute.component.html
@@ -1,29 +1,31 @@
 <ngb-accordion activeIds="awg-convolute-view">
     <ngb-panel id="awg-convolute-view" title="Konvolutübersicht">
         <ng-template ngbPanelContent>
-
             <!-- convolute dropDown -->
             <div class="d-inline-block" ngbDropdown>
                 <a class="btn" id="dropDownConvolutes" ngbDropdownToggle>
-                    <span>{{ selectedConvoluteLabel }}</span>
+                    <span>{{ selectedConvolute }}</span>
                 </a>
                 <div ngbDropdownMenu aria-labelledby="dropDownConvolutes">
-                    <a class="dropdown-item" (click)="selectConvolute(convoluteLabel.A)">{{ convoluteLabel.A }}</a>
-                    <a class="dropdown-item" (click)="openModal('sourceNotA')">{{ convoluteLabel.B_H }}</a>
+                    <a class="dropdown-item" (click)="selectConvolute(convolutes.A)">{{ convolutes.A }}</a>
+                    <a class="dropdown-item" (click)="openModal('sourceNotA')">{{ convolutes.B_H }}</a>
                 </div>
             </div>
 
             <!-- folio overview -->
-            <awg-edition-folio *ngIf="convoluteData && selectedSvgFile"
-                               [convoluteData]="convoluteData"
-                               [selectedSvgFile]="selectedSvgFile"
-                               (openModalRequest)="openModal($event)"
-                               (selectSvgFileRequest)="selectSvgFile($event)">
+            <awg-edition-folio
+                *ngIf="folios && selectedSvgSheet"
+                [folios]="folios"
+                [selectedSvgSheet]="selectedSvgSheet"
+                (openModalRequest)="openModal($event)"
+                (selectSvgSheetRequest)="selectSvgSheet($event)"
+            >
             </awg-edition-folio>
 
             <!-- folio legend -->
-            <div class="col-12">Legende:&nbsp;
-                <ng-container *ngFor="let legend of folioLegend">
+            <div class="col-12">
+                Legende:&nbsp;
+                <ng-container *ngFor="let legend of folioLegends">
                     <span class="{{ legend.color }}">
                         <fa-icon [icon]="faSquare"></fa-icon>
                         {{ legend.label }}
diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-convolute/edition-convolute.component.spec.ts b/src/app/views/edition-view/edition-outlets/edition-detail/edition-convolute/edition-convolute.component.spec.ts
index 9712270d62..e1e9dbc7ef 100644
--- a/src/app/views/edition-view/edition-outlets/edition-detail/edition-convolute/edition-convolute.component.spec.ts
+++ b/src/app/views/edition-view/edition-outlets/edition-detail/edition-convolute/edition-convolute.component.spec.ts
@@ -5,14 +5,14 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
 
 import { EditionConvoluteComponent } from './edition-convolute.component';
-import { ConvoluteFolio, EditionSvgFile } from '@awg-views/edition-view/models';
+import { Folio, EditionSvgSheet } from '@awg-views/edition-view/models';
 
 @Component({ selector: 'awg-edition-folio', template: '' })
 class FolioStubComponent {
     @Input()
-    convoluteData: ConvoluteFolio[];
+    folios: Folio[];
     @Input()
-    selectedSvgFile: EditionSvgFile;
+    selectedSvgSheet: EditionSvgSheet;
 
     // TODO: handle outputs
 }
diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-convolute/edition-convolute.component.ts b/src/app/views/edition-view/edition-outlets/edition-detail/edition-convolute/edition-convolute.component.ts
index bf5902a69a..0c6f9c37e5 100644
--- a/src/app/views/edition-view/edition-outlets/edition-detail/edition-convolute/edition-convolute.component.ts
+++ b/src/app/views/edition-view/edition-outlets/edition-detail/edition-convolute/edition-convolute.component.ts
@@ -1,32 +1,103 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 
-import { ConvoluteFolio, EditionSvgFile } from '@awg-views/edition-view/models';
+import { Folio, EditionSvgSheet } from '@awg-views/edition-view/models';
 import { faSquare } from '@fortawesome/free-solid-svg-icons/faSquare';
 
+/**
+ * The IFolioLegend interface.
+ *
+ * It represents the interface for a folio legend
+ * of an edition convolute folio.
+ */
+interface IFolioLegend {
+    /**
+     * The color of the folio legend.
+     */
+    color: string;
+
+    /**
+     * The label of the folio legend.
+     */
+    label: string;
+}
+
+/**
+ * The EditionConvolute component.
+ *
+ * It contains the edition convolute section
+ * of the edition view of the app
+ * with the {@link EditionFolioComponent}.
+ */
 @Component({
     selector: 'awg-edition-convolute',
     templateUrl: './edition-convolute.component.html',
-    styleUrls: ['./edition-convolute.component.css']
+    styleUrls: ['./edition-convolute.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class EditionConvoluteComponent implements OnInit {
+    /**
+     * Input variable: folios.
+     *
+     * It keeps the folios of the edition detail.
+     */
     @Input()
-    convoluteData: ConvoluteFolio[];
+    folios: Folio[];
+
+    /**
+     * Public variable: selectedSvgSheet.
+     *
+     * It keeps the selected svg sheet.
+     */
     @Input()
-    selectedSvgFile: EditionSvgFile;
+    selectedSvgSheet: EditionSvgSheet;
+
+    /**
+     * Output variable: openModalRequest.
+     *
+     * It keeps an event emitter to open the modal
+     * with the selected modal text snippet.
+     */
     @Output()
     openModalRequest: EventEmitter<string> = new EventEmitter();
+
+    /**
+     * Output variable: selectSvgSheetRequest.
+     *
+     * It keeps an event emitter for the selected id of an svg sheet.
+     */
     @Output()
-    selectSvgFileRequest: EventEmitter<string> = new EventEmitter();
+    selectSvgSheetRequest: EventEmitter<string> = new EventEmitter();
 
+    /**
+     * Public variable: faSquare.
+     *
+     * It instantiates fontawesome's faSquare icon.
+     */
     faSquare = faSquare;
 
-    selectedConvoluteLabel: string;
-    convoluteLabel = {
+    /**
+     * Public variable: selectedConvolute.
+     *
+     * It keeps the selected convolute string.
+     */
+    selectedConvolute: string;
+
+    /**
+     * Public variable: convolutes.
+     *
+     * It keeps the labels for the convolutes.
+     */
+    convolutes = {
         A: 'A Skizzen (Basel, Paul Sacher Stiftung)',
         B_H: 'B–H (siehe Kritischer Bericht)'
     };
 
-    folioLegend = [
+    /**
+     * Public variable: folioLegends.
+     *
+     * It keeps the legend for the folios.
+     */
+    folioLegends: IFolioLegend[] = [
         {
             color: 'olivedrab',
             label: 'aktuell ausgewählt'
@@ -41,23 +112,52 @@ export class EditionConvoluteComponent implements OnInit {
         }
     ];
 
-    constructor() {}
-
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {
-        this.selectedConvoluteLabel = this.convoluteLabel.A;
+        this.selectedConvolute = this.convolutes.A;
     }
 
-    selectConvolute(convoluteLabel: string) {
-        this.selectedConvoluteLabel = convoluteLabel;
+    /**
+     * Public method: openModal.
+     *
+     * It emits a given id of a modal snippet text
+     * to the {@link openModalRequest}.
+     *
+     * @param {string} id The given modal snippet id.
+     * @returns {void} Emits the id.
+     */
+    openModal(id: string): void {
+        this.openModalRequest.emit(id);
     }
 
-    // request function to emit modal id
-    openModal(id: string) {
-        this.openModalRequest.emit(id);
+    /**
+     * Public method: selectConvolute.
+     *
+     * It sets a given convolutelabel to the
+     * to the {@link selectSvgSheetRequest}.
+     *
+     * @param {string} convoluteLabel The given label.
+     * @returns {void} Sets the selectedConvoluteLabel variable.
+     */
+    selectConvolute(convoluteLabel: string): void {
+        this.selectedConvolute = convoluteLabel;
     }
 
-    // request function to emit selected sheet id
-    selectSvgFile(id: string) {
-        this.selectSvgFileRequest.emit(id);
+    /**
+     * Public method: selectSvgSheet.
+     *
+     * It emits a given id of a selected svg sheet
+     * to the {@link selectSvgSheetRequest}.
+     *
+     * @param {string} id The given sheet id.
+     * @returns {void} Emits the id.
+     */
+    selectSvgSheet(id: string): void {
+        this.selectSvgSheetRequest.emit(id);
     }
 }
diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail-notification/edition-detail-notification.component.ts b/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail-notification/edition-detail-notification.component.ts
index 21927975ae..e9f3958694 100644
--- a/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail-notification/edition-detail-notification.component.ts
+++ b/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail-notification/edition-detail-notification.component.ts
@@ -1,13 +1,25 @@
-import { Component, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 
+/**
+ * The EditionDetailNotification component.
+ *
+ * It contains the notification block section
+ * of the edition view of the app
+ * that displays a hint to the user.
+ */
 @Component({
     selector: 'awg-edition-detail-notification',
     templateUrl: './edition-detail-notification.component.html',
-    styleUrls: ['./edition-detail-notification.component.css']
+    styleUrls: ['./edition-detail-notification.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class EditionDetailNotificationComponent implements OnInit {
-    constructor() {}
-
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {}
 
     // TODO: refactor as awg-helpblock
diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail.component.html b/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail.component.html
index dd3f1bd148..9fb64f282b 100644
--- a/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail.component.html
+++ b/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail.component.html
@@ -1,30 +1,31 @@
 <!-- content: edition -->
 <div>
-
     <!-- modal -->
     <awg-modal #modal></awg-modal>
 
     <!-- body with embedded svg's -->
 
-        <!-- convolute view -->
-        <awg-edition-convolute *ngIf="convoluteData && selectedSvgFile"
-                               [convoluteData]="convoluteData"
-                               [selectedSvgFile]="selectedSvgFile"
-                               (openModalRequest)="modal.open($event)"
-                               (selectSvgFileRequest)="onSvgFileSelect($event)">
-        </awg-edition-convolute>
-
-
-        <!-- accolade view -->
-        <awg-edition-accolade *ngIf="svgFileData && selectedSvgFile"
-                              [svgFileData]="svgFileData"
-                              [selectedSvgFile]="selectedSvgFile"
-                              [selectedTextcritics]="selectedTextcritics"
-                              [selectedOverlay]="selectedOverlay"
-                              [showTkA]="showTkA"
-                              (openModalRequest)="modal.open($event)"
-                              (selectSvgFileRequest)="onSvgFileSelect($event)"
-                              (selectTextcriticRequest)="onTextcriticSelect($event)">
-        </awg-edition-accolade>
+    <!-- convolute view -->
+    <awg-edition-convolute
+        *ngIf="folios && selectedSvgSheet"
+        [folios]="folios"
+        [selectedSvgSheet]="selectedSvgSheet"
+        (openModalRequest)="modal.open($event)"
+        (selectSvgSheetRequest)="onSvgSheetSelect($event)"
+    >
+    </awg-edition-convolute>
 
+    <!-- accolade view -->
+    <awg-edition-accolade
+        *ngIf="svgSheetsData && selectedSvgSheet"
+        [svgSheetsData]="svgSheetsData"
+        [selectedSvgSheet]="selectedSvgSheet"
+        [selectedTextcritics]="selectedTextcritics"
+        [selectedOverlay]="selectedOverlay"
+        [showTkA]="showTkA"
+        (openModalRequest)="modal.open($event)"
+        (selectSvgSheetRequest)="onSvgSheetSelect($event)"
+        (selectOverlayRequest)="onOverlaySelect($event)"
+    >
+    </awg-edition-accolade>
 </div>
diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail.component.spec.ts b/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail.component.spec.ts
index e199f01c14..4263d154e5 100644
--- a/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail.component.spec.ts
+++ b/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail.component.spec.ts
@@ -8,8 +8,8 @@ import { Observable, of as observableOf } from 'rxjs';
 import { NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
 
 import {
-    ConvoluteFolio,
-    EditionSvgFile,
+    Folio,
+    EditionSvgSheet,
     EditionSvgOverlay,
     Textcritics,
     TextcriticsList
@@ -26,9 +26,9 @@ class EditionDetailNotificationStubComponent {}
 @Component({ selector: 'awg-edition-convolute', template: '' })
 class EditionConvoluteStubComponent {
     @Input()
-    convoluteData: ConvoluteFolio[];
+    folios: Folio[];
     @Input()
-    selectedSvgFile: EditionSvgFile;
+    selectedSvgSheet: EditionSvgSheet;
 
     // TODO: add outputs
 }
@@ -36,9 +36,9 @@ class EditionConvoluteStubComponent {
 @Component({ selector: 'awg-edition-accolade', template: '' })
 class EditionAccoladeStubComponent {
     @Input()
-    svgFileData: EditionSvgFile[];
+    svgSheetsData: EditionSvgSheet[];
     @Input()
-    selectedSvgFile: EditionSvgFile;
+    selectedSvgSheet: EditionSvgSheet;
     @Input()
     selectedTextcritics: Textcritics[];
     @Input()
@@ -54,10 +54,10 @@ describe('EditionDetailComponent', () => {
     let fixture: ComponentFixture<EditionDetailComponent>;
 
     let mockEditionService: Partial<EditionService>;
-    let getEditionDetailDataSpy: Observable<[ConvoluteFolio[], EditionSvgFile[], TextcriticsList]>;
+    let getEditionDetailDataSpy: Observable<[Folio[], EditionSvgSheet[], TextcriticsList]>;
 
     beforeEach(async(() => {
-        // create a fake service object with a `getCurrentSearchResults()` spy
+        // create a fake service object with a `getEditionDetailData()` spy
         const mockEditionDataService = jasmine.createSpyObj('EditionDataService', ['getEditionDetailData']);
         // make the spies return a synchronous Observable with the test data
         getEditionDetailDataSpy = mockEditionDataService.getEditionDetailData.and.returnValue(observableOf()); // TODO: provide real test data
diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail.component.ts b/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail.component.ts
index caac52ff34..c5d4bd48b5 100644
--- a/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail.component.ts
+++ b/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail.component.ts
@@ -2,51 +2,130 @@ import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Params, Router } from '@angular/router';
 
 import {
-    ConvoluteFolio,
-    EditionSvgFile,
+    Folio,
+    EditionSvgSheet,
     EditionSvgOverlay,
     Textcritics,
     TextcriticsList
 } from '@awg-views/edition-view/models';
 import { EditionDataService, EditionService } from '@awg-views/edition-view/services';
 
+/**
+ * The EditionDetail component.
+ *
+ * It contains the edition detail section
+ * of the edition view of the app
+ * with a {@link ModalComponent},
+ * the {@link ConvoluteComponent}
+ * and the {@link AccoladeComponent}.
+ */
 @Component({
     selector: 'awg-edition-detail',
     templateUrl: './edition-detail.component.html',
     styleUrls: ['./edition-detail.component.css']
 })
 export class EditionDetailComponent implements OnInit {
-    convoluteData: ConvoluteFolio[];
+    /**
+     * Public variable: folios.
+     *
+     * It keeps the folios of the edition detail.
+     */
+    folios: Folio[];
 
-    svgFileData: EditionSvgFile[];
-    selectedSvgFile: EditionSvgFile;
+    /**
+     * Public variable: svgSheetsData.
+     *
+     * It keeps the svg sheets data of the edition detail.
+     */
+    svgSheetsData: EditionSvgSheet[];
 
+    /**
+     * Public variable: textcriticsData.
+     *
+     * It keeps the textcritics data of the edition detail.
+     */
     textcriticsData: TextcriticsList;
+
+    /**
+     * Public variable: selectedSvgSheet.
+     *
+     * It keeps the selected svg sheet.
+     */
+    selectedSvgSheet: EditionSvgSheet;
+
+    /**
+     * Public variable: selectedTextcritics.
+     *
+     * It keeps the selected textcritics.
+     */
     selectedTextcritics: Textcritics[];
+
+    /**
+     * Public variable: selectedOverlay.
+     *
+     * It keeps the selected svg overlay.
+     */
     selectedOverlay: EditionSvgOverlay;
 
+    /**
+     * Public variable: errorMessage.
+     *
+     * It keeps an errorMessage for the service calls.
+     */
     errorMessage: string = undefined;
+
+    /**
+     * Public variable: showTka.
+     *
+     * If the textcritics shall be displayed.
+     */
     showTkA = false;
 
+    /**
+     * Constructor of the EditionDetailComponent.
+     *
+     * It declares a private instances of
+     * EditionDataService and EditionService,
+     * ActivatedRoute and Router.
+     *
+     * @param {ActivatedRoute} route Instance of the Angular ActivatedRoute.
+     * @param {Router} router Instance of the Angular Router.
+     * @param {EditionDataService} editionDataService Instance of the EditionDataService.
+     * @param {EditionService} editionService Instance of the EditionService.
+     */
     constructor(
-        private route: ActivatedRoute,
-        private router: Router,
         private editionDataService: EditionDataService,
-        private editionService: EditionService
+        private editionService: EditionService,
+        private route: ActivatedRoute,
+        private router: Router
     ) {}
 
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {
         this.getEditionDetailData();
     }
 
-    // get edition data
-    getEditionDetailData() {
+    /**
+     * Public method: getEditionDetailData.
+     *
+     * It calls the EditionDataService to provide
+     * the data for the edition detail.
+     *
+     * @returns {void} Sets the folios,
+     * svgSheetsData and textcriticsData.
+     */
+    getEditionDetailData(): void {
         this.editionDataService.getEditionDetailData().subscribe(
-            (data: [ConvoluteFolio[], EditionSvgFile[], TextcriticsList]) => {
-                this.convoluteData = data[0]['convolute'];
-                this.svgFileData = data[1];
+            (data: [Folio[], EditionSvgSheet[], TextcriticsList]) => {
+                this.folios = data[0]['convolute'];
+                this.svgSheetsData = data[1];
                 this.textcriticsData = data[2];
-                if (this.svgFileData) {
+                if (this.svgSheetsData) {
                     this.getRouteParams();
                 }
             },
@@ -56,31 +135,58 @@ export class EditionDetailComponent implements OnInit {
         );
     }
 
+    /**
+     * Private method: getRouteParams.
+     *
+     * It checks the route params for a given sheet id
+     * and sets the selected sheet if any.
+     *
+     * @returns {void} Sets selectd sheet.
+     */
     private getRouteParams(): void {
         this.route.params.forEach((params: Params) => {
             // if there is no id in route params
-            // take first entry of svg file object as default
-            const fileId: string = params['id'] ? params['id'] : Object.keys(this.svgFileData)[0];
-            this.selectedSvgFile = this.svgFileData[fileId];
+            // take first entry of svg sheets data as default
+            const fileId: string = params['id'] ? params['id'] : Object.keys(this.svgSheetsData)[0];
+            this.selectedSvgSheet = this.svgSheetsData[fileId];
         });
     }
 
-    onSvgFileSelect(id: string): void {
-        this.selectedSvgFile = this.svgFileData[id];
-        this.showTkA = false;
-        this.router.navigate(['/edition/detail', id]);
-    }
-
-    onTextcriticSelect($event: EditionSvgOverlay): void {
-        if (!this.textcriticsData && !this.selectedSvgFile) {
+    /**
+     * Public method: onOverlaySelect.
+     *
+     * It selects a given overlay and its corresponding textcritics.
+     *
+     * @param {EditionSvgOverlay} overlay The given svg overlay.
+     * @returns {void} Sets the selectedOverlay,
+     * selectedTextcritis and showTka variable.
+     */
+    onOverlaySelect(overlay: EditionSvgOverlay): void {
+        if (!this.textcriticsData && !this.selectedSvgSheet) {
             return;
         }
 
         // shortcut
-        const textcritics = this.textcriticsData[this.selectedSvgFile.id];
+        const textcritics = this.textcriticsData[this.selectedSvgSheet.id];
 
-        this.selectedOverlay = $event;
+        this.selectedOverlay = overlay;
         this.selectedTextcritics = this.editionService.getTextcritics(textcritics, this.selectedOverlay);
         this.showTkA = this.selectedTextcritics !== [];
     }
+
+    /**
+     * Public method: onSvgSheetSelect.
+     *
+     * It selects a svg sheet by its id and
+     * navigates to the '/edition/detail' route
+     * with this given id.
+     *
+     * @param {string} id The given svg sheet id.
+     * @returns {void} Navigates to the edition detail.
+     */
+    onSvgSheetSelect(id: string): void {
+        this.selectedSvgSheet = this.svgSheetsData[id];
+        this.showTkA = false;
+        this.router.navigate(['/edition/detail', id]);
+    }
 }
diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail.module.ts b/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail.module.ts
index 543bad4265..5e13fc68b4 100644
--- a/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail.module.ts
+++ b/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail.module.ts
@@ -7,24 +7,32 @@ import { EditionTkaTableModule } from '../edition-tka-table/edition-tka-table.mo
 import { EditionAccoladeComponent } from './edition-accolade/edition-accolade.component';
 import { EditionConvoluteComponent } from './edition-convolute';
 import { EditionDetailNotificationComponent } from './edition-detail-notification';
-import { EditionSvgFileNavComponent } from './edition-svg-file-nav';
-import { EditionSvgFileComponent } from './edition-svg-file';
+import { EditionSvgSheetNavComponent } from './edition-svg-sheet-nav';
+import { EditionSvgSheetComponent } from './edition-svg-sheet';
 
+/**
+ * The edition detail module.
+ *
+ * It embeds the {@link EditionAccoladeComponent}, {@link EditionConvoluteComponent},
+ * {@link EditionDetailNotificationComponent}, {@link EditionSvgSheetNavComponent},
+ * {@link EditionSvgSheetComponent} as well as the {@link EditionTkaTableModule},
+ * {@link FolioModule} and {@link SharedModule}.
+ */
 @NgModule({
     imports: [SharedModule, FolioModule, EditionTkaTableModule],
     declarations: [
         EditionAccoladeComponent,
         EditionConvoluteComponent,
         EditionDetailNotificationComponent,
-        EditionSvgFileNavComponent,
-        EditionSvgFileComponent
+        EditionSvgSheetNavComponent,
+        EditionSvgSheetComponent
     ],
     exports: [
         EditionAccoladeComponent,
         EditionConvoluteComponent,
         EditionDetailNotificationComponent,
-        EditionSvgFileNavComponent,
-        EditionSvgFileComponent
+        EditionSvgSheetNavComponent,
+        EditionSvgSheetComponent
     ]
 })
 export class EditionDetailModule {}
diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-file-nav/edition-svg-file-nav.component.html b/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-file-nav/edition-svg-file-nav.component.html
deleted file mode 100644
index 4c219365b1..0000000000
--- a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-file-nav/edition-svg-file-nav.component.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div *ngIf="svgFileData" class="btn-group awg-btn-group d-flex" role="group">
-    <a class="btn btn-default w-100" *ngFor="let svgFile of svgFileData | keyvalue" [class.active]="isSelectedSvgFile(svgFile.value)" (click)="selectSvgFile(svgFile.value)">
-        {{ svgFile.key }}
-    </a>
-</div>
-
diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-file-nav/edition-svg-file-nav.component.ts b/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-file-nav/edition-svg-file-nav.component.ts
deleted file mode 100644
index ce32091e17..0000000000
--- a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-file-nav/edition-svg-file-nav.component.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-
-import { EditionSvgFile } from '@awg-views/edition-view/models';
-
-@Component({
-    selector: 'awg-edition-svg-file-nav',
-    templateUrl: './edition-svg-file-nav.component.html',
-    styleUrls: ['./edition-svg-file-nav.component.css']
-})
-export class EditionSvgFileNavComponent implements OnInit {
-    @Input()
-    svgFileData: EditionSvgFile[];
-    @Input()
-    selectedSvgFile: EditionSvgFile;
-    @Output()
-    selectSvgFileRequest: EventEmitter<string> = new EventEmitter();
-
-    constructor() {}
-
-    ngOnInit() {}
-
-    isSelectedSvgFile(svgFile: EditionSvgFile) {
-        return svgFile.id === this.selectedSvgFile.id;
-    }
-
-    selectSvgFile(svgFile: EditionSvgFile) {
-        this.selectSvgFileRequest.emit(svgFile.id);
-    }
-}
diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-file-nav/index.ts b/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-file-nav/index.ts
deleted file mode 100644
index 5e6495b0ae..0000000000
--- a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-file-nav/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './edition-svg-file-nav.component';
diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-file/edition-svg-file.component.ts b/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-file/edition-svg-file.component.ts
deleted file mode 100644
index dc8c0f7ade..0000000000
--- a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-file/edition-svg-file.component.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-
-import { EditionSvgFile, EditionSvgOverlay } from '@awg-views/edition-view/models';
-
-@Component({
-    selector: 'awg-edition-svg-file',
-    templateUrl: './edition-svg-file.component.html',
-    styleUrls: ['./edition-svg-file.component.css']
-})
-export class EditionSvgFileComponent implements OnInit {
-    @Input()
-    selectedSvgFile: EditionSvgFile;
-    @Input()
-    selectedOverlay: EditionSvgOverlay;
-    @Output()
-    selectSvgFileRequest: EventEmitter<string> = new EventEmitter();
-    @Output()
-    selectTextcriticRequest: EventEmitter<EditionSvgOverlay> = new EventEmitter();
-
-    // init sheets
-    // TODO: other solution possible?
-    svgFile2 = 'Aa:SkI/2';
-    svgFile3 = 'Aa:SkI/3';
-    svgFile4 = 'Aa:SkI/4';
-    svgFile5 = 'Aa:SkI/5';
-
-    constructor() {}
-
-    ngOnInit() {}
-
-    isSelectedSvgFile(id: string) {
-        // compare file ids
-        return id === this.selectedSvgFile.id;
-    }
-
-    isSelectedTextcritic(type: any, id: string) {
-        // compare stringified objects
-        const overlay = new EditionSvgOverlay(type, id);
-        return JSON.stringify(overlay) === JSON.stringify(this.selectedOverlay);
-    }
-
-    // request function to emit svg file id
-    selectSvgFile(id: string) {
-        this.selectSvgFileRequest.emit(id);
-    }
-
-    // request function to emit selected textcritic's type & id
-    selectTextcritic(type: any, id: string) {
-        const overlay = new EditionSvgOverlay(type, id);
-        this.selectTextcriticRequest.emit(overlay);
-    }
-}
diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-file/index.ts b/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-file/index.ts
deleted file mode 100644
index dab7b42922..0000000000
--- a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-file/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './edition-svg-file.component';
diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet-nav/edition-svg-sheet-nav.component.css b/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet-nav/edition-svg-sheet-nav.component.css
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet-nav/edition-svg-sheet-nav.component.html b/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet-nav/edition-svg-sheet-nav.component.html
new file mode 100644
index 0000000000..54aa0aa66e
--- /dev/null
+++ b/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet-nav/edition-svg-sheet-nav.component.html
@@ -0,0 +1,10 @@
+<div *ngIf="svgSheetsData" class="btn-group awg-btn-group d-flex" role="group">
+    <a
+        class="btn btn-default w-100"
+        *ngFor="let svgSheet of svgSheetsData | keyvalue"
+        [class.active]="isSelectedSvgSheet(svgSheet.value.id)"
+        (click)="selectSvgSheet(svgSheet.value.id)"
+    >
+        {{ svgSheet.key }}
+    </a>
+</div>
diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-file-nav/edition-svg-file-nav.component.spec.ts b/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet-nav/edition-svg-sheet-nav.component.spec.ts
similarity index 56%
rename from src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-file-nav/edition-svg-file-nav.component.spec.ts
rename to src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet-nav/edition-svg-sheet-nav.component.spec.ts
index ee81f3f7f7..c76686dd83 100644
--- a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-file-nav/edition-svg-file-nav.component.spec.ts
+++ b/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet-nav/edition-svg-sheet-nav.component.spec.ts
@@ -2,20 +2,20 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { DebugElement } from '@angular/core';
 
-import { EditionSvgFileNavComponent } from './edition-svg-file-nav.component';
+import { EditionSvgSheetNavComponent } from './edition-svg-sheet-nav.component';
 
-describe('EditionSvgFileNavComponent', () => {
-    let component: EditionSvgFileNavComponent;
-    let fixture: ComponentFixture<EditionSvgFileNavComponent>;
+describe('EditionSvgSheetNavComponent', () => {
+    let component: EditionSvgSheetNavComponent;
+    let fixture: ComponentFixture<EditionSvgSheetNavComponent>;
 
     beforeEach(async(() => {
         TestBed.configureTestingModule({
-            declarations: [EditionSvgFileNavComponent]
+            declarations: [EditionSvgSheetNavComponent]
         }).compileComponents();
     }));
 
     beforeEach(() => {
-        fixture = TestBed.createComponent(EditionSvgFileNavComponent);
+        fixture = TestBed.createComponent(EditionSvgSheetNavComponent);
         component = fixture.componentInstance;
         fixture.detectChanges();
     });
diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet-nav/edition-svg-sheet-nav.component.ts b/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet-nav/edition-svg-sheet-nav.component.ts
new file mode 100644
index 0000000000..e07563bd8d
--- /dev/null
+++ b/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet-nav/edition-svg-sheet-nav.component.ts
@@ -0,0 +1,76 @@
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+
+import { EditionSvgSheet } from '@awg-views/edition-view/models';
+
+/**
+ * The EditionSvgSheetNav component.
+ *
+ * It contains the svg sheet navigation section
+ * of the edition view of the app
+ * and lets the user select an svg sheet.
+ */
+@Component({
+    selector: 'awg-edition-svg-sheet-nav',
+    templateUrl: './edition-svg-sheet-nav.component.html',
+    styleUrls: ['./edition-svg-sheet-nav.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class EditionSvgSheetNavComponent implements OnInit {
+    /**
+     * Input variable: svgSheetsData.
+     *
+     * It keeps the svg sheets data.
+     */
+    @Input()
+    svgSheetsData: EditionSvgSheet[];
+
+    /**
+     * Input variable: selectedSvgSheet.
+     *
+     * It keeps the selected svg sheet.
+     */
+    @Input()
+    selectedSvgSheet: EditionSvgSheet;
+
+    /**
+     * Output variable: selectSvgSheetRequest.
+     *
+     * It keeps an event emitter for the selected id of an svg sheet.
+     */
+    @Output()
+    selectSvgSheetRequest: EventEmitter<string> = new EventEmitter();
+
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
+    ngOnInit() {}
+
+    /**
+     * Public method: isSelectedSvgSheet.
+     *
+     * It compares a given id with the id
+     * of the latest selected svg sheet.
+     *
+     * @param {string} id The given sheet id.
+     * @returns {boolean} The boolean value of the comparison result.
+     */
+    isSelectedSvgSheet(id: string): boolean {
+        return id === this.selectedSvgSheet.id;
+    }
+
+    /**
+     * Public method: selectSvgSheet.
+     *
+     * It emits a given id of a selected svg sheet
+     * to the {@link selectSvgSheetRequest}.
+     *
+     * @param {string} id The given sheet id.
+     * @returns {void} Emits the id.
+     */
+    selectSvgSheet(id: string): void {
+        this.selectSvgSheetRequest.emit(id);
+    }
+}
diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet-nav/index.ts b/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet-nav/index.ts
new file mode 100644
index 0000000000..90747f340b
--- /dev/null
+++ b/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet-nav/index.ts
@@ -0,0 +1 @@
+export * from './edition-svg-sheet-nav.component';
diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet/edition-svg-sheet.component.css b/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet/edition-svg-sheet.component.css
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-file/edition-svg-file.component.html b/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet/edition-svg-sheet.component.html
similarity index 67%
rename from src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-file/edition-svg-file.component.html
rename to src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet/edition-svg-sheet.component.html
index 7b6958c182..5ed67adf2d 100644
--- a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-file/edition-svg-file.component.html
+++ b/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet/edition-svg-sheet.component.html
@@ -1,67 +1,67 @@
 <div>
     <!-- embedded svg: Aa:SkI/2 -->
-    <div class="svg edition-svg" *ngIf="isSelectedSvgFile(svgFile2)">
+    <div class="svg edition-svg" *ngIf="isSelectedSvgSheet(svgSheetLabels.sheet2)">
         <svg
             version="1.1"
             xmlns="https://www.w3.org/2000/svg"
             xmlns:xlink="https://www.w3.org/1999/xlink"
             viewBox="0 0 1000 508"
-            [id]="selectedSvgFile.id"
+            [id]="selectedSvgSheet.id"
         >
-            <svg:image xlink:href [attr.xlink:href]="selectedSvgFile.svg" width="100%" height="100%" />
+            <svg:image xlink:href [attr.xlink:href]="selectedSvgSheet.svg" width="100%" height="100%" />
             <!-- systems -->
             <svg:g class="edition-svg-systems">
                 <!-- system 14 -->
-                <a (click)="selectTextcritic('system', '14')" [class.active]="isSelectedTextcritic('system', '14')">
+                <a (click)="selectOverlay('system', '14')" [class.active]="isSelectedOverlay('system', '14')">
                     <rect class="edition-svg-system" x="20" y="205" width="950" height="60" />
                 </a>
                 <!-- system 13 -->
-                <a (click)="selectTextcritic('system', '13')" [class.active]="isSelectedTextcritic('system', '13')">
+                <a (click)="selectOverlay('system', '13')" [class.active]="isSelectedOverlay('system', '13')">
                     <rect class="edition-svg-system" x="20" y="275" width="950" height="60" />
                 </a>
                 <!-- system 12 -->
-                <a (click)="selectTextcritic('system', '12')" [class.active]="isSelectedTextcritic('system', '12')">
+                <a (click)="selectOverlay('system', '12')" [class.active]="isSelectedOverlay('system', '12')">
                     <rect class="edition-svg-system" x="20" y="345" width="950" height="60" />
                 </a>
             </svg:g>
             <!-- measures -->
             <svg:g class="edition-svg-measures">
                 <!-- measure 10 -->
-                <a (click)="selectTextcritic('measure', '10')" [class.active]="isSelectedTextcritic('measure', '10')">
+                <a (click)="selectOverlay('measure', '10')" [class.active]="isSelectedOverlay('measure', '10')">
                     <rect class="edition-svg-measure" x="300" y="125" width="180" height="345" />
                 </a>
                 <!-- measure 11 -->
-                <a (click)="selectTextcritic('measure', '11')" [class.active]="isSelectedTextcritic('measure', '11')">
+                <a (click)="selectOverlay('measure', '11')" [class.active]="isSelectedOverlay('measure', '11')">
                     <rect class="edition-svg-measure" x="480" y="125" width="180" height="345" />
                 </a>
                 <!-- measure 12 -->
-                <a (click)="selectTextcritic('measure', '12')" [class.active]="isSelectedTextcritic('measure', '12')">
+                <a (click)="selectOverlay('measure', '12')" [class.active]="isSelectedOverlay('measure', '12')">
                     <rect class="edition-svg-measure" x="660" y="125" width="180" height="345" />
                 </a>
             </svg:g>
             <!-- items -->
             <svg:g class="edition-svg-items">
                 <!-- T10/S12/o1 -->
-                <a (click)="selectTextcritic('item', '0')" [class.active]="isSelectedTextcritic('item', '0')">
+                <a (click)="selectOverlay('item', '0')" [class.active]="isSelectedOverlay('item', '0')">
                     <rect class="edition-svg-item" x="330" y="350" rx="5" ry="5" width="40" height="70" />
                 </a>
                 <!-- T10/S12/o2 -->
-                <a (click)="selectTextcritic('item', '1')" [class.active]="isSelectedTextcritic('item', '1')">
+                <a (click)="selectOverlay('item', '1')" [class.active]="isSelectedOverlay('item', '1')">
                     <rect class="edition-svg-item" x="380" y="350" rx="5" ry="5" width="40" height="70" />
                 </a>
                 <!-- T11/S14/o(1/4) -->
-                <a (click)="selectTextcritic('item', '2')" [class.active]="isSelectedTextcritic('item', '2')">
+                <a (click)="selectOverlay('item', '2')" [class.active]="isSelectedOverlay('item', '2')">
                     <rect class="edition-svg-item" x="480" y="200" rx="5" ry="5" width="125" height="80" />
                 </a>
                 <!-- T12/S13/oO -->
-                <a (click)="selectTextcritic('item', '3')" [class.active]="isSelectedTextcritic('item', '3')">
+                <a (click)="selectOverlay('item', '3')" [class.active]="isSelectedOverlay('item', '3')">
                     <rect class="edition-svg-item" x="660" y="270" rx="5" ry="5" width="125" height="80" />
                 </a>
             </svg:g>
             <!-- link boxes -->
             <svg:g class="edition-svg-linkboxes">
                 <!-- rect SkI/3 -->
-                <a (click)="selectSvgFile(svgFile3)">
+                <a (click)="selectSvgSheet(svgSheetLabels.sheet3)">
                     <rect class="edition-svg-linkbox" x="90" y="345" width="182" height="125" />
                 </a>
             </svg:g>
@@ -70,49 +70,49 @@
     <!-- END svg Aa:SkI/2 -->
 
     <!-- embedded svg: Aa:SkI/3 -->
-    <div class="svg edition-svg" *ngIf="isSelectedSvgFile(svgFile3)">
+    <div class="svg edition-svg" *ngIf="isSelectedSvgSheet(svgSheetLabels.sheet3)">
         <svg
             version="1.1"
             xmlns="https://www.w3.org/2000/svg"
             xmlns:xlink="https://www.w3.org/1999/xlink"
             viewBox="0 0 1000 608"
-            [id]="selectedSvgFile.id"
+            [id]="selectedSvgSheet.id"
         >
-            <svg:image xlink:href [attr.xlink:href]="selectedSvgFile.svg" width="100%" height="100%" />
+            <svg:image xlink:href [attr.xlink:href]="selectedSvgSheet.svg" width="100%" height="100%" />
             <!-- measures -->
             <svg:g class="edition-svg-measures">
                 <!-- measure 10 -->
-                <a (click)="selectTextcritic('measure', '10')" [class.active]="isSelectedTextcritic('measure', '10')">
+                <a (click)="selectOverlay('measure', '10')" [class.active]="isSelectedOverlay('measure', '10')">
                     <rect class="edition-svg-measure" x="80" y="110" width="282" height="400" />
                 </a>
                 <!-- measure 11 -->
-                <a (click)="selectTextcritic('measure', '11')" [class.active]="isSelectedTextcritic('measure', '11')">
+                <a (click)="selectOverlay('measure', '11')" [class.active]="isSelectedOverlay('measure', '11')">
                     <rect class="edition-svg-measure" x="362" y="110" width="260" height="400" />
                 </a>
             </svg:g>
             <!-- items -->
             <svg:g class="edition-svg-items">
                 <!-- T10/S9/o(2/4) -->
-                <a (click)="selectTextcritic('item', '0')" [class.active]="isSelectedTextcritic('item', '0')">
+                <a (click)="selectOverlay('item', '0')" [class.active]="isSelectedOverlay('item', '0')">
                     <rect class="edition-svg-item" x="225" y="420" rx="5" ry="5" width="40" height="70" />
                 </a>
                 <!-- T11/S10/o(1.-2.Note) -->
-                <a (click)="selectTextcritic('item', '1')" [class.active]="isSelectedTextcritic('item', '1')">
+                <a (click)="selectOverlay('item', '1')" [class.active]="isSelectedOverlay('item', '1')">
                     <rect class="edition-svg-item" x="365" y="340" rx="5" ry="5" width="105" height="70" />
                 </a>
                 <!-- T12/S10/o(nach 2/4) -->
-                <a (click)="selectTextcritic('item', '2')" [class.active]="isSelectedTextcritic('item', '2')">
+                <a (click)="selectOverlay('item', '2')" [class.active]="isSelectedOverlay('item', '2')">
                     <rect class="edition-svg-item" x="510" y="340" rx="5" ry="5" width="100" height="70" />
                 </a>
             </svg:g>
             <!-- link boxes -->
             <svg:g class="edition-svg-linkboxes">
                 <!-- rect SkI/2 -->
-                <a (click)="selectSvgFile(svgFile2)">
+                <a (click)="selectSvgSheet(svgSheetLabels.sheet2)">
                     <rect class="edition-svg-linkbox" x="458" y="111" width="165" height="162" />
                 </a>
                 <!-- rect SkI/5 -->
-                <a (click)="selectSvgFile(svgFile5)">
+                <a (click)="selectSvgSheet(svgSheetLabels.sheet5)">
                     <rect class="edition-svg-linkbox" x="620" y="420" width="165" height="160" />
                 </a>
             </svg:g>
@@ -121,37 +121,37 @@
     <!-- END svg Aa:SkI/3 -->
 
     <!-- embedded svg: Aa:SkI/4 -->
-    <div class="svg edition-svg" *ngIf="isSelectedSvgFile(svgFile4)">
+    <div class="svg edition-svg" *ngIf="isSelectedSvgSheet(svgSheetLabels.sheet4)">
         <svg
             version="1.1"
             xmlns="https://www.w3.org/2000/svg"
             xmlns:xlink="https://www.w3.org/1999/xlink"
             viewBox="0 0 1000 508"
-            [id]="selectedSvgFile.id"
+            [id]="selectedSvgSheet.id"
         >
-            <svg:image xlink:href [attr.xlink:href]="selectedSvgFile.svg" width="100%" height="100%" />
+            <svg:image xlink:href [attr.xlink:href]="selectedSvgSheet.svg" width="100%" height="100%" />
             <!-- measures -->
             <svg:g class="edition-svg-measures">
                 <!-- measure 10 -->
-                <a (click)="selectTextcritic('measure', '10')" [class.active]="isSelectedTextcritic('measure', '10')">
+                <a (click)="selectOverlay('measure', '10')" [class.active]="isSelectedOverlay('measure', '10')">
                     <rect class="edition-svg-measure" x="150" y="115" width="268" height="390" />
                 </a>
             </svg:g>
             <!-- items -->
             <svg:g class="edition-svg-items">
                 <!-- T10/S6/oO -->
-                <a (click)="selectTextcritic('item', '0')" [class.active]="isSelectedTextcritic('item', '0')">
+                <a (click)="selectOverlay('item', '0')" [class.active]="isSelectedOverlay('item', '0')">
                     <rect class="edition-svg-item" x="283" y="270" rx="5" ry="5" width="40" height="70" />
                 </a>
                 <!-- T10/S5/o(3.Note) -->
-                <a (click)="selectTextcritic('item', '1')" [class.active]="isSelectedTextcritic('item', '1')">
+                <a (click)="selectOverlay('item', '1')" [class.active]="isSelectedOverlay('item', '1')">
                     <rect class="edition-svg-item" x="283" y="350" rx="5" ry="5" width="40" height="70" />
                 </a>
             </svg:g>
             <!-- link boxes -->
             <svg:g class="edition-svg-linkboxes">
                 <!-- rect SkI/5 -->
-                <a (click)="selectSvgFile(svgFile5)">
+                <a (click)="selectSvgSheet(svgSheetLabels.sheet5)">
                     <rect class="edition-svg-linkbox" x="577" y="152" width="222" height="180" />
                 </a>
             </svg:g>
@@ -160,45 +160,45 @@
     <!-- END svg Aa:SkI/4 -->
 
     <!-- embedded svg: Aa:SkI/5 -->
-    <div class="svg edition-svg" *ngIf="isSelectedSvgFile(svgFile5)">
+    <div class="svg edition-svg" *ngIf="isSelectedSvgSheet(svgSheetLabels.sheet5)">
         <svg
             version="1.1"
             xmlns="https://www.w3.org/2000/svg"
             xmlns:xlink="https://www.w3.org/1999/xlink"
             viewBox="0 0 1000 608"
-            [id]="selectedSvgFile.id"
+            [id]="selectedSvgSheet.id"
         >
-            <svg:image xlink:href [attr.xlink:href]="selectedSvgFile.svg" width="100%" height="100%" />
+            <svg:image xlink:href [attr.xlink:href]="selectedSvgSheet.svg" width="100%" height="100%" />
             <!-- measures -->
             <svg:g class="edition-svg-measures">
                 <!-- measure 10 -->
-                <a (click)="selectTextcritic('measure', '10')" [class.active]="isSelectedTextcritic('measure', '10')">
+                <a (click)="selectOverlay('measure', '10')" [class.active]="isSelectedOverlay('measure', '10')">
                     <rect class="edition-svg-measure" x="390" y="115" width="260" height="390" />
                 </a>
                 <!-- measure 11 -->
-                <a (click)="selectTextcritic('measure', '11')" [class.active]="isSelectedTextcritic('measure', '11')">
+                <a (click)="selectOverlay('measure', '11')" [class.active]="isSelectedOverlay('measure', '11')">
                     <rect class="edition-svg-measure" x="650" y="115" width="200" height="390" />
                 </a>
             </svg:g>
             <!-- items -->
             <svg:g class="edition-svg-items">
                 <!-- T10/S9/o3/8 -->
-                <a (click)="selectTextcritic('item', '0')" [class.active]="isSelectedTextcritic('item', '0')">
+                <a (click)="selectOverlay('item', '0')" [class.active]="isSelectedOverlay('item', '0')">
                     <rect class="edition-svg-item" x="523" y="195" rx="5" ry="5" width="40" height="85" />
                 </a>
                 <!-- T11/S9/o1/4 -->
-                <a (click)="selectTextcritic('item', '1')" [class.active]="isSelectedTextcritic('item', '1')">
+                <a (click)="selectOverlay('item', '1')" [class.active]="isSelectedOverlay('item', '1')">
                     <rect class="edition-svg-item" x="650" y="195" rx="5" ry="5" width="40" height="85" />
                 </a>
             </svg:g>
             <!-- link boxes -->
             <svg:g class="edition-svg-linkboxes">
                 <!-- rect SkI/3 -->
-                <a (click)="selectSvgFile(svgFile3)">
+                <a (click)="selectSvgSheet(svgSheetLabels.sheet3)">
                     <rect class="edition-svg-linkbox" x="72" y="148" width="242" height="125" />
                 </a>
                 <!-- rect SkI/4 -->
-                <a (click)="selectSvgFile(svgFile4)">
+                <a (click)="selectSvgSheet(svgSheetLabels.sheet4)">
                     <rect class="edition-svg-linkbox" x="72" y="345" width="245" height="205" />
                 </a>
             </svg:g>
diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-file/edition-svg-file.component.spec.ts b/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet/edition-svg-sheet.component.spec.ts
similarity index 72%
rename from src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-file/edition-svg-file.component.spec.ts
rename to src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet/edition-svg-sheet.component.spec.ts
index 36b0ea64da..83bd061fa1 100644
--- a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-file/edition-svg-file.component.spec.ts
+++ b/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet/edition-svg-sheet.component.spec.ts
@@ -1,24 +1,24 @@
 /* tslint:disable:no-unused-variable */
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { EditionSvgFileComponent } from './edition-svg-file.component';
-import { EditionSvgFile, EditionSvgOverlay } from '@awg-views/edition-view/models';
+import { EditionSvgSheetComponent } from './edition-svg-sheet.component';
+import { EditionSvgSheet, EditionSvgOverlay } from '@awg-views/edition-view/models';
 import { EditionSvgOverlayTypes } from '@awg-views/edition-view/models/edition-svg-overlay';
 
-describe('EditionSvgFileComponent', () => {
-    let component: EditionSvgFileComponent;
-    let fixture: ComponentFixture<EditionSvgFileComponent>;
-    let expectedSvgFile: EditionSvgFile;
+describe('EditionSvgSheetComponent', () => {
+    let component: EditionSvgSheetComponent;
+    let fixture: ComponentFixture<EditionSvgSheetComponent>;
+    let expectedSvgSheet: EditionSvgSheet;
     let expectedOverlay: EditionSvgOverlay;
 
     beforeEach(async(() => {
         TestBed.configureTestingModule({
-            declarations: [EditionSvgFileComponent]
+            declarations: [EditionSvgSheetComponent]
         }).compileComponents();
     }));
 
     beforeEach(() => {
-        fixture = TestBed.createComponent(EditionSvgFileComponent);
+        fixture = TestBed.createComponent(EditionSvgSheetComponent);
         component = fixture.componentInstance;
     });
 
@@ -28,7 +28,7 @@ describe('EditionSvgFileComponent', () => {
 
     describe('BEFORE initial data binding', () => {
         it('should not get svg file input', () => {
-            expect(component.selectedSvgFile).toBeUndefined('should be undefined');
+            expect(component.selectedSvgSheet).toBeUndefined('should be undefined');
         });
 
         it('should not get overlay input', () => {
@@ -43,7 +43,7 @@ describe('EditionSvgFileComponent', () => {
             // svgFileEl = svgFIleDe.nativeElement;
 
             // mock the inputs supplied by the parent component
-            expectedSvgFile = {
+            expectedSvgSheet = {
                 id: 'Aa:SkI/2',
                 svg: 'assets/img/edition/SkI_2n_small_cut_opt.svg',
                 image: 'assets/img/edition/SkI_2_small.jpg',
@@ -54,7 +54,7 @@ describe('EditionSvgFileComponent', () => {
             expectedOverlay = new EditionSvgOverlay(type, id);
 
             // simulate the parent setting the input properties
-            component.selectedSvgFile = expectedSvgFile;
+            component.selectedSvgSheet = expectedSvgSheet;
             component.selectedOverlay = expectedOverlay;
 
             // trigger initial data binding
@@ -62,7 +62,7 @@ describe('EditionSvgFileComponent', () => {
         });
 
         it('should get svg file input', () => {
-            expect(component.selectedSvgFile).toBe(expectedSvgFile);
+            expect(component.selectedSvgSheet).toBe(expectedSvgSheet);
         });
 
         it('should get overlay input', () => {
diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet/edition-svg-sheet.component.ts b/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet/edition-svg-sheet.component.ts
new file mode 100644
index 0000000000..c3a81d0cbd
--- /dev/null
+++ b/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet/edition-svg-sheet.component.ts
@@ -0,0 +1,138 @@
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+
+import { EditionSvgSheet, EditionSvgOverlay } from '@awg-views/edition-view/models';
+
+/**
+ * The SvgSheetLabels enumeration.
+ *
+ * It stores the possible sheet labels.
+ */
+export enum SvgSheetLabels {
+    sheet2 = 'Aa:SkI/2',
+    sheet3 = 'Aa:SkI/3',
+    sheet4 = 'Aa:SkI/4',
+    sheet5 = 'Aa:SkI/5'
+}
+
+/**
+ * The EditionSvgSheet component.
+ *
+ * It contains the svg sheet section
+ * of the edition view of the app
+ * and displays a selected svg sheet.
+ */
+@Component({
+    selector: 'awg-edition-svg-sheet',
+    templateUrl: './edition-svg-sheet.component.html',
+    styleUrls: ['./edition-svg-sheet.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class EditionSvgSheetComponent implements OnInit {
+    /**
+     * Input variable: selectedSvgSheet.
+     *
+     * It keeps the selected svg sheet.
+     */
+    @Input()
+    selectedSvgSheet: EditionSvgSheet;
+
+    /**
+     * Input variable: selectedOverlay.
+     *
+     * It keeps the selected svg overlay.
+     */
+    @Input()
+    selectedOverlay: EditionSvgOverlay;
+
+    /**
+     * Output variable: selectSvgSheetRequest.
+     *
+     * It keeps an event emitter for the selected id of an svg sheet.
+     */
+    @Output()
+    selectSvgSheetRequest: EventEmitter<string> = new EventEmitter();
+
+    /**
+     * Output variable: selectOverlayRequest.
+     *
+     * It keeps an event emitter for the selected textcritics.
+     */
+    @Output()
+    selectOverlayRequest: EventEmitter<EditionSvgOverlay> = new EventEmitter();
+
+    /**
+     * Public variable: svgSheetLabels.
+     *
+     * It keeps the labels of the svg sheets.
+     */
+    svgSheetLabels = {
+        sheet2: SvgSheetLabels.sheet2,
+        sheet3: SvgSheetLabels.sheet3,
+        sheet4: SvgSheetLabels.sheet4,
+        sheet5: SvgSheetLabels.sheet5
+    };
+
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
+    ngOnInit() {}
+
+    /**
+     * Public method: isSelectedSvgSheet.
+     *
+     * It compares a given id with the id
+     * of the latest selected svg sheet.
+     *
+     * @param {string} id The given sheet id.
+     * @returns {boolean} The boolean value of the comparison result.
+     */
+    isSelectedSvgSheet(id: string): boolean {
+        return id === this.selectedSvgSheet.id;
+    }
+
+    /**
+     * Public method: isSelectedOverlay.
+     *
+     * It compares a given svg overlay with
+     * the latest selected svg overlay.
+     *
+     * @param {string} type The given type of the svg overlay.
+     * @param {string} id The given id of the svg overlay.
+     * @returns {boolean} The boolean value of the comparison result.
+     */
+    isSelectedOverlay(type: any, id: string): boolean {
+        const overlay = new EditionSvgOverlay(type, id);
+        return JSON.stringify(overlay) === JSON.stringify(this.selectedOverlay);
+    }
+
+    /**
+     * Public method: selectOverlay.
+     *
+     * It emits a given svg overlay
+     * to the {@link selectOverlayRequest}.
+     *
+     * @param {string} type The given type of the svg overlay.
+     * @param {string} id The given id of the svg overlay.
+     * @returns {void} Emits the svg overlay.
+     */
+    selectOverlay(type: any, id: string): void {
+        const overlay = new EditionSvgOverlay(type, id);
+        this.selectOverlayRequest.emit(overlay);
+    }
+
+    /**
+     * Public method: selectSvgSheet.
+     *
+     * It emits a given id of a selected svg sheet
+     * to the {@link selectSvgSheetRequest}.
+     *
+     * @param {string} id The given sheet id.
+     * @returns {void} Emits the id.
+     */
+    selectSvgSheet(id: string): void {
+        this.selectSvgSheetRequest.emit(id);
+    }
+}
diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet/index.ts b/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet/index.ts
new file mode 100644
index 0000000000..4a8c8cd2aa
--- /dev/null
+++ b/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet/index.ts
@@ -0,0 +1 @@
+export * from './edition-svg-sheet.component';
diff --git a/src/app/views/edition-view/edition-outlets/edition-folio/folio.component.html b/src/app/views/edition-view/edition-outlets/edition-folio/folio.component.html
index 90b9f28084..1b3b26c5d6 100644
--- a/src/app/views/edition-view/edition-outlets/edition-folio/folio.component.html
+++ b/src/app/views/edition-view/edition-outlets/edition-folio/folio.component.html
@@ -1,11 +1,11 @@
-<!-- embedded svg: EditionSvgFile Overview -->
-<div class="container-fluid svgGrid" *ngIf="folioSvgOutputArray">
+<!-- embedded svg: EditionSvgSheet Overview -->
+<div class="container-fluid svgGrid" *ngIf="folioSvgDataArray">
     <div class="row svgRow">
-        <div class="col-sm-6 col-lg-{{ 12 / folioSvgOutputArray?.length }} svgCol" *ngFor="let folioSvg of folioSvgOutputArray">
-
+        <div
+            class="col-sm-6 col-lg-{{ 12 / folioSvgDataArray?.length }} svgCol"
+            *ngFor="let folioSvg of folioSvgDataArray"
+        >
             <svg id="folio-{{ folioSvg.sheet.folioId }}"></svg>
-
         </div>
     </div>
 </div>
-
diff --git a/src/app/views/edition-view/edition-outlets/edition-folio/folio.component.spec.ts b/src/app/views/edition-view/edition-outlets/edition-folio/folio.component.spec.ts
index 1fe883fa79..ef919440c2 100644
--- a/src/app/views/edition-view/edition-outlets/edition-folio/folio.component.spec.ts
+++ b/src/app/views/edition-view/edition-outlets/edition-folio/folio.component.spec.ts
@@ -2,19 +2,13 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { FolioComponent } from './folio.component';
 import { FolioService } from './folio.service';
-import {
-    ConvoluteFolio,
-    ConvoluteFolioSvgOutput,
-    EditionSvgFile,
-    FolioCalculation,
-    FolioFormatOptions
-} from '@awg-views/edition-view/models';
+import { Folio, FolioSvgData, EditionSvgSheet, FolioCalculation, FolioSettings } from '@awg-views/edition-view/models';
 
 describe('FolioComponent', () => {
     let component: FolioComponent;
     let fixture: ComponentFixture<FolioComponent>;
-    let expectedConvoluteData: ConvoluteFolio[];
-    let expectedSvgFile: EditionSvgFile;
+    let expectedFolios: Folio[];
+    let expectedSvgSheet: EditionSvgSheet;
 
     beforeEach(async(() => {
         TestBed.configureTestingModule({
@@ -33,25 +27,25 @@ describe('FolioComponent', () => {
     });
 
     describe('BEFORE initial data binding', () => {
-        it('should not get convoluteData input', () => {
-            expect(component.convoluteData).toBeUndefined('should be undefined');
+        it('should not get folios input', () => {
+            expect(component.folios).toBeUndefined('should be undefined');
         });
 
         it('should not get svg file input', () => {
-            expect(component.selectedSvgFile).toBeUndefined('should be undefined');
+            expect(component.selectedSvgSheet).toBeUndefined('should be undefined');
         });
     });
 
     describe('AFTER initial data binding', () => {
         beforeEach(() => {
             // mock the inputs supplied by the parent component
-            expectedSvgFile = {
+            expectedSvgSheet = {
                 id: 'Aa:SkI/2',
                 svg: 'assets/img/edition/SkI_2n_small_cut_opt.svg',
                 image: 'assets/img/edition/SkI_2_small.jpg',
                 alt: 'Aa:SkI/2'
             };
-            const folioFormatOptions: FolioFormatOptions = {
+            const folioFormatSettings: FolioSettings = {
                 factor: 1.5,
                 formatX: 175,
                 formatY: 270,
@@ -59,7 +53,7 @@ describe('FolioComponent', () => {
                 initialOffsetY: 5,
                 numberOfFolios: 0
             };
-            expectedConvoluteData = [
+            expectedFolios = [
                 {
                     folioId: '1r',
                     systems: '16',
@@ -84,19 +78,19 @@ describe('FolioComponent', () => {
             ];
 
             // simulate the parent setting the input properties
-            component.convoluteData = expectedConvoluteData;
-            component.selectedSvgFile = expectedSvgFile;
+            component.folios = expectedFolios;
+            component.selectedSvgSheet = expectedSvgSheet;
 
             // trigger initial data binding
             fixture.detectChanges();
         });
 
         it('should get svg file input', () => {
-            expect(component.selectedSvgFile).toBe(expectedSvgFile);
+            expect(component.selectedSvgSheet).toBe(expectedSvgSheet);
         });
 
-        it('should get convoluteData input', () => {
-            expect(component.convoluteData).toBe(expectedConvoluteData);
+        it('should get folios input', () => {
+            expect(component.folios).toBe(expectedFolios);
         });
     });
 });
diff --git a/src/app/views/edition-view/edition-outlets/edition-folio/folio.component.ts b/src/app/views/edition-view/edition-outlets/edition-folio/folio.component.ts
index 1d06e19e37..b5e7626f78 100644
--- a/src/app/views/edition-view/edition-outlets/edition-folio/folio.component.ts
+++ b/src/app/views/edition-view/edition-outlets/edition-folio/folio.component.ts
@@ -1,45 +1,114 @@
-import { AfterViewChecked, AfterViewInit, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-
 import {
-    ConvoluteFolio,
-    FolioFormatOptions,
-    ConvoluteFolioSvgOutput,
-    EditionSvgFile,
-    ViewBox
-} from '@awg-views/edition-view/models';
+    AfterViewChecked,
+    AfterViewInit,
+    ChangeDetectionStrategy,
+    Component,
+    EventEmitter,
+    Input,
+    OnInit,
+    Output
+} from '@angular/core';
+
+import { Folio, FolioSettings, FolioSvgData, EditionSvgSheet, ViewBox } from '@awg-views/edition-view/models';
 import { FolioService } from './folio.service';
 
-// embedded SnapSvg (snapsvg.io)
+/**
+ * Declared variable: Snap.
+ *
+ * It provides access to the embedded SnapSvg library (see {@link snapsvg.io}).
+ */
 declare var Snap: any;
 
+/**
+ * The Folio component.
+ *
+ * It contains the folio section
+ * of the edition view of the app
+ * and displays the convolute folios.
+ */
 @Component({
     selector: 'awg-edition-folio',
     templateUrl: './folio.component.html',
-    styleUrls: ['./folio.component.css']
+    styleUrls: ['./folio.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class FolioComponent implements OnInit, AfterViewInit, AfterViewChecked {
+    /**
+     * Input variable: folios.
+     *
+     * It keeps the folio data.
+     */
     @Input()
-    convoluteData: ConvoluteFolio[];
+    folios: Folio[];
+
+    /**
+     * Public variable: selectedSvgSheet.
+     *
+     * It keeps the selected svg sheet.
+     */
     @Input()
-    selectedSvgFile: EditionSvgFile;
+    selectedSvgSheet: EditionSvgSheet;
+
+    /**
+     * Output variable: openModalRequest.
+     *
+     * It keeps an event emitter to open the modal
+     * with the selected modal text snippet.
+     */
     @Output()
     openModalRequest: EventEmitter<string> = new EventEmitter();
-    @Output()
-    selectSvgFileRequest: EventEmitter<string> = new EventEmitter();
 
-    folio: ConvoluteFolio;
+    /**
+     * Output variable: selectSvgSheetRequest.
+     *
+     * It keeps an event emitter for the selected id of an svg sheet.
+     */
+    @Output()
+    selectSvgSheetRequest: EventEmitter<string> = new EventEmitter();
 
-    // output
+    /**
+     * Public variable: canvasArray.
+     *
+     * It keeps the array with a Snap canvas per folio.
+     */
     canvasArray = [];
-    folioSvgOutputArray: ConvoluteFolioSvgOutput[] = [];
+
+    /**
+     * Public variable: folioSvgDataArray.
+     *
+     * It keeps the array with the svg data
+     * needed to draw the Snap canvas of the folios.
+     */
+    folioSvgDataArray: FolioSvgData[] = [];
+
+    /**
+     * Public variable: vbArray.
+     *
+     * It keeps the array with the
+     * viewbox data for the folios.
+     */
     vbArray: ViewBox[] = [];
 
-    // colors
+    /**
+     * Public variable: bgColor.
+     *
+     * It keeps the background color for the folio.
+     */
     bgColor = '#a3a3a3';
+
+    /**
+     * Public variable: fgColor.
+     *
+     * It keeps the foreground color for the folio.
+     */
     fgColor = 'orange';
 
-    // options
-    private _folioFormatOptions: FolioFormatOptions = {
+    /**
+     * Private variable: _folioSettings.
+     *
+     * It keeps the format settings for the folio.
+     */
+    private _folioSettings: FolioSettings = {
         factor: 1.5,
         formatX: 175,
         formatY: 270,
@@ -48,28 +117,79 @@ export class FolioComponent implements OnInit, AfterViewInit, AfterViewChecked {
         numberOfFolios: 0
     };
 
+    /**
+     * Getter for folio format settings.
+     */
+    get folioSettings() {
+        return this._folioSettings;
+    }
+
+    /**
+     * Setter for folio format settings.
+     */
+    set folioSettings(settings: FolioSettings) {
+        this._folioSettings = settings;
+    }
+
+    /**
+     * Self-referring variable needed for CompileHtml library.
+     */
     ref: FolioComponent;
 
+    /**
+     * Constructor of the FolioComponent.
+     *
+     * It declares a private {@link FolioService} instance
+     * and initializes the self-referring ref variable
+     * needed for CompileHtml library.
+     *
+     * @param {FolioService} folioService Instance of the FolioService.
+     */
     constructor(private folioService: FolioService) {
         this.ref = this;
     }
 
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {
         this.prepareFolioSvgOutput();
     }
 
+    /**
+     * Angular life cycle hook: ngAfterViewInit.
+     *
+     * It calls the containing methods
+     * after the view was initialized.
+     */
     ngAfterViewInit() {
         // start to render svg only after view, inputs and calculation are available
         this.renderSnapSvg();
     }
 
+    /**
+     * Angular life cycle hook: ngAfterViewChecked.
+     *
+     * It calls the containing methods
+     * after the view was built and checked.
+     */
     ngAfterViewChecked() {
-        // apply active classes after view was checked
-        this.applyActiveClass();
+        // toggle active classes after view was checked
+        this.toggleActiveClass();
     }
 
-    // helper function to toggle active class on selected sheet
-    applyActiveClass() {
+    /**
+     * Public method: toggleActiveClass.
+     *
+     * It toggles css class 'active' on a selected sheet
+     * (canvas item-group).
+     *
+     * @returns {void} Toggles the css class.
+     */
+    toggleActiveClass(): void {
         // iterate over canvas Array
         if (!this.canvasArray) {
             return;
@@ -77,41 +197,58 @@ export class FolioComponent implements OnInit, AfterViewInit, AfterViewChecked {
         this.canvasArray.forEach(canvas => {
             // find all item groups
             canvas.selectAll('.item-group').forEach(itemGroup => {
-                // toggle active class if itemId corresponds to selectedSvgFileId
+                // toggle active class if itemId corresponds to selectedSvgSheetId
                 const itemId = itemGroup.node.attributes.itemId.value;
-                itemGroup.toggleClass('active', this.isSelectedSvgFile(itemId));
+                itemGroup.toggleClass('active', this.isSelectedSvgSheet(itemId));
             });
         });
     }
 
-    /**********
-     * FolioSvgOutputData
+    /**
+     * Public method: prepareFolioSvgOutput.
+     *
+     * It prepares the viewbox and svg data for all folios
+     * to render the folio svg object (SnapCanvas).
+     *
+     * @returns {void} Sets the vbArray and folioSvgDataArray variable.
      */
     prepareFolioSvgOutput(): void {
-        for (let folioIndex = 0; folioIndex < this.convoluteData.length; folioIndex++) {
+        for (let folioIndex = 0; folioIndex < this.folios.length; folioIndex++) {
             // current folio
-            this.folio = this.convoluteData[folioIndex];
+            const folio = this.folios[folioIndex];
+
+            // update folio settings
+            this.folioSettings = {
+                factor: this.folioSettings.factor,
+                formatX: +folio.format.width,
+                formatY: +folio.format.height,
+                initialOffsetX: this.folioSettings.initialOffsetX,
+                initialOffsetY: this.folioSettings.initialOffsetY,
+                numberOfFolios: +this.folios.length
+            };
 
             // prepare viewbox settings
-            this.vbArray[folioIndex] = this.folioService.getViewBoxData(this.folioFormatOptions);
+            this.vbArray[folioIndex] = new ViewBox(this.folioSettings);
 
-            // prepare output data
-            this.folioSvgOutputArray[folioIndex] = this.folioService.getFolioSvgOutputData(
-                this.folioFormatOptions,
-                this.folio
-            );
+            // calculate svg data
+            this.folioSvgDataArray[folioIndex] = this.folioService.getFolioSvgData(this.folioSettings, folio);
         }
     }
 
-    /**********
-     * rendering of SVG
+    /**
+     * Public method: renderSnapSvg.
+     *
+     * It provides the folio viewbox and svg data
+     * to the SnapCanvas to render the folios.
+     *
+     * @returns {void} Sets the canvasArray variable.
      */
-    renderSnapSvg() {
+    renderSnapSvg(): void {
         // empty canvasArray
         this.canvasArray = [];
 
-        /* apply values from folioSvgOutputArray to render the svg image with snapsvg */
-        this.folioSvgOutputArray.forEach((folioSvg: ConvoluteFolioSvgOutput, folioIndex: number) => {
+        /* apply data from folioSvgDataArray to render the svg image with snapsvg */
+        this.folioSvgDataArray.forEach((folioSvg: FolioSvgData, folioIndex: number) => {
             // init canvas
             const snapId: string = '#folio-' + folioSvg.sheet.folioId;
             const snapCanvas: any = Snap(snapId);
@@ -119,42 +256,52 @@ export class FolioComponent implements OnInit, AfterViewInit, AfterViewChecked {
                 return;
             }
 
-            /**********
-             * viewBox
-             */
-            this.folioService.setSvgViewBox(snapCanvas, this.vbArray[folioIndex]);
+            // svg viewBox
+            this.folioService.addViewBoxToSnapSvgCanvas(snapCanvas, this.vbArray[folioIndex]);
 
-            /**********
-             * svg content
-             */
-            this.folioService.renderSvg(snapCanvas, folioSvg, this.bgColor, this.fgColor, this.ref);
+            // svg content
+            this.folioService.addFolioToSnapSvgCanvas(snapCanvas, folioSvg, this.bgColor, this.fgColor, this.ref);
 
             this.canvasArray.push(snapCanvas);
         });
     }
 
-    // getter function for format options
-    get folioFormatOptions() {
-        // prepare folio width & height
-        this._folioFormatOptions.numberOfFolios = +this.convoluteData.length;
-        this._folioFormatOptions.formatX = +this.folio.format.width;
-        this._folioFormatOptions.formatY = +this.folio.format.height;
-
-        return this._folioFormatOptions;
-    }
-
-    // helper function to compare id with that of selected sheet
-    isSelectedSvgFile(id: string) {
-        return id === this.selectedSvgFile.id;
+    /**
+     * Public method: isSelectedSvgSheet.
+     *
+     * It compares a given id with the id
+     * of the latest selected svg sheet.
+     *
+     * @param {string} id The given sheet id.
+     * @returns {boolean} The boolean value of the comparison result.
+     */
+    isSelectedSvgSheet(id: string): boolean {
+        return id === this.selectedSvgSheet.id;
     }
 
-    // request function to emit modal id
-    openModal(id: string) {
+    /**
+     * Public method: openModal.
+     *
+     * It emits a given id of a modal snippet text
+     * to the {@link openModalRequest}.
+     *
+     * @param {string} id The given modal snippet id.
+     * @returns {void} Emits the id.
+     */
+    openModal(id: string): void {
         this.openModalRequest.emit(id);
     }
 
-    // request function to emit selected sheet id
-    selectSvgFile(id: string) {
-        this.selectSvgFileRequest.emit(id);
+    /**
+     * Public method: selectSvgSheet.
+     *
+     * It emits a given id of a selected svg sheet
+     * to the {@link selectSvgSheetRequest}.
+     *
+     * @param {string} id The given sheet id.
+     * @returns {void} Emits the id.
+     */
+    selectSvgSheet(id: string): void {
+        this.selectSvgSheetRequest.emit(id);
     }
 }
diff --git a/src/app/views/edition-view/edition-outlets/edition-folio/folio.module.ts b/src/app/views/edition-view/edition-outlets/edition-folio/folio.module.ts
index 3d7de9cc10..dbb9f255c0 100644
--- a/src/app/views/edition-view/edition-outlets/edition-folio/folio.module.ts
+++ b/src/app/views/edition-view/edition-outlets/edition-folio/folio.module.ts
@@ -3,6 +3,12 @@ import { SharedModule } from '@awg-shared/shared.module';
 
 import { FolioComponent } from './folio.component';
 
+/**
+ * The edition folio module.
+ *
+ * It embeds the {@link FolioComponent}
+ * as well as the {@link SharedModule}.
+ */
 @NgModule({
     imports: [SharedModule],
     declarations: [FolioComponent],
diff --git a/src/app/views/edition-view/edition-outlets/edition-folio/folio.service.ts b/src/app/views/edition-view/edition-outlets/edition-folio/folio.service.ts
index 41783e9039..abfe877eb3 100644
--- a/src/app/views/edition-view/edition-outlets/edition-folio/folio.service.ts
+++ b/src/app/views/edition-view/edition-outlets/edition-folio/folio.service.ts
@@ -1,40 +1,80 @@
 import { Injectable } from '@angular/core';
 
 import {
-    ConvoluteFolio,
+    Folio,
+    FolioSvgData,
     FolioCalculation,
-    FolioFormatOptions,
     FolioCalculationLine,
-    ConvoluteFolioSvgOutput,
-    ConvoluteFolioSvgContentItem,
+    FolioSettings,
     ViewBox
 } from '@awg-views/edition-view/models';
 
+/**
+ * Declared variable: Snap.
+ *
+ * It provides access to the embedded SnapSvg library (see {@link snapsvg.io}).
+ */
 declare var Snap: any;
 
+/**
+ * The Folio service.
+ *
+ * It handles the calculations needed for edition folio svg's
+ * and prepares the Snap svg canvas object.
+ *
+ * Provided in: `root`.
+ */
 @Injectable({
     providedIn: 'root'
 })
 export class FolioService {
+    /**
+     * Self-referring variable needed for CompileHtml library.
+     *
+     * It refers to the Component from which it is called.
+     */
     ref: any;
-    private itemsOffsetCorrection = 4; // offsetCorrection to avoid collision between items
 
-    /******************
-     * get data for dynamic viewBox
+    /**
+     * Private variable: itemsOffsetCorrection.
+     *
+     * It corrects the offset (in px) to avoid
+     * border collision between rendered svg items.
+     */
+    private itemsOffsetCorrection = 4;
+
+    /**
+     * Public method: getFolioSvgData.
+     *
+     * It calculates and provides the folio svg data
+     * to render the folio svg object (SnapCanvas).
+     *
+     * @param {FolioSettings} folioSettings The given folio format settings.
+     * @param {Folio} folio The given folio.
+     * @returns {FolioSvgData} The calculated folio data.
      */
-    getViewBoxData(folioFormatOptions: FolioFormatOptions): ViewBox {
-        // return new viewBoxModel
-        return new ViewBox(folioFormatOptions);
+    getFolioSvgData(folioSettings: FolioSettings, folio: Folio): FolioSvgData {
+        // calculate values for svg
+        const calculation = new FolioCalculation(folioSettings, folio, this.itemsOffsetCorrection);
+
+        // get svg data from calculation
+        return new FolioSvgData(calculation);
     }
 
-    /******************
-     * set viewBox of snapCanvas svg
+    /**
+     * Public method: addViewBoxToSnapSvgCanvas.
+     *
+     * It adds the svg viewbox attributes to a Snap canvas svg object.
+     *
+     * @param {*} snapCanvas The given Snap canvas svg object.
+     * @param {ViewBox} vb The given ViewBox object.
+     * @returns {void} Adds the svg viewbox attributes to the Snap canvas svg object.
      */
-    setSvgViewBox(snapCanvas: any, vb: ViewBox) {
+    addViewBoxToSnapSvgCanvas(snapCanvas: any, vb: ViewBox): void {
         snapCanvas.attr({
             viewBox: vb.viewBox,
-            width: vb.viewBoxWidth,
-            height: vb.viewBoxHeight,
+            width: vb.svgWidth,
+            height: vb.svgHeight,
             version: '1.1',
             xmlns: 'https://www.w3.org/2000/svg',
             xlink: 'https://www.w3.org/1999/xlink',
@@ -42,36 +82,63 @@ export class FolioService {
         });
     }
 
-    /******************
-     * prepare rendering of snapCanvas svg
+    /**
+     * Public method: addFolioToSnapSvgCanvas.
+     *
+     * It coordinates the drawing of the calculated folio svg data
+     * for a folio's sheet, systems and items to the folio svg object
+     * (SnapCanvas).
+     *
+     * @param {*} snapCanvas The given Snap canvas svg object.
+     * @param {FolioSvgData} folioSvg The given calculated folio data.
+     * @param {string} bgColor The given background color.
+     * @param {string} fgColor The given foreground color.
+     * @param {*} ref The given reference to the calling component.
+     * @returns {void} Adds the folio to the Snap canvas svg object.
      */
-    renderSvg(snapCanvas: any, folioSvg: ConvoluteFolioSvgOutput, bgColor: string, fgColor: string, ref: any) {
+    addFolioToSnapSvgCanvas(snapCanvas: any, folioSvg: FolioSvgData, bgColor: string, fgColor: string, ref: any): void {
+        /**
+         * Self-referring variable needed for CompileHtml library.
+         */
         this.ref = ref;
 
-        /**********
-         * sheet
+        /**
+         * The Snap canvas sheet group object.
          */
         const snapSheetGroup: any = snapCanvas.group();
-        this.renderSheet(snapCanvas, snapSheetGroup, folioSvg, bgColor);
 
-        /**********
-         * systems
+        /**
+         * Draw sheet.
+         */
+        this.addFolioSheetToSnapSvgCanvas(snapCanvas, snapSheetGroup, folioSvg, bgColor);
+
+        /**
+         * Draw systems.
          */
-        this.renderSystems(snapCanvas, snapSheetGroup, folioSvg, bgColor);
+        this.addFolioSystemsToSnapSvgCanvas(snapCanvas, snapSheetGroup, folioSvg, bgColor);
 
-        /**********
-         * items
+        /**
+         * Draw items.
          */
-        this.renderItems(snapCanvas, snapSheetGroup, folioSvg, fgColor);
+        this.addFolioItemsToSnapSvgCanvas(snapCanvas, snapSheetGroup, folioSvg, fgColor);
     }
 
-    /******************
-     * prepare rendering of folio
+    /**
+     * Private method: addFolioSheetToSnapSvgCanvas.
+     *
+     * It adds the folio's sheet from the calculated
+     * folio svg data to the folio svg object (SnapCanvas).
+     *
+     * @param {*} snapCanvas The given Snap canvas svg object.
+     * @param {*} snapSheetGroup The given Snap canvas sheet group object.
+     * @param {FolioSvgData} folioSvg The given calculated folio data.
+     * @param {string} bgColor The given background color.
+     * @returns {void} Adds the sheet to the Snap canvas svg object.
      */
-    private renderSheet(
+    private addFolioSheetToSnapSvgCanvas(
         snapCanvas: any,
         snapSheetGroup: any,
-        folioSvg: ConvoluteFolioSvgOutput,
+        folioSvg: FolioSvgData,
         bgColor: string
     ): void {
         // init
@@ -97,18 +164,30 @@ export class FolioService {
 
         // sheet title
         const snapSheetGroupTitle: string = Snap.parse('<title>Bl. ' + folioId + '</title>');
+
+        // add the sheet group title to the sheet group
         snapSheetGroup.append(snapSheetGroupTitle);
 
+        // add the sheet rectangle to the sheet group
         snapSheetGroup.add(snapSheetRect);
     }
 
-    /**********
-     * prepare rendering of systems
+    /**
+     * Private method: addFolioSystemsToSnapSvgCanvas.
+     *
+     * It adds the folio's systems from the calculated
+     * folio svg data to the folio svg object (SnapCanvas).
+     *
+     * @param {*} snapCanvas The given Snap canvas svg object.
+     * @param {*} snapSheetGroup The given Snap canvas sheet group object.
+     * @param {FolioSvgData} folioSvg The given calculated folio data.
+     * @param {string} bgColor The given background color.
+     * @returns {void} Adds the systems to the Snap canvas svg object.
      */
-    private renderSystems(
+    private addFolioSystemsToSnapSvgCanvas(
         snapCanvas: any,
         snapSheetGroup: any,
-        folioSvg: ConvoluteFolioSvgOutput,
+        folioSvg: FolioSvgData,
         bgColor: string
     ): void {
         folioSvg.systems.lineArrays.forEach((lineArray: FolioCalculationLine[], systemIndex: number) => {
@@ -156,20 +235,30 @@ export class FolioService {
                 class: 'systems-group'
             });
 
+            // add the systems group to the sheet group
             snapSheetGroup.add(snapSystemsGroup);
         });
     }
 
-    /**********
-     * prepare rendering of content items
+    /**
+     * Private method: addFolioItemsToSnapSvgCanvas.
+     *
+     * It adds the folio's items from the calculated
+     * folio svg data to the folio svg object (SnapCanvas).
+     *
+     * @param {*} snapCanvas The given Snap canvas svg object.
+     * @param {*} snapSheetGroup The given Snap canvas sheet group object.
+     * @param {FolioSvgData} folioSvg The given calculated folio data.
+     * @param {string} fgColor The given foreground color.
+     * @returns {void} Adds the items to the Snap canvas svg object.
      */
-    private renderItems(
+    private addFolioItemsToSnapSvgCanvas(
         snapCanvas: any,
         snapSheetGroup: any,
-        folioSvg: ConvoluteFolioSvgOutput,
+        folioSvg: FolioSvgData,
         fgColor: string
     ): void {
-        folioSvg.contentItemsArray.forEach((contentItem: ConvoluteFolioSvgContentItem) => {
+        folioSvg.contentItemsArray.forEach(contentItem => {
             if (!contentItem) {
                 return;
             }
@@ -249,28 +338,15 @@ export class FolioService {
                     fill: 'grey'
                 });
             } else {
-                snapItemGroup.click(() => this.ref.selectSvgFile(contentItem.sigle));
+                snapItemGroup.click(() => this.ref.selectSvgSheet(contentItem.sigle));
                 snapItemGroup.attr({
                     stroke: fgColor,
                     fill: fgColor
                 });
             }
 
+            // add the item group to the sheet group
             snapSheetGroup.add(snapItemGroup);
         });
     }
-
-    /******************
-     * svgOutputData
-     */
-    // compute all values to render the svg
-    getFolioSvgOutputData(folioFormatOptions: FolioFormatOptions, folioData: ConvoluteFolio): ConvoluteFolioSvgOutput {
-        // calculate values for svg
-        const calculation = new FolioCalculation(folioFormatOptions, folioData, this.itemsOffsetCorrection);
-
-        // get svg output data from calculation
-        const folioSvgOutput: ConvoluteFolioSvgOutput = new ConvoluteFolioSvgOutput(calculation);
-
-        return folioSvgOutput;
-    }
 }
diff --git a/src/app/views/edition-view/edition-outlets/edition-overview.component.ts b/src/app/views/edition-view/edition-outlets/edition-overview.component.ts
index 128c0d4b20..402b640fbe 100644
--- a/src/app/views/edition-view/edition-outlets/edition-overview.component.ts
+++ b/src/app/views/edition-view/edition-outlets/edition-overview.component.ts
@@ -2,17 +2,45 @@ import { Component, OnInit } from '@angular/core';
 
 import { RouterLinkButton } from '@awg-shared/router-link-button-group/router-link-button.model';
 
+/**
+ * The EditionOverview component.
+ *
+ * It contains the overview section
+ * of the edition view of the app
+ * with a {@link RouterLinkButtonGroupComponent} and
+ * another router outlet for the edition routes.
+ */
 @Component({
     selector: 'awg-edition-overview',
     templateUrl: './edition-overview.component.html',
     styleUrls: ['./edition-overview.component.css']
 })
 export class EditionOverviewComponent implements OnInit {
+    /**
+     * Public variable: editionButtonArray.
+     *
+     * It keeps the array for the edition router link buttons.
+     */
     editionButtonArray: RouterLinkButton[];
 
-    constructor() {}
-
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {
+        this.setButtons();
+    }
+
+    /**
+     * Public method: setButtons.
+     *
+     * It initializes the editionButtonArray.
+     *
+     * @returns {void} Sets the editionButtonArray.
+     */
+    setButtons(): void {
         this.editionButtonArray = [
             new RouterLinkButton('/edition', 'intro', 'Einleitung', false),
             new RouterLinkButton('/edition', 'detail', 'Edierter Notentext', false),
diff --git a/src/app/views/edition-view/edition-outlets/edition-tka-table/edition-tka-table.component.html b/src/app/views/edition-view/edition-outlets/edition-tka-table/edition-tka-table.component.html
index d1e516b493..0335b8c48c 100644
--- a/src/app/views/edition-view/edition-outlets/edition-tka-table/edition-tka-table.component.html
+++ b/src/app/views/edition-view/edition-outlets/edition-tka-table/edition-tka-table.component.html
@@ -12,7 +12,7 @@
             <tr *ngFor="let textcritic of selectedTextcritics">
                 <td>{{ textcritic.measure }}</td>
                 <td>{{ textcritic.system }}</td>
-                <td [innerHTML]="textcritic.location"></td>
+                <td [innerHTML]="textcritic.position"></td>
                 <td><span [compile-html]="textcritic.comment" [compile-html-ref]="ref"></span></td>
             </tr>
         </tbody>
diff --git a/src/app/views/edition-view/edition-outlets/edition-tka-table/edition-tka-table.component.ts b/src/app/views/edition-view/edition-outlets/edition-tka-table/edition-tka-table.component.ts
index c6df7eac4a..86db02fdea 100644
--- a/src/app/views/edition-view/edition-outlets/edition-tka-table/edition-tka-table.component.ts
+++ b/src/app/views/edition-view/edition-outlets/edition-tka-table/edition-tka-table.component.ts
@@ -1,33 +1,90 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 
 import { Textcritics } from '../../models/index';
 
+/**
+ * The EditionTkaTable component.
+ *
+ * It contains the table for the textcritical comments
+ * of the edition view of the app.
+ */
 @Component({
     selector: 'awg-edition-tka-table',
     templateUrl: './edition-tka-table.component.html',
-    styleUrls: ['./edition-tka-table.component.css']
+    styleUrls: ['./edition-tka-table.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class EditionTkaTableComponent implements OnInit {
+    /**
+     * Input variable: selectedTextcritics.
+     *
+     * It keeps the selected textcritics.
+     */
     @Input()
     selectedTextcritics: Textcritics[];
+
+    /**
+     * Output variable: openModalRequest.
+     *
+     * It keeps an event emitter to open the modal
+     * with the selected modal text snippet.
+     */
     @Output()
     openModalRequest: EventEmitter<string> = new EventEmitter();
+
+    /**
+     * Output variable: selectSvgSheetRequest.
+     *
+     * It keeps an event emitter for the selected id of an svg sheet.
+     */
     @Output()
-    selectSvgFileRequest: EventEmitter<string> = new EventEmitter();
+    selectSvgSheetRequest: EventEmitter<string> = new EventEmitter();
 
+    /**
+     * Self-referring variable needed for CompileHtml library.
+     */
     ref: EditionTkaTableComponent;
 
+    /**
+     * Constructor of the EditionTkaTableComponent.
+     *
+     * It initializes the self-referring ref variable needed for CompileHtml library.
+     */
     constructor() {
         this.ref = this;
     }
 
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {}
 
-    openModal(id: string) {
+    /**
+     * Public method: openModal.
+     *
+     * It emits a given id of a modal snippet text
+     * to the {@link openModalRequest}.
+     *
+     * @param {string} id The given modal snippet id.
+     * @returns {void} Emits the id.
+     */
+    openModal(id: string): void {
         this.openModalRequest.emit(id);
     }
 
-    selectSvgFile(id: string): void {
-        this.selectSvgFileRequest.emit(id);
+    /**
+     * Public method: selectSvgSheet.
+     *
+     * It emits a given id of a selected svg sheet
+     * to the {@link selectSvgSheetRequest}.
+     *
+     * @param {string} id The given sheet id.
+     * @returns {void} Emits the id.
+     */
+    selectSvgSheet(id: string): void {
+        this.selectSvgSheetRequest.emit(id);
     }
 }
diff --git a/src/app/views/edition-view/edition-outlets/edition-tka-table/edition-tka-table.module.ts b/src/app/views/edition-view/edition-outlets/edition-tka-table/edition-tka-table.module.ts
index a1ff4ab301..1f032cb44a 100644
--- a/src/app/views/edition-view/edition-outlets/edition-tka-table/edition-tka-table.module.ts
+++ b/src/app/views/edition-view/edition-outlets/edition-tka-table/edition-tka-table.module.ts
@@ -3,6 +3,12 @@ import { SharedModule } from '@awg-shared/shared.module';
 
 import { EditionTkaTableComponent } from './edition-tka-table.component';
 
+/**
+ * The edition TkA table module.
+ *
+ * It embeds the {@link EditionTkaTableComponent}
+ * as well as the {@link SharedModule}.
+ */
 @NgModule({
     imports: [SharedModule],
     declarations: [EditionTkaTableComponent],
diff --git a/src/app/views/edition-view/edition-outlets/intro/intro.component.ts b/src/app/views/edition-view/edition-outlets/intro/intro.component.ts
index 2abc9b0541..0c96ef812f 100644
--- a/src/app/views/edition-view/edition-outlets/intro/intro.component.ts
+++ b/src/app/views/edition-view/edition-outlets/intro/intro.component.ts
@@ -1,8 +1,15 @@
-import { Component } from '@angular/core';
+import { ChangeDetectionStrategy, Component } from '@angular/core';
 
+/**
+ * The Intro component.
+ *
+ * It contains the intro section
+ * of the edition view of the app.
+ */
 @Component({
     selector: 'awg-intro',
     templateUrl: './intro.component.html',
-    styleUrls: ['./intro.component.css']
+    styleUrls: ['./intro.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class IntroComponent {}
diff --git a/src/app/views/edition-view/edition-outlets/report/report.component.html b/src/app/views/edition-view/edition-outlets/report/report.component.html
index 732090df83..d20ead7077 100644
--- a/src/app/views/edition-view/edition-outlets/report/report.component.html
+++ b/src/app/views/edition-view/edition-outlets/report/report.component.html
@@ -1,6 +1,5 @@
 <!-- content: report -->
 <div>
-
     <!-- modal -->
     <awg-modal #modal></awg-modal>
 
@@ -8,16 +7,19 @@
     <awg-heading [title]="reportTitle" [id]="reportId"></awg-heading>
 
     <!-- sources -->
-    <awg-sources *ngIf="sourceListData"
-        [sourceListData]="sourceListData"
-        (openModalRequest)="modal.open($event)">
+    <awg-sources
+        *ngIf="editionReportData$ | async; let editionReportData"
+        [sourceListData]="editionReportData[0]"
+        (openModalRequest)="modal.open($event)"
+    >
     </awg-sources>
 
     <!-- textcritics -->
-    <awg-textcritics *ngIf="textcriticsData"
-        [textcriticsData]="textcriticsData"
+    <awg-textcritics
+        *ngIf="editionReportData$ | async; let editionReportData"
+        [textcriticsData]="editionReportData[1]"
         (openModalRequest)="modal.open($event)"
-        (selectSvgFileRequest)="onSvgFileSelect($event)">
+        (selectSvgSheetRequest)="onSvgSheetSelect($event)"
+    >
     </awg-textcritics>
-
 </div>
diff --git a/src/app/views/edition-view/edition-outlets/report/report.component.ts b/src/app/views/edition-view/edition-outlets/report/report.component.ts
index 40d7e24ae5..7d9a5f96be 100644
--- a/src/app/views/edition-view/edition-outlets/report/report.component.ts
+++ b/src/app/views/edition-view/edition-outlets/report/report.component.ts
@@ -1,45 +1,89 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+
+import { Observable } from 'rxjs';
 
 import { SourceList, TextcriticsList } from '@awg-views/edition-view/models';
 import { EditionDataService } from '@awg-views/edition-view/services';
 
+/**
+ * The Report component.
+ *
+ * It contains the report section of the edition view of the app
+ * with a {@link HeadingComponent}, a {@link ModalComponent},
+ * the {@link SourcesComponent} and the {@link TextcriticsComponent}.
+ */
 @Component({
     selector: 'awg-report',
     templateUrl: './report.component.html',
-    styleUrls: ['./report.component.css']
+    styleUrls: ['./report.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class ReportComponent implements OnInit {
-    reportTitle = 'Kritischer Bericht';
+    /**
+     * Public variable: editionReportData$.
+     *
+     * Observable that keeps the report data.
+     */
+    editionReportData$: Observable<[SourceList, TextcriticsList]>;
+
+    /**
+     * Public variable: reportId.
+     *
+     * It keeps the id of the report section.
+     */
     reportId = 'report';
 
-    sourceListData: SourceList;
-    textcriticsData: TextcriticsList;
-    private errorMessage: string = undefined;
+    /**
+     * Public variable: reportTitle.
+     *
+     * It keeps the title of the report section.
+     */
+    reportTitle = 'Kritischer Bericht';
 
-    constructor(
-        private router: Router,
-        private route: ActivatedRoute,
-        private editionDataService: EditionDataService
-    ) {}
+    /**
+     * Constructor of the ReportComponent.
+     *
+     * It declares a private EditionDataService instance
+     * to get the report data and a private Router instance.
+     *
+     * @param {EditionDataService} editionDataService Instance of the EditionDataService.
+     * @param {Router} router Instance of the Router.
+     */
+    constructor(private editionDataService: EditionDataService, private router: Router) {}
 
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {
-        this.getData();
+        this.getEditionReportData();
     }
 
-    getData() {
-        this.editionDataService.getEditionReportData().subscribe(
-            (data: [SourceList, TextcriticsList]) => {
-                this.sourceListData = data[0];
-                this.textcriticsData = data[1];
-            },
-            error => {
-                this.errorMessage = error as any;
-            }
-        );
+    /**
+     * Public method: getEditionReportData.
+     *
+     * It calls the EditionDataService to provide
+     * the data for the edition report.
+     *
+     * @returns {void} Sets the editionReportData observable.
+     */
+    getEditionReportData(): void {
+        this.editionReportData$ = this.editionDataService.getEditionReportData();
     }
 
-    onSvgFileSelect(id: string) {
+    /**
+     * Public method: onSvgSheetSelect.
+     *
+     * It navigates to the '/edition/detail'
+     * route with the given id.
+     *
+     * @param {string} id The given svg sheet id.
+     * @returns {void} Navigates to the edition detail.
+     */
+    onSvgSheetSelect(id: string): void {
         this.router.navigate(['/edition/detail', id]);
     }
 }
diff --git a/src/app/views/edition-view/edition-outlets/report/report.module.ts b/src/app/views/edition-view/edition-outlets/report/report.module.ts
index 948cdf297f..836709dc43 100644
--- a/src/app/views/edition-view/edition-outlets/report/report.module.ts
+++ b/src/app/views/edition-view/edition-outlets/report/report.module.ts
@@ -11,6 +11,12 @@ import {
 } from './sources';
 import { TextcriticsComponent } from './textcritics';
 
+/**
+ * The report module.
+ *
+ * It embeds the report components as well as the
+ * {@link EditionTkaTableModule} and {@link SharedModule}.
+ */
 @NgModule({
     imports: [SharedModule, EditionTkaTableModule],
     declarations: [
diff --git a/src/app/views/edition-view/edition-outlets/report/sources/source-description/source-description.component.ts b/src/app/views/edition-view/edition-outlets/report/sources/source-description/source-description.component.ts
index 47f4e2455f..b9e9d07e7e 100644
--- a/src/app/views/edition-view/edition-outlets/report/sources/source-description/source-description.component.ts
+++ b/src/app/views/edition-view/edition-outlets/report/sources/source-description/source-description.component.ts
@@ -1,27 +1,46 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 
+/**
+ * The SourceDescription component.
+ *
+ * It contains the source description section
+ * of the criitical report
+ * of the edition view of the app.
+ */
 @Component({
     selector: 'awg-source-description',
     templateUrl: './source-description.component.html',
-    styleUrls: ['./source-description.component.css']
+    styleUrls: ['./source-description.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class SourceDescriptionComponent implements OnInit {
-    @Input()
-    showDescriptionPanel: boolean;
-    @Output()
-    toggleDescriptionPanelRequest: EventEmitter<boolean> = new EventEmitter();
+    /**
+     * Output variable: openModalRequest.
+     *
+     * It keeps an event emitter to open the modal
+     * with the selected modal text snippet.
+     */
     @Output()
     openModalRequest: EventEmitter<string> = new EventEmitter();
 
-    constructor() {}
-
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {}
 
-    openModal(identifier: string) {
-        this.openModalRequest.emit(identifier);
-    }
-
-    togglePanel(): void {
-        this.toggleDescriptionPanelRequest.emit(this.showDescriptionPanel);
+    /**
+     * Public method: openModal.
+     *
+     * It emits a given id of a modal snippet text
+     * to the {@link openModalRequest}.
+     *
+     * @param {string} id The given modal snippet id.
+     * @returns {void} Emits the id.
+     */
+    openModal(id: string): void {
+        this.openModalRequest.emit(id);
     }
 }
diff --git a/src/app/views/edition-view/edition-outlets/report/sources/source-evaluation/source-evaluation.component.ts b/src/app/views/edition-view/edition-outlets/report/sources/source-evaluation/source-evaluation.component.ts
index 3f38ebaa6d..ded43ea98f 100644
--- a/src/app/views/edition-view/edition-outlets/report/sources/source-evaluation/source-evaluation.component.ts
+++ b/src/app/views/edition-view/edition-outlets/report/sources/source-evaluation/source-evaluation.component.ts
@@ -1,27 +1,46 @@
-import { Component, EventEmitter, OnInit, Output } from '@angular/core';
+import { ChangeDetectionStrategy, Component, EventEmitter, OnInit, Output } from '@angular/core';
 
+/**
+ * The SourceEvaluation component.
+ *
+ * It contains the source evaluation section
+ * of the criitical report
+ * of the edition view of the app.
+ */
 @Component({
     selector: 'awg-source-evaluation',
     templateUrl: './source-evaluation.component.html',
-    styleUrls: ['./source-evaluation.component.css']
+    styleUrls: ['./source-evaluation.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class SourceEvaluationComponent implements OnInit {
+    /**
+     * Output variable: openModalRequest.
+     *
+     * It keeps an event emitter to open the modal
+     * with the selected modal text snippet.
+     */
     @Output()
     openModalRequest: EventEmitter<string> = new EventEmitter();
-    @Output()
-    scrollRequest: EventEmitter<any> = new EventEmitter();
-
-    showEvaluationPanel = true;
-
-    constructor() {}
 
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {}
 
-    openModal(identifier: string) {
-        this.openModalRequest.emit(identifier);
-    }
-
-    togglePanel(): boolean {
-        return (this.showEvaluationPanel = !this.showEvaluationPanel);
+    /**
+     * Public method: openModal.
+     *
+     * It emits a given id of a modal snippet text
+     * to the {@link openModalRequest}.
+     *
+     * @param {string} id The given modal snippet id.
+     * @returns {void} Emits the id.
+     */
+    openModal(id: string): void {
+        this.openModalRequest.emit(id);
     }
 }
diff --git a/src/app/views/edition-view/edition-outlets/report/sources/source-list/source-list.component.ts b/src/app/views/edition-view/edition-outlets/report/sources/source-list/source-list.component.ts
index 91b05b10e7..577a15a985 100644
--- a/src/app/views/edition-view/edition-outlets/report/sources/source-list/source-list.component.ts
+++ b/src/app/views/edition-view/edition-outlets/report/sources/source-list/source-list.component.ts
@@ -1,32 +1,71 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 
 import { SourceList } from '@awg-views/edition-view/models';
 
+/**
+ * The SourceList component.
+ *
+ * It contains the source list section
+ * of the criitical report
+ * of the edition view of the app.
+ */
 @Component({
     selector: 'awg-source-list',
     templateUrl: './source-list.component.html',
-    styleUrls: ['./source-list.component.css']
+    styleUrls: ['./source-list.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class SourceListComponent implements OnInit {
+    /**
+     * Input variable: sourceListData.
+     *
+     * It keeps the source list data.
+     */
     @Input()
     sourceListData: SourceList;
+
+    /**
+     * Output variable: openModalRequest.
+     *
+     * It keeps an event emitter to open the modal
+     * with the selected modal text snippet.
+     */
     @Output()
     openModalRequest: EventEmitter<string> = new EventEmitter();
 
-    showListPanel = true;
+    /**
+     * Self-referring variable needed for CompileHtml library.
+     */
     ref: SourceListComponent;
 
+    /**
+     * Constructor of the SourceListComponent.
+     *
+     * It initializes the self-referring ref variable needed for CompileHtml library.
+     */
     constructor() {
         this.ref = this;
     }
 
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {}
 
-    openModal(id: string) {
+    /**
+     * Public method: openModal.
+     *
+     * It emits a given id of a modal snippet text
+     * to the {@link openModalRequest}.
+     *
+     * @param {string} id The given modal snippet id.
+     *
+     * @returns {void} Emits the id.
+     */
+    openModal(id: string): void {
         this.openModalRequest.emit(id);
     }
-
-    togglePanel(): boolean {
-        return (this.showListPanel = !this.showListPanel);
-    }
 }
diff --git a/src/app/views/edition-view/edition-outlets/report/sources/sources.component.html b/src/app/views/edition-view/edition-outlets/report/sources/sources.component.html
index 87e54e1c6f..cfb51e45c6 100644
--- a/src/app/views/edition-view/edition-outlets/report/sources/sources.component.html
+++ b/src/app/views/edition-view/edition-outlets/report/sources/sources.component.html
@@ -1,14 +1,15 @@
 <ngb-accordion id="sourcesAcc" activeIds="sourcesPanel">
-    <ngb-panel id="sourcesPanel" title="I. Quellen" >
+    <ngb-panel id="sourcesPanel" title="I. Quellen">
         <ng-template ngbPanelContent>
             <ngb-accordion id="sourcesPanelAcc" activeIds="sourceList, sourceDesc, sourceEvaluation">
-
                 <!-- source list -->
                 <ngb-panel id="sourceList" title="1. Quellenübersicht">
                     <ng-template ngbPanelContent>
-                        <awg-source-list *ngIf="sourceListData"
-                                         [sourceListData]="sourceListData"
-                                         (openModalRequest)="openModal($event)">
+                        <awg-source-list
+                            *ngIf="sourceListData"
+                            [sourceListData]="sourceListData"
+                            (openModalRequest)="openModal($event)"
+                        >
                         </awg-source-list>
                     </ng-template>
                 </ngb-panel>
@@ -16,24 +17,19 @@
                 <!-- source description -->
                 <ngb-panel id="sourceDesc" title="2. Quellenbeschreibung">
                     <ng-template ngbPanelContent>
-                        <awg-source-description
-                            [showDescriptionPanel]="showDescriptionPanel"
-                            (toggleDescriptionPanelRequest)="toggleDescriptionPanel($event)"
-                            (openModalRequest)="openModal($event)">
-                        </awg-source-description>
+                        <awg-source-description (openModalRequest)="openModal($event)"> </awg-source-description>
                     </ng-template>
                 </ngb-panel>
 
                 <!-- source evaluation -->
                 <ngb-panel id="sourceEvaluation" title="3. Quellenbewertung">
                     <ng-template ngbPanelContent>
-                        <awg-source-evaluation
-                            (openModalRequest)="openModal($event)">
-                        </awg-source-evaluation>
+                        <awg-source-evaluation (openModalRequest)="openModal($event)"> </awg-source-evaluation>
                     </ng-template>
                 </ngb-panel>
-
-            </ngb-accordion> <!-- END inner accordion -->
+            </ngb-accordion>
+            <!-- END inner accordion -->
         </ng-template>
     </ngb-panel>
-</ngb-accordion> <!-- END outer accordion -->
+</ngb-accordion>
+<!-- END outer accordion -->
diff --git a/src/app/views/edition-view/edition-outlets/report/sources/sources.component.ts b/src/app/views/edition-view/edition-outlets/report/sources/sources.component.ts
index d82cdec872..ee441a4cac 100644
--- a/src/app/views/edition-view/edition-outlets/report/sources/sources.component.ts
+++ b/src/app/views/edition-view/edition-outlets/report/sources/sources.component.ts
@@ -1,43 +1,58 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 
 import { SourceList } from '@awg-views/edition-view/models';
 
+/**
+ * The Sources component.
+ *
+ * It contains the sources section of the critical report
+ * of the edition view of the app with a
+ * {@link SourceListComponent}, a {@link SourceDescriptionComponent},
+ * and the {@link SourceEvaluationComponent}.
+ */
 @Component({
     selector: 'awg-sources',
     templateUrl: './sources.component.html',
-    styleUrls: ['./sources.component.css']
+    styleUrls: ['./sources.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class SourcesComponent implements OnInit {
+    /**
+     * Input variable: sourceListData.
+     *
+     * It keeps the source list data.
+     */
     @Input()
     sourceListData: SourceList;
+
+    /**
+     * Output variable: openModalRequest.
+     *
+     * It keeps an event emitter to open the modal
+     * with the selected modal text snippet.
+     */
     @Output()
     openModalRequest: EventEmitter<any> = new EventEmitter();
 
-    showDescriptionPanel = true;
-
-    constructor() {}
-
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {}
 
-    openModal(id: string) {
-        // emit event to open modal
+    /**
+     * Public method: openModal.
+     *
+     * It emits a given id of a modal snippet text
+     * to the {@link openModalRequest}.
+     *
+     * @param {string} id The given modal snippet id.
+     *
+     * @returns {void} Emits the id.
+     */
+    openModal(id: string): void {
         this.openModalRequest.emit(id);
     }
-
-    scrollTo(id: string) {
-        // if description is closed: open it before scrolling
-        // TODO: change calling logic
-        if (!this.showDescriptionPanel) {
-            this.toggleDescriptionPanel(this.showDescriptionPanel);
-        }
-    }
-
-    toggleDescriptionPanel(showPanel: boolean): boolean {
-        // toggle boolean value of showDescriptionPanel after emitting toggle event
-        return (this.showDescriptionPanel = this.togglePanel(showPanel));
-    }
-
-    togglePanel(showPanel: boolean): boolean {
-        return (showPanel = !showPanel);
-    }
 }
diff --git a/src/app/views/edition-view/edition-outlets/report/textcritics/textcritics.component.html b/src/app/views/edition-view/edition-outlets/report/textcritics/textcritics.component.html
index c59f11db0e..7b8db91f17 100644
--- a/src/app/views/edition-view/edition-outlets/report/textcritics/textcritics.component.html
+++ b/src/app/views/edition-view/edition-outlets/report/textcritics/textcritics.component.html
@@ -2,22 +2,24 @@
     <ngb-panel id="tkaPanel" title="II. Textkritischer Kommentar">
         <ng-template ngbPanelContent>
             <div class="para">
-                <p class="bold">
-                    <a (click)="openModal('sheetComingSoon')">Aa:SkI/1</a>:
-                </p>
+                <p class="bold"><a (click)="openModal('sheetComingSoon')">Aa:SkI/1</a>:</p>
                 <p class="small text-muted">
-                    [Der Textkritische Kommentar zu <strong>Aa:Sk1/1</strong> erscheint im Zusammenhang der vollständigen Edition der <i>Vier Lieder</i> op. 12 in AWG I/5.]
+                    [Der Textkritische Kommentar zu <strong>Aa:Sk1/1</strong> erscheint im Zusammenhang der
+                    vollständigen Edition der <i>Vier Lieder</i> op. 12 in AWG I/5.]
                 </p>
             </div>
 
             <div class="para" *ngFor="let textcritics of textcriticsData | keyvalue">
-                <caption class="bold"><a [routerLink]="['/edition/detail', textcritics.key]">{{ textcritics.key }}</a>:</caption>
+                <caption class="bold">
+                    <a [routerLink]="['/edition/detail', textcritics.key]">{{ textcritics.key }}</a
+                    >:
+                </caption>
                 <awg-edition-tka-table
                     [selectedTextcritics]="textcritics.value"
                     (openModalRequest)="openModal($event)"
-                    (selectSvgFileRequest)="selectSvgFile($event)">
+                    (selectSvgSheetRequest)="selectSvgSheet($event)"
+                >
                 </awg-edition-tka-table>
-
             </div>
         </ng-template>
     </ngb-panel>
diff --git a/src/app/views/edition-view/edition-outlets/report/textcritics/textcritics.component.ts b/src/app/views/edition-view/edition-outlets/report/textcritics/textcritics.component.ts
index 706e8aa4ea..215a145d65 100644
--- a/src/app/views/edition-view/edition-outlets/report/textcritics/textcritics.component.ts
+++ b/src/app/views/edition-view/edition-outlets/report/textcritics/textcritics.component.ts
@@ -1,38 +1,91 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 
 import { TextcriticsList } from '@awg-views/edition-view/models';
 
+/**
+ * The Textcritics component.
+ *
+ * It contains the textcritical comments section
+ * of the critical report of the edition view of the app
+ * with an {@link EditionTkaTableComponent}.
+ */
 @Component({
     selector: 'awg-textcritics',
     templateUrl: './textcritics.component.html',
-    styleUrls: ['./textcritics.component.css']
+    styleUrls: ['./textcritics.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class TextcriticsComponent implements OnInit {
+    /**
+     * Input variable: textcriticsData.
+     *
+     * It keeps the textcritics data.
+     */
     @Input()
     textcriticsData: TextcriticsList;
+
+    /**
+     * Output variable: openModalRequest.
+     *
+     * It keeps an event emitter to open the modal
+     * with the selected modal text snippet.
+     */
     @Output()
     openModalRequest: EventEmitter<string> = new EventEmitter();
+
+    /**
+     * Output variable: selectSvgSheetRequest.
+     *
+     * It keeps an event emitter for the selected id of an svg sheet.
+     */
     @Output()
-    selectSvgFileRequest: EventEmitter<string> = new EventEmitter();
+    selectSvgSheetRequest: EventEmitter<string> = new EventEmitter();
 
+    /**
+     * Self-referring variable needed for CompileHtml library.
+     */
     ref: TextcriticsComponent;
-    showPanel = true;
 
+    /**
+     * Constructor of the TextcriticsComponent.
+     *
+     * It initializes the self-referring ref variable needed for CompileHtml library.
+     */
     constructor() {
         this.ref = this;
     }
 
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {}
 
+    /**
+     * Public method: openModal.
+     *
+     * It emits a given id of a modal snippet text
+     * to the {@link openModalRequest}.
+     *
+     * @param {string} id The given modal snippet id.
+     * @returns {void} Emits the id.
+     */
     openModal(id: string): void {
         this.openModalRequest.emit(id);
     }
 
-    selectSvgFile(id: string): void {
-        this.selectSvgFileRequest.emit(id);
-    }
-
-    togglePanel(): boolean {
-        return (this.showPanel = !this.showPanel);
+    /**
+     * Public method: selectSvgSheet.
+     *
+     * It emits a given id of a selected svg sheet
+     * to the {@link selectSvgSheetRequest}.
+     *
+     * @param {string} id The given sheet id.
+     * @returns {void} Emits the id.
+     */
+    selectSvgSheet(id: string): void {
+        this.selectSvgSheetRequest.emit(id);
     }
 }
diff --git a/src/app/views/edition-view/edition-routing.module.ts b/src/app/views/edition-view/edition-routing.module.ts
index 57f065d564..2cf4ce813a 100644
--- a/src/app/views/edition-view/edition-routing.module.ts
+++ b/src/app/views/edition-view/edition-routing.module.ts
@@ -7,6 +7,7 @@ import { EditionOverviewComponent } from './edition-outlets/edition-overview.com
 import { IntroComponent } from './edition-outlets/intro';
 import { ReportComponent } from './edition-outlets/report';
 
+/* routes of the EditionModule */
 const editionRoutes: Routes = [
     {
         path: '',
@@ -26,16 +27,26 @@ const editionRoutes: Routes = [
     }
 ];
 
-@NgModule({
-    imports: [RouterModule.forChild(editionRoutes)],
-    exports: [RouterModule]
-})
-export class EditionRoutingModule {}
-
-export const routedComponents = [
+/**
+ * Routed components of the {@link EditionModule}:
+ * {@link IntroComponent}, {@link EditionDetailComponent},
+ * {@link ReportComponent}.
+ */
+export const routedEditionComponents = [
     EditionViewComponent,
     EditionDetailComponent,
     IntroComponent,
     EditionOverviewComponent,
     ReportComponent
 ];
+
+/**
+ * Edition module routing.
+ *
+ * It activates the editionRoutes.
+ */
+@NgModule({
+    imports: [RouterModule.forChild(editionRoutes)],
+    exports: [RouterModule]
+})
+export class EditionRoutingModule {}
diff --git a/src/app/views/edition-view/edition-view.component.html b/src/app/views/edition-view/edition-view.component.html
index a36a00ecf5..41c52a5b3a 100644
--- a/src/app/views/edition-view/edition-view.component.html
+++ b/src/app/views/edition-view/edition-view.component.html
@@ -3,4 +3,5 @@
 <!-- heading -->
 <awg-heading [title]="editionTitle" [id]="editionId"></awg-heading>
 
+<!-- edition routes -->
 <router-outlet></router-outlet>
diff --git a/src/app/views/edition-view/edition-view.component.ts b/src/app/views/edition-view/edition-view.component.ts
index 40f3da531d..e9167cb537 100644
--- a/src/app/views/edition-view/edition-view.component.ts
+++ b/src/app/views/edition-view/edition-view.component.ts
@@ -1,21 +1,59 @@
 import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 
+/**
+ * The EditionView component.
+ *
+ * It contains the edition view section of the app
+ * with a {@link HeadingComponent} and
+ * another router outlet for the edition routes.
+ */
 @Component({
     selector: 'awg-edition-view',
     templateUrl: './edition-view.component.html',
     styleUrls: ['./edition-view.component.css']
 })
 export class EditionViewComponent implements OnInit {
+    /**
+     * Public variable: editionTitle.
+     *
+     * It keeps the title of the edition view section.
+     */
     editionTitle = 'Beispieledition ausgewählter Skizzen zu <em>Vier Lieder</em> op. 12, Nr. 1';
+
+    /**
+     * Public variable: editionId.
+     *
+     * It keeps the id of the edition view section.
+     */
     editionId = 'edition';
 
+    /**
+     * Constructor of the EditionViewComponent.
+     *
+     * It declares a private Router instance.
+     *
+     * @param {Router} router Instance of the Angular router.
+     */
     constructor(private router: Router) {}
 
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {
         this.routeToSidenav();
     }
 
+    /**
+     * Public method: routeToSidenav.
+     *
+     * It activates the secondary outlet with the edition-info.
+     *
+     * @returns {void} Activates the edition-info side outlet.
+     */
     routeToSidenav(): void {
         // opens the side-info outlet while preserving the router fragment for scrolling
         this.router.navigate([{ outlets: { side: 'editionInfo' } }], {
diff --git a/src/app/views/edition-view/edition.module.ts b/src/app/views/edition-view/edition.module.ts
index 2f9a890268..76ff54cc51 100644
--- a/src/app/views/edition-view/edition.module.ts
+++ b/src/app/views/edition-view/edition.module.ts
@@ -4,10 +4,19 @@ import { SharedModule } from '@awg-shared/shared.module';
 import { EditionDetailModule } from './edition-outlets/edition-detail/edition-detail.module';
 import { ReportModule } from './edition-outlets/report/report.module';
 
-import { EditionRoutingModule, routedComponents } from './edition-routing.module';
+/* Routing Module */
+import { EditionRoutingModule, routedEditionComponents } from './edition-routing.module';
 
+/**
+ * The edition module.
+ *
+ * It embeds the edition components and their
+ * [routing definition]{@link EditionRoutingModule}
+ * as well as the {@link EditionDetailModule},
+ * {@link ReportModule} and {@link SharedModule}.
+ */
 @NgModule({
     imports: [SharedModule, EditionDetailModule, ReportModule, EditionRoutingModule],
-    declarations: [routedComponents]
+    declarations: [routedEditionComponents]
 })
 export class EditionModule {}
diff --git a/src/app/views/edition-view/models/convolute-folio-svg-output.model.ts b/src/app/views/edition-view/models/convolute-folio-svg-output.model.ts
deleted file mode 100644
index bec7516269..0000000000
--- a/src/app/views/edition-view/models/convolute-folio-svg-output.model.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import {
-    FolioCalculationPoint,
-    FolioCalculationLine,
-    FolioCalculationContentItem,
-    FolioCalculationSheet,
-    FolioCalculationSystems,
-    FolioCalculation
-} from './folio-calculation.model';
-
-export class ConvoluteFolioSvgFolio {
-    folioId: string;
-    upperLeftCorner: FolioCalculationPoint;
-    lowerRightCorner: FolioCalculationPoint;
-}
-
-export class ConvoluteFolioSvgSystems {
-    lineLabelArray: FolioCalculationPoint[];
-    lineArrays: FolioCalculationLine[][];
-}
-
-export class ConvoluteFolioSvgContentItem {
-    sigle: string;
-    measure: string;
-    upperLeftCorner: FolioCalculationPoint;
-    width: number;
-    height: number;
-    lineArray: FolioCalculationLine[];
-}
-
-export class ConvoluteFolioSvgOutput {
-    sheet: ConvoluteFolioSvgFolio;
-    systems: ConvoluteFolioSvgSystems;
-    contentItemsArray: ConvoluteFolioSvgContentItem[];
-
-    constructor(calculation: FolioCalculation) {
-        this.sheet = this.getSheet(calculation.sheet);
-        this.systems = this.getSystems(calculation.systems);
-        this.contentItemsArray = this.getContentItemsArray(calculation.contentItemsArray);
-    }
-
-    getSheet(calculatedSheet: FolioCalculationSheet): ConvoluteFolioSvgFolio {
-        let outputSheet = new ConvoluteFolioSvgFolio();
-
-        return (outputSheet = {
-            folioId: calculatedSheet.folioId,
-            upperLeftCorner: calculatedSheet.upperLeftCorner,
-            lowerRightCorner: calculatedSheet.lowerRightCorner
-        });
-    }
-
-    getSystems(calculatedSytems: FolioCalculationSystems): ConvoluteFolioSvgSystems {
-        let outputSystems = new ConvoluteFolioSvgSystems();
-
-        return (outputSystems = {
-            lineLabelArray: calculatedSytems.lineLabelArray,
-            lineArrays: calculatedSytems.lineArrays
-        });
-    }
-
-    getContentItemsArray(calculatedContentItems: FolioCalculationContentItem[]): ConvoluteFolioSvgContentItem[] {
-        const outputContentItemsArray: ConvoluteFolioSvgContentItem[] = [];
-
-        calculatedContentItems.forEach((calculatedContentItem: FolioCalculationContentItem) => {
-            let outputContentItem = new ConvoluteFolioSvgContentItem();
-
-            outputContentItem = {
-                sigle: calculatedContentItem.sigle,
-                measure: calculatedContentItem.measure,
-                upperLeftCorner: calculatedContentItem.current.corner.upperLeft,
-                width: calculatedContentItem.width,
-                height: calculatedContentItem.height,
-                lineArray: calculatedContentItem.lineArray
-            };
-
-            outputContentItemsArray.push(outputContentItem);
-        });
-        return outputContentItemsArray;
-    }
-}
diff --git a/src/app/views/edition-view/models/convolute-folio.model.ts b/src/app/views/edition-view/models/convolute-folio.model.ts
deleted file mode 100644
index 91f34f996d..0000000000
--- a/src/app/views/edition-view/models/convolute-folio.model.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-export class ConvoluteFolio {
-    folioId: string;
-    systems: string;
-    format: ConvoluteFolioFormat;
-    content: ConvoluteFolioContent[];
-}
-
-export class ConvoluteFolioFormat {
-    height: number;
-    width: number;
-}
-
-export class ConvoluteFolioContent {
-    sigle: string;
-    measure: string;
-    sectionPartition?: number;
-    sections?: ConvoluteFolioSection[];
-}
-
-export class ConvoluteFolioSection {
-    startSystem: number;
-    endSystem: number;
-    position?: number;
-}
diff --git a/src/app/views/edition-view/models/edition-svg-file.model.ts b/src/app/views/edition-view/models/edition-svg-file.model.ts
deleted file mode 100644
index 8cb4d9486b..0000000000
--- a/src/app/views/edition-view/models/edition-svg-file.model.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export class EditionSvgFile {
-    id: string;
-    svg: string;
-    image: string;
-    alt: string;
-}
diff --git a/src/app/views/edition-view/models/edition-svg-overlay.ts b/src/app/views/edition-view/models/edition-svg-overlay.ts
index 2591089c51..1280a49897 100644
--- a/src/app/views/edition-view/models/edition-svg-overlay.ts
+++ b/src/app/views/edition-view/models/edition-svg-overlay.ts
@@ -1,14 +1,44 @@
+/**
+ * The EditionSvgOverlayTypes enumeration.
+ *
+ * It stores the possible svg overlay types.
+ */
 export enum EditionSvgOverlayTypes {
     measure = 'Takt',
     system = 'System',
     item = 'Anmerkung'
 }
 
+/**
+ * The EditionSvgOverlay class.
+ *
+ * It is used in the context of the edition view
+ * to store the data of a svg overlay.
+ */
 export class EditionSvgOverlay {
+    /**
+     * The type of an svg overlay (EditionSvgOverlayTypes).
+     */
     type: EditionSvgOverlayTypes;
+
+    /**
+     * The id of an svg overlay.
+     */
     id: string;
+
+    /**
+     * The type label of an svg overlay.
+     */
     typeLabel?: string[];
 
+    /**
+     * Constructor of the EditionSvgOverlay class.
+     *
+     * It initializes the class with values from the EditionSvgOverlayTypes and an id.
+     *
+     * @param {EditionSvgOverlayTypes} type The given overlay type.
+     * @param {string} id The given id of the overlay.
+     */
     constructor(type: EditionSvgOverlayTypes, id: string) {
         this.type = type;
         this.id = id;
diff --git a/src/app/views/edition-view/models/edition-svg-sheet.model.ts b/src/app/views/edition-view/models/edition-svg-sheet.model.ts
new file mode 100644
index 0000000000..c731fbf0ba
--- /dev/null
+++ b/src/app/views/edition-view/models/edition-svg-sheet.model.ts
@@ -0,0 +1,28 @@
+/**
+ * The EditionSvgSheet class.
+ *
+ * It is used in the context of the edition view
+ * to store the data of a svg sheet
+ * from a svg sheet json file.
+ */
+export class EditionSvgSheet {
+    /**
+     * The sheet's id (string).
+     */
+    id: string;
+
+    /**
+     * The path to the svg file of the sheet.
+     */
+    svg: string;
+
+    /**
+     * The path to an alternative image file of the sheet.
+     */
+    image: string;
+
+    /**
+     * The alternative label for the sheet.
+     */
+    alt: string;
+}
diff --git a/src/app/views/edition-view/models/folio-calculation.model.ts b/src/app/views/edition-view/models/folio-calculation.model.ts
index c99605186a..e3db3b0d0a 100644
--- a/src/app/views/edition-view/models/folio-calculation.model.ts
+++ b/src/app/views/edition-view/models/folio-calculation.model.ts
@@ -1,11 +1,43 @@
-import { ConvoluteFolio, ConvoluteFolioContent, ConvoluteFolioSection } from './convolute-folio.model';
-import { FolioFormatOptions } from './folio-format-options.model';
-
+import { Folio, FolioContent, FolioSection } from './folio.model';
+import { FolioSettings } from './folio-settings.model';
+
+/**
+ * The FolioCalculationPoint class.
+ *
+ * It is used in the context of the edition folio convolutes
+ * to calculate the values of a point on the folio canvas.
+ *
+ * Exposed to be used throughout {@link EditionDetailModule}.
+ */
 export class FolioCalculationPoint {
+    /**
+     * The x value (in px) of a point.
+     */
     x: number;
+
+    /**
+     * The y value (in px) of a point.
+     */
     y: number;
+
+    /**
+     * Method: add.
+     *
+     * It adds x and y values (in px) to an existing point.
+     *
+     * @param {number} addX Add to x value.
+     * @param {number} addY Add to y value.
+     */
     add: (addX: number, addY: number) => FolioCalculationPoint;
 
+    /**
+     * Constructor of the FolioCalculationPoint class.
+     *
+     * It initializes the class with values for x and y (in px).
+     *
+     * @param {number} x The given x value (in px).
+     * @param {number} y The given y value (in px).
+     */
     constructor(x: number, y: number) {
         this.x = x;
         this.y = y;
@@ -17,106 +49,426 @@ export class FolioCalculationPoint {
     }
 }
 
+/**
+ * The FolioCalculationLine class.
+ *
+ * It is used in the context of the edition folio convolutes
+ * to calculate the values of a line on the folio canvas.
+ *
+ * Exposed to be used throughout {@link EditionDetailModule}.
+ */
 export class FolioCalculationLine {
+    /**
+     * The starting point of a line (FolioCalculationPoint).
+     */
     startPoint: FolioCalculationPoint;
+
+    /**
+     * The ending point of a line (FolioCalculationPoint).
+     */
     endPoint: FolioCalculationPoint;
 
-    constructor(point1: FolioCalculationPoint, point2: FolioCalculationPoint) {
-        this.startPoint = point1;
-        this.endPoint = point2;
+    /**
+     * Constructor of the FolioCalculationLine class.
+     *
+     * It initializes the class with two points for start and end.
+     *
+     * @param {FolioCalculationPoint} startPoint The given starting point.
+     * @param {FolioCalculationPoint} endPoint The given ending point.
+     */
+    constructor(startPoint: FolioCalculationPoint, endPoint: FolioCalculationPoint) {
+        this.startPoint = startPoint;
+        this.endPoint = endPoint;
     }
 }
 
-export class FolioCalculationContentItemCorner {
-    upperLeft: FolioCalculationPoint;
-    lowerLeft: FolioCalculationPoint;
-    upperRight: FolioCalculationPoint;
-    lowerRight: FolioCalculationPoint;
+/**
+ * The FolioCalculationContentItemCornerPoints class.
+ *
+ * It is used in the context of the edition folio convolutes
+ * to calculate the values of a content item's corners on the folio canvas.
+ *
+ * Not exposed, only called internally from {@link FolioCalculation}.
+ */
+class FolioCalculationContentItemCornerPoints {
+    /**
+     * The upper left corner point of a content item (FolioCalculationPoint).
+     */
+    upperLeftCorner: FolioCalculationPoint;
+
+    /**
+     * The lower left corner point of a content item (FolioCalculationPoint).
+     */
+    lowerLeftCorner: FolioCalculationPoint;
+
+    /**
+     * The upper right corner point of a content item (FolioCalculationPoint).
+     */
+    upperRightCorner: FolioCalculationPoint;
+
+    /**
+     * The lower right corner point of a content item (FolioCalculationPoint).
+     */
+    lowerRightCorner: FolioCalculationPoint;
+
+    /**
+     * Constructor of the FolioCalculationContentItemCornerPoints class.
+     *
+     * It initializes the class with four points
+     * for upper and lower left and upper and lower right corners.
+     *
+     * @param {FolioCalculationContentItem} calculatedContentItem The given calculated content item.
+     */
+    constructor(calculatedContentItem: FolioCalculationContentItem) {
+        this.upperLeftCorner = new FolioCalculationPoint(calculatedContentItem.startX, calculatedContentItem.startY);
+        this.lowerLeftCorner = new FolioCalculationPoint(calculatedContentItem.startX, calculatedContentItem.endY);
+        this.upperRightCorner = new FolioCalculationPoint(calculatedContentItem.endX, calculatedContentItem.startY);
+        this.lowerRightCorner = new FolioCalculationPoint(calculatedContentItem.endX, calculatedContentItem.endY);
+    }
 }
 
-export class FolioCalculationContentItemCache {
-    section: ConvoluteFolioSection;
-    corner: FolioCalculationContentItemCorner;
+/**
+ * The FolioCalculationContentItemCache class.
+ *
+ * It is used in the context of the edition folio convolutes
+ * to calculate the values of a content item cache on the folio canvas.
+ *
+ * Not exposed, only called internally from {@link FolioCalculation}.
+ */
+class FolioCalculationContentItemCache {
+    /**
+     * The section of a content item (FolioSection).
+     */
+    section: FolioSection;
+
+    /**
+     * The corner points of a content item (FolioCalculationContentItemCornerPoints).
+     */
+    cornerPoints: FolioCalculationContentItemCornerPoints;
 }
 
+/**
+ * The FolioCalculationContentItem class.
+ *
+ * It is used in the context of the edition folio convolutes
+ * to calculate the values of a content item on the folio canvas.
+ *
+ * Exposed to be used throughout {@link EditionDetailModule}.
+ */
 export class FolioCalculationContentItem {
+    /**
+     * The correction value for the offset of the content item (number).
+     */
     offsetCorrection: number;
+
+    /**
+     * The width including offset of the content item (number).
+     */
     widthWithOffset: number;
+
+    /**
+     * The width of the content item (number).
+     */
     width: number;
+
+    /**
+     * The height of the content item (number).
+     */
     height: number;
+
+    /**
+     * The system range of the content item (number).
+     */
     systemRange: number;
+
+    /**
+     * The start position (x-value) of the index of the content item (number).
+     */
     startXIndex: number;
+
+    /**
+     * The start position (y-value) of the index of the content item (number).
+     */
     startYIndex: number;
+
+    /**
+     * The start position (x-value) of the content item (number).
+     */
     startX: number;
+
+    /**
+     * The end position (x-value) of the content item (number).
+     */
     endX: number;
+
+    /**
+     * The start position (y-value) of the content item (number).
+     */
     startY: number;
+
+    /**
+     * The end position (y-value) of the content item (number).
+     */
     endY: number;
+
+    /**
+     * The line array of the content item (FolioCalculationLine[]).
+     */
     lineArray: FolioCalculationLine[];
+
+    /**
+     * The current content item (FolioCalculationContentItemCache).
+     */
     current: FolioCalculationContentItemCache;
+
+    /**
+     * The previous content item (FolioCalculationContentItemCache).
+     */
     previous: FolioCalculationContentItemCache;
+
+    /**
+     * The optional label for the sigle of the content item (string).
+     */
     sigle?: string;
+
+    /**
+     * The optional label for the measure of the content item (string).
+     */
     measure?: string;
 }
 
+/**
+ * The FolioCalculationSheet class.
+ *
+ * It is used in the context of the edition folio convolutes
+ * to calculate the values of a sheet on the folio canvas.
+ *
+ * Exposed to be used throughout {@link EditionDetailModule}.
+ */
 export class FolioCalculationSheet {
+    /**
+     * The offset of the sheet (FolioCalculationPoint).
+     */
     offset: FolioCalculationPoint;
+
+    /**
+     * The width of the sheet (number).
+     */
     width: number;
+
+    /**
+     * The height of the sheet (number).
+     */
     height: number;
+
+    /**
+     * The optional folio id of the sheet (string).
+     */
     folioId?: string;
+
+    /**
+     * The optional upper left corner point of the sheet (FolioCalculationPoint).
+     */
     upperLeftCorner?: FolioCalculationPoint;
+
+    /**
+     * The optional lower right corner point of the sheet (FolioCalculationPoint).
+     */
     lowerRightCorner?: FolioCalculationPoint;
+
+    /**
+     * Constructor of the FolioCalculationSheet class.
+     *
+     * It initializes the class with values from folio settings, the folio id and zoom factor.
+     *
+     * @param {FolioSettings} folioSettings The given folio settings.
+     * @param {string} folioId The given folio id.
+     */
+    constructor(folioSettings: FolioSettings, folioId: string) {
+        this.folioId = folioId;
+        this.offset = new FolioCalculationPoint(folioSettings.initialOffsetX, folioSettings.initialOffsetY);
+        this.width = folioSettings.formatX * folioSettings.factor;
+        this.height = folioSettings.formatY * folioSettings.factor;
+        this.upperLeftCorner = this.offset;
+        this.lowerRightCorner = new FolioCalculationPoint(this.width, this.height);
+    }
 }
 
+/**
+ * The FolioCalculationSystems class.
+ *
+ * It is used in the context of the edition folio convolutes
+ * to calculate the values of the systems on the folio canvas.
+ *
+ * Exposed to be used throughout {@link EditionDetailModule}.
+ */
 export class FolioCalculationSystems {
+    /**
+     * The width of the systems (number).
+     */
     width: number;
+
+    /**
+     * The left margin of the systems (number).
+     */
     leftMargin: number;
+
+    /**
+     * The right margin of the systems (number).
+     */
     rightMargin: number;
+
+    /**
+     * The upper margin of the systems (number).
+     */
     upperMargin: number;
+
+    /**
+     * The margins of the systems (number).
+     */
     margins: number;
+
+    /**
+     * The start position (x-value) of the systems (number).
+     */
     startX: number;
+
+    /**
+     * The end position (x-value) of the systems (number).
+     */
     endX: number;
+
+    /**
+     * The start position (y-value) of the systems (number).
+     */
     startY: number;
+
+    /**
+     * The array of y-value arrays for the systems (number).
+     */
     yArray: number[][];
+
+    /**
+     * The start position (x-value) of the labels of the systems (number).
+     */
     labelStartX: number;
+
+    /**
+     * The correction value for the offset of the labels of the systems (number).
+     */
     labelOffsetCorrection: number;
+
+    /**
+     * The optional line label array of the systems (FolioCalculationPoint[]).
+     */
     lineLabelArray?: FolioCalculationPoint[];
+
+    /**
+     * The optional array of line arrays of the systems (FolioCalculationLine[][]).
+     */
     lineArrays?: FolioCalculationLine[][];
 }
 
+/**
+ * The FolioCalculation class.
+ *
+ * It is used in the context of the edition folio convolutes
+ * to calculate all the values needed for the folio canvas.
+ *
+ * Exposed to be used throughout {@link EditionDetailModule}.
+ */
 export class FolioCalculation {
+    /**
+     * The correction value for the offset of the folio items (number).
+     */
     itemsOffsetCorrection: number;
+
+    /**
+     * The number of systems (number).
+     */
     numberOfSystems: number;
+
+    /**
+     * The zoom factor (number).
+     */
     zoomFactor: number;
+
+    /**
+     * The calculated values for the sheet
+     * of a folio (FolioCalculationSheet).
+     */
     sheet: FolioCalculationSheet;
+
+    /**
+     * The calculated values for the systems
+     * of a folio (FolioCalculationSystems).
+     */
     systems: FolioCalculationSystems;
+
+    /**
+     * The calculated values for the array of content items
+     * of a folio (FolioCalculationContentItem[]).
+     */
     contentItemsArray: FolioCalculationContentItem[];
 
-    constructor(options: FolioFormatOptions, folioData: ConvoluteFolio, itemsOffsetCorrection?: number) {
+    /**
+     * Constructor of the FolioCalculation class.
+     *
+     * It initializes the class with values from folio settings, folio data and itemsOffset correction.
+     *
+     * @param {FolioSettings} folioSettings The given folio settings.
+     * @param {Folio} folioData The given folio data.
+     * @param {number} [itemsOffsetCorrection] The optional given itemsOffset correction.
+     */
+    constructor(folioSettings: FolioSettings, folioData: Folio, itemsOffsetCorrection?: number) {
         this.itemsOffsetCorrection = itemsOffsetCorrection ? itemsOffsetCorrection : 0;
         this.numberOfSystems = folioData.systems ? parseInt(folioData.systems, 10) : 0;
-        this.zoomFactor = options.factor;
+        this.zoomFactor = folioSettings.factor;
 
-        this.sheet = this.getSheet(options, folioData.folioId);
-        this.systems = this.getSystems();
-        this.contentItemsArray = this.getContentArray(folioData.content);
+        this.calculateFolio(folioSettings, folioData);
     }
 
-    getSheet(options: FolioFormatOptions, folioId: string): FolioCalculationSheet {
-        // init
-        const calculatedSheet = new FolioCalculationSheet();
-
-        // set calculated values for offsets (= upper left starting point), width & height
-        calculatedSheet.folioId = folioId;
-        calculatedSheet.offset = new FolioCalculationPoint(options.initialOffsetX, options.initialOffsetY);
-        calculatedSheet.width = options.formatX * this.zoomFactor;
-        calculatedSheet.height = options.formatY * this.zoomFactor;
-        calculatedSheet.upperLeftCorner = calculatedSheet.offset;
-        calculatedSheet.lowerRightCorner = new FolioCalculationPoint(calculatedSheet.width, calculatedSheet.height);
+    /**
+     * Private method: calculateFolio.
+     *
+     * It calls the calculation methods for the sheet,
+     * systems and contentItemsArray of a folio.
+     *
+     * @param {FolioSettings} folioSettings The given folio settings.
+     * @param {Folio} folioData The given folio data.
+     *
+     * @returns {void} Sets the sheet, systems and contentItemsArray variables.
+     */
+    private calculateFolio(folioSettings: FolioSettings, folioData: Folio): void {
+        this.sheet = this.calculateSheet(folioSettings, folioData.folioId);
+        this.systems = this.calculateSystems();
+        this.contentItemsArray = this.calculateContentArray(folioData.content);
+    }
 
-        return calculatedSheet;
+    /**
+     * Private method: calculateSheet.
+     *
+     * It returns a FolioCalculationSheet class that provides
+     * all the calculated values for the sheet of a folio.
+     *
+     * @param {FolioSettings} folioSettings The given folio settings.
+     * @param {string} folioId The given folio id.
+     *
+     * @returns {FolioCalculationSheet} The calculated sheet.
+     */
+    private calculateSheet(folioSettings: FolioSettings, folioId: string): FolioCalculationSheet {
+        return new FolioCalculationSheet(folioSettings, folioId);
     }
 
-    getSystems(): FolioCalculationSystems {
+    /**
+     * Private method: calculateSystems.
+     *
+     * It returns a FolioCalculationSystems class that provides
+     * all the calculated values for the systems of a folio.
+     *
+     * @returns {FolioCalculationSystems} The calculated systems.
+     */
+    private calculateSystems(): FolioCalculationSystems {
         // init
         const calculatedSystems = new FolioCalculationSystems();
 
@@ -169,18 +521,26 @@ export class FolioCalculation {
         return calculatedSystems;
     }
 
-    getContentArray(contents: ConvoluteFolioContent[]): FolioCalculationContentItem[] {
+    /**
+     * Private method: calculateContentArray.
+     *
+     * It provides all the calculated values for the content items of a folio.
+     *
+     * @param {FolioContent[]} contents The given folio contents.
+     * @returns {FolioCalculationContentItem[]} The array of the calculated content items.
+     */
+    private calculateContentArray(contents: FolioContent[]): FolioCalculationContentItem[] {
         // init
         const calculatedContentItems: FolioCalculationContentItem[] = [];
 
         // iterate over items
-        contents.forEach((content: ConvoluteFolioContent) => {
+        contents.forEach((content: FolioContent) => {
             // init
             const calculatedContentItem: FolioCalculationContentItem = new FolioCalculationContentItem();
             calculatedContentItem.previous = new FolioCalculationContentItemCache();
             calculatedContentItem.current = new FolioCalculationContentItemCache();
-            calculatedContentItem.previous.section = new ConvoluteFolioSection(); // reset prevSection
-            calculatedContentItem.current.section = new ConvoluteFolioSection(); // reset currentSection
+            calculatedContentItem.previous.section = new FolioSection(); // reset prevSection
+            calculatedContentItem.current.section = new FolioSection(); // reset currentSection
             let sectionPartition = 1; // default: 1 section
 
             // offsetCorrection to avoid collision between items
@@ -200,15 +560,17 @@ export class FolioCalculation {
                     return;
                 }
                 // iterate over sections
-                content.sections.forEach((section: ConvoluteFolioSection, sectionIndex: number) => {
+                content.sections.forEach((section: FolioSection, sectionIndex: number) => {
                     // set section cache
                     this.setContentItemSectionCache(calculatedContentItem, section);
 
-                    // calculate main values for item
-                    this.calculateContentItemMainValues(calculatedContentItem, section, sectionPartition, content);
+                    // set main values for item
+                    this.setContentItemMainValues(calculatedContentItem, section, sectionPartition, content);
 
                     // set item corner points
-                    calculatedContentItem.current.corner = this.setContentItemCornerPoints(calculatedContentItem);
+                    calculatedContentItem.current.cornerPoints = new FolioCalculationContentItemCornerPoints(
+                        calculatedContentItem
+                    );
 
                     // set item lines
                     calculatedContentItem.lineArray = this.setContentItemLineArray(
@@ -231,11 +593,22 @@ export class FolioCalculation {
         return calculatedContentItems;
     }
 
-    private calculateContentItemMainValues(
+    /**
+     * Private helper method for calculateContentArray: setContentItemMainValues.
+     *
+     * It calculates the main values for the content items of a folio.
+     *
+     * @param {FolioCalculationContentItem} calculatedContentItem The given calculated content item.
+     * @param {FolioSection} section The given section.
+     * @param {number} sectionPartition The given section partition.
+     * @param {FolioContent} item The given folio content.
+     * @returns {void} Calculates and sets the main values of the calculatedContentItem.
+     */
+    private setContentItemMainValues(
         calculatedContentItem: FolioCalculationContentItem,
-        section: ConvoluteFolioSection,
+        section: FolioSection,
         sectionPartition: number,
-        item: ConvoluteFolioContent
+        item: FolioContent
     ): void {
         if (!calculatedContentItem) {
             return;
@@ -295,9 +668,18 @@ export class FolioCalculation {
         calculatedContentItem.endY = this.round(calculatedContentItem.startY + calculatedContentItem.height, 2);
     }
 
+    /**
+     * Private helper method for calculateContentArray: setContentItemSectionCache.
+     *
+     * It caches the current and previous section of a calculated content item.
+     *
+     * @param {FolioCalculationContentItem} calculatedContentItem The given calculated content item.
+     * @param {FolioSection} section The given section.
+     * @returns {void} Caches the current and previous section of the calculatedContentItem.
+     */
     private setContentItemSectionCache(
         calculatedContentItem: FolioCalculationContentItem,
-        section: ConvoluteFolioSection
+        section: FolioSection
     ): void {
         if (!calculatedContentItem) {
             return;
@@ -305,41 +687,36 @@ export class FolioCalculation {
 
         if (calculatedContentItem.current['section']) {
             calculatedContentItem.previous.section = calculatedContentItem.current.section;
-            calculatedContentItem.previous.corner = calculatedContentItem.current.corner;
+            calculatedContentItem.previous.cornerPoints = calculatedContentItem.current.cornerPoints;
         }
         calculatedContentItem.current.section = section;
     }
 
-    private setContentItemCornerPoints(
-        calculatedContentItem: FolioCalculationContentItem
-    ): FolioCalculationContentItemCorner {
-        if (!calculatedContentItem) {
-            return;
-        }
-
-        const corner: FolioCalculationContentItemCorner = {
-            upperLeft: new FolioCalculationPoint(calculatedContentItem.startX, calculatedContentItem.startY),
-            lowerLeft: new FolioCalculationPoint(calculatedContentItem.startX, calculatedContentItem.endY),
-            upperRight: new FolioCalculationPoint(calculatedContentItem.endX, calculatedContentItem.startY),
-            lowerRight: new FolioCalculationPoint(calculatedContentItem.endX, calculatedContentItem.endY)
-        };
-        return corner;
-    }
-
+    /**
+     * Private helper method for calculateContentArray: setContentItemLineArray.
+     *
+     * It calculates the line array for the content items of a folio.
+     *
+     * @param {FolioCalculationContentItem} calculatedContentItem The given calculated content item.
+     * @param {number} sectionsLength The given section's length.
+     * @param {number} sectionIndex The given section index.
+     * @param {number} sectionPartition The given section partition.
+     * @returns {FolioCalculationLine[]} The calculated line array.
+     */
     private setContentItemLineArray(
         calculatedContentItem: FolioCalculationContentItem,
         sectionsLength: number,
         sectionIndex: number,
         sectionPartition: number
     ): FolioCalculationLine[] {
-        if (!calculatedContentItem.current.corner) {
+        if (!calculatedContentItem.current.cornerPoints) {
             return;
         }
 
         // init
         const lineArray: FolioCalculationLine[] = [];
         const lines: string[] = [];
-        const corner = calculatedContentItem.current.corner; // shortcut
+        const cornerPoints = calculatedContentItem.current.cornerPoints; // shortcut
         const correctionValue = this.itemsOffsetCorrection / 2; // offset correction value
 
         // decide which lines to add to array depending on sectionsLength and position in sectionIndex
@@ -352,8 +729,8 @@ export class FolioCalculation {
                 // first item part
 
                 // offset correction
-                this.setContentItemOffsetCorrection(corner.upperRight, correctionValue);
-                this.setContentItemOffsetCorrection(corner.lowerRight, correctionValue);
+                this.setContentItemOffsetCorrection(cornerPoints.upperRightCorner, correctionValue);
+                this.setContentItemOffsetCorrection(cornerPoints.lowerRightCorner, correctionValue);
 
                 // add upper & lower horizontal & left vertical line to line array
                 lines.push('uH', 'lH', 'lV');
@@ -361,8 +738,8 @@ export class FolioCalculation {
                 // last item part
 
                 // offset correction
-                this.setContentItemOffsetCorrection(corner.upperLeft, -correctionValue);
-                this.setContentItemOffsetCorrection(corner.lowerLeft, -correctionValue);
+                this.setContentItemOffsetCorrection(cornerPoints.upperLeftCorner, -correctionValue);
+                this.setContentItemOffsetCorrection(cornerPoints.lowerLeftCorner, -correctionValue);
 
                 // add upper & lower horizontal & right vertical line to line array
                 lines.push('uH', 'lH', 'rV');
@@ -375,10 +752,10 @@ export class FolioCalculation {
                 // middle item part
 
                 // offset correction
-                this.setContentItemOffsetCorrection(corner.upperRight, correctionValue);
-                this.setContentItemOffsetCorrection(corner.lowerRight, correctionValue);
-                this.setContentItemOffsetCorrection(corner.upperLeft, -correctionValue);
-                this.setContentItemOffsetCorrection(corner.lowerLeft, -correctionValue);
+                this.setContentItemOffsetCorrection(cornerPoints.upperRightCorner, correctionValue);
+                this.setContentItemOffsetCorrection(cornerPoints.lowerRightCorner, correctionValue);
+                this.setContentItemOffsetCorrection(cornerPoints.upperLeftCorner, -correctionValue);
+                this.setContentItemOffsetCorrection(cornerPoints.lowerLeftCorner, -correctionValue);
 
                 // add upper and lower horizontal line to line array
                 lines.push('uH', 'lH');
@@ -391,10 +768,19 @@ export class FolioCalculation {
         }
 
         // create lines
-        const upperHorizontalLine = new FolioCalculationLine(corner.upperLeft, corner.upperRight);
-        const lowerHorizontalLine = new FolioCalculationLine(corner.lowerLeft, corner.lowerRight);
-        const leftVerticalLine = new FolioCalculationLine(corner.upperLeft, corner.lowerLeft);
-        const rightVerticalLine = new FolioCalculationLine(corner.upperRight, corner.lowerRight);
+        const upperHorizontalLine = new FolioCalculationLine(
+            cornerPoints.upperLeftCorner,
+            cornerPoints.upperRightCorner
+        );
+        const lowerHorizontalLine = new FolioCalculationLine(
+            cornerPoints.lowerLeftCorner,
+            cornerPoints.lowerRightCorner
+        );
+        const leftVerticalLine = new FolioCalculationLine(cornerPoints.upperLeftCorner, cornerPoints.lowerLeftCorner);
+        const rightVerticalLine = new FolioCalculationLine(
+            cornerPoints.upperRightCorner,
+            cornerPoints.lowerRightCorner
+        );
 
         lines.forEach((line: string) => {
             switch (line) {
@@ -416,13 +802,22 @@ export class FolioCalculation {
         return lineArray;
     }
 
+    /**
+     * Private helper method for calculateContentArray: checkForConnectorLine.
+     *
+     * It calculates the connector lines for the content items of a folio.
+     *
+     * @param {FolioCalculationContentItem} calculatedContentItem The given calculated content item.
+     * @param {number} lineArray The given calculated line array.
+     * @returns {void} Sets the connector lines of the calculatedContentItem..
+     */
     private checkForConnectorLine(
         calculatedContentItem: FolioCalculationContentItem,
         lineArray: FolioCalculationLine[]
     ): void {
         // init
-        const currentSection: ConvoluteFolioSection = calculatedContentItem.current.section;
-        const prevSection: ConvoluteFolioSection = calculatedContentItem.previous.section;
+        const currentSection: FolioSection = calculatedContentItem.current.section;
+        const prevSection: FolioSection = calculatedContentItem.previous.section;
 
         // check if sections exist
         if (
@@ -437,52 +832,83 @@ export class FolioCalculation {
         if (currentSection.startSystem !== prevSection.startSystem) {
             // draw upper connector
             const connectorLine: FolioCalculationLine = new FolioCalculationLine(
-                calculatedContentItem.previous.corner.upperRight,
-                calculatedContentItem.current.corner.upperLeft
+                calculatedContentItem.previous.cornerPoints.upperRightCorner,
+                calculatedContentItem.current.cornerPoints.upperLeftCorner
             );
             lineArray.push(connectorLine);
         }
         if (currentSection.endSystem !== prevSection.endSystem) {
             // draw lower connector
             const connectorLine: FolioCalculationLine = new FolioCalculationLine(
-                calculatedContentItem.previous.corner.lowerRight,
-                calculatedContentItem.current.corner.lowerLeft
+                calculatedContentItem.previous.cornerPoints.lowerRightCorner,
+                calculatedContentItem.current.cornerPoints.lowerLeftCorner
             );
             lineArray.push(connectorLine);
         }
     }
 
-    // sets the offsetCorrection for an item
-    private setContentItemOffsetCorrection(cornerPoint: FolioCalculationPoint, correctionX: number) {
+    /**
+     * Private helper method for calculateContentArray: setContentItemOffsetCorrection.
+     *
+     * It sets the offsetCorrection for a calculated point of a content item of a folio.
+     *
+     * @param {FolioCalculationPoint} cornerPoint The given calculated point.
+     * @param {number} correctionX The given correction value for x (in px).
+     * @returns {void} Sets the offsetCorrection for a calculatedContentItem.
+     */
+    private setContentItemOffsetCorrection(cornerPoint: FolioCalculationPoint, correctionX: number): void {
         cornerPoint = cornerPoint.add(correctionX, 0);
     }
 
-    // calculates the start position of an item
+    /**
+     * Private helper method for calculateContentArray: getContentItemStart.
+     *
+     * It calculates the start position of a content item of a folio.
+     *
+     * @param {number} offset The given offset.
+     * @param {number} index The given index position (offset * index -->
+     * (X: start at item 1, 2, 3 etc; Y: start at system line 1, 2, 3 etc.)).
+     * @param {number} systemStart The given horizontal(X) or vertical (Y) systemsMargins.
+     * @param {number} [offsetCorrection] The optional given offset correction value (mostly needed to center items).
+     * @returns {number} The start position for a calculatedContentItem.
+     */
     private getContentItemStart(offset: number, index: number, systemStart: number, offsetCorrection?: number): number {
-        // @offset * index (X: start at item 1, 2, 3 etc; Y: start at system line 1, 2, 3 etc.)
-        // @systemStart: add horizontal(X) or vertical (Y) systemsMargins
-        // @offsetCorrection: mostly needed to center items
         let itemValue = systemStart + offset * index;
         if (offsetCorrection) {
             itemValue += offsetCorrection;
         }
-        const itemStart = this.round(parseFloat(itemValue.toString()), 2);
-        return itemStart;
+        return this.round(parseFloat(itemValue.toString()), 2);
     }
 
-    // calculates the start position of the systems
-    private getSystemYArray(offset: number, systemStart: number, offsetCorrection?: number): number[][] {
+    /**
+     * Private helper method for calculateSystems: getSystemYArray.
+     *
+     * It calculates the array of start positions of the systems of a folio.
+     *
+     * @param {number} offset The given offset.
+     * @param {number} systemStartY The given (Y) systemsMargins (begin of sheet plus upper margin).
+     * @param {number} [offsetCorrection] The optional given offset correction value (mostly needed to center items).
+     * @returns {number[][]} The array of start position arrays (Y values) for the calculatedSystems.
+     */
+    private getSystemYArray(offset: number, systemStartY: number, offsetCorrection?: number): number[][] {
         const arr = [];
         // iterate over systems and get their start position
         for (let i = 0; i < this.numberOfSystems; i++) {
             // use the same method as for items to populate the systems array
-            const yStartValue = this.getContentItemStart(offset, i, systemStart, offsetCorrection);
+            const yStartValue = this.getContentItemStart(offset, i, systemStartY, offsetCorrection);
             arr[i] = this.getSystemLineArray(yStartValue);
         }
         return arr;
     }
 
-    // calculates the start position of the lines per system
+    /**
+     * Private helper method for calculateSystems: getSystemLineArray.
+     *
+     * It calculates the start position of the lines per system of a folio.
+     *
+     * @param {number} y The Y start value of the first line of a system.
+     * @returns {number[]} The start position array (Y values) of a system.
+     */
     private getSystemLineArray(y: number): number[] {
         if (!y) {
             return;
@@ -498,11 +924,17 @@ export class FolioCalculation {
         return lineArray;
     }
 
-    /******************
-     * round a number with a given number of decimals
+    /**
+     * Private helper method for folio calculation model: round.
+     *
+     * It rounds a number to a set number of decimal places.
+     * JS in-built round-method is sometimes not correct,
+     * see: {@link http://www.jacklmoore.com/notes/rounding-in-javascript/}.
+     *
+     * @param {number} value The input value to be rounded.
+     * @param {number} decimals The number of decimal places to round to.
+     * @returns {number} The rounded number.
      */
-    // in-built round-method is sometimes not correct
-    // see: http://www.jacklmoore.com/notes/rounding-in-javascript/
     private round(value: number, decimals: number): number {
         if (Number.isNaN(value)) {
             return;
diff --git a/src/app/views/edition-view/models/folio-format-options.model.ts b/src/app/views/edition-view/models/folio-format-options.model.ts
deleted file mode 100644
index 10c9acd543..0000000000
--- a/src/app/views/edition-view/models/folio-format-options.model.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export class FolioFormatOptions {
-    factor: number;
-    formatX: number;
-    formatY: number;
-    initialOffsetX: number;
-    initialOffsetY: number;
-    numberOfFolios: number;
-}
diff --git a/src/app/views/edition-view/models/folio-settings.model.ts b/src/app/views/edition-view/models/folio-settings.model.ts
new file mode 100644
index 0000000000..d321e5fb63
--- /dev/null
+++ b/src/app/views/edition-view/models/folio-settings.model.ts
@@ -0,0 +1,36 @@
+/**
+ * The folio settings class.
+ *
+ * It is used to store the basic settings of the edition folios.
+ */
+export class FolioSettings {
+    /**
+     * The zoom factor to be applied.
+     */
+    factor: number;
+
+    /**
+     * The x value (width) of the folio format.
+     */
+    formatX: number;
+
+    /**
+     * The y value (height) of the folio format.
+     */
+    formatY: number;
+
+    /**
+     * The initial offset (x-position) to be applied.
+     */
+    initialOffsetX: number;
+
+    /**
+     * The initial offset (y-position) to be applied.
+     */
+    initialOffsetY: number;
+
+    /**
+     * The number of folios.
+     */
+    numberOfFolios: number;
+}
diff --git a/src/app/views/edition-view/models/folio-svg-data.model.ts b/src/app/views/edition-view/models/folio-svg-data.model.ts
new file mode 100644
index 0000000000..bf0d9008b3
--- /dev/null
+++ b/src/app/views/edition-view/models/folio-svg-data.model.ts
@@ -0,0 +1,202 @@
+import {
+    FolioCalculationPoint,
+    FolioCalculationLine,
+    FolioCalculationContentItem,
+    FolioCalculationSheet,
+    FolioCalculationSystems,
+    FolioCalculation
+} from './folio-calculation.model';
+
+/**
+ * The FolioSvgSheet class.
+ *
+ * It is used in the context of the edition folio convolutes
+ * to store and expose the svg data for the sheet of a folio.
+ *
+ * Not exposed, only called internally from {@link FolioSvgData}.
+ */
+class FolioSvgSheet {
+    /**
+     * The folio's id (string).
+     */
+    folioId: string;
+
+    /**
+     * The upper left corner of a folio (FolioCalculationPoint).
+     *
+     * It contains the calculated upper left point (in px)
+     * to draw the svg of the sheet of a folio.
+     */
+    upperLeftCorner: FolioCalculationPoint;
+
+    /**
+     * The lower right corner (in px) of a folio (FolioCalculationPoint).
+     *
+     * It contains the calculated lower right point (in px)
+     * to draw the svg of the sheet of a folio.
+     */
+    lowerRightCorner: FolioCalculationPoint;
+
+    /**
+     * Constructor of the FolioSvgSheet class.
+     *
+     * It initializes the class with values from the folio sheet calculation.
+     *
+     * @param {FolioCalculationSheet} calculatedSheet The given calculated folio sheet.
+     */
+    constructor(calculatedSheet: FolioCalculationSheet) {
+        this.folioId = calculatedSheet.folioId;
+        this.upperLeftCorner = calculatedSheet.upperLeftCorner;
+        this.lowerRightCorner = calculatedSheet.lowerRightCorner;
+    }
+}
+
+/**
+ * The FolioSvgSystems class.
+ *
+ * It is used in the context of the edition folio convolutes
+ * to store the svg data for the systems of a folio.
+ *
+ * Not exposed, only called internally from {@link FolioSvgData}.
+ */
+class FolioSvgSystems {
+    /**
+     * The line label array of a folio (FolioCalculationPoint[]).
+     *
+     * It contains all calculated labels and their positions (in px)
+     * to draw the svg of the systems of a folio.
+     */
+    lineLabelArray: FolioCalculationPoint[];
+
+    /**
+     * The array of line arrays of a folio (FolioCalculationLine[][]).
+     *
+     * It contains all calculated lines and their positions (in px)
+     * to draw the svg of the systems of a folio.
+     */
+    lineArrays: FolioCalculationLine[][];
+
+    /**
+     * Constructor of the FolioSvgSystems class.
+     *
+     * It initializes the class with values from the folio system calculation.
+     *
+     * @param {FolioCalculationSystems} calculatedSystems The given calculated folio systems.
+     */
+    constructor(calculatedSystems: FolioCalculationSystems) {
+        this.lineLabelArray = calculatedSystems.lineLabelArray;
+        this.lineArrays = calculatedSystems.lineArrays;
+    }
+}
+
+/**
+ * The FolioSvgContentItem class.
+ *
+ * It is used in the context of the edition folio convolutes
+ * to store the svg data for the content item of a folio.
+ *
+ * Not exposed, only called internally from {@link FolioSvgData}.
+ */
+class FolioSvgContentItem {
+    /**
+     * The sigle for the label of a content item (string).
+     */
+    sigle: string;
+
+    /**
+     * The measure for the label of a content item (string).
+     */
+    measure: string;
+
+    /**
+     * The upper left corner of a content item (FolioCalculationPoint).
+     *
+     * It contains the calculated upper left corner point (in px)
+     * to draw the svg of a content item of a folio.
+     */
+    upperLeftCorner: FolioCalculationPoint;
+
+    /**
+     * The width of a content item (number).
+     */
+    width: number;
+
+    /**
+     * The height of a content item (number).
+     */
+    height: number;
+
+    /**
+     * The line array of a content item (FolioCalculationLine[]).
+     *
+     * It contains all calculated lines and their positions (in px)
+     * to draw the svg of the content item of a folio.
+     */
+    lineArray: FolioCalculationLine[];
+
+    /**
+     * Constructor of the FolioSvgContentItem class.
+     *
+     * It initializes the class with values from the folio content item calculation.
+     *
+     * @param {FolioCalculationContentItem} calculatedContentItem The given calculated folio content item.
+     */
+    constructor(calculatedContentItem: FolioCalculationContentItem) {
+        this.sigle = calculatedContentItem.sigle;
+        this.measure = calculatedContentItem.measure;
+        this.upperLeftCorner = calculatedContentItem.current.cornerPoints.upperLeftCorner;
+        this.width = calculatedContentItem.width;
+        this.height = calculatedContentItem.height;
+        this.lineArray = calculatedContentItem.lineArray;
+    }
+}
+
+/**
+ * The FolioSvgData class.
+ *
+ * It is used in the context of the edition folio convolutes
+ * to store and expose the svg data for a folio.
+ *
+ * Exposed to be used throughout {@link EditionDetailModule}.
+ */
+export class FolioSvgData {
+    /**
+     * The sheet of a folio (FolioSvgSheet).
+     *
+     * It contains all calculated values and their positions (in px)
+     * to draw the svg of the sheet of a folio.
+     */
+    sheet: FolioSvgSheet;
+
+    /**
+     * The systems of a folio (FolioSvgSystems).
+     *
+     * It contains all calculated values and their positions (in px)
+     * to draw the svg of the systems of a folio.
+     */
+    systems: FolioSvgSystems;
+
+    /**
+     * The content items array of a folio (FolioSvgContentItems).
+     *
+     * It contains all calculated values and their positions (in px)
+     * to draw the svg of the content items of a folio.
+     */
+    contentItemsArray: FolioSvgContentItem[];
+
+    /**
+     * Constructor of the FolioSvgData class.
+     *
+     * It initializes the class with values from the folio calculation.
+     *
+     * @param {FolioCalculation[]} calculation The given folio calculation.
+     */
+    constructor(calculation: FolioCalculation) {
+        this.sheet = new FolioSvgSheet(calculation.sheet);
+        this.systems = new FolioSvgSystems(calculation.systems);
+        this.contentItemsArray = [];
+        calculation.contentItemsArray.forEach((calculatedContentItem: FolioCalculationContentItem) => {
+            this.contentItemsArray.push(new FolioSvgContentItem(calculatedContentItem));
+        });
+    }
+}
diff --git a/src/app/views/edition-view/models/folio.model.ts b/src/app/views/edition-view/models/folio.model.ts
new file mode 100644
index 0000000000..e487e0927f
--- /dev/null
+++ b/src/app/views/edition-view/models/folio.model.ts
@@ -0,0 +1,100 @@
+/**
+ * The Folio class.
+ *
+ * It is used in the context of the edition folio convolutes
+ * to store the top level data for a folio
+ * from a folio json file.
+ */
+export class Folio {
+    /**
+     * The folio's id (string).
+     */
+    folioId: string;
+
+    /**
+     * The folio's number of systems (string).
+     */
+    systems: string;
+
+    /**
+     * The folio's format values (FolioFormat).
+     */
+    format: FolioFormat;
+
+    /**
+     * The folio's content array (FolioContent[]).
+     */
+    content: FolioContent[];
+}
+
+/**
+ * The Folio format class.
+ *
+ * It is used in the context of the edition folio convolutes
+ * to store the sub level data for folio format
+ * from a folio json file.
+ */
+export class FolioFormat {
+    /**
+     * The folio format's height (number).
+     */
+    height: number;
+
+    /**
+     * The folio format's width (number).
+     */
+    width: number;
+}
+
+/**
+ * The Folio content class.
+ *
+ * It is used in the context of the edition folio convolutes
+ * to store the sub level data for folio content
+ * from a folio json file.
+ */
+export class FolioContent {
+    /**
+     * The folio content's sigle (string).
+     */
+    sigle: string;
+
+    /**
+     * The folio content's measure (string).
+     */
+    measure: string;
+
+    /**
+     * The folio content's optional sectionPartition (number).
+     */
+    sectionPartition?: number;
+
+    /**
+     * The folio content's optional sections array (FolioSection[]).
+     */
+    sections?: FolioSection[];
+}
+
+/**
+ * The Folio section class.
+ *
+ * It is used in the context of the edition folio convolutes
+ * to store the sub level data for folio sections
+ * from a folio json file.
+ */
+export class FolioSection {
+    /**
+     * The folio section's start system (number).
+     */
+    startSystem: number;
+
+    /**
+     * The folio section's end system (number).
+     */
+    endSystem: number;
+
+    /**
+     * The folio section's optional position (number).
+     */
+    position?: number;
+}
diff --git a/src/app/views/edition-view/models/index.ts b/src/app/views/edition-view/models/index.ts
index c1e83d33a8..e2e3c346eb 100644
--- a/src/app/views/edition-view/models/index.ts
+++ b/src/app/views/edition-view/models/index.ts
@@ -7,44 +7,30 @@
  *
  */
 
-import {
-    ConvoluteFolio,
-    ConvoluteFolioFormat,
-    ConvoluteFolioContent,
-    ConvoluteFolioSection
-} from './convolute-folio.model';
-import {
-    ConvoluteFolioSvgOutput,
-    ConvoluteFolioSvgContentItem,
-    ConvoluteFolioSvgFolio,
-    ConvoluteFolioSvgSystems
-} from './convolute-folio-svg-output.model';
+import { Folio, FolioFormat, FolioContent, FolioSection } from './folio.model';
+import { FolioCalculation, FolioCalculationLine, FolioCalculationPoint } from './folio-calculation.model';
+import { FolioSettings } from './folio-settings.model';
+import { FolioSvgData } from './folio-svg-data.model';
 
-import { EditionSvgFile } from './edition-svg-file.model';
+import { EditionSvgSheet } from './edition-svg-sheet.model';
 import { EditionSvgOverlay } from './edition-svg-overlay';
 
-import { FolioCalculation, FolioCalculationLine, FolioCalculationPoint } from './folio-calculation.model';
-import { FolioFormatOptions } from './folio-format-options.model';
-
 import { Source, SourceList } from './source.model';
 import { Textcritics, TextcriticsList } from './textcritics.model';
 import { ViewBox } from './view-box.model';
 
 export {
-    ConvoluteFolio,
-    ConvoluteFolioFormat,
-    ConvoluteFolioContent,
-    ConvoluteFolioSection,
-    ConvoluteFolioSvgContentItem,
-    ConvoluteFolioSvgFolio,
-    ConvoluteFolioSvgSystems,
-    ConvoluteFolioSvgOutput,
-    EditionSvgFile,
+    Folio,
+    FolioFormat,
+    FolioContent,
+    FolioSection,
+    FolioSvgData,
+    EditionSvgSheet,
     EditionSvgOverlay,
     FolioCalculation,
     FolioCalculationLine,
     FolioCalculationPoint,
-    FolioFormatOptions,
+    FolioSettings,
     Source,
     SourceList,
     Textcritics,
diff --git a/src/app/views/edition-view/models/source.model.ts b/src/app/views/edition-view/models/source.model.ts
index 65df88ad85..0d9ffd5069 100644
--- a/src/app/views/edition-view/models/source.model.ts
+++ b/src/app/views/edition-view/models/source.model.ts
@@ -1,10 +1,42 @@
+/**
+ * The Source class.
+ *
+ * It is used in the context of the edition view
+ * to store the data for a single source
+ * from a sourcelist json file.
+ */
 export class Source {
+    /**
+     * The siglum of a source.
+     */
     siglum: string;
+
+    /**
+     * The type description of a source.
+     */
     type: string;
+
+    /**
+     * The physical location of a source.
+     */
     location: string;
+
+    /**
+     * The link to a source description in the critical report.
+     */
     linkTo: string;
 }
 
+/**
+ * The SourceList class.
+ *
+ * It is used in the context of the edition view
+ * to store the data for a source list
+ * from a sourcelist json file.
+ */
 export class SourceList {
+    /**
+     * The array of sources from a source list.
+     */
     sources: Source[];
 }
diff --git a/src/app/views/edition-view/models/textcritics.model.ts b/src/app/views/edition-view/models/textcritics.model.ts
index 5bdce199aa..52e1be7167 100644
--- a/src/app/views/edition-view/models/textcritics.model.ts
+++ b/src/app/views/edition-view/models/textcritics.model.ts
@@ -1,10 +1,42 @@
+/**
+ * The Textcritics class.
+ *
+ * It is used in the context of the edition view
+ * to store the data for a single textcritical comment
+ * from a textcritics json file.
+ */
 export class Textcritics {
+    /**
+     * The measure that the textcritical comment is addressing.
+     */
     measure: string;
+
+    /**
+     * The system that the textcritical comment is addressing.
+     */
     system: string;
-    location: string;
+
+    /**
+     * The position within the measure that the textcritical comment is addressing.
+     */
+    position: string;
+
+    /**
+     * The textcritical comment.
+     */
     comment: string;
 }
 
+/**
+ * The TextcriticsList class.
+ *
+ * It is used in the context of the edition view
+ * to store the data for a list of textcritical comments
+ * from a textcritics json file.
+ */
 export class TextcriticsList {
+    /**
+     * The array of textcritical comments from a textcritics list.
+     */
     [key: string]: Textcritics[];
 }
diff --git a/src/app/views/edition-view/models/view-box.model.ts b/src/app/views/edition-view/models/view-box.model.ts
index 92bef1543a..90668cae04 100644
--- a/src/app/views/edition-view/models/view-box.model.ts
+++ b/src/app/views/edition-view/models/view-box.model.ts
@@ -1,15 +1,51 @@
-import { FolioFormatOptions } from './folio-format-options.model';
+import { FolioSettings } from './folio-settings.model';
 
+/**
+ * The ViewBox class.
+ *
+ * It is used for the calculation of the svg view box measures of the edition folios.
+ * It takes folio settings as input to return the main svg view box values.
+ */
 export class ViewBox {
-    viewBoxWidth: string;
-    viewBoxHeight: string;
+    /**
+     * The width of the svg (string).
+     *
+     * Set to `100%`.
+     */
+    svgWidth = '100%';
+
+    /**
+     * The height of the svg (string).
+     *
+     * Set to `100%`.
+     */
+    svgHeight = '100%';
+
+    /**
+     * The svg viewBox attribute (string).
+     *
+     * Calculated in the constructor from the folio settings.
+     *
+     * @example
+     * viewBox: `0 0 540 270`;
+     */
     viewBox: string;
 
-    constructor(options: FolioFormatOptions) {
-        const width = (options.formatX + 2 * options.initialOffsetX) * options.factor;
-        const height = (options.formatY + 2 * options.initialOffsetY) * options.factor;
-        this.viewBoxWidth = '100%';
-        this.viewBoxHeight = '100%';
+    /**
+     * Constructor of the ViewBox class.
+     *
+     * It calculates the view box string from the folio settings.
+     *
+     * @param {FolioSettings} folioSettings The given folio settings.
+     */
+    constructor(folioSettings: FolioSettings) {
+        // calculate the width for the viewBox string
+        const width = (folioSettings.formatX + 2 * folioSettings.initialOffsetX) * folioSettings.factor;
+
+        // calculate the height for the viewBox string
+        const height = (folioSettings.formatY + 2 * folioSettings.initialOffsetY) * folioSettings.factor;
+
+        // set the viewBox string
         this.viewBox = '0 0 ' + width + ' ' + height;
     }
 }
diff --git a/src/app/views/edition-view/services/edition-data.service.spec.ts b/src/app/views/edition-view/services/edition-data.service.spec.ts
index 396e2bfc61..2b3d00c916 100644
--- a/src/app/views/edition-view/services/edition-data.service.spec.ts
+++ b/src/app/views/edition-view/services/edition-data.service.spec.ts
@@ -5,7 +5,7 @@ import { Data } from '@angular/router';
 
 import { forkJoin, Observable, of } from 'rxjs';
 
-import { ConvoluteFolio, EditionSvgFile, SourceList, TextcriticsList } from '@awg-views/edition-view/models';
+import { Folio, EditionSvgSheet, SourceList, TextcriticsList, Source } from '@awg-views/edition-view/models';
 
 import { EditionDataService } from './edition-data.service';
 import { ApiServiceError } from '@awg-core/services/api-service/api-service-error.model';
@@ -18,8 +18,8 @@ describe('EditionDataService', () => {
 
     const BASE = 'assets/data';
     const regexBase = new RegExp(BASE);
-    const convoluteFilePath = `${BASE}/convolute.json`;
-    const sheetsFilePath = `${BASE}/sheets.json`;
+    const folioFilePath = `${BASE}/folio.json`;
+    const sheetsFilePath = `${BASE}/svg-sheets.json`;
     const sourcelistFilePath = `${BASE}/sourcelist.json`;
     const textcriticsFilePath = `${BASE}/textcritics.json`;
 
@@ -52,15 +52,15 @@ describe('EditionDataService', () => {
             });
 
             // match the request url
-            const r = httpTestingController.expectOne({
+            const call = httpTestingController.expectOne({
                 url: '/foo/bar'
             });
 
             // check for GET request
-            expect(r.request.method).toEqual('GET');
+            expect(call.request.method).toBe('GET');
 
             // respond with mocked data
-            r.flush(testData);
+            call.flush(testData);
         }));
     });
 
@@ -71,14 +71,20 @@ describe('EditionDataService', () => {
                 editionDataService.getEditionDetailData().subscribe();
 
                 // expect one request to to every file with given settings
-                const r = httpTestingController.match((req: HttpRequest<any>) => {
+                const call = httpTestingController.match((req: HttpRequest<any>) => {
                     return req.method === 'GET' && req.responseType === 'json' && regexBase.test(req.url);
                 });
 
-                expect(r.length).toEqual(3);
-                expect(r[0].request.url).toEqual(convoluteFilePath, `should be ${convoluteFilePath}`);
-                expect(r[1].request.url).toEqual(sheetsFilePath, `should be ${sheetsFilePath}`);
-                expect(r[2].request.url).toEqual(textcriticsFilePath, `should be ${textcriticsFilePath}`);
+                expect(call.length).toBe(3);
+                expect(call[0].request.method).toBe('GET', 'should be GET');
+                expect(call[1].request.method).toBe('GET', 'should be GET');
+                expect(call[2].request.method).toBe('GET', 'should be GET');
+                expect(call[0].request.responseType).toBe('json', 'should be json');
+                expect(call[1].request.responseType).toBe('json', 'should be json');
+                expect(call[2].request.responseType).toBe('json', 'should be json');
+                expect(call[0].request.url).toBe(folioFilePath, `should be ${folioFilePath}`);
+                expect(call[1].request.url).toBe(sheetsFilePath, `should be ${sheetsFilePath}`);
+                expect(call[2].request.url).toBe(textcriticsFilePath, `should be ${textcriticsFilePath}`);
             }));
         });
     });
@@ -90,42 +96,62 @@ describe('EditionDataService', () => {
                 editionDataService.getEditionReportData().subscribe();
 
                 // expect one request to to every file with given settings
-                const r = httpTestingController.match((req: HttpRequest<any>) => {
+                const call = httpTestingController.match((req: HttpRequest<any>) => {
                     return req.method === 'GET' && req.responseType === 'json' && regexBase.test(req.url);
                 });
 
-                expect(r.length).toEqual(2);
-                expect(r[0].request.url).toEqual(sourcelistFilePath, `should be ${sourcelistFilePath}`);
-                expect(r[1].request.url).toEqual(textcriticsFilePath, `should be ${textcriticsFilePath}`);
+                expect(call.length).toBe(2);
+                expect(call[0].request.method).toBe('GET', 'should be GET');
+                expect(call[1].request.method).toBe('GET', 'should be GET');
+                expect(call[0].request.responseType).toBe('json', 'should be json');
+                expect(call[1].request.responseType).toBe('json', 'should be json');
+                expect(call[0].request.url).toBe(sourcelistFilePath, `should be ${sourcelistFilePath}`);
+                expect(call[1].request.url).toBe(textcriticsFilePath, `should be ${textcriticsFilePath}`);
             }));
         });
 
         describe('response', () => {
             describe('success', () => {
-                xit(`... should return a forkJoined Observable<SourceList, TextcriticsList>`, async(() => {
+                it(`... should return a forkJoined Observable<SourceList, TextcriticsList>`, async(() => {
                     const expectedResult = [new SourceList(), new TextcriticsList()];
-
-                    console.log('expectedResult', expectedResult);
+                    expectedResult[0].sources = [];
+                    expectedResult[0].sources[0] = {
+                        siglum: 'A',
+                        type: 'Autograph',
+                        location: 'CH-Bps',
+                        linkTo: 'Textlink'
+                    };
+                    expectedResult[1]['test'] = [];
+                    expectedResult[1]['test'][0] = {
+                        measure: '1',
+                        system: '1',
+                        position: '1. Note',
+                        comment: 'Fehler'
+                    };
 
                     // call service function (success)
                     editionDataService.getEditionReportData().subscribe(res => {
                         expect(res).toBeTruthy();
-
-                        console.log('res', res, res[0], res[1]);
+                        expect(res.length).toBe(2);
                         expect(res).toEqual(expectedResult);
-
-                        // expect(res[0]).toEqual(expectedResult[0]);
-                        // expect(res[1]).toEqual(expectedResult[1]);
                     });
 
                     // expect one request to to every file with given settings
-                    const r = httpTestingController.match((req: HttpRequest<any>) => {
+                    const call = httpTestingController.match((req: HttpRequest<any>) => {
                         return req.method === 'GET' && req.responseType === 'json' && regexBase.test(req.url);
                     });
 
+                    expect(call.length).toBe(2);
+                    expect(call[0].request.method).toBe('GET', 'should be GET');
+                    expect(call[1].request.method).toBe('GET', 'should be GET');
+                    expect(call[0].request.responseType).toBe('json', 'should be json');
+                    expect(call[1].request.responseType).toBe('json', 'should be json');
+                    expect(call[0].request.url).toBe(sourcelistFilePath, `should be ${sourcelistFilePath}`);
+                    expect(call[1].request.url).toBe(textcriticsFilePath, `should be ${textcriticsFilePath}`);
+
                     // mock input from HTTP request
-                    r[0].flush(of(expectedResult[0]));
-                    r[1].flush(of(expectedResult[1]));
+                    call[0].flush(expectedResult[0]);
+                    call[1].flush(expectedResult[1]);
                 }));
             });
 
@@ -141,12 +167,12 @@ describe('EditionDataService', () => {
                     });
 
                     // expect one request to to every file with given settings
-                    const r = httpTestingController.match((req: HttpRequest<any>) => {
+                    const call = httpTestingController.match((req: HttpRequest<any>) => {
                         return req.method === 'GET' && req.responseType === 'json' && regexBase.test(req.url);
                     });
 
-                    r[0].error(null, new HttpErrorResponse({ error: 'ERROR_LOADING_SOURCELIST' }));
-                    r[1].error(new ErrorEvent('ERROR_LOADING_TEXTCRITICS'));
+                    call[0].error(null, new HttpErrorResponse({ error: 'ERROR_LOADING_SOURCELIST' }));
+                    call[1].error(new ErrorEvent('ERROR_LOADING_TEXTCRITICS'));
                 }));
 
                 it(`... should return [sourcelist, []] if textcritics request failed`, async(() => {
@@ -160,12 +186,12 @@ describe('EditionDataService', () => {
                     });
 
                     // expect one request to to every file with given settings
-                    const r = httpTestingController.match((req: HttpRequest<any>) => {
+                    const call = httpTestingController.match((req: HttpRequest<any>) => {
                         return req.method === 'GET' && req.responseType === 'json' && regexBase.test(req.url);
                     });
 
-                    r[0].flush(expectedResult[0]);
-                    r[1].error(null, new HttpErrorResponse({ error: 'ERROR_LOADING_TEXTCRITICS' }));
+                    call[0].flush(expectedResult[0]);
+                    call[1].error(null, new HttpErrorResponse({ error: 'ERROR_LOADING_TEXTCRITICS' }));
                 }));
 
                 it(`... should return [[], textcritics] if sourcelist request failed`, async(() => {
@@ -179,12 +205,12 @@ describe('EditionDataService', () => {
                     });
 
                     // expect one request to to every file with given settings
-                    const r = httpTestingController.match((req: HttpRequest<any>) => {
+                    const call = httpTestingController.match((req: HttpRequest<any>) => {
                         return req.method === 'GET' && req.responseType === 'json' && regexBase.test(req.url);
                     });
 
-                    r[1].flush(expectedResult[1]);
-                    r[0].error(null, new HttpErrorResponse({ error: 'ERROR_LOADING_SOURCELIST' }));
+                    call[1].flush(expectedResult[1]);
+                    call[0].error(null, new HttpErrorResponse({ error: 'ERROR_LOADING_SOURCELIST' }));
                 }));
             });
         });
diff --git a/src/app/views/edition-view/services/edition-data.service.ts b/src/app/views/edition-view/services/edition-data.service.ts
index 65383cc073..5c71a05092 100644
--- a/src/app/views/edition-view/services/edition-data.service.ts
+++ b/src/app/views/edition-view/services/edition-data.service.ts
@@ -2,73 +2,201 @@ import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 
 import { forkJoin as observableForkJoin, Observable, of as observableOf } from 'rxjs';
-import { catchError } from 'rxjs/operators';
+import { catchError, defaultIfEmpty, take } from 'rxjs/operators';
 
-import { ConvoluteFolio, EditionSvgFile, SourceList, TextcriticsList } from '@awg-views/edition-view/models';
+import { Folio, EditionSvgSheet, SourceList, TextcriticsList } from '@awg-views/edition-view/models';
 
+/**
+ * The EditionData service.
+ *
+ * It handles the calls to local JSON files vai HTTP
+ * and provides the data response for the edition detail
+ * and edition report view.
+ *
+ * Provided in: `root`.
+ */
 @Injectable({
     providedIn: 'root'
 })
 export class EditionDataService {
+    /**
+     * Private variable: BASE.
+     *
+     * It keeps the base path to the JSON files.
+     */
     private BASE = 'assets/data';
 
-    constructor(private http: HttpClient) {}
+    /**
+     * Private variable: folioFile.
+     *
+     * It keeps the path to the folio JSON file.
+     */
+    private folioFile = 'folio.json';
+
+    /**
+     * Private variable: svgSheetsFile.
+     *
+     * It keeps the path to the svgSheets JSON file.
+     */
+    private svgSheetsFile = 'svg-sheets.json';
+
+    /**
+     * Private variable: sourcelistFile.
+     *
+     * It keeps the path to the sourcelist JSON file.
+     */
+    private sourcelistFile = 'sourcelist.json';
 
-    /*********************************
+    /**
+     * Private variable: textcriticsFile.
      *
-     * get data from JSON files
+     * It keeps the path to the textcritics JSON file.
+     */
+    private textcriticsFile = 'textcritics.json';
+
+    /**
+     * Constructor of the EditionDataService.
+     *
+     * It declares a private {@link HttpClient} instance
+     * to handle http requests.
      *
-     * returns array of Observables,
-     * e.g. [Observable<Sheets[]>, Observable<Textcritics[]>]
+     * @param {HttpClient} http Instance of the HttpClient.
+     */
+    constructor(private http: HttpClient) {}
+
+    /**
+     * Public method: getEditionDetailData.
      *
-     *********************************/
-    getEditionDetailData(): Observable<[ConvoluteFolio[], EditionSvgFile[], TextcriticsList]> {
-        return observableForkJoin(this.getConvoluteFolioData(), this.getSvgFileData(), this.getTextcriticsListData());
+     * It provides the data from a JSON file
+     * for the edition detail view
+     * (folios, edition svg sheets and textcritics list)
+     * as a fork-joined observable array.
+     *
+     * @returns {Observable<[Folio[], EditionSvgSheet[], TextcriticsList]>}
+     * The fork-joined observable array with the Folio,
+     * EditionSvgSheet and TextcriticsList data.
+     * Only the first emit is needed.
+     */
+    getEditionDetailData(): Observable<[Folio[], EditionSvgSheet[], TextcriticsList]> {
+        const folioData$: Observable<Folio[]> = this.getFolioData();
+        const svgSheetsData$: Observable<EditionSvgSheet[]> = this.getSvgSheetsData();
+        const textciticsListData$: Observable<TextcriticsList> = this.getTextcriticsListData();
+
+        return observableForkJoin([folioData$, svgSheetsData$, textciticsListData$]).pipe(
+            // default empty value
+            defaultIfEmpty([[new Folio()], [new EditionSvgSheet()], new TextcriticsList()]),
+            // take only first request (JSON fetch)
+            take(1)
+        );
     }
 
+    /**
+     * Public method: getEditionReportData.
+     *
+     * It provides the data from a JSON file
+     * for the edition report view
+     * (source list and textcritics list)
+     * as a fork-joined observable array.
+     *
+     * @returns {Observable<[SourceList, TextcriticsList]>}
+     * The fork-joined observable array with the SourceList
+     * and TextcriticsList data. Only the first emit is needed.
+     */
     getEditionReportData(): Observable<[SourceList, TextcriticsList]> {
-        return observableForkJoin(this.getSourceListData(), this.getTextcriticsListData());
+        const sourceListData$: Observable<SourceList> = this.getSourceListData();
+        const textciticsListData$: Observable<TextcriticsList> = this.getTextcriticsListData();
+
+        return observableForkJoin([sourceListData$, textciticsListData$]).pipe(
+            // default empty value
+            defaultIfEmpty([new SourceList(), new TextcriticsList()]),
+            // take only first request (JSON fetch)
+            take(1)
+        );
     }
 
-    /*
-     * private functions to prepare http request
+    /**
+     * Private method: getFolioData.
+     *
+     * It sets the path to the JSON file with
+     * the folio data and triggers
+     * the method to get the JSON data.
+     *
+     * @returns {Observable<Folio[]>} The observable with the Folio data.
      */
-    private getConvoluteFolioData(): Observable<ConvoluteFolio[]> {
-        const file = 'convolute.json';
+    private getFolioData(): Observable<Folio[]> {
+        const file = this.folioFile;
         const url = `${this.BASE}/${file}`;
         return this.getJsonData(url);
     }
 
-    private getSvgFileData(): Observable<EditionSvgFile[]> {
-        const file = 'sheets.json';
+    /**
+     * Private method: getSvgSheetsData.
+     *
+     * It sets the path to the JSON file with
+     * the svg sheets data and triggers
+     * the method to get the JSON data.
+     *
+     * @returns {Observable<EditionSvgSheet[]>} The observable with the EditionSvgSheet data.
+     */
+    private getSvgSheetsData(): Observable<EditionSvgSheet[]> {
+        const file = this.svgSheetsFile;
         const url = `${this.BASE}/${file}`;
         return this.getJsonData(url);
     }
 
+    /**
+     * Private method: getSourceListData.
+     *
+     * It sets the path to the JSON file with
+     * the source list data and triggers
+     * the method to get the JSON data.
+     *
+     * @returns {Observable<SourceList>} The observable with the SourceList data.
+     */
     private getSourceListData(): Observable<SourceList> {
-        const file = 'sourcelist.json';
+        const file = this.sourcelistFile;
         const url = `${this.BASE}/${file}`;
         return this.getJsonData(url);
     }
 
+    /**
+     * Private method: getTextcriticsListData.
+     *
+     * It sets the path to the JSON file with
+     * the textcritics list data and triggers
+     * the method to get the JSON data.
+     *
+     * @returns {Observable<TextcriticsList>} The observable with the TextcriticsList data.
+     */
     private getTextcriticsListData(): Observable<TextcriticsList> {
-        const file = 'textcritics.json';
+        const file = this.textcriticsFile;
         const url = `${this.BASE}/${file}`;
         return this.getJsonData(url);
     }
 
-    /*
-     * http request to fetch json files
+    /**
+     * Private method: getJsonData.
+     *
+     * It fetches the given JSON file (path) via HTTP request.
+     *
+     * @param {string} path The path to the JSON file.
+     * @returns {Observable<any>} The observable with the requested data.
      */
-    private getJsonData(url: string): Observable<any> {
-        return this.http.get(url).pipe(
+    private getJsonData(path: string): Observable<any> {
+        return this.http.get(path).pipe(
             // tap(res => this.log(`fetched jsonData with url=${url}`)),
             catchError(this.handleError(`getJsonData`, []))
         );
     }
 
-    /*
-     * error handling
+    /**
+     * Private method: handleError.
+     *
+     * It handles errors, if any, of the HTTP request.
+     *
+     * @param {string} operation Name of the requested operation.
+     * @param {T} [result] An optional empty result to let the app keep running.
+     * @returns An observable of the error.
      */
     private handleError<T>(operation: string, result?: T) {
         return (error: any): Observable<T> => {
@@ -83,7 +211,15 @@ export class EditionDataService {
         };
     }
 
-    private log(message: string) {
+    /**
+     * Private method: log.
+     *
+     * It logs a message to the console.
+     *
+     * @param {string} message The given message to be logged.
+     * @returns {void} Logs the message to the console.
+     */
+    private log(message: string): void {
         console.log(message);
     }
 }
diff --git a/src/app/views/edition-view/services/edition.service.ts b/src/app/views/edition-view/services/edition.service.ts
index 510efd4aa3..b496d3b5f2 100644
--- a/src/app/views/edition-view/services/edition.service.ts
+++ b/src/app/views/edition-view/services/edition.service.ts
@@ -1,35 +1,40 @@
 import { Injectable } from '@angular/core';
 
-import { Textcritics } from '@awg-views/edition-view/models';
+import { EditionSvgOverlay, Textcritics } from '@awg-views/edition-view/models';
 
+/**
+ * The Edition service.
+ *
+ * It handles the provision of the textcritical comments
+ * for a selected overlay item.
+ *
+ * Provided in: `root`.
+ * @used in the {@link EditionDetailComponent}.
+ */
 @Injectable({
     providedIn: 'root'
 })
 export class EditionService {
-    constructor() {}
-
-    /********************************
-     *
-     * get comments for selected item
+    /**
+     * Private static method: filterTextcritics.
      *
-     * returns array with textcritics<Textcritics[]>
+     * It filters a textcritics object in regard of a selected overlay item.
      *
-     *
-     ********************************/
-    getTextcritics(textcritics: Textcritics[], overlay: { type: string; id: string }): Textcritics[] {
-        return textcritics.filter((textcritic, filterIndex) => {
-            return this.filterTextcritics(textcritic, overlay, filterIndex);
-        });
-    }
-
-    /*
-     * private function to filter out needed textcritics
+     * @param {Textcritics[]} textcritics The given textcritical comments to be filtered.
+     * @param {{ type: string; id: string }} overlay The given selected overlay item defined by `type` and `ìd`.
+     * @param {number} filterIndex The given index position of the filter.
+     * @returns {boolean} A boolean value if the input contains the overlay type and id
      */
-    private filterTextcritics(textcritics, overlay, filterIndex): boolean {
+    private static filterTextcritics(
+        textcritics: Textcritics,
+        overlay: { type: string; id: string },
+        filterIndex: number
+    ): boolean {
         // shortcuts & trimmed values
         const measure = textcritics.measure.replace('[', '').replace(']', '');
         const system = textcritics.system.replace('[', '').replace(']', '');
 
+        // filter the comments by overlay type and id
         switch (overlay.type) {
             case 'measure':
                 return measure === overlay.id;
@@ -39,4 +44,21 @@ export class EditionService {
                 return filterIndex === +overlay.id;
         }
     }
+
+    /**
+     * Public method: getTextcritics.
+     *
+     * It provides the textcritical comments for a selected svg overlay.
+     *
+     * @param {Textcritics[]} textcritics The given textcritical comments.
+     * @param {EditionSvgOverlay} overlay The given svg overlay.
+     * @returns {Textcritics[]} Array with filtered textcritical comments.
+     */
+    getTextcritics(textcritics: Textcritics[], overlay: EditionSvgOverlay): Textcritics[] {
+        // filter the textcritics input array
+        return textcritics.filter((textcritic, filterIndex) => {
+            // get filtered results from private method
+            return EditionService.filterTextcritics(textcritic, overlay, filterIndex);
+        });
+    }
 }
diff --git a/src/app/views/home-view/home-view.component.html b/src/app/views/home-view/home-view.component.html
index f8392dc358..ec11865ce3 100644
--- a/src/app/views/home-view/home-view.component.html
+++ b/src/app/views/home-view/home-view.component.html
@@ -56,8 +56,15 @@ <h4>Skizzen</h4>
 
 <!-- declamation -->
 <div class="declamation">
-    <p>Ediert von <span class="editors" [innerHtml]="metaData?.edition?.editors"></span></p>
     <p>
-        Versionsdatum: <span class="version">{{ metaData?.edition?.lastModified }}</span>
+        Ediert von
+        <span class="editors"
+            ><a href="{{ (editionMetaData?.editors)[0].contactUrl }}" target="_blank" rel="noopener noreferrer">{{
+                (editionMetaData?.editors)[0].name
+            }}</a></span
+        >
+    </p>
+    <p>
+        Versionsdatum: <span class="version">{{ editionMetaData?.lastModified }}</span>
     </p>
 </div>
diff --git a/src/app/views/home-view/home-view.component.spec.ts b/src/app/views/home-view/home-view.component.spec.ts
index 492b56be48..a19f596d68 100644
--- a/src/app/views/home-view/home-view.component.spec.ts
+++ b/src/app/views/home-view/home-view.component.spec.ts
@@ -10,7 +10,8 @@ import {
 } from '@testing/expect-helper';
 import { RouterLinkStubDirective } from '@testing/router-stubs';
 
-import { Meta } from '@awg-core/core-models';
+import { MetaEdition, MetaSectionTypes } from '@awg-core/core-models';
+import { METADATA } from '@awg-core/mock-data';
 import { CoreService } from '@awg-core/services';
 
 import { HomeViewComponent } from './home-view.component';
@@ -26,11 +27,11 @@ describe('HomeViewComponent (DONE)', () => {
     let mockCoreService: Partial<CoreService>;
     let mockRouter;
 
-    let expectedMetaData: Meta;
+    let expectedEditionMetaData: MetaEdition;
 
     beforeEach(async(() => {
         // stub service for test purposes
-        mockCoreService = { getMetaData: () => expectedMetaData };
+        mockCoreService = { getMetaDataSection: key => METADATA[key] };
 
         // router spy object
         mockRouter = jasmine.createSpyObj('Router', ['navigate']);
@@ -48,8 +49,7 @@ describe('HomeViewComponent (DONE)', () => {
         compEl = compDe.nativeElement;
 
         // test data
-        expectedMetaData = new Meta();
-        expectedMetaData.edition = { editors: 'Test Editor 1', lastModified: '9. Oktober 2018' };
+        expectedEditionMetaData = METADATA[MetaSectionTypes.edition];
 
         // spies on component functions
         // `.and.callThrough` will track the spy down the nested describes, see
@@ -67,11 +67,14 @@ describe('HomeViewComponent (DONE)', () => {
         expect(mockCoreService === coreService).toBe(false);
 
         // changing the stub service has no effect on the injected service
-        const changedMetaData = new Meta();
-        changedMetaData.edition = { editors: 'Test Editor 2', lastModified: '10. Oktober 2018' };
-        mockCoreService.getMetaData = () => changedMetaData;
-
-        expect(coreService.getMetaData()).toBe(expectedMetaData);
+        let changedEditionMetaData = new MetaEdition();
+        changedEditionMetaData = {
+            editors: [{ name: 'Test Editor 2', contactUrl: '' }],
+            lastModified: '10. Oktober 2018'
+        };
+
+        mockCoreService.getMetaDataSection = () => changedEditionMetaData;
+        expect(coreService.getMetaDataSection(MetaSectionTypes.edition)).toBe(expectedEditionMetaData);
     });
 
     describe('BEFORE initial data binding', () => {
@@ -88,7 +91,7 @@ describe('HomeViewComponent (DONE)', () => {
         });
 
         it('should not have metadata', () => {
-            expect(component.metaData).toBeUndefined('should be undefined');
+            expect(component.editionMetaData).toBeUndefined('should be undefined');
         });
 
         describe('VIEW', () => {
@@ -97,16 +100,19 @@ describe('HomeViewComponent (DONE)', () => {
                 getAndExpectDebugElementByCss(compDe, 'div.declamation', 1, 1);
             });
 
-            it('... should not render `editors` and `lastmodified` yet', () => {
-                const editorsDes = getAndExpectDebugElementByCss(compDe, '.editors', 1, 1);
+            it('... should not render `editors` yet', () => {
+                const editorsDes = getAndExpectDebugElementByCss(compDe, '.editors a', 1, 1);
                 const editorsEl = editorsDes[0].nativeElement;
 
+                expect(editorsEl).toBeDefined();
+                expect(editorsEl.href).toBe('', 'should be empty string');
+                expect(editorsEl.textContent).toBe('', 'should be empty string');
+            });
+
+            it('... should not render `lastmodified` yet', () => {
                 const versionDes = getAndExpectDebugElementByCss(compDe, '.version', 1, 1);
                 const versionEl = versionDes[0].nativeElement;
 
-                expect(editorsEl).toBeDefined();
-                expect(editorsEl.innerHTML).toBe('', 'should be empty string');
-
                 expect(versionEl).toBeDefined();
                 expect(versionEl.textContent).toBe('', 'be contain empty string');
             });
@@ -116,7 +122,7 @@ describe('HomeViewComponent (DONE)', () => {
     describe('AFTER initial data binding', () => {
         beforeEach(() => {
             // mock the call to the meta service in #provideMetaData
-            component.metaData = mockCoreService.getMetaData();
+            component.editionMetaData = mockCoreService.getMetaDataSection(MetaSectionTypes.edition);
 
             // trigger initial data binding
             fixture.detectChanges();
@@ -173,29 +179,35 @@ describe('HomeViewComponent (DONE)', () => {
             });
 
             it('... should return metadata', () => {
-                expect(component.metaData).toBeDefined();
-                expect(component.metaData).toBe(expectedMetaData);
+                expect(component.editionMetaData).toBeDefined();
+                expect(component.editionMetaData).toBe(expectedEditionMetaData);
             });
         });
 
         describe('VIEW', () => {
-            it('... should render `editors` and `lastmodified` in declamation', () => {
-                const editorsDes = getAndExpectDebugElementByCss(compDe, '.editors', 1, 1);
+            it('... should render `editors` in declamation', () => {
+                const editorsDes = getAndExpectDebugElementByCss(compDe, '.declamation .editors a', 1, 1);
                 const editorsEl = editorsDes[0].nativeElement;
 
-                const versionDes = getAndExpectDebugElementByCss(compDe, '.version', 1, 1);
-                const versionEl = versionDes[0].nativeElement;
-
                 expect(editorsEl).toBeDefined();
-                expect(editorsEl.innerHTML).toContain(
-                    expectedMetaData.edition.editors,
-                    `should contain ${expectedMetaData.edition.editors}`
+                expect(editorsEl.href).toBe(
+                    expectedEditionMetaData.editors[0].contactUrl,
+                    `should be ${expectedEditionMetaData.editors[0].contactUrl}`
+                );
+                expect(editorsEl.innerHTML).toBe(
+                    expectedEditionMetaData.editors[0].name,
+                    `should be ${expectedEditionMetaData.editors[0].name}`
                 );
+            });
+
+            it('... should render `lastmodified` in declamation', () => {
+                const versionDes = getAndExpectDebugElementByCss(compDe, '.declamation .version', 1, 1);
+                const versionEl = versionDes[0].nativeElement;
 
                 expect(versionEl).toBeDefined();
-                expect(versionEl.textContent).toContain(
-                    expectedMetaData.edition.lastModified,
-                    `should contain ${expectedMetaData.edition.lastModified}`
+                expect(versionEl.textContent).toBe(
+                    expectedEditionMetaData.lastModified,
+                    `should be ${expectedEditionMetaData.lastModified}`
                 );
             });
         });
diff --git a/src/app/views/home-view/home-view.component.ts b/src/app/views/home-view/home-view.component.ts
index 196dd6b57a..bbba2c5dc6 100644
--- a/src/app/views/home-view/home-view.component.ts
+++ b/src/app/views/home-view/home-view.component.ts
@@ -1,28 +1,70 @@
-import { Component, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 
-import { Meta } from '@awg-core/core-models';
+import { MetaEdition, MetaSectionTypes } from '@awg-core/core-models';
 import { CoreService } from '@awg-core/services';
 
+/**
+ * The HomeView component.
+ *
+ * It contains the home view section of the app
+ * with basic information about the prototype.
+ */
 @Component({
     selector: 'awg-home-view',
     templateUrl: './home-view.component.html',
-    styleUrls: ['./home-view.component.css']
+    styleUrls: ['./home-view.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class HomeViewComponent implements OnInit {
-    metaData: Meta;
+    /**
+     * Public variable: editionMetaData.
+     *
+     * It keeps the edition meta data for the home view.
+     */
+    editionMetaData: MetaEdition;
 
-    constructor(private router: Router, private coreService: CoreService) {}
+    /**
+     * Constructor of the HomeViewComponent.
+     *
+     * It declares a private CoreService instance
+     * to get the meta data and a private Router instance.
+     *
+     * @param {CoreService} coreService Instance of the CoreService.
+     * @param {Router} router Instance of the Angular router.
+     */
+    constructor(private coreService: CoreService, private router: Router) {}
 
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {
         this.routeToSidenav();
         this.provideMetaData();
     }
 
+    /**
+     * Public method: provideMetaData.
+     *
+     * It calls the CoreService to provide
+     * the meta data for the home view.
+     *
+     * @returns {void} Sets the editionMetaData variable.
+     */
     provideMetaData(): void {
-        this.metaData = this.coreService.getMetaData();
+        this.editionMetaData = this.coreService.getMetaDataSection(MetaSectionTypes.edition);
     }
 
+    /**
+     * Public method: routeToSidenav.
+     *
+     * It activates the secondary outlet with the edition-info.
+     *
+     * @returns {void} Activates the edition-info side outlet.
+     */
     routeToSidenav(): void {
         // opens the side-info outlet while preserving the router fragment for scrolling
         this.router.navigate([{ outlets: { side: 'editionInfo' } }], {
diff --git a/src/app/views/page-not-found-view/page-not-found-view.component.html b/src/app/views/page-not-found-view/page-not-found-view.component.html
index 693c9ea41c..0fdd517372 100644
--- a/src/app/views/page-not-found-view/page-not-found-view.component.html
+++ b/src/app/views/page-not-found-view/page-not-found-view.component.html
@@ -1,14 +1,18 @@
 <div class="col-12 col-xl-9 awg-page-not-found">
-    <h2 id="awg-page-not-found-title">{{ title }}</h2>
+    <h2 id="awg-page-not-found-title">{{ pageNotFoundTitle }}</h2>
 
-    <h5 id="awg-page-not-found-subtitle">{{ subtitle }}</h5>
+    <h5 id="awg-page-not-found-subtitle">{{ pageNotFoundSubTitle }}</h5>
 
     <div class="my-4">
-        <img [src]="imgPath" width="100%"/>
+        <img [src]="pageNotFoundImgPath" width="100%" />
     </div>
 
-    <h5 id="awg-page-not-found-contact">Kontaktieren sie uns gerne unter: <a [href]="awgUrl" target="_blank" rel="noopener noreferrer">anton-webern.ch</a></h5>
-
-    <h5 id="awg-page-not-found-back" class="mt-4">Zurück zur Startseite: <a [routerLink]="['/home']" routerLinkActive="active">Home</a></h5>
+    <h5 id="awg-page-not-found-contact">
+        Kontaktieren sie uns gerne unter:
+        <a [href]="awgContactUrl" target="_blank" rel="noopener noreferrer">anton-webern.ch</a>
+    </h5>
 
+    <h5 id="awg-page-not-found-back" class="mt-4">
+        Zurück zur Startseite: <a [routerLink]="['/home']" routerLinkActive="active">Home</a>
+    </h5>
 </div>
diff --git a/src/app/views/page-not-found-view/page-not-found-view.component.spec.ts b/src/app/views/page-not-found-view/page-not-found-view.component.spec.ts
index 108b541b5c..c9568ac39e 100644
--- a/src/app/views/page-not-found-view/page-not-found-view.component.spec.ts
+++ b/src/app/views/page-not-found-view/page-not-found-view.component.spec.ts
@@ -16,10 +16,10 @@ describe('PageNotFoundViewComponent (DONE)', () => {
     let linkDes: DebugElement[];
     let routerLinks;
 
-    const expectedTitle = 'Entschuldigung, diese Seite gibt es hier nicht…';
-    const expectedSubtitle = '… aber möglicherweise können wir Ihnen anders weiterhelfen?';
-    const expectedImgPath = 'assets/img/page-not-found/Webern_Books.jpg';
-    const expectedAwgUrl = 'https://www.anton-webern.ch/index.php?id=41';
+    const expectedPageNotFoundTitle = 'Entschuldigung, diese Seite gibt es hier nicht…';
+    const expectedPageNotFoundSubTitle = '… aber möglicherweise können wir Ihnen anders weiterhelfen?';
+    const expectedPageNotFoundImgPath = 'assets/img/page-not-found/Webern_Books.jpg';
+    const expectedAwgContactUrl = 'https://www.anton-webern.ch/index.php?id=41';
 
     beforeEach(async(() => {
         TestBed.configureTestingModule({
@@ -39,14 +39,14 @@ describe('PageNotFoundViewComponent (DONE)', () => {
     });
 
     describe('BEFORE initial data binding', () => {
-        it(`should have title and subtitle`, () => {
-            expect(component.title).toBe(expectedTitle);
-            expect(component.subtitle).toBe(expectedSubtitle);
+        it(`should have pageNotFoundTitle and pageNotFoundSubtitle`, () => {
+            expect(component.pageNotFoundTitle).toBe(expectedPageNotFoundTitle);
+            expect(component.pageNotFoundSubTitle).toBe(expectedPageNotFoundSubTitle);
         });
 
         it('should have correct values from getters', () => {
-            expect(component.imgPath).toBe(expectedImgPath);
-            expect(component.awgUrl).toBe(expectedAwgUrl);
+            expect(component.pageNotFoundImgPath).toBe(expectedPageNotFoundImgPath);
+            expect(component.awgContactUrl).toBe(expectedAwgContactUrl);
         });
 
         describe('VIEW', () => {
@@ -70,16 +70,21 @@ describe('PageNotFoundViewComponent (DONE)', () => {
                 expect(imgEl.src).toBe('', 'should be empty string');
             });
 
-            it('... should not render title or subtitle yet', () => {
-                const h2Des = getAndExpectDebugElementByCss(compDe, 'h2', 1, 1);
-                const h2El = h2Des[0].nativeElement;
+            it('... should not render pageNotFoundTitle or pageNotFoundSubtitle yet', () => {
+                const titleDes = getAndExpectDebugElementByCss(compDe, 'h2#awg-page-not-found-title', 1, 1);
+                const titleEl = titleDes[0].nativeElement;
 
-                expect(h2El.textContent).toBeDefined();
-                expect(h2El.textContent).not.toContain(expectedSubtitle);
+                const subtitleDes = getAndExpectDebugElementByCss(compDe, 'h5#awg-page-not-found-subtitle', 1, 1);
+                const subtitleEl = subtitleDes[0].nativeElement;
+
+                expect(titleEl.textContent).toBeDefined();
+                expect(titleEl.textContent).not.toContain(expectedPageNotFoundTitle);
+
+                expect(subtitleEl.textContent).toBeDefined();
+                expect(subtitleEl.textContent).not.toContain(expectedPageNotFoundSubTitle);
             });
 
             it('... should not render contact url yet', () => {
-                // second h5 should have an anchor link
                 const contactDes = getAndExpectDebugElementByCss(compDe, 'h5#awg-page-not-found-contact > a', 1, 1);
                 const contactEl = contactDes[0].nativeElement;
 
@@ -96,12 +101,26 @@ describe('PageNotFoundViewComponent (DONE)', () => {
         });
 
         describe('VIEW', () => {
-            it('... should render title in the `h2`-element', () => {
-                const h2Des = getAndExpectDebugElementByCss(compDe, 'h2', 1, 1);
-                const h2El = h2Des[0].nativeElement;
+            it('... should render pageNotFoundTitle in the `h2`-element', () => {
+                const titleDes = getAndExpectDebugElementByCss(compDe, 'h2#awg-page-not-found-title', 1, 1);
+                const titleEl = titleDes[0].nativeElement;
+
+                expect(titleEl.textContent).toBeDefined();
+                expect(titleEl.textContent).toContain(
+                    expectedPageNotFoundTitle,
+                    `should contain ${expectedPageNotFoundTitle}`
+                );
+            });
 
-                expect(h2El.textContent).toBeDefined();
-                expect(h2El.textContent).toContain(expectedTitle, `should contain ${expectedTitle}`);
+            it('... should render pageNotFoundSubTitle in the first `h5`-element', () => {
+                const subtitleDes = getAndExpectDebugElementByCss(compDe, 'h5#awg-page-not-found-subtitle', 1, 1);
+                const subtitleEl = subtitleDes[0].nativeElement;
+
+                expect(subtitleEl.textContent).toBeDefined();
+                expect(subtitleEl.textContent).toContain(
+                    expectedPageNotFoundSubTitle,
+                    `should contain ${expectedPageNotFoundSubTitle}`
+                );
             });
 
             it('... should render image', () => {
@@ -109,18 +128,15 @@ describe('PageNotFoundViewComponent (DONE)', () => {
                 const imgEl = imgDes[0].nativeElement;
 
                 expect(imgEl.src).toBeDefined();
-                expect(imgEl.src).toContain(expectedImgPath);
+                expect(imgEl.src).toContain(expectedPageNotFoundImgPath);
             });
 
-            it('... should render contact linkt', () => {
-                const h5Des = getAndExpectDebugElementByCss(compDe, 'div.awg-page-not-found > h5', 3, 3);
-
-                // second h5 should have an anchor link with href
-                const contactDes = getAndExpectDebugElementByCss(h5Des[1], 'a[href]', 1, 1);
+            it('... should render contact url', () => {
+                const contactDes = getAndExpectDebugElementByCss(compDe, 'h5#awg-page-not-found-contact > a', 1, 1);
                 const contactEl = contactDes[0].nativeElement;
 
                 expect(contactEl.href).toBeDefined();
-                expect(contactEl.href).toBe(expectedAwgUrl);
+                expect(contactEl.href).toBe(expectedAwgContactUrl);
             });
         });
 
diff --git a/src/app/views/page-not-found-view/page-not-found-view.component.ts b/src/app/views/page-not-found-view/page-not-found-view.component.ts
index bff72421b0..74972f319f 100644
--- a/src/app/views/page-not-found-view/page-not-found-view.component.ts
+++ b/src/app/views/page-not-found-view/page-not-found-view.component.ts
@@ -1,26 +1,72 @@
-import { Component, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component } from '@angular/core';
 
+import { AppConfig } from '@awg-app/app.config';
+
+/**
+ * The PageNotFoundView component.
+ *
+ * It contains the page not found view section of the app
+ * with redirects to awg contact pages.
+ */
 @Component({
     selector: 'awg-page-not-found-view',
     templateUrl: './page-not-found-view.component.html',
-    styleUrls: ['./page-not-found-view.component.css']
+    styleUrls: ['./page-not-found-view.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class PageNotFoundViewComponent implements OnInit {
-    title = 'Entschuldigung, diese Seite gibt es hier nicht…';
-    subtitle = '… aber möglicherweise können wir Ihnen anders weiterhelfen?';
+export class PageNotFoundViewComponent {
+    /**
+     * Public variable: pageNotFoundTitle.
+     *
+     * It keeps the title of
+     * the page not found section.
+     */
+    pageNotFoundTitle = 'Entschuldigung, diese Seite gibt es hier nicht…';
 
-    private _imgPath = 'assets/img/page-not-found/Webern_Books.jpg';
-    private _awgUrl = 'https://www.anton-webern.ch/index.php?id=41';
+    /**
+     * Public variable: pageNotFoundSubTitle.
+     *
+     * It keeps the subtitle of
+     * the page not found section.
+     */
+    pageNotFoundSubTitle = '… aber möglicherweise können wir Ihnen anders weiterhelfen?';
 
-    get imgPath(): string {
-        return this._imgPath;
-    }
+    /**
+     * Private variable: _pageNotFoundImgPath.
+     *
+     * It keeps the path to the image
+     * of the page not found section.
+     */
+    private _pageNotFoundImgPath = 'assets/img/page-not-found/Webern_Books.jpg';
 
-    get awgUrl(): string {
-        return this._awgUrl;
-    }
+    /**
+     * Private variable: _awgContactUrl.
+     *
+     * It keeps the url to the contact page
+     * of the Webern project homepage.
+     */
+    private _awgContactUrl = AppConfig.AWG_PROJECT_URL + 'index.php?id=41';
 
-    constructor() {}
+    /**
+     * Getter for the path to the image
+     * of the page not found section.
+     *
+     * @returns {string} The path to the image
+     * of the page not found section.
+     */
+    get pageNotFoundImgPath(): string {
+        return this._pageNotFoundImgPath;
+    }
 
-    ngOnInit() {}
+    /**
+     * Getter for the URL of the contact page
+     * of the AWG project website
+     * ({@link https://anton-webern.ch/index.php?id=41}).
+     *
+     * @returns {string} The url of the contact page
+     * of the AWG project website.
+     */
+    get awgContactUrl(): string {
+        return this._awgContactUrl;
+    }
 }
diff --git a/src/app/views/structure-view/structure-routing.module.ts b/src/app/views/structure-view/structure-routing.module.ts
index 1cc53e5f3a..4c9174934b 100644
--- a/src/app/views/structure-view/structure-routing.module.ts
+++ b/src/app/views/structure-view/structure-routing.module.ts
@@ -3,6 +3,7 @@ import { Routes, RouterModule } from '@angular/router';
 
 import { StructureViewComponent } from '@awg-views/structure-view/structure-view.component';
 
+/* routes of the StructureModule */
 const structureRoutes: Routes = [
     {
         path: '',
@@ -10,10 +11,19 @@ const structureRoutes: Routes = [
     }
 ];
 
+/**
+ * Routed components of the {@link StructureModule}:
+ * {@link StructureViewComponent}.
+ */
+export const routedStructureComponents = [StructureViewComponent];
+
+/**
+ * Structure module routing.
+ *
+ * It activates the structureRoutes.
+ */
 @NgModule({
     imports: [RouterModule.forChild(structureRoutes)],
     exports: [RouterModule]
 })
 export class StructureRoutingModule {}
-
-export const routedComponents = [StructureViewComponent];
diff --git a/src/app/views/structure-view/structure-view.component.ts b/src/app/views/structure-view/structure-view.component.ts
index 4fba94062d..c03fc7e3d8 100644
--- a/src/app/views/structure-view/structure-view.component.ts
+++ b/src/app/views/structure-view/structure-view.component.ts
@@ -1,21 +1,61 @@
-import { Component, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 
+/**
+ * The StructureView component.
+ *
+ * It contains the structure view section of the app
+ * with an {@link HeadingComponent} and a structure overview.
+ */
 @Component({
     selector: 'awg-structure-view',
     templateUrl: './structure-view.component.html',
-    styleUrls: ['./structure-view.component.css']
+    styleUrls: ['./structure-view.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class StructureViewComponent implements OnInit {
+    /**
+     * Public variable: structureTitle.
+     *
+     * It keeps the title for the heading component
+     * of the structure view section.
+     */
     structureTitle = 'Datenstrukturmodell';
+
+    /**
+     * Public variable: structureId.
+     *
+     * It keeps the id for the heading component
+     * of the structure view section.
+     */
     structureId = 'structure';
 
+    /**
+     * Constructor of the StructureViewComponent.
+     *
+     * It declares a private Router instance.
+     *
+     * @param {Router} router Instance of the Angular router.
+     */
     constructor(private router: Router) {}
 
+    /**
+     * Angular life cycle hook: ngOnInit.
+     *
+     * It calls the containing methods
+     * when initializing the component.
+     */
     ngOnInit() {
         this.routeToSidenav();
     }
 
+    /**
+     * Public method: routeToSidenav.
+     *
+     * It activates the secondary outlet with the structure-info.
+     *
+     * @returns {void} Activates the structure-info side outlet.
+     */
     routeToSidenav(): void {
         // opens the side-info outlet while preserving the router fragment for scrolling
         this.router.navigate([{ outlets: { side: 'structureInfo' } }], {
diff --git a/src/app/views/structure-view/structure.module.ts b/src/app/views/structure-view/structure.module.ts
index 40ce25cc9f..ee778650da 100644
--- a/src/app/views/structure-view/structure.module.ts
+++ b/src/app/views/structure-view/structure.module.ts
@@ -1,10 +1,18 @@
 import { NgModule } from '@angular/core';
 import { SharedModule } from '@awg-shared/shared.module';
 
-import { StructureRoutingModule, routedComponents } from './structure-routing.module';
+/* Routing Module */
+import { StructureRoutingModule, routedStructureComponents } from './structure-routing.module';
 
+/**
+ * The structure module.
+ *
+ * It embeds the {@link StructureViewComponent} and its
+ * [routing definition]{@link StructureRoutingModule}
+ * as well as the {@link SharedModule}.
+ */
 @NgModule({
     imports: [SharedModule, StructureRoutingModule],
-    declarations: [routedComponents]
+    declarations: [routedStructureComponents]
 })
 export class StructureModule {}
diff --git a/src/assets/data/convolute.json b/src/assets/data/folio.json
similarity index 100%
rename from src/assets/data/convolute.json
rename to src/assets/data/folio.json
diff --git a/src/assets/data/sourcelist.json b/src/assets/data/sourcelist.json
index 552e06aca0..b7ced953fe 100644
--- a/src/assets/data/sourcelist.json
+++ b/src/assets/data/sourcelist.json
@@ -1,49 +1,58 @@
 {
-	"sources": [{
-		"siglum": "A",
-		"type": "Skizzen",
-		"location": "Basel, Paul Sacher Stiftung, Sammlung Anton Webern.",
-        "linkTo": "sourceA"
-	}, {
-        "siglum": "B",
-		"type": "Autograph von Nr. I.",
-		"location": "Basel, Paul Sacher Stiftung, Sammlung Anton Webern.",
-        "linkTo": "sourceNotA"
-	}, {
-
-        "siglum": "C",
-		"type": "Autograph von Nr. I–IV.",
-		"location": "Basel, Paul Sacher Stiftung, Sammlung Anton Webern.",
-        "linkTo": "sourceNotA"
-	}, {
-        "siglum": "D",
-        "type": "Autograph von Nr. IV.",
-        "location": "London, British Library, O. W. Neighbour Collection.",
-        "linkTo": "sourceNotA"
-    }, {
-        "siglum": "E",
-		"type": "Druck von Nr. I, in: <em>Musikblätter des Anbruch</em> IV (Mai 1922).",
-		"location": "",
-        "linkTo": "sourceNotA"
-	}, {
-        "siglum": "E<sup>1</sup>",
-		"type": "Handexemplar von <a (click)=\"ref.openModal('sourceNotA')\"><strong>E</strong></a>.",
-		"location": "Basel, Paul Sacher Stiftung, Sammlung Anton Webern.",
-        "linkTo": "sourceNotA"
-	}, {
-        "siglum": "F",
-		"type": "Autograph.",
-		"location": "New York, NY, Pierpont Morgan Library, Dept. of Music Manuscripts and Books, Robert Owen Lehman Collection, W376.L716.",
-        "linkTo": "sourceNotA"
-	}, {
-        "siglum": "G",
-		"type": "Druck.",
-		"location": "Wien: Universal Edition, 1925.",
-        "linkTo": "sourceNotA"
-	}, {
-        "siglum": "G<sup>1</sup>",
-		"type": "Handexemplar von <a (click)=\"ref.openModal('sourceNotA')\"><strong>G</strong></a>.",
-		"location": "Washington, DC, Library of Congress, Moldenhauer Archives, Box-Folder: 59/10.",
-        "linkTo": "sourceNotA"
-	}]
+    "sources": [
+        {
+            "siglum": "A",
+            "type": "Skizzen",
+            "location": "Basel, Paul Sacher Stiftung, Sammlung Anton Webern.",
+            "linkTo": "sourceA"
+        },
+        {
+            "siglum": "B",
+            "type": "Autograph von Nr. I.",
+            "location": "Basel, Paul Sacher Stiftung, Sammlung Anton Webern.",
+            "linkTo": "sourceNotA"
+        },
+        {
+            "siglum": "C",
+            "type": "Autograph von Nr. I–IV.",
+            "location": "Basel, Paul Sacher Stiftung, Sammlung Anton Webern.",
+            "linkTo": "sourceNotA"
+        },
+        {
+            "siglum": "D",
+            "type": "Autograph von Nr. IV.",
+            "location": "London, British Library, O. W. Neighbour Collection.",
+            "linkTo": "sourceNotA"
+        },
+        {
+            "siglum": "E",
+            "type": "Druck von Nr. I, in: <em>Musikblätter des Anbruch</em> IV (Mai 1922).",
+            "location": "",
+            "linkTo": "sourceNotA"
+        },
+        {
+            "siglum": "E<sup>1</sup>",
+            "type": "Handexemplar von <a (click)=\"ref.openModal('sourceNotA')\"><strong>E</strong></a>.",
+            "location": "Basel, Paul Sacher Stiftung, Sammlung Anton Webern.",
+            "linkTo": "sourceNotA"
+        },
+        {
+            "siglum": "F",
+            "type": "Autograph.",
+            "location": "New York, NY, Pierpont Morgan Library, Dept. of Music Manuscripts and Books, Robert Owen Lehman Collection, W376.L716.",
+            "linkTo": "sourceNotA"
+        },
+        {
+            "siglum": "G",
+            "type": "Druck.",
+            "location": "Wien: Universal Edition, 1925.",
+            "linkTo": "sourceNotA"
+        },
+        {
+            "siglum": "G<sup>1</sup>",
+            "type": "Handexemplar von <a (click)=\"ref.openModal('sourceNotA')\"><strong>G</strong></a>.",
+            "location": "Washington, DC, Library of Congress, Moldenhauer Archives, Box-Folder: 59/10.",
+            "linkTo": "sourceNotA"
+        }
+    ]
 }
diff --git a/src/assets/data/sheets.json b/src/assets/data/svg-sheets.json
similarity index 100%
rename from src/assets/data/sheets.json
rename to src/assets/data/svg-sheets.json
diff --git a/src/assets/data/textcritics.json b/src/assets/data/textcritics.json
index 499396e476..cd9f806707 100644
--- a/src/assets/data/textcritics.json
+++ b/src/assets/data/textcritics.json
@@ -1,61 +1,76 @@
 {
-	"Aa:SkI/2": [{
-		"measure": "10",
-		"system": "12",
-		"location": "1. Note",
-		"comment": "Viertelnote überschreibt Halbe Note."
-	}, {
-		"measure": "10",
-		"system": "12",
-		"location": "2. Note",
-		"comment": "&#9838;e oder &#9837;es (?). (Siehe auch System 13 2/4: e<sup>1</sup>/as<sup>1</sup> oder [&#9837;]es<sup>1</sup>/as<sup>1</sup>?) Vorgeschlagene Entzifferung mit Blick auf eindeutig entzifferbare Akzidenzien an entsprechender Stelle in <a (click)=\"ref.openModal('sheetComingSoon')\"><strong>Aa:SkI/1</strong></a> T. [11], <a (click)=\"ref.selectSvgFile('Aa:SkI/3')\"><strong>Aa:SkI/3</strong></a> und <a (click)=\"ref.selectSvgFile('Aa:SkI/5')\"><strong>Aa:SkI/5</strong></a> sowie in den <a (click)=\"ref.openModal('editionComingSoon')\">Reinschrift- bzw. Druckfassungen</a> aus <a (click)=\"ref.openModal('sourceNotA')\"><strong>B</strong></a>, <a (click)=\"ref.openModal('sourceNotA')\"><strong>C</strong></a>, <a (click)=\"ref.openModal('sourceNotA')\"><strong>E</strong></a>, <a (click)=\"ref.openModal('sourceNotA')\"><strong>F</strong></a> und <a (click)=\"ref.openModal('sourceNotA')\"><strong>G</strong></a>."
-	}, {
-		"measure": "[11]",
-		"system": "14",
-		"location": "(1/4)",
-		"comment": "punktierte Achtelpause, Sechzehntelnote &#9837;b radiert."
-	}, {
-		"measure": "[12]",
-		"system": "13",
-		"location": "",
-		"comment": "radierte, nicht entzifferbare Schicht."
-	}],
-	"Aa:SkI/3": [{
-		"measure": "10",
-		"system": "9",
-		"location": "2/4",
-		"comment": "c gestrichen; &#9838;e oder &#9837;es (?)."
-	}, {
-		"measure": "11",
-		"system": "10",
-		"location": "1.-2. Note",
-		"comment": "Triole aus Viertelnote und Achtelnote überschreibt zwei zusammengebalkte Achtelnoten."
-	}, {
-		"measure": "11",
-		"system": "10",
-		"location": "nach 2/4",
-		"comment": "Radierspuren."
-	}],
-	"Aa:SkI/4": [{
-		"measure": "10",
-		"system": "6",
-		"location": "",
-		"comment": "Achtelfähnchen gestrichen."
-	}, {
-		"measure": "10",
-		"system": "5",
-		"location": "3. Note",
-		"comment": "Ansatz zu Notenkopf c<sup>2</sup> und f<sup>1</sup>(?)."
-	}],
-	"Aa:SkI/5": [{
-		"measure": "10",
-		"system": "9",
-		"location": "3/8",
-		"comment": "&#9837; zu ces<sup>1</sup> überschreibt &#9838; zu c<sup>1</sup>. (Oder: &#9837;ces<sup>1</sup> überschreibt &#9838;h?)."
-	}, {
-		"measure": "11",
-		"system": "9",
-		"location": "1/4",
-		"comment": "sic: Text <i>dir</i> (statt <i>mir</i>)."
-	}]
+    "Aa:SkI/2": [
+        {
+            "measure": "10",
+            "system": "12",
+            "position": "1. Note",
+            "comment": "Viertelnote überschreibt Halbe Note."
+        },
+        {
+            "measure": "10",
+            "system": "12",
+            "position": "2. Note",
+            "comment": "&#9838;e oder &#9837;es (?). (Siehe auch System 13 2/4: e<sup>1</sup>/as<sup>1</sup> oder [&#9837;]es<sup>1</sup>/as<sup>1</sup>?) Vorgeschlagene Entzifferung mit Blick auf eindeutig entzifferbare Akzidenzien an entsprechender Stelle in <a (click)=\"ref.openModal('sheetComingSoon')\"><strong>Aa:SkI/1</strong></a> T. [11], <a (click)=\"ref.selectSvgSheet('Aa:SkI/3')\"><strong>Aa:SkI/3</strong></a> und <a (click)=\"ref.selectSvgSheet('Aa:SkI/5')\"><strong>Aa:SkI/5</strong></a> sowie in den <a (click)=\"ref.openModal('editionComingSoon')\">Reinschrift- bzw. Druckfassungen</a> aus <a (click)=\"ref.openModal('sourceNotA')\"><strong>B</strong></a>, <a (click)=\"ref.openModal('sourceNotA')\"><strong>C</strong></a>, <a (click)=\"ref.openModal('sourceNotA')\"><strong>E</strong></a>, <a (click)=\"ref.openModal('sourceNotA')\"><strong>F</strong></a> und <a (click)=\"ref.openModal('sourceNotA')\"><strong>G</strong></a>."
+        },
+        {
+            "measure": "[11]",
+            "system": "14",
+            "position": "(1/4)",
+            "comment": "punktierte Achtelpause, Sechzehntelnote &#9837;b radiert."
+        },
+        {
+            "measure": "[12]",
+            "system": "13",
+            "position": "",
+            "comment": "radierte, nicht entzifferbare Schicht."
+        }
+    ],
+    "Aa:SkI/3": [
+        {
+            "measure": "10",
+            "system": "9",
+            "position": "2/4",
+            "comment": "c gestrichen; &#9838;e oder &#9837;es (?)."
+        },
+        {
+            "measure": "11",
+            "system": "10",
+            "position": "1.-2. Note",
+            "comment": "Triole aus Viertelnote und Achtelnote überschreibt zwei zusammengebalkte Achtelnoten."
+        },
+        {
+            "measure": "11",
+            "system": "10",
+            "position": "nach 2/4",
+            "comment": "Radierspuren."
+        }
+    ],
+    "Aa:SkI/4": [
+        {
+            "measure": "10",
+            "system": "6",
+            "position": "",
+            "comment": "Achtelfähnchen gestrichen."
+        },
+        {
+            "measure": "10",
+            "system": "5",
+            "position": "3. Note",
+            "comment": "Ansatz zu Notenkopf c<sup>2</sup> und f<sup>1</sup>(?)."
+        }
+    ],
+    "Aa:SkI/5": [
+        {
+            "measure": "10",
+            "system": "9",
+            "position": "3/8",
+            "comment": "&#9837; zu ces<sup>1</sup> überschreibt &#9838; zu c<sup>1</sup>. (Oder: &#9837;ces<sup>1</sup> überschreibt &#9838;h?)."
+        },
+        {
+            "measure": "11",
+            "system": "9",
+            "position": "1/4",
+            "comment": "sic: Text <i>dir</i> (statt <i>mir</i>)."
+        }
+    ]
 }
diff --git a/src/assets/img/logos/github.png b/src/assets/img/logos/github.png
new file mode 100644
index 0000000000..8b25551a97
Binary files /dev/null and b/src/assets/img/logos/github.png differ
diff --git a/src/assets/img/logos/github.svg b/src/assets/img/logos/github.svg
new file mode 100644
index 0000000000..38997125e4
--- /dev/null
+++ b/src/assets/img/logos/github.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>GitHub icon</title><path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"/></svg>
\ No newline at end of file
diff --git a/src/browserslist b/src/browserslist
deleted file mode 100644
index fcb53f03c0..0000000000
--- a/src/browserslist
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file is currently used by autoprefixer to adjust CSS to support the below specified browsers
-# For additional information regarding the format and rule options, please see:
-# https://github.com/browserslist/browserslist#queries
-#
-# For IE 9-11 support, please remove 'not' from the last line of the file and adjust as needed
-
-> 0.5%
-last 2 versions
-Firefox ESR
-not dead
-IE 9-11
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 5d08331620..f669467271 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -1,3 +1,10 @@
+/**
+ * The environment setting for production.
+ *
+ * `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
+ *
+ * The list of file replacements can be found in `angular.json`.
+ */
 export const environment = {
     production: true
 };
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 6b323087cb..9d7aed7492 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -1,7 +1,12 @@
 // This file can be replaced during build by using the `fileReplacements` array.
-// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
-// The list of file replacements can be found in `angular.json`.
 
+/**
+ * The default environment setting (non-production).
+ *
+ * `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
+ *
+ * The list of file replacements can be found in `angular.json`.
+ */
 export const environment = {
     production: false
 };
diff --git a/src/index.html b/src/index.html
index 3a2521f819..126b9643bc 100644
--- a/src/index.html
+++ b/src/index.html
@@ -69,7 +69,7 @@
                 // cf. https://stackoverflow.com/questions/1251922/is-there-a-way-to-stop-google-analytics-counting-development-work-as-hits#8178283
                 console.log('Running non-production google analytics replacement now');
                 ga = function(arg) {
-                    console.info('ga:', arguments);
+                    // console.info('ga:', arguments);
                 };
             }
             ga('create', 'UA-64657372-2', 'auto');
diff --git a/src/plugins/dateConverter.js b/src/plugins/dateConverter.js
index 5d15d3fcf0..87de82efd8 100644
--- a/src/plugins/dateConverter.js
+++ b/src/plugins/dateConverter.js
@@ -1,6 +1,5 @@
-(function (angular) {
-
-/*
+(function(angular) {
+    /*
        JavaScript functions for the Fourmilab Calendar Converter
 
                   by John Walker  --  September, MIM
@@ -9,230 +8,357 @@
                 This program is in the public domain.
 */
 
-/*
+    /*
        extended (2009 - 2010) by Lukas Rosenthaler, Patrick Ryf, Tobias Schweizer
 */
-/*
+    /*
 		modified as ANGULAR Plugin (2016) by Stefan Münnich
 */
 
-	//INIT
-	var J0000 = 1721424.5;                // Julian date of Gregorian epoch: 0000-01-01
-	var J1970 = 2440587.5;                // Julian date at Unix epoch: 1970-01-01
-	var JMJD  = 2400000.5;                // Epoch of Modified Julian Date system
-	var J1900 = 2415020.5;                // Epoch (day 1) of Excel 1900 date system (PC)
-	var J1904 = 2416480.5;                // Epoch (day 0) of Excel 1904 date system (Mac)
-
-	var GREGORIAN_EPOCH = 1721425.5;
-
-	var NormLeap = new Array("Normal year", "Leap year");
-
-	var calendars = {
-			GREGORIAN: {name: 'Gregorian', short: 'G', n_months: 12},
-			JULIAN: {name: 'Julian', short: 'Ju', n_months: 12},
-			JEWISH: {name: 'Jewish', short: 'Je', n_months: 13},
-			FRENCH: {name: 'Revol.', short: 'R', n_months: 13}
-	};
-
-	var weekday = ['So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa'];
-	//var weekday = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
-
-	var months = {
-		GREGORIAN: ['ZERO', 'Jan', 'Feb', 'März', 'Apr', 'Mai', 'Juni', 'Juli', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez'],
-		// GREGORIAN: ['ZERO', 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
-		JULIAN: ['ZERO', 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
-		JEWISH: ['ZERO', 'Tishri', 'Heshvan', 'Kislev', 'Tevet', 'Shevat', 'AdarI', 'AdarII', 'Nisan', 'Iyyar', 'Sivan', 'Tammuz', 'Av', 'Elul'],
-		FRENCH: ['ZERO', 'Vendemiaire', 'Brumaire', 'Frimaire', 'Nivose', 'Pluviose', 'Ventose', 'Germinal', 'Floreal', 'Prairial', 'Messidor', 'Thermidor', 'Fructidor', 'Extra']
-	};
-
-	var months_long = {
-		GREGORIAN: ['ZERO', 'Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember'],
-		// GREGORIAN: ['ZERO', 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
-		JULIAN: ['ZERO', 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
-		JEWISH: ['ZERO', 'Tishri', 'Heshvan', 'Kislev', 'Tevet', 'Shevat', 'AdarI', 'AdarII', 'Nisan', 'Iyyar', 'Sivan', 'Tammuz', 'Av', 'Elul'],
-		FRENCH: ['ZERO', 'Vendemiaire', 'Brumaire', 'Frimaire', 'Nivose', 'Pluviose', 'Ventose', 'Germinal', 'Floreal', 'Prairial', 'Messidor', 'Thermidor', 'Fructidor', 'Extra']
-	};
-
-	//                          <snip> code </snip>             //
-
-	//  MOD
-	function mod(a, b) {
-		return a - (b * Math.floor(a / b));
-	}
-
-	//  JWDAY
-	function jwday(j) {
-		j = Number(j);
-		return mod(Math.floor((j + 1.5)), 7);
-	}
-
-	//  LEAP_GREGORIAN  --  Is a given year in the Gregorian calendar a leap year ?
-	function leap_gregorian(year) {
-	    year = parseInt(year);
-	    return ((year % 4) == 0) && (!(((year % 100) == 0) && ((year % 400) != 0)));
-	}
-
-	//  GREGORIAN_TO_JD  --  Determine Julian day number from Gregorian calendar date
-	function gregorian_to_jd(year, month, day)
-	{
-	    return (GREGORIAN_EPOCH - 1) +
-	           (365 * (year - 1)) +
-	           Math.floor((year - 1) / 4) +
-	           (-Math.floor((year - 1) / 100)) +
-	           Math.floor((year - 1) / 400) +
-	           Math.floor((((367 * month) - 362) / 12) +
-	           ((month <= 2) ? 0 : (leap_gregorian(year) ? -1 : -2)) + day);
-	} //END gregorian_to_jd (func)
-
-	//  JD_TO_GREGORIAN  --  Calculate Gregorian calendar date from Julian day
-	function jd_to_gregorian(jd) {
-	    var wjd, depoch, quadricent, dqc, cent, dcent, quad, dquad,
-	        yindex, dyindex, year, yearday, leapadj;
-
-	    wjd = Math.floor(jd - 0.5) + 0.5;
-	    depoch = wjd - GREGORIAN_EPOCH;
-	    quadricent = Math.floor(depoch / 146097);
-	    dqc = mod(depoch, 146097);
-	    cent = Math.floor(dqc / 36524);
-	    dcent = mod(dqc, 36524);
-	    quad = Math.floor(dcent / 1461);
-	    dquad = mod(dcent, 1461);
-	    yindex = Math.floor(dquad / 365);
-	    year = (quadricent * 400) + (cent * 100) + (quad * 4) + yindex;
-	    if (!((cent == 4) || (yindex == 4))) {
-	        year++;
-	    }
-	    yearday = wjd - gregorian_to_jd(year, 1, 1);
-	    leapadj = ((wjd < gregorian_to_jd(year, 3, 1)) ? 0
-	                                                  :
-	                  (leap_gregorian(year) ? 1 : 2)
-	              );
-	    month = Math.floor((((yearday + leapadj) * 12) + 373) / 367);
-	    day = (wjd - gregorian_to_jd(year, month, 1)) + 1;
-	    if (year <= 0) year--; // correction for PHPvar JULIAN_EPOCH = 1721423.5;
-
-	    return new Array(year, month, day);
-	} // END jd_to_gregorian (func)
-
-	function jdc_to_date (jdc, cal) {
-			jdc = parseInt(jdc);
-			var dateobj = {};
-			var tmparr;
-			switch (cal) {
-				case 'GREGORIAN':
-				case 'gregorian': {
-					tmparr = jd_to_gregorian(jdc);
-					break;
-				}
-				case 'JULIAN':
-				case 'julian': {
-					tmparr = S.jd_to_julian(jdc);
-					break;
-				}
-				case 'JEWISH':
-				case 'jewish': {
-					tmparr = S.jd_to_hebrew(jdc);
-					break;
-				}
-				case 'FRENCH':
-				case 'french': {
-					tmparr = S.jd_to_french_revolutionary(jdc);
-					break;
-				}
-			}
-			dateobj.year = tmparr[0];
-			dateobj.month = tmparr[1];
-			dateobj.day = tmparr[2];
-			dateobj.weekday = jwday(jdc);
-
-			return dateobj;
-		} // END jdc_to_date (func)
-
-
-	/**
-	 * Dateobject:
-	 * - <i>name</i>.dateval1 (JDC)
-	 * - <i>name</i>.dateval2 (JDC)
-	 * - <i>name</i>.dateprecision1 ("DAY", "MONTH", "YEAR")
-	 * - <i>name</i>.dateprecision2 ("DAY", "MONTH", "YEAR")
-	 * - <i>name</i>.calendar ("GREGORIAN", "JULIAN", "JEWISH", "FRENCH")
-	 */
-
-	return dateConverter = function (dateobj) {
-		var $that = this;
-		var d1 = jdc_to_date(dateobj.dateval1, dateobj.calendar);
-		var d2 = jdc_to_date(dateobj.dateval2, dateobj.calendar);
-		var datestr = '';
-		if (dateobj.dateprecision1 == dateobj.dateprecision2) {
-			//
-			// same precisions for start- and end-date
-			//
-			switch (dateobj.dateprecision1) {
-				case 'DAY': {
-					if ((d1.year == d2.year) && (d1.month == d2.month) && (d1.day == d2.day)) {
-						datestr = '[' + weekday[d1.weekday] + '] ' + d1.day + '. ' + months[dateobj.calendar][d1.month] + ' ' + d1.year;
-					}
-					else {
-						datestr = '[' + weekday[d1.weekday] + '] ' + d1.day + '. ' + months[dateobj.calendar][d1.month] + ' ' + d1.year + ' – [' + weekday[d2.weekday] + '] ' + d2.day + '. ' + months[dateobj.calendar][d2.month] + ' ' + d2.year;
-					}
-					break;
-				}
-				case 'MONTH': {
-					if ((d1.year == d2.year) && (d1.month == d2.month)) {
-						datestr = months[dateobj.calendar][d1.month] + ' ' + d1.year;
-					}
-					else {
-						datestr = months[dateobj.calendar][d1.month] + ' ' + d1.year + ' – ' + months[dateobj.calendar][d2.month] + ' ' + d2.year;
-					}
-					break;
-				}
-				case 'YEAR': {
-					if (d1.year == d2.year) {
-						datestr = d1.year;
-					}
-					else {
-						datestr = d1.year + '–' + d2.year;
-					}
-					break;
-				}
-			} // END switch(precision1)
-		}
-		else {
-			//
-			// different precisions for start- and end-date
-			//
-			switch (dateobj.dateprecision1) {
-				case 'DAY': {
-					datestr = '[' + weekday[d1.weekday] + '] ' +  d1.day + '. ' + months[dateobj.calendar][d1.month] + ' ' + d1.year;
-					break;
-				}
-				case 'MONTH': {
-					datestr = months[dateobj.calendar][d1.month] + ' ' + d1.year;
-					break;
-				}
-				case 'YEAR': {
-					datestr = d1.year;
-					break;
-				}
-			} // switch(precision1)
-			datestr += ' – ';
-			switch (dateobj.dateprecision2) {
-				case 'DAY': {
-					datestr += '[' + weekday[d2.weekday] + '] ' +  d2.day + '. ' + months[dateobj.calendar][d2.month] + ' ' + d2.year;
-					break;
-				}
-				case 'MONTH': {
-					datestr += months[dateobj.calendar][d2.month] + ' ' + d2.year;
-					break;
-				}
-				case 'YEAR': {
-					datestr += d2.year;
-					break;
-				}
-			} // END switch(precision2)
-		}
-		datestr += ' (' + calendars[dateobj.calendar].short + ')';
-
-		return datestr;
-	};
-}(window.angular));
+    //INIT
+    var J0000 = 1721424.5; // Julian date of Gregorian epoch: 0000-01-01
+    var J1970 = 2440587.5; // Julian date at Unix epoch: 1970-01-01
+    var JMJD = 2400000.5; // Epoch of Modified Julian Date system
+    var J1900 = 2415020.5; // Epoch (day 1) of Excel 1900 date system (PC)
+    var J1904 = 2416480.5; // Epoch (day 0) of Excel 1904 date system (Mac)
+
+    var GREGORIAN_EPOCH = 1721425.5;
+
+    var NormLeap = new Array('Normal year', 'Leap year');
+
+    var calendars = {
+        GREGORIAN: { name: 'Gregorian', short: 'G', n_months: 12 },
+        JULIAN: { name: 'Julian', short: 'Ju', n_months: 12 },
+        JEWISH: { name: 'Jewish', short: 'Je', n_months: 13 },
+        FRENCH: { name: 'Revol.', short: 'R', n_months: 13 }
+    };
+
+    var weekday = ['So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa'];
+    //var weekday = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
+
+    var months = {
+        GREGORIAN: ['ZERO', 'Jan', 'Feb', 'März', 'Apr', 'Mai', 'Juni', 'Juli', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez'],
+        // GREGORIAN: ['ZERO', 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
+        JULIAN: ['ZERO', 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
+        JEWISH: [
+            'ZERO',
+            'Tishri',
+            'Heshvan',
+            'Kislev',
+            'Tevet',
+            'Shevat',
+            'AdarI',
+            'AdarII',
+            'Nisan',
+            'Iyyar',
+            'Sivan',
+            'Tammuz',
+            'Av',
+            'Elul'
+        ],
+        FRENCH: [
+            'ZERO',
+            'Vendemiaire',
+            'Brumaire',
+            'Frimaire',
+            'Nivose',
+            'Pluviose',
+            'Ventose',
+            'Germinal',
+            'Floreal',
+            'Prairial',
+            'Messidor',
+            'Thermidor',
+            'Fructidor',
+            'Extra'
+        ]
+    };
+
+    var months_long = {
+        GREGORIAN: [
+            'ZERO',
+            'Januar',
+            'Februar',
+            'März',
+            'April',
+            'Mai',
+            'Juni',
+            'Juli',
+            'August',
+            'September',
+            'Oktober',
+            'November',
+            'Dezember'
+        ],
+        // GREGORIAN: ['ZERO', 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
+        JULIAN: [
+            'ZERO',
+            'January',
+            'February',
+            'March',
+            'April',
+            'May',
+            'June',
+            'July',
+            'August',
+            'September',
+            'October',
+            'November',
+            'December'
+        ],
+        JEWISH: [
+            'ZERO',
+            'Tishri',
+            'Heshvan',
+            'Kislev',
+            'Tevet',
+            'Shevat',
+            'AdarI',
+            'AdarII',
+            'Nisan',
+            'Iyyar',
+            'Sivan',
+            'Tammuz',
+            'Av',
+            'Elul'
+        ],
+        FRENCH: [
+            'ZERO',
+            'Vendemiaire',
+            'Brumaire',
+            'Frimaire',
+            'Nivose',
+            'Pluviose',
+            'Ventose',
+            'Germinal',
+            'Floreal',
+            'Prairial',
+            'Messidor',
+            'Thermidor',
+            'Fructidor',
+            'Extra'
+        ]
+    };
+
+    //                          <snip> code </snip>             //
+
+    //  MOD
+    function mod(a, b) {
+        return a - b * Math.floor(a / b);
+    }
+
+    //  JWDAY
+    function jwday(j) {
+        j = Number(j);
+        return mod(Math.floor(j + 1.5), 7);
+    }
+
+    //  LEAP_GREGORIAN  --  Is a given year in the Gregorian calendar a leap year ?
+    function leap_gregorian(year) {
+        year = parseInt(year);
+        return year % 4 == 0 && !(year % 100 == 0 && year % 400 != 0);
+    }
+
+    //  GREGORIAN_TO_JD  --  Determine Julian day number from Gregorian calendar date
+    function gregorian_to_jd(year, month, day) {
+        return (
+            GREGORIAN_EPOCH -
+            1 +
+            365 * (year - 1) +
+            Math.floor((year - 1) / 4) +
+            -Math.floor((year - 1) / 100) +
+            Math.floor((year - 1) / 400) +
+            Math.floor((367 * month - 362) / 12 + (month <= 2 ? 0 : leap_gregorian(year) ? -1 : -2) + day)
+        );
+    } //END gregorian_to_jd (func)
+
+    //  JD_TO_GREGORIAN  --  Calculate Gregorian calendar date from Julian day
+    function jd_to_gregorian(jd) {
+        var wjd, depoch, quadricent, dqc, cent, dcent, quad, dquad, yindex, dyindex, year, yearday, leapadj;
+
+        wjd = Math.floor(jd - 0.5) + 0.5;
+        depoch = wjd - GREGORIAN_EPOCH;
+        quadricent = Math.floor(depoch / 146097);
+        dqc = mod(depoch, 146097);
+        cent = Math.floor(dqc / 36524);
+        dcent = mod(dqc, 36524);
+        quad = Math.floor(dcent / 1461);
+        dquad = mod(dcent, 1461);
+        yindex = Math.floor(dquad / 365);
+        year = quadricent * 400 + cent * 100 + quad * 4 + yindex;
+        if (!(cent == 4 || yindex == 4)) {
+            year++;
+        }
+        yearday = wjd - gregorian_to_jd(year, 1, 1);
+        leapadj = wjd < gregorian_to_jd(year, 3, 1) ? 0 : leap_gregorian(year) ? 1 : 2;
+        month = Math.floor(((yearday + leapadj) * 12 + 373) / 367);
+        day = wjd - gregorian_to_jd(year, month, 1) + 1;
+        if (year <= 0) year--; // correction for PHPvar JULIAN_EPOCH = 1721423.5;
+
+        return new Array(year, month, day);
+    } // END jd_to_gregorian (func)
+
+    function jdc_to_date(jdc, cal) {
+        jdc = parseInt(jdc);
+        var dateobj = {};
+        var tmparr;
+        switch (cal) {
+            case 'GREGORIAN':
+            case 'gregorian': {
+                tmparr = jd_to_gregorian(jdc);
+                break;
+            }
+            case 'JULIAN':
+            case 'julian': {
+                tmparr = S.jd_to_julian(jdc);
+                break;
+            }
+            case 'JEWISH':
+            case 'jewish': {
+                tmparr = S.jd_to_hebrew(jdc);
+                break;
+            }
+            case 'FRENCH':
+            case 'french': {
+                tmparr = S.jd_to_french_revolutionary(jdc);
+                break;
+            }
+        }
+        dateobj.year = tmparr[0];
+        dateobj.month = tmparr[1];
+        dateobj.day = tmparr[2];
+        dateobj.weekday = jwday(jdc);
+
+        return dateobj;
+    } // END jdc_to_date (func)
+
+    /**
+     * Dateobject:
+     * - <i>name</i>.dateval1 (JDC)
+     * - <i>name</i>.dateval2 (JDC)
+     * - <i>name</i>.dateprecision1 ("DAY", "MONTH", "YEAR")
+     * - <i>name</i>.dateprecision2 ("DAY", "MONTH", "YEAR")
+     * - <i>name</i>.calendar ("GREGORIAN", "JULIAN", "JEWISH", "FRENCH")
+     */
+
+    return (dateConverter = function(dateobj) {
+        var $that = this;
+        var d1 = jdc_to_date(dateobj.dateval1, dateobj.calendar);
+        var d2 = jdc_to_date(dateobj.dateval2, dateobj.calendar);
+        var datestr = '';
+        if (dateobj.dateprecision1 == dateobj.dateprecision2) {
+            //
+            // same precisions for start- and end-date
+            //
+            switch (dateobj.dateprecision1) {
+                case 'DAY': {
+                    if (d1.year == d2.year && d1.month == d2.month && d1.day == d2.day) {
+                        datestr =
+                            '[' +
+                            weekday[d1.weekday] +
+                            '] ' +
+                            d1.day +
+                            '. ' +
+                            months[dateobj.calendar][d1.month] +
+                            ' ' +
+                            d1.year;
+                    } else {
+                        datestr =
+                            '[' +
+                            weekday[d1.weekday] +
+                            '] ' +
+                            d1.day +
+                            '. ' +
+                            months[dateobj.calendar][d1.month] +
+                            ' ' +
+                            d1.year +
+                            ' – [' +
+                            weekday[d2.weekday] +
+                            '] ' +
+                            d2.day +
+                            '. ' +
+                            months[dateobj.calendar][d2.month] +
+                            ' ' +
+                            d2.year;
+                    }
+                    break;
+                }
+                case 'MONTH': {
+                    if (d1.year == d2.year && d1.month == d2.month) {
+                        datestr = months[dateobj.calendar][d1.month] + ' ' + d1.year;
+                    } else {
+                        datestr =
+                            months[dateobj.calendar][d1.month] +
+                            ' ' +
+                            d1.year +
+                            ' – ' +
+                            months[dateobj.calendar][d2.month] +
+                            ' ' +
+                            d2.year;
+                    }
+                    break;
+                }
+                case 'YEAR': {
+                    if (d1.year == d2.year) {
+                        datestr = d1.year;
+                    } else {
+                        datestr = d1.year + '–' + d2.year;
+                    }
+                    break;
+                }
+            } // END switch(precision1)
+        } else {
+            //
+            // different precisions for start- and end-date
+            //
+            switch (dateobj.dateprecision1) {
+                case 'DAY': {
+                    datestr =
+                        '[' +
+                        weekday[d1.weekday] +
+                        '] ' +
+                        d1.day +
+                        '. ' +
+                        months[dateobj.calendar][d1.month] +
+                        ' ' +
+                        d1.year;
+                    break;
+                }
+                case 'MONTH': {
+                    datestr = months[dateobj.calendar][d1.month] + ' ' + d1.year;
+                    break;
+                }
+                case 'YEAR': {
+                    datestr = d1.year;
+                    break;
+                }
+            } // switch(precision1)
+            datestr += ' – ';
+            switch (dateobj.dateprecision2) {
+                case 'DAY': {
+                    datestr +=
+                        '[' +
+                        weekday[d2.weekday] +
+                        '] ' +
+                        d2.day +
+                        '. ' +
+                        months[dateobj.calendar][d2.month] +
+                        ' ' +
+                        d2.year;
+                    break;
+                }
+                case 'MONTH': {
+                    datestr += months[dateobj.calendar][d2.month] + ' ' + d2.year;
+                    break;
+                }
+                case 'YEAR': {
+                    datestr += d2.year;
+                    break;
+                }
+            } // END switch(precision2)
+        }
+        datestr += ' (' + calendars[dateobj.calendar].short + ')';
+
+        return datestr;
+    });
+})(window.angular);
diff --git a/src/plugins/htmlConverter.js b/src/plugins/htmlConverter.js
index f984f5d420..d9fb6b99af 100644
--- a/src/plugins/htmlConverter.js
+++ b/src/plugins/htmlConverter.js
@@ -1,13 +1,12 @@
-(function (angular) {
-
-/*
+(function(angular) {
+    /*
                     jQuery-plugin template for SALSAH
                         converts the linear standoff
                      of SALSAH richtext values to HTML
 
                      by Lukas Rosenthaler & Tobias Schweizer
 */
-/*
+    /*
 		      modified as ANGULAR Plugin (2015) by Stefan Münnich
 */
 
@@ -16,203 +15,202 @@
      * @param assigned_props The object representing the text's properties
      * @param txt The text (sequence of characters)
      * @return {String} A string which can be converted to HTML
-    */
-    return htmlConverter = function (assigned_props, txt) {
-    		var html = '';
-    		var proparr;
-    		var stack;
-    		var pos;
-    		var tmp;
-    		var tmpstack;
-    		var propname;
-    		var idx;
-    		var i, j;
-    		var lbstack;
-
-            var tagPrecedence = {
-                p: 0,
-                h1: 0,
-                h2: 0,
-                h3: 0,
-                h4: 0,
-                h5: 0,
-                h6: 0,
-                ol: 0,
-                ul: 0,
-                li: 1,
-                a: 2,
-                strong: 3,
-                u: 3,
-                s: 3,
-                em: 3,
-                span: 3,
-                sup: 3,
-                sub: 3
-            };
-
-            var localdata = {};
-            localdata.settings = { // any initializations come here
-                utf8str: '',
-                textattr: {},
-                css: {
-                    width: '100%',
-                    minHeight: '30px'
-                },
-                matching: { // match tagnames to offset labels
-                    strong: 'bold',
-                    u: 'underline',
-                    s: 'strikethrough',
-                    em: 'italic',
-                    'a': '_link',
-                    h1: 'h1',
-                    h2: 'h2',
-                    h3: 'h3',
-                    h4: 'h4',
-                    h5: 'h5',
-                    h6: 'h6',
-                    ol: 'ol',
-                    ul: 'ul',
-                    li: 'li',
-                    span: 'style',
-                    p: 'p',
-                    sup: 'sup',
-                    sub: 'sub'
+     */
+    return (htmlConverter = function(assigned_props, txt) {
+        var html = '';
+        var proparr;
+        var stack;
+        var pos;
+        var tmp;
+        var tmpstack;
+        var propname;
+        var idx;
+        var i, j;
+        var lbstack;
+
+        var tagPrecedence = {
+            p: 0,
+            h1: 0,
+            h2: 0,
+            h3: 0,
+            h4: 0,
+            h5: 0,
+            h6: 0,
+            ol: 0,
+            ul: 0,
+            li: 1,
+            a: 2,
+            strong: 3,
+            u: 3,
+            s: 3,
+            em: 3,
+            span: 3,
+            sup: 3,
+            sub: 3
+        };
+
+        var localdata = {};
+        localdata.settings = {
+            // any initializations come here
+            utf8str: '',
+            textattr: {},
+            css: {
+                width: '100%',
+                minHeight: '30px'
+            },
+            matching: {
+                // match tagnames to offset labels
+                strong: 'bold',
+                u: 'underline',
+                s: 'strikethrough',
+                em: 'italic',
+                a: '_link',
+                h1: 'h1',
+                h2: 'h2',
+                h3: 'h3',
+                h4: 'h4',
+                h5: 'h5',
+                h6: 'h6',
+                ol: 'ol',
+                ul: 'ul',
+                li: 'li',
+                span: 'style',
+                p: 'p',
+                sup: 'sup',
+                sub: 'sub'
+            }
+        };
+
+        // invert matching so that we can check for the offset names
+        var matching_inv = {};
+        for (var prop in localdata.settings.matching) {
+            matching_inv[localdata.settings.matching[prop]] = prop;
+        }
+
+        //
+        // sort keys (propnames) according to tag precedence
+        //
+        var propnames = Object.keys(assigned_props);
+
+        propnames.sort(function(a, b) {
+            return tagPrecedence[matching_inv[a]] - tagPrecedence[matching_inv[b]];
+        });
+
+        //
+        // register props (their starting and ending point) for each position in the text
+        //
+        proparr = [];
+        for (propname in propnames) {
+            // process propname by propname in the defined order (tag precedence)
+            propname = propnames[propname]; // propname is numeric (array index), get the prop's name (string)
+            for (idx in assigned_props[propname]) {
+                // process the array of assigned objects for this propname
+                pos = assigned_props[propname][idx].start;
+
+                if (proparr[pos] === undefined) {
+                    proparr[pos] = [];
+                }
+                proparr[pos].push({
+                    propname: propname,
+                    proptype: 'start'
+                });
+
+                if (proparr[pos][proparr[pos].length - 1].propname == '_link') {
+                    proparr[pos][proparr[pos].length - 1].href = assigned_props[propname][idx].href; // add href to link property
+                    if (assigned_props[propname][idx].resid !== undefined) {
+                        proparr[pos][proparr[pos].length - 1].resid = assigned_props[propname][idx].resid; // add resid to link property
+                    }
+                } else if (proparr[pos][proparr[pos].length - 1].propname == 'style') {
+                    proparr[pos][proparr[pos].length - 1].css = assigned_props[propname][idx].css; // add style
                 }
-            };
-
-    		// invert matching so that we can check for the offset names
-    		var matching_inv = {};
-    		for (var prop in localdata.settings.matching) {
-    			matching_inv[localdata.settings.matching[prop]] = prop;
-    		}
-
-    		//
-    		// sort keys (propnames) according to tag precedence
-    		//
-    		var propnames = Object.keys(assigned_props);
-
-    		propnames.sort(function(a, b) {
-    			return (tagPrecedence[matching_inv[a]] - tagPrecedence[matching_inv[b]]);
-    		});
-
-    		//
-    		// register props (their starting and ending point) for each position in the text
-    		//
-    		proparr = [];
-    		for (propname in propnames) {
-    			// process propname by propname in the defined order (tag precedence)
-    			propname = propnames[propname]; // propname is numeric (array index), get the prop's name (string)
-    			for(idx in assigned_props[propname]) {
-    				// process the array of assigned objects for this propname
-    				pos = assigned_props[propname][idx].start;
-
-    				if (proparr[pos] === undefined) {
-    					proparr[pos] = [];
-    				}
-    				proparr[pos].push({
-    					propname: propname,
-    					proptype: 'start'
-    				});
-
-    				if (proparr[pos][proparr[pos].length - 1].propname == '_link') {
-    					proparr[pos][proparr[pos].length - 1].href = assigned_props[propname][idx].href; // add href to link property
-    					if (assigned_props[propname][idx].resid !== undefined) {
-    						proparr[pos][proparr[pos].length - 1].resid = assigned_props[propname][idx].resid; // add resid to link property
-    					}
-    				} else if (proparr[pos][proparr[pos].length - 1].propname == 'style') {
-    					proparr[pos][proparr[pos].length - 1].css = assigned_props[propname][idx].css; // add style
-    				}
-
-    				pos = assigned_props[propname][idx].end;
-
-    				if (proparr[pos] === undefined) {
-    					proparr[pos] = [];
-    				}
-    				proparr[pos].push({
-    					propname: propname,
-    					proptype: 'end'
-    				});
-    			} //END for idx
-    		} //END for propname
-
-    		//
-    		// go through the single chars of the text and create html tags according to proparr
-    		//
-    		stack = [];
-    		for (i = 0; i <= txt.length; i++) {
-    			if (proparr[i] !== undefined) {
-    				// there is an entry in proparr for the current pos
-    				tmpstack = [];
-    				lbstack = [];
-    				for (j = proparr[i].length - 1; j >= 0; j--) {
-    					// go through the array from back to front (it is a stack!!)
-    					// tags which have been opened later (lower precedence -> order in proparr[position]) have to be closed first
-    					// because no overlap is allowed
-    					if (proparr[i][j].proptype == 'end' && proparr[i][j].propname != 'linebreak') {
-    						while ((tmp = stack.pop()) !== undefined) {
-    							// close tag
-    							html += '</' + matching_inv[tmp] + '>';
-    							if (tmp == proparr[i][j].propname) {
-    								// tag ends here
-    								break; // leave while loop;
-    							} else {
-    								// tag had only to be closed temporarily
-    								tmpstack.push(tmp);
-    							}
-    						}
-    						while ((tmp = tmpstack.pop()) !== undefined) {
-    							stack.push(tmp);
-    							// reopen previously closed tags
-    							html += '<' + matching_inv[tmp] + '>';
-    						}
-    					} //END if
-    				} //END for j
-    				for (j in proparr[i]) {
-    					// open tags here (according to tag precedence sorting)
-    					// add them to the stack -> the higher the index in the stack, the lower the precedence
-    					// or the tag has been added at another position (later)
-    					if (proparr[i][j].proptype == 'start') {
-    						if (proparr[i][j].propname == 'linebreak') { // only due to backwards compatibility
-    							html += '<br/>';
-    						} else if (proparr[i][j].propname == '_link') {
-    							stack.push(proparr[i][j].propname);
-    							// create an anchor tag with href
-    							var href = proparr[i][j].href;
-    							if (href === undefined && proparr[i][j].resid !== undefined) {
-    								// backwards compatibility
-    								// before, no href was set
-    								href = 'http://www.salsah.org/api/resources/' + proparr[i][j].resid;
-    							}
-    							html += '<' + matching_inv[proparr[i][j].propname] + ' href="' + href;
-    							if (proparr[i][j].resid !== undefined) {
-    								html += '" class="salsah-link">';
-    							} else {
-    								html += '">';
-    							}
-    						} else if (proparr[i][j].propname == 'style') {
-    							stack.push(proparr[i][j].propname);
-    							html += '<' + matching_inv[proparr[i][j].propname] + ' style="' + proparr[i][j].css + '">';
-
-    						}
-    						else {
-    							stack.push(proparr[i][j].propname);
-    							html += '<' + matching_inv[proparr[i][j].propname] + '>';
-    						} //END if elseif else
-    					} //END if
-    				} // END for j
-
-    			} //END if
-    			if (i < txt.length) {
-    				html += txt.charAt(i);
-    			}
-    		} //END for i
-
-    		// replace '\n' with <br>
-    		html = html.replace(/\n/g, '<br/>');
-    		// remove \r since they are represented by block elements
-    		html = html.replace(/\r/g, '');
 
-    		return html;
-    	} //END convert_lin2html (func)
+                pos = assigned_props[propname][idx].end;
 
-}(window.angular));
+                if (proparr[pos] === undefined) {
+                    proparr[pos] = [];
+                }
+                proparr[pos].push({
+                    propname: propname,
+                    proptype: 'end'
+                });
+            } //END for idx
+        } //END for propname
+
+        //
+        // go through the single chars of the text and create html tags according to proparr
+        //
+        stack = [];
+        for (i = 0; i <= txt.length; i++) {
+            if (proparr[i] !== undefined) {
+                // there is an entry in proparr for the current pos
+                tmpstack = [];
+                lbstack = [];
+                for (j = proparr[i].length - 1; j >= 0; j--) {
+                    // go through the array from back to front (it is a stack!!)
+                    // tags which have been opened later (lower precedence -> order in proparr[position]) have to be closed first
+                    // because no overlap is allowed
+                    if (proparr[i][j].proptype == 'end' && proparr[i][j].propname != 'linebreak') {
+                        while ((tmp = stack.pop()) !== undefined) {
+                            // close tag
+                            html += '</' + matching_inv[tmp] + '>';
+                            if (tmp == proparr[i][j].propname) {
+                                // tag ends here
+                                break; // leave while loop;
+                            } else {
+                                // tag had only to be closed temporarily
+                                tmpstack.push(tmp);
+                            }
+                        }
+                        while ((tmp = tmpstack.pop()) !== undefined) {
+                            stack.push(tmp);
+                            // reopen previously closed tags
+                            html += '<' + matching_inv[tmp] + '>';
+                        }
+                    } //END if
+                } //END for j
+                for (j in proparr[i]) {
+                    // open tags here (according to tag precedence sorting)
+                    // add them to the stack -> the higher the index in the stack, the lower the precedence
+                    // or the tag has been added at another position (later)
+                    if (proparr[i][j].proptype == 'start') {
+                        if (proparr[i][j].propname == 'linebreak') {
+                            // only due to backwards compatibility
+                            html += '<br/>';
+                        } else if (proparr[i][j].propname == '_link') {
+                            stack.push(proparr[i][j].propname);
+                            // create an anchor tag with href
+                            var href = proparr[i][j].href;
+                            if (href === undefined && proparr[i][j].resid !== undefined) {
+                                // backwards compatibility
+                                // before, no href was set
+                                href = 'http://www.salsah.org/api/resources/' + proparr[i][j].resid;
+                            }
+                            html += '<' + matching_inv[proparr[i][j].propname] + ' href="' + href;
+                            if (proparr[i][j].resid !== undefined) {
+                                html += '" class="salsah-link">';
+                            } else {
+                                html += '">';
+                            }
+                        } else if (proparr[i][j].propname == 'style') {
+                            stack.push(proparr[i][j].propname);
+                            html += '<' + matching_inv[proparr[i][j].propname] + ' style="' + proparr[i][j].css + '">';
+                        } else {
+                            stack.push(proparr[i][j].propname);
+                            html += '<' + matching_inv[proparr[i][j].propname] + '>';
+                        } //END if elseif else
+                    } //END if
+                } // END for j
+            } //END if
+            if (i < txt.length) {
+                html += txt.charAt(i);
+            }
+        } //END for i
+
+        // replace '\n' with <br>
+        html = html.replace(/\n/g, '<br/>');
+        // remove \r since they are represented by block elements
+        html = html.replace(/\r/g, '');
+
+        return html;
+    }); //END convert_lin2html (func)
+})(window.angular);
diff --git a/src/polyfills.ts b/src/polyfills.ts
index d15a1152a5..2f258e56c6 100644
--- a/src/polyfills.ts
+++ b/src/polyfills.ts
@@ -43,7 +43,7 @@
  *
  * (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
  * (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
- * (window as any).__zone_symbol__BLACK_LISTED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
+ * (window as any).__zone_symbol__UNPATCHED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
  *
  *  in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
  *  with the following flag, it will bypass `zone.js` patch for IE/Edge
diff --git a/src/testing/async-observable-helpers.ts b/src/testing/async-observable-helpers.ts
index 2ad05a2558..f9f5f0ce40 100644
--- a/src/testing/async-observable-helpers.ts
+++ b/src/testing/async-observable-helpers.ts
@@ -1,17 +1,27 @@
-import { defer } from 'rxjs';
+import { defer, Observable } from 'rxjs';
 
-/*
- * Create async observable that emits-once and completes
- * after a JS engine turn
+/**
+ * Test helper function: asyncData.
+ *
+ * It creates an async observable of the input data
+ * that emits-once and completes after a JS engine turn.
+ *
+ * @param {T} data The data input.
+ * @returns {Observable<T>} A resolved data promise.
  */
-export function asyncData<T>(data: T) {
+export function asyncData<T>(data: T): Observable<T> {
     return defer(() => Promise.resolve(data));
 }
 
-/*
- * Create async observable error that errors
- * after a JS engine turn
+/**
+ * Test helper function: asyncError
+ *
+ * It creates an async observable error that
+ * errors after a JS engine turn
+ *
+ * @param {any} errorObject The object to err.
+ * @returns {Observable<any>} A rejected error promise.
  */
-export function asyncError<T>(errorObject: any) {
+export function asyncError<T>(errorObject: any): Observable<any> {
     return defer(() => Promise.reject(errorObject));
 }
diff --git a/src/testing/click-helper.ts b/src/testing/click-helper.ts
index 9282e4288c..6abde8ed8e 100644
--- a/src/testing/click-helper.ts
+++ b/src/testing/click-helper.ts
@@ -1,13 +1,30 @@
 import { DebugElement } from '@angular/core';
 import { ComponentFixture, flush } from '@angular/core/testing';
 
-/** Button events to pass to `DebugElement.triggerEventHandler` for RouterLink event handler */
+/**
+ * Test helper object constant: BUTTON_CLICK_EVENTS.
+ *
+ * It provides button click events to be passed to
+ * `DebugElement.triggerEventHandler` for RouterLink event handler.
+ */
 export const BUTTON_CLICK_EVENTS = {
     left: { button: 0 },
     right: { button: 2 }
 };
 
-/** Simulate element click. Defaults to mouse left-button click event. */
+/**
+ * Test helper function: click.
+ *
+ * It simulates the click on an element.
+ * Defaults to mouse left-button click event.
+ *
+ * Exposed to be called from tests.
+ *
+ * @param {DebugElement | HTMLElement} el The element to be clicked on.
+ * @param {any} eventObj The click event object. Defaults to mouse left-button click event.
+ *
+ * @returns {void} Triggers the event handler.
+ */
 export function click(el: DebugElement | HTMLElement, eventObj: any = BUTTON_CLICK_EVENTS.left): void {
     if (el instanceof HTMLElement) {
         el.click();
@@ -16,12 +33,24 @@ export function click(el: DebugElement | HTMLElement, eventObj: any = BUTTON_CLI
     }
 }
 
-/** Simulate element click and wait for changes to be applied */
-export function clickAndAwaitChanges(clickDe: DebugElement, fixture: ComponentFixture<any>) {
+/**
+ * Test helper function: clickAndAwaitChanges.
+ *
+ * It simulates the click on an element
+ * and waits for changes to be applied.
+ *
+ * Exposed to be called from tests.
+ *
+ * @param {DebugElement } clickDe The DebugElement to be clicked on.
+ * @param {ComponentFixture<any>} fixture The component fixture on which the changes are applied.
+ *
+ * @returns {void} Triggers the click event and applies the changes to the component fixture.
+ */
+export function clickAndAwaitChanges(clickDe: DebugElement, fixture: ComponentFixture<any>): void {
     // trigger click with click helper
     click(clickDe);
 
-    // wait for changes
+    // wait for changes to be applied
     flush();
     fixture.detectChanges();
 }
diff --git a/src/testing/custom-matchers.ts b/src/testing/custom-matchers.ts
index 400ac84c66..f2d551f6fa 100644
--- a/src/testing/custom-matchers.ts
+++ b/src/testing/custom-matchers.ts
@@ -6,7 +6,23 @@ import CustomEqualityTester = jasmine.CustomEqualityTester;
 import CustomMatcher = jasmine.CustomMatcher;
 import CustomMatcherResult = jasmine.CustomMatcherResult;
 
+/**
+ * Test helper custom matcher factory: customJasmineMatchers.
+ *
+ * It exposes custom jasmine matchers to be used in unit tests.
+ *
+ * For more details on custom matchers see {@link https://stackoverflow.com/a/44996479}.
+ */
 export const customJasmineMatchers: CustomMatcherFactories = {
+    /**
+     * Test helper custom matcher: toHaveCssClass.
+     *
+     * It checks if a given element has an expected CSS class.
+     *
+     * @param {MatchersUtil} util
+     * @param {CustomEqualityTester[]} customEqualityTester
+     * @returns {CustomMatcher} The custom matcher instance.
+     */
     toHaveCssClass(util: MatchersUtil, customEqualityTester: CustomEqualityTester[]): CustomMatcher {
         return { compare: buildError(false), negativeCompare: buildError(true) };
 
@@ -22,5 +38,3 @@ export const customJasmineMatchers: CustomMatcherFactories = {
         }
     }
 };
-
-// custom matchers, see https://stackoverflow.com/a/44996479
diff --git a/src/testing/expect-helper.ts b/src/testing/expect-helper.ts
index e154da09f9..5b3232be47 100644
--- a/src/testing/expect-helper.ts
+++ b/src/testing/expect-helper.ts
@@ -1,53 +1,102 @@
-import { DebugElement } from '@angular/core';
+import { DebugElement, Type } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import Spy = jasmine.Spy;
-import { Type } from '@angular/core';
-import { CompileHtmlComponent } from '@awg-shared/compile-html';
 
-// global helper functions for expects
-
-/* get debug element and check for its existence and length*/
+// Test helper functions for expectation statements
+
+/**
+ * Test helper function: getAndExpectDebugElementByCss.
+ *
+ * It checks for existence and number of elements
+ * defined by a CSS selector in a `DebugElement`.
+ *
+ * Exposed to be called from tests.
+ *
+ * @param {DebugElement} inDe The input DebugElement to be checked.
+ * @param {string} selector The CSS selector to look for.
+ * @param {number} expected The expected number of elements in the result array.
+ * @param {number} expectedInFailMsg The expected number of elements in the result array in the fail message.
+ * @param {string} [suffixMsg] An optional message to add at the end of the expectation statement.
+ *
+ * @returns {DebugElement[]} An array of the found DebugElements.
+ */
 export function getAndExpectDebugElementByCss(
     inDe: DebugElement,
     selector: string,
-    length: number,
-    expLength: number,
+    expected: number,
+    expectedInFailMsg: number,
     suffixMsg?: string
 ): DebugElement[] {
     const outDe = inDe.queryAll(By.css(selector));
 
+    // empty string if no suffix message provided
     if (!suffixMsg) {
         suffixMsg = '';
     }
 
-    expectDebugElement(outDe, selector, length, expLength, suffixMsg);
+    expectDebugElement(outDe, selector, expected, expectedInFailMsg, suffixMsg);
 
     return outDe;
 }
 
+/**
+ * Test helper function: getAndExpectDebugElementByDirective.
+ *
+ * It checks for existence and number of elements
+ * defined by Directive in a `DebugElement`.
+ *
+ * Exposed to be called from tests.
+ *
+ * @param {DebugElement} inDe The input DebugElement to be checked.
+ * @param {Type<any>} selectorType The selector type (directive) to look for.
+ * @param {number | undefined} expected The expected number of elements in the result array.
+ * @param {number | undefined} expectedInFailMsg The expected number of elements in the result array in the fail message.
+ * @param {string} [suffixMsg] An optional message to add at the end of the expectation statement.
+ *
+ * @returns {DebugElement[]} An array of the found DebugElements.
+ */
 export function getAndExpectDebugElementByDirective(
     inDe: DebugElement,
     selectorType: Type<any>,
-    length: number | undefined,
-    expLength: number | undefined,
+    expected: number | undefined,
+    expectedInFailMsg: number | undefined,
     suffixMsg?: string
 ): DebugElement[] {
     const outDe = inDe.queryAll(By.directive(selectorType));
 
+    // empty string if no suffix message provided
     if (!suffixMsg) {
         suffixMsg = '';
     }
 
-    expectDebugElement(outDe, selectorType, length, expLength, suffixMsg);
+    expectDebugElement(outDe, selectorType, expected, expectedInFailMsg, suffixMsg);
 
     return outDe;
 }
 
-export function expectDebugElement(
+/**
+ * Test helper function: expectDebugElement (internal).
+ *
+ * It checks for existence of elements defined by
+ * CSS selector or Directive in a `DebugElement` array
+ * and throws the expectation statements.
+ *
+ * Not exposed, only called internally from {@link getAndExpectDebugElementByCss}
+ * and {@link getAndExpectDebugElementByDirective}.
+ *
+ * @param {DebugElement[]} de The input DebugElement array to be checked.
+ * @param {string | Type<any>} selector The selector (CSS or directive) to look for.
+ * @param {number | undefined} expected The expected number of elements in the input array.
+ * @param {number | undefined} expectedInFailMsg The expected number of elements in the input array in the fail message.
+ * @param {string} suffixMsg A message to add at the end of the expectation statement.
+ *
+ * @returns {void} Throws the expectation statements.
+ */
+function expectDebugElement(
     de: DebugElement[],
     selector: string | Type<any>,
-    length: number | undefined,
-    expLength: number | undefined,
+    expected: number | undefined,
+    expectedInFailMsg: number | undefined,
     suffixMsg: string
 ): void {
     let failMsg: string;
@@ -55,43 +104,67 @@ export function expectDebugElement(
     if (selector instanceof Type) {
         selector = selector.name;
     }
-    if (length === undefined) {
-        failMsg = suffixMsg ? `should be ${expLength} ${suffixMsg}` : `should be ${expLength}`;
+    if (expected === undefined) {
+        failMsg = suffixMsg ? `should be ${expectedInFailMsg} ${suffixMsg}` : `should be ${expectedInFailMsg}`;
 
         expect(de).toBeUndefined(failMsg);
     } else {
         failMsg = suffixMsg
-            ? `should have ${expLength} ${selector} ${suffixMsg}`
-            : `should have ${expLength} ${selector}`;
+            ? `should have ${expectedInFailMsg} ${selector} ${suffixMsg}`
+            : `should have ${expectedInFailMsg} ${selector}`;
 
         expect(de).toBeDefined();
-        expect(de.length).toBe(length, failMsg);
+        expect(de.length).toBe(expected, failMsg);
     }
 }
 
-/* check if, how often and with which arguments a spy has been called */
-export function expectSpyCall(spy: Spy, nTimes: number, expectedValue?: any) {
+/**
+ * Test helper function: expectSpyCall.
+ *
+ * It checks if, how often and with which arguments a spy has been called.
+ *
+ * Exposed to be called from tests.
+ *
+ * @param {Spy} spy The input spy instance.
+ * @param {number} expectedTimes The expected number of spy calls.
+ * @param {any} [expectedMostRecentValue] An optional expected value for the most recent spy call.
+ *
+ * @returns {void} Throws the expectation statements.
+ */
+export function expectSpyCall(spy: Spy, expectedTimes: number, expectedMostRecentValue?: any): void {
     // spy has been called or not
-    nTimes > 0 ? expect(spy).toHaveBeenCalled() : expect(spy).not.toHaveBeenCalled();
+    expectedTimes > 0 ? expect(spy).toHaveBeenCalled() : expect(spy).not.toHaveBeenCalled();
 
-    // spy has been called n times
-    expect(spy).toHaveBeenCalledTimes(nTimes);
+    // spy has been called expected times
+    expect(spy).toHaveBeenCalledTimes(expectedTimes);
 
     // spy has been called with value x
-    if (expectedValue && Array.isArray(expectedValue)) {
-        expectedValue.forEach((value, index) => {
+    if (expectedMostRecentValue && Array.isArray(expectedMostRecentValue)) {
+        expectedMostRecentValue.forEach((value, index) => {
             expectRecentSpyCall(spy, value, index);
         });
-    } else if (expectedValue) {
-        expectRecentSpyCall(spy, expectedValue, 0);
+    } else if (expectedMostRecentValue) {
+        expectRecentSpyCall(spy, expectedMostRecentValue, 0);
     }
 }
 
-/* check the most recent call of a spy */
-function expectRecentSpyCall(spy: Spy, expectedValue: any, index: number) {
-    if (expectedValue && expectedValue instanceof Object) {
-        expect(spy.calls.mostRecent().args[index]).toEqual(expectedValue);
-    } else if (expectedValue) {
-        expect(spy.calls.mostRecent().args[index]).toBe(expectedValue);
+/**
+ * Test helper function: expectRecentSpyCall (internal).
+ *
+ * It checks the most recent spy call.
+ *
+ * Not exposed, only called internally from {@link expectSpyCall}.
+ *
+ * @param {Spy} spy The input spy instance.
+ * @param {any} expectedMostRecentValue The expected value for the most recent spy call.
+ * @param {number} index The index value of the most recent arguments array of a spy call.
+ *
+ * @returns {void} Throws the expectation statements.
+ */
+function expectRecentSpyCall(spy: Spy, expectedMostRecentValue: any, index: number): void {
+    if (expectedMostRecentValue && expectedMostRecentValue instanceof Object) {
+        expect(spy.calls.mostRecent().args[index]).toEqual(expectedMostRecentValue);
+    } else if (expectedMostRecentValue) {
+        expect(spy.calls.mostRecent().args[index]).toBe(expectedMostRecentValue);
     }
 }
diff --git a/src/testing/mock-data/index.ts b/src/testing/mock-data/index.ts
index 18c3806384..b42eb15ed5 100644
--- a/src/testing/mock-data/index.ts
+++ b/src/testing/mock-data/index.ts
@@ -8,8 +8,17 @@
  */
 
 import { mockContextJson } from '@testing/mock-data/mockContextJson';
+import { mockResourceContextResponseJson } from '@testing/mock-data/mockResourceContextResponseJson';
+import { mockResourceDetail } from '@testing/mock-data/mockResourceDetail';
 import { mockResourceFullResponseJson } from '@testing/mock-data/mockResourceFullResponseJson';
 import { mockSearchResponseConverted } from '@testing/mock-data/mockSearchResponseConverted';
 import { mockSearchResponseJson } from '@testing/mock-data/mockSearchResponseJson';
 
-export { mockContextJson, mockResourceFullResponseJson, mockSearchResponseConverted, mockSearchResponseJson };
+export {
+    mockContextJson,
+    mockResourceContextResponseJson,
+    mockResourceDetail,
+    mockResourceFullResponseJson,
+    mockSearchResponseConverted,
+    mockSearchResponseJson
+};
diff --git a/src/testing/mock-data/mockContextJson.ts b/src/testing/mock-data/mockContextJson.ts
index 97a1548d70..ece88cd53a 100644
--- a/src/testing/mock-data/mockContextJson.ts
+++ b/src/testing/mock-data/mockContextJson.ts
@@ -1,3 +1,10 @@
+/**
+ * Test helper data file: mockContextJson.
+ *
+ * It provides a mocked ContextJson response from the Salsah API.
+ *
+ * Exposed to be called from tests.
+ */
 export const mockContextJson = {
     res_id: ['2173574', '2173577'],
     resclass_name: 'image',
diff --git a/src/testing/mock-data/mockResourceContextResponseJson.ts b/src/testing/mock-data/mockResourceContextResponseJson.ts
new file mode 100644
index 0000000000..764e839853
--- /dev/null
+++ b/src/testing/mock-data/mockResourceContextResponseJson.ts
@@ -0,0 +1,210 @@
+/**
+ * Test helper data file: mockResourceContextResponseJson.
+ *
+ * It provides a mocked ResourceContextResponseJson
+ * response from the Salsah API.
+ *
+ * Exposed to be called from tests.
+ */
+export const mockResourceContextResponseJson = {
+    status: 0,
+    userdata: {
+        lang: 'en'
+    },
+    resource_context: {
+        res_id: ['2173574', '2173577'],
+        resclass_name: 'image',
+        preview: [
+            {
+                path: 'http://www.salsah.org/core/sendlocdata.php?res=2173574&qtype=thumbnail',
+                protocol: 'file',
+                origname: 'Programm_Prag19350109_op7-1.jpg',
+                format_name: 'JPEG',
+                nx: 0,
+                ny: 0,
+                duration: '0.000',
+                fps: '0.000'
+            },
+            {
+                path: 'http://www.salsah.org/core/sendlocdata.php?res=2173577&qtype=thumbnail',
+                protocol: 'file',
+                origname: 'Programm_Prag19350109_op7-2.jpg',
+                format_name: 'JPEG',
+                nx: 0,
+                ny: 0,
+                duration: '0.000',
+                fps: '0.000'
+            }
+        ],
+        locations: [
+            [
+                {
+                    path: 'http://www.salsah.org/core/sendlocdata.php?res=2173574&qtype=thumbnail',
+                    protocol: 'file',
+                    origname: 'Programm_Prag19350109_op7-1.jpg',
+                    format_name: 'JPEG',
+                    nx: 0,
+                    ny: 0,
+                    duration: '0.000',
+                    fps: '0.000'
+                },
+                {
+                    path: 'http://www.salsah.org/core/sendlocdata.php?res=2173574&qtype=full&reduce=5',
+                    protocol: 'file',
+                    origname: 'Programm_Prag19350109_op7-1.jpg',
+                    format_name: 'JPEG2000',
+                    nx: 0,
+                    ny: 0,
+                    duration: 0,
+                    fps: 0
+                },
+                {
+                    path: 'http://www.salsah.org/core/sendlocdata.php?res=2173574&qtype=full&reduce=4',
+                    protocol: 'file',
+                    origname: 'Programm_Prag19350109_op7-1.jpg',
+                    format_name: 'JPEG2000',
+                    nx: 0,
+                    ny: 0,
+                    duration: 0,
+                    fps: 0
+                },
+                {
+                    path: 'http://www.salsah.org/core/sendlocdata.php?res=2173574&qtype=full&reduce=3',
+                    protocol: 'file',
+                    origname: 'Programm_Prag19350109_op7-1.jpg',
+                    format_name: 'JPEG2000',
+                    nx: 0,
+                    ny: 0,
+                    duration: 0,
+                    fps: 0
+                },
+                {
+                    path: 'http://www.salsah.org/core/sendlocdata.php?res=2173574&qtype=full&reduce=2',
+                    protocol: 'file',
+                    origname: 'Programm_Prag19350109_op7-1.jpg',
+                    format_name: 'JPEG2000',
+                    nx: 0,
+                    ny: 0,
+                    duration: 0,
+                    fps: 0
+                },
+                {
+                    path: 'http://www.salsah.org/core/sendlocdata.php?res=2173574&qtype=full&reduce=1',
+                    protocol: 'file',
+                    origname: 'Programm_Prag19350109_op7-1.jpg',
+                    format_name: 'JPEG2000',
+                    nx: 0,
+                    ny: 0,
+                    duration: 0,
+                    fps: 0
+                },
+                {
+                    path: 'http://www.salsah.org/core/sendlocdata.php?res=2173574&qtype=full&reduce=0',
+                    protocol: 'file',
+                    origname: 'Programm_Prag19350109_op7-1.jpg',
+                    format_name: 'JPEG2000',
+                    nx: 0,
+                    ny: 0,
+                    duration: 0,
+                    fps: 0
+                }
+            ],
+            [
+                {
+                    path: 'http://www.salsah.org/core/sendlocdata.php?res=2173577&qtype=thumbnail',
+                    protocol: 'file',
+                    origname: 'Programm_Prag19350109_op7-2.jpg',
+                    format_name: 'JPEG',
+                    nx: 0,
+                    ny: 0,
+                    duration: '0.000',
+                    fps: '0.000'
+                },
+                {
+                    path: 'http://www.salsah.org/core/sendlocdata.php?res=2173577&qtype=full&reduce=5',
+                    protocol: 'file',
+                    origname: 'Programm_Prag19350109_op7-2.jpg',
+                    format_name: 'JPEG2000',
+                    nx: 0,
+                    ny: 0,
+                    duration: 0,
+                    fps: 0
+                },
+                {
+                    path: 'http://www.salsah.org/core/sendlocdata.php?res=2173577&qtype=full&reduce=4',
+                    protocol: 'file',
+                    origname: 'Programm_Prag19350109_op7-2.jpg',
+                    format_name: 'JPEG2000',
+                    nx: 0,
+                    ny: 0,
+                    duration: 0,
+                    fps: 0
+                },
+                {
+                    path: 'http://www.salsah.org/core/sendlocdata.php?res=2173577&qtype=full&reduce=3',
+                    protocol: 'file',
+                    origname: 'Programm_Prag19350109_op7-2.jpg',
+                    format_name: 'JPEG2000',
+                    nx: 0,
+                    ny: 0,
+                    duration: 0,
+                    fps: 0
+                },
+                {
+                    path: 'http://www.salsah.org/core/sendlocdata.php?res=2173577&qtype=full&reduce=2',
+                    protocol: 'file',
+                    origname: 'Programm_Prag19350109_op7-2.jpg',
+                    format_name: 'JPEG2000',
+                    nx: 0,
+                    ny: 0,
+                    duration: 0,
+                    fps: 0
+                },
+                {
+                    path: 'http://www.salsah.org/core/sendlocdata.php?res=2173577&qtype=full&reduce=1',
+                    protocol: 'file',
+                    origname: 'Programm_Prag19350109_op7-2.jpg',
+                    format_name: 'JPEG2000',
+                    nx: 0,
+                    ny: 0,
+                    duration: 0,
+                    fps: 0
+                },
+                {
+                    path: 'http://www.salsah.org/core/sendlocdata.php?res=2173577&qtype=full&reduce=0',
+                    protocol: 'file',
+                    origname: 'Programm_Prag19350109_op7-2.jpg',
+                    format_name: 'JPEG2000',
+                    nx: 0,
+                    ny: 0,
+                    duration: 0,
+                    fps: 0
+                }
+            ]
+        ],
+        firstprop: ['Programm_Prag_19350109_Bild_1_2', 'Programm_Prag_19350109_Bild_2_2'],
+        region: ['', ''],
+        context: 2,
+        resinfo: {
+            project_id: '6',
+            person_id: '32',
+            restype_id: '125',
+            handle_id: null,
+            restype_name: 'webern:supplement',
+            restype_label: 'Supplement',
+            restype_description: 'Supplement',
+            restype_iconsrc:
+                'http://www.salsah.org/core/location.php?table=resource_type&field=icon&keyfield=id&keyvalue=125',
+            preview: null,
+            locations: null,
+            locdata: null,
+            resclass_name: 'object',
+            resclass_has_location: false,
+            lastmod: '2017-12-05 15:16:17',
+            lastmod_utc: '2017-12-05 14:16:17',
+            value_of: 0,
+            firstproperty: '[Programm:] Sdru\u017een\u00ed pro soudobou houdbu v Praze'
+        },
+        canonical_res_id: '2173561'
+    }
+};
diff --git a/src/testing/mock-data/mockResourceDetail.ts b/src/testing/mock-data/mockResourceDetail.ts
new file mode 100644
index 0000000000..8991896b5e
--- /dev/null
+++ b/src/testing/mock-data/mockResourceDetail.ts
@@ -0,0 +1,135 @@
+/**
+ * Test helper data file: mockResourceDetail.
+ *
+ * It provides a mocked ResourceDetail
+ * response from the conversion service.
+ *
+ * Exposed to be called from tests.
+ */
+export const mockResourceDetail = {
+    header: {
+        objID: '2173561',
+        icon: 'https://www.salsah.org:443/core/location.php?table=resource_type&field=icon&keyfield=id&keyvalue=125',
+        type: 'Supplement',
+        lastmod: '2017-12-05 15:16:17',
+        title: '[Programm:] Sdružení pro soudobou houdbu v Praze<br/>[Mi] 9. Jan 1935'
+    },
+    content: {
+        props: [
+            {
+                pid: '1',
+                guielement: 'text',
+                label: 'Title',
+                values: ['[Programm:] Sdružení pro soudobou houdbu v Praze']
+            },
+            {
+                pid: '597',
+                guielement: 'pulldown',
+                label: 'Art',
+                values: ['Programm']
+            },
+            {
+                pid: '25',
+                guielement: 'text',
+                label: 'Creator',
+                values: ['']
+            },
+            {
+                pid: '43',
+                guielement: 'text',
+                label: 'Ort',
+                values: ['Prag']
+            },
+            {
+                pid: '46',
+                guielement: 'date',
+                label: 'Date',
+                values: ['[Mi] 9. Jan 1935']
+            },
+            {
+                pid: '200',
+                guielement: 'richtext',
+                label: 'Standort des physischen Originals',
+                values: [null]
+            },
+            {
+                pid: '192',
+                guielement: 'richtext',
+                label: 'Beschreibung',
+                values: [null]
+            },
+            {
+                pid: '221',
+                guielement: 'richtext',
+                label: 'Inhalt',
+                values: ['<p>[Programm:] Sdružení pro soudobou houdbu v Praze</p>']
+            },
+            {
+                pid: '604',
+                guielement: 'richtext',
+                label: 'Transkription',
+                values: [null]
+            },
+            {
+                pid: '92',
+                guielement: 'richtext',
+                label: 'Literaturnachweis',
+                values: [null]
+            },
+            {
+                pid: '603',
+                guielement: 'richtext',
+                label: 'andere Quellen',
+                values: [null]
+            },
+            {
+                pid: '193',
+                guielement: 'richtext',
+                label: 'Quelle',
+                values: [null]
+            },
+            {
+                pid: '199',
+                guielement: 'richtext',
+                label: 'Kommentar',
+                values: [null]
+            }
+        ],
+        images: [
+            {
+                small: 'https://www.salsah.org:443/core/sendlocdata.php?res=2173574&qtype=full&reduce=3',
+                medium: 'https://www.salsah.org:443/core/sendlocdata.php?res=2173574&qtype=full&reduce=3',
+                big: 'https://www.salsah.org:443/core/sendlocdata.php?res=2173574&qtype=full&reduce=0',
+                description: 'Programm_Prag19350109_op7-1.jpg',
+                url: 'https://www.salsah.org:443/core/sendlocdata.php?res=2173574&qtype=full&reduce=0',
+                label: 'Programm_Prag_19350109_Bild_1_2'
+            },
+            {
+                small: 'https://www.salsah.org:443/core/sendlocdata.php?res=2173577&qtype=full&reduce=3',
+                medium: 'https://www.salsah.org:443/core/sendlocdata.php?res=2173577&qtype=full&reduce=3',
+                big: 'https://www.salsah.org:443/core/sendlocdata.php?res=2173577&qtype=full&reduce=0',
+                description: 'Programm_Prag19350109_op7-2.jpg',
+                url: 'https://www.salsah.org:443/core/sendlocdata.php?res=2173577&qtype=full&reduce=0',
+                label: 'Programm_Prag_19350109_Bild_2_2'
+            }
+        ],
+        incoming: [
+            {
+                restypeLabel: 'Chronologie',
+                links: [
+                    {
+                        id: '2173508',
+                        value:
+                            'Vier Stücke für Geige und Klavier op. 7: Aufführung (Egon Ledeč, Vl.;  Karel Reiner, Klav.). Programm: Webern, op. 7; Leopold Spinner, Zwei kleine Stücke für Geige und Klavier (1934); Ernst Kanitz, Fünf Tänze für Klavier, Nr. 1 und 3; Hans Erich Apostel, Sonatina ritmica op. 5; Egon Wellesz, Sonate für Violine solo op. 36; Ernst Krenek, Toccata und Chaconne für Klavier op. 13; Paul Amadeus Pisk, Rondo-Suite für Violine und Klavier op. 27.\r',
+                        restype: {
+                            id: '28',
+                            label: 'Chronologie',
+                            icon:
+                                'https://www.salsah.org:443/core/location.php?table=resource_type&field=icon&keyfield=id&keyvalue=28'
+                        }
+                    }
+                ]
+            }
+        ]
+    }
+};
diff --git a/src/testing/mock-data/mockResourceFullResponseJson.ts b/src/testing/mock-data/mockResourceFullResponseJson.ts
index 4f22f72e00..b3b0ff14e4 100644
--- a/src/testing/mock-data/mockResourceFullResponseJson.ts
+++ b/src/testing/mock-data/mockResourceFullResponseJson.ts
@@ -1,3 +1,11 @@
+/**
+ * Test helper data file: mockResourceFullResponseJson.
+ *
+ * It provides a mocked ResourceFullResponseJson response
+ * from the Salsah API.
+ *
+ * Exposed to be called from tests.
+ */
 export const mockResourceFullResponseJson = {
     resinfo: {
         project_id: '6',
diff --git a/src/testing/mock-data/mockSearchResponseConverted.ts b/src/testing/mock-data/mockSearchResponseConverted.ts
index 5336ea0647..08121a7484 100644
--- a/src/testing/mock-data/mockSearchResponseConverted.ts
+++ b/src/testing/mock-data/mockSearchResponseConverted.ts
@@ -1,3 +1,11 @@
+/**
+ * Test helper data file: mockSearchResponseConverted.
+ *
+ * It provides a mocked conversion of a SearchResponseJson
+ * response from the Salsah API.
+ *
+ * Exposed to be called from tests.
+ */
 export const mockSearchResponseConverted = {
     status: 0,
     userdata: {
diff --git a/src/testing/mock-data/mockSearchResponseJson.ts b/src/testing/mock-data/mockSearchResponseJson.ts
index ed38bba4a6..43632ec14f 100644
--- a/src/testing/mock-data/mockSearchResponseJson.ts
+++ b/src/testing/mock-data/mockSearchResponseJson.ts
@@ -1,3 +1,11 @@
+/**
+ * Test helper data file: mockSearchResponseJson.
+ *
+ * It provides a mocked SearchResponseJson response
+ * from the Salsah API.
+ *
+ * Exposed to be called from tests.
+ */
 export const mockSearchResponseJson = {
     status: 0,
     userdata: {
diff --git a/src/testing/router-stubs.ts b/src/testing/router-stubs.ts
index b48895e103..1795a269b2 100644
--- a/src/testing/router-stubs.ts
+++ b/src/testing/router-stubs.ts
@@ -1,20 +1,35 @@
 /* tslint:disable:no-input-rename */
+/* tslint:disable:directive-selector component-selector */
 import { Component, Directive, HostListener, Injectable, Input, NgModule } from '@angular/core';
 import { NavigationExtras } from '@angular/router';
 
 import { AppModule } from '@awg-app/app.module';
 
-// export { ActivatedRoute, Router, RouterLink, RouterOutlet } from '@angular/router';
-
 // #docregion router-link-stub
+/**
+ * A RouterLink test double (stub) with a `click` listener.
+ *
+ * Use the `routerLink` input to set the `navigatedTo` value
+ * after click.
+ */
 @Directive({
     selector: '[routerLink]'
 })
 export class RouterLinkStubDirective {
+    /**
+     * Input with navigation parameters.
+     */
     @Input('routerLink')
     linkParams: any;
+
+    /**
+     * The router params after navigation.
+     */
     navigatedTo: any = null;
 
+    /**
+     * Listener that sets the navigation target after click.
+     */
     @HostListener('click')
     onClick() {
         this.navigatedTo = this.linkParams;
@@ -23,6 +38,9 @@ export class RouterLinkStubDirective {
 // #enddocregion router-link-stub
 
 // #docregion router-outlet-stub
+/**
+ * A RouterOutlet test double (stub).
+ */
 @Component({
     selector: 'router-outlet',
     template: ''
@@ -31,63 +49,112 @@ export class RouterOutletStubComponent {}
 // #enddocregion router-outlet-stub
 
 // #docregion router-stub
+/**
+ * A Router test double (stub) for components that use the Router.
+ *
+ * Use the `navigate()` method to set the next navigation target.
+ */
 @Injectable()
 export class RouterStub {
-    navigate(commands: any[], extras?: NavigationExtras) {}
+    /**
+     * A`router.navigate` test double (stub)
+     * to navigate to the next target.
+     *
+     * @params {any[]} commands - Array of navigation commands
+     * @params {NavigationExtras} [extras] - Optional NavigationExtras
+     *
+     * @returns {void}
+     */
+    navigate(commands: any[], extras?: NavigationExtras): void {}
 }
 // #enddocregion router-stub
 
 // #docregion activated-route-stub
 import { convertToParamMap, ParamMap, Params } from '@angular/router';
 import { BehaviorSubject, ReplaySubject } from 'rxjs';
+
 /**
- * An ActivateRoute test double with a `paramMap` observable.
+ * An ActivatedRoute test double (stub) with a `paramMap` observable.
+ *
  * Use the `setParamMap()` method to add the next `paramMap` value.
  */
 @Injectable()
 export class ActivatedRouteStub {
-    // Use a ReplaySubject to share previous values with subscribers
-    // and pump new values into the `paramMap` observable
-
-    // ActivatedRoute.params
-    private subject = new BehaviorSubject(this.testParams);
-    params = this.subject.asObservable();
-
-    // Test parameters
+    /**
+     * Private BehaviorSubject to handle test route parameters.
+     */
+    private paramSubject = new BehaviorSubject(this.testParams);
+
+    /**
+     * Readonly ActivatedRoute.params test double (stub)
+     * as observable (`BehaviorSubject`).
+     */
+    readonly params = this.paramSubject.asObservable();
+
+    /**
+     * Private variable for test parameters.
+     */
     private _testParams: {};
 
+    /**
+     * Getter for test route parameters.
+     * @returns The latest test route parameters.
+     */
     get testParams() {
         return this._testParams;
     }
 
+    /**
+     * Setter for test route parameters.
+     * @param params The test route parameters to be set.
+     */
     set testParams(params: {}) {
         this._testParams = params;
-        this.subject.next(params);
+        this.paramSubject.next(params);
     }
 
-    // ActivatedRoute.snapshot.params
+    /**
+     * Getter for the ActivatedRoute.snapshot.params.
+     * @returns Snapshot of the test route parameters.
+     */
     get snapshot() {
         return { params: this.testParams };
     }
 
-    // ActivatedRoute.paramMap
+    /**
+     * Private ReplaySubject to handle route paramMaps.
+     */
     private paramMapSubject = new ReplaySubject<ParamMap>();
 
+    /**
+     * Constructor for the ActivatedRoute.paramMap test double (stub).
+     *
+     * @param {Params} [initialParams] The optional initial route parameters.
+     */
     constructor(initialParams?: Params) {
         this.setParamMap(initialParams);
     }
 
-    /** The mock paramMap observable */
+    /**
+     * An ActivatedRoute.paramMap test double (stub)
+     * as observable (`ReplaySubject`).
+     */
     readonly paramMap = this.paramMapSubject.asObservable();
 
-    /** Set the paramMap observables's next value */
+    /**
+     * Set the paramMap observable's next value.
+     *
+     * @param {Params} [params] The optional route parameters to be set.
+     */
     setParamMap(params?: Params) {
-        this.subject.next(convertToParamMap(params));
+        this.paramMapSubject.next(convertToParamMap(params));
     }
 }
 // #enddocregion activated-route-stub
 
 /**
+ * A fake router module.
+ *
  * Needed so that `aot` build is working. But it isn't used throughout our tests and/or app.
  */
 @NgModule({
diff --git a/src/tsconfig.app.json b/tsconfig.app.json
similarity index 61%
rename from src/tsconfig.app.json
rename to tsconfig.app.json
index 37a9b65907..7747e9d0ef 100644
--- a/src/tsconfig.app.json
+++ b/tsconfig.app.json
@@ -1,9 +1,9 @@
 {
-    "extends": "../tsconfig.json",
+    "extends": "./tsconfig.json",
     "compilerOptions": {
-        "outDir": "../out-tsc/app",
+        "outDir": "./out-tsc/app",
         "types": [],
-        "baseUrl": "./",
+        "baseUrl": "./src/",
         "paths": {
             "@awg-app/*": ["app/*"],
             "@awg-core/*": ["app/core/*"],
@@ -12,6 +12,6 @@
             "@awg-views/*": ["app/views/*"]
         }
     },
-    "include": ["**/*.ts"],
-    "exclude": ["test.ts", "**/*.spec.ts", "testing/"]
+    "include": ["src/**/*.ts"],
+    "exclude": ["src/test.ts", "src/**/*.spec.ts", "src/testing/"]
 }
diff --git a/tsconfig.json b/tsconfig.json
index 3e7b7999cb..7a2c95236d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -5,11 +5,13 @@
         "outDir": "./dist/out-tsc",
         "sourceMap": true,
         "declaration": false,
-        "module": "es2015",
-        "moduleResolution": "node",
+        "downlevelIteration": true,
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
-        "target": "es5",
+        "module": "esnext",
+        "moduleResolution": "node",
+        "importHelpers": true,
+        "target": "es2015",
         "typeRoots": ["node_modules/@types"],
         "lib": ["es2018", "dom"],
         "paths": {
diff --git a/src/tsconfig.spec.json b/tsconfig.spec.json
similarity index 62%
rename from src/tsconfig.spec.json
rename to tsconfig.spec.json
index b5f28837ad..d04ae7d292 100644
--- a/src/tsconfig.spec.json
+++ b/tsconfig.spec.json
@@ -1,9 +1,9 @@
 {
-    "extends": "../tsconfig.json",
+    "extends": "./tsconfig.json",
     "compilerOptions": {
-        "outDir": "../out-tsc/spec",
+        "outDir": "./out-tsc/spec",
         "types": ["jasmine", "node"],
-        "baseUrl": "./",
+        "baseUrl": "./src/",
         "paths": {
             "@awg-app/*": ["app/*"],
             "@awg-core/*": ["app/core/*"],
@@ -13,6 +13,6 @@
             "@testing/*": ["testing/*"]
         }
     },
-    "files": ["test.ts", "polyfills.ts"],
-    "include": ["**/*.spec.ts", "**/*.d.ts", "testing/"]
+    "files": ["src/test.ts", "src/polyfills.ts"],
+    "include": ["src/**/*.spec.ts", "src/**/*.d.ts", "src/testing/"]
 }
diff --git a/tslint.json b/tslint.json
index be548dfd15..e0807d6149 100644
--- a/tslint.json
+++ b/tslint.json
@@ -1,11 +1,15 @@
 {
     "extends": ["tslint:recommended", "tslint-config-prettier"],
-    "rulesDirectory": ["codelyzer"],
     "rules": {
         "array-type": false,
         "deprecation": {
             "severity": "warn"
         },
+        "component-class-suffix": true,
+        "contextual-lifecycle": true,
+        "directive-class-suffix": true,
+        "directive-selector": [true, "attribute", "awg", "camelCase"],
+        "component-selector": [true, "element", "awg", "kebab-case"],
         "import-blacklist": [true, "rxjs/Rx"],
         "interface-name": false,
         "max-classes-per-file": false,
@@ -26,18 +30,21 @@
         "no-var-requires": false,
         "object-literal-sort-keys": false,
         "ordered-imports": false,
-        "no-output-on-prefix": true,
-        "use-input-property-decorator": true,
-        "use-output-property-decorator": true,
-        "use-host-property-decorator": true,
+        "no-conflicting-lifecycle": true,
+        "no-host-metadata-property": true,
         "no-input-rename": false,
+        "no-inputs-metadata-property": true,
+        "no-output-native": true,
+        "no-output-on-prefix": true,
         "no-output-rename": true,
+        "no-outputs-metadata-property": true,
+        "template-banana-in-box": true,
+        "template-no-negated-async": true,
         "use-life-cycle-interface": true,
         "use-pipe-transform-interface": true,
-        "component-class-suffix": true,
-        "directive-class-suffix": true,
         "ban-types": [true, ["Object", "Use {} instead."]],
         "no-string-literal": false,
         "variable-name": [true, "allow-snake-case", "allow-leading-underscore"]
-    }
+    },
+    "rulesDirectory": ["codelyzer"]
 }
diff --git a/version.sh b/version.sh
index 84371151ec..9c59bad958 100755
--- a/version.sh
+++ b/version.sh
@@ -11,8 +11,20 @@ echo "Updating app globals...
 > $version_file
 echo "// THIS IS AN AUTO-GENERATED FILE. DO NOT CHANGE IT MANUALLY!
 // Generated last time on $(date)
+
+/**
+ * The latest version of the AWG App
+ */
 export const appVersion = '$1';
+
+/**
+ * The release date of the latest version of the AWG App
+ */
 export const appVersionReleaseDate = '$curday $curmonth $curyear';
+
+/**
+ * The URL of the AWG App
+ */
 export const appHomepage = '$2';" >> $version_file
 
 
diff --git a/yarn.lock b/yarn.lock
index e68bfa08e0..5b02d634d7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,141 +2,149 @@
 # yarn lockfile v1
 
 
-"@angular-devkit/architect@0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.6.tgz#7758ab9f288cfd4f64d8b88b0700bac5c4961d06"
-  integrity sha512-Cg9z4lmCvjt5uD00E/0tBRz3ESjYicmqT3NL/BIsNVNb+s1GwCCoPSOIM8Ss4nyGDtrdono1XKSOmkJnlzF3Cw==
-  dependencies:
-    "@angular-devkit/core" "7.3.6"
-    rxjs "6.3.3"
-
-"@angular-devkit/build-angular@~0.13.0":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.6.tgz#7050a0367bb7646961d0bdc36aa083a6f3029dea"
-  integrity sha512-gdP856Z5tuQ69mJla5VPKm/uR86dcrPWYW41Jyu5oIhL2GAQ4JtDEuL2+ppwQO8i8hsXGIAbulGAbrlvU5I8OA==
-  dependencies:
-    "@angular-devkit/architect" "0.13.6"
-    "@angular-devkit/build-optimizer" "0.13.6"
-    "@angular-devkit/build-webpack" "0.13.6"
-    "@angular-devkit/core" "7.3.6"
-    "@ngtools/webpack" "7.3.6"
-    ajv "6.9.1"
-    autoprefixer "9.4.6"
+"@angular-devkit/architect@0.800.6":
+  version "0.800.6"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.800.6.tgz#24d65f1e079f294312fe76dc11eaabf5e5d43eff"
+  integrity sha512-946ceRci/1yx09g8iRvULLoVihcB2RW9nhpCCMum4L9wheip8t4FWso3pd3JtPQGJV9dmsnwPzR9s12bncmj3g==
+  dependencies:
+    "@angular-devkit/core" "8.0.6"
+    rxjs "6.4.0"
+
+"@angular-devkit/build-angular@~0.800.6":
+  version "0.800.6"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.800.6.tgz#96515da8cb83f28b3afae8b3fd73392f2b54925d"
+  integrity sha512-b6WPGN8PReRizeTe5sR3XS2sqTqfCeFIDXI4sPy3T3XdmO1dB/UP8trsHXifuNTNSVIID4X0hDwXuz36Lk+4Jw==
+  dependencies:
+    "@angular-devkit/architect" "0.800.6"
+    "@angular-devkit/build-optimizer" "0.800.6"
+    "@angular-devkit/build-webpack" "0.800.6"
+    "@angular-devkit/core" "8.0.6"
+    "@ngtools/webpack" "8.0.6"
+    ajv "6.10.0"
+    autoprefixer "9.5.1"
+    browserslist "4.5.5"
+    caniuse-lite "1.0.30000974"
     circular-dependency-plugin "5.0.2"
     clean-css "4.2.1"
-    copy-webpack-plugin "4.6.0"
+    copy-webpack-plugin "5.0.2"
+    core-js "3.0.1"
     file-loader "3.0.1"
     glob "7.1.3"
     istanbul-instrumenter-loader "3.0.1"
-    karma-source-map-support "1.3.0"
+    karma-source-map-support "1.4.0"
     less "3.9.0"
     less-loader "4.1.0"
-    license-webpack-plugin "2.1.0"
+    license-webpack-plugin "2.1.1"
     loader-utils "1.2.3"
-    mini-css-extract-plugin "0.5.0"
+    mini-css-extract-plugin "0.6.0"
     minimatch "3.0.4"
-    opn "5.4.0"
+    open "6.2.0"
     parse5 "4.0.0"
     postcss "7.0.14"
     postcss-import "12.0.1"
     postcss-loader "3.0.0"
     raw-loader "1.0.0"
-    rxjs "6.3.3"
+    rxjs "6.4.0"
+    sass "1.19.0"
     sass-loader "7.1.0"
-    semver "5.6.0"
+    semver "6.0.0"
     source-map-loader "0.2.4"
-    source-map-support "0.5.10"
-    speed-measure-webpack-plugin "1.3.0"
+    source-map-support "0.5.12"
+    speed-measure-webpack-plugin "1.3.1"
     stats-webpack-plugin "0.7.0"
     style-loader "0.23.1"
     stylus "0.54.5"
     stylus-loader "3.0.2"
-    terser-webpack-plugin "1.2.2"
+    terser-webpack-plugin "1.2.3"
     tree-kill "1.2.1"
-    webpack "4.29.0"
-    webpack-dev-middleware "3.5.1"
-    webpack-dev-server "3.1.14"
+    webpack "4.30.0"
+    webpack-dev-middleware "3.6.2"
+    webpack-dev-server "3.3.1"
     webpack-merge "4.2.1"
     webpack-sources "1.3.0"
     webpack-subresource-integrity "1.1.0-rc.6"
-  optionalDependencies:
-    node-sass "4.11.0"
+    worker-plugin "3.1.0"
 
-"@angular-devkit/build-optimizer@0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.6.tgz#846b6d0042de0102c6420ff86380ed961cc71956"
-  integrity sha512-/EOO0wxw7FIKfove4Fv/aKiKgvH0kFhRT2GOe3pW0yV2y2e1dfQdo2AqdGCfJ4rSbwsfWSGTUUFITc+9jgXFZw==
+"@angular-devkit/build-optimizer@0.800.6":
+  version "0.800.6"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.800.6.tgz#2a801d0bb03296cd34e866d783a86b0e6ac0250b"
+  integrity sha512-f8u9c5VA+bxbYREKX6EY8QsbIT8ziDRHlhJ1n6H2nUTaQi+THtbPfrDsf3S3aVACfkkY+LEGGl135XEPr5PoxA==
   dependencies:
     loader-utils "1.2.3"
     source-map "0.5.6"
-    typescript "3.2.4"
+    typescript "3.4.4"
     webpack-sources "1.3.0"
 
-"@angular-devkit/build-webpack@0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.6.tgz#c88691aa0259d124e2bdb78a492c44aa44ae148f"
-  integrity sha512-lQmYrhOHeBn/r7uw+FfpJUq9puApYe72+mrIfg/UtLwSEYt58n5d156jnuMcfWnCyhYUgYqLTaOUfSM0RV7akw==
+"@angular-devkit/build-webpack@0.800.6":
+  version "0.800.6"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.800.6.tgz#74a22b4928b73e3106408977a813ad76a6354c9b"
+  integrity sha512-FwNGa99dxL9dACv/eLTP6u50tlPLG01yqp/JFAgxS0OmDkEMjSBLNgS8b8qhTo8XMhMsMWzb8yIUwV1PcSj6qg==
   dependencies:
-    "@angular-devkit/architect" "0.13.6"
-    "@angular-devkit/core" "7.3.6"
-    rxjs "6.3.3"
+    "@angular-devkit/architect" "0.800.6"
+    "@angular-devkit/core" "8.0.6"
+    rxjs "6.4.0"
+    webpack-merge "4.2.1"
 
-"@angular-devkit/core@7.3.6":
-  version "7.3.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.6.tgz#bc11ca571187f0f0ce9df012332794907e0b8133"
-  integrity sha512-aoarMK0DJIdwjVA0OuQIN7b8nKPcF9n5vSMF7MFmhKpTw5/uV3SynQZbm3YCgylu/2CMuiTzKuAunnWWdli//g==
+"@angular-devkit/core@8.0.6":
+  version "8.0.6"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.0.6.tgz#540ff673f1808fc09538c8aa6c01f08750921301"
+  integrity sha512-gbKEVsQuYqBJPzgaxEitvs0aN9NwmUHhTkum28mRyPbS3witay/q8+3ls48M2W+98Da/PQbfndxFY4OCa+qHEA==
   dependencies:
-    ajv "6.9.1"
-    chokidar "2.0.4"
+    ajv "6.10.0"
     fast-json-stable-stringify "2.0.0"
-    rxjs "6.3.3"
+    magic-string "0.25.2"
+    rxjs "6.4.0"
     source-map "0.7.3"
 
-"@angular-devkit/schematics@7.3.6":
-  version "7.3.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.6.tgz#5580b730b1bae5397f5860cfb0d7270fec6e6deb"
-  integrity sha512-YXF7QusmMy3D9H0vNczc1n5BkuEHLwt7cW33euNeGNgTIsD0n6DrUhgClurXicnr2GNPSDYE5+3115lmJkhyrg==
+"@angular-devkit/schematics@8.0.6":
+  version "8.0.6"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-8.0.6.tgz#e50805582f4a082079201dffd8940e001f3721e0"
+  integrity sha512-FGPcVKxNvtdFB0A6oHyxtWeugL83nW+kPATlAimgh1hu7TCP94dDpflCV9o/lgZlH817xTYXrhToXJaMZSnDPw==
   dependencies:
-    "@angular-devkit/core" "7.3.6"
-    rxjs "6.3.3"
+    "@angular-devkit/core" "8.0.6"
+    rxjs "6.4.0"
 
-"@angular/animations@^7.2.9":
-  version "7.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.9.tgz#1bfacb76dfd80656e28edb4efdfd3154e56f1c29"
-  integrity sha512-cdIf/UWwhNlw6Ep3pRxRk12F8q/GyTbcHDF4qbgg7lZEDPYS32KS1lpHY1pgSuSOIPZUT+iLPOxAZ6cu7Am1vA==
+"@angular/animations@^8.0.3":
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.3.tgz#9fc82919b8eb28d4d1a9ff93095907acb2a64e91"
+  integrity sha512-9zciJ4YRR0bodFSYgsgXdYMz8wKKyVjch7XZADGkWubXT8mGuwlpdPMlQ6n9Cwj8Ebu0u52WxMeQsX76K9RlYA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/cli@~7.3.6":
-  version "7.3.6"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.6.tgz#4bcaec6f371095e8d88384408ee4c9a6852fb97c"
-  integrity sha512-u5lBcYVQRk9cez/DozJvFOYomeko9b5kE+NElyFhPtM3GF1SBcXKb5QyNxH/zSOc850VL7KPe7ZfC6kW3Phhyw==
+"@angular/cli@~8.0.6":
+  version "8.0.6"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-8.0.6.tgz#151147040d46d3a20618a7b494e440268e39b899"
+  integrity sha512-COBpeoXyLt8FiOhsmoEnDfQcm0aTdUSUHsH3zNkVTcyxpRzZVspTDGzxhK0UsCpddXS/MMjJiXph6SJ1el3qaQ==
   dependencies:
-    "@angular-devkit/architect" "0.13.6"
-    "@angular-devkit/core" "7.3.6"
-    "@angular-devkit/schematics" "7.3.6"
-    "@schematics/angular" "7.3.6"
-    "@schematics/update" "0.13.6"
+    "@angular-devkit/architect" "0.800.6"
+    "@angular-devkit/core" "8.0.6"
+    "@angular-devkit/schematics" "8.0.6"
+    "@schematics/angular" "8.0.6"
+    "@schematics/update" "0.800.6"
     "@yarnpkg/lockfile" "1.1.0"
+    debug "^4.1.1"
     ini "1.3.5"
-    inquirer "6.2.1"
+    inquirer "6.3.1"
     npm-package-arg "6.1.0"
-    opn "5.4.0"
-    pacote "9.4.0"
-    semver "5.6.0"
+    open "6.2.0"
+    pacote "9.5.0"
+    read-package-tree "5.2.2"
+    semver "6.0.0"
     symbol-observable "1.2.0"
+    universal-analytics "^0.4.20"
+    uuid "^3.3.2"
 
-"@angular/common@^7.2.9":
-  version "7.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.9.tgz#eeb3d0332e14f737bfb9a63b8347b3dd625e57fe"
-  integrity sha512-SBIinZi/R0mKWjbKvcBhwRpAVIY/7/AnzIEkMb5JnGExersYhDD02otW3ZwPStpl7HrhgWk8ueWnxVFFXRz5gA==
+"@angular/common@^8.0.3":
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.0.3.tgz#822b0c2d74ffafd096473596812ad6fca7876c17"
+  integrity sha512-2YLYGVUf9eJZcocRmD3/9UHj4qFHt2t4ftDWJmrFM9zo2PZF+G5O9fASO7qoBbwpx3KFZtQO4dprKl2dFugRjg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@^7.2.9":
-  version "7.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.9.tgz#2c1c970969a956fe148a96fe402704626568d3bc"
-  integrity sha512-3itdcfszdyXTHYEsO4eBu4WEx10hU8JpOgUcZyw+OYgwLQLyjEXOD9dfYZZpE/+2F0omoMLseCTHTP//uux+Iw==
+"@angular/compiler-cli@^8.0.3":
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.0.3.tgz#14047c99d034384f92044a77954fbdeb2fbdb604"
+  integrity sha512-6nckvBnnp1YnrxwCB8UKvhHAMcUa1WvGjbYMEqhgiBreiRT4ub+tKVPNzrRtQFPpcXtY1wlgOWqYHWhHRtcLlg==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^2.1.1"
@@ -148,68 +156,61 @@
     shelljs "^0.8.1"
     source-map "^0.6.1"
     tslib "^1.9.0"
-    yargs "9.0.1"
-
-"@angular/compiler@^7.2.9":
-  version "7.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.9.tgz#92dd0d9fd26fa7cfdbc8c75d0be0d96bd6432fbb"
-  integrity sha512-jAKV4C5BW2pnke10fiDZNbLCQOs2QK37mUJWe5jnZqCAM4Y3edXlfifOkbi0hvA4WJMDXKmUdydY6Xo/Z+cWbA==
-  dependencies:
-    tslib "^1.9.0"
+    yargs "13.1.0"
 
-"@angular/core@^7.2.9":
-  version "7.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.9.tgz#43ca94adf74fd8ad9ba0b015b3b979a5d04fb3a6"
-  integrity sha512-tW1jHjCnvtquJ3XEnmqRNMoV7MXAZ2yfnCXE25+odRZjNVMiTcKWvRLd/XjBzjCg2OvwREXcQpB7/s+Av10uAQ==
+"@angular/compiler@^8.0.3":
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.0.3.tgz#93855340bc029ab15871f6e699dcb8d3ffdfb54d"
+  integrity sha512-1/vF8D6l1O6IfWiDtaj6nC+B8CtkVtFgXgooDzLBO6XAkaCuJCnhKT1HnpWG5GtVsGaY9MGoTl1vE9ZMDbRQjg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/forms@^7.2.9":
-  version "7.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.9.tgz#1cc46542b422654ac87a6ead84cb4d9a7e73b0e8"
-  integrity sha512-2hpu2Gl8suwG5FmOczk/oBBE1x7QypM58XE1ms0V6uYlL+g/JIg0AWMMOldI5KYUnxwoCikgsdGzzt8XPbvRkQ==
+"@angular/core@^8.0.3":
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.0.3.tgz#f8a73cbeccce482261949190f1d15d4b0be3c1f2"
+  integrity sha512-IIxrtIPNuv2+HudER9J1nmPGiGJ4aRpeiFM9V4lSiSFv50RzuaoG60XqYIpUyuBdgvyKigcrfSbu9+x1vyN0hw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/http@^7.2.9":
-  version "7.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.9.tgz#074c6ed2860e5f56f3ea15ce7819807f36ee158c"
-  integrity sha512-86brgdKpeEJHiI45cVwEzQJIJb/c+Edlr32hH5rymj2QqpKC5RyMmLajnLhkzV3LdBvEK8P+uRyA+bZyb/X3HQ==
+"@angular/forms@^8.0.3":
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-8.0.3.tgz#21282ba5616ee1641c2cbec9d34afd1c3482e44d"
+  integrity sha512-22s82QDRQ72K4vMYuNh3NAN+da9uanwoydnfKlp2rb9dZAb2QVX9NN6gSoMrkSSr2O9KTP6pWiw6A3/MW8sGRA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/language-service@^7.2.9":
-  version "7.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.9.tgz#50a74f80a42b069c6a3a0844ee6af3098f8bd48b"
-  integrity sha512-+8P3yGqrCZy8PaoxUUlC6cowxPAIbuW4HwhvHvYV3G99LDQUC/bxUPSPhqbrAvDiFr3VeXqivzXgFCTo69S1WQ==
+"@angular/language-service@^8.0.3":
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-8.0.3.tgz#25909e6a9ce5336768e489401bc9c3abb57b4304"
+  integrity sha512-04XojOo9FJgEQE/rZafnaJQxPEU+//TSzTgpGoIVzCSMx+joCY/ZSSwJZPWxiHlOE57W/zX02ZY+TwcM81oTdw==
 
-"@angular/platform-browser-dynamic@^7.2.9":
-  version "7.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.9.tgz#bfbdf1a906f1363440cd4f18f9dd64a369a7b55a"
-  integrity sha512-QJQ1NmzaX2nAX9u6vkc/cZSBEqio/YQojaZqlbRyAn391rpzb9cGVvqYzUU9DqCeXbxKgA1xbmLiNMQ/M7xMHg==
+"@angular/platform-browser-dynamic@^8.0.3":
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.0.3.tgz#8feabfaea1a4d751b3101ef4d6492afeea199803"
+  integrity sha512-ZjQjSYslSQAKzM4llvyMFxnSjFpbhT1U9FOdKwscPe475zAKX0087qsHrP2CRwkJRfwtdcmj9wMUQIPlzMpHLA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^7.2.9":
-  version "7.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.9.tgz#4259eb9c41d152c580ab283b858a938fc0058421"
-  integrity sha512-h7RaXllauFLa1SPcje/cK7IbwCqV6ViyeHEUAAWljrM2OWRU1zRYtDk/gcphRj4tWhhHVfQsJ9+0p3NoPP5LZw==
+"@angular/platform-browser@^8.0.3":
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.0.3.tgz#d19588f2f016bfc5893bb94fc5a7dadb9b5eaacf"
+  integrity sha512-ceAPP2Ijmk2sZ1rnOU/WNlE3DtT6K6ljpjO9oUfXKMoSMdWirJKAraT3m/BAzmYwMSXpPBxA7c3paZjiLL6t5A==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-server@^7.2.9":
-  version "7.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-7.2.9.tgz#19bc041ec9dc11dd160568198ac30b71d489ae91"
-  integrity sha512-uF3xepiSSQKk0Z0d1syMuueT4KdZyYssaAeAthXjhaGl5Cs4KB7NrM3DArMTnHc1PZQprTFOmChgC6MKy1LuZA==
+"@angular/platform-server@^8.0.3":
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-8.0.3.tgz#e3b9ec0a2d63db32e7615cc01b218807d5e06cbb"
+  integrity sha512-3Ayu1OZ+SrsxahwOFnfRG5hXJhZZ+MGsSCrHkunhw55IbEzJRvHqSrIGJqMzP0BarAcIegmvcTX9HrCVWv9uoA==
   dependencies:
-    domino "^2.1.0"
+    domino "^2.1.2"
     tslib "^1.9.0"
     xhr2 "^0.1.4"
 
-"@angular/router@^7.2.9":
-  version "7.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.9.tgz#63fabbaa4dc83c32fbc2858c621916ea7b1690a1"
-  integrity sha512-vNk2x6i1iLNQM1KYnRhbC2DJQvNmlu9lVGzcZzRiS7zDT5DFvbiYA1M7ixUlbehLDEGVKlJEZNIdKWErWW8xYw==
+"@angular/router@^8.0.3":
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.0.3.tgz#7e9e908b9c19753d275f2ff18699a7ec13eaff1e"
+  integrity sha512-CU5pLTfQVUnTN93mdIKJrVjXiNldUkk30DPz4lpdxpZjYOqFGXeeSeQWmToHSofLPodNcAB4kkZ41VyXvlBu7w==
   dependencies:
     tslib "^1.9.0"
 
@@ -220,14 +221,14 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
-"@babel/generator@^7.0.0":
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.1.2.tgz#fde75c072575ce7abbd97322e8fef5bae67e4630"
-  integrity sha512-70A9HWLS/1RHk3Ck8tNHKxOoKQuSKocYgwDN85Pyl/RBduss6AKxUR7RIZ/lzduQMSYfWEM4DDBu6A+XGbkFig==
+"@babel/generator@^7.4.0", "@babel/generator@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.4.4.tgz#174a215eb843fc392c7edcaabeaa873de6e8f041"
+  integrity sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==
   dependencies:
-    "@babel/types" "^7.1.2"
+    "@babel/types" "^7.4.4"
     jsesc "^2.5.1"
-    lodash "^4.17.10"
+    lodash "^4.17.11"
     source-map "^0.5.0"
     trim-right "^1.0.1"
 
@@ -247,12 +248,12 @@
   dependencies:
     "@babel/types" "^7.0.0"
 
-"@babel/helper-split-export-declaration@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813"
-  integrity sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==
+"@babel/helper-split-export-declaration@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz#ff94894a340be78f53f06af038b205c49d993677"
+  integrity sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.4.4"
 
 "@babel/highlight@^7.0.0":
   version "7.0.0"
@@ -263,12 +264,19 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.1.2":
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.2.tgz#85c5c47af6d244fab77bce6b9bd830e38c978409"
-  integrity sha512-x5HFsW+E/nQalGMw7hu+fvPqnBeBaIr0lWJ2SG0PPL2j+Pm9lYvCrsZJGIgauPIENx0v10INIyFjmSNUD/gSqQ==
+"@babel/parser@^7.1.2", "@babel/parser@^7.4.3", "@babel/parser@^7.4.4", "@babel/parser@^7.4.5":
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.4.5.tgz#04af8d5d5a2b044a2a1bffacc1e5e6673544e872"
+  integrity sha512-9mUqkL1FF5T7f0WDFfAoDdiMVPWsdD1gZYzSnaXsxUCUqzuch/8of9G3VUSNiZmMBoRxT3neyVsqeiL/ZPcjew==
+
+"@babel/runtime@^7.3.1":
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12"
+  integrity sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==
+  dependencies:
+    regenerator-runtime "^0.13.2"
 
-"@babel/template@^7.0.0", "@babel/template@^7.1.0":
+"@babel/template@^7.1.0":
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.1.2.tgz#090484a574fef5a2d2d7726a674eceda5c5b5644"
   integrity sha512-SY1MmplssORfFiLDcOETrW7fCLl+PavlwMh92rrGcikQaRq4iWPVH0MpwPpY3etVMx6RnDjXtr6VZYr/IbP/Ag==
@@ -277,193 +285,262 @@
     "@babel/parser" "^7.1.2"
     "@babel/types" "^7.1.2"
 
-"@babel/traverse@^7.0.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.1.0.tgz#503ec6669387efd182c3888c4eec07bcc45d91b2"
-  integrity sha512-bwgln0FsMoxm3pLOgrrnGaXk18sSM9JNf1/nHC/FksmNGFbYnPWY4GYCfLxyP1KRmfsxqkRpfoa6xr6VuuSxdw==
+"@babel/template@^7.4.0":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz#f4b88d1225689a08f5bc3a17483545be9e4ed237"
+  integrity sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.0.0"
+    "@babel/parser" "^7.4.4"
+    "@babel/types" "^7.4.4"
+
+"@babel/traverse@^7.4.3":
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.4.5.tgz#4e92d1728fd2f1897dafdd321efbff92156c3216"
+  integrity sha512-Vc+qjynwkjRmIFGxy0KYoPj4FdVDxLej89kMHFsWScq999uX+pwcX4v9mWRjW0KcAYTPAuVQl2LKP1wEVLsp+A==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/generator" "^7.4.4"
     "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.0.0"
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
-    debug "^3.1.0"
+    "@babel/helper-split-export-declaration" "^7.4.4"
+    "@babel/parser" "^7.4.5"
+    "@babel/types" "^7.4.4"
+    debug "^4.1.0"
     globals "^11.1.0"
-    lodash "^4.17.10"
+    lodash "^4.17.11"
 
-"@babel/types@^7.0.0", "@babel/types@^7.1.2":
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.1.2.tgz#183e7952cf6691628afdc2e2b90d03240bac80c0"
-  integrity sha512-pb1I05sZEKiSlMUV9UReaqsCPUpgbHHHu2n1piRm7JkuBkm6QxcaIzKu6FMnMtCbih/cEYTR+RGYYC96Yk9HAg==
+"@babel/types@^7.0.0", "@babel/types@^7.1.2", "@babel/types@^7.4.0", "@babel/types@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.4.4.tgz#8db9e9a629bb7c29370009b4b779ed93fe57d5f0"
+  integrity sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==
   dependencies:
     esutils "^2.0.2"
-    lodash "^4.17.10"
+    lodash "^4.17.11"
     to-fast-properties "^2.0.0"
 
-"@commitlint/cli@^7.5.2":
-  version "7.5.2"
-  resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-7.5.2.tgz#2475cd8f7ed3b2f9c2ab96c06bc24d61d23f8716"
-  integrity sha512-UQdW/wNb+XeANoYYLyuKEDIfWKSzdhJkPQZ8ie/IjfMNnsP+B23bkX4Ati+6U8zgz0yyngoxWl+3lfExiIL4hQ==
+"@commitlint/cli@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-8.0.0.tgz#1be7aa14fecbcf71317a8187fbb5210760d4ca61"
+  integrity sha512-wFu+g9v73I2rMRTv27ItIbcrhWqge0ZpUNUIJ9fw8TF7XpmhaUFvGqa2kU6st1F0TyEOrq5ZMzwI8kQZNVLuXg==
   dependencies:
-    "@commitlint/format" "^7.5.0"
-    "@commitlint/lint" "^7.5.2"
-    "@commitlint/load" "^7.5.0"
-    "@commitlint/read" "^7.5.0"
+    "@commitlint/format" "^8.0.0"
+    "@commitlint/lint" "^8.0.0"
+    "@commitlint/load" "^8.0.0"
+    "@commitlint/read" "^8.0.0"
     babel-polyfill "6.26.0"
     chalk "2.3.1"
-    get-stdin "5.0.1"
+    get-stdin "7.0.0"
     lodash "4.17.11"
     meow "5.0.0"
-    resolve-from "4.0.0"
-    resolve-global "0.1.0"
+    resolve-from "5.0.0"
+    resolve-global "1.0.0"
 
-"@commitlint/config-angular-type-enum@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/config-angular-type-enum/-/config-angular-type-enum-7.5.0.tgz#fde0d0696c4a8886e39fa67daa76c38e8f68fecb"
-  integrity sha512-dpwnDaqda5gYY9U1XUHpOrtTi4YrlRLoSY1QYj44sCc1Bdi0k1fKi3IPPtLASlbxILP/O9qEGygCHBnC68mOnw==
+"@commitlint/config-angular-type-enum@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/config-angular-type-enum/-/config-angular-type-enum-8.0.0.tgz#6a8144592f7ef6865a652512a79a340e6ffe9f0c"
+  integrity sha512-NpIyJtp3c5F+Ge031fyTSj5Vj/l0fpyfJz2Q1NZTn+J9y156rMlwJRltbWB2eYG5n2vFnYZpA9PeVpCaiyNDLQ==
 
-"@commitlint/config-angular@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/config-angular/-/config-angular-7.5.0.tgz#dcc869593c6201c74fe9aa8114f56f8e48b80332"
-  integrity sha512-aNchHhm/fVmkH0AI9dtOuYLs74Pum95Bp7PUGBk1+pMOy2Jb/NW095qDMfFS1Hmc2+FCQ8AmgNO2NulZDoTyOw==
+"@commitlint/config-angular@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/config-angular/-/config-angular-8.0.0.tgz#adf9f99eac7b55a09de4dbe5fa7459ff17cef305"
+  integrity sha512-5HQ+vKIBdafmoUIluzTam+XIud3NAHpENR6MNF79740BEbibjI6f7QGanCKR+TSE/o2idrIjt10WpYFdtZc8Yg==
   dependencies:
-    "@commitlint/config-angular-type-enum" "^7.5.0"
+    "@commitlint/config-angular-type-enum" "^8.0.0"
 
-"@commitlint/ensure@^7.5.2":
-  version "7.5.2"
-  resolved "https://registry.yarnpkg.com/@commitlint/ensure/-/ensure-7.5.2.tgz#57bb7dcbf1e9913e27c3b294325d0d68dd14cebf"
-  integrity sha512-ZMJKHhSJC789chKy0kWp8EWbCpLPy6vKa+fopUVx+tWL7H8AeBbibXlqAnybg+HWNcb/RD7ORROx0IsgrK4IYA==
+"@commitlint/ensure@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/ensure/-/ensure-8.0.0.tgz#67a3e72755a0dfa5f4216efd05238f62ff132110"
+  integrity sha512-rhBO79L9vXeb26JU+14cxZQq46KyyVqlo31C33VIe7oJndUtWrDhZTvMjJeB1pdXh4EU4XWdMo+yzBmuypFgig==
   dependencies:
     lodash "4.17.11"
 
-"@commitlint/execute-rule@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/execute-rule/-/execute-rule-7.5.0.tgz#c9cfbab71eb962e1c46e78d76375e32754ab1e38"
-  integrity sha512-K66aoly8mxSHmBA/Y8bKSPPcCAR4GpJEsvHaLDYOG7GsyChu8NgCD53L8GUqPW8lBCWwnmCiSL+RlOkNHJ0Gag==
+"@commitlint/execute-rule@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/execute-rule/-/execute-rule-8.0.0.tgz#df2a9893f162fc561ca4e95a34bd782469dd7f8b"
+  integrity sha512-E/A2xHqx3syclXAFl8vJY2o/+xtL9axrqbFFF42Bzke+Eflf0mOJviPxDodu2xP0wXMRQ9UokAi/reK9dMtA/A==
   dependencies:
     babel-runtime "6.26.0"
 
-"@commitlint/format@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/format/-/format-7.5.0.tgz#57a2b92dc58a3409b2be67c4c8c10bd1b28e9fe8"
-  integrity sha512-DEeQXfTLUm9kARliCBfw3SlQRAYjK2aXeRAUMs1HPhLA2tjNFFGv6LOpFFNdiu/WV+o1ojcgIvBBjpHaVT+Tvw==
+"@commitlint/format@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/format/-/format-8.0.0.tgz#f7c858d9057e1da6856be211ad049c5b9a66185b"
+  integrity sha512-dFxKGLp1T4obi7+YZ2NcSAebJA/dBQwnerRJGz0hWtsO6pheJRe+qC50+GCb2fYGWUc5lIWawaRts0m7RkFGUw==
   dependencies:
-    babel-runtime "^6.23.0"
     chalk "^2.0.1"
 
-"@commitlint/is-ignored@^7.5.1":
-  version "7.5.1"
-  resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-7.5.1.tgz#c4f7ffc1c8b4cf9dc3204d22ef8e78ff82536d67"
-  integrity sha512-8JZCgy6bWSnjOT5cTTiyEAGp+Y4+5CUknhVbyiPxTRbjy6yF0aMKs1gMTfHrNHTKsasgmkCyPQd4C2eOPceuKA==
+"@commitlint/is-ignored@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-8.0.0.tgz#eba06c9a6227288574f544a1705583d965f0ed65"
+  integrity sha512-geWr/NXGMrZ3qc3exDM+S1qV+nMDxp1LwN3rLpEN2gXTwW3rIXq49RQQUkn0n3BHcpqJJ9EBhjqFoMU1TYx7Ng==
   dependencies:
-    semver "5.6.0"
+    semver "6.0.0"
 
-"@commitlint/lint@^7.5.2":
-  version "7.5.2"
-  resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-7.5.2.tgz#26cb819c74f8770413c4f6ef1e7abf1b739eda77"
-  integrity sha512-DY/UfGFDquMno+5c6+tE50rMxpjdQK3CRG+nktgYlVz1UAqeUD+bRc3pvX5HwAsuGvyDrWAjtszHtEDeYJKcjw==
+"@commitlint/lint@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-8.0.0.tgz#3defb3b1a900ba966c64a51b497bf1fcff5fc9f2"
+  integrity sha512-5nKiJpBDR2iei+fre4+6M7FUrSX1cIMoxXKdrnb1GMOXkw9CsZSF5OvdrX08zHAFmOAeDaohoCV+XN/UN/vWYg==
   dependencies:
-    "@commitlint/is-ignored" "^7.5.1"
-    "@commitlint/parse" "^7.5.0"
-    "@commitlint/rules" "^7.5.2"
+    "@commitlint/is-ignored" "^8.0.0"
+    "@commitlint/parse" "^8.0.0"
+    "@commitlint/rules" "^8.0.0"
     babel-runtime "^6.23.0"
     lodash "4.17.11"
 
-"@commitlint/load@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-7.5.0.tgz#2b225b97d631c2235d8b2084bc2fefb4d4d66719"
-  integrity sha512-fhBER/rzPsteM6zq5qqMiOi+A2bHKCE/0PKmOzYgaqTKcG9c1SsOle9phPemW85to8Gxd2YgUOVLsZkCMltLtA==
+"@commitlint/load@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-8.0.0.tgz#5eacfb96635e9aeac8f1a0674491f29483348872"
+  integrity sha512-JXC3YjO7hN7Rv2Z/SaYz+oIvShsQWLL7gnOCe8+YgI1EusBqjV4mPI0HnBXVe9volfdxbl+Af/GoQZs2dvyOFA==
   dependencies:
-    "@commitlint/execute-rule" "^7.5.0"
-    "@commitlint/resolve-extends" "^7.5.0"
+    "@commitlint/execute-rule" "^8.0.0"
+    "@commitlint/resolve-extends" "^8.0.0"
     babel-runtime "^6.23.0"
-    cosmiconfig "^4.0.0"
+    cosmiconfig "^5.2.0"
     lodash "4.17.11"
-    resolve-from "^4.0.0"
+    resolve-from "^5.0.0"
 
-"@commitlint/message@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/message/-/message-7.5.0.tgz#2572fad648c769dd210374c8b95fb37124302bc5"
-  integrity sha512-5YOhsqy/MgHH7vyDsmmzO6Jr3ygr1pXbCm9NR3XB51wjg55Kd6/6dVlkhS/FmDp99pfwTdHb0TyeDFEjP98waw==
+"@commitlint/message@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/message/-/message-8.0.0.tgz#bbb02fb78490808e36157d675acc544fafd7942b"
+  integrity sha512-2oGUV8630nzsj17t6akq3mFguzWePADO069IwKJi+CN5L0YRBQj9zGRCB0P+zvh4EngjqMnuMwhEhaBEM8TTzA==
 
-"@commitlint/parse@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/parse/-/parse-7.5.0.tgz#d9374266493e5229ec61d92316d28e02419c600f"
-  integrity sha512-hWASM8SBFTBtlFkKrEtD1qW6yTe2BsfoRiMKuYyRCTd+739TUF17og5vgQVuWttbGP0gXaciW44NygS2YjZmfA==
+"@commitlint/parse@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/parse/-/parse-8.0.0.tgz#4b5fa19ab8bdb2c6452b7dbdf1d7adf52386ae60"
+  integrity sha512-6CyweJrBkI+Jqx7qkpYgVx2muBMoUZAZHWhUTgqHIDDmI+3d4UPZ2plGS2G0969KkHCgjtlwnwTjWqA9HLMwPA==
   dependencies:
     conventional-changelog-angular "^1.3.3"
     conventional-commits-parser "^2.1.0"
     lodash "^4.17.11"
 
-"@commitlint/read@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/read/-/read-7.5.0.tgz#35d563b0f3075da2ce6945978996b16fb4acb0f8"
-  integrity sha512-uqGFCKZGnBUCTkxoCCJp4MfWUkegXkyT0T0RVM9diyG6uNWPWlMH1509sjLFlyeJKG+cSyYGG/d6T103ScMb4Q==
+"@commitlint/read@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/read/-/read-8.0.0.tgz#5149fcb2550a07e7eb6a9f50b88df742780fa1e8"
+  integrity sha512-IhNMiKPqkB5yxphe/FiOKgX2uCysbR8fGK6KOXON3uJaVND0dctxnfdv+vY9gDv2CtjIXgNFO+v6FLnqMfIvwA==
   dependencies:
-    "@commitlint/top-level" "^7.5.0"
+    "@commitlint/top-level" "^8.0.0"
     "@marionebl/sander" "^0.6.0"
     babel-runtime "^6.23.0"
     git-raw-commits "^1.3.0"
 
-"@commitlint/resolve-extends@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/resolve-extends/-/resolve-extends-7.5.0.tgz#d95a3058e83ddbaef5e3045835b9a3a1fba3422c"
-  integrity sha512-FRIyPuqGvGa03OT4VgOHakizcw8YR5rdm77JsZff1rSnpxk6i+025I6qMeHqCIr5FaVIA0kR3FlC+MJFUs165A==
+"@commitlint/resolve-extends@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/resolve-extends/-/resolve-extends-8.0.0.tgz#dc606cecb0f392d57905cfd690d8f736ad26eec2"
+  integrity sha512-SPkH+dXMCpYboVwpIhtOhpg1xYdE7L77fuHmEJWveXSmgfi0GosFm4aJ7Cer9DjNjW+KbD0TUfzZU0TrYUESjQ==
   dependencies:
     babel-runtime "6.26.0"
     import-fresh "^3.0.0"
     lodash "4.17.11"
-    resolve-from "^4.0.0"
-    resolve-global "^0.1.0"
+    resolve-from "^5.0.0"
+    resolve-global "^1.0.0"
 
-"@commitlint/rules@^7.5.2":
-  version "7.5.2"
-  resolved "https://registry.yarnpkg.com/@commitlint/rules/-/rules-7.5.2.tgz#da03d754625b2e67c0a6b8b9ab89eae1952a4f2e"
-  integrity sha512-eDN1UFPcBOjdnlI3syuo7y99SjGH/dUV6S9NvBocAye8ln5dfKiI2shhWochJhl36r/kYWU8Wrvl2NZJL3c52g==
+"@commitlint/rules@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/rules/-/rules-8.0.0.tgz#26ef50fedb5a88a2ad2af43677e5bb7c32fb5f14"
+  integrity sha512-s9BehZQP5uAc/V4lMaUxwxFabVZTw5fZ18Ase1e5tbMKVIwq/7E00Ny1czN7xSFXfgffukWznsexpfFXYpbVsg==
   dependencies:
-    "@commitlint/ensure" "^7.5.2"
-    "@commitlint/message" "^7.5.0"
-    "@commitlint/to-lines" "^7.5.0"
+    "@commitlint/ensure" "^8.0.0"
+    "@commitlint/message" "^8.0.0"
+    "@commitlint/to-lines" "^8.0.0"
     babel-runtime "^6.23.0"
 
-"@commitlint/to-lines@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/to-lines/-/to-lines-7.5.0.tgz#a24410d25bb85a5fff3b8d610277b3145f899766"
-  integrity sha512-ZQ3LxPNuQ/J7q42hkiPWN5fUIjWae85H2HHoBB+/Rw1fo+oehvr4Xyt+Oa9Mx5WbBnev/wXnUFjXgoadv1RZ5A==
+"@commitlint/to-lines@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/to-lines/-/to-lines-8.0.0.tgz#9f7d7938404bdbb345c23c8665293e051c4dc243"
+  integrity sha512-qqgNeyj+NJ1Xffwv6hGsipKlVFj30NmfPup751MS/me0GV8IBd//njTjiqHvf/3sKm/OcGn4Re4D7YXwTcC2RA==
 
-"@commitlint/top-level@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/top-level/-/top-level-7.5.0.tgz#01e740167e3d15110794192cd754f49f27d4a16d"
-  integrity sha512-oTu185GufTYHjTXPHu6k6HL7iuASOvDOtQizZWRSxj0VXuoki6e0HzvGZsRsycDTOn04Q9hVu+PhF83IUwRpeg==
+"@commitlint/top-level@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/top-level/-/top-level-8.0.0.tgz#3d998ba1e13be939f4227202eebae7f1dbb472a9"
+  integrity sha512-If9hwfISHV8HXGKeXUKsUvOo4DuISWiU/VC2qHsKpeHSREAxkWESmQzzwYvOtyBjMiOTfAXfzgth18g36Fz2ow==
   dependencies:
     find-up "^2.1.0"
 
-"@fortawesome/angular-fontawesome@^0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/angular-fontawesome/-/angular-fontawesome-0.3.0.tgz#380492f186469ce03d6fdbb3ec719810f771bf62"
-  integrity sha512-wXvyPI7GidoNiqeMz2re9iemUMFH4zBmuv94CfXlaanQ8+kMP/fYs/k69PLVN1KsebQY4kRA9GHmc1U1ndBkJg==
+"@compodoc/compodoc@^1.1.9":
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/@compodoc/compodoc/-/compodoc-1.1.9.tgz#b45593897fd54ca8a0996fb41e41e26f99da6c4f"
+  integrity sha512-LFdbF/fO9qOGgdrCHg4irMBrl3sD8ySIlL6XabFAz8QbUdf2+77xOVnZJ/PYdcuI8h8vXo4UGS7MFg0pDR2jsw==
+  dependencies:
+    "@compodoc/ngd-transformer" "^2.0.0"
+    chalk "^2.4.2"
+    cheerio "^1.0.0-rc.2"
+    chokidar "^2.1.2"
+    colors "^1.3.3"
+    commander "^2.19.0"
+    cosmiconfig "^5.1.0"
+    fancy-log "^1.3.3"
+    findit2 "^2.2.3"
+    fs-extra "^7.0.1"
+    glob "^7.1.3"
+    handlebars "^4.1.0"
+    html-entities "^1.2.1"
+    i18next "^15.0.4"
+    inside "^1.0.0"
+    json5 "^2.1.0"
+    live-server "^1.2.1"
+    lodash "^4.17.11"
+    lunr "^2.3.6"
+    marked "^0.6.1"
+    minimist "^1.2.0"
+    opencollective "^1.0.3"
+    os-name "^3.0.0"
+    pdfmake "^0.1.53"
+    semver "^5.6.0"
+    traverse "^0.6.6"
+    ts-simple-ast "12.4.0"
+    uuid "^3.3.2"
+
+"@compodoc/ngd-core@~2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@compodoc/ngd-core/-/ngd-core-2.0.0.tgz#e31a6cbbdfa8de648b027aa4169468bc496544c9"
+  integrity sha512-6HpYvXRZBdIYFojWxW5EVNkhYPmblytCve62CNoYBSWfy++vTGH7Ypg2Bhjg2CsqeV8JOVxrPO7JM9M3MgWKEA==
+  dependencies:
+    ansi-colors "^1.0.1"
+    fancy-log "^1.3.2"
+    typescript "^2.4.2"
+
+"@compodoc/ngd-transformer@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@compodoc/ngd-transformer/-/ngd-transformer-2.0.0.tgz#89e858dd332198cde262f0cf3648bd0969d0da62"
+  integrity sha512-9J0KkmuuuvDHxH0oREgrgbqdEFqcltQXIBofeYdIyMKzI3A+pN1Ji4zfi7x1ql0Ax7qQKemp8XWP+cCpP0qY+w==
+  dependencies:
+    "@compodoc/ngd-core" "~2.0.0"
+    dot "^1.1.1"
+    fs-extra "^4.0.1"
+    viz.js "^1.8.0"
+
+"@dsherret/to-absolute-glob@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@dsherret/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1f6475dc8bd974cea07a2daf3864b317b1dd332c"
+  integrity sha1-H2R13IvZdM6gei2vOGSzF7HdMyw=
+  dependencies:
+    is-absolute "^1.0.0"
+    is-negated-glob "^1.0.0"
+
+"@fortawesome/angular-fontawesome@^0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/angular-fontawesome/-/angular-fontawesome-0.4.0.tgz#ab794362a5e37124b834564dcb55ed1c0ce0413a"
+  integrity sha512-DYVXdCzwQo6d0CxVMRK+10LpBAvYN9xigWeQW4wKYq/Czd5es46nPMKixB5rHfNViECwwlM2gTM61K4DpxlJxg==
   dependencies:
     tslib "^1.9.0"
 
-"@fortawesome/fontawesome-common-types@^0.2.15":
-  version "0.2.15"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.15.tgz#16af950653083d1e3064061de9f8e5e3b579f688"
-  integrity sha512-ATBRyKJw1d2ko+0DWN9+BXau0EK3I/Q6pPzPv3LhJD7r052YFAkAdfb1Bd7ZqhBsJrdse/S7jKxWUOZ61qBD4g==
+"@fortawesome/fontawesome-common-types@^0.2.19":
+  version "0.2.19"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.19.tgz#754a0f85e1290858152e1c05700ab502b11197f1"
+  integrity sha512-nd2Ul/CUs8U9sjofQYAALzOGpgkVJQgEhIJnOHaoyVR/LeC3x2mVg4eB910a4kS6WgLPebAY0M2fApEI497raQ==
 
-"@fortawesome/fontawesome-svg-core@^1.2.15":
-  version "1.2.15"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.15.tgz#368f9fc7e8e8d8636495dc7483f97510f920ba97"
-  integrity sha512-M/sHyl4g2VBtKYkay1Z+XImMyTVcaBPmehYtPw4HKD9zg2E7eovB7Yx98aUfZjPbroGqa+IL4/+KhWBMOGlHIQ==
+"@fortawesome/fontawesome-svg-core@^1.2.19":
+  version "1.2.19"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.19.tgz#0eca1ce9285c3d99e6e340633ee8f615f9d1a2e0"
+  integrity sha512-D4ICXg9oU08eF9o7Or392gPpjmwwgJu8ecCFusthbID95CLVXOgIyd4mOKD9Nud5Ckz+Ty59pqkNtThDKR0erA==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "^0.2.15"
+    "@fortawesome/fontawesome-common-types" "^0.2.19"
 
-"@fortawesome/free-solid-svg-icons@^5.7.2":
-  version "5.7.2"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.7.2.tgz#9ec2ed353d630092a8e19cc8aae2f716572963e5"
-  integrity sha512-iujcXMyAvIbWM8W3jkOLpvJbR+rPpdN1QyqhZeJaLRdHPH4JmuovIAYP4vx5Sa1csZVXfRD1eDWqVZ/jGM620A==
+"@fortawesome/free-solid-svg-icons@^5.9.0":
+  version "5.9.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.9.0.tgz#1c73e7bac17417d23f934d83f7fff5b100a7fda9"
+  integrity sha512-U8YXPfWcSozsCW0psCtlRGKjjRs5+Am5JJwLOUmVHFZbIEWzaz4YbP84EoPwUsVmSAKrisu3QeNcVOtmGml0Xw==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "^0.2.15"
+    "@fortawesome/fontawesome-common-types" "^0.2.19"
 
 "@marionebl/sander@^0.6.0":
   version "0.6.1"
@@ -474,88 +551,114 @@
     mkdirp "^0.5.1"
     rimraf "^2.5.2"
 
-"@ng-bootstrap/ng-bootstrap@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-4.1.0.tgz#84c542e7dbb1e03944c87a2615199edc39c3d6c7"
-  integrity sha512-7THBEgwDW9bs3R6JQ3glDXAxyihrUqM8p71Es2GpN21xLs2fcxUUcLO4ioRcWGGlR6QKwamzNVAHNUDB5IMY+Q==
+"@mrmlnc/readdir-enhanced@^2.2.1":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
+  integrity sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==
+  dependencies:
+    call-me-maybe "^1.0.1"
+    glob-to-regexp "^0.3.0"
+
+"@ng-bootstrap/ng-bootstrap@^4.2.1":
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-4.2.1.tgz#aa87f2ee6c4def0be087d4f456930b1e0761d91a"
+  integrity sha512-7etP9X9jKIkbuDzU3ngI2jQhHQDZxIu0ErvlkHb7u7YH9akIOLVkXvz2mTMvcFABWZhze64UjFuEgR46b6WGSw==
   dependencies:
     tslib "^1.9.0"
 
-"@ngtools/webpack@7.3.6":
-  version "7.3.6"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.6.tgz#3f90c60f7c1742fa4a557f90def8fe742304f4c5"
-  integrity sha512-gDMHybwe8B+1BSvtwM5z4qAkUnZ9b4PTyIVWWECgTLDp2x3WhJi2rMk2X8HTkpbZ52pLPue5GL1sfqlZIOcX7Q==
+"@ngtools/webpack@8.0.6":
+  version "8.0.6"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-8.0.6.tgz#c6b5416710913b24b741a17c8f255e54f42c9abf"
+  integrity sha512-ulu+5lLt4RjmcCXbmaGCjqjuOWt18DVek/Sq4HFE9E7zP+n7HercsU6h+9PrtaZThj9NB0B7A+afRB5aAQN/bQ==
   dependencies:
-    "@angular-devkit/core" "7.3.6"
+    "@angular-devkit/core" "8.0.6"
     enhanced-resolve "4.1.0"
-    rxjs "6.3.3"
+    rxjs "6.4.0"
     tree-kill "1.2.1"
     webpack-sources "1.3.0"
 
-"@schematics/angular@7.3.6":
-  version "7.3.6"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.6.tgz#e827111e7d3cdf950efcca504389cbade3c9c59a"
-  integrity sha512-Q4VXAjVaCDb2zXFXoIdOfNPsn+EQjqDBHK4a97omytnSNAmu1erl3l2FkEMi6x/VuzK2mQSzBbmHJIgauMmOAA==
+"@nodelib/fs.stat@^1.1.2":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
+  integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
+
+"@schematics/angular@8.0.6":
+  version "8.0.6"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-8.0.6.tgz#13b81ac1130396dc9676f8119e9d10cc7f615237"
+  integrity sha512-F0/MrbvrJQJIjt0GwEkmf9PZUX0xQlCjlDcH6U7yBni0/+R5Gd5g3G0f12fsSa2iAwpwrLkKpiQluj29eFituQ==
   dependencies:
-    "@angular-devkit/core" "7.3.6"
-    "@angular-devkit/schematics" "7.3.6"
-    typescript "3.2.4"
+    "@angular-devkit/core" "8.0.6"
+    "@angular-devkit/schematics" "8.0.6"
 
-"@schematics/update@0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.6.tgz#7d114b50e99af0b77ea537a50341a81a80240a02"
-  integrity sha512-TkeigdQTHG40ZGj4CAAzQHh7/rSotg0J6nkBBtc4Y+9md7IGg6dzSFJAvYbDX5JZ9tk7DpukdRHOVVopS/J0AQ==
+"@schematics/update@0.800.6":
+  version "0.800.6"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.800.6.tgz#42bde01071bab9311632dc511a1234c8ecf7908b"
+  integrity sha512-vrzGIJtMiwLWl96+aJXMYrPgPtktLRpY8ZiNnlLm3pMDmeg08uButRh/pQGt02HuO/apTNJ5g0bmG8K5wS4I5A==
   dependencies:
-    "@angular-devkit/core" "7.3.6"
-    "@angular-devkit/schematics" "7.3.6"
+    "@angular-devkit/core" "8.0.6"
+    "@angular-devkit/schematics" "8.0.6"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
-    pacote "9.4.0"
-    rxjs "6.3.3"
-    semver "5.6.0"
+    pacote "9.5.0"
+    rxjs "6.4.0"
+    semver "6.0.0"
     semver-intersect "1.4.0"
 
-"@types/jasmine@*":
-  version "2.8.5"
-  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.5.tgz#96e58872583fa80c7ea0dd29024b180d5e133678"
-  integrity sha512-mkrHFZTgOXkZhau36K628iKFkjbp11t/bHCkY4Mefu4R6McMg2FD9P3naBv/0Ygyn4sz8baColJp2gdmSekgiw==
+"@types/events@*":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
+  integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
+
+"@types/glob@^7.1.1":
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
+  integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
+  dependencies:
+    "@types/events" "*"
+    "@types/minimatch" "*"
+    "@types/node" "*"
 
-"@types/jasmine@~2.8.8":
-  version "2.8.9"
-  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.9.tgz#e028c891e8551fdf6de905d959581fc4fa0b5509"
-  integrity sha512-8dPZwjosElZOGGYw1nwTvOEMof4gjwAWNFS93nBI091BoEfd5drnHOLRMiRF/LOPuMTn5LgEdv0bTUO8QFVuHQ==
+"@types/jasmine@*", "@types/jasmine@~3.3.8":
+  version "3.3.13"
+  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.3.13.tgz#d5daabb0af47bcddee40597acf6e804433bab439"
+  integrity sha512-iczmLoIiVymaD1TIr2UctxjFkNEslVE/QtNAUmpDsD71cZfZBAsPCUv1Y+8AwsfA8bLx2ccr7d95T9w/UAirlQ==
 
 "@types/jasminewd2@~2.0.3":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@types/jasminewd2/-/jasminewd2-2.0.5.tgz#0910db4bd50202dea9fe6ec37517b0ae6a01a9e6"
-  integrity sha512-1awkm/O4pQCR9hI2F80HmIOda/L+ogkSL8Arj1k00eue5VLY5ooewhSOyF/cUJE0S+/34uD5EYY3zmd6fu2OCA==
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@types/jasminewd2/-/jasminewd2-2.0.6.tgz#2f57a8d9875a6c9ef328a14bd070ba14a055ac39"
+  integrity sha512-2ZOKrxb8bKRmP/po5ObYnRDgFE4i+lQiEB27bAMmtMWLgJSqlIDqlLx6S0IRorpOmOPRQ6O80NujTmQAtBkeNw==
   dependencies:
     "@types/jasmine" "*"
 
-"@types/node@*":
-  version "10.12.18"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.18.tgz#1d3ca764718915584fcd9f6344621b7672665c67"
-  integrity sha512-fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ==
+"@types/minimatch@*":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
+  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
-"@types/node@^6.0.46":
-  version "6.0.96"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.96.tgz#7bf0bf40d6ce51e93762cc47d010c8cc5ebb2179"
-  integrity sha512-fsOOY6tMQ3jCB2wD51XFDmmpgm4wVKkJECdcVRqapbJEa7awJDcr+SaH8toz+4r4KW8YQ3M7ybXMoSDo1QGewA==
+"@types/node@*":
+  version "12.0.8"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.8.tgz#551466be11b2adc3f3d47156758f610bd9f6b1d8"
+  integrity sha512-b8bbUOTwzIY3V5vDTY1fIJ+ePKDUBqt2hC2woVGotdQQhG/2Sh62HOKHrT7ab+VerXAcPyAiTEipPu/FsreUtg==
 
 "@types/node@~8.9.4":
   version "8.9.5"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.9.5.tgz#162b864bc70be077e6db212b322754917929e976"
   integrity sha512-jRHfWsvyMtXdbhnz5CVHxaBgnV6duZnPlQuRSo/dm/GnmikNcmZhxIES4E9OZjUmQ8C+HCl4KJux+cXN/ErGDQ==
 
+"@types/normalize-package-data@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
+  integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
+
 "@types/q@^0.0.32":
   version "0.0.32"
   resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
   integrity sha1-vShOV8hPEyXacCur/IKlMoGQwMU=
 
 "@types/selenium-webdriver@^3.0.0":
-  version "3.0.12"
-  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.12.tgz#6affe5aed1ba379175075a889adbe2bc3aa62159"
-  integrity sha512-hYn+eoOehVUIdMwp5h34ZsGAO1ydja10GDup4BwyoFCdcH5MQ35nQq+AInSaBMEMopD5hEooFCyKo2Pajbe1ag==
+  version "3.0.16"
+  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.16.tgz#50a4755f8e33edacd9c406729e9b930d2451902a"
+  integrity sha512-lMC2G0ItF2xv4UCiwbJGbnJlIuUixHrioOhNGHSCsYCJ8l4t9hMCUimCytvFv7qy6AfSzRxhRHoGa+UqaqwyeA==
 
 "@types/source-list-map@*":
   version "0.1.2"
@@ -571,158 +674,161 @@
     "@types/source-list-map" "*"
     source-map "^0.6.1"
 
-"@webassemblyjs/ast@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz#b988582cafbb2b095e8b556526f30c90d057cace"
-  integrity sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==
-  dependencies:
-    "@webassemblyjs/helper-module-context" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/wast-parser" "1.7.11"
-
-"@webassemblyjs/floating-point-hex-parser@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz#a69f0af6502eb9a3c045555b1a6129d3d3f2e313"
-  integrity sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg==
-
-"@webassemblyjs/helper-api-error@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz#c7b6bb8105f84039511a2b39ce494f193818a32a"
-  integrity sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg==
-
-"@webassemblyjs/helper-buffer@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz#3122d48dcc6c9456ed982debe16c8f37101df39b"
-  integrity sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w==
-
-"@webassemblyjs/helper-code-frame@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz#cf8f106e746662a0da29bdef635fcd3d1248364b"
-  integrity sha512-T8ESC9KMXFTXA5urJcyor5cn6qWeZ4/zLPyWeEXZ03hj/x9weSokGNkVCdnhSabKGYWxElSdgJ+sFa9G/RdHNw==
-  dependencies:
-    "@webassemblyjs/wast-printer" "1.7.11"
-
-"@webassemblyjs/helper-fsm@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz#df38882a624080d03f7503f93e3f17ac5ac01181"
-  integrity sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A==
-
-"@webassemblyjs/helper-module-context@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz#d874d722e51e62ac202476935d649c802fa0e209"
-  integrity sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg==
-
-"@webassemblyjs/helper-wasm-bytecode@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz#dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06"
-  integrity sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ==
-
-"@webassemblyjs/helper-wasm-section@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz#9c9ac41ecf9fbcfffc96f6d2675e2de33811e68a"
-  integrity sha512-8ZRY5iZbZdtNFE5UFunB8mmBEAbSI3guwbrsCl4fWdfRiAcvqQpeqd5KHhSWLL5wuxo53zcaGZDBU64qgn4I4Q==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-buffer" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/wasm-gen" "1.7.11"
-
-"@webassemblyjs/ieee754@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz#c95839eb63757a31880aaec7b6512d4191ac640b"
-  integrity sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ==
+"@webassemblyjs/ast@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
+  integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==
+  dependencies:
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/wast-parser" "1.8.5"
+
+"@webassemblyjs/floating-point-hex-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721"
+  integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==
+
+"@webassemblyjs/helper-api-error@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7"
+  integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==
+
+"@webassemblyjs/helper-buffer@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204"
+  integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==
+
+"@webassemblyjs/helper-code-frame@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e"
+  integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.8.5"
+
+"@webassemblyjs/helper-fsm@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452"
+  integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==
+
+"@webassemblyjs/helper-module-context@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"
+  integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    mamacro "^0.0.3"
+
+"@webassemblyjs/helper-wasm-bytecode@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61"
+  integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==
+
+"@webassemblyjs/helper-wasm-section@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"
+  integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+
+"@webassemblyjs/ieee754@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e"
+  integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.11.tgz#d7267a1ee9c4594fd3f7e37298818ec65687db63"
-  integrity sha512-vuGmgZjjp3zjcerQg+JA+tGOncOnJLWVkt8Aze5eWQLwTQGNgVLcyOTqgSCxWTR4J42ijHbBxnuRaL1Rv7XMdw==
-  dependencies:
-    "@xtuc/long" "4.2.1"
-
-"@webassemblyjs/utf8@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz#06d7218ea9fdc94a6793aa92208160db3d26ee82"
-  integrity sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA==
-
-"@webassemblyjs/wasm-edit@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz#8c74ca474d4f951d01dbae9bd70814ee22a82005"
-  integrity sha512-FUd97guNGsCZQgeTPKdgxJhBXkUbMTY6hFPf2Y4OedXd48H97J+sOY2Ltaq6WGVpIH8o/TGOVNiVz/SbpEMJGg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-buffer" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/helper-wasm-section" "1.7.11"
-    "@webassemblyjs/wasm-gen" "1.7.11"
-    "@webassemblyjs/wasm-opt" "1.7.11"
-    "@webassemblyjs/wasm-parser" "1.7.11"
-    "@webassemblyjs/wast-printer" "1.7.11"
-
-"@webassemblyjs/wasm-gen@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz#9bbba942f22375686a6fb759afcd7ac9c45da1a8"
-  integrity sha512-U/KDYp7fgAZX5KPfq4NOupK/BmhDc5Kjy2GIqstMhvvdJRcER/kUsMThpWeRP8BMn4LXaKhSTggIJPOeYHwISA==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/ieee754" "1.7.11"
-    "@webassemblyjs/leb128" "1.7.11"
-    "@webassemblyjs/utf8" "1.7.11"
-
-"@webassemblyjs/wasm-opt@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz#b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7"
-  integrity sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-buffer" "1.7.11"
-    "@webassemblyjs/wasm-gen" "1.7.11"
-    "@webassemblyjs/wasm-parser" "1.7.11"
-
-"@webassemblyjs/wasm-parser@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz#6e3d20fa6a3519f6b084ef9391ad58211efb0a1a"
-  integrity sha512-6lmXRTrrZjYD8Ng8xRyvyXQJYUQKYSXhJqXOBLw24rdiXsHAOlvw5PhesjdcaMadU/pyPQOJ5dHreMjBxwnQKg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-api-error" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/ieee754" "1.7.11"
-    "@webassemblyjs/leb128" "1.7.11"
-    "@webassemblyjs/utf8" "1.7.11"
-
-"@webassemblyjs/wast-parser@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz#25bd117562ca8c002720ff8116ef9072d9ca869c"
-  integrity sha512-lEyVCg2np15tS+dm7+JJTNhNWq9yTZvi3qEhAIIOaofcYlUp0UR5/tVqOwa/gXYr3gjwSZqw+/lS9dscyLelbQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/floating-point-hex-parser" "1.7.11"
-    "@webassemblyjs/helper-api-error" "1.7.11"
-    "@webassemblyjs/helper-code-frame" "1.7.11"
-    "@webassemblyjs/helper-fsm" "1.7.11"
-    "@xtuc/long" "4.2.1"
-
-"@webassemblyjs/wast-printer@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz#c4245b6de242cb50a2cc950174fdbf65c78d7813"
-  integrity sha512-m5vkAsuJ32QpkdkDOUPGSltrg8Cuk3KBx4YrmAGQwCZPRdUHXxG4phIOuuycLemHFr74sWL9Wthqss4fzdzSwg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/wast-parser" "1.7.11"
-    "@xtuc/long" "4.2.1"
+"@webassemblyjs/leb128@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10"
+  integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==
+  dependencies:
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/utf8@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"
+  integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==
+
+"@webassemblyjs/wasm-edit@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a"
+  integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/helper-wasm-section" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+    "@webassemblyjs/wasm-opt" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+    "@webassemblyjs/wast-printer" "1.8.5"
+
+"@webassemblyjs/wasm-gen@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc"
+  integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/ieee754" "1.8.5"
+    "@webassemblyjs/leb128" "1.8.5"
+    "@webassemblyjs/utf8" "1.8.5"
+
+"@webassemblyjs/wasm-opt@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264"
+  integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+
+"@webassemblyjs/wasm-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d"
+  integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-api-error" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/ieee754" "1.8.5"
+    "@webassemblyjs/leb128" "1.8.5"
+    "@webassemblyjs/utf8" "1.8.5"
+
+"@webassemblyjs/wast-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"
+  integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/floating-point-hex-parser" "1.8.5"
+    "@webassemblyjs/helper-api-error" "1.8.5"
+    "@webassemblyjs/helper-code-frame" "1.8.5"
+    "@webassemblyjs/helper-fsm" "1.8.5"
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/wast-printer@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc"
+  integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/wast-parser" "1.8.5"
+    "@xtuc/long" "4.2.2"
 
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
   integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
 
-"@xtuc/long@4.2.1":
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8"
-  integrity sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==
+"@xtuc/long@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
+  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
 "@yarnpkg/lockfile@1.1.0":
   version "1.1.0"
@@ -742,21 +848,13 @@ abbrev@1:
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
-accepts@~1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.4.tgz#86246758c7dd6d21a6474ff084a4740ec05eb21f"
-  integrity sha1-hiRnWMfdbSGmR0/whKR0DsBesh8=
-  dependencies:
-    mime-types "~2.1.16"
-    negotiator "0.6.1"
-
-accepts@~1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
-  integrity sha1-63d99gEXI6OxTopywIBcjoZ0a9I=
+accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
+  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
   dependencies:
-    mime-types "~2.1.18"
-    negotiator "0.6.1"
+    mime-types "~2.1.24"
+    negotiator "0.6.2"
 
 acorn-dynamic-import@^4.0.0:
   version "4.0.0"
@@ -768,22 +866,34 @@ acorn-walk@^6.1.1:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913"
   integrity sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==
 
+acorn@^5.0.0:
+  version "5.7.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
+  integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
+
 acorn@^6.0.5, acorn@^6.0.7:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
   integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
 
-adm-zip@^0.4.7:
-  version "0.4.7"
-  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.7.tgz#8606c2cbf1c426ce8c8ec00174447fd49b6eafc1"
-  integrity sha1-hgbCy/HEJs6MjsABdER/1Jtur8E=
+adm-zip@^0.4.9:
+  version "0.4.13"
+  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.13.tgz#597e2f8cc3672151e1307d3e95cddbc75672314a"
+  integrity sha512-fERNJX8sOXfel6qCBCMPvZLzENBEhZTzKqg6vrOW5pvoEaQuJhRU4ndTAh6lHOxn1I6jnz2NHra56ZODM751uw==
 
 after@0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
   integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
 
-agent-base@4, agent-base@^4.1.0, agent-base@~4.2.0:
+agent-base@4, agent-base@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
+  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
+  dependencies:
+    es6-promisify "^5.0.0"
+
+agent-base@~4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
   integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
@@ -798,26 +908,26 @@ agentkeepalive@^3.4.1:
     humanize-ms "^1.2.1"
 
 ajv-errors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.0.tgz#ecf021fa108fd17dfb5e6b383f2dd233e31ffc59"
-  integrity sha1-7PAh+hCP0X37Xms4Py3SM+Mf/Fk=
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
+  integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
 
 ajv-keywords@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
-  integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.0.tgz#4b831e7b531415a7cc518cd404e73f6193c6349d"
+  integrity sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==
 
-ajv@6.9.1:
-  version "6.9.1"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.1.tgz#a4d3683d74abc5670e75f0b16520f70a20ea8dc1"
-  integrity sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==
+ajv@6.10.0, ajv@^6.1.0, ajv@^6.5.5:
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
+  integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^5.0.0, ajv@^5.1.0, ajv@^5.3.0:
+ajv@^5.0.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
   integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
@@ -827,16 +937,6 @@ ajv@^5.0.0, ajv@^5.1.0, ajv@^5.3.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-ajv@^6.1.0:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.4.tgz#247d5274110db653706b550fcc2b797ca28cfc59"
-  integrity sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
 amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
@@ -859,15 +959,34 @@ ansi-align@^2.0.0:
   dependencies:
     string-width "^2.0.0"
 
+ansi-colors@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
+  integrity sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==
+  dependencies:
+    ansi-wrap "^0.1.0"
+
 ansi-colors@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.1.0.tgz#dcfaacc90ef9187de413ec3ef8d5eb981a98808f"
-  integrity sha512-hTv1qPdi+sVEk3jYsdjox5nQI0C9HTbjKShbCdYLKb1LOfNbb7wsF4d7OEKIZoxIHx02tSp3m94jcPW2EfMjmA==
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
+  integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
 
-ansi-escapes@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
-  integrity sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==
+ansi-escapes@^1.1.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
+  integrity sha1-06ioOzGapneTZisT52HHkRQiMG4=
+
+ansi-escapes@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
+  integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
+
+ansi-gray@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
+  integrity sha1-KWLPVOyXksSFEKPetSRDaGHvclE=
+  dependencies:
+    ansi-wrap "0.1.0"
 
 ansi-html@0.0.7:
   version "0.0.7"
@@ -884,10 +1003,10 @@ ansi-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
   integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
-ansi-regex@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9"
-  integrity sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==
+ansi-regex@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
 
 ansi-styles@^2.2.1:
   version "2.2.1"
@@ -901,6 +1020,11 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
+ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
+  integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
+
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -909,10 +1033,22 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-app-root-path@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.1.0.tgz#98bf6599327ecea199309866e8140368fd2e646a"
-  integrity sha1-mL9lmTJ+zqGZMJhm6BQDaP0uZGo=
+apache-crypt@^1.1.2:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/apache-crypt/-/apache-crypt-1.2.1.tgz#d6fc72aa6d27d99c95a94fd188d731eefffa663c"
+  integrity sha1-1vxyqm0n2ZyVqU/RiNcx7v/6Zjw=
+  dependencies:
+    unix-crypt-td-js "^1.0.0"
+
+apache-md5@^1.0.6:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/apache-md5/-/apache-md5-1.1.2.tgz#ee49736b639b4f108b6e9e626c6da99306b41692"
+  integrity sha1-7klza2ObTxCLbp5ibG2pkwa0FpI=
+
+app-root-path@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.2.1.tgz#d0df4a682ee408273583d43f6f79e9892624bc9a"
+  integrity sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==
 
 append-transform@^1.0.0:
   version "1.0.0"
@@ -941,6 +1077,14 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+aria-query@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-3.0.0.tgz#65b3fcc1ca1155a8c9ae64d6eee297f15d5133cc"
+  integrity sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=
+  dependencies:
+    ast-types-flow "0.0.7"
+    commander "^2.11.0"
+
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
@@ -956,10 +1100,15 @@ arr-union@^3.1.0:
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
   integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
+array-differ@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
+  integrity sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=
+
 array-differ@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-2.0.3.tgz#0195bb00ccccf271106efee4a4786488b7180712"
-  integrity sha1-AZW7AMzM8nEQbv7kpHhkiLcYBxI=
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-2.1.0.tgz#4b9c1c3f14b906757082925769e8ab904f4801b1"
+  integrity sha512-KbUpJgx909ZscOc/7CLATBFam7P1Z1QRQInvgT0UztM9Q72aGKCunKASAl7WNW0tnPmPyEMeMhdsfWhfmW037w==
 
 array-filter@~0.0.0:
   version "0.0.1"
@@ -977,9 +1126,9 @@ array-flatten@1.1.1:
   integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
 
 array-flatten@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.1.tgz#426bb9da84090c1838d812c8150af20a8331e296"
-  integrity sha1-Qmu52oQJDBg42BLIFQryCoMx4pY=
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
+  integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
 
 array-ify@^1.0.0:
   version "1.0.0"
@@ -1023,15 +1172,15 @@ arrify@^1.0.0, arrify@^1.0.1:
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
   integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
 
-asap@~2.0.3:
+asap@^2.0.0, asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
 
 asn1.js@^4.0.0:
-  version "4.9.2"
-  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.2.tgz#8117ef4f7ed87cd8f89044b5bff97ac243a16c9a"
-  integrity sha512-b/OsSjvWEo8Pi8H0zsDd2P6Uqo2TK2pH8gNLSJtNLM2Db0v2QaAZ0pBQJXVjAn4gBuugeVDr7s63ZogpUIwWDg==
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
+  integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
   dependencies:
     bn.js "^4.0.0"
     inherits "^2.0.1"
@@ -1050,10 +1199,11 @@ assert-plus@1.0.0, assert-plus@^1.0.0:
   integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
 
 assert@^1.1.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
-  integrity sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
+  integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==
   dependencies:
+    object-assign "^4.1.1"
     util "0.10.3"
 
 assign-symbols@^1.0.0:
@@ -1061,6 +1211,25 @@ assign-symbols@^1.0.0:
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
   integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
+ast-transform@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/ast-transform/-/ast-transform-0.0.0.tgz#74944058887d8283e189d954600947bc98fe0062"
+  integrity sha1-dJRAWIh9goPhidlUYAlHvJj+AGI=
+  dependencies:
+    escodegen "~1.2.0"
+    esprima "~1.0.4"
+    through "~2.3.4"
+
+ast-types-flow@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
+  integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=
+
+ast-types@^0.7.0:
+  version "0.7.8"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.7.8.tgz#902d2e0d60d071bdcd46dc115e1809ed11c138a9"
+  integrity sha1-kC0uDWDQcb3NRtwRXhgJ7RHBOKk=
+
 async-each@^1.0.0, async-each@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.2.tgz#8b8a7ca2a658f927e9f307d6d1a42f4199f0f735"
@@ -1088,12 +1257,12 @@ async@^1.5.2:
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
   integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
 
-async@^2.5.0, async@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
-  integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==
+async@^2.5.0, async@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381"
+  integrity sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==
   dependencies:
-    lodash "^4.17.10"
+    lodash "^4.17.11"
 
 asynckit@^0.4.0:
   version "0.4.0"
@@ -1105,16 +1274,16 @@ atob@^2.1.1:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@9.4.6:
-  version "9.4.6"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.6.tgz#0ace275e33b37de16b09a5547dbfe73a98c1d446"
-  integrity sha512-Yp51mevbOEdxDUy5WjiKtpQaecqYq9OqZSL04rSoCiry7Tc5I9FEyo3bfxiTJc1DfHeKwSFCUYbBAiOQ2VGfiw==
+autoprefixer@9.5.1:
+  version "9.5.1"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.5.1.tgz#243b1267b67e7e947f28919d786b50d3bb0fb357"
+  integrity sha512-KJSzkStUl3wP0D5sdMlP82Q52JLy5+atf2MHAre48+ckWkXgixmfHyWmA77wFDy6jTHU6mIgXv6hAQ2mf1PjJQ==
   dependencies:
-    browserslist "^4.4.1"
-    caniuse-lite "^1.0.30000929"
+    browserslist "^4.5.4"
+    caniuse-lite "^1.0.30000957"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.13"
+    postcss "^7.0.14"
     postcss-value-parser "^3.3.1"
 
 aws-sign2@~0.7.0:
@@ -1122,11 +1291,18 @@ aws-sign2@~0.7.0:
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
   integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
-aws4@^1.6.0, aws4@^1.8.0:
+aws4@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
   integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
 
+axobject-query@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.0.2.tgz#ea187abe5b9002b377f925d8bf7d1c561adf38f9"
+  integrity sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==
+  dependencies:
+    ast-types-flow "0.0.7"
+
 babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
@@ -1161,21 +1337,7 @@ babel-core@^6.26.0:
     slash "^1.0.0"
     source-map "^0.5.7"
 
-babel-generator@^6.18.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.0.tgz#ac1ae20070b79f6e3ca1d3269613053774f20dc5"
-  integrity sha1-rBriAHC3n248odMmlhMFN3TyDcU=
-  dependencies:
-    babel-messages "^6.23.0"
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    detect-indent "^4.0.0"
-    jsesc "^1.3.0"
-    lodash "^4.17.4"
-    source-map "^0.5.6"
-    trim-right "^1.0.1"
-
-babel-generator@^6.26.0:
+babel-generator@^6.18.0, babel-generator@^6.26.0:
   version "6.26.1"
   resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
   integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==
@@ -1689,6 +1851,15 @@ babel-plugin-transform-strict-mode@^6.24.1:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
+babel-polyfill@6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.23.0.tgz#8364ca62df8eafb830499f699177466c3b03499d"
+  integrity sha1-g2TKYt+Or7gwSZ9pkXdGbDsDSZ0=
+  dependencies:
+    babel-runtime "^6.22.0"
+    core-js "^2.4.0"
+    regenerator-runtime "^0.10.0"
+
 babel-polyfill@6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
@@ -1780,7 +1951,7 @@ babel-register@^6.18.0, babel-register@^6.26.0:
     mkdirp "^0.5.1"
     source-map-support "^0.4.15"
 
-babel-runtime@6.26.0, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.26.0:
+babel-runtime@6.26.0, babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
   integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
@@ -1844,10 +2015,15 @@ base64-arraybuffer@0.1.5:
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
   integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
 
-base64-js@^1.0.2:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.1.tgz#a91947da1f4a516ea38e5b4ec0ec3773675e0886"
-  integrity sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw==
+base64-js@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-0.0.8.tgz#1101e9544f4a76b1bc3b26d452ca96d7a35e7978"
+  integrity sha1-EQHpVE9KdrG8OybUUsqW16NeeXg=
+
+base64-js@^1.0.2, base64-js@^1.1.2:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
+  integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
 
 base64id@1.0.0:
   version "1.0.0"
@@ -1867,6 +2043,13 @@ base@^0.11.1:
     mixin-deep "^1.2.0"
     pascalcase "^0.1.1"
 
+basic-auth@~2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a"
+  integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==
+  dependencies:
+    safe-buffer "5.1.2"
+
 batch@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
@@ -1879,6 +2062,11 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
+bcryptjs@^2.3.0:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb"
+  integrity sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms=
+
 better-assert@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
@@ -1896,25 +2084,20 @@ bfj@^6.1.1:
     hoopy "^0.1.2"
     tryer "^1.0.0"
 
-big.js@^3.1.3:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
-  integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==
-
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
   integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
 
 binary-extensions@^1.0.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.0.tgz#9523e001306a32444b907423f1de2164222f6ab1"
-  integrity sha512-EgmjVLMn22z7eGGv3kcnHwSnJXmFHjISTY9E/S5lIcTD3Oxw05QTcBLNkJFzcb3cNueUdF/IN4U+d78V0zO8Hw==
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
+  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 
-blob@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz#bcf13052ca54463f30f9fc7e95b9a47630a94921"
-  integrity sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=
+blob@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
+  integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
 
 block-stream@*:
   version "0.0.9"
@@ -1930,52 +2113,31 @@ blocking-proxy@^1.0.0:
   dependencies:
     minimist "^1.2.0"
 
-bluebird@^3.3.0:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
-  integrity sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==
-
-bluebird@^3.5.1, bluebird@^3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
-  integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==
+bluebird@^3.3.0, bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5:
+  version "3.5.5"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f"
+  integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
   integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
 
-body-parser@1.18.2, body-parser@^1.16.1:
-  version "1.18.2"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454"
-  integrity sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=
-  dependencies:
-    bytes "3.0.0"
-    content-type "~1.0.4"
-    debug "2.6.9"
-    depd "~1.1.1"
-    http-errors "~1.6.2"
-    iconv-lite "0.4.19"
-    on-finished "~2.3.0"
-    qs "6.5.1"
-    raw-body "2.3.2"
-    type-is "~1.6.15"
-
-body-parser@1.18.3:
-  version "1.18.3"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4"
-  integrity sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=
+body-parser@1.19.0, body-parser@^1.16.1:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
+  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
   dependencies:
-    bytes "3.0.0"
+    bytes "3.1.0"
     content-type "~1.0.4"
     debug "2.6.9"
     depd "~1.1.2"
-    http-errors "~1.6.3"
-    iconv-lite "0.4.23"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
     on-finished "~2.3.0"
-    qs "6.5.2"
-    raw-body "2.3.3"
-    type-is "~1.6.16"
+    qs "6.7.0"
+    raw-body "2.4.0"
+    type-is "~1.6.17"
 
 bonjour@^3.5.0:
   version "3.5.0"
@@ -1989,19 +2151,10 @@ bonjour@^3.5.0:
     multicast-dns "^6.0.1"
     multicast-dns-service-types "^1.1.0"
 
-boom@4.x.x:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
-  integrity sha1-T4owBctKfjiJ90kDD9JbluAdLjE=
-  dependencies:
-    hoek "4.x.x"
-
-boom@5.x.x:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
-  integrity sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==
-  dependencies:
-    hoek "4.x.x"
+boolbase@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
+  integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
 bootstrap@^4.3.1:
   version "4.3.1"
@@ -2045,15 +2198,39 @@ braces@^2.3.0, braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
+brfs@^1.3.0, brfs@^1.4.0:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/brfs/-/brfs-1.6.1.tgz#b78ce2336d818e25eea04a0947cba6d4fb8849c3"
+  integrity sha512-OfZpABRQQf+Xsmju8XE9bDjs+uU4vLREGolP7bDgcpsI17QREyZ4Bl+2KLxxx1kCgA0fAIhKQBaBYh+PEcCqYQ==
+  dependencies:
+    quote-stream "^1.0.1"
+    resolve "^1.1.5"
+    static-module "^2.2.0"
+    through2 "^2.0.0"
+
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
   integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
 
+brotli@^1.2.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/brotli/-/brotli-1.3.2.tgz#525a9cad4fcba96475d7d388f6aecb13eed52f46"
+  integrity sha1-UlqcrU/LqWR119OI9q7LE+7VL0Y=
+  dependencies:
+    base64-js "^1.1.2"
+
+browser-resolve@^1.8.1:
+  version "1.11.3"
+  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6"
+  integrity sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==
+  dependencies:
+    resolve "1.1.7"
+
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.1.1.tgz#38b7ab55edb806ff2dcda1a7f1620773a477c49f"
-  integrity sha512-UGnTYAnB2a3YuYKIRy1/4FB2HdM866E0qC46JXvVTYKlBlZlnvfpSfY6OKfXZAkv70eJ2a1SqzpAo5CRhZGDFg==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
+  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
   dependencies:
     buffer-xor "^1.0.3"
     cipher-base "^1.0.0"
@@ -2063,22 +2240,32 @@ browserify-aes@^1.0.0, browserify-aes@^1.0.4:
     safe-buffer "^5.0.1"
 
 browserify-cipher@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.0.tgz#9988244874bf5ed4e28da95666dcd66ac8fc363a"
-  integrity sha1-mYgkSHS/XtTijalWZtzWasj8Njo=
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
+  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
   dependencies:
     browserify-aes "^1.0.4"
     browserify-des "^1.0.0"
     evp_bytestokey "^1.0.0"
 
 browserify-des@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.0.tgz#daa277717470922ed2fe18594118a175439721dd"
-  integrity sha1-2qJ3cXRwki7S/hhZQRihdUOXId0=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
+  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
   dependencies:
     cipher-base "^1.0.1"
     des.js "^1.0.0"
     inherits "^2.0.1"
+    safe-buffer "^5.1.2"
+
+browserify-optional@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-optional/-/browserify-optional-1.0.1.tgz#1e13722cfde0d85f121676c2a72ced533a018869"
+  integrity sha1-HhNyLP3g2F8SFnbCpyztUzoBiGk=
+  dependencies:
+    ast-transform "0.0.0"
+    ast-types "^0.7.0"
+    browser-resolve "^1.8.1"
 
 browserify-rsa@^4.0.0:
   version "4.0.1"
@@ -2108,19 +2295,28 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.4.1:
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.1.tgz#2226cada1947b33f4cfcf7b608dcb519b6128106"
-  integrity sha512-/pPw5IAUyqaQXGuD5vS8tcbudyPZ241jk1W5pQBsGDfcjNQt7p8qxZhgMNuygDShte1PibLFexecWUPgmVLfrg==
+browserslist@4.5.5:
+  version "4.5.5"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.5.tgz#fe1a352330d2490d5735574c149a85bc18ef9b82"
+  integrity sha512-0QFO1r/2c792Ohkit5XI8Cm8pDtZxgNl2H6HU4mHrpYz7314pEYcsAVVatM0l/YmxPnEzh9VygXouj4gkFUTKA==
+  dependencies:
+    caniuse-lite "^1.0.30000960"
+    electron-to-chromium "^1.3.124"
+    node-releases "^1.1.14"
+
+browserslist@^4.5.4:
+  version "4.6.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.3.tgz#0530cbc6ab0c1f3fc8c819c72377ba55cf647f05"
+  integrity sha512-CNBqTCq22RKM8wKJNowcqihHJ4SkI8CGeK7KOR9tPboXUuS5Zk5lQgzzTbs4oxD8x+6HUshZUa2OyNI9lR93bQ==
   dependencies:
-    caniuse-lite "^1.0.30000949"
-    electron-to-chromium "^1.3.116"
-    node-releases "^1.1.11"
+    caniuse-lite "^1.0.30000975"
+    electron-to-chromium "^1.3.164"
+    node-releases "^1.1.23"
 
 browserstack@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.5.1.tgz#e2dfa66ffee940ebad0a07f7e00fd4687c455d66"
-  integrity sha512-O8VMT64P9NOLhuIoD4YngyxBURefaSdR4QdhG8l6HZ9VxtU7jc3m6jLufFwKA5gaf7fetfB2TnRJnMxyob+heg==
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.5.2.tgz#17d8bb76127a1cc0ea416424df80d218f803673f"
+  integrity sha512-+6AFt9HzhKykcPF79W6yjEUJcdvZOV0lIXdkORXMJftGrDl0OKWqRF4GHqpDNkxiceDT/uB7Fb/aDwktvXX7dg==
   dependencies:
     https-proxy-agent "^2.2.1"
 
@@ -2129,6 +2325,29 @@ btoa@^1.2.1:
   resolved "https://registry.yarnpkg.com/btoa/-/btoa-1.2.1.tgz#01a9909f8b2c93f6bf680ba26131eb30f7fa3d73"
   integrity sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==
 
+buffer-alloc-unsafe@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
+  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
+
+buffer-alloc@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
+  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
+  dependencies:
+    buffer-alloc-unsafe "^1.1.0"
+    buffer-fill "^1.0.0"
+
+buffer-equal@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b"
+  integrity sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs=
+
+buffer-fill@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
+  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
+
 buffer-from@^1.0.0, buffer-from@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
@@ -2153,7 +2372,7 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
-builtin-modules@^1.0.0, builtin-modules@^1.1.1:
+builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
   integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
@@ -2173,41 +2392,27 @@ bytes@3.0.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
   integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
 
-cacache@^10.0.4:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
-  integrity sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==
-  dependencies:
-    bluebird "^3.5.1"
-    chownr "^1.0.1"
-    glob "^7.1.2"
-    graceful-fs "^4.1.11"
-    lru-cache "^4.1.1"
-    mississippi "^2.0.0"
-    mkdirp "^0.5.1"
-    move-concurrently "^1.0.1"
-    promise-inflight "^1.0.1"
-    rimraf "^2.6.2"
-    ssri "^5.2.4"
-    unique-filename "^1.1.0"
-    y18n "^4.0.0"
+bytes@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
+  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
 
-cacache@^11.0.1, cacache@^11.0.2, cacache@^11.3.2:
-  version "11.3.2"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa"
-  integrity sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==
+cacache@^11.0.1, cacache@^11.0.2, cacache@^11.3.1, cacache@^11.3.2:
+  version "11.3.3"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.3.tgz#8bd29df8c6a718a6ebd2d010da4d7972ae3bbadc"
+  integrity sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==
   dependencies:
-    bluebird "^3.5.3"
+    bluebird "^3.5.5"
     chownr "^1.1.1"
     figgy-pudding "^3.5.1"
-    glob "^7.1.3"
+    glob "^7.1.4"
     graceful-fs "^4.1.15"
     lru-cache "^5.1.1"
     mississippi "^3.0.0"
     mkdirp "^0.5.1"
     move-concurrently "^1.0.1"
     promise-inflight "^1.0.1"
-    rimraf "^2.6.2"
+    rimraf "^2.6.3"
     ssri "^6.0.1"
     unique-filename "^1.1.1"
     y18n "^4.0.0"
@@ -2227,6 +2432,11 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
+call-me-maybe@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
+  integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
+
 caller-callsite@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
@@ -2252,9 +2462,9 @@ callsites@^2.0.0:
   integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
 
 callsites@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.0.0.tgz#fb7eb569b72ad7a45812f93fd9430a3e410b3dd3"
-  integrity sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
 camelcase-keys@^2.0.0:
   version "2.1.0"
@@ -2289,19 +2499,19 @@ camelcase@^4.0.0, camelcase@^4.1.0:
   integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
 camelcase@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.2.0.tgz#e7522abda5ed94cc0489e1b8466610e88404cf45"
-  integrity sha512-IXFsBS2pC+X0j0N/GE7Dm7j3bsEBp+oTpb7F50dwEVX7rf3IgwO9XatnegTsDtniKCUtEJH4fSU6Asw7uoVLfQ==
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@^1.0.30000929:
-  version "1.0.30000929"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000929.tgz#7b391b781a9c3097ecc39ea053301aea8ea16317"
-  integrity sha512-n2w1gPQSsYyorSVYqPMqbSaz1w7o9ZC8VhOEGI9T5MfGDzp7sbopQxG6GaQmYsaq13Xfx/mkxJUWC1Dz3oZfzw==
+caniuse-lite@1.0.30000974:
+  version "1.0.30000974"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000974.tgz#b7afe14ee004e97ce6dc73e3f878290a12928ad8"
+  integrity sha512-xc3rkNS/Zc3CmpMKuczWEdY2sZgx09BkAxfvkxlAEBTqcMHeL8QnPqhKse+5sRTi3nrw2pJwToD2WvKn1Uhvww==
 
-caniuse-lite@^1.0.30000949:
-  version "1.0.30000950"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000950.tgz#8c559d66e332b34e919d1086cc6d29c1948856ae"
-  integrity sha512-Cs+4U9T0okW2ftBsCIHuEYXXkki7mjXmjCh4c6PzYShk04qDEr76/iC7KwhLoWoY65wcra1XOsRD+S7BptEb5A==
+caniuse-lite@^1.0.30000957, caniuse-lite@^1.0.30000960, caniuse-lite@^1.0.30000975:
+  version "1.0.30000976"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000976.tgz#d30fe12662cb2a21e130d307db9907513ca830a2"
+  integrity sha512-tleNB1IwPRqZiod6nUNum63xQCMN96BUO2JTeiwuRM7p9d616EHsMBjBWJMudX39qCaPuWY8KEWzMZq7A9XQMQ==
 
 canonical-path@1.0.0:
   version "1.0.0"
@@ -2318,16 +2528,7 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-chalk@2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796"
-  integrity sha512-QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g==
-  dependencies:
-    ansi-styles "^3.2.0"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.2.0"
-
-chalk@^1.1.1, chalk@^1.1.3:
+chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
@@ -2338,16 +2539,16 @@ chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
-  integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==
+chalk@2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796"
+  integrity sha512-QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g==
   dependencies:
-    ansi-styles "^3.2.1"
+    ansi-styles "^3.2.0"
     escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
+    supports-color "^5.2.0"
 
-chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
+chalk@2.4.2, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2356,6 +2557,20 @@ chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
+chalk@^2.0.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
+  integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+chardet@^0.4.0:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
+  integrity sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=
+
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
@@ -2366,7 +2581,19 @@ check-types@^7.3.0:
   resolved "https://registry.yarnpkg.com/check-types/-/check-types-7.4.0.tgz#0378ec1b9616ec71f774931a3c6516fad8c152f4"
   integrity sha512-YbulWHdfP99UfZ73NcUDlNJhEIDgm9Doq9GhpyXbF+7Aegi3CVV7qqMCKTTqJxlvEvnQBp9IA+dxsGN6xK/nSg==
 
-chokidar@2.0.4, chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3:
+cheerio@^1.0.0-rc.2:
+  version "1.0.0-rc.3"
+  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.3.tgz#094636d425b2e9c0f4eb91a46c05630c9a1a8bf6"
+  integrity sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==
+  dependencies:
+    css-select "~1.2.0"
+    dom-serializer "~0.1.1"
+    entities "~1.1.1"
+    htmlparser2 "^3.9.1"
+    lodash "^4.15.0"
+    parse5 "^3.0.1"
+
+chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
   integrity sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==
@@ -2386,7 +2613,26 @@ chokidar@2.0.4, chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3:
   optionalDependencies:
     fsevents "^1.2.2"
 
-chokidar@^2.1.0, chokidar@^2.1.1:
+chokidar@^2.0.4, chokidar@^2.1.2, chokidar@^2.1.5:
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.6.tgz#b6cad653a929e244ce8a834244164d241fa954c5"
+  integrity sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==
+  dependencies:
+    anymatch "^2.0.0"
+    async-each "^1.0.1"
+    braces "^2.3.2"
+    glob-parent "^3.1.0"
+    inherits "^2.0.3"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    normalize-path "^3.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.2.1"
+    upath "^1.1.1"
+  optionalDependencies:
+    fsevents "^1.2.7"
+
+chokidar@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.2.tgz#9c23ea40b01638439e0513864d362aeacc5ad058"
   integrity sha512-IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg==
@@ -2405,15 +2651,15 @@ chokidar@^2.1.0, chokidar@^2.1.1:
   optionalDependencies:
     fsevents "^1.2.7"
 
-chownr@^1.0.1, chownr@^1.1.1:
+chownr@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
   integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
 
 chrome-trace-event@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz#45a91bd2c20c9411f0963b5aaeb9a1b95e09cc48"
-  integrity sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
+  integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==
   dependencies:
     tslib "^1.9.0"
 
@@ -2492,6 +2738,15 @@ cliui@^4.0.0:
     strip-ansi "^4.0.0"
     wrap-ansi "^2.0.0"
 
+cliui@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
+  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
+  dependencies:
+    string-width "^3.1.0"
+    strip-ansi "^5.2.0"
+    wrap-ansi "^5.1.0"
+
 clone-deep@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713"
@@ -2502,6 +2757,11 @@ clone-deep@^2.0.1:
     kind-of "^6.0.0"
     shallow-clone "^1.0.0"
 
+clone@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
+
 clone@^2.1.1, clone@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
@@ -2512,22 +2772,30 @@ co@^4.6.0:
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
   integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
 
+code-block-writer@^7.2.0:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/code-block-writer/-/code-block-writer-7.3.1.tgz#b3b921b885fe7fb869866c0648491eae6c08cfa9"
+  integrity sha512-3Jfe6ZmmGzvdQWFo3MUzobn3WdX++jc3Tj0rsviJWYPnP7NGMFEE4qheNeOXeJgB1TTgxYT8XuNvhS/u596yGg==
+
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
-codelyzer@~4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-4.5.0.tgz#a65ddeeeca2894653253a89bfa229118ff9f59b1"
-  integrity sha512-oO6vCkjqsVrEsmh58oNlnJkRXuA30hF8cdNAQV9DytEalDwyOFRvHMnlKFzmOStNerOmPGZU9GAHnBo4tGvtiQ==
+codelyzer@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-5.1.0.tgz#a0eb89497622679ea4c53b6974aa45598f06a4b5"
+  integrity sha512-QiyY2/oDQnYx4mAVEDqr+z9MwrOto18tQFjExiuRChXCy0yvngS5fQpWIxvAGpbOmZFiR1PRTRLbEI71u10maA==
   dependencies:
-    app-root-path "^2.1.0"
-    css-selector-tokenizer "^0.7.0"
+    app-root-path "^2.2.1"
+    aria-query "^3.0.0"
+    axobject-query "^2.0.2"
+    css-selector-tokenizer "^0.7.1"
     cssauron "^1.4.0"
+    damerau-levenshtein "^1.0.4"
     semver-dsl "^1.0.1"
     source-map "^0.5.7"
-    sprintf-js "^1.1.1"
+    sprintf-js "^1.1.2"
 
 collection-visit@^1.0.0:
   version "1.0.0"
@@ -2556,22 +2824,25 @@ color-name@1.1.3:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
+color-support@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
+
 colors@1.1.2, colors@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
   integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM=
 
-combined-stream@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
-  integrity sha1-cj599ugBrFYTETp+RFqbactjKBg=
-  dependencies:
-    delayed-stream "~1.0.0"
+colors@^1.3.3, colors@latest:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.3.tgz#39e005d546afe01e01f9c4ca8fa50f686a01205d"
+  integrity sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==
 
-combined-stream@^1.0.6, combined-stream@~1.0.5, combined-stream@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
-  integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==
+combined-stream@^1.0.6, combined-stream@~1.0.6:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
   dependencies:
     delayed-stream "~1.0.0"
 
@@ -2582,20 +2853,10 @@ commander@2.9.0:
   dependencies:
     graceful-readlink ">= 1.0.0"
 
-commander@^2.12.1:
-  version "2.15.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
-  integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==
-
-commander@^2.18.0, commander@^2.19.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
-  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
-
-commander@~2.17.1:
-  version "2.17.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
-  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
+commander@^2.11.0, commander@^2.12.1, commander@^2.18.0, commander@^2.19.0, commander@^2.20.0, commander@~2.20.0:
+  version "2.20.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
+  integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
 
 commondir@^1.0.1:
   version "1.0.1"
@@ -2610,7 +2871,7 @@ compare-func@^1.3.1:
     array-ify "^1.0.0"
     dot-prop "^3.0.0"
 
-compare-versions@^3.2.1:
+compare-versions@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.4.0.tgz#e0747df5c9cb7f054d6d3dc3e1dbc444f9e92b26"
   integrity sha512-tK69D7oNXXqUW3ZNo/z7NXTEz22TCF0pTE+YF9cxvaAM9XnkLo1fV621xCLrRR6aevJlKxExkss0vWqUCUpqdg==
@@ -2620,33 +2881,38 @@ component-bind@1.0.0:
   resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
   integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=
 
-component-emitter@1.2.1, component-emitter@^1.2.1:
+component-emitter@1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
   integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
 
+component-emitter@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
+
 component-inherit@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
   integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
 
-compressible@~2.0.14:
-  version "2.0.15"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.15.tgz#857a9ab0a7e5a07d8d837ed43fe2defff64fe212"
-  integrity sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==
+compressible@~2.0.16:
+  version "2.0.17"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.17.tgz#6e8c108a16ad58384a977f3a482ca20bff2f38c1"
+  integrity sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==
   dependencies:
-    mime-db ">= 1.36.0 < 2"
+    mime-db ">= 1.40.0 < 2"
 
-compression@^1.5.2:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.3.tgz#27e0e176aaf260f7f2c2813c3e440adb9f1993db"
-  integrity sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==
+compression@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
+  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
   dependencies:
     accepts "~1.3.5"
     bytes "3.0.0"
-    compressible "~2.0.14"
+    compressible "~2.0.16"
     debug "2.6.9"
-    on-headers "~1.0.1"
+    on-headers "~1.0.2"
     safe-buffer "5.1.2"
     vary "~1.1.2"
 
@@ -2655,7 +2921,7 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.5.0, concat-stream@^1.6.0:
+concat-stream@^1.5.0, concat-stream@~1.6.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -2665,6 +2931,16 @@ concat-stream@^1.5.0, concat-stream@^1.6.0:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
+concat-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz#414cf5af790a48c60ab9be4527d56d5e41133cb1"
+  integrity sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==
+  dependencies:
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^3.0.2"
+    typedarray "^0.0.6"
+
 configstore@^3.0.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f"
@@ -2677,19 +2953,19 @@ configstore@^3.0.0:
     write-file-atomic "^2.0.0"
     xdg-basedir "^3.0.0"
 
-connect-history-api-fallback@^1.3.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a"
-  integrity sha1-sGhzk0vF40T+9hGhlqb6rgruAVo=
+connect-history-api-fallback@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
+  integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
 
-connect@^3.6.0:
-  version "3.6.5"
-  resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.5.tgz#fb8dde7ba0763877d0ec9df9dac0b4b40e72c7da"
-  integrity sha1-+43ee6B2OHfQ7J352sC0tA5yx9o=
+connect@^3.6.0, connect@^3.6.6:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8"
+  integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==
   dependencies:
     debug "2.6.9"
-    finalhandler "1.0.6"
-    parseurl "~1.3.2"
+    finalhandler "1.1.2"
+    parseurl "~1.3.3"
     utils-merge "1.0.1"
 
 console-browserify@^1.1.0:
@@ -2709,10 +2985,12 @@ constants-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
   integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
 
-content-disposition@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
-  integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ=
+content-disposition@0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
+  integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
+  dependencies:
+    safe-buffer "5.1.2"
 
 content-type@~1.0.4:
   version "1.0.4"
@@ -2749,13 +3027,26 @@ conventional-changelog-codemirror@^2.0.1:
   dependencies:
     q "^1.5.1"
 
-conventional-changelog-core@^3.1.6:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.1.6.tgz#ac1731a461c50d150d29c1ad4f33143293bcd32f"
-  integrity sha512-5teTAZOtJ4HLR6384h50nPAaKdDr+IaU0rnD2Gg2C3MS7hKsEPH8pZxrDNqam9eOSPQg9tET6uZY79zzgSz+ig==
+conventional-changelog-config-spec@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-config-spec/-/conventional-changelog-config-spec-1.0.0.tgz#fc17bf0ab7b7f2a6b0c91bccc1bd55819d3ee79e"
+  integrity sha512-RR3479x5Qw7XWkmNDYx/kOnsQJW+FZBIakURG/Dg7FkTaCrGjAkgfH96pQs9SyOEZI07USEXy7FjUDWYP8bt3Q==
+
+conventional-changelog-conventionalcommits@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-3.0.2.tgz#3a380a14ecd6f5056da6d460e30dd6c0c9f1aebe"
+  integrity sha512-w1+fQSDnm/7+sPKIYC5nfRVYDszt+6HdWizrigSqWFVIiiBVzkHGeqDLMSHc+Qq9qssHVAxAak5206epZyK87A==
+  dependencies:
+    compare-func "^1.3.1"
+    q "^1.5.1"
+
+conventional-changelog-core@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.2.2.tgz#de41e6b4a71011a18bcee58e744f6f8f0e7c29c0"
+  integrity sha512-cssjAKajxaOX5LNAJLB+UOcoWjAIBvXtDMedv/58G+YEmAXMNfC16mmPl0JDOuVJVfIqM0nqQiZ8UCm8IXbE0g==
   dependencies:
-    conventional-changelog-writer "^4.0.3"
-    conventional-commits-parser "^3.0.1"
+    conventional-changelog-writer "^4.0.5"
+    conventional-commits-parser "^3.0.2"
     dateformat "^3.0.0"
     get-pkg-repo "^1.0.0"
     git-raw-commits "2.0.0"
@@ -2766,7 +3057,7 @@ conventional-changelog-core@^3.1.6:
     q "^1.5.1"
     read-pkg "^3.0.0"
     read-pkg-up "^3.0.0"
-    through2 "^2.0.0"
+    through2 "^3.0.0"
 
 conventional-changelog-ember@^2.0.2:
   version "2.0.2"
@@ -2775,10 +3066,10 @@ conventional-changelog-ember@^2.0.2:
   dependencies:
     q "^1.5.1"
 
-conventional-changelog-eslint@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.1.tgz#f65e0e7f63dc09c044244b8785313a602e628002"
-  integrity sha512-yH3+bYrtvgKxSFChUBQnKNh9/U9kN2JElYBm253VpYs5wXhPHVc9ENcuVGWijh24nnOkei7wEJmnmUzgZ4ok+A==
+conventional-changelog-eslint@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.2.tgz#e9eb088cda6be3e58b2de6a5aac63df0277f3cbe"
+  integrity sha512-Yi7tOnxjZLXlCYBHArbIAm8vZ68QUSygFS7PgumPRiEk+9NPUeucy5Wg9AAyKoBprSV3o6P7Oghh4IZSLtKCvQ==
   dependencies:
     q "^1.5.1"
 
@@ -2804,49 +3095,50 @@ conventional-changelog-jshint@^2.0.1:
     compare-func "^1.3.1"
     q "^1.5.1"
 
-conventional-changelog-preset-loader@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.0.2.tgz#81d1a07523913f3d17da3a49f0091f967ad345b0"
-  integrity sha512-pBY+qnUoJPXAXXqVGwQaVmcye05xi6z231QM98wHWamGAmu/ghkBprQAwmF5bdmyobdVxiLhPY3PrCfSeUNzRQ==
+conventional-changelog-preset-loader@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.1.1.tgz#65bb600547c56d5627d23135154bcd9a907668c4"
+  integrity sha512-K4avzGMLm5Xw0Ek/6eE3vdOXkqnpf9ydb68XYmCc16cJ99XMMbc2oaNMuPwAsxVK6CC1yA4/I90EhmWNj0Q6HA==
 
-conventional-changelog-writer@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.3.tgz#916a2b302d0bb5ef18efd236a034c13fb273cde1"
-  integrity sha512-bIlpSiQtQZ1+nDVHEEh798Erj2jhN/wEjyw9sfxY9es6h7pREE5BNJjfv0hXGH/FTrAsEpHUq4xzK99eePpwuA==
+conventional-changelog-writer@^4.0.5:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.6.tgz#24db578ac8e7c89a409ef9bba12cf3c095990148"
+  integrity sha512-ou/sbrplJMM6KQpR5rKFYNVQYesFjN7WpNGdudQSWNi6X+RgyFUcSv871YBYkrUYV9EX8ijMohYVzn9RUb+4ag==
   dependencies:
     compare-func "^1.3.1"
-    conventional-commits-filter "^2.0.1"
+    conventional-commits-filter "^2.0.2"
     dateformat "^3.0.0"
     handlebars "^4.1.0"
     json-stringify-safe "^5.0.1"
     lodash "^4.2.1"
     meow "^4.0.0"
-    semver "^5.5.0"
+    semver "^6.0.0"
     split "^1.0.0"
-    through2 "^2.0.0"
+    through2 "^3.0.0"
 
-conventional-changelog@^3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-3.0.6.tgz#a0bd3b51a0549ec03eb6ef90af7f9fa8c358b15f"
-  integrity sha512-1b96x3G67lDKakRvMm+VvYGwgRk+C8aapHKL5iZ/TJzzD/RuyGA2diHNEsR+uPHmQ7/A4Ts7j6N+VNqUoOfksg==
+conventional-changelog@3.1.8:
+  version "3.1.8"
+  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-3.1.8.tgz#091382b5a0820bf8ec8e75ad2664a3688c31b07d"
+  integrity sha512-fb3/DOLLrQdNqN0yYn/lT6HcNsAa9A+VTDBqlZBMQcEPPIeJIMI+DBs3yu+eiYOLi22w9oShq3nn/zN6qm1Hmw==
   dependencies:
     conventional-changelog-angular "^5.0.3"
     conventional-changelog-atom "^2.0.1"
     conventional-changelog-codemirror "^2.0.1"
-    conventional-changelog-core "^3.1.6"
+    conventional-changelog-conventionalcommits "^3.0.2"
+    conventional-changelog-core "^3.2.2"
     conventional-changelog-ember "^2.0.2"
-    conventional-changelog-eslint "^3.0.1"
+    conventional-changelog-eslint "^3.0.2"
     conventional-changelog-express "^2.0.1"
     conventional-changelog-jquery "^3.0.4"
     conventional-changelog-jshint "^2.0.1"
-    conventional-changelog-preset-loader "^2.0.2"
+    conventional-changelog-preset-loader "^2.1.1"
 
-conventional-commits-filter@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.1.tgz#55a135de1802f6510b6758e0a6aa9e0b28618db3"
-  integrity sha512-92OU8pz/977udhBjgPEbg3sbYzIxMDFTlQT97w7KdhR9igNqdJvy8smmedAAgn4tPiqseFloKkrVfbXCVd+E7A==
+conventional-commits-filter@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.2.tgz#f122f89fbcd5bb81e2af2fcac0254d062d1039c1"
+  integrity sha512-WpGKsMeXfs21m1zIw4s9H5sys2+9JccTzpN6toXtxhpw2VNF2JUXwIakthKBy+LN4DvJm+TzWhxOMWOs1OFCFQ==
   dependencies:
-    is-subset "^0.1.1"
+    lodash.ismatch "^4.4.0"
     modify-values "^1.0.0"
 
 conventional-commits-parser@^2.1.0:
@@ -2862,28 +3154,28 @@ conventional-commits-parser@^2.1.0:
     through2 "^2.0.0"
     trim-off-newlines "^1.0.0"
 
-conventional-commits-parser@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.1.tgz#fe1c49753df3f98edb2285a5e485e11ffa7f2e4c"
-  integrity sha512-P6U5UOvDeidUJ8ebHVDIoXzI7gMlQ1OF/id6oUvp8cnZvOXMt1n8nYl74Ey9YMn0uVQtxmCtjPQawpsssBWtGg==
+conventional-commits-parser@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.3.tgz#c3f972fd4e056aa8b9b4f5f3d0e540da18bf396d"
+  integrity sha512-KaA/2EeUkO4bKjinNfGUyqPTX/6w9JGshuQRik4r/wJz7rUw3+D3fDG6sZSEqJvKILzKXFQuFkpPLclcsAuZcg==
   dependencies:
     JSONStream "^1.0.4"
-    is-text-path "^1.0.0"
+    is-text-path "^2.0.0"
     lodash "^4.2.1"
     meow "^4.0.0"
     split2 "^2.0.0"
-    through2 "^2.0.0"
+    through2 "^3.0.0"
     trim-off-newlines "^1.0.0"
 
-conventional-recommended-bump@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-4.0.4.tgz#05540584641d3da758c8863c09788fcaeb586872"
-  integrity sha512-9mY5Yoblq+ZMqJpBzgS+RpSq+SUfP2miOR3H/NR9drGf08WCrY9B6HAGJZEm6+ThsVP917VHAahSOjM6k1vhPg==
+conventional-recommended-bump@5.0.0, conventional-recommended-bump@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-5.0.0.tgz#019d45a1f3d2cc14a26e9bad1992406ded5baa23"
+  integrity sha512-CsfdICpbUe0pmM4MTG90GPUqnFgB1SWIR2HAh+vS+JhhJdPWvc0brs8oadWoYGhFOQpQwe57JnvzWEWU0m2OSg==
   dependencies:
-    concat-stream "^1.6.0"
-    conventional-changelog-preset-loader "^2.0.2"
-    conventional-commits-filter "^2.0.1"
-    conventional-commits-parser "^3.0.1"
+    concat-stream "^2.0.0"
+    conventional-changelog-preset-loader "^2.1.1"
+    conventional-commits-filter "^2.0.2"
+    conventional-commits-parser "^3.0.2"
     git-raw-commits "2.0.0"
     git-semver-tags "^2.0.2"
     meow "^4.0.0"
@@ -2906,6 +3198,11 @@ cookie@0.3.1:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
   integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
 
+cookie@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
+  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
+
 copy-concurrently@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
@@ -2923,69 +3220,60 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-copy-webpack-plugin@4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz#e7f40dd8a68477d405dd1b7a854aae324b158bae"
-  integrity sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==
+copy-webpack-plugin@5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.2.tgz#56186dfddbf9aa1b29c97fa4c796c1be98870da4"
+  integrity sha512-7nC7EynPrnBTtBwwbG1aTqrfNS1aTb9eEjSmQDqFtKAsJrR3uDb+pCDIFT2LzhW+SgGJxQcYzThrmXzzZ720uw==
   dependencies:
-    cacache "^10.0.4"
-    find-cache-dir "^1.0.0"
+    cacache "^11.3.1"
+    find-cache-dir "^2.0.0"
+    glob-parent "^3.1.0"
     globby "^7.1.1"
     is-glob "^4.0.0"
     loader-utils "^1.1.0"
     minimatch "^3.0.4"
-    p-limit "^1.0.0"
+    normalize-path "^3.0.0"
+    p-limit "^2.1.0"
     serialize-javascript "^1.4.0"
+    webpack-log "^2.0.0"
 
-core-js@^2.2.0:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e"
-  integrity sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=
-
-core-js@^2.4.0, core-js@^2.5.0:
-  version "2.6.5"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
-  integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==
-
-core-js@^2.5.4:
-  version "2.5.7"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
-  integrity sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==
+core-js@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.1.tgz#1343182634298f7f38622f95e73f54e48ddf4738"
+  integrity sha512-sco40rF+2KlE0ROMvydjkrVMMG1vYilP2ALoRXcYR4obqbYIuV3Bg+51GEDW+HF8n7NRA+iaA4qD0nD9lo9mew==
 
-core-js@~2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.3.0.tgz#fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65"
-  integrity sha1-+rg/uwstjchfpjbEudNMdUIMbWU=
+core-js@^2.2.0, core-js@^2.4.0, core-js@^2.5.0:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2"
+  integrity sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
-cosmiconfig@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc"
-  integrity sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==
+cors@latest:
+  version "2.8.5"
+  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
+  integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
   dependencies:
-    is-directory "^0.3.1"
-    js-yaml "^3.9.0"
-    parse-json "^4.0.0"
-    require-from-string "^2.0.1"
+    object-assign "^4"
+    vary "^1"
 
-cosmiconfig@^5.0.7:
-  version "5.0.7"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.7.tgz#39826b292ee0d78eda137dfa3173bd1c21a43b04"
-  integrity sha512-PcLqxTKiDmNT6pSpy4N6KtuPwb53W+2tzNvwOZw0WH9N6O0vLIBq0x8aj8Oj75ere4YcGi48bDFCL+3fRJdlNA==
+cosmiconfig@^5.0.0, cosmiconfig@^5.1.0, cosmiconfig@^5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
+  integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==
   dependencies:
     import-fresh "^2.0.0"
     is-directory "^0.3.1"
-    js-yaml "^3.9.0"
+    js-yaml "^3.13.1"
     parse-json "^4.0.0"
 
 create-ecdh@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d"
-  integrity sha1-iIxyNZbN92EvZJgjPuvXo1MBc30=
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
+  integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==
   dependencies:
     bn.js "^4.1.0"
     elliptic "^6.0.0"
@@ -2998,19 +3286,20 @@ create-error-class@^3.0.0:
     capture-stack-trace "^1.0.0"
 
 create-hash@^1.1.0, create-hash@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.3.tgz#606042ac8b9262750f483caddab0f5819172d8fd"
-  integrity sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0=
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
+  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
   dependencies:
     cipher-base "^1.0.1"
     inherits "^2.0.1"
-    ripemd160 "^2.0.0"
+    md5.js "^1.3.4"
+    ripemd160 "^2.0.1"
     sha.js "^2.4.0"
 
 create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.6.tgz#acb9e221a4e17bdb076e90657c42b93e3726cf06"
-  integrity sha1-rLniIaThe9sHbpBlfEK5PjcmzwY=
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
+  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
   dependencies:
     cipher-base "^1.0.3"
     create-hash "^1.1.0"
@@ -3058,13 +3347,6 @@ cross-var@^1.1.0:
     cross-spawn "^5.0.1"
     exit "^0.1.2"
 
-cryptiles@3.x.x:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.4.tgz#769a68c95612b56faadfcebf57ac86479cbe8322"
-  integrity sha512-8I1sgZHfVwcSOY6mSGpVU3lw/GSIZvusg8dD2+OGehCJpOhQRLNcH0qb9upQnOH4XhgxxFJSg6E2kx95deb1Tw==
-  dependencies:
-    boom "5.x.x"
-
 crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
@@ -3082,6 +3364,11 @@ crypto-browserify@^3.11.0:
     randombytes "^2.0.0"
     randomfill "^1.0.3"
 
+crypto-js@^3.1.9-1:
+  version "3.1.9-1"
+  resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.1.9-1.tgz#fda19e761fc077e01ffbfdc6e9fdfc59e8806cd8"
+  integrity sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg=
+
 crypto-random-string@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
@@ -3092,15 +3379,30 @@ css-parse@1.7.x:
   resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b"
   integrity sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=
 
-css-selector-tokenizer@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"
-  integrity sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=
+css-select@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
+  integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=
+  dependencies:
+    boolbase "~1.0.0"
+    css-what "2.1"
+    domutils "1.5.1"
+    nth-check "~1.0.1"
+
+css-selector-tokenizer@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz#a177271a8bca5019172f4f891fc6eed9cbf68d5d"
+  integrity sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==
   dependencies:
     cssesc "^0.1.0"
     fastparse "^1.1.1"
     regexpu-core "^1.0.0"
 
+css-what@2.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
+  integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==
+
 cssauron@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/cssauron/-/cssauron-1.4.0.tgz#a6602dff7e04a8306dc0db9a551e92e8b5662ad8"
@@ -3130,6 +3432,11 @@ cyclist@~0.2.2:
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
   integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=
 
+damerau-levenshtein@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.5.tgz#780cf7144eb2e8dbd1c3bb83ae31100ccc31a414"
+  integrity sha512-CBCRqFnpu715iPmw1KrdOrzRqbdFwQTwAWyyyYS42+iAgHCuXZ+/TdMgQkUENPomxEz9z1BEzuQU2Xw0kUuAgA==
+
 dargs@^4.0.1:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"
@@ -3159,40 +3466,38 @@ dateformat@^3.0.0:
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
   integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
 
-debug@*:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.0.1.tgz#f9bb36d439b8d1f0dd52d8fb6b46e4ebb8c1cd5b"
-  integrity sha512-K23FHJ/Mt404FSlp6gSZCevIbTMLX0j3fmHhUEhQ3Wq0FMODW3+cUSoLdy1Gx4polAf4t/lphhmHH35BB8cLYw==
+debug@*, debug@^4.1.0, debug@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
   dependencies:
     ms "^2.1.1"
 
-debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
+debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
-debug@3.1.0, debug@=3.1.0, debug@~3.1.0:
+debug@3.1.0, debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
   integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.0, debug@^3.2.5:
+debug@^3.0.0, debug@^3.1.0, debug@^3.2.5, debug@^3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
   dependencies:
     ms "^2.1.1"
 
-debug@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
-  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
-  dependencies:
-    ms "^2.1.1"
+debuglog@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+  integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
 
 decamelize-keys@^1.0.0:
   version "1.1.0"
@@ -3207,19 +3512,12 @@ decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
-decamelize@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
-  integrity sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==
-  dependencies:
-    xregexp "4.0.0"
-
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
   integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
-deep-equal@^1.0.1:
+deep-equal@^1.0.0, deep-equal@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
   integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=
@@ -3229,12 +3527,17 @@ deep-extend@^0.6.0:
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
   integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
-default-gateway@^2.6.0:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-2.7.2.tgz#b7ef339e5e024b045467af403d50348db4642d0f"
-  integrity sha512-lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==
+deep-is@~0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
+
+default-gateway@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
+  integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==
   dependencies:
-    execa "^0.10.0"
+    execa "^1.0.0"
     ip-regex "^2.1.0"
 
 default-require-extensions@^2.0.0:
@@ -3286,17 +3589,18 @@ del@^2.2.0:
     pinkie-promise "^2.0.0"
     rimraf "^2.2.8"
 
-del@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
-  integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=
+del@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4"
+  integrity sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==
   dependencies:
+    "@types/glob" "^7.1.1"
     globby "^6.1.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    p-map "^1.1.1"
-    pify "^3.0.0"
-    rimraf "^2.2.8"
+    is-path-cwd "^2.0.0"
+    is-path-in-cwd "^2.0.0"
+    p-map "^2.0.0"
+    pify "^4.0.1"
+    rimraf "^2.6.3"
 
 delayed-stream@~1.0.0:
   version "1.0.0"
@@ -3313,12 +3617,7 @@ denodeify@1.2.1:
   resolved "https://registry.yarnpkg.com/denodeify/-/denodeify-1.2.1.tgz#3a36287f5034e699e7577901052c2e6c94251631"
   integrity sha1-OjYof1A05pnnV3kBBSwubJQlFjE=
 
-depd@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
-  integrity sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=
-
-depd@~1.1.1, depd@~1.1.2:
+depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
   integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
@@ -3341,6 +3640,11 @@ destroy@~1.0.4:
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
   integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
 
+detect-indent@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.0.0.tgz#0abd0f549f69fc6659a254fe96786186b6f528fd"
+  integrity sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==
+
 detect-indent@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
@@ -3348,46 +3652,56 @@ detect-indent@^4.0.0:
   dependencies:
     repeating "^2.0.0"
 
-detect-indent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
-  integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50=
-
 detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
   integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
 
-detect-newline@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
-  integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=
+detect-newline@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.0.0.tgz#8ae477c089e51872c264531cd6547719c0b86b2f"
+  integrity sha512-JAP22dVPAqvhdRFFxK1G5GViIokyUn0UWXRNW0ztK96fsqi9cuM8w8ESbSk+T2w5OVorcMcL6m7yUg1RrX+2CA==
 
 detect-node@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
   integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
 
+dezalgo@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
+  integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=
+  dependencies:
+    asap "^2.0.0"
+    wrappy "1"
+
+dfa@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/dfa/-/dfa-1.1.0.tgz#d30218bd10d030fa421df3ebbc82285463a31781"
+  integrity sha1-0wIYvRDQMPpCHfPrvIIoVGOjF4E=
+  dependencies:
+    babel-runtime "^6.11.6"
+
 di@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
   integrity sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=
 
 diff@^3.1.0, diff@^3.2.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.4.0.tgz#b1d85507daf3964828de54b37d0d73ba67dda56c"
-  integrity sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA==
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
 
 diffie-hellman@^5.0.0:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e"
-  integrity sha1-tYNXOScM/ias9jIJn97SoH8gnl4=
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
+  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
   dependencies:
     bn.js "^4.1.0"
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-dir-glob@^2.0.0:
+dir-glob@2.0.0, dir-glob@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
   integrity sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==
@@ -3415,11 +3729,6 @@ dns-txt@^2.0.2:
   dependencies:
     buffer-indexof "^1.0.0"
 
-docopt@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/docopt/-/docopt-0.6.2.tgz#b28e9e2220da5ec49f7ea5bb24a47787405eeb11"
-  integrity sha1-so6eIiDaXsSffqW7JKR3h0Be6xE=
-
 dom-serialize@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
@@ -3430,15 +3739,51 @@ dom-serialize@^2.2.0:
     extend "^3.0.0"
     void-elements "^2.0.0"
 
+dom-serializer@0, dom-serializer@~0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0"
+  integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==
+  dependencies:
+    domelementtype "^1.3.0"
+    entities "^1.1.1"
+
 domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
   integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
 
-domino@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/domino/-/domino-2.1.1.tgz#cd5c639940db72bb7cde1cdb5beea466a4113136"
-  integrity sha512-fqoTi6oQ881wYRENIEmz78hKVoc3X9HqVpklo419yxzebys6dtU5c83iVh3UYvvexPFdAuwlDYCsUM9//CrMMg==
+domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
+  integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
+
+domhandler@^2.3.0:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
+  integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==
+  dependencies:
+    domelementtype "1"
+
+domino@^2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/domino/-/domino-2.1.3.tgz#0ca1ad02cbd316ebe2e99e0ac9fb0010407d4601"
+  integrity sha512-EwjTbUv1Q/RLQOdn9k7ClHutrQcWGsfXaRQNOnM/KgK4xDBoLFEcIRFuBSxAx13Vfa63X029gXYrNFrSy+DOSg==
+
+domutils@1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
+  integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
+domutils@^1.5.1:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
+  integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
 
 dot-prop@^3.0.0:
   version "3.0.0"
@@ -3454,7 +3799,12 @@ dot-prop@^4.1.0:
   dependencies:
     is-obj "^1.0.0"
 
-dotgitignore@^2.1.0:
+dot@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/dot/-/dot-1.1.2.tgz#c7377019fc4e550798928b2b9afeb66abfa1f2f9"
+  integrity sha1-xzdwGfxOVQeYkosrmv62ar+h8vk=
+
+dotgitignore@2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/dotgitignore/-/dotgitignore-2.1.0.tgz#a4b15a4e4ef3cf383598aaf1dfa4a04bcc089b7b"
   integrity sha512-sCm11ak2oY6DglEPpCB8TixLjWAxd3kJTs6UIcSasNYxXdFPV+YKlye92c8H4kKFqV5qYMIh7d+cYecEg0dIkA==
@@ -3462,20 +3812,27 @@ dotgitignore@^2.1.0:
     find-up "^3.0.0"
     minimatch "^3.0.4"
 
+duplexer2@~0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
+  integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=
+  dependencies:
+    readable-stream "^2.0.2"
+
 duplexer3@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
   integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
 
-duplexer@^0.1.1:
+duplexer@^0.1.1, duplexer@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
   integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
 
 duplexify@^3.4.2, duplexify@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.0.tgz#592903f5d80b38d037220541264d69a198fb3410"
-  integrity sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
+  integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
   dependencies:
     end-of-stream "^1.0.0"
     inherits "^2.0.1"
@@ -3495,20 +3852,20 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-ejs@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
-  integrity sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==
+ejs@^2.6.1, ejs@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.2.tgz#3a32c63d1cd16d11266cd4703b14fec4e74ab4f6"
+  integrity sha512-PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q==
 
-electron-to-chromium@^1.3.116:
-  version "1.3.116"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.116.tgz#1dbfee6a592a0c14ade77dbdfe54fef86387d702"
-  integrity sha512-NKwKAXzur5vFCZYBHpdWjTMO8QptNLNP80nItkSIgUOapPAo9Uia+RvkCaZJtO7fhQaVElSvBPWEc2ku6cKsPA==
+electron-to-chromium@^1.3.124, electron-to-chromium@^1.3.164:
+  version "1.3.167"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.167.tgz#6c22e5384a6b54fb13136ca5b3ade5daac9bf894"
+  integrity sha512-84IjpeRudjP43Q0+K7tlS7ESoHOl0W6CIdzs5reS9p+sAjCQEDiaAyiXN2v1qLUdL+Of6ZSaH4Cq6bl+sfzy8A==
 
 elliptic@^6.0.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df"
-  integrity sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
+  integrity sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==
   dependencies:
     bn.js "^4.4.0"
     brorand "^1.0.1"
@@ -3518,12 +3875,17 @@ elliptic@^6.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.0"
 
+emoji-regex@^7.0.1:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
+  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
+
 emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
   integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
 
-encodeurl@~1.0.1, encodeurl@~1.0.2:
+encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
@@ -3560,20 +3922,20 @@ engine.io-client@~3.2.0:
     yeast "0.1.2"
 
 engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.2.tgz#4c0f4cff79aaeecbbdcfdea66a823c6085409196"
-  integrity sha512-dInLFzr80RijZ1rGpx1+56/uFoH7/7InhH3kZt+Ms6hT8tNx3NGW/WNSA/f8As1WkOfkuyb3tnRyuXGxusclMw==
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.3.tgz#757ab970fbf2dfb32c7b74b033216d5739ef79a6"
+  integrity sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==
   dependencies:
     after "0.8.2"
     arraybuffer.slice "~0.0.7"
     base64-arraybuffer "0.1.5"
-    blob "0.0.4"
+    blob "0.0.5"
     has-binary2 "~1.0.2"
 
 engine.io@~3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.2.0.tgz#54332506f42f2edc71690d2f2a42349359f3bf7d"
-  integrity sha512-mRbgmAtQ4GAlKwuPnnAvXXwdPhEx+jkc0OBCLrXuD/CRvwNK3AxRSnqK4FSqmAMRRHryVJP8TopOvmEaA64fKw==
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.2.1.tgz#b60281c35484a70ee0351ea0ebff83ec8c9522a2"
+  integrity sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==
   dependencies:
     accepts "~1.3.4"
     base64id "1.0.0"
@@ -3596,6 +3958,11 @@ ent@~2.2.0:
   resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
   integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0=
 
+entities@^1.1.1, entities@~1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
+  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
+
 err-code@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
@@ -3637,14 +4004,9 @@ es-to-primitive@^1.2.0:
     is-symbol "^1.0.2"
 
 es6-promise@^4.0.3:
-  version "4.2.5"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.5.tgz#da6d0d5692efb461e082c14817fe2427d8f5d054"
-  integrity sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==
-
-es6-promise@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.0.2.tgz#010d5858423a5f118979665f46486a95c6ee2bb6"
-  integrity sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y=
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
+  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
 
 es6-promisify@^5.0.0:
   version "5.0.0"
@@ -3653,7 +4015,7 @@ es6-promisify@^5.0.0:
   dependencies:
     es6-promise "^4.0.3"
 
-escape-html@~1.0.3:
+escape-html@^1.0.3, escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
@@ -3663,19 +4025,64 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
+escodegen@^1.8.1:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.1.tgz#c485ff8d6b4cdb89e27f4a856e91f118401ca510"
+  integrity sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==
+  dependencies:
+    esprima "^3.1.3"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
+escodegen@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.2.0.tgz#09de7967791cc958b7f89a2ddb6d23451af327e1"
+  integrity sha1-Cd55Z3kcyVi3+Jot220jRRrzJ+E=
+  dependencies:
+    esprima "~1.0.4"
+    estraverse "~1.5.0"
+    esutils "~1.0.0"
+  optionalDependencies:
+    source-map "~0.1.30"
+
+escodegen@~1.9.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2"
+  integrity sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==
+  dependencies:
+    esprima "^3.1.3"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
 eslint-scope@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
-  integrity sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
+  integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
   dependencies:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
+esprima@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+  integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
+
 esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
+esprima@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.0.4.tgz#9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"
+  integrity sha1-n1V+CPw7TSbs6d00+Pv0drYlha0=
+
 esrecurse@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
@@ -3683,16 +4090,26 @@ esrecurse@^4.1.0:
   dependencies:
     estraverse "^4.1.0"
 
-estraverse@^4.1.0, estraverse@^4.1.1:
+estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
   integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
 
+estraverse@~1.5.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.5.1.tgz#867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71"
+  integrity sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=
+
 esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
   integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
 
+esutils@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-1.0.0.tgz#8151d358e20c8acc7fb745e7472c0025fe496570"
+  integrity sha1-gVHTWOIMisx/t0XnRywAJf5JZXA=
+
 etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
@@ -3703,20 +4120,28 @@ eve@~0.5.1:
   resolved "https://registry.yarnpkg.com/eve/-/eve-0.5.4.tgz#67d080b9725291d7e389e34c26860dd97f1debaa"
   integrity sha1-Z9CAuXJSkdfjieNMJoYN2X8d66o=
 
-eventemitter3@1.x.x:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"
-  integrity sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=
+event-stream@3.3.4:
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"
+  integrity sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=
+  dependencies:
+    duplexer "~0.1.1"
+    from "~0"
+    map-stream "~0.1.0"
+    pause-stream "0.0.11"
+    split "0.3"
+    stream-combiner "~0.0.4"
+    through "~2.3.1"
 
 eventemitter3@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
-  integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7"
+  integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==
 
-events@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
-  integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=
+events@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88"
+  integrity sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==
 
 eventsource@^1.0.7:
   version "1.0.7"
@@ -3733,19 +4158,6 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
 
-execa@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
-  integrity sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==
-  dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^3.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
 execa@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
@@ -3803,82 +4215,46 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-express@^4.16.2:
-  version "4.16.3"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
-  integrity sha1-avilAjUNsyRuzEvs9rWjTSL37VM=
+express@^4.16.3, express@^4.16.4:
+  version "4.17.1"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
+  integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
   dependencies:
-    accepts "~1.3.5"
+    accepts "~1.3.7"
     array-flatten "1.1.1"
-    body-parser "1.18.2"
-    content-disposition "0.5.2"
+    body-parser "1.19.0"
+    content-disposition "0.5.3"
     content-type "~1.0.4"
-    cookie "0.3.1"
+    cookie "0.4.0"
     cookie-signature "1.0.6"
     debug "2.6.9"
     depd "~1.1.2"
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
     etag "~1.8.1"
-    finalhandler "1.1.1"
+    finalhandler "~1.1.2"
     fresh "0.5.2"
     merge-descriptors "1.0.1"
     methods "~1.1.2"
     on-finished "~2.3.0"
-    parseurl "~1.3.2"
+    parseurl "~1.3.3"
     path-to-regexp "0.1.7"
-    proxy-addr "~2.0.3"
-    qs "6.5.1"
-    range-parser "~1.2.0"
-    safe-buffer "5.1.1"
-    send "0.16.2"
-    serve-static "1.13.2"
-    setprototypeof "1.1.0"
-    statuses "~1.4.0"
-    type-is "~1.6.16"
+    proxy-addr "~2.0.5"
+    qs "6.7.0"
+    range-parser "~1.2.1"
+    safe-buffer "5.1.2"
+    send "0.17.1"
+    serve-static "1.14.1"
+    setprototypeof "1.1.1"
+    statuses "~1.5.0"
+    type-is "~1.6.18"
     utils-merge "1.0.1"
     vary "~1.1.2"
 
-express@^4.16.3:
-  version "4.16.4"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
-  integrity sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==
-  dependencies:
-    accepts "~1.3.5"
-    array-flatten "1.1.1"
-    body-parser "1.18.3"
-    content-disposition "0.5.2"
-    content-type "~1.0.4"
-    cookie "0.3.1"
-    cookie-signature "1.0.6"
-    debug "2.6.9"
-    depd "~1.1.2"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    finalhandler "1.1.1"
-    fresh "0.5.2"
-    merge-descriptors "1.0.1"
-    methods "~1.1.2"
-    on-finished "~2.3.0"
-    parseurl "~1.3.2"
-    path-to-regexp "0.1.7"
-    proxy-addr "~2.0.4"
-    qs "6.5.2"
-    range-parser "~1.2.0"
-    safe-buffer "5.1.2"
-    send "0.16.2"
-    serve-static "1.13.2"
-    setprototypeof "1.1.0"
-    statuses "~1.4.0"
-    type-is "~1.6.16"
-    utils-merge "1.0.1"
-    vary "~1.1.2"
-
-extend-shallow@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
+extend-shallow@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
   dependencies:
     is-extendable "^0.1.0"
 
@@ -3890,17 +4266,21 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
-  integrity sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=
-
-extend@~3.0.1, extend@~3.0.2:
+extend@^3.0.0, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
-external-editor@^3.0.0:
+external-editor@^2.0.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
+  integrity sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==
+  dependencies:
+    chardet "^0.4.0"
+    iconv-lite "^0.4.17"
+    tmp "^0.0.33"
+
+external-editor@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
   integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
@@ -3933,6 +4313,26 @@ extsprintf@^1.2.0:
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
   integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
+falafel@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/falafel/-/falafel-2.1.0.tgz#96bb17761daba94f46d001738b3cedf3a67fe06c"
+  integrity sha1-lrsXdh2rqU9G0AFzizzt86Z/4Gw=
+  dependencies:
+    acorn "^5.0.0"
+    foreach "^2.0.5"
+    isarray "0.0.1"
+    object-keys "^1.0.6"
+
+fancy-log@^1.3.2, fancy-log@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7"
+  integrity sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==
+  dependencies:
+    ansi-gray "^0.1.1"
+    color-support "^1.1.3"
+    parse-node-version "^1.0.0"
+    time-stamp "^1.0.0"
+
 fast-deep-equal@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
@@ -3943,15 +4343,39 @@ fast-deep-equal@^2.0.1:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
   integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
 
+fast-glob@^2.0.2:
+  version "2.2.7"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d"
+  integrity sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==
+  dependencies:
+    "@mrmlnc/readdir-enhanced" "^2.2.1"
+    "@nodelib/fs.stat" "^1.1.2"
+    glob-parent "^3.1.0"
+    is-glob "^4.0.0"
+    merge2 "^1.2.3"
+    micromatch "^3.1.10"
+
 fast-json-stable-stringify@2.0.0, fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
   integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
 
+fast-levenshtein@~2.0.4:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+
 fastparse@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
-  integrity sha1-0eJkOzipTXWDtHkGDmxK/8lAcfg=
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
+  integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==
+
+faye-websocket@0.11.x, faye-websocket@~0.11.1:
+  version "0.11.3"
+  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e"
+  integrity sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==
+  dependencies:
+    websocket-driver ">=0.5.1"
 
 faye-websocket@^0.10.0:
   version "0.10.0"
@@ -3960,18 +4384,18 @@ faye-websocket@^0.10.0:
   dependencies:
     websocket-driver ">=0.5.1"
 
-faye-websocket@~0.11.1:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"
-  integrity sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=
-  dependencies:
-    websocket-driver ">=0.5.1"
-
 figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
   integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
 
+figures@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-3.0.0.tgz#756275c964646163cc6f9197c7a0295dbfd04de9"
+  integrity sha512-HKri+WoWoUgr83pehn/SIgLOMZ9nAWC6dcGj26RY2R4F50u4+RTUz0RCrUlOV3nKRAICW1UGzyb+kcX2qK1S/g==
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
 figures@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
@@ -4010,50 +4434,35 @@ fill-range@^4.0.0:
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
-finalhandler@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.6.tgz#007aea33d1a4d3e42017f624848ad58d212f814f"
-  integrity sha1-AHrqM9Gk0+QgF/YkhIrVjSEvgU8=
-  dependencies:
-    debug "2.6.9"
-    encodeurl "~1.0.1"
-    escape-html "~1.0.3"
-    on-finished "~2.3.0"
-    parseurl "~1.3.2"
-    statuses "~1.3.1"
-    unpipe "~1.0.0"
-
-finalhandler@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
-  integrity sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==
+finalhandler@1.1.2, finalhandler@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
+  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
     on-finished "~2.3.0"
-    parseurl "~1.3.2"
-    statuses "~1.4.0"
+    parseurl "~1.3.3"
+    statuses "~1.5.0"
     unpipe "~1.0.0"
 
-find-cache-dir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
-  integrity sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^1.0.0"
-    pkg-dir "^2.0.0"
-
 find-cache-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.0.0.tgz#4c1faed59f45184530fb9d7fa123a4d04a98472d"
-  integrity sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
+  integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
   dependencies:
     commondir "^1.0.1"
-    make-dir "^1.0.0"
+    make-dir "^2.0.0"
     pkg-dir "^3.0.0"
 
+find-up@3.0.0, find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+  dependencies:
+    locate-path "^3.0.0"
+
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
@@ -4069,12 +4478,18 @@ find-up@^2.0.0, find-up@^2.1.0:
   dependencies:
     locate-path "^2.0.0"
 
-find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+find-up@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
   dependencies:
-    locate-path "^3.0.0"
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
+findit2@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/findit2/-/findit2-2.2.3.tgz#58a466697df8a6205cdfdbf395536b8bd777a5f6"
+  integrity sha1-WKRmaX34piBc39vzlVNri9d3pfY=
 
 flatted@^2.0.0:
   version "2.0.0"
@@ -4082,24 +4497,36 @@ flatted@^2.0.0:
   integrity sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==
 
 flush-write-stream@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
-  integrity sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
+  integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
   dependencies:
-    inherits "^2.0.1"
-    readable-stream "^2.0.4"
+    inherits "^2.0.3"
+    readable-stream "^2.3.6"
 
 follow-redirects@^1.0.0:
-  version "1.5.8"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.8.tgz#1dbfe13e45ad969f813e86c00e5296f525c885a1"
-  integrity sha512-sy1mXPmv7kLAMKW/8XofG7o9T+6gAjzdZK4AJF6ryqQYUa/hnzgiypoeUecZ53x7XiqKNEpNqLtS97MshW2nxg==
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.7.0.tgz#489ebc198dc0e7f64167bd23b03c4c19b5784c76"
+  integrity sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==
   dependencies:
-    debug "=3.1.0"
+    debug "^3.2.6"
 
-font-awesome@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
-  integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=
+fontkit@^1.0.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/fontkit/-/fontkit-1.8.0.tgz#deb9351619e90ddc91707b6156a9f14c8ab11554"
+  integrity sha512-EFDRCca7khfQWYu1iFhsqeABpi87f03MBdkT93ZE6YhqCdMzb5Eojb6c4dlJikGv5liuhByyzA7ikpIPTSBWbQ==
+  dependencies:
+    babel-runtime "^6.11.6"
+    brfs "^1.4.0"
+    brotli "^1.2.0"
+    browserify-optional "^1.0.0"
+    clone "^1.0.1"
+    deep-equal "^1.0.0"
+    dfa "^1.0.0"
+    restructure "^0.5.3"
+    tiny-inflate "^1.0.2"
+    unicode-properties "^1.0.0"
+    unicode-trie "^0.3.0"
 
 for-in@^0.1.3:
   version "0.1.8"
@@ -4118,12 +4545,17 @@ for-own@^1.0.0:
   dependencies:
     for-in "^1.0.1"
 
+foreach@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
+  integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
+
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
-form-data@~2.3.1:
+form-data@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
   integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
@@ -4132,15 +4564,6 @@ form-data@~2.3.1:
     combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
-form-data@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
-  integrity sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "1.0.6"
-    mime-types "^2.1.12"
-
 forwarded@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
@@ -4166,7 +4589,12 @@ from2@^2.1.0:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
-fs-access@^1.0.0:
+from@~0:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
+  integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=
+
+fs-access@1.0.1, fs-access@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/fs-access/-/fs-access-1.0.1.tgz#d6a87f262271cefebec30c553407fb995da8777a"
   integrity sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=
@@ -4182,7 +4610,25 @@ fs-extra@3.0.1:
     jsonfile "^3.0.0"
     universalify "^0.1.0"
 
-fs-extra@^7.0.0, fs-extra@^7.0.1:
+fs-extra@^4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
+  integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-extra@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b"
+  integrity sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-extra@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
   integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
@@ -4192,9 +4638,9 @@ fs-extra@^7.0.0, fs-extra@^7.0.1:
     universalify "^0.1.0"
 
 fs-minipass@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
-  integrity sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.6.tgz#2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07"
+  integrity sha512-crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==
   dependencies:
     minipass "^2.2.1"
 
@@ -4214,17 +4660,17 @@ fs.realpath@^1.0.0:
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@^1.2.2, fsevents@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4"
-  integrity sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==
+  version "1.2.9"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f"
+  integrity sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==
   dependencies:
-    nan "^2.9.2"
-    node-pre-gyp "^0.10.0"
+    nan "^2.12.1"
+    node-pre-gyp "^0.12.0"
 
-fstream@^1.0.0, fstream@^1.0.2:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
-  integrity sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=
+fstream@^1.0.0, fstream@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
+  integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
   dependencies:
     graceful-fs "^4.1.2"
     inherits "~2.0.0"
@@ -4267,6 +4713,11 @@ get-caller-file@^1.0.1:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
   integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
+get-caller-file@^2.0.1:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
 get-pkg-repo@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d"
@@ -4278,21 +4729,16 @@ get-pkg-repo@^1.0.0:
     parse-github-repo-url "^1.3.0"
     through2 "^2.0.0"
 
-get-stdin@5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
-  integrity sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=
+get-stdin@7.0.0, get-stdin@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6"
+  integrity sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==
 
 get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
   integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
 
-get-stdin@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
-  integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
-
 get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
@@ -4360,7 +4806,7 @@ git-remote-origin-url@^2.0.0:
     gitconfiglocal "^1.0.0"
     pify "^2.3.0"
 
-git-semver-tags@^2.0.2:
+git-semver-tags@2.0.2, git-semver-tags@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-2.0.2.tgz#f506ec07caade191ac0c8d5a21bdb8131b4934e3"
   integrity sha512-34lMF7Yo1xEmsK2EkbArdoU79umpvm0MfzaDkSNYSJqtM5QLAVTPWgpiXSVI5o/O9EvZPSrP4Zvnec/CqhSd5w==
@@ -4383,6 +4829,11 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
+glob-to-regexp@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
+  integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
+
 glob@7.0.x:
   version "7.0.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
@@ -4395,7 +4846,7 @@ glob@7.0.x:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@7.1.3, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.2, glob@^7.1.3, glob@~7.1.1:
+glob@7.1.3:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
   integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
@@ -4407,10 +4858,10 @@ glob@7.1.3, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.2, glob@^7.1.3, glo
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.6, glob@^7.1.1:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
-  integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@~7.1.1:
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
+  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -4419,7 +4870,7 @@ glob@^7.0.6, glob@^7.1.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-global-dirs@^0.1.0:
+global-dirs@^0.1.0, global-dirs@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
   integrity sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=
@@ -4427,9 +4878,9 @@ global-dirs@^0.1.0:
     ini "^1.3.4"
 
 globals@^11.1.0:
-  version "11.8.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.8.0.tgz#c1ef45ee9bed6badf0663c5cb90e8d1adec1321d"
-  integrity sha512-io6LkyPVuzCHBSQV9fmOwxZkUk6nIaGmxheLDgmuFv89j0fm2aqDbIXKAGfzCMHqz3HLF2Zf8WSG6VqMh2qFmA==
+  version "11.12.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
 globals@^9.18.0:
   version "9.18.0"
@@ -4471,6 +4922,19 @@ globby@^7.1.1:
     pify "^3.0.0"
     slash "^1.0.0"
 
+globby@^8.0.1:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.2.tgz#5697619ccd95c5275dbb2d6faa42087c1a941d8d"
+  integrity sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==
+  dependencies:
+    array-union "^1.0.1"
+    dir-glob "2.0.0"
+    fast-glob "^2.0.2"
+    glob "^7.1.2"
+    ignore "^3.3.5"
+    pify "^3.0.0"
+    slash "^1.0.0"
+
 globule@^1.0.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d"
@@ -4513,40 +4977,30 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3
   integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
 
 gzip-size@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.0.0.tgz#a55ecd99222f4c48fd8c01c625ce3b349d0a0e80"
-  integrity sha512-5iI7omclyqrnWw4XbXAmGhPsABkSIDQonv2K0h61lybgofWa6iZyvrI3r2zsJH4P8Nb64fFVzlvfhs0g7BBxAA==
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274"
+  integrity sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==
   dependencies:
     duplexer "^0.1.1"
-    pify "^3.0.0"
+    pify "^4.0.1"
 
-gzipper@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/gzipper/-/gzipper-2.2.0.tgz#a5cd6eab704f7899768bf28bdcba5509599533eb"
-  integrity sha512-zSQ4mpWBjOh+xhbDd+lvHKZAYDGIhIuxaomn9b9Z9n4dEpf5PfOoa2t262AtN3i8IqZIuh1Fp1KzmH4vWzafGw==
+gzipper@^2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/gzipper/-/gzipper-2.8.0.tgz#5cea4692eea90c35ce22766caa794ce5f6adb01b"
+  integrity sha512-DMoYEcsq+Wj2/R6mAoFEHUPF2bBQ2kN2BapoiKEmq5axEPIcjxJlxsi26PricDMMbbDY3VujKkzilfk4AonSaA==
   dependencies:
-    commander "^2.19.0"
+    commander "^2.20.0"
+    uuid "^3.3.2"
 
 handle-thing@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754"
   integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==
 
-handlebars@^4.0.11:
-  version "4.0.12"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.12.tgz#2c15c8a96d46da5e266700518ba8cb8d919d5bc5"
-  integrity sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==
-  dependencies:
-    async "^2.5.0"
-    optimist "^0.6.1"
-    source-map "^0.6.1"
-  optionalDependencies:
-    uglify-js "^3.1.4"
-
-handlebars@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.1.tgz#6e4e41c18ebe7719ae4d38e5aca3d32fa3dd23d3"
-  integrity sha512-3Zhi6C0euYZL5sM0Zcy7lInLXKQ+YLcF/olbN010mzGQ4XVm50JeyBnMqofHh696GrciGruC7kCcApPDJvVgwA==
+handlebars@^4.1.0, handlebars@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67"
+  integrity sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==
   dependencies:
     neo-async "^2.6.0"
     optimist "^0.6.1"
@@ -4559,20 +5013,12 @@ har-schema@^2.0.0:
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
   integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
-har-validator@~5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
-  integrity sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=
-  dependencies:
-    ajv "^5.1.0"
-    har-schema "^2.0.0"
-
 har-validator@~5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
-  integrity sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
+  integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
   dependencies:
-    ajv "^5.3.0"
+    ajv "^6.5.5"
     har-schema "^2.0.0"
 
 has-ansi@^2.0.0:
@@ -4583,9 +5029,9 @@ has-ansi@^2.0.0:
     ansi-regex "^2.0.0"
 
 has-binary2@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.2.tgz#e83dba49f0b9be4d026d27365350d9f03f54be98"
-  integrity sha1-6D26SfC5vk0CbSc2U1DZ8D9Uvpg=
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
+  integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==
   dependencies:
     isarray "2.0.1"
 
@@ -4647,13 +5093,6 @@ has@^1.0.1, has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
-hash-base@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-2.0.2.tgz#66ea1d856db4e8a5470cadf6fce23ae5244ef2e1"
-  integrity sha1-ZuodhW206KVHDK32/OI65SRO8uE=
-  dependencies:
-    inherits "^2.0.1"
-
 hash-base@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
@@ -4663,22 +5102,12 @@ hash-base@^3.0.0:
     safe-buffer "^5.0.1"
 
 hash.js@^1.0.0, hash.js@^1.0.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.3.tgz#340dedbe6290187151c1ea1d777a3448935df846"
-  integrity sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
+  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
   dependencies:
     inherits "^2.0.3"
-    minimalistic-assert "^1.0.0"
-
-hawk@~6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
-  integrity sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==
-  dependencies:
-    boom "4.x.x"
-    cryptiles "3.x.x"
-    hoek "4.x.x"
-    sntp "2.x.x"
+    minimalistic-assert "^1.0.1"
 
 hmac-drbg@^1.0.0:
   version "1.0.1"
@@ -4689,11 +5118,6 @@ hmac-drbg@^1.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
-hoek@4.x.x:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb"
-  integrity sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==
-
 home-or-tmp@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
@@ -4722,11 +5146,33 @@ hpack.js@^2.1.6:
     readable-stream "^2.0.1"
     wbuf "^1.1.0"
 
-html-entities@^1.2.0:
+html-entities@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
   integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
 
+htmlparser2@^3.9.1:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
+  integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
+  dependencies:
+    domelementtype "^1.3.1"
+    domhandler "^2.3.0"
+    domutils "^1.5.1"
+    entities "^1.1.1"
+    inherits "^2.0.1"
+    readable-stream "^3.1.1"
+
+http-auth@3.1.x:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/http-auth/-/http-auth-3.1.3.tgz#945cfadd66521eaf8f7c84913d377d7b15f24e31"
+  integrity sha1-lFz63WZSHq+PfISRPTd9exXyTjE=
+  dependencies:
+    apache-crypt "^1.1.2"
+    apache-md5 "^1.0.6"
+    bcryptjs "^2.3.0"
+    uuid "^3.0.0"
+
 http-cache-semantics@^3.8.1:
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
@@ -4737,17 +5183,18 @@ http-deceiver@^1.2.7:
   resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
   integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
 
-http-errors@1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736"
-  integrity sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=
+http-errors@1.7.2, http-errors@~1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
+  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
   dependencies:
-    depd "1.1.1"
+    depd "~1.1.2"
     inherits "2.0.3"
-    setprototypeof "1.0.3"
-    statuses ">= 1.3.1 < 2"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
 
-http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
+http-errors@~1.6.2:
   version "1.6.3"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
   integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
@@ -4757,10 +5204,10 @@ http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
     setprototypeof "1.1.0"
     statuses ">= 1.4.0 < 2"
 
-http-parser-js@>=0.4.0:
-  version "0.4.13"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.13.tgz#3bd6d6fde6e3172c9334c3b33b6c193d80fe1137"
-  integrity sha1-O9bW/ebjFyyTNMOzO2wZPYD+ETc=
+"http-parser-js@>=0.4.0 <0.4.11":
+  version "0.4.10"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz#92c9c1374c35085f75db359ec56cc257cbb93fa4"
+  integrity sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=
 
 http-proxy-agent@^2.1.0:
   version "2.1.0"
@@ -4770,25 +5217,17 @@ http-proxy-agent@^2.1.0:
     agent-base "4"
     debug "3.1.0"
 
-http-proxy-middleware@~0.18.0:
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz#0987e6bb5a5606e5a69168d8f967a87f15dd8aab"
-  integrity sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==
+http-proxy-middleware@^0.19.1:
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
+  integrity sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==
   dependencies:
-    http-proxy "^1.16.2"
+    http-proxy "^1.17.0"
     is-glob "^4.0.0"
-    lodash "^4.17.5"
-    micromatch "^3.1.9"
-
-http-proxy@^1.13.0:
-  version "1.16.2"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.16.2.tgz#06dff292952bf64dbe8471fa9df73066d4f37742"
-  integrity sha1-Bt/ykpUr9k2+hHH6nfcwZtTzd0I=
-  dependencies:
-    eventemitter3 "1.x.x"
-    requires-port "1.x.x"
+    lodash "^4.17.11"
+    micromatch "^3.1.10"
 
-http-proxy@^1.16.2:
+http-proxy@^1.13.0, http-proxy@^1.17.0:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
   integrity sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==
@@ -4826,35 +5265,30 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-husky@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-1.3.1.tgz#26823e399300388ca2afff11cfa8a86b0033fae0"
-  integrity sha512-86U6sVVVf4b5NYSZ0yvv88dRgBSSXXmHaiq5pP4KDj5JVzdwKgBjEtUPOm8hcoytezFwbU+7gotXNhpHdystlg==
+husky@^2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-2.4.1.tgz#dd00f9646f8693b93f7b3a12ba4be00be0eff7ab"
+  integrity sha512-ZRwMWHr7QruR22dQ5l3rEGXQ7rAQYsJYqaeCd+NyOsIFczAtqaApZQP3P4HwLZjCtFbm3SUNYoKuoBXX3AYYfw==
   dependencies:
-    cosmiconfig "^5.0.7"
+    cosmiconfig "^5.2.0"
     execa "^1.0.0"
     find-up "^3.0.0"
-    get-stdin "^6.0.0"
+    get-stdin "^7.0.0"
     is-ci "^2.0.0"
-    pkg-dir "^3.0.0"
+    pkg-dir "^4.1.0"
     please-upgrade-node "^3.1.1"
-    read-pkg "^4.0.1"
+    read-pkg "^5.1.1"
     run-node "^1.0.0"
-    slash "^2.0.0"
-
-iconv-lite@0.4.19:
-  version "0.4.19"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
-  integrity sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==
+    slash "^3.0.0"
 
-iconv-lite@0.4.23:
-  version "0.4.23"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
-  integrity sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==
+i18next@^15.0.4:
+  version "15.1.3"
+  resolved "https://registry.yarnpkg.com/i18next/-/i18next-15.1.3.tgz#f1984cbee0e3cb00cff9008b037264289ce8840a"
+  integrity sha512-hN2DZLoRSY2h/RYeNqth5XxV4N1ekKGSJDCGhFmmuXkOCAfK5CkUG4VBv9OBXrvf93xApv0KKBVrb0zJP31EKg==
   dependencies:
-    safer-buffer ">= 2.1.2 < 3"
+    "@babel/runtime" "^7.3.1"
 
-iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -4862,9 +5296,9 @@ iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
     safer-buffer ">= 2.1.2 < 3"
 
 ieee754@^1.1.4:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
-  integrity sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
+  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
 
 iferr@^0.1.5:
   version "0.1.5"
@@ -4976,47 +5410,76 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
 inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
   integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
 
+inherits@2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+
 ini@1.3.5, ini@^1.3.2, ini@^1.3.4, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
   integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
 
-inquirer@6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.1.tgz#9943fc4882161bdb0b0c9276769c75b32dbfcd52"
-  integrity sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==
+inquirer@3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.0.6.tgz#e04aaa9d05b7a3cb9b0f407d04375f0447190347"
+  integrity sha1-4EqqnQW3o8ubD0B9BDdfBEcZA0c=
   dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.0"
+    ansi-escapes "^1.1.0"
+    chalk "^1.0.0"
     cli-cursor "^2.1.0"
     cli-width "^2.0.0"
-    external-editor "^3.0.0"
+    external-editor "^2.0.1"
     figures "^2.0.0"
-    lodash "^4.17.10"
+    lodash "^4.3.0"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rx "^4.1.0"
+    string-width "^2.0.0"
+    strip-ansi "^3.0.0"
+    through "^2.3.6"
+
+inquirer@6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.3.1.tgz#7a413b5e7950811013a3db491c61d1f3b776e8e7"
+  integrity sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==
+  dependencies:
+    ansi-escapes "^3.2.0"
+    chalk "^2.4.2"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^3.0.3"
+    figures "^2.0.0"
+    lodash "^4.17.11"
     mute-stream "0.0.7"
     run-async "^2.2.0"
-    rxjs "^6.1.0"
+    rxjs "^6.4.0"
     string-width "^2.1.0"
-    strip-ansi "^5.0.0"
+    strip-ansi "^5.1.0"
     through "^2.3.6"
 
-internal-ip@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-3.0.1.tgz#df5c99876e1d2eb2ea2d74f520e3f669a00ece27"
-  integrity sha512-NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==
+inside@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/inside/-/inside-1.0.0.tgz#db45e993573cdb3db70b9832e8285bad46424770"
+  integrity sha1-20Xpk1c82z23C5gy6ChbrUZCR3A=
+
+internal-ip@^4.2.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
+  integrity sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==
   dependencies:
-    default-gateway "^2.6.0"
-    ipaddr.js "^1.5.2"
+    default-gateway "^4.2.0"
+    ipaddr.js "^1.9.0"
 
 interpret@^1.0.0:
   version "1.2.0"
@@ -5024,9 +5487,9 @@ interpret@^1.0.0:
   integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==
 
 invariant@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
-  integrity sha1-nh9WrArNtr8wMwbzOL47IErmA2A=
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
   dependencies:
     loose-envify "^1.0.0"
 
@@ -5050,15 +5513,18 @@ ip@^1.1.0, ip@^1.1.5:
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
   integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
 
-ipaddr.js@1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
-  integrity sha1-6qM9bd16zo9/b+DJygRA5wZzix4=
+ipaddr.js@1.9.0, ipaddr.js@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65"
+  integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==
 
-ipaddr.js@^1.5.2:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.1.tgz#fa4b79fa47fd3def5e3b159825161c0a519c9427"
-  integrity sha1-+kt5+kf9Pe9eOxWYJRYcClGclCc=
+is-absolute@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
+  integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
+  dependencies:
+    is-relative "^1.0.0"
+    is-windows "^1.0.1"
 
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
@@ -5091,13 +5557,6 @@ is-buffer@^1.1.5:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-builtin-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
-  integrity sha1-VAVy0096wxGfj3bDDLwbHgN6/74=
-  dependencies:
-    builtin-modules "^1.0.0"
-
 is-callable@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
@@ -5203,9 +5662,9 @@ is-glob@^3.1.0:
     is-extglob "^2.1.0"
 
 is-glob@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
-  integrity sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
   dependencies:
     is-extglob "^2.1.1"
 
@@ -5217,6 +5676,11 @@ is-installed-globally@^0.1.0:
     global-dirs "^0.1.0"
     is-path-inside "^1.0.0"
 
+is-negated-glob@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2"
+  integrity sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=
+
 is-npm@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
@@ -5239,13 +5703,25 @@ is-path-cwd@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
   integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
 
+is-path-cwd@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.1.0.tgz#2e0c7e463ff5b7a0eb60852d851a6809347a124c"
+  integrity sha512-Sc5j3/YnM8tDeyCsVeKlm/0p95075DyLmDEIkSgQ7mXkrOX+uTCtmQFm0CYzVyJwcCCmO3k8qfJt17SxQwB5Zw==
+
 is-path-in-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc"
-  integrity sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
+  integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
   dependencies:
     is-path-inside "^1.0.0"
 
+is-path-in-cwd@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz#bfe2dca26c69f397265a4009963602935a053acb"
+  integrity sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==
+  dependencies:
+    is-path-inside "^2.1.0"
+
 is-path-inside@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
@@ -5253,7 +5729,14 @@ is-path-inside@^1.0.0:
   dependencies:
     path-is-inside "^1.0.1"
 
-is-plain-obj@^1.1.0:
+is-path-inside@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz#7c9810587d659a40d27bcdb4d5616eab059494b2"
+  integrity sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==
+  dependencies:
+    path-is-inside "^1.0.2"
+
+is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
   integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
@@ -5282,21 +5765,23 @@ is-regex@^1.0.4:
   dependencies:
     has "^1.0.1"
 
+is-relative@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
+  integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
+  dependencies:
+    is-unc-path "^1.0.0"
+
 is-retry-allowed@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
   integrity sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=
 
-is-stream@^1.0.0, is-stream@^1.1.0:
+is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
   integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
-is-subset@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
-  integrity sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=
-
 is-symbol@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
@@ -5311,17 +5796,31 @@ is-text-path@^1.0.0:
   dependencies:
     text-extensions "^1.0.0"
 
+is-text-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-2.0.0.tgz#b2484e2b720a633feb2e85b67dc193ff72c75636"
+  integrity sha512-+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw==
+  dependencies:
+    text-extensions "^2.0.0"
+
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
+is-unc-path@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
+  integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
+  dependencies:
+    unc-path-regex "^0.1.2"
+
 is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
   integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
 
-is-windows@^1.0.2:
+is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
@@ -5331,6 +5830,11 @@ is-wsl@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
   integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
 
+isarray@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -5342,9 +5846,11 @@ isarray@2.0.1:
   integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
 
 isbinaryfile@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.2.tgz#4a3e974ec0cba9004d3fc6cde7209ea69368a621"
-  integrity sha1-Sj6XTsDLqQBNP8bN5yCeppNopiE=
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80"
+  integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==
+  dependencies:
+    buffer-alloc "^1.2.0"
 
 isexe@^2.0.0:
   version "2.0.0"
@@ -5368,22 +5874,23 @@ isstream@~0.1.2:
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
-istanbul-api@^2.0.5:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-2.0.6.tgz#cd7b33ee678f6c01531d05f5e567ebbcd25f8ecc"
-  integrity sha512-8W5oeAGWXhtTJjAyVfvavOLVyZCTNCKsyF6GON/INKlBdO7uJ/bv3qnPj5M6ERKzmMCJS1kntnjjGuJ86fn3rQ==
+istanbul-api@^2.1.1:
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-2.1.6.tgz#d61702a9d1c66ad89d92e66d401e16b0bda4a35f"
+  integrity sha512-x0Eicp6KsShG1k1rMgBAi/1GgY7kFGEBwQpw3PXGEmu+rBcBNhqU8g2DgY9mlepAsLPzrzrbqSgCGANnki4POA==
   dependencies:
-    async "^2.6.1"
-    compare-versions "^3.2.1"
+    async "^2.6.2"
+    compare-versions "^3.4.0"
     fileset "^2.0.3"
-    istanbul-lib-coverage "^2.0.1"
-    istanbul-lib-hook "^2.0.1"
-    istanbul-lib-instrument "^3.0.0"
-    istanbul-lib-report "^2.0.2"
-    istanbul-lib-source-maps "^2.0.1"
-    istanbul-reports "^2.0.1"
-    js-yaml "^3.12.0"
-    make-dir "^1.3.0"
+    istanbul-lib-coverage "^2.0.5"
+    istanbul-lib-hook "^2.0.7"
+    istanbul-lib-instrument "^3.3.0"
+    istanbul-lib-report "^2.0.8"
+    istanbul-lib-source-maps "^3.0.6"
+    istanbul-reports "^2.2.4"
+    js-yaml "^3.13.1"
+    make-dir "^2.1.0"
+    minimatch "^3.0.4"
     once "^1.4.0"
 
 istanbul-instrumenter-loader@3.0.1:
@@ -5401,15 +5908,15 @@ istanbul-lib-coverage@^1.2.1:
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz#ccf7edcd0a0bb9b8f729feeb0930470f9af664f0"
   integrity sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==
 
-istanbul-lib-coverage@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#2aee0e073ad8c5f6a0b00e0dfbf52b4667472eda"
-  integrity sha512-nPvSZsVlbG9aLhZYaC3Oi1gT/tpyo3Yt5fNyf6NmcKIayz4VV/txxJFFKAK/gU4dcNn8ehsanBbVHVl0+amOLA==
+istanbul-lib-coverage@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49"
+  integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==
 
-istanbul-lib-hook@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.1.tgz#918a57b75a0f951d552a08487ca1fa5336433d72"
-  integrity sha512-ufiZoiJ8CxY577JJWEeFuxXZoMqiKpq/RqZtOAYuQLvlkbJWscq9n3gc4xrCGH9n4pW0qnTxOz1oyMmVtk8E1w==
+istanbul-lib-hook@^2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.7.tgz#c95695f383d4f8f60df1f04252a9550e15b5b133"
+  integrity sha512-vrRztU9VRRFDyC+aklfLoeXyNdTfga2EI3udDGn4cZ6fpSXpHLV9X6CHvfoMCPtggg8zvDDmC4b9xfu0z6/llA==
   dependencies:
     append-transform "^1.0.0"
 
@@ -5426,56 +5933,56 @@ istanbul-lib-instrument@^1.7.3:
     istanbul-lib-coverage "^1.2.1"
     semver "^5.3.0"
 
-istanbul-lib-instrument@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.0.0.tgz#b5f066b2a161f75788be17a9d556f40a0cf2afc9"
-  integrity sha512-eQY9vN9elYjdgN9Iv6NS/00bptm02EBBk70lRMaVjeA6QYocQgenVrSgC28TJurdnZa80AGO3ASdFN+w/njGiQ==
-  dependencies:
-    "@babel/generator" "^7.0.0"
-    "@babel/parser" "^7.0.0"
-    "@babel/template" "^7.0.0"
-    "@babel/traverse" "^7.0.0"
-    "@babel/types" "^7.0.0"
-    istanbul-lib-coverage "^2.0.1"
-    semver "^5.5.0"
-
-istanbul-lib-report@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.2.tgz#430a2598519113e1da7af274ba861bd42dd97535"
-  integrity sha512-rJ8uR3peeIrwAxoDEbK4dJ7cqqtxBisZKCuwkMtMv0xYzaAnsAi3AHrHPAAtNXzG/bcCgZZ3OJVqm1DTi9ap2Q==
-  dependencies:
-    istanbul-lib-coverage "^2.0.1"
-    make-dir "^1.3.0"
-    supports-color "^5.4.0"
+istanbul-lib-instrument@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630"
+  integrity sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==
+  dependencies:
+    "@babel/generator" "^7.4.0"
+    "@babel/parser" "^7.4.3"
+    "@babel/template" "^7.4.0"
+    "@babel/traverse" "^7.4.3"
+    "@babel/types" "^7.4.0"
+    istanbul-lib-coverage "^2.0.5"
+    semver "^6.0.0"
+
+istanbul-lib-report@^2.0.8:
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz#5a8113cd746d43c4889eba36ab10e7d50c9b4f33"
+  integrity sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==
+  dependencies:
+    istanbul-lib-coverage "^2.0.5"
+    make-dir "^2.1.0"
+    supports-color "^6.1.0"
 
-istanbul-lib-source-maps@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-2.0.1.tgz#ce8b45131d8293fdeaa732f4faf1852d13d0a97e"
-  integrity sha512-30l40ySg+gvBLcxTrLzR4Z2XTRj3HgRCA/p2rnbs/3OiTaoj054gAbuP5DcLOtwqmy4XW8qXBHzrmP2/bQ9i3A==
+istanbul-lib-source-maps@^3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz#284997c48211752ec486253da97e3879defba8c8"
+  integrity sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==
   dependencies:
-    debug "^3.1.0"
-    istanbul-lib-coverage "^2.0.1"
-    make-dir "^1.3.0"
-    rimraf "^2.6.2"
+    debug "^4.1.1"
+    istanbul-lib-coverage "^2.0.5"
+    make-dir "^2.1.0"
+    rimraf "^2.6.3"
     source-map "^0.6.1"
 
-istanbul-reports@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.0.1.tgz#fb8d6ea850701a3984350b977a969e9a556116a7"
-  integrity sha512-CT0QgMBJqs6NJLF678ZHcquUAZIoBIUNzdJrRJfpkI9OnzG6MkUfHxbJC3ln981dMswC7/B1mfX3LNkhgJxsuw==
+istanbul-reports@^2.2.4:
+  version "2.2.6"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.6.tgz#7b4f2660d82b29303a8fe6091f8ca4bf058da1af"
+  integrity sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==
   dependencies:
-    handlebars "^4.0.11"
+    handlebars "^4.1.2"
+
+jasmine-core@^3.3, jasmine-core@~3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.4.0.tgz#2a74618e966026530c3518f03e9f845d26473ce3"
+  integrity sha512-HU/YxV4i6GcmiH4duATwAbJQMlE0MsDIR5XmSVxURxKHn3aGAdbY1/ZJFmVRbKtnLwIxxMJD7gYaPsypcbYimg==
 
 jasmine-core@~2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
   integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=
 
-jasmine-core@~2.99.1:
-  version "2.99.1"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.99.1.tgz#e6400df1e6b56e130b61c4bcd093daa7f6e8ca15"
-  integrity sha1-5kAN8ea1bhMLYcS80JPap/boyhU=
-
 jasmine-spec-reporter@~4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz#1d632aec0341670ad324f92ba84b4b32b35e9e22"
@@ -5498,40 +6005,24 @@ jasminewd2@^2.1.0:
   integrity sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=
 
 js-base64@^2.1.8:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.0.tgz#42255ba183ab67ce59a0dee640afdc00ab5ae93e"
-  integrity sha512-wlEBIZ5LP8usDylWbDNhKPEFVFdI5hCHpnVoT/Ysvoi/PRhJENm/Rlh9TvjYB38HFfKZN7OzEbRjmjvLkFw11g==
-
-js-tokens@^3.0.0, js-tokens@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
-  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121"
+  integrity sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==
 
-js-tokens@^4.0.0:
+"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.12.0:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
-  integrity sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-js-yaml@^3.7.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
-  integrity sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
+js-tokens@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
-js-yaml@^3.9.0:
-  version "3.12.2"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.2.tgz#ef1d067c5a9d9cb65bd72f285b5d8105c77f14fc"
-  integrity sha512-QHn/Lh/7HhZ/Twc7vJYQTkjuCa0kaCcDcjK5Zlk2rvnUpy7DxMJ23+Jc2dcyvltwQVg1nygAVlB2oRDFHoRS5Q==
+js-yaml@^3.13.0, js-yaml@^3.13.1:
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
+  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -5547,9 +6038,9 @@ jsesc@^1.3.0:
   integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s=
 
 jsesc@^2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
-  integrity sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
 jsesc@~0.5.0:
   version "0.5.0"
@@ -5581,17 +6072,17 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
-json2typescript@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/json2typescript/-/json2typescript-1.2.0.tgz#8c5c7de3a2343f02418369295ab4d08c84752c73"
-  integrity sha512-IHiaZVJ3z7HS/Cv/iy3TezlH7b2iFITheSRQRFqeqRoDiXxcrFLsiSiF5q09JqKPv0Txnca8B33eTmhv+O2ezA==
+json2typescript@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/json2typescript/-/json2typescript-1.2.3.tgz#f6760f41fc6f606af5ea309368755518b32d353f"
+  integrity sha512-XJzQXMXJgRgCSmz2nYzeUBCIq/+feVtOnLzwAOMplXgGFqsXVnOwL5IEjYKkbx2sjyRuMRIfY76elUVv7P6NsQ==
 
 json3@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
-  integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
+  integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
 
-json5@^0.5.0, json5@^0.5.1:
+json5@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
   integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
@@ -5603,6 +6094,13 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
+json5@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850"
+  integrity sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==
+  dependencies:
+    minimist "^1.2.0"
+
 jsonfile@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66"
@@ -5638,15 +6136,14 @@ jsprim@^1.2.2:
     verror "1.10.0"
 
 jszip@^3.1.3:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.1.5.tgz#e3c2a6c6d706ac6e603314036d43cd40beefdf37"
-  integrity sha512-5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ==
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.2.1.tgz#c5d32df7274042282b157efb16e522b43435e01a"
+  integrity sha512-iCMBbo4eE5rb1VCpm5qXOAaUiRKRUKiItn8ah2YQQx9qymmSAY98eyQfioChEYcVQLh0zxJ3wS4A0mh90AVPvw==
   dependencies:
-    core-js "~2.3.0"
-    es6-promise "~3.0.2"
-    lie "~3.1.0"
+    lie "~3.3.0"
     pako "~1.0.2"
-    readable-stream "~2.0.6"
+    readable-stream "~2.3.6"
+    set-immediate-shim "~1.0.1"
 
 karma-chrome-launcher@~2.2.0:
   version "2.2.0"
@@ -5657,41 +6154,36 @@ karma-chrome-launcher@~2.2.0:
     which "^1.2.1"
 
 karma-coverage-istanbul-reporter@~2.0.1:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.4.tgz#402ae4ed6eadb9d9dafbd408ffda17897c0d003a"
-  integrity sha512-xJS7QSQIVU6VK9HuJ/ieE5yynxKhjCCkd96NLY/BX/HXsx0CskU9JJiMQbd4cHALiddMwI4OWh1IIzeWrsavJw==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.5.tgz#ca5899d4905e44a5984dd4f963adfc1a74dce767"
+  integrity sha512-yPvAlKtY3y+rKKWbOo0CzBMVTvJEeMOgbMXuVv3yWvS8YtYKC98AU9vFF0mVBZ2RP1E9SgS90+PT6Kf14P3S4w==
   dependencies:
-    istanbul-api "^2.0.5"
+    istanbul-api "^2.1.1"
     minimatch "^3.0.4"
 
-karma-jasmine-html-reporter@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-0.2.2.tgz#48a8e5ef18807617ee2b5e33c1194c35b439524c"
-  integrity sha1-SKjl7xiAdhfuK14zwRlMNbQ5Ukw=
-  dependencies:
-    karma-jasmine "^1.0.2"
-
-karma-jasmine@^1.0.2:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.1.tgz#6fe840e75a11600c9d91e84b33c458e1c46a3529"
-  integrity sha1-b+hA51oRYAydkehLM8RY4cRqNSk=
+karma-jasmine-html-reporter@^1.4.0:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.4.2.tgz#16d100fd701271192d27fd28ddc90b710ad36fff"
+  integrity sha512-7g0gPj8+9JepCNJR9WjDyQ2RkZ375jpdurYQyAYv8PorUCadepl8vrD6LmMqOGcM17cnrynBawQYZHaumgDjBw==
 
-karma-jasmine@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.2.tgz#394f2b25ffb4a644b9ada6f22d443e2fd08886c3"
-  integrity sha1-OU8rJf+0pkS5rabyLUQ+L9CIhsM=
+karma-jasmine@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-2.0.1.tgz#26e3e31f2faf272dd80ebb0e1898914cc3a19763"
+  integrity sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==
+  dependencies:
+    jasmine-core "^3.3"
 
-karma-source-map-support@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.3.0.tgz#36dd4d8ca154b62ace95696236fae37caf0a7dde"
-  integrity sha512-HcPqdAusNez/ywa+biN4EphGz62MmQyPggUsDfsHqa7tSe4jdsxgvTKuDfIazjL+IOxpVWyT7Pr4dhAV+sxX5Q==
+karma-source-map-support@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz#58526ceccf7e8730e56effd97a4de8d712ac0d6b"
+  integrity sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==
   dependencies:
     source-map-support "^0.5.5"
 
-karma@~4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-4.0.1.tgz#2581d6caa0d4cd28b65131561b47bad6d5478773"
-  integrity sha512-ind+4s03BqIXas7ZmraV3/kc5+mnqwCd+VDX1FndS6jxbt03kQKX2vXrWxNLuCjVYmhMwOZosAEKMM0a2q7w7A==
+karma@~4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-4.1.0.tgz#d07387c9743a575b40faf73e8a3eb5421c2193e1"
+  integrity sha512-xckiDqyNi512U4dXGOOSyLKPwek6X/vUizSy2f3geYevbLj+UIdvNwbn7IwfUIL2g1GXEPWt/87qFD1fBbl/Uw==
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"
@@ -5721,7 +6213,7 @@ karma@~4.0.0:
     tmp "0.0.33"
     useragent "2.3.0"
 
-killable@^1.0.0:
+killable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
   integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
@@ -5796,21 +6288,57 @@ less@3.9.0:
     request "^2.83.0"
     source-map "~0.6.0"
 
-license-webpack-plugin@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.1.0.tgz#83acaa6e89c3c5316effdd80cb4ec9c5cd8efc2f"
-  integrity sha512-vDiBeMWxjE9n6TabQ9J4FH8urFdsRK0Nvxn1cit9biCiR9aq1zBR0X2BlAkEiIG6qPamLeU0GzvIgLkrFc398A==
+levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
+license-webpack-plugin@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.1.1.tgz#f0ab760f7f301c76f5af52e480f320656b5721bb"
+  integrity sha512-TiarZIg5vkQ2rGdYJn2+5YxO/zqlqjpK5IVglr7OfmrN1sBCakS+PQrsP2uC5gtve1ZDb9WMSUMlmHDQ0FoW4w==
   dependencies:
     "@types/webpack-sources" "^0.1.5"
     webpack-sources "^1.2.0"
 
-lie@~3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
-  integrity sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=
+lie@~3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a"
+  integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==
   dependencies:
     immediate "~3.0.5"
 
+linebreak@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/linebreak/-/linebreak-0.3.0.tgz#0526480a62c05bd679f3e9d99830e09c6a7d0ed6"
+  integrity sha1-BSZICmLAW9Z58+nZmDDgnGp9DtY=
+  dependencies:
+    base64-js "0.0.8"
+    brfs "^1.3.0"
+    unicode-trie "^0.3.0"
+
+live-server@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/live-server/-/live-server-1.2.1.tgz#670630dd409d22fe9c513ab1c1894686c757153e"
+  integrity sha512-Yn2XCVjErTkqnM3FfTmM7/kWy3zP7+cEtC7x6u+wUzlQ+1UW3zEYbbyJrc0jNDwiMDZI0m4a0i3dxlGHVyXczw==
+  dependencies:
+    chokidar "^2.0.4"
+    colors latest
+    connect "^3.6.6"
+    cors latest
+    event-stream "3.3.4"
+    faye-websocket "0.11.x"
+    http-auth "3.1.x"
+    morgan "^1.9.1"
+    object-assign latest
+    opn latest
+    proxy-middleware latest
+    send latest
+    serve-index "^1.9.1"
+
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
@@ -5822,16 +6350,6 @@ load-json-file@^1.0.0:
     pinkie-promise "^2.0.0"
     strip-bom "^2.0.0"
 
-load-json-file@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
-  integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    strip-bom "^3.0.0"
-
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
@@ -5843,11 +6361,11 @@ load-json-file@^4.0.0:
     strip-bom "^3.0.0"
 
 loader-runner@^2.3.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.1.tgz#026f12fe7c3115992896ac02ba022ba92971b979"
-  integrity sha512-By6ZFY7ETWOc9RFaAIb23IjJVcM4dvJC/N57nmdz9RSkMXvAXGI7SyVlAw3v8vjtDRlqThgVDVmTnr9fqMlxkw==
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
+  integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
 
-loader-utils@1.2.3:
+loader-utils@1.2.3, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
   integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
@@ -5856,15 +6374,6 @@ loader-utils@1.2.3:
     emojis-list "^2.0.0"
     json5 "^1.0.1"
 
-loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
-  integrity sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=
-  dependencies:
-    big.js "^3.1.3"
-    emojis-list "^2.0.0"
-    json5 "^0.5.0"
-
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@@ -5881,17 +6390,19 @@ locate-path@^3.0.0:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
 
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+  dependencies:
+    p-locate "^4.1.0"
+
 lodash._reinterpolate@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
   integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
 
-lodash.assign@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
-  integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
-
-lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0:
+lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
   integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
@@ -5901,10 +6412,10 @@ lodash.debounce@^4.0.8:
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
-lodash.mergewith@^4.6.0:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
-  integrity sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==
+lodash.ismatch@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
+  integrity sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc=
 
 lodash.tail@^4.1.1:
   version "4.1.1"
@@ -5926,38 +6437,33 @@ lodash.templatesettings@^4.0.0:
   dependencies:
     lodash._reinterpolate "~3.0.0"
 
-lodash@4.17.11, lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.5, lodash@^4.2.1, lodash@~4.17.10:
+lodash@4.17.11, lodash@^4.0.0, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@~4.17.10:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
-lodash@^4.17.4:
-  version "4.17.4"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
-  integrity sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=
-
 log4js@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-4.0.2.tgz#0c73e623ca4448669653eb0e9f629beacc7fbbe3"
-  integrity sha512-KE7HjiieVDPPdveA3bJZSuu0n8chMkFl8mIoisBFxwEJ9FmXe4YzNuiqSwYUiR1K8q8/5/8Yd6AClENY1RA9ww==
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/log4js/-/log4js-4.3.2.tgz#2c1d97c2ebeb5172d92df63ebf8750af4a1d91ea"
+  integrity sha512-72GjgSP+ifL156MD/bXEhE7UlFLKS2KkCXujodb1nl1z6PpKhCfS+41dyNQ7zKi4iM49TQl+aWLEISXGLcGCCQ==
   dependencies:
     date-format "^2.0.0"
-    debug "^3.1.0"
+    debug "^4.1.1"
     flatted "^2.0.0"
     rfdc "^1.1.2"
-    streamroller "^1.0.1"
+    streamroller "^1.0.5"
 
-loglevel@^1.4.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
-  integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=
+loglevel@^1.6.1:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.3.tgz#77f2eb64be55a404c9fd04ad16d57c1d6d6b1280"
+  integrity sha512-LoEDv5pgpvWgPF4kNYuIp0qqSJVWak/dML0RY74xlzMZiT9w77teNAwKYKWBTYjlokMirg+o3jBwp+vlLrcfAA==
 
 loose-envify@^1.0.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
-  integrity sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
   dependencies:
-    js-tokens "^3.0.0"
+    js-tokens "^3.0.0 || ^4.0.0"
 
 loud-rejection@^1.0.0:
   version "1.6.0"
@@ -5980,14 +6486,6 @@ lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
-lru-cache@^4.1.1:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
-  integrity sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==
-  dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
-
 lru-cache@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
@@ -5995,6 +6493,30 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
+lunr@^2.3.6:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.6.tgz#f278beee7ffd56ad86e6e478ce02ab2b98c78dd5"
+  integrity sha512-swStvEyDqQ85MGpABCMBclZcLI/pBIlu8FFDtmX197+oEgKloJ67QnB+Tidh0340HmLMs39c4GrkPY3cmkXp6Q==
+
+macos-release@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.3.0.tgz#eb1930b036c0800adebccd5f17bc4c12de8bb71f"
+  integrity sha512-OHhSbtcviqMPt7yfw5ef5aghS2jzFVKEFyCJndQt2YpSQ9qRVSEv2axSJI1paVThEu+FFGs584h/1YhxjVqajA==
+
+magic-string@0.25.2:
+  version "0.25.2"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.2.tgz#139c3a729515ec55e96e69e82a11fe890a293ad9"
+  integrity sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==
+  dependencies:
+    sourcemap-codec "^1.4.4"
+
+magic-string@^0.22.4:
+  version "0.22.5"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e"
+  integrity sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==
+  dependencies:
+    vlq "^0.2.2"
+
 magic-string@^0.25.0:
   version "0.25.1"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.1.tgz#b1c248b399cd7485da0fe7385c2fc7011843266e"
@@ -6002,17 +6524,25 @@ magic-string@^0.25.0:
   dependencies:
     sourcemap-codec "^1.4.1"
 
-make-dir@^1.0.0, make-dir@^1.3.0:
+make-dir@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
   integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
   dependencies:
     pify "^3.0.0"
 
+make-dir@^2.0.0, make-dir@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
+  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
+  dependencies:
+    pify "^4.0.1"
+    semver "^5.6.0"
+
 make-error@^1.1.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.2.tgz#8762ffad2444dd8ff1f7c819629fa28e24fea1c4"
-  integrity sha512-l9ra35l5VWLF24y75Tg8XgfGLX0ueRhph118WKM6H5denx4bB5QF59+4UAm9oJ2qsPQZas/CQUDdtDdfvYHBdQ==
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
+  integrity sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==
 
 make-fetch-happen@^4.0.1:
   version "4.0.1"
@@ -6031,10 +6561,15 @@ make-fetch-happen@^4.0.1:
     socks-proxy-agent "^4.0.0"
     ssri "^6.0.0"
 
+mamacro@^0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
+  integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==
+
 map-age-cleaner@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz#098fb15538fd3dbe461f12745b0ca8568d4e3f74"
-  integrity sha512-UN1dNocxQq44IhJyMI4TU8phc2m9BddacHRPRjKGLYaF0jqd3xLz0jS0skpAU9WgYyoR4gHtUpzytNBS385FWQ==
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
+  integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
   dependencies:
     p-defer "^1.0.0"
 
@@ -6053,6 +6588,11 @@ map-obj@^2.0.0:
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9"
   integrity sha1-plzSkIepJZi4eRJXpSPgISIqwfk=
 
+map-stream@~0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
+  integrity sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=
+
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
@@ -6060,36 +6600,35 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
+marked@^0.6.1:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-0.6.2.tgz#c574be8b545a8b48641456ca1dbe0e37b6dccc1a"
+  integrity sha512-LqxwVH3P/rqKX4EKGz7+c2G9r98WeM/SW34ybhgNGhUQNKtf1GmmSkJ6cDGJ/t6tiyae49qRkpyTw2B9HOrgUA==
+
 md5.js@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
-  integrity sha1-6b296UogpawYsENA/Fdk1bCdkB0=
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
+  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
   dependencies:
     hash-base "^3.0.0"
     inherits "^2.0.1"
+    safe-buffer "^5.1.2"
 
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
-mem@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
-  integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=
-  dependencies:
-    mimic-fn "^1.0.0"
-
 mem@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-4.0.0.tgz#6437690d9471678f6cc83659c00cbafcd6b0cdaf"
-  integrity sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
+  integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
   dependencies:
     map-age-cleaner "^0.1.1"
-    mimic-fn "^1.0.0"
-    p-is-promise "^1.1.0"
+    mimic-fn "^2.0.0"
+    p-is-promise "^2.0.0"
 
-memory-fs@^0.4.0, memory-fs@~0.4.1:
+memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
   integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
@@ -6153,12 +6692,24 @@ merge-descriptors@1.0.1:
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
   integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
 
+merge-source-map@1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.4.tgz#a5de46538dae84d4114cc5ea02b4772a6346701f"
+  integrity sha1-pd5GU42uhNQRTMXqArR3KmNGcB8=
+  dependencies:
+    source-map "^0.5.6"
+
+merge2@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
+  integrity sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA==
+
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
-micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
+micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
@@ -6185,68 +6736,27 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-"mime-db@>= 1.36.0 < 2", mime-db@~1.36.0:
-  version "1.36.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
-  integrity sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==
+mime-db@1.40.0, "mime-db@>= 1.40.0 < 2":
+  version "1.40.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
+  integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
 
-mime-db@~1.30.0:
-  version "1.30.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
-  integrity sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=
-
-mime-db@~1.37.0:
-  version "1.37.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
-  integrity sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==
-
-mime-db@~1.38.0:
-  version "1.38.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.38.0.tgz#1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad"
-  integrity sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==
-
-mime-types@^2.1.12, mime-types@~2.1.17:
-  version "2.1.21"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96"
-  integrity sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==
-  dependencies:
-    mime-db "~1.37.0"
-
-mime-types@~2.1.16:
-  version "2.1.17"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
-  integrity sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=
-  dependencies:
-    mime-db "~1.30.0"
-
-mime-types@~2.1.18:
-  version "2.1.22"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.22.tgz#fe6b355a190926ab7698c9a0556a11199b2199bd"
-  integrity sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==
-  dependencies:
-    mime-db "~1.38.0"
-
-mime-types@~2.1.19:
-  version "2.1.20"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19"
-  integrity sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==
+mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
+  version "2.1.24"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
+  integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
   dependencies:
-    mime-db "~1.36.0"
-
-mime@1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
-  integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
+    mime-db "1.40.0"
 
-mime@^1.2.11, mime@^1.4.1:
+mime@1.6.0, mime@^1.2.11, mime@^1.4.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
-mime@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
-  integrity sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==
+mime@^2.3.1, mime@^2.4.2:
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5"
+  integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==
 
 mimeparse@^0.1.4:
   version "0.1.4"
@@ -6254,30 +6764,36 @@ mimeparse@^0.1.4:
   integrity sha1-2vsCdSNw/SJgk64xUsJxrwGsJUo=
 
 mimic-fn@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
-  integrity sha1-5md4PZLonb00KBi1IwudYqZyrRg=
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
-mini-css-extract-plugin@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz#ac0059b02b9692515a637115b0cc9fed3a35c7b0"
-  integrity sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==
+mimic-fn@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+
+mini-css-extract-plugin@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.6.0.tgz#a3f13372d6fcde912f3ee4cd039665704801e3b9"
+  integrity sha512-79q5P7YGI6rdnVyIAV4NXpBQJFWdkzJxCim3Kog4078fM0piAaFlwocqbejdWtLW1cEzCexPrh6EdyFsPgVdAw==
   dependencies:
     loader-utils "^1.1.0"
+    normalize-url "^2.0.1"
     schema-utils "^1.0.0"
     webpack-sources "^1.1.0"
 
-minimalistic-assert@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
-  integrity sha1-cCvi3aazf0g2vLP121ZkG2Sh09M=
+minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
 minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
+minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -6297,7 +6813,7 @@ minimist@0.0.8:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
   integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
-minimist@^1.1.3, minimist@^1.2.0:
+minimist@1.2.0, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
@@ -6307,7 +6823,7 @@ minimist@~0.0.1:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
   integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
 
-minipass@^2.2.1, minipass@^2.3.4, minipass@^2.3.5:
+minipass@^2.2.1, minipass@^2.3.5:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
   integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
@@ -6315,29 +6831,13 @@ minipass@^2.2.1, minipass@^2.3.4, minipass@^2.3.5:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
-minizlib@^1.1.1:
+minizlib@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
   integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==
   dependencies:
     minipass "^2.2.1"
 
-mississippi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
-  integrity sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==
-  dependencies:
-    concat-stream "^1.5.0"
-    duplexify "^3.4.2"
-    end-of-stream "^1.1.0"
-    flush-write-stream "^1.0.0"
-    from2 "^2.1.0"
-    parallel-transform "^1.1.0"
-    pump "^2.0.1"
-    pumpify "^1.3.3"
-    stream-each "^1.1.0"
-    through2 "^2.0.0"
-
 mississippi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
@@ -6382,6 +6882,17 @@ modify-values@^1.0.0:
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
   integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
+morgan@^1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.9.1.tgz#0a8d16734a1d9afbc824b99df87e738e58e2da59"
+  integrity sha512-HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA==
+  dependencies:
+    basic-auth "~2.0.0"
+    debug "2.6.9"
+    depd "~1.1.2"
+    on-finished "~2.3.0"
+    on-headers "~1.0.1"
+
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
@@ -6404,11 +6915,16 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
-ms@^2.0.0, ms@^2.1.1:
+ms@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
+ms@^2.0.0, ms@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
 multicast-dns-service-types@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
@@ -6422,6 +6938,16 @@ multicast-dns@^6.0.1:
     dns-packet "^1.3.1"
     thunky "^1.0.2"
 
+multimatch@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
+  integrity sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=
+  dependencies:
+    array-differ "^1.0.0"
+    array-union "^1.0.1"
+    arrify "^1.0.0"
+    minimatch "^3.0.0"
+
 multimatch@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-3.0.0.tgz#0e2534cc6bc238d9ab67e1b9cd5fcd85a6dbf70b"
@@ -6437,15 +6963,10 @@ mute-stream@0.0.7:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
   integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
-nan@^2.10.0:
-  version "2.11.1"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766"
-  integrity sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==
-
-nan@^2.9.2:
-  version "2.13.1"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.1.tgz#a15bee3790bde247e8f38f1d446edcdaeb05f2dd"
-  integrity sha512-I6YB/YEuDeUZMmhscXKxGgZlFnhsn5y0hgOZBadkzfTRrZBtJDZeg6eQf7PYMIEclwmorTKK8GztsyOUSVBREA==
+nan@^2.12.1, nan@^2.13.2:
+  version "2.14.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
+  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -6465,33 +6986,27 @@ nanomatch@^1.2.9:
     to-regex "^3.0.1"
 
 needle@^2.2.1:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e"
-  integrity sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c"
+  integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==
   dependencies:
-    debug "^2.1.2"
+    debug "^3.2.6"
     iconv-lite "^0.4.4"
     sax "^1.2.4"
 
-negotiator@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
-  integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
-
-neo-async@^2.5.0:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.2.tgz#489105ce7bc54e709d736b195f82135048c50fcc"
-  integrity sha512-vdqTKI9GBIYcAEbFAcpKPErKINfPF5zIuz3/niBfq8WUZjpT2tytLlFVrBgWdOtqI4uaA/Rb6No0hux39XXDuw==
+negotiator@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
+  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
 
-neo-async@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
-  integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
+neo-async@^2.5.0, neo-async@^2.6.0:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
+  integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
 
-ngx-gallery@^5.9.1:
-  version "5.9.1"
-  resolved "https://registry.yarnpkg.com/ngx-gallery/-/ngx-gallery-5.9.1.tgz#c56cd21346298931c71273356ebc6e1e5466c223"
-  integrity sha512-T9nPI+8TwQ5huQvPnptp0FwXJrLcAIjmtenOHZulFMkKfai3LBt3zhWRazoL706ywhs+JKIvOY+4lzpBOQ0n3g==
+"ngx-gallery@git://github.com/musicEnfanthen/ngx-gallery-dist-patch":
+  version "5.10.0"
+  resolved "git://github.com/musicEnfanthen/ngx-gallery-dist-patch#9ee16e59d050c072f76bfc65a313c81eb7e03cf3"
 
 ngx-json-viewer@^2.4.0:
   version "2.4.0"
@@ -6512,6 +7027,14 @@ node-fetch-npm@^2.0.2:
     json-parse-better-errors "^1.0.0"
     safe-buffer "^5.1.1"
 
+node-fetch@1.6.3:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.6.3.tgz#dc234edd6489982d58e8f0db4f695029abcd8c04"
+  integrity sha1-3CNO3WSJmC1Y6PDbT2lQKavNjAQ=
+  dependencies:
+    encoding "^0.1.11"
+    is-stream "^1.0.1"
+
 node-forge@0.7.5:
   version "0.7.5"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df"
@@ -6536,9 +7059,9 @@ node-gyp@^3.8.0:
     which "1"
 
 node-libs-browser@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df"
-  integrity sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
+  integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==
   dependencies:
     assert "^1.1.1"
     browserify-zlib "^0.2.0"
@@ -6547,10 +7070,10 @@ node-libs-browser@^2.0.0:
     constants-browserify "^1.0.0"
     crypto-browserify "^3.11.0"
     domain-browser "^1.1.1"
-    events "^1.0.0"
+    events "^3.0.0"
     https-browserify "^1.0.0"
     os-browserify "^0.3.0"
-    path-browserify "0.0.0"
+    path-browserify "0.0.1"
     process "^0.11.10"
     punycode "^1.2.4"
     querystring-es3 "^0.2.0"
@@ -6561,13 +7084,13 @@ node-libs-browser@^2.0.0:
     timers-browserify "^2.0.4"
     tty-browserify "0.0.0"
     url "^0.11.0"
-    util "^0.10.3"
-    vm-browserify "0.0.4"
+    util "^0.11.0"
+    vm-browserify "^1.0.1"
 
-node-pre-gyp@^0.10.0:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
-  integrity sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==
+node-pre-gyp@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149"
+  integrity sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==
   dependencies:
     detect-libc "^1.0.2"
     mkdirp "^0.5.1"
@@ -6580,17 +7103,17 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.1.11:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.11.tgz#9a0841a4b0d92b7d5141ed179e764f42ad22724a"
-  integrity sha512-8v1j5KfP+s5WOTa1spNUAOfreajQPN12JXbRR0oDE+YrJBQCXBnNqUDj27EKpPLOoSiU3tKi3xGPB+JaOdUEQQ==
+node-releases@^1.1.14, node-releases@^1.1.23:
+  version "1.1.23"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.23.tgz#de7409f72de044a2fa59c097f436ba89c39997f0"
+  integrity sha512-uq1iL79YjfYC0WXoHbC/z28q/9pOl8kSHaXdWmAAc8No+bDwqkZbzIJz55g/MUsPgSGm9LZ7QSUbzTcH5tz47w==
   dependencies:
     semver "^5.3.0"
 
-node-sass@4.11.0, node-sass@^4.11.0:
-  version "4.11.0"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.11.0.tgz#183faec398e9cbe93ba43362e2768ca988a6369a"
-  integrity sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==
+node-sass@^4.12.0:
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.12.0.tgz#0914f531932380114a30cc5fa4fa63233a25f017"
+  integrity sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==
   dependencies:
     async-foreach "^0.1.3"
     chalk "^1.1.1"
@@ -6599,12 +7122,10 @@ node-sass@4.11.0, node-sass@^4.11.0:
     get-stdin "^4.0.1"
     glob "^7.0.3"
     in-publish "^2.0.0"
-    lodash.assign "^4.2.0"
-    lodash.clonedeep "^4.3.2"
-    lodash.mergewith "^4.6.0"
+    lodash "^4.17.11"
     meow "^3.7.0"
     mkdirp "^0.5.1"
-    nan "^2.10.0"
+    nan "^2.13.2"
     node-gyp "^3.8.0"
     npmlog "^4.0.0"
     request "^2.88.0"
@@ -6612,12 +7133,12 @@ node-sass@4.11.0, node-sass@^4.11.0:
     stdout-stream "^1.4.0"
     "true-case-path" "^1.0.2"
 
-nodemon@^1.18.10:
-  version "1.18.10"
-  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.10.tgz#3ba63f64eb4c283cf3e4f75f30817e9d4f393afe"
-  integrity sha512-we51yBb1TfEvZamFchRgcfLbVYgg0xlGbyXmOtbBzDwxwgewYS/YbZ5tnlnsH51+AoSTTsT3A2E/FloUbtH8cQ==
+nodemon@^1.19.1:
+  version "1.19.1"
+  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.19.1.tgz#576f0aad0f863aabf8c48517f6192ff987cd5071"
+  integrity sha512-/DXLzd/GhiaDXXbGId5BzxP1GlsqtMGM9zTmkWrgXtSqjKmGSbLicM/oAy4FR0YWm14jCHRwnR31AHS2dYFHrg==
   dependencies:
-    chokidar "^2.1.0"
+    chokidar "^2.1.5"
     debug "^3.1.0"
     ignore-by-default "^1.0.1"
     minimatch "^3.0.4"
@@ -6650,17 +7171,7 @@ nopt@~1.0.10:
   dependencies:
     abbrev "1"
 
-normalize-package-data@^2.3.0, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
-  integrity sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==
-  dependencies:
-    hosted-git-info "^2.1.4"
-    is-builtin-module "^1.0.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
+normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -6687,6 +7198,15 @@ normalize-range@^0.1.2:
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
   integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
 
+normalize-url@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"
+  integrity sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==
+  dependencies:
+    prepend-http "^2.0.0"
+    query-string "^5.0.1"
+    sort-keys "^2.0.0"
+
 npm-bundled@^1.0.1:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd"
@@ -6702,15 +7222,7 @@ npm-package-arg@6.1.0, npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
     semver "^5.5.0"
     validate-npm-package-name "^3.0.0"
 
-npm-packlist@^1.1.12:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.2.0.tgz#55a60e793e272f00862c7089274439a4cc31fc7f"
-  integrity sha512-7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ==
-  dependencies:
-    ignore-walk "^3.0.1"
-    npm-bundled "^1.0.1"
-
-npm-packlist@^1.1.6:
+npm-packlist@^1.1.12, npm-packlist@^1.1.6:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.1.tgz#19064cdf988da80ea3cee45533879d90192bbfbc"
   integrity sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==
@@ -6728,9 +7240,9 @@ npm-pick-manifest@^2.2.3:
     semver "^5.4.1"
 
 npm-registry-fetch@^3.8.0:
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-3.8.0.tgz#aa7d9a7c92aff94f48dba0984bdef4bd131c88cc"
-  integrity sha512-hrw8UMD+Nob3Kl3h8Z/YjmKamb1gf7D1ZZch2otrIXM3uFLB5vjEY6DhMlq80z/zZet6eETLbOXcuQudCB3Zpw==
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-3.9.0.tgz#44d841780e2833f06accb34488f8c7450d1a6856"
+  integrity sha512-srwmt8YhNajAoSAaDWndmZgx89lJwIZ1GWxOuckH4Coek4uHv5S+o/l9FLQe/awA+JwTnj4FJHldxhlXdZEBmw==
   dependencies:
     JSONStream "^1.3.4"
     bluebird "^3.5.1"
@@ -6771,6 +7283,13 @@ npm-run-path@^2.0.0:
     gauge "~2.7.3"
     set-blocking "~2.0.0"
 
+nth-check@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
+  integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==
+  dependencies:
+    boolbase "~1.0.0"
+
 null-check@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/null-check/-/null-check-1.0.0.tgz#977dffd7176012b9ec30d2a39db5cf72a0439edd"
@@ -6786,17 +7305,12 @@ number-is-nan@^1.0.0:
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
-oauth-sign@~0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-  integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=
-
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
   integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
-object-assign@^4.0.1, object-assign@^4.1.0:
+object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1, object-assign@latest:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -6815,10 +7329,15 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-keys@^1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
-  integrity sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==
+object-inspect@~1.4.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.4.1.tgz#37ffb10e71adaf3748d05f713b4c9452f402cbc4"
+  integrity sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==
+
+object-keys@^1.0.12, object-keys@^1.0.6:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
 object-visit@^1.0.0:
   version "1.0.1"
@@ -6846,10 +7365,10 @@ on-finished@~2.3.0:
   dependencies:
     ee-first "1.1.1"
 
-on-headers@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
-  integrity sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=
+on-headers@~1.0.1, on-headers@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
+  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
 
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
@@ -6865,17 +7384,44 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
+open@6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-6.2.0.tgz#7cf92cb961b5d8498b071e64098bf5e27f57230c"
+  integrity sha512-Vxf6HJkwrqmvh9UAID3MnMYXntbTxKLOSfOnO7LJdzPf3NE3KQYFNV0/Lcz2VAndbRFil58XVCyh8tiX11fiYw==
+  dependencies:
+    is-wsl "^1.1.0"
+
+open@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-6.3.0.tgz#60d0b845ee38fae0631f5d739a21bd40e3d2a527"
+  integrity sha512-6AHdrJxPvAXIowO/aIaeHZ8CeMdDf7qCyRNq8NwJpinmCdXhz+NZR7ie1Too94lpciCDsG+qHGO9Mt0svA4OqA==
+  dependencies:
+    is-wsl "^1.1.0"
+
+opencollective@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/opencollective/-/opencollective-1.0.3.tgz#aee6372bc28144583690c3ca8daecfc120dd0ef1"
+  integrity sha1-ruY3K8KBRFg2kMPKja7PwSDdDvE=
+  dependencies:
+    babel-polyfill "6.23.0"
+    chalk "1.1.3"
+    inquirer "3.0.6"
+    minimist "1.2.0"
+    node-fetch "1.6.3"
+    opn "4.0.2"
+
 opener@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed"
   integrity sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==
 
-opn@5.4.0, opn@^5.1.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.4.0.tgz#cb545e7aab78562beb11aa3bfabc7042e1761035"
-  integrity sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==
+opn@4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-4.0.2.tgz#7abc22e644dff63b0a96d5ab7f2790c0f01abc95"
+  integrity sha1-erwi5kTf9jsKltWrfyeQwPAavJU=
   dependencies:
-    is-wsl "^1.1.0"
+    object-assign "^4.0.1"
+    pinkie-promise "^2.0.0"
 
 opn@^5.5.0:
   version "5.5.0"
@@ -6884,6 +7430,13 @@ opn@^5.5.0:
   dependencies:
     is-wsl "^1.1.0"
 
+opn@latest:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-6.0.0.tgz#3c5b0db676d5f97da1233d1ed42d182bc5a27d2d"
+  integrity sha512-I9PKfIZC+e4RXZ/qr1RhgyCnGgYX0UEIlXgWnCOVACIvFgaC9rz6Won7xbdhoHrd8IIhV7YEpHjreNUNkqCGkQ==
+  dependencies:
+    is-wsl "^1.1.0"
+
 optimist@^0.6.1, optimist@~0.6.0:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
@@ -6892,6 +7445,18 @@ optimist@^0.6.1, optimist@~0.6.0:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
 
+optionator@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+  integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.4"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    wordwrap "~1.0.0"
+
 original@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
@@ -6916,24 +7481,23 @@ os-locale@^1.4.0:
   dependencies:
     lcid "^1.0.0"
 
-os-locale@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
-  integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==
-  dependencies:
-    execa "^0.7.0"
-    lcid "^1.0.0"
-    mem "^1.1.0"
-
-os-locale@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.0.1.tgz#3b014fbf01d87f60a1e5348d80fe870dc82c4620"
-  integrity sha512-7g5e7dmXPtzcP4bgsZ8ixDVqA7oWYuEz4lOSujeWyliPai4gfVDiFIcwBg3aGCPnmSGfzOKTK3ccPn0CKv3DBw==
+os-locale@^3.0.0, os-locale@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
+  integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
   dependencies:
-    execa "^0.10.0"
+    execa "^1.0.0"
     lcid "^2.0.0"
     mem "^4.0.0"
 
+os-name@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801"
+  integrity sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==
+  dependencies:
+    macos-release "^2.2.0"
+    windows-release "^3.1.0"
+
 os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
@@ -6957,22 +7521,22 @@ p-finally@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
-p-is-promise@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
-  integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=
+p-is-promise@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
+  integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
 
-p-limit@^1.0.0, p-limit@^1.1.0:
+p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
   integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
   dependencies:
     p-try "^1.0.0"
 
-p-limit@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.1.0.tgz#1d5a0d20fb12707c758a655f6bbc4386b5930d68"
-  integrity sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==
+p-limit@^2.0.0, p-limit@^2.1.0, p-limit@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2"
+  integrity sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==
   dependencies:
     p-try "^2.0.0"
 
@@ -6990,10 +7554,17 @@ p-locate@^3.0.0:
   dependencies:
     p-limit "^2.0.0"
 
-p-map@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
-  integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  dependencies:
+    p-limit "^2.2.0"
+
+p-map@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
+  integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
 
 p-try@^1.0.0:
   version "1.0.0"
@@ -7001,9 +7572,9 @@ p-try@^1.0.0:
   integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
 
 p-try@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
-  integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
 package-json@^4.0.0:
   version "4.0.1"
@@ -7015,10 +7586,10 @@ package-json@^4.0.0:
     registry-url "^3.0.3"
     semver "^5.1.0"
 
-pacote@9.4.0:
-  version "9.4.0"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.4.0.tgz#af979abdeb175cd347c3e33be3241af1ed254807"
-  integrity sha512-WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w==
+pacote@9.5.0:
+  version "9.5.0"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.5.0.tgz#85f3013a3f6dd51c108b0ccabd3de8102ddfaeda"
+  integrity sha512-aUplXozRbzhaJO48FaaeClmN+2Mwt741MC6M3bevIGZwdCaP7frXzbUOfOWa91FPHoLITzG0hYaKY363lxO3bg==
   dependencies:
     bluebird "^3.5.3"
     cacache "^11.3.2"
@@ -7048,10 +7619,15 @@ pacote@9.4.0:
     unique-filename "^1.1.1"
     which "^1.3.1"
 
+pako@^0.2.5:
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
+  integrity sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=
+
 pako@~1.0.2, pako@~1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
-  integrity sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732"
+  integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==
 
 parallel-transform@^1.1.0:
   version "1.1.0"
@@ -7063,22 +7639,23 @@ parallel-transform@^1.1.0:
     readable-stream "^2.1.5"
 
 parent-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.0.tgz#df250bdc5391f4a085fb589dad761f5ad6b865b5"
-  integrity sha512-8Mf5juOMmiE4FcmzYc4IaiS9L3+9paz2KOiXzkRviCP6aDmN49Hz6EMWz0lGNp9pX80GvvAuLADtyGfW/Em3TA==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
+  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
   dependencies:
     callsites "^3.0.0"
 
 parse-asn1@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.0.tgz#37c4f9b7ed3ab65c74817b5f2480937fbf97c712"
-  integrity sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.4.tgz#37f6628f823fbdeb2273b4d540434a22f3ef1fcc"
+  integrity sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==
   dependencies:
     asn1.js "^4.0.0"
     browserify-aes "^1.0.0"
     create-hash "^1.1.0"
     evp_bytestokey "^1.0.0"
     pbkdf2 "^3.0.3"
+    safe-buffer "^5.1.1"
 
 parse-github-repo-url@^1.3.0:
   version "1.4.1"
@@ -7100,11 +7677,23 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
+parse-node-version@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
+  integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
+
 parse5@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
   integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
 
+parse5@^3.0.1:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c"
+  integrity sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==
+  dependencies:
+    "@types/node" "*"
+
 parseqs@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
@@ -7119,20 +7708,20 @@ parseuri@0.0.5:
   dependencies:
     better-assert "~1.0.0"
 
-parseurl@~1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
-  integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=
+parseurl@~1.3.2, parseurl@~1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
 
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
   integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
 
-path-browserify@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
-  integrity sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=
+path-browserify@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
+  integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==
 
 path-dirname@^1.0.0:
   version "1.0.2"
@@ -7151,12 +7740,17 @@ path-exists@^3.0.0:
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
   integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
 
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
 path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-is-inside@^1.0.1:
+path-is-inside@^1.0.1, path-is-inside@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
   integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
@@ -7166,11 +7760,6 @@ path-key@^2.0.0, path-key@^2.0.1:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
-path-parse@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
-  integrity sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=
-
 path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
@@ -7190,13 +7779,6 @@ path-type@^1.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-path-type@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
-  integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=
-  dependencies:
-    pify "^2.0.0"
-
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
@@ -7204,10 +7786,17 @@ path-type@^3.0.0:
   dependencies:
     pify "^3.0.0"
 
+pause-stream@0.0.11:
+  version "0.0.11"
+  resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"
+  integrity sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=
+  dependencies:
+    through "~2.3"
+
 pbkdf2@^3.0.3:
-  version "3.0.14"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.14.tgz#a35e13c64799b06ce15320f459c230e68e73bade"
-  integrity sha512-gjsZW9O34fm0R7PaLHRJmLLVfSoesxztjPjE9o6R+qtVJij90ltg1joIovN9GKrRW3t1PzhDDG3UMEMFfZ+1wA==
+  version "3.0.17"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
+  integrity sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==
   dependencies:
     create-hash "^1.1.2"
     create-hmac "^1.1.4"
@@ -7215,6 +7804,25 @@ pbkdf2@^3.0.3:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
+pdfkit@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/pdfkit/-/pdfkit-0.10.0.tgz#88f2aa8e3cf9e1cc2caff6447b68dd4e435cb284"
+  integrity sha512-mRJ6iuDzpIQ4ftKp5GvijLXNVRK86xjnyIPBraYSPrUPubNqWM5/oYmc7FZKUWz3wusRTj3PLR9HJ1X5ooqfsg==
+  dependencies:
+    crypto-js "^3.1.9-1"
+    fontkit "^1.0.0"
+    linebreak "^0.3.0"
+    png-js ">=0.1.0"
+
+pdfmake@^0.1.53:
+  version "0.1.57"
+  resolved "https://registry.yarnpkg.com/pdfmake/-/pdfmake-0.1.57.tgz#408e9853777fb851eeb700aaa221905e135917a0"
+  integrity sha512-s6Bs71Ylh06yNgJfP61xicHZSEvFrwo8lvI/BOU4+6eDddO8lwOZi5A42RA0V8zQr6hrI1XYxtLkk/7oJ+5w+w==
+  dependencies:
+    iconv-lite "^0.4.24"
+    linebreak "^0.3.0"
+    pdfkit "^0.10.0"
+
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
@@ -7235,6 +7843,11 @@ pify@^3.0.0:
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
   integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
 
+pify@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
+  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
+
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
@@ -7247,13 +7860,6 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
-pkg-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
-  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
-  dependencies:
-    find-up "^2.1.0"
-
 pkg-dir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
@@ -7261,6 +7867,13 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
+pkg-dir@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
+  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
+  dependencies:
+    find-up "^4.0.0"
+
 please-upgrade-node@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz#ed320051dfcc5024fae696712c8288993595e8ac"
@@ -7268,10 +7881,15 @@ please-upgrade-node@^3.1.1:
   dependencies:
     semver-compare "^1.0.0"
 
-portfinder@^1.0.9:
-  version "1.0.17"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.17.tgz#a8a1691143e46c4735edefcf4fbcccedad26456a"
-  integrity sha512-syFcRIRzVI1BoEFOCaAiizwDolh1S1YXSodsVhncbhjzjZQulhczNRbqnUl9N31Q4dKGOXsNDqxC2BWBgSMqeQ==
+png-js@>=0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/png-js/-/png-js-0.1.1.tgz#1cc7c212303acabe74263ec3ac78009580242d93"
+  integrity sha1-HMfCEjA6yr50Jj7DrHgAlYAkLZM=
+
+portfinder@^1.0.20:
+  version "1.0.20"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
+  integrity sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==
   dependencies:
     async "^1.5.2"
     debug "^2.2.0"
@@ -7293,11 +7911,11 @@ postcss-import@12.0.1:
     resolve "^1.1.7"
 
 postcss-load-config@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.0.0.tgz#f1312ddbf5912cd747177083c5ef7a19d62ee484"
-  integrity sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.0.tgz#c84d692b7bb7b41ddced94ee62e8ab31b417b003"
+  integrity sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==
   dependencies:
-    cosmiconfig "^4.0.0"
+    cosmiconfig "^5.0.0"
     import-cwd "^2.0.0"
 
 postcss-loader@3.0.0:
@@ -7310,17 +7928,12 @@ postcss-loader@3.0.0:
     postcss-load-config "^2.0.0"
     schema-utils "^1.0.0"
 
-postcss-value-parser@^3.2.3:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
-  integrity sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=
-
-postcss-value-parser@^3.3.1:
+postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss@7.0.14, postcss@^7.0.13:
+postcss@7.0.14:
   version "7.0.14"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"
   integrity sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==
@@ -7329,29 +7942,39 @@ postcss@7.0.14, postcss@^7.0.13:
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
-postcss@^7.0.0, postcss@^7.0.1:
-  version "7.0.13"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.13.tgz#42bf716413e8f1c786ab71dc6e722b3671b16708"
-  integrity sha512-h8SY6kQTd1wISHWjz+E6cswdhMuyBZRb16pSTv3W4zYZ3/YbyWeJdNUeOXB5IdZqE1U76OUEjjjqsC3z2f3hVg==
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14:
+  version "7.0.17"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz#4da1bdff5322d4a0acaab4d87f3e782436bad31f"
+  integrity sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
+
 prepend-http@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
   integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
 
-prettier@1.16.4:
-  version "1.16.4"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.4.tgz#73e37e73e018ad2db9c76742e2647e21790c9717"
-  integrity sha512-ZzWuos7TI5CKUeQAtFd6Zhm2s6EpAD/ZLApIhsF9pRvRtM1RFo61dM/4MSRUA0SuLugA/zgrZD8m0BaY46Og7g==
+prepend-http@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
+  integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
+
+prettier@1.18.2:
+  version "1.18.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"
+  integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==
 
-pretty-quick@^1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-1.10.0.tgz#d86cc46fe92ed8cfcfba6a082ec5949c53858198"
-  integrity sha512-uNvm2N3UWmnZRZrClyQI45hIbV20f5BpSyZY51Spbvn4APp9+XLyX4bCjWRGT3fGyVyQ/2/iw7dbQq1UUaq7SQ==
+pretty-quick@^1.11.1:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-1.11.1.tgz#462ffa2b93d24c05b7a0c3a001e08601a0c55ee4"
+  integrity sha512-kSXCkcETfak7EQXz6WOkCeCqpbC4GIzrN/vaneTGMP/fAtD8NerA9bPhCUqHAks1geo7biZNl5uEMPceeneLuA==
   dependencies:
     chalk "^2.3.0"
     execa "^0.8.0"
@@ -7365,15 +7988,10 @@ private@^0.1.6, private@^0.1.8:
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
   integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
 
-process-nextick-args@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
-  integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=
-
 process-nextick-args@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
-  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
 process@^0.11.10:
   version "0.11.10"
@@ -7408,11 +8026,10 @@ protoduck@^5.0.1:
     genfun "^5.0.0"
 
 protractor@~5.4.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.4.1.tgz#011a99e38df7aa45d22455b889ffbb13a6ce0bd9"
-  integrity sha512-ORey5ewQMYiXQxcQohsqEiKYOg/r5yJoJbt0tuROmmgajdg/CA3gTOZNIFJncUVMAJIk5YFqBBLUjKVmQO6tfA==
+  version "5.4.2"
+  resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.4.2.tgz#329efe37f48b2141ab9467799be2d4d12eb48c13"
+  integrity sha512-zlIj64Cr6IOWP7RwxVeD8O4UskLYPoyIcg0HboWJL9T79F1F0VWtKkGTr/9GN6BKL+/Q/GmM7C9kFVCfDbP5sA==
   dependencies:
-    "@types/node" "^6.0.46"
     "@types/q" "^0.0.32"
     "@types/selenium-webdriver" "^3.0.0"
     blocking-proxy "^1.0.0"
@@ -7429,13 +8046,18 @@ protractor@~5.4.0:
     webdriver-js-extender "2.1.0"
     webdriver-manager "^12.0.6"
 
-proxy-addr@~2.0.3, proxy-addr@~2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93"
-  integrity sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==
+proxy-addr@~2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"
+  integrity sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==
   dependencies:
     forwarded "~0.1.2"
-    ipaddr.js "1.8.0"
+    ipaddr.js "1.9.0"
+
+proxy-middleware@latest:
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/proxy-middleware/-/proxy-middleware-0.15.0.tgz#a3fdf1befb730f951965872ac2f6074c61477a56"
+  integrity sha1-o/3xvvtzD5UZZYcqwvYHTGFHelY=
 
 prr@~1.0.1:
   version "1.0.1"
@@ -7448,27 +8070,28 @@ pseudomap@^1.0.2:
   integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
 psl@^1.1.24:
-  version "1.1.29"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
-  integrity sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==
+  version "1.1.33"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.33.tgz#5533d9384ca7aab86425198e10e8053ebfeab661"
+  integrity sha512-LTDP2uSrsc7XCb5lO7A8BI1qYxRe/8EqlRvMeEl6rsnYAqDOl8xHR+8lSAIVfrNaSAlTPTNOCgNjWcoUL3AZsw==
 
 pstree.remy@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.6.tgz#73a55aad9e2d95814927131fbf4dc1b62d259f47"
-  integrity sha512-NdF35+QsqD7EgNEI5mkI/X+UwaxVEbQaz9f4IooEmMUv6ZPmlTQYGjBPJGgrlzNdjSvIy4MWMg6Q6vCgBO2K+w==
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.7.tgz#c76963a28047ed61542dc361aa26ee55a7fa15f3"
+  integrity sha512-xsMgrUwRpuGskEzBFkH8NmTimbZ5PcPup0LA8JJkHIm2IMUbQcpo3yeLNWVrufEYjh8YwtSVh0xz6UeWc5Oh5A==
 
 public-encrypt@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6"
-  integrity sha1-OfaZ86RlYN1eusvKaTyvfGXBjMY=
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
+  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
   dependencies:
     bn.js "^4.1.0"
     browserify-rsa "^4.0.0"
     create-hash "^1.1.0"
     parse-asn1 "^5.0.0"
     randombytes "^2.0.1"
+    safe-buffer "^5.1.2"
 
-pump@^2.0.0, pump@^2.0.1:
+pump@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
   integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
@@ -7531,25 +8154,34 @@ q@^1.0.1, q@^1.4.1, q@^1.5.1:
   integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
 qjobs@^1.1.4:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.1.5.tgz#659de9f2cf8dcc27a1481276f205377272382e73"
-  integrity sha1-ZZ3p8s+NzCehSBJ28gU3cnI4LnM=
-
-qs@6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
-  integrity sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
+  integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
 
-qs@6.5.2, qs@~6.5.1, qs@~6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+qs@6.7.0:
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
+  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
 
 qs@^1.2.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-1.2.2.tgz#19b57ff24dc2a99ce1f8bdf6afcda59f8ef61f88"
   integrity sha1-GbV/8k3CqZzh+L32r82ln472H4g=
 
+qs@~6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+
+query-string@^5.0.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
+  integrity sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==
+  dependencies:
+    decode-uri-component "^0.2.0"
+    object-assign "^4.1.0"
+    strict-uri-encode "^1.0.0"
+
 querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
@@ -7560,54 +8192,58 @@ querystring@0.2.0:
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
   integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
-querystringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.0.0.tgz#fa3ed6e68eb15159457c89b37bc6472833195755"
-  integrity sha512-eTPo5t/4bgaMNZxyjWx6N2a6AuE0mq51KWvpc7nU/MAqixcI6v6KrGUKES0HaomdnolQBBXU/++X6/QQ9KL4tw==
+querystringify@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
+  integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==
 
 quick-lru@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
   integrity sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=
 
+quote-stream@^1.0.1, quote-stream@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/quote-stream/-/quote-stream-1.0.2.tgz#84963f8c9c26b942e153feeb53aae74652b7e0b2"
+  integrity sha1-hJY/jJwmuULhU/7rU6rnRlK34LI=
+  dependencies:
+    buffer-equal "0.0.1"
+    minimist "^1.1.3"
+    through2 "^2.0.0"
+
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
-  integrity sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
+  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
   dependencies:
     safe-buffer "^5.1.0"
 
 randomfill@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.3.tgz#b96b7df587f01dd91726c418f30553b1418e3d62"
-  integrity sha512-YL6GrhrWoic0Eq8rXVbMptH7dAxCs0J+mh5Y0euNekPPYaxEmdVGim6GdoxoRzKW2yJoU8tueifS7mYxvcFDEQ==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
+  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
   dependencies:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
 
-range-parser@^1.0.3, range-parser@^1.2.0, range-parser@~1.2.0:
+range-parser@^1.0.3, range-parser@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
   integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
 
-raw-body@2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89"
-  integrity sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=
-  dependencies:
-    bytes "3.0.0"
-    http-errors "1.6.2"
-    iconv-lite "0.4.19"
-    unpipe "1.0.0"
+range-parser@^1.2.1, range-parser@~1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
-  integrity sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==
+raw-body@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
+  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
   dependencies:
-    bytes "3.0.0"
-    http-errors "1.6.3"
-    iconv-lite "0.4.23"
+    bytes "3.1.0"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
     unpipe "1.0.0"
 
 raw-loader@1.0.0:
@@ -7635,6 +8271,29 @@ read-cache@^1.0.0:
   dependencies:
     pify "^2.3.0"
 
+read-package-json@^2.0.0:
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.13.tgz#2e82ebd9f613baa6d2ebe3aa72cefe3f68e41f4a"
+  integrity sha512-/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg==
+  dependencies:
+    glob "^7.1.1"
+    json-parse-better-errors "^1.0.1"
+    normalize-package-data "^2.0.0"
+    slash "^1.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.2"
+
+read-package-tree@5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.2.2.tgz#4b6a0ef2d943c1ea36a578214c9a7f6b7424f7a8"
+  integrity sha512-rW3XWUUkhdKmN2JKB4FL563YAgtINifso5KShykufR03nJ5loGFlkUMe1g/yxmqX073SoYYTsgXu7XdDinKZuA==
+  dependencies:
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
+    once "^1.3.0"
+    read-package-json "^2.0.0"
+    readdir-scoped-modules "^1.0.0"
+
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -7643,14 +8302,6 @@ read-pkg-up@^1.0.1:
     find-up "^1.0.0"
     read-pkg "^1.0.0"
 
-read-pkg-up@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
-  integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=
-  dependencies:
-    find-up "^2.0.0"
-    read-pkg "^2.0.0"
-
 read-pkg-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
@@ -7668,15 +8319,6 @@ read-pkg@^1.0.0:
     normalize-package-data "^2.3.2"
     path-type "^1.0.0"
 
-read-pkg@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
-  integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=
-  dependencies:
-    load-json-file "^2.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^2.0.0"
-
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
@@ -7686,16 +8328,17 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-read-pkg@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-4.0.1.tgz#963625378f3e1c4d48c85872b5a6ec7d5d093237"
-  integrity sha1-ljYlN48+HE1IyFhytabsfV0JMjc=
+read-pkg@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.1.1.tgz#5cf234dde7a405c90c88a519ab73c467e9cb83f5"
+  integrity sha512-dFcTLQi6BZ+aFUaICg7er+/usEoqFdQxiEBsEMNGoipenihtxxtdrQuBXvyANCEI8VuUIVYFgeHGx9sLLvim4w==
   dependencies:
-    normalize-package-data "^2.3.2"
+    "@types/normalize-package-data" "^2.4.0"
+    normalize-package-data "^2.5.0"
     parse-json "^4.0.0"
-    pify "^3.0.0"
+    type-fest "^0.4.1"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.3, readable-stream@~2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
@@ -7708,39 +8351,24 @@ read-pkg@^4.0.1:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
-  integrity sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.0.3"
-    util-deprecate "~1.0.1"
-
-readable-stream@^3.0.6:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.1.1.tgz#ed6bbc6c5ba58b090039ff18ce670515795aeb06"
-  integrity sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==
+"readable-stream@2 || 3", readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.1.1:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc"
+  integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==
   dependencies:
     inherits "^2.0.3"
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@~2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
-  integrity sha1-j5A0HmilPMySh4jaz80Rs265t44=
+readdir-scoped-modules@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
+  integrity sha1-n6+jfShr5dksuuve4DDcm19AZ0c=
   dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    string_decoder "~0.10.x"
-    util-deprecate "~1.0.1"
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
+    graceful-fs "^4.1.2"
+    once "^1.3.0"
 
 readdirp@^2.0.0, readdirp@^2.2.1:
   version "2.2.1"
@@ -7775,16 +8403,16 @@ redent@^2.0.0:
     strip-indent "^2.0.0"
 
 reflect-metadata@^0.1.2:
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.12.tgz#311bf0c6b63cd782f228a81abe146a2bfa9c56f2"
-  integrity sha512-n+IyV+nGz3+0q3/Yf1ra12KpCyi001bi4XFxSjbiWWjfqb52iTTtpGXmCCAOWWIAn9KEuFZKGqBERHmrtScZ3A==
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08"
+  integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==
 
 regenerate@^1.2.1:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f"
-  integrity sha512-jVpo1GadrDAK59t/0jRx5VxYWQEDkkEKi6+HjE3joFVLfDOh9Xrdh0dF1eSq+BI/SwvTQ44gSscJ8N5zYL61sg==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
+  integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
 
-regenerator-runtime@^0.10.5:
+regenerator-runtime@^0.10.0, regenerator-runtime@^0.10.5:
   version "0.10.5"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
   integrity sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=
@@ -7794,6 +8422,11 @@ regenerator-runtime@^0.11.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
   integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
+regenerator-runtime@^0.13.2:
+  version "0.13.2"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447"
+  integrity sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==
+
 regenerator-transform@^0.10.0:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd"
@@ -7830,9 +8463,9 @@ regexpu-core@^2.0.0:
     regjsparser "^0.1.4"
 
 registry-auth-token@^3.0.1:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"
-  integrity sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.4.0.tgz#d7446815433f5d5ed6431cd5dca21048f66b397e"
+  integrity sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==
   dependencies:
     rc "^1.1.6"
     safe-buffer "^5.0.1"
@@ -7878,34 +8511,6 @@ repeating@^2.0.0:
   dependencies:
     is-finite "^1.0.0"
 
-request@^2.78.0:
-  version "2.83.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
-  integrity sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.6.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.1"
-    forever-agent "~0.6.1"
-    form-data "~2.3.1"
-    har-validator "~5.0.3"
-    hawk "~6.0.2"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.17"
-    oauth-sign "~0.8.2"
-    performance-now "^2.1.0"
-    qs "~6.5.1"
-    safe-buffer "^5.1.1"
-    stringstream "~0.0.5"
-    tough-cookie "~2.3.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.1.0"
-
 request@^2.83.0, request@^2.87.0, request@^2.88.0:
   version "2.88.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
@@ -7937,17 +8542,17 @@ require-directory@^2.1.1:
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
-require-from-string@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
-  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
-
 require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
   integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
 
-requires-port@1.x.x, requires-port@^1.0.0:
+require-main-filename@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+
+requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
@@ -7959,56 +8564,45 @@ resolve-cwd@^2.0.0:
   dependencies:
     resolve-from "^3.0.0"
 
-resolve-from@4.0.0, resolve-from@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
-  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
+resolve-from@5.0.0, resolve-from@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
   integrity sha1-six699nWiBvItuZTM17rywoYh0g=
 
-resolve-global@0.1.0, resolve-global@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/resolve-global/-/resolve-global-0.1.0.tgz#8fb02cfd5b7db20118e886311f15af95bd15fbd9"
-  integrity sha1-j7As/Vt9sgEY6IYxHxWvlb0V+9k=
+resolve-from@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
+
+resolve-global@1.0.0, resolve-global@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-global/-/resolve-global-1.0.0.tgz#a2a79df4af2ca3f49bf77ef9ddacd322dad19255"
+  integrity sha512-zFa12V4OLtT5XUX/Q4VLvTfBf+Ok0SPc1FNGM/z9ctUdiU618qwKpWnd0CHs3+RqROfyEg/DhuHbMWYqcgljEw==
   dependencies:
-    global-dirs "^0.1.0"
+    global-dirs "^0.1.1"
 
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.1.6:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.9.0.tgz#a14c6fdfa8f92a7df1d996cb7105fa744658ea06"
-  integrity sha512-TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ==
-  dependencies:
-    path-parse "^1.0.6"
-
-resolve@^1.1.7:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
-  integrity sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==
-  dependencies:
-    path-parse "^1.0.5"
+resolve@1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+  integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@^1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
-  integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==
+resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.2:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.0.tgz#4014870ba296176b86343d50b60f3b50609ce232"
+  integrity sha512-WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw==
   dependencies:
     path-parse "^1.0.6"
 
-resolve@^1.3.2:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
-  integrity sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==
-  dependencies:
-    path-parse "^1.0.5"
-
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
@@ -8017,6 +8611,13 @@ restore-cursor@^2.0.0:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
+restructure@^0.5.3:
+  version "0.5.4"
+  resolved "https://registry.yarnpkg.com/restructure/-/restructure-0.5.4.tgz#f54e7dd563590fb34fd6bf55876109aeccb28de8"
+  integrity sha1-9U591WNZD7NP1r9Vh2EJrsyyjeg=
+  dependencies:
+    browserify-optional "^1.0.0"
+
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -8028,30 +8629,23 @@ retry@^0.10.0:
   integrity sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=
 
 rfdc@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.2.tgz#e6e72d74f5dc39de8f538f65e00c36c18018e349"
-  integrity sha512-92ktAgvZhBzYTIK0Mja9uen5q5J3NRVMoDkJL2VMwq6SXjVCgqvQeVP2XAaUY6HT+XpQYeLSjb3UoitBryKmdA==
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.4.tgz#ba72cc1367a0ccd9cf81a870b3b58bd3ad07f8c2"
+  integrity sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==
 
-rimraf@2, rimraf@^2.5.2, rimraf@^2.6.1, rimraf@~2.6.2:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3, rimraf@~2.6.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
   integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
   dependencies:
     glob "^7.1.3"
 
-rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
-  integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
-  dependencies:
-    glob "^7.0.5"
-
 ripemd160@^2.0.0, ripemd160@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.1.tgz#0f4584295c53a3628af7e6d79aca21ce57d1c6e7"
-  integrity sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
+  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
   dependencies:
-    hash-base "^2.0.0"
+    hash-base "^3.0.0"
     inherits "^2.0.1"
 
 run-async@^2.2.0:
@@ -8073,19 +8667,26 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rxjs@6.3.3, rxjs@^6.1.0, rxjs@~6.3.3:
-  version "6.3.3"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
-  integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==
+rx@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
+  integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=
+
+rxjs@6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
+  integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
   dependencies:
     tslib "^1.9.0"
 
-safe-buffer@5.1.1, safe-buffer@^5.1.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-  integrity sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==
+rxjs@^6.4.0, rxjs@~6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7"
+  integrity sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==
+  dependencies:
+    tslib "^1.9.0"
 
-safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@5.1.2, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
@@ -8124,6 +8725,13 @@ sass-loader@7.1.0:
     pify "^3.0.0"
     semver "^5.5.0"
 
+sass@1.19.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.19.0.tgz#5de82c713d4299fac57384ef5219534a37fe3e6c"
+  integrity sha512-8kzKCgxCzh8/zEn3AuRwzLWVSSFj8omkiGwqdJdeOufjM+I88dXxu9LYJ/Gw4rRTHXesN0r1AixBuqM6yLQUJw==
+  dependencies:
+    chokidar "^2.0.0"
+
 saucelabs@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/saucelabs/-/saucelabs-1.5.0.tgz#9405a73c360d449b232839919a86c396d379fd9d"
@@ -8148,14 +8756,6 @@ schema-utils@^0.3.0:
   dependencies:
     ajv "^5.0.0"
 
-schema-utils@^0.4.4:
-  version "0.4.7"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
-  integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
-  dependencies:
-    ajv "^6.1.0"
-    ajv-keywords "^3.1.0"
-
 schema-utils@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
@@ -8188,10 +8788,10 @@ selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1:
     tmp "0.0.30"
     xml2js "^0.4.17"
 
-selfsigned@^1.9.1:
-  version "1.10.3"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.3.tgz#d628ecf9e3735f84e8bafba936b3cf85bea43823"
-  integrity sha512-vmZenZ+8Al3NLHkWnhBQ0x6BkML1eCP2xEi3JE+f3D9wW9fipD9NNJHYtE9XJM4TsPaHGZJIamrSI6MTg1dU2Q==
+selfsigned@^1.10.4:
+  version "1.10.4"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.4.tgz#cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"
+  integrity sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==
   dependencies:
     node-forge "0.7.5"
 
@@ -8221,25 +8821,30 @@ semver-intersect@1.4.0:
   dependencies:
     semver "^5.0.0"
 
-"semver@2 || 3 || 4 || 5", semver@5.6.0, semver@^5.0.3, semver@^5.1.0, semver@^5.2.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
-  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
+"semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
+  integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
 
-semver@^5.0.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
-  integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==
+semver@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
+  integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==
+
+semver@^6.0.0:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b"
+  integrity sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==
 
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
   integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
 
-send@0.16.2:
-  version "0.16.2"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
-  integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==
+send@0.17.1, send@latest:
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
+  integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
   dependencies:
     debug "2.6.9"
     depd "~1.1.2"
@@ -8248,19 +8853,24 @@ send@0.16.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"
+    http-errors "~1.7.2"
+    mime "1.6.0"
+    ms "2.1.1"
     on-finished "~2.3.0"
-    range-parser "~1.2.0"
-    statuses "~1.4.0"
+    range-parser "~1.2.1"
+    statuses "~1.5.0"
 
 serialize-javascript@^1.4.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
   integrity sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==
 
-serve-index@^1.7.2:
+serialize-javascript@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.7.0.tgz#d6e0dfb2a3832a8c94468e6eb1db97e55a192a65"
+  integrity sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==
+
+serve-index@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
   integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
@@ -8273,21 +8883,26 @@ serve-index@^1.7.2:
     mime-types "~2.1.17"
     parseurl "~1.3.2"
 
-serve-static@1.13.2:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
-  integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
+serve-static@1.14.1:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
+  integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
   dependencies:
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
-    parseurl "~1.3.2"
-    send "0.16.2"
+    parseurl "~1.3.3"
+    send "0.17.1"
 
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
+set-immediate-shim@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
+  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
+
 set-value@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
@@ -8313,20 +8928,20 @@ setimmediate@^1.0.4:
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
   integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
 
-setprototypeof@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
-  integrity sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=
-
 setprototypeof@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
   integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
 
+setprototypeof@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
+  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
+
 sha.js@^2.4.0, sha.js@^2.4.8:
-  version "2.4.10"
-  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.10.tgz#b1fde5cd7d11a5626638a07c604ab909cfa31f9b"
-  integrity sha512-vnwmrFDlOExK4Nm16J2KMWHLrp14lBrjxMxBJpu++EnsuBmpiYaM/MEs46Vxxm/4FvdP5yTwuCTO9it5FSjrqA==
+  version "2.4.11"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
+  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -8340,6 +8955,11 @@ shallow-clone@^1.0.0:
     kind-of "^5.0.0"
     mixin-object "^2.0.1"
 
+shallow-copy@~0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/shallow-copy/-/shallow-copy-0.0.1.tgz#415f42702d73d810330292cc5ee86eae1a11a170"
+  integrity sha1-QV9CcC1z2BAzApLMXuhurhoRoXA=
+
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -8381,15 +9001,15 @@ slash@^1.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
   integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
-slash@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
-  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-smart-buffer@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.1.tgz#07ea1ca8d4db24eb4cac86537d7d18995221ace3"
-  integrity sha512-RFqinRVJVcCAL9Uh1oVqE6FZkqsyLiVOYEZ20TqIOjuX7iFVJ+zsbs4RIghnw/pTs7mZvt8ZHhvm1ZUrR4fykg==
+smart-buffer@4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.2.tgz#5207858c3815cc69110703c6b94e46c15634395d"
+  integrity sha512-JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw==
 
 snapdragon-node@^2.0.1:
   version "2.1.1"
@@ -8428,13 +9048,6 @@ snapsvg@^0.5.1:
   dependencies:
     eve "~0.5.1"
 
-sntp@2.x.x:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
-  integrity sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==
-  dependencies:
-    hoek "4.x.x"
-
 socket.io-adapter@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz#2a805e8a14d6372124dd9159ad4502f8cb07f06b"
@@ -8502,45 +9115,54 @@ sockjs@0.3.19:
     uuid "^3.0.1"
 
 socks-proxy-agent@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz#5936bf8b707a993079c6f37db2091821bffa6473"
-  integrity sha512-Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw==
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz#3c8991f3145b2799e70e11bd5fbc8b1963116386"
+  integrity sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==
   dependencies:
-    agent-base "~4.2.0"
-    socks "~2.2.0"
+    agent-base "~4.2.1"
+    socks "~2.3.2"
 
-socks@~2.2.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.2.2.tgz#f061219fc2d4d332afb4af93e865c84d3fa26e2b"
-  integrity sha512-g6wjBnnMOZpE0ym6e0uHSddz9p3a+WsBaaYQaBaSCJYvrC4IXykQR9MNGjLQf38e9iIIhp3b1/Zk8YZI3KGJ0Q==
+socks@~2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.2.tgz#ade388e9e6d87fdb11649c15746c578922a5883e"
+  integrity sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ==
   dependencies:
     ip "^1.1.5"
-    smart-buffer "^4.0.1"
+    smart-buffer "4.0.2"
 
-source-list-map@^2.0.0:
+sort-keys@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
-  integrity sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
+  integrity sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=
+  dependencies:
+    is-plain-obj "^1.0.0"
+
+source-list-map@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
+  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
 source-list-map@~0.1.7:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
   integrity sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=
 
-source-map-explorer@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/source-map-explorer/-/source-map-explorer-1.8.0.tgz#61cb8ffaff65d10ae2e6b60228fc625f523c41ff"
-  integrity sha512-1Q0lNSw5J7pChKmjqniOCLbvLFi4KJfrtixk99CzvRcqFiGBJvRHMrw0PjLwKOvbuAo8rNOukJhEPA0Nj85xDw==
+source-map-explorer@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/source-map-explorer/-/source-map-explorer-2.0.1.tgz#988721e8320d7b6925bc40289e5de658fe4cad4d"
+  integrity sha512-mv2sv2b6oN2L9n18O/eLrYiP5zfWEHESLq4utWBqNw8GnkbuRuXs8twVCOhMT5hxRzfQgS7Yxh7HlQaW8oeiAQ==
   dependencies:
     btoa "^1.2.1"
+    chalk "^2.4.2"
     convert-source-map "^1.6.0"
-    docopt "^0.6.2"
-    ejs "^2.6.1"
-    fs-extra "^7.0.1"
-    glob "^7.1.3"
-    opn "^5.5.0"
-    source-map "^0.5.1"
+    ejs "^2.6.2"
+    escape-html "^1.0.3"
+    glob "^7.1.4"
+    lodash "^4.17.11"
+    open "^6.3.0"
+    source-map "^0.7.3"
     temp "^0.9.0"
+    yargs "^13.2.4"
 
 source-map-loader@0.2.4:
   version "0.2.4"
@@ -8561,10 +9183,10 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@0.5.10, source-map-support@~0.5.6:
-  version "0.5.10"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c"
-  integrity sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==
+source-map-support@0.5.12, source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.10:
+  version "0.5.12"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
+  integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -8576,28 +9198,12 @@ source-map-support@^0.4.15, source-map-support@~0.4.0:
   dependencies:
     source-map "^0.5.6"
 
-source-map-support@^0.5.5, source-map-support@^0.5.6:
-  version "0.5.9"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
-  integrity sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-support@~0.5.10:
-  version "0.5.11"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.11.tgz#efac2ce0800355d026326a0ca23e162aeac9a4e2"
-  integrity sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
   integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
-source-map@0.1.x:
+source-map@0.1.x, source-map@~0.1.30:
   version "0.1.43"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
   integrity sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=
@@ -8609,7 +9215,7 @@ source-map@0.5.6:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
   integrity sha1-dc449SvwczxafwwRjYEzSiu19BI=
 
-source-map@0.7.3:
+source-map@0.7.3, source-map@^0.7.3:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
@@ -8621,7 +9227,7 @@ source-map@^0.4.2, source-map@~0.4.1:
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.6, source-map@^0.5.7:
+source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
@@ -8631,7 +9237,7 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-sourcemap-codec@^1.4.1:
+sourcemap-codec@^1.4.1, sourcemap-codec@^1.4.4:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz#c63ea927c029dd6bd9a2b7fa03b3fec02ad56e9f"
   integrity sha512-CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg==
@@ -8658,9 +9264,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz#81c0ce8f21474756148bbb5f3bfc0f36bf15d76e"
-  integrity sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g==
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz#75ecd1a88de8c184ef015eafb51b5b48bfd11bb1"
+  integrity sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==
 
 spdy-transport@^3.0.0:
   version "3.0.0"
@@ -8685,10 +9291,10 @@ spdy@^4.0.0:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
-speed-measure-webpack-plugin@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.0.tgz#c7ffafef513df3d63d5d546c8fc1986dfc4969aa"
-  integrity sha512-b9Yd0TrzceMVYSbuamM1sFsGM1oVfyFTM22gOoyLhymNvBVApuYpkdFOgYkKJpN/KhTpcCYcTGHg7X+FJ33Vvw==
+speed-measure-webpack-plugin@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz#69840a5cdc08b4638697dac7db037f595d7f36a0"
+  integrity sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==
   dependencies:
     chalk "^2.0.1"
 
@@ -8706,6 +9312,13 @@ split2@^2.0.0:
   dependencies:
     through2 "^2.0.2"
 
+split@0.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"
+  integrity sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=
+  dependencies:
+    through "2"
+
 split@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
@@ -8713,7 +9326,7 @@ split@^1.0.0:
   dependencies:
     through "2"
 
-sprintf-js@^1.1.1:
+sprintf-js@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
   integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
@@ -8724,9 +9337,9 @@ sprintf-js@~1.0.2:
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 sshpk@^1.7.0:
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.0.tgz#1d4963a2fbffe58050aa9084ca20be81741c07de"
-  integrity sha512-Zhev35/y7hRMcID/upReIvRse+I9SVhyVre/KTJSJQWMz3C3+G+HpO7m1wK/yckEtujKZ7dS4hkVxAnmHaIGVQ==
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
@@ -8738,13 +9351,6 @@ sshpk@^1.7.0:
     safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
-ssri@^5.2.4:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
-  integrity sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==
-  dependencies:
-    safe-buffer "^5.1.1"
-
 ssri@^6.0.0, ssri@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
@@ -8752,23 +9358,32 @@ ssri@^6.0.0, ssri@^6.0.1:
   dependencies:
     figgy-pudding "^3.5.1"
 
-standard-version@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/standard-version/-/standard-version-5.0.2.tgz#39fc8ce9a2850cc70868a39f9a4c9661a4439beb"
-  integrity sha512-vvdWZySinwWU9UZhtgYUGGTkYzqrwYMw3c7CFJ17E7vMbAEqVSui/bm+ZcSukAAU2WmphPTWIKFmn8ni+lk4NA==
+standard-version@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/standard-version/-/standard-version-6.0.1.tgz#ad50e9770b73090d2f8f692e520d906813a3cefe"
+  integrity sha512-+09AwTbyLKyUwefiZSccgarp24okvH9A229NOVSpYTKWcxBxqZqdYmtQaJ8UET9mjPXRxP84vonJU4YMqCyBTQ==
+  dependencies:
+    chalk "2.4.2"
+    conventional-changelog "3.1.8"
+    conventional-changelog-config-spec "1.0.0"
+    conventional-recommended-bump "5.0.0"
+    detect-indent "6.0.0"
+    detect-newline "3.0.0"
+    dotgitignore "2.1.0"
+    figures "3.0.0"
+    find-up "3.0.0"
+    fs-access "1.0.1"
+    git-semver-tags "2.0.2"
+    semver "6.0.0"
+    stringify-package "1.0.0"
+    yargs "13.2.2"
+
+static-eval@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-2.0.2.tgz#2d1759306b1befa688938454c546b7871f806a42"
+  integrity sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==
   dependencies:
-    chalk "^2.4.1"
-    conventional-changelog "^3.0.6"
-    conventional-recommended-bump "^4.0.4"
-    detect-indent "^5.0.0"
-    detect-newline "^2.1.0"
-    dotgitignore "^2.1.0"
-    figures "^2.0.0"
-    fs-access "^1.0.0"
-    git-semver-tags "^2.0.2"
-    semver "^5.2.0"
-    stringify-package "^1.0.0"
-    yargs "^12.0.2"
+    escodegen "^1.8.1"
 
 static-extend@^0.1.1:
   version "0.1.2"
@@ -8778,6 +9393,26 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
+static-module@^2.2.0:
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/static-module/-/static-module-2.2.5.tgz#bd40abceae33da6b7afb84a0e4329ff8852bfbbf"
+  integrity sha512-D8vv82E/Kpmz3TXHKG8PPsCPg+RAX6cbCOyvjM6x04qZtQ47EtJFVwRsdov3n5d6/6ynrOY9XB4JkaZwB2xoRQ==
+  dependencies:
+    concat-stream "~1.6.0"
+    convert-source-map "^1.5.1"
+    duplexer2 "~0.1.4"
+    escodegen "~1.9.0"
+    falafel "^2.1.0"
+    has "^1.0.1"
+    magic-string "^0.22.4"
+    merge-source-map "1.0.4"
+    object-inspect "~1.4.0"
+    quote-stream "~1.0.2"
+    readable-stream "~2.3.3"
+    shallow-copy "~0.0.1"
+    static-eval "^2.0.0"
+    through2 "~2.0.3"
+
 stats-webpack-plugin@0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/stats-webpack-plugin/-/stats-webpack-plugin-0.7.0.tgz#ccffe9b745de8bbb155571e063f8263fc0e2bc06"
@@ -8785,21 +9420,11 @@ stats-webpack-plugin@0.7.0:
   dependencies:
     lodash "^4.17.4"
 
-"statuses@>= 1.3.1 < 2", "statuses@>= 1.4.0 < 2":
+"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
-statuses@~1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
-  integrity sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=
-
-statuses@~1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
-  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
-
 stdout-stream@^1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
@@ -8808,13 +9433,20 @@ stdout-stream@^1.4.0:
     readable-stream "^2.0.1"
 
 stream-browserify@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
-  integrity sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
+  integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==
   dependencies:
     inherits "~2.0.1"
     readable-stream "^2.0.2"
 
+stream-combiner@~0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14"
+  integrity sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=
+  dependencies:
+    duplexer "~0.1.1"
+
 stream-each@^1.1.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
@@ -8839,16 +9471,21 @@ stream-shift@^1.0.0:
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
   integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
 
-streamroller@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-1.0.3.tgz#cb51e7e382f799a9381a5d7490ce3053b325fba3"
-  integrity sha512-P7z9NwP51EltdZ81otaGAN3ob+/F88USJE546joNq7bqRNTe6jc74fTBDyynxP4qpIfKlt/CesEYicuMzI0yJg==
+streamroller@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-1.0.5.tgz#71660c20b06b1a7b204d46085731ad13c10a562d"
+  integrity sha512-iGVaMcyF5PcUY0cPbW3xFQUXnr9O4RZXNBBjhuLZgrjLO4XCLLGfx4T2sGqygSeylUjwgWRsnNbT9aV0Zb8AYw==
   dependencies:
-    async "^2.6.1"
+    async "^2.6.2"
     date-format "^2.0.0"
-    debug "^3.1.0"
-    fs-extra "^7.0.0"
-    lodash "^4.17.10"
+    debug "^3.2.6"
+    fs-extra "^7.0.1"
+    lodash "^4.17.11"
+
+strict-uri-encode@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
 
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
@@ -8867,6 +9504,15 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
+string-width@^3.0.0, string-width@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
+  dependencies:
+    emoji-regex "^7.0.1"
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^5.1.0"
+
 string.prototype.padend@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz#f3aaef7c1719f170c5eab1c32bf780d96e21f2f0"
@@ -8876,42 +9522,25 @@ string.prototype.padend@^3.0.0:
     es-abstract "^1.4.3"
     function-bind "^1.0.2"
 
-string_decoder@^1.0.0, string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
-string_decoder@^1.1.1:
+string_decoder@^1.0.0, string_decoder@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
   integrity sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==
   dependencies:
     safe-buffer "~5.1.0"
 
-string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
-
-string_decoder@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
-  integrity sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
   dependencies:
     safe-buffer "~5.1.0"
 
-stringify-package@^1.0.0:
+stringify-package@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.0.tgz#e02828089333d7d45cd8c287c30aa9a13375081b"
   integrity sha512-JIQqiWmLiEozOC0b0BtxZ/AOUtdUZHCBPgqIZ2kSJJqGwgb9neo44XdTHUC4HZSGqi03hOeB7W/E8rAlKnGe9g==
 
-stringstream@~0.0.5:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72"
-  integrity sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==
-
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -8926,12 +9555,12 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f"
-  integrity sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==
+strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
   dependencies:
-    ansi-regex "^4.0.0"
+    ansi-regex "^4.1.0"
 
 strip-bom@^2.0.0:
   version "2.0.0"
@@ -9001,7 +9630,7 @@ supports-color@^2.0.0:
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
   integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
-supports-color@^5.1.0, supports-color@^5.2.0, supports-color@^5.3.0, supports-color@^5.4.0:
+supports-color@^5.2.0, supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
@@ -9021,31 +9650,31 @@ symbol-observable@1.2.0:
   integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
 
 tapable@^1.0.0, tapable@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz#0d076a172e3d9ba088fd2272b2668fb8d194b78c"
-  integrity sha512-IlqtmLVaZA2qab8epUXbVWRn3aB1imbDMJtjB3nu4X0NqPkcY/JH9ZtCBWKHWPxs8Svi9tyo8w2dBoi07qZbBA==
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
+  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
 tar@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
-  integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40"
+  integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==
   dependencies:
     block-stream "*"
-    fstream "^1.0.2"
+    fstream "^1.0.12"
     inherits "2"
 
 tar@^4, tar@^4.4.8:
-  version "4.4.8"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"
-  integrity sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==
+  version "4.4.10"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.10.tgz#946b2810b9a5e0b26140cf78bea6b0b0d689eba1"
+  integrity sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==
   dependencies:
     chownr "^1.1.1"
     fs-minipass "^1.2.5"
-    minipass "^2.3.4"
-    minizlib "^1.1.1"
+    minipass "^2.3.5"
+    minizlib "^1.2.1"
     mkdirp "^0.5.0"
     safe-buffer "^5.1.2"
-    yallist "^3.0.2"
+    yallist "^3.0.3"
 
 temp@^0.9.0:
   version "0.9.0"
@@ -9061,10 +9690,10 @@ term-size@^1.2.0:
   dependencies:
     execa "^0.7.0"
 
-terser-webpack-plugin@1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.2.tgz#9bff3a891ad614855a7dde0d707f7db5a927e3d9"
-  integrity sha512-1DMkTk286BzmfylAvLXwpJrI7dWa5BnFmscV/2dCr8+c56egFcbaeFAl7+sujAjdmpLam21XRdhA4oifLyiWWg==
+terser-webpack-plugin@1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz#3f98bc902fac3e5d0de730869f50668561262ec8"
+  integrity sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==
   dependencies:
     cacache "^11.0.2"
     find-cache-dir "^2.0.0"
@@ -9076,18 +9705,20 @@ terser-webpack-plugin@1.2.2:
     worker-farm "^1.5.2"
 
 terser-webpack-plugin@^1.1.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.1.tgz#7545da9ae5f4f9ae6a0ac961eb46f5e7c845cc26"
-  integrity sha512-GGSt+gbT0oKcMDmPx4SRSfJPE1XaN3kQRWG4ghxKQw9cn5G9x6aCKSsgYdvyM0na9NJ4Drv0RG6jbBByZ5CMjw==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.3.0.tgz#69aa22426299f4b5b3775cbed8cb2c5d419aa1d4"
+  integrity sha512-W2YWmxPjjkUcOWa4pBEv4OP4er1aeQJlSo2UhtCFQCuRXEHjOFscO8VyWHj9JLlA0RzQb8Y2/Ta78XZvT54uGg==
   dependencies:
-    cacache "^11.0.2"
+    cacache "^11.3.2"
     find-cache-dir "^2.0.0"
+    is-wsl "^1.1.0"
+    loader-utils "^1.2.3"
     schema-utils "^1.0.0"
-    serialize-javascript "^1.4.0"
+    serialize-javascript "^1.7.0"
     source-map "^0.6.1"
-    terser "^3.8.1"
-    webpack-sources "^1.1.0"
-    worker-farm "^1.5.2"
+    terser "^4.0.0"
+    webpack-sources "^1.3.0"
+    worker-farm "^1.7.0"
 
 terser@^3.16.1:
   version "3.17.0"
@@ -9098,21 +9729,26 @@ terser@^3.16.1:
     source-map "~0.6.1"
     source-map-support "~0.5.10"
 
-terser@^3.8.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-3.14.1.tgz#cc4764014af570bc79c79742358bd46926018a32"
-  integrity sha512-NSo3E99QDbYSMeJaEk9YW2lTg3qS9V0aKGlb+PlOrei1X02r1wSBHCNX/O+yeTRFSWPKPIGj6MqvvdqV4rnVGw==
+terser@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.0.0.tgz#ef356f6f359a963e2cc675517f21c1c382877374"
+  integrity sha512-dOapGTU0hETFl1tCo4t56FN+2jffoKyER9qBGoUFyZ6y7WLoKT0bF+lAYi6B6YsILcGF3q1C2FBh8QcKSCgkgA==
   dependencies:
-    commander "~2.17.1"
+    commander "^2.19.0"
     source-map "~0.6.1"
-    source-map-support "~0.5.6"
+    source-map-support "~0.5.10"
 
 text-extensions@^1.0.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26"
   integrity sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==
 
-through2@^2.0.0, through2@^2.0.2:
+text-extensions@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-2.0.0.tgz#43eabd1b495482fae4a2bf65e5f56c29f69220f6"
+  integrity sha512-F91ZqLgvi1E0PdvmxMgp+gcf6q8fMH7mhdwWfzXnl1k+GbpQDmi8l7DzLC5JTASKbwpY3TfxajAUzAXcv2NmsQ==
+
+through2@^2.0.0, through2@^2.0.2, through2@~2.0.3:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
   integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
@@ -9120,15 +9756,27 @@ through2@^2.0.0, through2@^2.0.2:
     readable-stream "~2.3.6"
     xtend "~4.0.1"
 
-through@2, "through@>=2.2.7 <3", through@X.X.X, through@^2.3.6:
+through2@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a"
+  integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==
+  dependencies:
+    readable-stream "2 || 3"
+
+through@2, "through@>=2.2.7 <3", through@X.X.X, through@^2.3.6, through@~2.3, through@~2.3.1, through@~2.3.4:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
 thunky@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.2.tgz#a862e018e3fb1ea2ec3fce5d55605cf57f247371"
-  integrity sha1-qGLgGOP7HqLsP85dVWBc9X8kc3E=
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.3.tgz#f5df732453407b09191dae73e2a8cc73f381a826"
+  integrity sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==
+
+time-stamp@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
+  integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=
 
 timed-out@^4.0.0:
   version "4.0.1"
@@ -9142,6 +9790,11 @@ timers-browserify@^2.0.4:
   dependencies:
     setimmediate "^1.0.4"
 
+tiny-inflate@^1.0.0, tiny-inflate@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/tiny-inflate/-/tiny-inflate-1.0.2.tgz#93d9decffc8805bd57eae4310f0b745e9b6fb3a7"
+  integrity sha1-k9nez/yIBb1X6uQxDwt0Xptvs6c=
+
 tmp@0.0.30:
   version "0.0.30"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.30.tgz#72419d4a8be7d6ce75148fd8b324e593a711c2ed"
@@ -9201,6 +9854,11 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
+toidentifier@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
+  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
+
 touch@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b"
@@ -9208,13 +9866,6 @@ touch@^3.1.0:
   dependencies:
     nopt "~1.0.10"
 
-tough-cookie@~2.3.3:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
-  integrity sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==
-  dependencies:
-    punycode "^1.4.1"
-
 tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
@@ -9223,6 +9874,11 @@ tough-cookie@~2.4.3:
     psl "^1.1.24"
     punycode "^1.4.1"
 
+traverse@^0.6.6:
+  version "0.6.6"
+  resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137"
+  integrity sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=
+
 tree-kill@1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.1.tgz#5398f374e2f292b9dcc7b2e71e30a5c3bb6c743a"
@@ -9274,6 +9930,22 @@ ts-node@~7.0.0:
     source-map-support "^0.5.6"
     yn "^2.0.0"
 
+ts-simple-ast@12.4.0:
+  version "12.4.0"
+  resolved "https://registry.yarnpkg.com/ts-simple-ast/-/ts-simple-ast-12.4.0.tgz#6b53f6d6a59145da637dfe0e8c646d1e66ba278a"
+  integrity sha512-7GJFZlyTZY7uMAEhX62ZLxdwOpGDJzc/nwpi1nRPZ7N2ICcqqrMjDtRnki15IUBv2ZjIGu6KBqk/pUqJFODFsg==
+  dependencies:
+    "@dsherret/to-absolute-glob" "^2.0.2"
+    code-block-writer "^7.2.0"
+    fs-extra "^6.0.1"
+    glob-parent "^3.1.0"
+    globby "^8.0.1"
+    is-negated-glob "^1.0.0"
+    multimatch "^2.1.0"
+    object-assign "^4.1.1"
+    tslib "^1.9.0"
+    typescript "2.9.1"
+
 tslib@^1.8.0, tslib@^1.8.1:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
@@ -9289,10 +9961,10 @@ tslint-config-prettier@^1.18.0:
   resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz#75f140bde947d35d8f0d238e0ebf809d64592c37"
   integrity sha512-xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg==
 
-tslint@~5.11.0:
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.11.0.tgz#98f30c02eae3cde7006201e4c33cb08b48581eed"
-  integrity sha1-mPMMAurjzecAYgHkwzywi0hYHu0=
+tslint@~5.15.0:
+  version "5.15.0"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.15.0.tgz#6ffb180986d63afa1e531feb2a134dbf961e27d3"
+  integrity sha512-6bIEujKR21/3nyeoX2uBnE8s+tMXCQXhqMmaIPJpHmXJoBJPTLcI7/VHRtUwMhnLVdwLqqY3zmd8Dxqa5CVdJA==
   dependencies:
     babel-code-frame "^6.22.0"
     builtin-modules "^1.1.1"
@@ -9300,14 +9972,15 @@ tslint@~5.11.0:
     commander "^2.12.1"
     diff "^3.2.0"
     glob "^7.1.1"
-    js-yaml "^3.7.0"
+    js-yaml "^3.13.0"
     minimatch "^3.0.4"
+    mkdirp "^0.5.1"
     resolve "^1.3.2"
     semver "^5.3.0"
     tslib "^1.8.0"
-    tsutils "^2.27.2"
+    tsutils "^2.29.0"
 
-tsutils@^2.27.2:
+tsutils@^2.29.0:
   version "2.29.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
   integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
@@ -9331,30 +10004,57 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
   integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
-type-is@~1.6.15, type-is@~1.6.16:
-  version "1.6.16"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
-  integrity sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
+  dependencies:
+    prelude-ls "~1.1.2"
+
+type-fest@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.4.1.tgz#8bdf77743385d8a4f13ba95f610f5ccd68c728f8"
+  integrity sha512-IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw==
+
+type-is@~1.6.17, type-is@~1.6.18:
+  version "1.6.18"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
+  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
   dependencies:
     media-typer "0.3.0"
-    mime-types "~2.1.18"
+    mime-types "~2.1.24"
 
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@3.2.4, typescript@~3.2.4:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.4.tgz#c585cb952912263d915b462726ce244ba510ef3d"
-  integrity sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==
+typescript@2.9.1:
+  version "2.9.1"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.1.tgz#fdb19d2c67a15d11995fd15640e373e09ab09961"
+  integrity sha512-h6pM2f/GDchCFlldnriOhs1QHuwbnmj6/v7499eMHqPeW4V2G0elua2eIc2nu8v2NdHV0Gm+tzX83Hr6nUFjQA==
+
+typescript@3.4.4:
+  version "3.4.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.4.tgz#aac4a08abecab8091a75f10842ffa0631818f785"
+  integrity sha512-xt5RsIRCEaf6+j9AyOBgvVuAec0i92rgCaS3S+UVf5Z/vF2Hvtsw08wtUTJqp4djwznoAgjSxeCcU4r+CcDBJA==
+
+typescript@^2.4.2:
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c"
+  integrity sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==
+
+typescript@~3.4.5:
+  version "3.4.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.5.tgz#2d2618d10bb566572b8d7aad5180d84257d70a99"
+  integrity sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==
 
 uglify-js@^3.1.4:
-  version "3.4.9"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
-  integrity sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.0.tgz#704681345c53a8b2079fb6cec294b05ead242ff5"
+  integrity sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==
   dependencies:
-    commander "~2.17.1"
+    commander "~2.20.0"
     source-map "~0.6.1"
 
 ultron@~1.1.0:
@@ -9362,6 +10062,11 @@ ultron@~1.1.0:
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
   integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==
 
+unc-path-regex@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
+  integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
+
 undefsafe@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.2.tgz#225f6b9e0337663e0d8e7cfd686fc2836ccace76"
@@ -9369,6 +10074,22 @@ undefsafe@^2.0.2:
   dependencies:
     debug "^2.2.0"
 
+unicode-properties@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/unicode-properties/-/unicode-properties-1.1.0.tgz#7a96eef49f75682ea69d2315eec9ac43ffdf00c1"
+  integrity sha1-epbu9J91aC6mnSMV7smsQ//fAME=
+  dependencies:
+    brfs "^1.4.0"
+    unicode-trie "^0.3.0"
+
+unicode-trie@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/unicode-trie/-/unicode-trie-0.3.1.tgz#d671dddd89101a08bac37b6a5161010602052085"
+  integrity sha1-1nHd3YkQGgi6w3tqUWEBBgIFIIU=
+  dependencies:
+    pako "^0.2.5"
+    tiny-inflate "^1.0.0"
+
 union-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
@@ -9379,7 +10100,7 @@ union-value@^1.0.0:
     is-extendable "^0.1.1"
     set-value "^0.4.3"
 
-unique-filename@^1.1.0, unique-filename@^1.1.1:
+unique-filename@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
   integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
@@ -9387,9 +10108,9 @@ unique-filename@^1.1.0, unique-filename@^1.1.1:
     unique-slug "^2.0.0"
 
 unique-slug@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.1.tgz#5e9edc6d1ce8fb264db18a507ef9bd8544451ca6"
-  integrity sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
+  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
   dependencies:
     imurmurhash "^0.1.4"
 
@@ -9400,11 +10121,25 @@ unique-string@^1.0.0:
   dependencies:
     crypto-random-string "^1.0.0"
 
+universal-analytics@^0.4.20:
+  version "0.4.20"
+  resolved "https://registry.yarnpkg.com/universal-analytics/-/universal-analytics-0.4.20.tgz#d6b64e5312bf74f7c368e3024a922135dbf24b03"
+  integrity sha512-gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==
+  dependencies:
+    debug "^3.0.0"
+    request "^2.88.0"
+    uuid "^3.0.0"
+
 universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
+unix-crypt-td-js@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unix-crypt-td-js/-/unix-crypt-td-js-1.0.0.tgz#1c0824150481bc7a01d49e98f1ec668d82412f3b"
+  integrity sha1-HAgkFQSBvHoB1J6Y8exmjYJBLzs=
+
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
@@ -9423,7 +10158,7 @@ unzip-response@^2.0.1:
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
   integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=
 
-upath@^1.0.5, upath@^1.1.0:
+upath@^1.0.5, upath@^1.1.0, upath@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
   integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
@@ -9464,11 +10199,11 @@ url-parse-lax@^1.0.0:
     prepend-http "^1.0.1"
 
 url-parse@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.3.tgz#bfaee455c889023219d757e045fa6a684ec36c15"
-  integrity sha512-rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw==
+  version "1.4.7"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
+  integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==
   dependencies:
-    querystringify "^2.0.0"
+    querystringify "^2.1.1"
     requires-port "^1.0.0"
 
 url2@^0.0.0:
@@ -9509,10 +10244,10 @@ util@0.10.3:
   dependencies:
     inherits "2.0.1"
 
-util@^0.10.3:
-  version "0.10.4"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
-  integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==
+util@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"
+  integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==
   dependencies:
     inherits "2.0.3"
 
@@ -9521,7 +10256,7 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
-uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2:
+uuid@^3.0.0, uuid@^3.0.1, uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
   integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
@@ -9541,7 +10276,7 @@ validate-npm-package-name@^3.0.0:
   dependencies:
     builtins "^1.0.3"
 
-vary@~1.1.2:
+vary@^1, vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
@@ -9555,12 +10290,20 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vm-browserify@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
-  integrity sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=
-  dependencies:
-    indexof "0.0.1"
+viz.js@^1.8.0:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/viz.js/-/viz.js-1.8.2.tgz#d9cc04cd99f98ec986bf9054db76a6cbcdc5d97a"
+  integrity sha512-W+1+N/hdzLpQZEcvz79n2IgUE9pfx6JLdHh3Kh8RGvLL8P1LdJVQmi2OsDcLdY4QVID4OUy+FPelyerX0nJxIQ==
+
+vlq@^0.2.2:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"
+  integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==
+
+vm-browserify@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz#bd76d6a23323e2ca8ffa12028dc04559c75f9019"
+  integrity sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==
 
 void-elements@^2.0.0:
   version "2.0.1"
@@ -9597,26 +10340,26 @@ webdriver-js-extender@2.1.0:
     selenium-webdriver "^3.0.1"
 
 webdriver-manager@^12.0.6:
-  version "12.0.6"
-  resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.0.6.tgz#3df1a481977010b4cbf8c9d85c7a577828c0e70b"
-  integrity sha1-PfGkgZdwELTL+MnYXHpXeCjA5ws=
+  version "12.1.5"
+  resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.5.tgz#28817b14d4b16b94ede10d5a7ee187aeb7679edf"
+  integrity sha512-f1apDjMpZ8SHlXtXGzqBxOjV+WQcDRz5PN7pWScgjXS7vhUIFcM3V89Shetf4A04n8DDR2MxiVQq6JproFcRZw==
   dependencies:
-    adm-zip "^0.4.7"
+    adm-zip "^0.4.9"
     chalk "^1.1.1"
     del "^2.2.0"
     glob "^7.0.3"
     ini "^1.3.4"
     minimist "^1.2.0"
     q "^1.4.1"
-    request "^2.78.0"
+    request "^2.87.0"
     rimraf "^2.5.2"
     semver "^5.3.0"
     xml2js "^0.4.17"
 
-webpack-bundle-analyzer@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.1.0.tgz#2f19cbb87bb6d4f3cb4e59cb67c837bd9436e89d"
-  integrity sha512-nyDyWEs7C6DZlgvu1pR1zzJfIWSiGPbtaByZr8q+Fd2xp70FuM/8ngCJzj3Er1TYRLSFmp1F1OInbEm4DZH8NA==
+webpack-bundle-analyzer@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.3.2.tgz#3da733a900f515914e729fcebcd4c40dde71fc6f"
+  integrity sha512-7qvJLPKB4rRWZGjVp5U1KEjwutbDHSKboAl0IfafnrdXMrgC0tOtZbQD6Rw0u4cmpgRN4O02Fc0t8eAT+FgGzA==
   dependencies:
     acorn "^6.0.7"
     acorn-walk "^6.1.1"
@@ -9640,61 +10383,61 @@ webpack-core@^0.6.8:
     source-list-map "~0.1.7"
     source-map "~0.4.1"
 
-webpack-dev-middleware@3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz#1132fecc9026fd90f0ecedac5cbff75d1fb45890"
-  integrity sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==
+webpack-dev-middleware@3.6.2:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.6.2.tgz#f37a27ad7c09cd7dc67cd97655413abaa1f55942"
+  integrity sha512-A47I5SX60IkHrMmZUlB0ZKSWi29TZTcPz7cha1Z75yYOsgWh/1AcPmQEbC8ZIbU3A1ytSv1PMU0PyPz2Lmz2jg==
   dependencies:
-    memory-fs "~0.4.1"
+    memory-fs "^0.4.1"
     mime "^2.3.1"
     range-parser "^1.0.3"
     webpack-log "^2.0.0"
 
-webpack-dev-middleware@3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.5.1.tgz#9265b7742ef50f54f54c1d9af022fc17c1be9b88"
-  integrity sha512-4dwCh/AyMOYAybggUr8fiCkRnjVDp+Cqlr9c+aaNB3GJYgRGYQWJ1YX/WAKUNA9dPNHZ6QSN2lYDKqjKSI8Vqw==
+webpack-dev-middleware@^3.6.2:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz#ef751d25f4e9a5c8a35da600c5fda3582b5c6cff"
+  integrity sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA==
   dependencies:
-    memory-fs "~0.4.1"
-    mime "^2.3.1"
-    range-parser "^1.0.3"
+    memory-fs "^0.4.1"
+    mime "^2.4.2"
+    range-parser "^1.2.1"
     webpack-log "^2.0.0"
 
-webpack-dev-server@3.1.14:
-  version "3.1.14"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz#60fb229b997fc5a0a1fc6237421030180959d469"
-  integrity sha512-mGXDgz5SlTxcF3hUpfC8hrQ11yhAttuUQWf1Wmb+6zo3x6rb7b9mIfuQvAPLdfDRCGRGvakBWHdHOa0I9p/EVQ==
+webpack-dev-server@3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.3.1.tgz#7046e49ded5c1255a82c5d942bcdda552b72a62d"
+  integrity sha512-jY09LikOyGZrxVTXK0mgIq9y2IhCoJ05848dKZqX1gAGLU1YDqgpOT71+W53JH/wI4v6ky4hm+KvSyW14JEs5A==
   dependencies:
     ansi-html "0.0.7"
     bonjour "^3.5.0"
-    chokidar "^2.0.0"
-    compression "^1.5.2"
-    connect-history-api-fallback "^1.3.0"
-    debug "^3.1.0"
-    del "^3.0.0"
-    express "^4.16.2"
-    html-entities "^1.2.0"
-    http-proxy-middleware "~0.18.0"
+    chokidar "^2.1.5"
+    compression "^1.7.4"
+    connect-history-api-fallback "^1.6.0"
+    debug "^4.1.1"
+    del "^4.1.0"
+    express "^4.16.4"
+    html-entities "^1.2.1"
+    http-proxy-middleware "^0.19.1"
     import-local "^2.0.0"
-    internal-ip "^3.0.1"
+    internal-ip "^4.2.0"
     ip "^1.1.5"
-    killable "^1.0.0"
-    loglevel "^1.4.1"
-    opn "^5.1.0"
-    portfinder "^1.0.9"
+    killable "^1.0.1"
+    loglevel "^1.6.1"
+    opn "^5.5.0"
+    portfinder "^1.0.20"
     schema-utils "^1.0.0"
-    selfsigned "^1.9.1"
-    semver "^5.6.0"
-    serve-index "^1.7.2"
+    selfsigned "^1.10.4"
+    semver "^6.0.0"
+    serve-index "^1.9.1"
     sockjs "0.3.19"
     sockjs-client "1.3.0"
     spdy "^4.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^5.1.0"
+    strip-ansi "^3.0.1"
+    supports-color "^6.1.0"
     url "^0.11.0"
-    webpack-dev-middleware "3.4.0"
+    webpack-dev-middleware "^3.6.2"
     webpack-log "^2.0.0"
-    yargs "12.0.2"
+    yargs "12.0.5"
 
 webpack-log@^2.0.0:
   version "2.0.0"
@@ -9726,15 +10469,15 @@ webpack-subresource-integrity@1.1.0-rc.6:
   dependencies:
     webpack-core "^0.6.8"
 
-webpack@4.29.0:
-  version "4.29.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.0.tgz#f2cfef83f7ae404ba889ff5d43efd285ca26e750"
-  integrity sha512-pxdGG0keDBtamE1mNvT5zyBdx+7wkh6mh7uzMOo/uRQ/fhsdj5FXkh/j5mapzs060forql1oXqXN9HJGju+y7w==
+webpack@4.30.0:
+  version "4.30.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.30.0.tgz#aca76ef75630a22c49fcc235b39b4c57591d33a9"
+  integrity sha512-4hgvO2YbAFUhyTdlR4FNyt2+YaYBYHavyzjCMbZzgglo02rlKi/pcsEzwCuCpsn1ryzIl1cq/u8ArIKu8JBYMg==
   dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-module-context" "1.7.11"
-    "@webassemblyjs/wasm-edit" "1.7.11"
-    "@webassemblyjs/wasm-parser" "1.7.11"
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/wasm-edit" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
     acorn "^6.0.5"
     acorn-dynamic-import "^4.0.0"
     ajv "^6.1.0"
@@ -9750,18 +10493,19 @@ webpack@4.29.0:
     mkdirp "~0.5.0"
     neo-async "^2.5.0"
     node-libs-browser "^2.0.0"
-    schema-utils "^0.4.4"
+    schema-utils "^1.0.0"
     tapable "^1.1.0"
     terser-webpack-plugin "^1.1.0"
     watchpack "^1.5.0"
     webpack-sources "^1.3.0"
 
 websocket-driver@>=0.5.1:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
-  integrity sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz#a2d4e0d4f4f116f1e6297eba58b05d430100e9f9"
+  integrity sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==
   dependencies:
-    http-parser-js ">=0.4.0"
+    http-parser-js ">=0.4.0 <0.4.11"
+    safe-buffer ">=5.1.0"
     websocket-extensions ">=0.1.1"
 
 websocket-extensions@>=0.1.1:
@@ -9784,20 +10528,13 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@1, which@^1.2.9, which@^1.3.1:
+which@1, which@^1.2.1, which@^1.2.9, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
-which@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
-  integrity sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==
-  dependencies:
-    isexe "^2.0.0"
-
 wide-align@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
@@ -9812,11 +10549,23 @@ widest-line@^2.0.0:
   dependencies:
     string-width "^2.1.1"
 
+windows-release@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.2.0.tgz#8122dad5afc303d833422380680a79cdfa91785f"
+  integrity sha512-QTlz2hKLrdqukrsapKsINzqMgOUpQW268eJ0OaOpJN32h272waxR9fkB9VoWRtK7uKHG5EHJcTXQBD8XZVJkFA==
+  dependencies:
+    execa "^1.0.0"
+
 wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
   integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
 
+wordwrap@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
+
 worker-farm@^1.5.2:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
@@ -9824,6 +10573,20 @@ worker-farm@^1.5.2:
   dependencies:
     errno "~0.1.7"
 
+worker-farm@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
+  integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==
+  dependencies:
+    errno "~0.1.7"
+
+worker-plugin@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/worker-plugin/-/worker-plugin-3.1.0.tgz#6311778f3514a87c273510ee3f809cc3fe161e6f"
+  integrity sha512-iQ9KTTmmN5fhfc2KMR7CcDblvcrg1QQ4pXymqZ3cRZF8L0890YLBcEqlIsGPdxoFwghyN8RA1pCEhCKuTF4Lkw==
+  dependencies:
+    loader-utils "^1.1.0"
+
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
@@ -9832,24 +10595,33 @@ wrap-ansi@^2.0.0:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
 
+wrap-ansi@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
+  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
+  dependencies:
+    ansi-styles "^3.2.0"
+    string-width "^3.0.0"
+    strip-ansi "^5.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
 write-file-atomic@^2.0.0:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.2.tgz#a7181706dfba17855d221140a9c06e15fcdd87b9"
-  integrity sha512-s0b6vB3xIVRLWywa6X9TOMA7k9zio0TMOsl9ZnDkliA/cfJlpHXAscj0gbHVJiTdIuAYpIyqS5GW91fqm6gG5g==
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"
+  integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==
   dependencies:
     graceful-fs "^4.1.11"
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
 ws@^6.0.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.0.tgz#13806d9913b2a5f3cbb9ba47b563c002cbc7c526"
-  integrity sha512-deZYUNlt2O4buFCa3t5bKLf8A7FPP/TVjwOeVNpw818Ma5nk4MLXls2eoEGS39o8119QIYxTrTDoPQ5B/gTD6w==
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
+  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
   dependencies:
     async-limiter "~1.0.0"
 
@@ -9881,20 +10653,15 @@ xml2js@^0.4.17:
     xmlbuilder "~9.0.1"
 
 xmlbuilder@~9.0.1:
-  version "9.0.4"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.4.tgz#519cb4ca686d005a8420d3496f3f0caeecca580f"
-  integrity sha1-UZy0ymhtAFqEINNJbz8MruzKWA8=
+  version "9.0.7"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
+  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
 
 xmlhttprequest-ssl@~1.5.4:
   version "1.5.5"
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
   integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
 
-xregexp@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
-  integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==
-
 xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
@@ -9915,12 +10682,12 @@ yallist@^2.1.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
-yallist@^3.0.0, yallist@^3.0.2:
+yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
   integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
 
-yargs-parser@^10.0.0, yargs-parser@^10.1.0:
+yargs-parser@^10.0.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
   integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
@@ -9935,6 +10702,14 @@ yargs-parser@^11.1.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
+yargs-parser@^13.0.0, yargs-parser@^13.1.0:
+  version "13.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0"
+  integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
 yargs-parser@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
@@ -9942,20 +10717,13 @@ yargs-parser@^5.0.0:
   dependencies:
     camelcase "^3.0.0"
 
-yargs-parser@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
-  integrity sha1-jQrELxbqVd69MyyvTEA4s+P139k=
-  dependencies:
-    camelcase "^4.1.0"
-
-yargs@12.0.2:
-  version "12.0.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
-  integrity sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==
+yargs@12.0.5:
+  version "12.0.5"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
+  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
   dependencies:
     cliui "^4.0.0"
-    decamelize "^2.0.0"
+    decamelize "^1.2.0"
     find-up "^3.0.0"
     get-caller-file "^1.0.1"
     os-locale "^3.0.0"
@@ -9965,44 +10733,58 @@ yargs@12.0.2:
     string-width "^2.0.0"
     which-module "^2.0.0"
     y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^10.1.0"
+    yargs-parser "^11.1.1"
 
-yargs@9.0.1:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c"
-  integrity sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=
+yargs@13.1.0:
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.1.0.tgz#b2729ce4bfc0c584939719514099d8a916ad2301"
+  integrity sha512-1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg==
   dependencies:
-    camelcase "^4.1.0"
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
-    get-caller-file "^1.0.1"
-    os-locale "^2.0.0"
-    read-pkg-up "^2.0.0"
+    cliui "^4.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    os-locale "^3.1.0"
     require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
+    require-main-filename "^2.0.0"
     set-blocking "^2.0.0"
-    string-width "^2.0.0"
+    string-width "^3.0.0"
     which-module "^2.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^7.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.0.0"
 
-yargs@^12.0.2:
-  version "12.0.5"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
-  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
+yargs@13.2.2:
+  version "13.2.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.2.tgz#0c101f580ae95cea7f39d927e7770e3fdc97f993"
+  integrity sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==
   dependencies:
     cliui "^4.0.0"
-    decamelize "^1.2.0"
     find-up "^3.0.0"
-    get-caller-file "^1.0.1"
-    os-locale "^3.0.0"
+    get-caller-file "^2.0.1"
+    os-locale "^3.1.0"
     require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
+    require-main-filename "^2.0.0"
     set-blocking "^2.0.0"
-    string-width "^2.0.0"
+    string-width "^3.0.0"
     which-module "^2.0.0"
-    y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^11.1.1"
+    y18n "^4.0.0"
+    yargs-parser "^13.0.0"
+
+yargs@^13.2.4:
+  version "13.2.4"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83"
+  integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==
+  dependencies:
+    cliui "^5.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    os-locale "^3.1.0"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.1.0"
 
 yargs@^7.0.0:
   version "7.1.0"
@@ -10033,7 +10815,7 @@ yn@^2.0.0:
   resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
   integrity sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=
 
-zone.js@~0.8.26:
-  version "0.8.29"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.29.tgz#8dce92aa0dd553b50bc5bfbb90af9986ad845a12"
-  integrity sha512-mla2acNCMkWXBD+c+yeUrBUrzOxYMNFdQ6FGfigGGtEVBPJx07BQeJekjt9DmH1FtZek4E9rE1eRR9qQpxACOQ==
+zone.js@~0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.9.1.tgz#e37c6e5c54c13fae4de26b5ffe8d8e9212da6d9b"
+  integrity sha512-GkPiJL8jifSrKReKaTZ5jkhrMEgXbXYC+IPo1iquBjayRa0q86w3Dipjn8b415jpitMExe9lV8iTsv8tk3DGag==