diff --git a/.travis.yml b/.travis.yml
index 0d3b60506d..6b98fd4ec8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,6 @@
+git:
+  depth: 3
+  quiet: true
 language: node_js
 dist: trusty
 sudo: required
@@ -128,7 +131,7 @@ jobs:
             AFFECTED_LIBS="$(./scripts/affected-libs.sh -b $TRAVIS_BRANCH)";
             if [[ $AFFECTED_LIBS =~ "core$" || $AFFECTED_E2E = "e2e" ]];
             then
-                (./scripts/test-e2e-lib.sh -host localhost:4200 --host_sso "$E2E_HOST_SSO" -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e $E2E_EMAIL -b -save --folder core --skip-lint --use-dist --timeout 7000 || exit 1;);
+                (./scripts/test-e2e-lib.sh -host localhost:4200 --host_sso "$E2E_HOST_SSO" -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e $E2E_EMAIL -b -save --folder core --skip-lint --use-dist || exit 1;);
             fi
         - stage: e2e Test # Test process-services
           name: process-services
@@ -137,7 +140,7 @@ jobs:
             AFFECTED_LIBS="$(./scripts/affected-libs.sh -b $TRAVIS_BRANCH)";
             if [[ $AFFECTED_LIBS =~ "process-services$" || $AFFECTED_E2E = "e2e" ]];
             then
-                (./scripts/test-e2e-lib.sh -host localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e $E2E_EMAIL -b -save --folder process-services --skip-lint --use-dist --timeout 7000 || exit 1;);
+                (./scripts/test-e2e-lib.sh -host localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e $E2E_EMAIL -b -save --folder process-services --skip-lint --use-dist || exit 1;);
             fi
         - stage: e2e Test # Test content-services
           name: content-services
@@ -146,7 +149,16 @@ jobs:
             AFFECTED_LIBS="$(./scripts/affected-libs.sh -b $TRAVIS_BRANCH)";
             if [[ $AFFECTED_LIBS =~ "content-services$" || $AFFECTED_E2E = "e2e" ]];
             then
-                (./scripts/test-e2e-lib.sh -host localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e $E2E_EMAIL -b -save --folder content-services --skip-lint --use-dist --timeout 7000 || exit 1;);
+                (./scripts/test-e2e-lib.sh -host localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e $E2E_EMAIL -b -save --folder content-services --skip-lint --use-dist || exit 1;);
+            fi
+        - stage: e2e Test # Test search
+          name: search
+          script:
+            AFFECTED_E2E="$(./scripts/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e")";
+            AFFECTED_LIBS="$(./scripts/affected-libs.sh -b $TRAVIS_BRANCH)";
+            if [[ $AFFECTED_LIBS =~ "content-services$" || $AFFECTED_E2E = "e2e" ]];
+            then
+                (./scripts/test-e2e-lib.sh -host localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e $E2E_EMAIL -b -save --folder search --skip-lint --use-dist  || exit 1;);
             fi
         - stage: e2e Test # Test process-services-cloud
           name: process-services-cloud
@@ -155,7 +167,7 @@ jobs:
             AFFECTED_LIBS="$(./scripts/affected-libs.sh -b $TRAVIS_BRANCH)";
             if [[ $AFFECTED_LIBS =~ "process-services-cloud$" || $AFFECTED_E2E = "e2e" ]];
             then
-                (./scripts/test-e2e-lib.sh -host localhost:4200 --host_sso "$E2E_HOST_SSO" -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e $E2E_EMAIL -b -save --folder process-services-cloud --skip-lint --use-dist --timeout 7000 || exit 1;);
+                (./scripts/test-e2e-lib.sh -host localhost:4200 --host_sso "$E2E_HOST_SSO" -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e $E2E_EMAIL -b -save --folder process-services-cloud --skip-lint --use-dist  || exit 1;);
             fi
         - stage: e2e Test # Test insights
           name: insights
@@ -164,7 +176,7 @@ jobs:
             AFFECTED_LIBS="$(./scripts/affected-libs.sh -b $TRAVIS_BRANCH)";
             if [[ $AFFECTED_LIBS =~ "process-services-cloud$" || $AFFECTED_E2E = "e2e" ]];
             then
-                (./scripts/test-e2e-lib.sh -host localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e $E2E_EMAIL -b -save --folder insights --skip-lint --use-dist --timeout 7000 || exit 1;);
+                (./scripts/test-e2e-lib.sh -host localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e $E2E_EMAIL -b -save --folder insights --skip-lint --use-dist  || exit 1;);
             fi
         - stage: Create Docker PR
           script: (./scripts/pr-publish.sh -n $TRAVIS_BUILD_NUMBER -r $REPO_DOCKER -u $USERNAME_DOCKER -p $PASSWORD_DOCKER || exit 1)
diff --git a/.vscode/settings.json b/.vscode/settings.json
index bf4cc506a6..e6e58ccce6 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -19,5 +19,10 @@
     "MD033": false,
     "MD031": false
   },
-  "cSpell.words": ["mincount", "webscript"]
+  "stylelint.enable": true,
+  "css.validate": false,
+  "scss.validate": false,
+  "stylelint.config": {
+      "extends": "./stylelint-config"
+  }
 }
diff --git a/demo-shell/resources/i18n/en.json b/demo-shell/resources/i18n/en.json
index cc4c439d2d..53c864ae04 100644
--- a/demo-shell/resources/i18n/en.json
+++ b/demo-shell/resources/i18n/en.json
@@ -1,5 +1,6 @@
 {
   "APP": {
+    "CREATE_LIBRARY": "Create Library",
     "INFO_DRAWER": {
       "TITLE": "Details",
       "COMMENTS": "Comments",
@@ -146,6 +147,7 @@
     },
     "ACTIONS": {
       "VERSIONS": "Manage versions",
+      "LOCK": "Lock",
       "METADATA": "Info",
       "DOWNLOAD": "Download",
       "PERMISSION": "Permission",
diff --git a/demo-shell/src/app/components/config-editor/config-editor.component.ts b/demo-shell/src/app/components/config-editor/config-editor.component.ts
index ecdd090965..8fed801830 100644
--- a/demo-shell/src/app/components/config-editor/config-editor.component.ts
+++ b/demo-shell/src/app/components/config-editor/config-editor.component.ts
@@ -54,12 +54,13 @@ export class ConfigEditorComponent {
             this.invalidJson = true;
             this.notificationService.openSnackMessage(
                 'Wrong Code configuration ' + error,
-                4000
+                1000
             );
         } finally {
             if (!this.invalidJson) {
                 this.notificationService.openSnackMessage(
-                    'Saved'
+                    'Saved',
+                    1000
                 );
             }
         }
diff --git a/demo-shell/src/app/components/files/files.component.html b/demo-shell/src/app/components/files/files.component.html
index edddb1e945..88f4b3602a 100644
--- a/demo-shell/src/app/components/files/files.component.html
+++ b/demo-shell/src/app/components/files/files.component.html
@@ -75,6 +75,7 @@
                         <mat-icon *ngIf="displayMode === 'gallery'" matTooltip="{{ 'DOCUMENT_LIST.TOOLBAR.LISTVIEW' | translate }}">list</mat-icon>
                     </button>
                     <button
+                        data-automation-id="create-new-folder"
                         mat-icon-button
                         [disabled]="!canCreateContent(documentList.folderNode)"
                         title="{{ 'DOCUMENT_LIST.TOOLBAR.NEW_FOLDER' | translate }}"
@@ -84,6 +85,12 @@
                         matTooltip="{{ 'DOCUMENT_LIST.TOOLBAR.NEW_FOLDER' | translate }}">
                         <mat-icon>create_new_folder</mat-icon>
                     </button>
+                    <button
+                        mat-icon-button
+                        matTooltip="{{ 'APP.CREATE_LIBRARY' | translate }}"
+                        (click)="createLibrary()">
+                        <mat-icon>library_add</mat-icon>
+                    </button>
                     <button mat-icon-button
                             [disabled]="!canEditFolder(documentList.selection)"
                             title="{{ 'DOCUMENT_LIST.TOOLBAR.EDIT_FOLDER' | translate }}"
@@ -372,7 +379,6 @@
                         target="document" 
                         *ngIf="authenticationService.isBpmLoggedIn()"
                         icon="play_arrow"
-                        target="document" 
                         title="DOCUMENT_LIST.ACTIONS.DOCUMENT.PROCESS_ACTION"
                         (execute)="startProcessAction($event)">
                     </content-action>
@@ -381,7 +387,7 @@
                         icon="lock"
                         permission="lock"
                         handler="lock"
-                        title="Lock">
+                        title="DOCUMENT_LIST.ACTIONS.LOCK">
                     </content-action>
                 </content-actions>
             </adf-document-list>
diff --git a/demo-shell/src/app/components/files/files.component.ts b/demo-shell/src/app/components/files/files.component.ts
index 19b7c71fff..69daf2e1ea 100644
--- a/demo-shell/src/app/components/files/files.component.ts
+++ b/demo-shell/src/app/components/files/files.component.ts
@@ -35,7 +35,8 @@ import {
     DocumentListComponent,
     PermissionStyleModel,
     UploadFilesEvent,
-    ConfirmDialogComponent
+    ConfirmDialogComponent,
+    LibraryDialogComponent
 } from '@alfresco/adf-content-services';
 
 import { SelectAppsDialogComponent } from '@alfresco/adf-process-services';
@@ -346,7 +347,7 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
     openSnackMessage(event: any) {
         this.notificationService.openSnackMessage(
             event,
-            6000
+            4000
         );
     }
 
@@ -572,4 +573,17 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
     getFileFiltering() {
         return this.acceptedFilesTypeShow ? this.acceptedFilesType : '*';
     }
+
+    createLibrary() {
+        const dialogInstance: any = this.dialog.open(LibraryDialogComponent, {
+            width: '400px'
+        });
+
+        dialogInstance.componentInstance.error.subscribe((message) => {
+            this.notificationService.openSnackMessage(
+                message,
+                6000
+            );
+        });
+    }
 }
diff --git a/demo-shell/src/app/components/form/form.component.ts b/demo-shell/src/app/components/form/form.component.ts
index 472bddfb54..66732d8cb3 100644
--- a/demo-shell/src/app/components/form/form.component.ts
+++ b/demo-shell/src/app/components/form/form.component.ts
@@ -89,7 +89,7 @@ export class FormComponent implements OnInit, OnDestroy {
         } catch (error) {
             this.notificationService.openSnackMessage(
                 'Wrong form configuration',
-                2000
+                4000
             );
         }
     }
diff --git a/demo-shell/src/app/components/process-service/process-service.component.html b/demo-shell/src/app/components/process-service/process-service.component.html
index 705197e9b1..b4f9dfecba 100644
--- a/demo-shell/src/app/components/process-service/process-service.component.html
+++ b/demo-shell/src/app/components/process-service/process-service.component.html
@@ -270,8 +270,7 @@
                     </mat-slide-toggle>
                 </div>
                 <div>
-                    <mat-slide-toggle id="adf-show-header" (change)="toggleHeaderContent()"
-                                      [checked]="showHeaderContent">{{ 'PS-TAB.TASK-SHOW-HEADER'| translate }}
+                    <mat-slide-toggle id="adf-show-header" (change)="toggleHeaderContent()" [checked]="showHeaderContent">{{ 'PS-TAB.TASK-SHOW-HEADER'| translate }}
                     </mat-slide-toggle>
                 </div>
                 <div>
diff --git a/demo-shell/src/app/components/search/search-bar.component.html b/demo-shell/src/app/components/search/search-bar.component.html
index 929de529cb..f94df07e23 100644
--- a/demo-shell/src/app/components/search/search-bar.component.html
+++ b/demo-shell/src/app/components/search/search-bar.component.html
@@ -1,4 +1,5 @@
-<adf-search-control [highlight]="true"
+<adf-search-control
+    [highlight]="true"
     (optionClicked)="onItemClicked($event)"
     (submit)="onSearchSubmit($event)">
     <!-- <adf-empty-search-result>
diff --git a/e2e/Util.kt b/e2e/Util.kt
new file mode 100644
index 0000000000..d6f7d49b72
--- /dev/null
+++ b/e2e/Util.kt
@@ -0,0 +1 @@
+var Util = require('../../util/util');var Util = require('../../util/util');
diff --git a/e2e/actions/users.actions.ts b/e2e/actions/users.actions.ts
index dbc24459c2..53c0817dd5 100644
--- a/e2e/actions/users.actions.ts
+++ b/e2e/actions/users.actions.ts
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import Tenant = require('../models/APS/Tenant');
-import User = require('../models/APS/User');
+import { Tenant } from '../models/APS/Tenant';
+import { User } from '../models/APS/User';
 import TestConfig = require('../test.config');
 import path = require('path');
 import fs = require('fs');
diff --git a/e2e/content-services/comments/comment_component.e2e.ts b/e2e/content-services/comments/comment_component.e2e.ts
index ff7cad6514..5d29ef65ee 100644
--- a/e2e/content-services/comments/comment_component.e2e.ts
+++ b/e2e/content-services/comments/comment_component.e2e.ts
@@ -20,8 +20,8 @@ import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
 import { ViewerPage } from '../../pages/adf/viewerPage';
 import { CommentsPage } from '../../pages/adf/commentsPage';
 
-import AcsUserModel = require('../../models/ACS/acsUserModel');
-import FileModel = require('../../models/ACS/fileModel');
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
+import { FileModel } from '../../models/ACS/fileModel';
 
 import TestConfig = require('../../test.config');
 import resources = require('../../util/resources');
diff --git a/e2e/content-services/directives/create_folder_directive.e2e.ts b/e2e/content-services/directives/create_folder_directive.e2e.ts
index d7101c66ca..b583c7674a 100644
--- a/e2e/content-services/directives/create_folder_directive.e2e.ts
+++ b/e2e/content-services/directives/create_folder_directive.e2e.ts
@@ -17,18 +17,15 @@
 
 import { LoginPage } from '../../pages/adf/loginPage';
 import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
-import CreateFolderDialog = require('../../pages/adf/dialog/createFolderDialog');
+import { CreateFolderDialog } from '../../pages/adf/dialog/createFolderDialog';
 import { NotificationPage } from '../../pages/adf/notificationPage';
-import MetadataViewPage = require('../../pages/adf/metadataViewPage');
-import ContentListPage = require('../../pages/adf/dialog/contentList');
-
-import AcsUserModel = require('../../models/ACS/acsUserModel');
+import { MetadataViewPage } from '../../pages/adf/metadataViewPage';
+import { ContentListPage } from '../../pages/adf/dialog/contentListPage';
 
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
 import TestConfig = require('../../test.config');
-
 import AlfrescoApi = require('alfresco-js-api-node');
-
-import { browser, protractor } from 'protractor';
+import { browser, Key } from 'protractor';
 
 describe('Create folder directive', function () {
 
@@ -58,8 +55,14 @@ describe('Create folder directive', function () {
         done();
     });
 
-    afterEach(() => {
-        browser.actions().sendKeys(protractor.Key.ESCAPE).perform();
+    beforeEach(async (done) => {
+        await browser.actions().sendKeys(Key.ESCAPE).perform();
+        done();
+    });
+
+    afterEach(async (done) => {
+        await browser.actions().sendKeys(Key.ESCAPE).perform();
+        done();
     });
 
     it('[C260154] Should not create the folder if cancel button is clicked', () => {
@@ -125,13 +128,24 @@ describe('Create folder directive', function () {
     });
 
     it('[C260159] Should not be possible create a folder with banned character', () => {
-        let bannedChar = ['* ', '<', '>', '\\', '/', '?', ':', '|'];
-
+        browser.refresh();
         contentServicesPage.clickOnCreateNewFolder();
 
-        bannedChar.forEach((currentChar) => {
-            createFolderDialog.addFolderName(currentChar);
-            createFolderDialog.checkCreateBtnIsDisabled();
-        });
+        createFolderDialog.addFolderName('*');
+        createFolderDialog.checkCreateBtnIsDisabled();
+        createFolderDialog.addFolderName('<');
+        createFolderDialog.checkCreateBtnIsDisabled();
+        createFolderDialog.addFolderName('>');
+        createFolderDialog.checkCreateBtnIsDisabled();
+        createFolderDialog.addFolderName('\\');
+        createFolderDialog.checkCreateBtnIsDisabled();
+        createFolderDialog.addFolderName('/');
+        createFolderDialog.checkCreateBtnIsDisabled();
+        createFolderDialog.addFolderName('?');
+        createFolderDialog.checkCreateBtnIsDisabled();
+        createFolderDialog.addFolderName(':');
+        createFolderDialog.checkCreateBtnIsDisabled();
+        createFolderDialog.addFolderName('|');
+        createFolderDialog.checkCreateBtnIsDisabled();
     });
 });
diff --git a/e2e/content-services/document-list/document_list_actions.e2e.ts b/e2e/content-services/document-list/document_list_actions.e2e.ts
index 7d5ca4c7f4..0683124e10 100644
--- a/e2e/content-services/document-list/document_list_actions.e2e.ts
+++ b/e2e/content-services/document-list/document_list_actions.e2e.ts
@@ -18,14 +18,14 @@
 import { browser } from 'protractor';
 import { LoginPage } from '../../pages/adf/loginPage';
 import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
-import ContentListPage = require('../../pages/adf/dialog/contentList');
-import AcsUserModel = require('../../models/ACS/acsUserModel');
+import { ContentListPage } from '../../pages/adf/dialog/contentListPage';
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
 import TestConfig = require('../../test.config');
 import resources = require('../../util/resources');
 import AlfrescoApi = require('alfresco-js-api-node');
 import { UploadActions } from '../../actions/ACS/upload.actions';
-import FileModel = require('../../models/ACS/fileModel');
-import Util = require('../../util/util');
+import { FileModel } from '../../models/ACS/fileModel';
+import { Util } from '../../util/util';
 
 describe('Document List Component - Actions', () => {
 
diff --git a/e2e/content-services/document-list/document_list_component.e2e.ts b/e2e/content-services/document-list/document_list_component.e2e.ts
index f2df12f86e..ab6034c87f 100644
--- a/e2e/content-services/document-list/document_list_component.e2e.ts
+++ b/e2e/content-services/document-list/document_list_component.e2e.ts
@@ -19,14 +19,14 @@ import { browser } from 'protractor';
 import { LoginPage } from '../../pages/adf/loginPage';
 import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
 import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
-import AcsUserModel = require('../../models/ACS/acsUserModel');
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
 import TestConfig = require('../../test.config');
 import resources = require('../../util/resources');
-import Util = require('../../util/util');
+import { Util } from '../../util/util';
 import AlfrescoApi = require('alfresco-js-api-node');
 import { UploadActions } from '../../actions/ACS/upload.actions';
-import ErrorPage = require('../../pages/adf/errorPage');
-import FileModel = require('../../models/ACS/fileModel');
+import { ErrorPage } from '../../pages/adf/errorPage';
+import { FileModel } from '../../models/ACS/fileModel';
 import moment from 'moment-es6';
 
 describe('Document List Component', () => {
@@ -75,7 +75,7 @@ describe('Document List Component', () => {
             acsUser = new AcsUserModel();
             let siteName = `PRIVATE_TEST_SITE_${Util.generateRandomString(5)}`;
             let folderName = `MEESEEKS_${Util.generateRandomString(5)}`;
-            let privateSiteBody = { visibility: 'PRIVATE' , title: siteName};
+            let privateSiteBody = { visibility: 'PRIVATE', title: siteName };
 
             await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
 
@@ -88,7 +88,7 @@ describe('Document List Component', () => {
             done();
         });
 
-        afterAll(async(done) => {
+        afterAll(async (done) => {
             await this.alfrescoJsApi.core.sitesApi.deleteSite(privateSite.entry.id);
             done();
         });
@@ -303,7 +303,7 @@ describe('Document List Component', () => {
         });
     });
 
-    it('[C260121] Should show the spinner on content loading', async (done) => {
+    xit('[C260121] Should show the spinner on content loading', async (done) => {
         acsUser = new AcsUserModel();
         await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
         await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
@@ -511,17 +511,17 @@ describe('Document List Component', () => {
             done();
         });
 
-        beforeEach( () => {
+        beforeEach(() => {
             loginPage.loginToContentServicesUsingUserModel(acsUser);
             contentServicesPage.goToDocumentList();
         });
 
         it('[C260108] Should display tooltip for file\'s name', () => {
-            expect(contentServicesPage.getTooltip(pdfFile.name)).toEqual(pdfFile.name);
+            expect(contentServicesPage.getContentList().getTooltip(pdfFile.name)).toEqual(pdfFile.name);
         });
 
         it('[C260109] Should display tooltip for folder\'s name', () => {
-            expect(contentServicesPage.getTooltip(folderName)).toEqual(folderName);
+            expect(contentServicesPage.getContentList().getTooltip(folderName)).toEqual(folderName);
         });
 
         it('[C260119] Should have a specific thumbnail for folders', async (done) => {
@@ -560,7 +560,7 @@ describe('Document List Component', () => {
     describe('Gallery View', () => {
 
         let cardProperties = {
-            DISPLAY_NAME : 'Display name',
+            DISPLAY_NAME: 'Display name',
             SIZE: 'Size',
             LOCK: 'Lock',
             CREATED_BY: 'Created by',
@@ -600,7 +600,7 @@ describe('Document List Component', () => {
             done();
         });
 
-        beforeEach( () => {
+        beforeEach(() => {
             loginPage.loginToContentServicesUsingUserModel(acsUser);
             contentServicesPage.goToDocumentList();
             contentServicesPage.clickGridViewButton();
diff --git a/e2e/content-services/document-list/document_list_pagination.e2e.ts b/e2e/content-services/document-list/document_list_pagination.e2e.ts
index e8101b5e9a..20eae4a24d 100644
--- a/e2e/content-services/document-list/document_list_pagination.e2e.ts
+++ b/e2e/content-services/document-list/document_list_pagination.e2e.ts
@@ -17,14 +17,14 @@
 
 import { LoginPage } from '../../pages/adf/loginPage';
 import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
-import PaginationPage = require('../../pages/adf/paginationPage');
+import { PaginationPage } from '../../pages/adf/paginationPage';
 import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
 
-import AcsUserModel = require('../../models/ACS/acsUserModel');
-import FolderModel = require('../../models/ACS/folderModel');
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
+import { FolderModel } from '../../models/ACS/folderModel';
 
 import TestConfig = require('../../test.config');
-import Util = require('../../util/util');
+import { Util } from '../../util/util';
 
 import AlfrescoApi = require('alfresco-js-api-node');
 import { UploadActions } from '../../actions/ACS/upload.actions';
diff --git a/e2e/content-services/lock_file.e2e.ts b/e2e/content-services/lock_file.e2e.ts
index 71cccf5701..5d77fce9ed 100644
--- a/e2e/content-services/lock_file.e2e.ts
+++ b/e2e/content-services/lock_file.e2e.ts
@@ -16,28 +16,29 @@
  */
 
 import { LoginPage } from '../pages/adf/loginPage';
-import { NavigationBarPage } from '../pages/adf/NavigationBarPage';
-import ContentList = require('../pages/adf/dialog/contentList');
+import { NavigationBarPage } from '../pages/adf/navigationBarPage';
+import { ContentListPage } from '../pages/adf/dialog/contentListPage';
 
 import { LockFilePage } from '../pages/adf/lockFilePage';
 
-import AcsUserModel = require('../models/ACS/acsUserModel');
-import FileModel = require('../models/ACS/fileModel');
+import { AcsUserModel } from '../models/ACS/acsUserModel';
+import { FileModel } from '../models/ACS/fileModel';
 
 import CONSTANTS = require('../util/constants');
-import Util = require('../util/util');
+import { Util } from '../util/util';
 
 import TestConfig = require('../test.config');
 import resources = require('../util/resources');
 
 import AlfrescoApi = require('alfresco-js-api-node');
 import { UploadActions } from '../actions/ACS/upload.actions';
+import { browser } from 'protractor';
 
 describe('Lock File', () => {
 
     const loginPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
-    const contentList = new ContentList();
+    const contentList = new ContentListPage();
     const lockFilePage = new LockFilePage();
 
     let adminUser = new AcsUserModel();
@@ -128,7 +129,7 @@ describe('Lock File', () => {
         });
 
         it('[C286604] Should be able to open Lock file option by clicking the lock image', () => {
-            contentList.clickContentLockIcon(pngFileModel.name);
+            contentList.lockContent(pngFileModel.name);
 
             lockFilePage.checkLockFileCheckboxIsDisplayed();
             lockFilePage.checkCancelButtonIsDisplayed();
@@ -136,7 +137,7 @@ describe('Lock File', () => {
         });
 
         it('[C286625] Should be able to click Cancel to cancel lock file operation', () => {
-            contentList.clickContentLockIcon(pngFileModel.name);
+            contentList.lockContent(pngFileModel.name);
 
             lockFilePage.checkLockFileCheckboxIsDisplayed();
             lockFilePage.clickCancelButton();
@@ -145,7 +146,7 @@ describe('Lock File', () => {
         });
 
         it('[C286603] Should be able to click on Lock file checkbox and lock a file', () => {
-            contentList.clickContentLockIcon(pngFileToLock.name);
+            contentList.lockContent(pngFileToLock.name);
 
             lockFilePage.checkLockFileCheckboxIsDisplayed();
             lockFilePage.clickLockFileCheckbox();
@@ -155,14 +156,14 @@ describe('Lock File', () => {
         });
 
         it('[C286618] Should be able to uncheck Lock file checkbox and unlock a file', () => {
-            contentList.clickContentLockIcon(pngFileModel.name);
+            contentList.lockContent(pngFileModel.name);
 
             lockFilePage.checkLockFileCheckboxIsDisplayed();
             lockFilePage.clickLockFileCheckbox();
             lockFilePage.clickSaveButton();
 
             contentList.checkLockedIcon(pngFileModel.name);
-            contentList.clickContentLockIcon(pngFileModel.name);
+            contentList.lockContent(pngFileModel.name);
 
             lockFilePage.clickLockFileCheckbox();
             lockFilePage.clickSaveButton();
@@ -197,7 +198,7 @@ describe('Lock File', () => {
         });
 
         it('[C286610] Should not be able to delete a locked file', async () => {
-            await contentList.clickContentLockIcon(pngFileModel.name);
+            await contentList.lockContent(pngFileModel.name);
 
             await lockFilePage.checkLockFileCheckboxIsDisplayed();
             await lockFilePage.clickLockFileCheckbox();
@@ -213,7 +214,7 @@ describe('Lock File', () => {
         });
 
         it('[C286611] Should not be able to rename a locked file', async () => {
-            await contentList.clickContentLockIcon(pngFileModel.name);
+            await contentList.lockContent(pngFileModel.name);
 
             await lockFilePage.checkLockFileCheckboxIsDisplayed();
             await lockFilePage.clickLockFileCheckbox();
@@ -229,7 +230,7 @@ describe('Lock File', () => {
         });
 
         it('[C286612] Should not be able to move a locked file', async () => {
-            await contentList.clickContentLockIcon(pngFileModel.name);
+            await contentList.lockContent(pngFileModel.name);
 
             await lockFilePage.checkLockFileCheckboxIsDisplayed();
             await lockFilePage.clickLockFileCheckbox();
@@ -244,7 +245,7 @@ describe('Lock File', () => {
         });
 
         it('[C286613] Should not be able to update a new version on a locked file', async () => {
-            await contentList.clickContentLockIcon(pngFileModel.name);
+            await contentList.lockContent(pngFileModel.name);
 
             await lockFilePage.checkLockFileCheckboxIsDisplayed();
             await lockFilePage.clickLockFileCheckbox();
@@ -262,8 +263,10 @@ describe('Lock File', () => {
 
     describe('Locked file with owner permissions', () => {
 
+        let pngFileToBeLocked;
+
         beforeAll(async (done) => {
-            let pngFileToBeLocked = await uploadActions.uploadFile(this.alfrescoJsApi, pngFileToLock.location, pngFileToLock.name, documentLibrary);
+            pngFileToBeLocked = await uploadActions.uploadFile(this.alfrescoJsApi, pngFileToLock.location, pngFileToLock.name, documentLibrary);
 
             lockedFileNodeId = pngFileToBeLocked.entry.id;
 
@@ -291,8 +294,8 @@ describe('Lock File', () => {
 
         });
 
-        it('[C286614] Owner of the locked file should be able to rename if "Allow owner to modify" is checked', async () => {
-            await contentList.clickContentLockIcon(pngFileModel.name);
+        it('[C286614] Owner of the locked file should be able to rename if Allow owner to modify is checked', async () => {
+            await contentList.lockContent(pngFileModel.name);
 
             await lockFilePage.checkLockFileCheckboxIsDisplayed();
             await lockFilePage.clickLockFileCheckbox();
@@ -304,8 +307,8 @@ describe('Lock File', () => {
             expect(response.entry.name).toEqual('My new name');
         });
 
-        it('[C286615] Owner of the locked file should be able to update a new version if "Allow owner to modify" is checked', async () => {
-            await contentList.clickContentLockIcon(pngFileModel.name);
+        it('[C286615] Owner of the locked file should be able to update a new version if Allow owner to modify is checked', async () => {
+            await contentList.lockContent(pngFileModel.name);
 
             await lockFilePage.checkLockFileCheckboxIsDisplayed();
             await lockFilePage.clickLockFileCheckbox();
@@ -317,8 +320,8 @@ describe('Lock File', () => {
             expect(response.entry.modifiedAt).toBeGreaterThan(response.entry.createdAt);
         });
 
-        it('[C286616] Owner of the locked file should be able to move if "Allow owner to modify" is checked', async () => {
-            await contentList.clickContentLockIcon(pngFileModel.name);
+        it('[C286616] Owner of the locked file should be able to move if Allow owner to modify is checked', async () => {
+            await contentList.lockContent(pngFileModel.name);
 
             await lockFilePage.checkLockFileCheckboxIsDisplayed();
             await lockFilePage.clickLockFileCheckbox();
@@ -333,29 +336,21 @@ describe('Lock File', () => {
 
         });
 
-        it('[C286617] Owner of the locked file should be able to delete if "Allow owner to modify" is checked', async () => {
-
+        it('[C286617] Owner of the locked file should be able to delete if Allow owner to modify is checked', () => {
             loginPage.loginToContentServicesUsingUserModel(adminUser);
 
             navigationBarPage.openContentServicesFolder(documentLibrary);
 
-            await contentList.clickContentLockIcon(pngFileToLock.name);
+            contentList.lockContent(pngFileToLock.name);
 
-            await lockFilePage.checkLockFileCheckboxIsDisplayed();
-            await lockFilePage.clickLockFileCheckbox();
-            await lockFilePage.clickAllowOwnerCheckbox();
-            await lockFilePage.clickSaveButton();
+            lockFilePage.checkLockFileCheckboxIsDisplayed();
+            lockFilePage.clickLockFileCheckbox();
+            lockFilePage.clickAllowOwnerCheckbox();
+            lockFilePage.clickSaveButton();
 
-            await this.alfrescoJsApi.core.nodesApi.deleteNode(lockedFileNodeId);
-
-            try {
-                await this.alfrescoJsApi.core.nodesApi.getNode(lockedFileNodeId);
-
-            } catch (error) {
-                expect(error.status).toEqual(404);
-            }
+            contentList.deleteContent(pngFileToBeLocked.entry.name);
+            contentList.checkContentIsNotDisplayed(pngFileToBeLocked.entry.name);
         });
 
     });
-
 });
diff --git a/e2e/content-services/notifications_component.e2e.ts b/e2e/content-services/notifications_component.e2e.ts
index ee992bc4b5..cc38a00d09 100644
--- a/e2e/content-services/notifications_component.e2e.ts
+++ b/e2e/content-services/notifications_component.e2e.ts
@@ -16,7 +16,7 @@
  */
 
 import { LoginPage } from '../pages/adf/loginPage';
-import AcsUserModel = require('../models/ACS/acsUserModel');
+import { AcsUserModel } from '../models/ACS/acsUserModel';
 import TestConfig = require('../test.config');
 import AlfrescoApi = require('alfresco-js-api-node');
 import { NotificationPage } from '../pages/adf/notificationPage';
diff --git a/e2e/content-services/permissions_component.e2e.ts b/e2e/content-services/permissions_component.e2e.ts
index 708bf493f8..c87b284f05 100644
--- a/e2e/content-services/permissions_component.e2e.ts
+++ b/e2e/content-services/permissions_component.e2e.ts
@@ -18,14 +18,14 @@
 import { PermissionsPage } from '../pages/adf/permissionsPage';
 import { LoginPage } from '../pages/adf/loginPage';
 import { ContentServicesPage } from '../pages/adf/contentServicesPage';
-import AcsUserModel = require('../models/ACS/acsUserModel');
+import { AcsUserModel } from '../models/ACS/acsUserModel';
 import TestConfig = require('../test.config');
 import resources = require('../util/resources');
-import ContentListPage = require('../pages/adf/dialog/contentList');
+import { ContentListPage } from '../pages/adf/dialog/contentListPage';
 import AlfrescoApi = require('alfresco-js-api-node');
-import FileModel = require('../models/ACS/fileModel');
+import { FileModel } from '../models/ACS/fileModel';
 import { UploadActions } from '../actions/ACS/upload.actions';
-import Util = require('../util/util');
+import { Util } from '../util/util';
 import { browser } from 'protractor';
 
 describe('Permissions Component', function () {
diff --git a/e2e/content-services/share-file/share_file.e2e.ts b/e2e/content-services/share-file/share_file.e2e.ts
index 7a9494d081..b72cc17891 100644
--- a/e2e/content-services/share-file/share_file.e2e.ts
+++ b/e2e/content-services/share-file/share_file.e2e.ts
@@ -17,13 +17,13 @@
 
 import { LoginPage } from '../../pages/adf/loginPage';
 import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
-import ContentListPage = require('../../pages/adf/dialog/contentList');
+import { ContentListPage } from '../../pages/adf/dialog/contentListPage';
 import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
 import { ViewerPage } from '../../pages/adf/viewerPage';
 import { ShareDialog } from '../../pages/adf/dialog/shareDialog';
 
-import AcsUserModel = require('../../models/ACS/acsUserModel');
-import FileModel = require('../../models/ACS/fileModel');
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
+import { FileModel } from '../../models/ACS/fileModel';
 
 import TestConfig = require('../../test.config');
 import resources = require('../../util/resources');
@@ -81,8 +81,8 @@ describe('Share file', () => {
     });
 
     describe('Shared link dialog', () => {
-        afterEach(async (done) => {
-            await browser.refresh();
+        afterEach( (done) => {
+            browser.refresh();
             done();
         });
 
@@ -141,9 +141,9 @@ describe('Share file', () => {
     });
 
     describe('Shared link preview', () => {
-        afterEach(async (done) => {
-            await loginPage.loginToContentServicesUsingUserModel(acsUser);
-            await contentServicesPage.navigateToDocumentList();
+        afterEach( (done) => {
+            loginPage.loginToContentServicesUsingUserModel(acsUser);
+            contentServicesPage.navigateToDocumentList();
             done();
         });
 
diff --git a/e2e/content-services/share-file/unshare_file.e2e.ts b/e2e/content-services/share-file/unshare_file.e2e.ts
index 00c4dcbe51..dee1de891e 100644
--- a/e2e/content-services/share-file/unshare_file.e2e.ts
+++ b/e2e/content-services/share-file/unshare_file.e2e.ts
@@ -16,15 +16,15 @@
  */
 
 import CONSTANTS = require('../../util/constants');
-import Util = require('../../util/util');
+import { Util } from '../../util/util';
 import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
 import { LoginPage } from '../../pages/adf/loginPage';
 import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
-import ContentListPage = require('../../pages/adf/dialog/contentList');
-import ErrorPage = require('../../pages/adf/errorPage');
+import { ContentListPage } from '../../pages/adf/dialog/contentListPage';
+import { ErrorPage } from '../../pages/adf/errorPage';
 import { ShareDialog } from '../../pages/adf/dialog/shareDialog';
-import AcsUserModel = require('../../models/ACS/acsUserModel');
-import FileModel = require('../../models/ACS/fileModel');
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
+import { FileModel } from '../../models/ACS/fileModel';
 import TestConfig = require('../../test.config');
 import resources = require('../../util/resources');
 import AlfrescoApi = require('alfresco-js-api-node');
@@ -51,7 +51,7 @@ describe('Unshare file', () => {
         'location': resources.Files.ADF_DOCUMENTS.PNG.file_location
     });
 
-    beforeAll(async(done) => {
+    beforeAll(async (done) => {
         const site = {
             title: siteName,
             visibility: 'PRIVATE',
@@ -142,10 +142,10 @@ describe('Unshare file', () => {
             shareDialog.clickUnShareFile();
             shareDialog.confirmationDialogIsDisplayed();
             shareDialog.clickConfirmationDialogRemoveButton();
-            shareDialog.shareToggleButtonIsChecked();
+            shareDialog.dialogIsClosed();
         });
 
-        it('[C280556] Should redirect to 404 when trying to access an unshared file', async() => {
+        it('[C280556] Should redirect to 404 when trying to access an unshared file', async () => {
             contentListPage.clickRowToSelect(pngFileModel.name);
             contentServicesPage.clickShareButton();
             shareDialog.checkDialogIsDisplayed();
diff --git a/e2e/content-services/tag_component.e2e.ts b/e2e/content-services/tag_component.e2e.ts
index fe3f4781eb..764b1ac35e 100644
--- a/e2e/content-services/tag_component.e2e.ts
+++ b/e2e/content-services/tag_component.e2e.ts
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import AcsUserModel = require('../models/ACS/acsUserModel');
-import FileModel = require('../models/ACS/fileModel');
+import { AcsUserModel } from '../models/ACS/acsUserModel';
+import { FileModel } from '../models/ACS/fileModel';
 
 import { LoginPage } from '../pages/adf/loginPage';
 import { TagPage } from '../pages/adf/tagPage';
@@ -28,7 +28,7 @@ import resources = require('../util/resources');
 import AlfrescoApi = require('alfresco-js-api-node');
 import { UploadActions } from '../actions/ACS/upload.actions';
 
-import Util = require('../util/util');
+import { Util } from '../util/util';
 import { browser } from 'protractor';
 
 describe('Tag component', () => {
diff --git a/e2e/content-services/trashcan_pagination.e2e.ts b/e2e/content-services/trashcan_pagination.e2e.ts
index 592eeb5d34..963ee44cee 100644
--- a/e2e/content-services/trashcan_pagination.e2e.ts
+++ b/e2e/content-services/trashcan_pagination.e2e.ts
@@ -18,14 +18,14 @@
 import { LoginPage } from '../pages/adf/loginPage';
 import { TrashcanPage } from '../pages/adf/trashcanPage';
 
-import PaginationPage = require('../pages/adf/paginationPage');
+import { PaginationPage } from '../pages/adf/paginationPage';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 
-import AcsUserModel = require('../models/ACS/acsUserModel');
-import FolderModel = require('../models/ACS/folderModel');
+import { AcsUserModel } from '../models/ACS/acsUserModel';
+import { FolderModel } from '../models/ACS/folderModel';
 
 import TestConfig = require('../test.config');
-import Util = require('../util/util');
+import { Util } from '../util/util';
 
 import AlfrescoApi = require('alfresco-js-api-node');
 import { UploadActions } from '../actions/ACS/upload.actions';
diff --git a/e2e/content-services/tree_view_component.e2e.ts b/e2e/content-services/tree_view_component.e2e.ts
index ee8330733d..6e64b3c04d 100644
--- a/e2e/content-services/tree_view_component.e2e.ts
+++ b/e2e/content-services/tree_view_component.e2e.ts
@@ -19,7 +19,7 @@ import { LoginPage } from '../pages/adf/loginPage';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 import { TreeViewPage } from '../pages/adf/content_services/treeViewPage';
 
-import AcsUserModel = require('../models/ACS/acsUserModel');
+import { AcsUserModel } from '../models/ACS/acsUserModel';
 
 import TestConfig = require('../test.config');
 
diff --git a/e2e/content-services/upload/excluded_file.e2e.ts b/e2e/content-services/upload/excluded_file.e2e.ts
index c62329a228..d7156c2bb7 100644
--- a/e2e/content-services/upload/excluded_file.e2e.ts
+++ b/e2e/content-services/upload/excluded_file.e2e.ts
@@ -19,13 +19,13 @@ import { element, by, browser } from 'protractor';
 
 import { LoginPage } from '../../pages/adf/loginPage';
 import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
-import UploadDialog = require('../../pages/adf/dialog/uploadDialog');
+import { UploadDialog } from '../../pages/adf/dialog/uploadDialog';
 import { UploadToggles } from '../../pages/adf/dialog/uploadToggles';
 import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
 
-import AcsUserModel = require('../../models/ACS/acsUserModel');
-import FileModel = require('../../models/ACS/fileModel');
-import FolderModel = require('../../models/ACS/folderModel');
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
+import { FileModel } from '../../models/ACS/fileModel';
+import { FolderModel } from '../../models/ACS/folderModel';
 
 import TestConfig = require('../../test.config');
 import resources = require('../../util/resources');
diff --git a/e2e/content-services/upload/uploader_component.e2e.ts b/e2e/content-services/upload/uploader_component.e2e.ts
index a16755193d..7a3620c640 100644
--- a/e2e/content-services/upload/uploader_component.e2e.ts
+++ b/e2e/content-services/upload/uploader_component.e2e.ts
@@ -19,12 +19,12 @@ import { element, by, browser } from 'protractor';
 
 import { LoginPage } from '../../pages/adf/loginPage';
 import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
-import UploadDialog = require('../../pages/adf/dialog/uploadDialog');
+import { UploadDialog } from '../../pages/adf/dialog/uploadDialog';
 import { UploadToggles } from '../../pages/adf/dialog/uploadToggles';
 
-import AcsUserModel = require('../../models/ACS/acsUserModel');
-import FileModel = require('../../models/ACS/fileModel');
-import FolderModel = require('../../models/ACS/folderModel');
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
+import { FileModel } from '../../models/ACS/fileModel';
+import { FolderModel } from '../../models/ACS/folderModel';
 
 import TestConfig = require('../../test.config');
 import resources = require('../../util/resources');
diff --git a/e2e/content-services/upload/user_permission.e2e.ts b/e2e/content-services/upload/user_permission.e2e.ts
index 1276493989..65b6ac7f7f 100644
--- a/e2e/content-services/upload/user_permission.e2e.ts
+++ b/e2e/content-services/upload/user_permission.e2e.ts
@@ -17,18 +17,18 @@
 
 import { element, by, browser } from 'protractor';
 
-import Util = require('../../util/util');
+import { Util } from '../../util/util';
 
 import { LoginPage } from '../../pages/adf/loginPage';
 import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
-import UploadDialog = require('../../pages/adf/dialog/uploadDialog');
+import { UploadDialog } from '../../pages/adf/dialog/uploadDialog';
 import { UploadToggles } from '../../pages/adf/dialog/uploadToggles';
 import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
 import { NotificationPage } from '../../pages/adf/notificationPage';
 
-import AcsUserModel = require('../../models/ACS/acsUserModel');
-import FileModel = require('../../models/ACS/fileModel');
-import FolderModel = require('../../models/ACS/folderModel');
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
+import { FileModel } from '../../models/ACS/fileModel';
+import { FolderModel } from '../../models/ACS/folderModel';
 
 import TestConfig = require('../../test.config');
 import resources = require('../../util/resources');
diff --git a/e2e/content-services/version/version-actions.e2e.ts b/e2e/content-services/version/version-actions.e2e.ts
index 231a3549eb..59ccc6e622 100644
--- a/e2e/content-services/version/version-actions.e2e.ts
+++ b/e2e/content-services/version/version-actions.e2e.ts
@@ -19,18 +19,18 @@ import { by, element } from 'protractor';
 
 import { LoginPage } from '../../pages/adf/loginPage';
 import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
-import ContentListPage = require('../../pages/adf/dialog/contentList');
+import { ContentListPage } from '../../pages/adf/dialog/contentListPage';
 import { VersionManagePage } from '../../pages/adf/versionManagerPage';
 
-import AcsUserModel = require('../../models/ACS/acsUserModel');
-import FileModel = require('../../models/ACS/fileModel');
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
+import { FileModel } from '../../models/ACS/fileModel';
 
 import TestConfig = require('../../test.config');
 import resources = require('../../util/resources');
 
 import AlfrescoApi = require('alfresco-js-api-node');
 import { UploadActions } from '../../actions/ACS/upload.actions';
-import Util = require('../../util/util');
+import { Util } from '../../util/util';
 import path = require('path');
 
 describe('Version component actions', () => {
diff --git a/e2e/content-services/version/version-permissions.e2e.ts b/e2e/content-services/version/version-permissions.e2e.ts
index 31e538f782..0dfec90a76 100644
--- a/e2e/content-services/version/version-permissions.e2e.ts
+++ b/e2e/content-services/version/version-permissions.e2e.ts
@@ -18,14 +18,14 @@
 import { element, by } from 'protractor';
 
 import { LoginPage } from '../../pages/adf/loginPage';
-import ContentListPage = require('../../pages/adf/dialog/contentList');
+import { ContentListPage } from '../../pages/adf/dialog/contentListPage';
 import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
 import { VersionManagePage } from '../../pages/adf/versionManagerPage';
-import UploadDialog = require('../../pages/adf/dialog/uploadDialog');
+import { UploadDialog } from '../../pages/adf/dialog/uploadDialog';
 import { NotificationPage } from '../../pages/adf/notificationPage';
 
-import AcsUserModel = require('../../models/ACS/acsUserModel');
-import FileModel = require('../../models/ACS/fileModel');
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
+import { FileModel } from '../../models/ACS/fileModel';
 
 import TestConfig = require('../../test.config');
 import resources = require('../../util/resources');
@@ -34,7 +34,7 @@ import AlfrescoApi = require('alfresco-js-api-node');
 import { UploadActions } from '../../actions/ACS/upload.actions';
 import { NodeActions } from '../../actions/ACS/node.actions';
 
-import Util = require('../../util/util');
+import { Util } from '../../util/util';
 import CONSTANTS = require('../../util/constants');
 
 describe('Version component permissions', () => {
diff --git a/e2e/content-services/version/version-properties.e2e.ts b/e2e/content-services/version/version-properties.e2e.ts
index 26b02504ac..8877c7cd18 100644
--- a/e2e/content-services/version/version-properties.e2e.ts
+++ b/e2e/content-services/version/version-properties.e2e.ts
@@ -19,18 +19,18 @@ import { by, element } from 'protractor';
 
 import { LoginPage } from '../../pages/adf/loginPage';
 import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
-import ContentListPage = require('../../pages/adf/dialog/contentList');
+import { ContentListPage } from '../../pages/adf/dialog/contentListPage';
 import { VersionManagePage } from '../../pages/adf/versionManagerPage';
 
-import AcsUserModel = require('../../models/ACS/acsUserModel');
-import FileModel = require('../../models/ACS/fileModel');
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
+import { FileModel } from '../../models/ACS/fileModel';
 
 import TestConfig = require('../../test.config');
 import resources = require('../../util/resources');
 
 import AlfrescoApi = require('alfresco-js-api-node');
 import { UploadActions } from '../../actions/ACS/upload.actions';
-import Util = require('../../util/util');
+import { Util } from '../../util/util';
 
 describe('Version Properties', () => {
 
diff --git a/e2e/content-services/version/version-smoke-tests.e2e.ts b/e2e/content-services/version/version-smoke-tests.e2e.ts
index a3beb94359..ec9b78f545 100644
--- a/e2e/content-services/version/version-smoke-tests.e2e.ts
+++ b/e2e/content-services/version/version-smoke-tests.e2e.ts
@@ -19,18 +19,18 @@ import { browser } from 'protractor';
 
 import { LoginPage } from '../../pages/adf/loginPage';
 import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
-import ContentListPage = require('../../pages/adf/dialog/contentList');
+import { ContentListPage } from '../../pages/adf/dialog/contentListPage';
 import { VersionManagePage } from '../../pages/adf/versionManagerPage';
 
-import AcsUserModel = require('../../models/ACS/acsUserModel');
-import FileModel = require('../../models/ACS/fileModel');
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
+import { FileModel } from '../../models/ACS/fileModel';
 
 import TestConfig = require('../../test.config');
 import resources = require('../../util/resources');
 
 import AlfrescoApi = require('alfresco-js-api-node');
 import { UploadActions } from '../../actions/ACS/upload.actions';
-import Util = require('../../util/util');
+import { Util } from '../../util/util';
 
 describe('Version component', () => {
 
diff --git a/e2e/core/card-view/aspect-oriented-config.e2e.ts b/e2e/core/card-view/aspect-oriented-config.e2e.ts
index 67a51ce4b3..f72721afc0 100644
--- a/e2e/core/card-view/aspect-oriented-config.e2e.ts
+++ b/e2e/core/card-view/aspect-oriented-config.e2e.ts
@@ -19,12 +19,12 @@ import { browser } from 'protractor';
 
 import { LoginPage } from '../../pages/adf/loginPage';
 import { ViewerPage } from '../../pages/adf/viewerPage';
-import CardViewPage = require('../../pages/adf/metadataViewPage');
+import { MetadataViewPage } from '../../pages/adf/metadataViewPage';
 import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
 import { ConfigEditorPage } from '../../pages/adf/configEditorPage';
 
-import AcsUserModel = require('../../models/ACS/acsUserModel');
-import FileModel = require('../../models/ACS/fileModel');
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
+import { FileModel } from '../../models/ACS/fileModel';
 
 import TestConfig = require('../../test.config');
 import resources = require('../../util/resources');
@@ -37,7 +37,7 @@ describe('Aspect oriented config', () => {
 
     const loginPage = new LoginPage();
     const viewerPage = new ViewerPage();
-    const metadataViewPage = new CardViewPage();
+    const metadataViewPage = new MetadataViewPage();
     const navigationBarPage = new NavigationBarPage();
     const configEditorPage = new ConfigEditorPage();
     let contentServicesPage = new ContentServicesPage();
@@ -71,13 +71,13 @@ describe('Aspect oriented config', () => {
         done();
     });
 
-    beforeEach(async(done) => {
+    beforeEach(async (done) => {
         navigationBarPage.clickConfigEditorButton();
         configEditorPage.clickClearButton();
         done();
     });
 
-    afterEach(async(done) => {
+    afterEach(async (done) => {
         viewerPage.clickCloseButton();
         contentServicesPage.checkAcsContainer();
         browser.refresh();
@@ -96,7 +96,8 @@ describe('Aspect oriented config', () => {
             '                }' +
             '            ]' +
             '        }]' +
-            '    }');
+            '    }' +
+            '  }');
 
         configEditorPage.clickSaveButton();
 
@@ -148,7 +149,7 @@ describe('Aspect oriented config', () => {
         metadataViewPage.checkMetadataGroupIsNotPresent('exists');
     });
 
-    it('[C260183] Should show all the aspect if the content-metadata configuration is NOT provided' , () => {
+    it('[C260183] Should show all the aspect if the content-metadata configuration is NOT provided', () => {
 
         configEditorPage.enterConfiguration('{ }');
 
@@ -172,7 +173,7 @@ describe('Aspect oriented config', () => {
         metadataViewPage.checkMetadataGroupIsPresent('Content');
     });
 
-    it('[C260182] Should show all the aspects if the default configuration contains the star symbol' , () => {
+    it('[C260182] Should show all the aspects if the default configuration contains the star symbol', () => {
 
         configEditorPage.enterConfiguration('{' +
             '    "presets": {' +
@@ -201,7 +202,7 @@ describe('Aspect oriented config', () => {
         metadataViewPage.checkMetadataGroupIsPresent('Content');
     });
 
-    it('[C268899] Should be possible use a Translation key as Title of a metadata group' , () => {
+    it('[C268899] Should be possible use a Translation key as Title of a metadata group', () => {
 
         configEditorPage.enterConfiguration('{' +
             '  "presets": {' +
@@ -251,7 +252,7 @@ describe('Aspect oriented config', () => {
 
     });
 
-    it('[C279968] Should be possible use a custom preset' , () => {
+    it('[C279968] Should be possible use a custom preset', () => {
 
         configEditorPage.enterConfiguration('{' +
             '    "presets": {' +
diff --git a/e2e/core/card-view/card-view-component.e2e.ts b/e2e/core/card-view/card-view-component.e2e.ts
index 9e6a87d6d0..5156095086 100644
--- a/e2e/core/card-view/card-view-component.e2e.ts
+++ b/e2e/core/card-view/card-view-component.e2e.ts
@@ -19,22 +19,21 @@ import { element, by } from 'protractor';
 
 import { LoginPage } from '../../pages/adf/loginPage';
 import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
-
-import CardViewPage = require('../../pages/adf/metadataViewPage');
+import { MetadataViewPage } from '../../pages/adf/metadataViewPage';
 
 import TestConfig = require('../../test.config');
 import resources = require('../../util/resources');
 import AlfrescoApi = require('alfresco-js-api-node');
 import { UsersActions } from '../../actions/users.actions';
 import { AppsActions } from '../../actions/APS/apps.actions';
-import CardViewPageComponent = require('../../pages/adf/cardViewPageComponent');
-import Util = require('../../util/util');
+import { CardViewComponentPage } from '../../pages/adf/cardViewComponentPage';
+import { Util } from '../../util/util';
 
 describe('CardView Component', () => {
     const loginPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
-    const cardViewPageComponent = new CardViewPageComponent();
-    const metadataViewPage = new CardViewPage();
+    const cardViewPageComponent = new CardViewComponentPage();
+    const metadataViewPage = new MetadataViewPage();
 
     const app = resources.Files.APP_WITH_PROCESSES;
 
@@ -69,7 +68,7 @@ describe('CardView Component', () => {
     describe('key-value pair ', () => {
 
         it('[C279938] Should the label be present', () => {
-            let label = element(by.xpath('div[data-automation-id="card-key-value-pairs-label-key-value-pairs"]'));
+            let label = element(by.css('div[data-automation-id="card-key-value-pairs-label-key-value-pairs"]'));
 
             Util.waitUntilElementIsPresent(label);
         });
@@ -91,7 +90,7 @@ describe('CardView Component', () => {
     describe('SelectBox', () => {
 
         it('[C279939] Should the label be present', () => {
-            let label = element(by.xpath('div[data-automation-id="card-select-label-select"]'));
+            let label = element(by.css('div[data-automation-id="card-select-label-select"]'));
 
             Util.waitUntilElementIsPresent(label);
         });
@@ -108,7 +107,7 @@ describe('CardView Component', () => {
     describe('Text', () => {
 
         it('[C279937] Should the label be present', () => {
-            let label = element(by.xpath('div[data-automation-id="card-textitem-label-name"]'));
+            let label = element(by.css('div[data-automation-id="card-textitem-label-name"]'));
 
             Util.waitUntilElementIsPresent(label);
         });
@@ -139,7 +138,7 @@ describe('CardView Component', () => {
     describe('Int', () => {
 
         it('[C279940] Should the label be present', () => {
-            let label = element(by.xpath('div[data-automation-id="card-textitem-label-int"]'));
+            let label = element(by.css('div[data-automation-id="card-textitem-label-int"]'));
 
             Util.waitUntilElementIsPresent(label);
         });
@@ -213,7 +212,7 @@ describe('CardView Component', () => {
     describe('Float', () => {
 
         it('[C279941] Should the label be present', () => {
-            let label = element(by.xpath('div[data-automation-id="card-textitem-label-float"]'));
+            let label = element(by.css('div[data-automation-id="card-textitem-label-float"]'));
 
             Util.waitUntilElementIsPresent(label);
         });
@@ -263,7 +262,7 @@ describe('CardView Component', () => {
     describe('Boolean', () => {
 
         it('[C279942] Should the label be present', () => {
-            let label = element(by.xpath('div[data-automation-id="card-boolean-label-boolean"]'));
+            let label = element(by.css('div[data-automation-id="card-boolean-label-boolean"]'));
 
             Util.waitUntilElementIsPresent(label);
         });
@@ -282,11 +281,11 @@ describe('CardView Component', () => {
     describe('Date and DateTime', () => {
 
         it('[C279961] Should the label be present', () => {
-            let labelDate = element(by.xpath('div[data-automation-id="card-dateitem-label-date"]'));
+            let labelDate = element(by.css('div[data-automation-id="card-dateitem-label-date"]'));
 
             Util.waitUntilElementIsPresent(labelDate);
 
-            let labelDatetime = element(by.xpath('div[data-automation-id="card-dateitem-label-datetime"]'));
+            let labelDatetime = element(by.css('div[data-automation-id="card-dateitem-label-datetime"]'));
 
             Util.waitUntilElementIsPresent(labelDatetime);
         });
@@ -301,11 +300,11 @@ describe('CardView Component', () => {
     it('[C279936] Should not be possible edit any parameter when editable property is false', () => {
         cardViewPageComponent.disableEdit();
 
-        let editIconText = element(by.xpath('mat-icon[data-automation-id="card-textitem-edit-icon-name"]'));
-        let editIconInt = element(by.xpath('mat-icon[data-automation-id="card-textitem-edit-icon-int"]'));
-        let editIconFloat = element(by.xpath('mat-icon[data-automation-id="card-textitem-edit-icon-float"]'));
-        let editIconKey = element(by.xpath('mat-icon[data-automation-id="card-key-value-pairs-button-key-value-pairs"]'));
-        let editIconData = element(by.xpath('mat-datetimepicker-toggle'));
+        let editIconText = element(by.css('mat-icon[data-automation-id="card-textitem-edit-icon-name"]'));
+        let editIconInt = element(by.css('mat-icon[data-automation-id="card-textitem-edit-icon-int"]'));
+        let editIconFloat = element(by.css('mat-icon[data-automation-id="card-textitem-edit-icon-float"]'));
+        let editIconKey = element(by.css('mat-icon[data-automation-id="card-key-value-pairs-button-key-value-pairs"]'));
+        let editIconData = element(by.css('mat-datetimepicker-toggle'));
 
         Util.waitUntilElementIsNotVisible(editIconText);
         Util.waitUntilElementIsNotVisible(editIconInt);
diff --git a/e2e/core/card-view/metadata-permissions.e2e.ts b/e2e/core/card-view/metadata-permissions.e2e.ts
index bb18e9ae09..7e91c5eb68 100644
--- a/e2e/core/card-view/metadata-permissions.e2e.ts
+++ b/e2e/core/card-view/metadata-permissions.e2e.ts
@@ -17,11 +17,11 @@
 
 import { LoginPage } from '../../pages/adf/loginPage';
 import { ViewerPage } from '../../pages/adf/viewerPage';
-import CardViewPage = require('../../pages/adf/metadataViewPage');
+import { MetadataViewPage } from '../../pages/adf/metadataViewPage';
 import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
 
-import AcsUserModel = require('../../models/ACS/acsUserModel');
-import FileModel = require('../../models/ACS/fileModel');
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
+import { FileModel } from '../../models/ACS/fileModel';
 
 import TestConfig = require('../../test.config');
 import resources = require('../../util/resources');
@@ -29,7 +29,7 @@ import resources = require('../../util/resources');
 import AlfrescoApi = require('alfresco-js-api-node');
 import { UploadActions } from '../../actions/ACS/upload.actions';
 
-import Util = require('../../util/util');
+import { Util } from '../../util/util';
 import CONSTANTS = require('../../util/constants');
 
 describe('permissions', () => {
@@ -49,7 +49,7 @@ describe('permissions', () => {
 
     const loginPage = new LoginPage();
     const viewerPage = new ViewerPage();
-    const metadataViewPage = new CardViewPage();
+    const metadataViewPage = new MetadataViewPage();
     const navigationBarPage = new NavigationBarPage();
 
     let consumerUser = new AcsUserModel();
diff --git a/e2e/core/card-view/metadata-properties.e2e.ts b/e2e/core/card-view/metadata-properties.e2e.ts
index 380ab17550..43adc85018 100644
--- a/e2e/core/card-view/metadata-properties.e2e.ts
+++ b/e2e/core/card-view/metadata-properties.e2e.ts
@@ -18,10 +18,10 @@
 import { LoginPage } from '../../pages/adf/loginPage';
 import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
 import { ViewerPage } from '../../pages/adf/viewerPage';
-import CardViewPage = require('../../pages/adf/metadataViewPage');
+import { MetadataViewPage } from '../../pages/adf/metadataViewPage';
 
-import AcsUserModel = require('../../models/ACS/acsUserModel');
-import FileModel = require('../../models/ACS/fileModel');
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
+import { FileModel } from '../../models/ACS/fileModel';
 
 import TestConfig = require('../../test.config');
 import resources = require('../../util/resources');
@@ -47,7 +47,7 @@ describe('CardView Component - properties', () => {
     let loginPage = new LoginPage();
     let contentServicesPage = new ContentServicesPage();
     let viewerPage = new ViewerPage();
-    let metadataViewPage = new CardViewPage();
+    let metadataViewPage = new MetadataViewPage();
 
     let acsUser = new AcsUserModel();
 
diff --git a/e2e/core/card-view/metadata-smoke-tests.e2e.ts b/e2e/core/card-view/metadata-smoke-tests.e2e.ts
index 6df360c8aa..ff90a4abe8 100644
--- a/e2e/core/card-view/metadata-smoke-tests.e2e.ts
+++ b/e2e/core/card-view/metadata-smoke-tests.e2e.ts
@@ -20,11 +20,11 @@ import { browser } from 'protractor';
 import { LoginPage } from '../../pages/adf/loginPage';
 import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
 import { ViewerPage } from '../../pages/adf/viewerPage';
-import CardViewPage = require('../../pages/adf/metadataViewPage');
-import ContentListPage = require('../../pages/adf/dialog/contentList');
+import { MetadataViewPage } from '../../pages/adf/metadataViewPage';
+import { ContentListPage } from '../../pages/adf/dialog/contentListPage';
 
-import AcsUserModel = require('../../models/ACS/acsUserModel');
-import FileModel = require('../../models/ACS/fileModel');
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
+import { FileModel } from '../../models/ACS/fileModel';
 
 import TestConfig = require('../../test.config');
 import resources = require('../../util/resources');
@@ -51,7 +51,7 @@ describe('Metadata component', () => {
     const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const viewerPage = new ViewerPage();
-    const metadataViewPage = new CardViewPage();
+    const metadataViewPage = new MetadataViewPage();
     const contentListPage = new ContentListPage();
 
     let acsUser = new AcsUserModel();
diff --git a/e2e/core/datatable/data-table-component-selection.e2e.ts b/e2e/core/datatable/data-table-component-selection.e2e.ts
index b9761fcd26..1b6cd27f27 100644
--- a/e2e/core/datatable/data-table-component-selection.e2e.ts
+++ b/e2e/core/datatable/data-table-component-selection.e2e.ts
@@ -16,17 +16,19 @@
  */
 
 import { LoginPage } from '../../pages/adf/loginPage';
-import DataTablePage = require('../../pages/adf/dataTablePage');
+import { DataTablePage } from '../../pages/adf/dataTablePage';
 import TestConfig = require('../../test.config');
 
-import AcsUserModel = require('../../models/ACS/acsUserModel');
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
 import AlfrescoApi = require('alfresco-js-api-node');
+import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
 
 describe('Datatable component - selection', () => {
 
     let dataTablePage = new DataTablePage();
     let loginPage = new LoginPage();
     let acsUser = new AcsUserModel();
+    let navigationBarPage = new NavigationBarPage();
 
     beforeAll(async (done) => {
         this.alfrescoJsApi = new AlfrescoApi({
@@ -40,7 +42,7 @@ describe('Datatable component - selection', () => {
 
         loginPage.loginToContentServicesUsingUserModel(acsUser);
 
-        dataTablePage.goToDatatable();
+        navigationBarPage.navigateToDatatable();
 
         done();
     });
diff --git a/e2e/core/datatable/data-table-component.e2e.ts b/e2e/core/datatable/data-table-component.e2e.ts
index 76fc478212..d2da549366 100644
--- a/e2e/core/datatable/data-table-component.e2e.ts
+++ b/e2e/core/datatable/data-table-component.e2e.ts
@@ -16,17 +16,19 @@
  */
 
 import { LoginPage } from '../../pages/adf/loginPage';
-import DataTablePage = require('../../pages/adf/dataTablePage');
-import AcsUserModel = require('../../models/ACS/acsUserModel');
+import { DataTablePage } from '../../pages/adf/dataTablePage';
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
 import TestConfig = require('../../test.config');
 
 import AlfrescoApi = require('alfresco-js-api-node');
+import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
 
 describe('Datatable component', () => {
 
     let dataTablePage = new DataTablePage();
     let loginPage = new LoginPage();
     let acsUser = new AcsUserModel();
+    let navigationBarPage = new NavigationBarPage();
 
     beforeAll(async (done) => {
         this.alfrescoJsApi = new AlfrescoApi({
@@ -40,7 +42,7 @@ describe('Datatable component', () => {
 
         loginPage.loginToContentServicesUsingUserModel(acsUser);
 
-        dataTablePage.goToDatatable();
+        navigationBarPage.navigateToDatatable();
 
         done();
     });
diff --git a/e2e/core/error_component.e2e.ts b/e2e/core/error_component.e2e.ts
index 3a1b2745e4..a026c47c69 100644
--- a/e2e/core/error_component.e2e.ts
+++ b/e2e/core/error_component.e2e.ts
@@ -16,10 +16,10 @@
  */
 
 import { LoginPage } from '../pages/adf/loginPage';
-import AcsUserModel = require('../models/ACS/acsUserModel');
+import { AcsUserModel } from '../models/ACS/acsUserModel';
 import TestConfig = require('../test.config');
 import AlfrescoApi = require('alfresco-js-api-node');
-import ErrorPage = require('../pages/adf/errorPage');
+import { ErrorPage } from '../pages/adf/errorPage';
 import { browser } from '../../node_modules/protractor';
 
 describe('Error Component', () => {
diff --git a/e2e/core/infinite_scrolling.e2e.ts b/e2e/core/infinite_scrolling.e2e.ts
index 17ebd10a79..da0168abc4 100644
--- a/e2e/core/infinite_scrolling.e2e.ts
+++ b/e2e/core/infinite_scrolling.e2e.ts
@@ -18,11 +18,11 @@
 import { LoginPage } from '../pages/adf/loginPage';
 import { ContentServicesPage } from '../pages/adf/contentServicesPage';
 
-import AcsUserModel = require('../models/ACS/acsUserModel');
-import FolderModel = require('../models/ACS/folderModel');
+import { AcsUserModel } from '../models/ACS/acsUserModel';
+import { FolderModel } from '../models/ACS/folderModel';
 
 import TestConfig = require('../test.config');
-import Util = require('../util/util');
+import { Util } from '../util/util';
 
 import AlfrescoApi = require('alfresco-js-api-node');
 import { UploadActions } from '../actions/ACS/upload.actions';
diff --git a/e2e/core/login/login-sso/login_sso.e2e.ts b/e2e/core/login/login-sso/login_sso.e2e.ts
index e0e827cb58..26e88ae557 100644
--- a/e2e/core/login/login-sso/login_sso.e2e.ts
+++ b/e2e/core/login/login-sso/login_sso.e2e.ts
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-import { LoginAPSPage } from '../../../pages/adf/loginApsPage';
+import { LoginSSOPage } from '../../../pages/adf/loginSSOPage';
 import { SettingsPage } from '../../../pages/adf/settingsPage';
 import TestConfig = require('../../../test.config');
 import { browser } from 'protractor';
-import { NavigationBarPage } from '../../../pages/adf/NavigationBarPage';
+import { NavigationBarPage } from '../../../pages/adf/navigationBarPage';
 
 describe('Login component - SSO', () => {
 
     const settingsPage = new SettingsPage();
-    const loginApsPage = new LoginAPSPage();
+    const loginApsPage = new LoginSSOPage();
     const navigationBarPage = new NavigationBarPage();
     const path = '/auth/realms/springboot';
     let silentLogin;
@@ -33,19 +33,17 @@ describe('Login component - SSO', () => {
         navigationBarPage.clickLogoutButton();
         browser.executeScript('window.sessionStorage.clear();');
         browser.executeScript('window.localStorage.clear();');
-       });
-
-    it('[C261050] Should be possible login in the PS with SSO', async () => {
-        silentLogin = false;
-        await settingsPage.setProviderBpmSso(TestConfig.adf.hostSso, TestConfig.adf.hostSso + path, silentLogin);
-        await loginApsPage.clickOnSSOButton();
-        browser.ignoreSynchronization = true;
-        await loginApsPage.loginAPS(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
     });
 
-    it ('[C280667] Should be redirect directly to keycloak without show the login page with silent login', async () => {
-        await settingsPage.setProviderBpmSso(TestConfig.adf.hostSso, TestConfig.adf.hostSso + path);
-        browser.ignoreSynchronization = true;
-        await loginApsPage.loginAPS(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+    it('[C261050] Should be possible login in the PS with SSO', () => {
+        silentLogin = false;
+        settingsPage.setProviderBpmSso(TestConfig.adf.hostSso, TestConfig.adf.hostSso + path, silentLogin);
+        loginApsPage.clickOnSSOButton();
+        loginApsPage.loginAPS(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+    });
+
+    it('[C280667] Should be redirect directly to keycloak without show the login page with silent login', () => {
+        settingsPage.setProviderBpmSso(TestConfig.adf.hostSso, TestConfig.adf.hostSso + path);
+        loginApsPage.loginAPS(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
     });
 });
diff --git a/e2e/core/login/login_component.e2e.ts b/e2e/core/login/login_component.e2e.ts
index 62c4d79d0f..a534833f7d 100644
--- a/e2e/core/login/login_component.e2e.ts
+++ b/e2e/core/login/login_component.e2e.ts
@@ -25,12 +25,12 @@ import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
 import { UserInfoDialog } from '../../pages/adf/dialog/userInfoDialog';
 
 import TestConfig = require('../../test.config');
-import AcsUserModel = require('../../models/ACS/acsUserModel');
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
 
 import { SettingsPage } from '../../pages/adf/settingsPage';
 import AlfrescoApi = require('alfresco-js-api-node');
 
-import Util = require('../../util/util');
+import { Util } from '../../util/util';
 
 describe('Login component', () => {
 
@@ -234,7 +234,6 @@ describe('Login component', () => {
 
         browser.getAllWindowHandles().then((handles) => {
 
-            browser.ignoreSynchronization = true;
             browser.switchTo().window(handles[1]).then(() => {
                 browser.get(TestConfig.adf.url + '/activiti');
                 processServicesPage.checkApsContainer();
diff --git a/e2e/core/login/redirection.e2e.ts b/e2e/core/login/redirection.e2e.ts
index aecabc674d..304bc0c943 100644
--- a/e2e/core/login/redirection.e2e.ts
+++ b/e2e/core/login/redirection.e2e.ts
@@ -23,13 +23,13 @@ import { ProcessServicesPage } from '../../pages/adf/process_services/processSer
 import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
 
 import TestConfig = require('../../test.config');
-import AcsUserModel = require('../../models/ACS/acsUserModel');
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
 
 import { SettingsPage } from '../../pages/adf/settingsPage';
 
 import AlfrescoApi = require('alfresco-js-api-node');
 
-import Util = require('../../util/util');
+import { Util } from '../../util/util';
 import { UploadActions } from '../../actions/ACS/upload.actions';
 
 describe('Login component - Redirect', () => {
@@ -40,14 +40,17 @@ describe('Login component - Redirect', () => {
     let contentServicesPage = new ContentServicesPage();
     let loginPage = new LoginPage();
     let user = new AcsUserModel();
+    let userFolderOwner = new AcsUserModel();
     let adminUserModel = new AcsUserModel({
         'id': TestConfig.adf.adminUser,
         'password': TestConfig.adf.adminPassword
     });
+    let uploadedFolder;
+    let uploadActions = new UploadActions();
 
     beforeAll(async (done) => {
         this.alfrescoJsApi = new AlfrescoApi({
-            provider: 'ALL',
+            provider: 'ECM',
             hostEcm: TestConfig.adf.url,
             hostBpm: TestConfig.adf.url
         });
@@ -55,6 +58,11 @@ describe('Login component - Redirect', () => {
         await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
 
         await this.alfrescoJsApi.core.peopleApi.addPerson(user);
+        await this.alfrescoJsApi.core.peopleApi.addPerson(userFolderOwner);
+
+        await this.alfrescoJsApi.login(user.id, user.password);
+
+        uploadedFolder = await uploadActions.uploadFolder(this.alfrescoJsApi, 'protecteFolder' + Util.generateRandomString(), '-my-');
 
         done();
     });
@@ -100,16 +108,10 @@ describe('Login component - Redirect', () => {
     });
 
     it('[C260088] Should be re-redirect to the request URL after login when try to access to a protect URL ', () => {
-        let uploadActions = new UploadActions();
-
-        let uploadedFolder;
-        let folderName = Util.generateRandomString();
-
         settingsPage.setProviderEcm();
         loginPage.login(user.id, user.password);
 
         browser.controlFlow().execute(async () => {
-            uploadedFolder = await uploadActions.uploadFolder(this.alfrescoJsApi, folderName, '-my-');
 
             navigationBarPage.openContentServicesFolder(uploadedFolder.entry.id);
 
diff --git a/e2e/core/pagination_empty_current_page.e2e.ts b/e2e/core/pagination_empty_current_page.e2e.ts
index 65717e8395..da41452680 100644
--- a/e2e/core/pagination_empty_current_page.e2e.ts
+++ b/e2e/core/pagination_empty_current_page.e2e.ts
@@ -17,13 +17,13 @@
 
 import { LoginPage } from '../pages/adf/loginPage';
 import { ContentServicesPage } from '../pages/adf/contentServicesPage';
-import PaginationPage = require('../pages/adf/paginationPage');
+import { PaginationPage } from '../pages/adf/paginationPage';
+import { Util } from '../util/util';
 
-import AcsUserModel = require('../models/ACS/acsUserModel');
-import FolderModel = require('../models/ACS/folderModel');
+import { AcsUserModel } from '../models/ACS/acsUserModel';
+import { FolderModel } from '../models/ACS/folderModel';
 
 import TestConfig = require('../test.config');
-import Util = require('../util/util');
 
 import AlfrescoApi = require('alfresco-js-api-node');
 import { UploadActions } from '../actions/ACS/upload.actions';
diff --git a/e2e/core/user_info_component.e2e.ts b/e2e/core/user_info_component.e2e.ts
index aa8d546e2d..19e2b7b9f6 100644
--- a/e2e/core/user_info_component.e2e.ts
+++ b/e2e/core/user_info_component.e2e.ts
@@ -20,8 +20,8 @@ import { LoginPage } from '../pages/adf/loginPage';
 import { UserInfoDialog } from '../pages/adf/dialog/userInfoDialog';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 
-import AcsUserModel = require('../models/ACS/acsUserModel');
-import FileModel = require('../models/ACS/fileModel');
+import { AcsUserModel } from '../models/ACS/acsUserModel';
+import { FileModel } from '../models/ACS/fileModel';
 
 import PeopleAPI = require('../restAPI/ACS/PeopleAPI');
 
diff --git a/e2e/core/viewer/viewer_component.e2e.ts b/e2e/core/viewer/viewer_component.e2e.ts
index 7bdffaf517..f293c43b1b 100644
--- a/e2e/core/viewer/viewer_component.e2e.ts
+++ b/e2e/core/viewer/viewer_component.e2e.ts
@@ -21,16 +21,16 @@ import { LoginPage } from '../../pages/adf/loginPage';
 import { ViewerPage } from '../../pages/adf/viewerPage';
 import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
 import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
-import ContentListPage = require('../../pages/adf/dialog/contentList');
+import { ContentListPage } from '../../pages/adf/dialog/contentListPage';
 import { ShareDialog } from '../../pages/adf/dialog/shareDialog';
 
 import resources = require('../../util/resources');
-import Util = require('../../util/util');
+import { Util } from '../../util/util';
 import CONSTANTS = require('../../util/constants');
 
-import FileModel = require('../../models/ACS/fileModel');
-import FolderModel = require('../../models/ACS/folderModel');
-import AcsUserModel = require('../../models/ACS/acsUserModel');
+import { FileModel } from '../../models/ACS/fileModel';
+import { FolderModel } from '../../models/ACS/folderModel';
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
 
 import AlfrescoApi = require('alfresco-js-api-node');
 import { UploadActions } from '../../actions/ACS/upload.actions';
diff --git a/e2e/core/viewer/viewer_content_services_component.e2e.ts b/e2e/core/viewer/viewer_content_services_component.e2e.ts
index dea0bbcbc1..57ff5cb710 100644
--- a/e2e/core/viewer/viewer_content_services_component.e2e.ts
+++ b/e2e/core/viewer/viewer_content_services_component.e2e.ts
@@ -25,8 +25,8 @@ import { ViewerPage } from '../../pages/adf/viewerPage';
 
 import resources = require('../../util/resources');
 
-import FileModel = require('../../models/ACS/fileModel');
-import AcsUserModel = require('../../models/ACS/acsUserModel');
+import { FileModel } from '../../models/ACS/fileModel';
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
 
 import AlfrescoApi = require('alfresco-js-api-node');
 import { UploadActions } from '../../actions/ACS/upload.actions';
diff --git a/e2e/core/viewer/viewer_custom_toolbar_info-drawer.e2e.ts b/e2e/core/viewer/viewer_custom_toolbar_info-drawer.e2e.ts
index 93e8df9504..a7afcb8e76 100644
--- a/e2e/core/viewer/viewer_custom_toolbar_info-drawer.e2e.ts
+++ b/e2e/core/viewer/viewer_custom_toolbar_info-drawer.e2e.ts
@@ -23,8 +23,8 @@ import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
 
 import resources = require('../../util/resources');
 
-import FileModel = require('../../models/ACS/fileModel');
-import AcsUserModel = require('../../models/ACS/acsUserModel');
+import { FileModel } from '../../models/ACS/fileModel';
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
 
 import AlfrescoApi = require('alfresco-js-api-node');
 import { UploadActions } from '../../actions/ACS/upload.actions';
diff --git a/e2e/core/viewer/viewer_properties.e2e.ts b/e2e/core/viewer/viewer_properties.e2e.ts
index d3a1662abb..e3104f0c2c 100644
--- a/e2e/core/viewer/viewer_properties.e2e.ts
+++ b/e2e/core/viewer/viewer_properties.e2e.ts
@@ -21,12 +21,12 @@ import { LoginPage } from '../../pages/adf/loginPage';
 import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
 import { ViewerPage } from '../../pages/adf/viewerPage';
 import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
-import DataTablePage = require('../../pages/adf/dataTablePage');
+import { DataTablePage } from '../../pages/adf/dataTablePage';
 
 import resources = require('../../util/resources');
 
-import FileModel = require('../../models/ACS/fileModel');
-import AcsUserModel = require('../../models/ACS/acsUserModel');
+import { FileModel } from '../../models/ACS/fileModel';
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
 
 import AlfrescoApi = require('alfresco-js-api-node');
 import { UploadActions } from '../../actions/ACS/upload.actions';
diff --git a/e2e/insights/analytics-component.e2e.ts b/e2e/insights/analytics-component.e2e.ts
index b4c287478e..0a11ab2701 100644
--- a/e2e/insights/analytics-component.e2e.ts
+++ b/e2e/insights/analytics-component.e2e.ts
@@ -17,12 +17,12 @@
 
 import { LoginPage } from '../pages/adf/loginPage';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
-import AnalyticsPage = require('../pages/adf/process_services/analyticsPage');
+import { AnalyticsPage } from '../pages/adf/process_services/analyticsPage';
 import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage';
 import { AppNavigationBarPage } from '../pages/adf/process_services/appNavigationBarPage';
 import TestConfig = require('../test.config');
-import Tenant = require('../models/APS/Tenant');
-import User = require('../models/APS/User');
+import { Tenant } from '../models/APS/Tenant';
+import { User } from '../models/APS/User';
 
 import AlfrescoApi = require('alfresco-js-api-node');
 
diff --git a/e2e/models/ACS/acsUserModel.js b/e2e/models/ACS/acsUserModel.ts
similarity index 57%
rename from e2e/models/ACS/acsUserModel.js
rename to e2e/models/ACS/acsUserModel.ts
index dc2a378368..6483a4007e 100644
--- a/e2e/models/ACS/acsUserModel.js
+++ b/e2e/models/ACS/acsUserModel.ts
@@ -15,42 +15,43 @@
  * limitations under the License.
  */
 
-var Util = require('../../util/util');
+import { Util } from '../../util/util';
 
-var AcsUserModel = function (details) {
+export class AcsUserModel {
 
-    this.firstName = Util.generateRandomString();
-    this.lastName = Util.generateRandomString();
-    this.password = Util.generateRandomString();
-    this.email = Util.generateRandomString();
-    this.id = Util.generateRandomString();
-    this.jobTitle = "N/A";
+    firstName = Util.generateRandomString();
+    lastName = Util.generateRandomString();
+    password = Util.generateRandomString();
+    email = Util.generateRandomString();
+    id = Util.generateRandomString();
+    jobTitle = 'N/A';
 
-    this.getFirstName = function () {
+    constructor(details?: any) {
+        Object.assign(this, details);
+    }
+
+    getFirstName = function () {
         return this.firstName;
     };
 
-    this.getLastName = function () {
+    getLastName = function () {
         return this.lastName;
     };
 
-    this.getPassword = function () {
+    getPassword = function () {
         return this.password;
     };
 
-    this.getEmail = function () {
+    getEmail = function () {
         return this.email;
     };
 
-    this.getId = function () {
+    getId = function () {
         return this.id;
     };
 
-    this.getJobTitle = function () {
+    getJobTitle = function () {
         return this.jobTitle;
     };
 
-    Object.assign(this, details);
-
-};
-module.exports = AcsUserModel;
+}
diff --git a/e2e/models/ACS/createdByModel.js b/e2e/models/ACS/createdByModel.ts
similarity index 67%
rename from e2e/models/ACS/createdByModel.js
rename to e2e/models/ACS/createdByModel.ts
index ba39dd069e..698ea5f386 100644
--- a/e2e/models/ACS/createdByModel.js
+++ b/e2e/models/ACS/createdByModel.ts
@@ -15,22 +15,22 @@
  * limitations under the License.
  */
 
-var Util = require('../../util/util');
+import { Util } from '../../util/util';
 
-var AcsUserModel = function (details) {
+export class CreatedByModel {
+    displayName = Util.generateRandomString();
+    id = Util.generateRandomString();
 
-    this.displayName = Util.generateRandomString();
-    this.id = Util.generateRandomString();
+    constructor(details?: any) {
+        Object.assign(this, details);
+    }
 
-    this.getId = function () {
+    getId() {
         return this.id;
-    };
+    }
 
-    this.getDisplayName = function () {
+    getDisplayName() {
         return this.displayName;
-    };
+    }
 
-    Object.assign(this, details);
-
-};
-module.exports = AcsUserModel;
+}
diff --git a/e2e/models/ACS/fileModel.js b/e2e/models/ACS/fileModel.js
deleted file mode 100644
index 9f637dbbde..0000000000
--- a/e2e/models/ACS/fileModel.js
+++ /dev/null
@@ -1,116 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var Util = require('../../util/util');
-var resources = require('../../util/resources');
-var CreatedByModel = require('./createdByModel');
-var ContentModel = require('./contentModel');
-var ContentPropertiesModel = require('./contentProperties');
-
-var FileModel = function (details) {
-
-    this.id = Util.generateRandomString();
-    this.name = Util.generateRandomString();
-    this.shortName = this.name;
-    this.location = resources.Files.ADF_DOCUMENTS.PDF.file_location;
-    this.tooltip = this.name;
-    this.version = "";
-    this.firstPageText = resources.Files.ADF_DOCUMENTS.PDF.first_page_text;
-    this.lastPageText = resources.Files.ADF_DOCUMENTS.PDF.last_page_text;
-    this.secondPageText = resources.Files.ADF_DOCUMENTS.PDF.second_page_text;
-    this.lastPageNumber = resources.Files.ADF_DOCUMENTS.PDF.last_page_number;
-    this.createdAt = "";
-    this.createdByUser = {};
-    this.modifiedByUser = {};
-    this.content = {};
-    this.properties = {};
-
-    this.getName = function () {
-        return this.name;
-    };
-
-    this.setVersion = function (ver) {
-        this.version = "-" + ver;
-    };
-
-    this.getVersionName = function () {
-        var extension = this.name.split(".")[1];
-        var name = this.name.split(".")[0];
-        return name + this.version + "." + extension;
-    };
-
-    this.getShortName = function () {
-        return this.shortName;
-    };
-
-    this.getLocation = function () {
-        return this.location;
-    };
-
-    this.getTooltip = function () {
-        return this.tooltip;
-    };
-
-    this.getId = function () {
-        return this.id;
-    };
-
-    this.getFirstPageText = function () {
-        return this.firstPageText;
-    };
-
-    this.getLastPageText = function () {
-        return this.lastPageText;
-    };
-
-    this.getSecondPageText = function () {
-        return this.secondPageText;
-    };
-
-    this.getLastPageNumber = function () {
-        return this.lastPageNumber;
-    };
-
-    this.getCreatedByUser = function () {
-        return this.createdByUser;
-    };
-
-    this.getModifiedByUser = function () {
-        return this.modifiedByUser;
-    };
-
-    this.getContent = function () {
-        return this.content;
-    };
-
-    this.getProperties = function () {
-        return this.properties;
-    };
-
-    this.update = function(details) {
-        Object.assign(this, {
-            createdByUser: new CreatedByModel(details.createdByUser),
-            modifiedByUser: new CreatedByModel(details.modifiedByUser),
-            content: new ContentModel(details.content),
-            properties: new ContentPropertiesModel(details.properties)
-        })
-    }
-
-    Object.assign(this, details);
-
-};
-module.exports = FileModel;
diff --git a/e2e/models/ACS/fileModel.ts b/e2e/models/ACS/fileModel.ts
new file mode 100644
index 0000000000..b4b773e9ee
--- /dev/null
+++ b/e2e/models/ACS/fileModel.ts
@@ -0,0 +1,116 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import resources = require('../../util/resources');
+import ContentModel = require('./contentModel');
+import ContentPropertiesModel = require('./contentProperties');
+import { CreatedByModel } from './createdByModel';
+import { Util } from '../../util/util';
+
+export class FileModel {
+
+    id = Util.generateRandomString();
+    name = Util.generateRandomString();
+    shortName = this.name;
+    location = resources.Files.ADF_DOCUMENTS.PDF.file_location;
+    tooltip = this.name;
+    version = '';
+    firstPageText = resources.Files.ADF_DOCUMENTS.PDF.first_page_text;
+    lastPageText = resources.Files.ADF_DOCUMENTS.PDF.last_page_text;
+    secondPageText = resources.Files.ADF_DOCUMENTS.PDF.second_page_text;
+    lastPageNumber = resources.Files.ADF_DOCUMENTS.PDF.last_page_number;
+    createdAt = '';
+    createdByUser = {};
+    modifiedByUser = {};
+    content = {};
+    properties = {};
+
+    constructor(details?: any) {
+        Object.assign(this, details);
+    }
+
+    getName() {
+        return this.name;
+    }
+
+    setVersion(ver) {
+        this.version = '-' + ver;
+    }
+
+    getVersionName() {
+        let extension = this.name.split('.')[1];
+        let name = this.name.split('.')[0];
+        return name + this.version + '.' + extension;
+    }
+
+    getShortName() {
+        return this.shortName;
+    }
+
+    getLocation() {
+        return this.location;
+    }
+
+    getTooltip() {
+        return this.tooltip;
+    }
+
+    getId() {
+        return this.id;
+    }
+
+    getFirstPageText() {
+        return this.firstPageText;
+    }
+
+    getLastPageText() {
+        return this.lastPageText;
+    }
+
+    getSecondPageText() {
+        return this.secondPageText;
+    }
+
+    getLastPageNumber() {
+        return this.lastPageNumber;
+    }
+
+    getCreatedByUser() {
+        return this.createdByUser;
+    }
+
+    getModifiedByUser() {
+        return this.modifiedByUser;
+    }
+
+    getContent() {
+        return this.content;
+    }
+
+    getProperties() {
+        return this.properties;
+    }
+
+    update(details) {
+        Object.assign(this, {
+            createdByUser: new CreatedByModel(details.createdByUser),
+            modifiedByUser: new CreatedByModel(details.modifiedByUser),
+            content: new ContentModel(details.content),
+            properties: new ContentPropertiesModel(details.properties)
+        });
+    }
+}
diff --git a/e2e/models/ACS/filesModel.js b/e2e/models/ACS/filesModel.js
deleted file mode 100644
index c2d02d32b1..0000000000
--- a/e2e/models/ACS/filesModel.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var FileModel = require('./fileModel');
-
-var FilesModel = function () {
-
-    var files = null;
-
-    this.setFiles = function (arr) {
-        files = arr.map(function(item) {
-            return new FileModel(item.entry);
-        });
-    };
-
-    this.getFiles = function () {
-        return files;
-    };
-};
-module.exports = FilesModel;
diff --git a/e2e/models/ACS/folderModel.js b/e2e/models/ACS/folderModel.ts
similarity index 58%
rename from e2e/models/ACS/folderModel.js
rename to e2e/models/ACS/folderModel.ts
index e222bee95c..9d7f725568 100644
--- a/e2e/models/ACS/folderModel.js
+++ b/e2e/models/ACS/folderModel.ts
@@ -15,39 +15,39 @@
  * limitations under the License.
  */
 
-var Util = require('../../util/util');
+import { Util } from '../../util/util';
 
-var FolderModel = function (details) {
+export class FolderModel {
 
-    this.id = Util.generateRandomString();
-    this.name = Util.generateRandomString();
-    this.shortName = this.name;
-    this.tooltip = this.name;
-    this.location = "";
-    this.description= "";
+    id = Util.generateRandomString();
+    name = Util.generateRandomString();
+    shortName = this.name;
+    tooltip = this.name;
+    location = '';
+    description = '';
 
-    this.getName = function () {
+    constructor(details?: any) {
+        Object.assign(this, details);
+    }
+
+    getName() {
         return this.name;
-    };
+    }
 
-    this.getShortName = function () {
+    getShortName() {
         return this.shortName;
-    };
+    }
 
-    this.getTooltip = function () {
+    getTooltip() {
         return this.tooltip;
-    };
+    }
 
-    this.getId = function () {
+    getId() {
         return this.id;
-    };
+    }
 
-    this.getLocation = function () {
+    getLocation() {
         return this.location;
-    };
-
-    Object.assign(this, details);
-
-};
-module.exports = FolderModel;
+    }
 
+}
diff --git a/e2e/models/APS/Group.js b/e2e/models/APS/Group.js
deleted file mode 100644
index 77826d5990..0000000000
--- a/e2e/models/APS/Group.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var Util = require('../../util/util');
-
-/**
- * Create Group Object
- *
- * @param details - Group object used to overwrite the default values
- * @constructor
- */
-
-var Group = function (details) {
-
-    this.name = Util.generateRandomString();
-    this.type = "1";
-    this.parentGroupId = null;
-    this.tenantId = "1";
-
-    Object.assign(this, details);
-};
-
-module.exports = Group;
diff --git a/e2e/models/APS/StandaloneTask.js b/e2e/models/APS/StandaloneTask.ts
similarity index 79%
rename from e2e/models/APS/StandaloneTask.js
rename to e2e/models/APS/StandaloneTask.ts
index f23cdb4c8a..b7450ad703 100644
--- a/e2e/models/APS/StandaloneTask.js
+++ b/e2e/models/APS/StandaloneTask.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-var Util = require('../../util/util');
+import { Util } from '../../util/util';
 
 /**
  * Create Json Object for standalone task
@@ -23,11 +23,12 @@ var Util = require('../../util/util');
  * @param details - JSON object used to overwrite the default values
  * @constructor
  */
+export class StandaloneTask {
 
-var StandaloneTask = function (details) {
+    name = Util.generateRandomString();
 
-    this.name = Util.generateRandomString();
+    constructor(details?: any) {
+        Object.assign(this, details);
+    }
 
-    Object.assign(this, details);
-};
-module.exports = StandaloneTask;
+}
diff --git a/e2e/models/APS/Tenant.js b/e2e/models/APS/Tenant.ts
similarity index 71%
rename from e2e/models/APS/Tenant.js
rename to e2e/models/APS/Tenant.ts
index 80e1f7feaf..07f6b06467 100644
--- a/e2e/models/APS/Tenant.js
+++ b/e2e/models/APS/Tenant.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-var Util = require('../../util/util');
+import { Util } from '../../util/util';
 
 /**
  * Create tenant JSON Object
@@ -23,14 +23,16 @@ var Util = require('../../util/util');
  * @param details - JSON object used to overwrite the default values
  * @constructor
  */
-var Tenant = function (details) {
-    this.active = true;
-    this.configuration = "DefaultConfig";
-    this.domain = "DefaultDomain";
-    this.maxUsers = 10;
-    this.name = Util.generateRandomString();
+export class Tenant {
 
-    Object.assign(this, details);
-};
+    active = true;
+    configuration = 'DefaultConfig';
+    domain = 'DefaultDomain';
+    maxUsers = 10;
+    name = Util.generateRandomString();
 
-module.exports = Tenant;
+    constructor(details?: any) {
+        Object.assign(this, details);
+    }
+
+}
diff --git a/e2e/models/APS/User.js b/e2e/models/APS/User.ts
similarity index 62%
rename from e2e/models/APS/User.js
rename to e2e/models/APS/User.ts
index 7c7c5e4163..5bd16a8cc0 100644
--- a/e2e/models/APS/User.js
+++ b/e2e/models/APS/User.ts
@@ -15,25 +15,25 @@
  * limitations under the License.
  */
 
-var Util = require('../../util/util');
+import { Util } from '../../util/util';
 
 /**
- * Create User JSON Object
+ * Create tenant JSON Object
  *
  * @param details - JSON object used to overwrite the default values
  * @constructor
  */
+export class User {
 
-var User = function (details) {
+    email = Util.generateRandomEmail();
+    firstName = Util.generateRandomString();
+    lastName = Util.generateRandomString();
+    password = Util.generatePasswordString();
+    type = 'enterprise';
+    tenantId = '1';
+    company = null;
 
-    this.email = Util.generateRandomEmail();
-    this.firstName = Util.generateRandomString();
-    this.lastName = Util.generateRandomString();
-    this.password = Util.generatePasswordString();
-    this.type = 'enterprise';
-    this.tenantId = "1";
-    this.company = null;
-
-    Object.assign(this, details);
-};
-module.exports = User;
+    constructor(details?: any) {
+        Object.assign(this, details);
+    }
+}
diff --git a/e2e/pages/adf/cardViewComponentPage.ts b/e2e/pages/adf/cardViewComponentPage.ts
new file mode 100644
index 0000000000..53bfffc8ca
--- /dev/null
+++ b/e2e/pages/adf/cardViewComponentPage.ts
@@ -0,0 +1,236 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { by, element } from 'protractor';
+import { Util } from '../../util/util';
+
+export class CardViewComponentPage {
+
+    addButton = element(by.className('adf-card-view__key-value-pairs__add-btn'));
+    keyValueRow = 'card-view__key-value-pairs__row';
+    selectValue = 'mat-option';
+    textField = element(by.css(`input[data-automation-id='card-textitem-editinput-name']`));
+    intField = element(by.css(`input[data-automation-id='card-textitem-editinput-int']`));
+    floatField = element(by.css(`input[data-automation-id='card-textitem-editinput-float']`));
+    valueInputField = element(by.xpath(`//*[contains(@id,'input') and @placeholder='Value']`));
+    nameInputField = element(by.xpath(`//*[contains(@id,'input') and @placeholder='Name']`));
+    consoleLog = element(by.className('adf-console'));
+    deleteButton = element.all(by.className('adf-card-view__key-value-pairs__remove-btn')).first();
+    select = element(by.css('mat-select[data-automation-class="select-box"]'));
+    checkbox = element(by.css(`mat-checkbox[data-automation-id='card-boolean-boolean']`));
+    resetButton = element(by.css(`#adf-reset-card-log`));
+    selectedValue = element(by.css('.mat-select-value-text span'));
+    listContent = element(by.className('mat-select-content'));
+    editableSwitch = element(by.id('adf-toggle-editable'));
+
+    clickOnAddButton() {
+        Util.waitUntilElementIsVisible(this.addButton);
+        this.addButton.click();
+        return this;
+    }
+
+    clickOnResetButton() {
+        Util.waitUntilElementIsVisible(this.resetButton);
+        this.resetButton.click();
+        return this;
+    }
+
+    clickOnTextField() {
+        let toggleText = element(by.css(`div[data-automation-id='card-textitem-edit-toggle-name']`));
+        Util.waitUntilElementIsVisible(toggleText);
+        toggleText.click();
+        Util.waitUntilElementIsVisible(this.textField);
+        return this;
+    }
+
+    clickOnTextClearIcon() {
+        let clearIcon = element(by.css(`mat-icon[data-automation-id="card-textitem-reset-name"]`));
+        Util.waitUntilElementIsVisible(clearIcon);
+        return clearIcon.click();
+    }
+
+    clickOnTextSaveIcon() {
+        let saveIcon = element(by.css(`mat-icon[data-automation-id="card-textitem-update-name"]`));
+        Util.waitUntilElementIsVisible(saveIcon);
+        return saveIcon.click();
+    }
+
+    getTextFieldText() {
+        let textField = element(by.css(`span[data-automation-id="card-textitem-value-name"]`));
+        Util.waitUntilElementIsVisible(textField);
+        return textField.getText();
+    }
+
+    enterTextField(text) {
+        Util.waitUntilElementIsVisible(this.textField);
+        this.textField.sendKeys('');
+        this.textField.clear();
+        this.textField.sendKeys(text);
+        return this;
+    }
+
+    clickOnIntField() {
+        let toggleText = element(by.css('div[data-automation-id="card-textitem-edit-toggle-int"]'));
+        Util.waitUntilElementIsVisible(toggleText);
+        toggleText.click();
+        Util.waitUntilElementIsVisible(this.intField);
+        return this;
+    }
+
+    clickOnIntClearIcon() {
+        let clearIcon = element(by.css('mat-icon[data-automation-id="card-textitem-reset-int"]'));
+        Util.waitUntilElementIsVisible(clearIcon);
+        return clearIcon.click();
+    }
+
+    clickOnIntSaveIcon() {
+        let saveIcon = element(by.css('mat-icon[data-automation-id="card-textitem-update-int"]'));
+        Util.waitUntilElementIsVisible(saveIcon);
+        return saveIcon.click();
+    }
+
+    enterIntField(text) {
+        Util.waitUntilElementIsVisible(this.intField);
+        this.intField.sendKeys('');
+        this.intField.clear();
+        this.intField.sendKeys(text);
+        return this;
+    }
+
+    getIntFieldText() {
+        let textField = element(by.css('span[data-automation-id="card-textitem-value-int"]'));
+        Util.waitUntilElementIsVisible(textField);
+        return textField.getText();
+    }
+
+    getErrorInt() {
+        let errorElement = element(by.css('mat-error[data-automation-id="card-textitem-error-int"]'));
+        Util.waitUntilElementIsVisible(errorElement);
+        return errorElement.getText();
+    }
+
+    clickOnFloatField() {
+        let toggleText = element(by.css('div[data-automation-id="card-textitem-edit-toggle-float"]'));
+        Util.waitUntilElementIsVisible(toggleText);
+        toggleText.click();
+        Util.waitUntilElementIsVisible(this.floatField);
+        return this;
+    }
+
+    clickOnFloatClearIcon() {
+        let clearIcon = element(by.css(`mat-icon[data-automation-id="card-textitem-reset-float"]`));
+        Util.waitUntilElementIsVisible(clearIcon);
+        return clearIcon.click();
+    }
+
+    clickOnFloatSaveIcon() {
+        let saveIcon = element(by.css(`mat-icon[data-automation-id="card-textitem-update-float"]`));
+        Util.waitUntilElementIsVisible(saveIcon);
+        return saveIcon.click();
+    }
+
+    enterFloatField(text) {
+        Util.waitUntilElementIsVisible(this.floatField);
+        this.floatField.sendKeys('');
+        this.floatField.clear();
+        this.floatField.sendKeys(text);
+        return this;
+    }
+
+    getFloatFieldText() {
+        let textField = element(by.css('span[data-automation-id="card-textitem-value-float"]'));
+        Util.waitUntilElementIsVisible(textField);
+        return textField.getText();
+    }
+
+    getErrorFloat() {
+        let errorElement = element(by.css('mat-error[data-automation-id="card-textitem-error-float"]'));
+        Util.waitUntilElementIsVisible(errorElement);
+        return errorElement.getText();
+    }
+
+    setName(name) {
+        Util.waitUntilElementIsVisible(this.nameInputField);
+        this.nameInputField.sendKeys(name);
+        return this;
+    }
+
+    setValue(value) {
+        Util.waitUntilElementIsVisible(this.valueInputField);
+        this.valueInputField.sendKeys(value);
+        return this;
+    }
+
+    waitForOutput() {
+        Util.waitUntilElementIsVisible(this.consoleLog);
+        return this;
+    }
+
+    getOutputText(index) {
+        return this.consoleLog.all(by.css('p')).get(index).getText();
+    }
+
+    deletePairsValues() {
+        Util.waitUntilElementIsVisible(this.deleteButton);
+        this.deleteButton.click();
+        return this;
+    }
+
+    checkNameAndValueVisibility(index) {
+        Util.waitUntilElementIsNotOnPage(this.getKeyValueRow(index));
+        return this;
+    }
+
+    getKeyValueRow(index) {
+        return element.all(by.css(this.keyValueRow)).get(index);
+
+    }
+
+    getMatSelectValue(index) {
+        return element.all(by.className(this.selectValue)).get(index);
+    }
+
+    clickSelectBox() {
+        this.select.click();
+        Util.waitUntilElementIsVisible(this.listContent);
+    }
+
+    checkboxClick() {
+        this.checkbox.click();
+    }
+
+    selectValueFromComboBox(index) {
+        this.getMatSelectValue(index).click();
+        Util.waitUntilElementIsVisible(this.consoleLog);
+        return this;
+    }
+
+    getSelectionValue() {
+        return this.selectedValue.getText();
+    }
+
+    disableEdit() {
+        Util.waitUntilElementIsVisible(this.editableSwitch);
+        this.editableSwitch.getAttribute('class').then((check) => {
+            if (check === 'mat-slide-toggle mat-primary mat-checked') {
+                this.editableSwitch.click();
+                expect(this.editableSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary');
+            }
+        });
+    }
+
+}
diff --git a/e2e/pages/adf/cardViewPageComponent.js b/e2e/pages/adf/cardViewPageComponent.js
deleted file mode 100644
index 29b2ca5064..0000000000
--- a/e2e/pages/adf/cardViewPageComponent.js
+++ /dev/null
@@ -1,234 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var Util = require('../../util/util');
-
-var CardViewComponentPage = function () {
-
-    const addButton = element(by.className('adf-card-view__key-value-pairs__add-btn'));
-    const keyValueRow = 'card-view__key-value-pairs__row';
-    const selectValue = 'mat-option';
-    const textField = element(by.css("input[data-automation-id='card-textitem-editinput-name']"));
-    const intField = element(by.css("input[data-automation-id='card-textitem-editinput-int']"));
-    const floatField = element(by.css("input[data-automation-id='card-textitem-editinput-float']"));
-    const valueInputField = element(by.xpath("//*[contains(@id,'input') and @placeholder='Value']"));
-    const nameInputField = element(by.xpath("//*[contains(@id,'input') and @placeholder='Name']"));
-    const consoleLog = element(by.className('adf-console'));
-    const deleteButton = element.all(by.className('adf-card-view__key-value-pairs__remove-btn')).first();
-    const select = element(by.css('mat-select[data-automation-class="select-box"]'));
-    const checkbox = element(by.css("mat-checkbox[data-automation-id='card-boolean-boolean']"));
-    const resetButton = element(by.css("#adf-reset-card-log"));
-    const selectedValue = element(by.css('.mat-select-value-text span'));
-    const listContent = element(by.className('mat-select-content'));
-    const editableSwitch = element(by.id('adf-toggle-editable'));
-
-    this.clickOnAddButton = function () {
-        Util.waitUntilElementIsVisible(addButton);
-        addButton.click();
-        return this;
-    };
-
-    this.clickOnResetButton= function () {
-        Util.waitUntilElementIsVisible(resetButton);
-        resetButton.click();
-        return this;
-    };
-
-    this.clickOnTextField = function () {
-        let toggleText = element(by.css("div[data-automation-id='card-textitem-edit-toggle-name']"));
-        Util.waitUntilElementIsVisible(toggleText);
-        toggleText.click();
-        Util.waitUntilElementIsVisible(textField);
-        return this;
-    };
-
-    this.clickOnTextClearIcon = function () {
-        let clearIcon = element(by.css("mat-icon[data-automation-id=\"card-textitem-reset-name\"]"));
-        Util.waitUntilElementIsVisible(clearIcon);
-        return clearIcon.click();
-    };
-
-    this.clickOnTextSaveIcon = function () {
-        let saveIcon = element(by.css("mat-icon[data-automation-id=\"card-textitem-update-name\"]"));
-        Util.waitUntilElementIsVisible(saveIcon);
-        return saveIcon.click();
-    };
-
-    this.getTextFieldText = function () {
-        var textField = element(by.css("span[data-automation-id='card-textitem-value-name']"));
-        Util.waitUntilElementIsVisible(textField);
-        return textField.getText();
-    };
-
-    this.enterTextField = function (text) {
-        Util.waitUntilElementIsVisible(textField);
-        textField.sendKeys('');
-        textField.clear().sendKeys(text);
-        return this;
-    };
-
-    this.clickOnIntField = function () {
-        let toggleText = element(by.css('div[data-automation-id="card-textitem-edit-toggle-int"]'));
-        Util.waitUntilElementIsVisible(toggleText);
-        toggleText.click();
-        Util.waitUntilElementIsVisible(intField);
-        return this;
-    };
-
-    this.clickOnIntClearIcon = function () {
-        let clearIcon = element(by.css('mat-icon[data-automation-id="card-textitem-reset-int"]'));
-        Util.waitUntilElementIsVisible(clearIcon);
-        return clearIcon.click();
-    };
-
-    this.clickOnIntSaveIcon = function () {
-        let saveIcon = element(by.css('mat-icon[data-automation-id="card-textitem-update-int"]'));
-        Util.waitUntilElementIsVisible(saveIcon);
-        return saveIcon.click();
-    };
-
-    this.enterIntField = function (text) {
-        Util.waitUntilElementIsVisible(intField);
-        intField.sendKeys('');
-        intField.clear().sendKeys(text);
-        return this;
-    };
-
-    this.getIntFieldText = function () {
-        var textField = element(by.css('span[data-automation-id="card-textitem-value-int"]'));
-        Util.waitUntilElementIsVisible(textField);
-        return textField.getText();
-    };
-
-    this.getErrorInt = function () {
-        let errorElement = element(by.css('mat-error[data-automation-id="card-textitem-error-int"]'));
-        Util.waitUntilElementIsVisible(errorElement);
-        return errorElement.getText();
-    };
-
-    this.clickOnFloatField = function () {
-        let toggleText = element(by.css('div[data-automation-id="card-textitem-edit-toggle-float"]'));
-        Util.waitUntilElementIsVisible(toggleText);
-        toggleText.click();
-        Util.waitUntilElementIsVisible(floatField);
-        return this;
-    };
-
-    this.clickOnFloatClearIcon = function () {
-        let clearIcon = element(by.css("mat-icon[data-automation-id='card-textitem-reset-float']"));
-        Util.waitUntilElementIsVisible(clearIcon);
-        return clearIcon.click();
-    };
-
-    this.clickOnFloatSaveIcon = function () {
-        let saveIcon = element(by.css("mat-icon[data-automation-id='card-textitem-update-float']"));
-        Util.waitUntilElementIsVisible(saveIcon);
-        return saveIcon.click();
-    };
-
-    this.enterFloatField = function (text) {
-        Util.waitUntilElementIsVisible(floatField);
-        floatField.sendKeys('');
-        floatField.clear().sendKeys(text);
-        return this;
-    };
-
-    this.getFloatFieldText = function () {
-        var textField = element(by.css('span[data-automation-id="card-textitem-value-float"]'));
-        Util.waitUntilElementIsVisible(textField);
-        return textField.getText();
-    };
-
-    this.getErrorFloat = function () {
-        let errorElement = element(by.css('mat-error[data-automation-id="card-textitem-error-float"]'));
-        Util.waitUntilElementIsVisible(errorElement);
-        return errorElement.getText();
-    };
-
-    this.setName = function (name) {
-        Util.waitUntilElementIsVisible(nameInputField);
-        nameInputField.sendKeys(name);
-        return this;
-    };
-
-    this.setValue = function (value) {
-        Util.waitUntilElementIsVisible(valueInputField);
-        valueInputField.sendKeys(value);
-        return this;
-    };
-
-
-    this.waitForOutput = function () {
-        Util.waitUntilElementIsVisible(consoleLog);
-        return this;
-    };
-
-    this.getOutputText = function (index) {
-        return consoleLog.all(by.css('p')).get(index).getText();
-    };
-
-    this.deletePairsValues = function () {
-        Util.waitUntilElementIsVisible(deleteButton);
-        deleteButton.click();
-        return this;
-    };
-
-    this.checkNameAndValueVisibility = (index) => {
-        Util.waitUntilElementIsNotOnPage(this.getKeyValueRow(index));
-        return this;
-    };
-
-    this.getKeyValueRow = (index) => {
-        return element.all(by.css(keyValueRow)).get(index);
-
-    };
-
-    this.getMatSelectValue = (index) => {
-        return element.all(by.className(selectValue)).get(index);
-    };
-
-    this.clickSelectBox = () => {
-        select.click();
-        Util.waitUntilElementIsVisible(listContent);
-    };
-
-    this.checkboxClick = () => {
-        checkbox.click();
-    };
-
-    this.selectValueFromComboBox = (index) => {
-        this.getMatSelectValue(index).click();
-        Util.waitUntilElementIsVisible(consoleLog);
-        return this;
-    };
-
-    this.getSelectionValue = () => {
-        return selectedValue.getText();
-    };
-
-    this.disableEdit = function () {
-        Util.waitUntilElementIsVisible(editableSwitch);
-        editableSwitch.getAttribute('class').then(function (check) {
-            if (check === 'mat-slide-toggle mat-primary mat-checked') {
-                editableSwitch.click();
-                expect(editableSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary');
-            }
-        })
-    };
-
-}
-module.exports = CardViewComponentPage;
diff --git a/e2e/pages/adf/commentsPage.ts b/e2e/pages/adf/commentsPage.ts
index 3de9d44fd1..3c1469327c 100644
--- a/e2e/pages/adf/commentsPage.ts
+++ b/e2e/pages/adf/commentsPage.ts
@@ -17,7 +17,7 @@
 
 import { element, by } from 'protractor';
 
-import Util = require('../../util/util');
+import { Util } from '../../util/util';
 import { TabsPage } from './material/tabsPage';
 
 export class CommentsPage {
diff --git a/e2e/pages/adf/configEditorPage.ts b/e2e/pages/adf/configEditorPage.ts
index 1b3958e43e..6590cb96e2 100644
--- a/e2e/pages/adf/configEditorPage.ts
+++ b/e2e/pages/adf/configEditorPage.ts
@@ -16,7 +16,7 @@
  */
 
 import { element, by, browser } from 'protractor';
-import Util = require('../../util/util');
+import { Util } from '../../util/util';
 
 export class ConfigEditorPage {
 
@@ -30,6 +30,7 @@ export class ConfigEditorPage {
     enterBigConfigurationText(text) {
         let textField = element(by.css('#adf-code-configuration-editor div.overflow-guard > textarea'));
         Util.waitUntilElementIsVisible(textField);
+
         browser.executeScript('this.monaco.editor.getModels()[0].setValue(`' + text + '`)');
         return this;
     }
diff --git a/e2e/pages/adf/contentServicesPage.ts b/e2e/pages/adf/contentServicesPage.ts
index ed4d779634..dff9f3410c 100644
--- a/e2e/pages/adf/contentServicesPage.ts
+++ b/e2e/pages/adf/contentServicesPage.ts
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-import Util = require('../../util/util');
-import ContentList = require('./dialog/contentList');
-import CreateFolderDialog = require('./dialog/createFolderDialog');
 import TestConfig = require('../../test.config');
+import { Util } from '../../util/util';
+import { ContentListPage } from './dialog/contentListPage';
+import { CreateFolderDialog } from './dialog/createFolderDialog';
 import { NavigationBarPage } from './navigationBarPage';
 import { by, element, protractor, $$, browser } from 'protractor';
 
@@ -26,15 +26,14 @@ import path = require('path');
 
 export class ContentServicesPage {
 
-    contentList = new ContentList();
+    contentList = new ContentListPage();
     createFolderDialog = new CreateFolderDialog();
     uploadBorder = element(by.id('document-list-container'));
     tableBody = element.all(by.css('adf-document-list div[class="adf-datatable-body"]')).first();
     contentServices = element(by.css('a[data-automation-id="Content Services"]'));
     currentFolder = element(by.css('div[class*="adf-breadcrumb-item adf-active"] div'));
-    createFolderButton = element(by.cssContainingText('mat-icon', 'create_new_folder'));
-    activeBreadcrumb = element(by.css('div[class*="adf-active"]'));
-    tooltip = by.css('div[class*="--text adf-full-width"] span');
+    createFolderButton = element(by.css('button[data-automation-id="create-new-folder"]'));
+    activeBreadcrumb = element(by.css('div[class*="active"]'));
     uploadFileButton = element(by.css('input[data-automation-id="upload-single-file"]'));
     uploadMultipleFileButton = element(by.css('input[data-automation-id="upload-multiple-files"]'));
     uploadFolderButton = element(by.css('input[data-automation-id="uploadFolder"]'));
@@ -57,7 +56,7 @@ export class ContentServicesPage {
     gridViewButton = element(by.css('button[data-automation-id="document-list-grid-view"]'));
     cardViewContainer = element(by.css('div.adf-document-list-container div.adf-data-table-card'));
     copyButton = element(by.css('button[data-automation-id="content-node-selector-actions-choose"]'));
-    searchInputElement = element(by.css('input[data-automation-id="content-node-selector-search-input"'));
+    searchInputElement = element(by.css('input[data-automation-id="content-node-selector-search-input"]'));
     shareNodeButton = element(by.cssContainingText('mat-icon', ' share '));
 
     getElementsDisplayed() {
@@ -82,7 +81,7 @@ export class ContentServicesPage {
     checkElementsSortedByNameAsc(elements) {
         browser.controlFlow().execute(async () => {
             let numberOfElements = await this.numberOfResultsDisplayed();
-            for (let i = 0; i < (numberOfElements - 1) ; i++ ) {
+            for (let i = 0; i < (numberOfElements - 1); i++) {
                 expect(JSON.stringify(elements[i]) <= JSON.stringify(elements[i + 1])).toEqual(true);
             }
         });
@@ -92,7 +91,7 @@ export class ContentServicesPage {
     checkElementsSortedByNameDesc(elements) {
         browser.controlFlow().execute(async () => {
             let numberOfElements = await this.numberOfResultsDisplayed();
-            for (let i = 0; i < (numberOfElements - 1) ; i++ ) {
+            for (let i = 0; i < (numberOfElements - 1); i++) {
                 expect(JSON.stringify(elements[i]) >= JSON.stringify(elements[i + 1])).toEqual(true);
             }
         });
@@ -173,12 +172,8 @@ export class ContentServicesPage {
         return deferred.promise;
     }
 
-    getTooltip(content) {
-        return this.contentList.getRowByRowName(content).element(this.tooltip).getAttribute('title');
-    }
-
-    getBreadcrumbTooltip(content) {
-        return element(by.css('nav[data-automation-id="breadcrumb"] div[title="' + content + '"]')).getAttribute('title');
+    getBreadcrumbTooltip(nodeName: string) {
+        return element(by.css(`nav[data-automation-id="breadcrumb"] div[title="${nodeName}"]`)).getAttribute('title');
     }
 
     getAllRowsNameColumn() {
@@ -259,6 +254,7 @@ export class ContentServicesPage {
     createNewFolder(folder) {
         this.clickOnCreateNewFolder();
         this.createFolderDialog.addFolderName(folder);
+        browser.sleep(200);
         this.createFolderDialog.clickOnCreateButton();
         return this;
     }
@@ -351,7 +347,7 @@ export class ContentServicesPage {
     }
 
     checkItemInDocList(fileName) {
-        Util.waitUntilElementIsVisible(element(by.css('div[data-automation-id="text_' + fileName + '"]')));
+        Util.waitUntilElementIsVisible(element(by.css(`div[data-automation-id="text_${fileName}"]`)));
     }
 
     enableInfiniteScrolling() {
@@ -376,7 +372,7 @@ export class ContentServicesPage {
     }
 
     enableThumbnails() {
-        let thumbnailSlide = element(by.css('#adf-thumbnails-upload-switch'));
+        let thumbnailSlide = element(by.id('adf-thumbnails-upload-switch'));
         Util.waitUntilElementIsVisible(thumbnailSlide);
         thumbnailSlide.click();
         return this;
@@ -427,7 +423,7 @@ export class ContentServicesPage {
     getColumnValueForRow(file, columnName) {
         let row = this.contentList.getRowByRowName(file);
         Util.waitUntilElementIsVisible(row);
-        let rowColumn = row.element(by.css('div[title="' + columnName + '"] span'));
+        let rowColumn = row.element(by.css(`div[title="${columnName}"] span`));
         Util.waitUntilElementIsVisible(rowColumn);
         return rowColumn.getText();
     }
diff --git a/e2e/pages/adf/content_services/search/components/dateRangeFilterPage.ts b/e2e/pages/adf/content_services/search/components/dateRangeFilterPage.ts
index 2e80d1d697..9e11c9d3cb 100644
--- a/e2e/pages/adf/content_services/search/components/dateRangeFilterPage.ts
+++ b/e2e/pages/adf/content_services/search/components/dateRangeFilterPage.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import Util = require('../../../../../util/util');
+import { Util } from '../../../../../util/util';
 import { by, browser, protractor } from 'protractor';
 import { DatePickerPage } from '../../../material/datePickerPage';
 
diff --git a/e2e/pages/adf/content_services/search/components/numberRangeFilterPage.ts b/e2e/pages/adf/content_services/search/components/numberRangeFilterPage.ts
index f5792a5f10..a2d1a4777d 100644
--- a/e2e/pages/adf/content_services/search/components/numberRangeFilterPage.ts
+++ b/e2e/pages/adf/content_services/search/components/numberRangeFilterPage.ts
@@ -14,8 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import Util = require('../../../../../util/util');
-import { by, protractor, browser } from 'protractor';
+import { Util } from '../../../../../util/util';
+import { by, protractor } from 'protractor';
 
 export class NumberRangeFilterPage {
 
diff --git a/e2e/pages/adf/content_services/search/components/search-checkList.ts b/e2e/pages/adf/content_services/search/components/search-checkList.ts
index 40a00a4e29..56164d2939 100644
--- a/e2e/pages/adf/content_services/search/components/search-checkList.ts
+++ b/e2e/pages/adf/content_services/search/components/search-checkList.ts
@@ -15,24 +15,24 @@
  * limitations under the License.
  */
 
-import Util = require('../../../../../util/util');
-import { element, by } from 'protractor';
+import { Util } from '../../../../../util/util';
+import { element, by, ElementFinder } from 'protractor';
 
 export class SearchCheckListPage {
 
-    filter;
+    filter: ElementFinder;
     inputBy = by.css('div[class*="mat-expansion-panel-content"] input');
     showMoreBy = by.css('button[title="Show more"]');
     showLessBy = by.css('button[title="Show less"]');
     clearAllButton = by.css('button');
 
-    constructor(filter) {
+    constructor(filter: ElementFinder) {
         this.filter = filter;
     }
 
     clickCheckListOption(option) {
         Util.waitUntilElementIsVisible(this.filter);
-        let result = this.filter.element(by.css(`mat-checkbox[data-automation-id*='-${option}'] .mat-checkbox-inner-container`));
+        let result = this.filter.all(by.css(`mat-checkbox[data-automation-id*='-${option}'] .mat-checkbox-inner-container`)).first();
         Util.waitUntilElementIsVisible(result);
         Util.waitUntilElementIsClickable(result);
         result.click();
@@ -63,16 +63,16 @@ export class SearchCheckListPage {
     }
 
     checkSearchFilterInputIsDisplayed() {
-        Util.waitUntilElementIsVisible(this.filter.element(this.inputBy));
+        Util.waitUntilElementIsVisible(this.filter.all(this.inputBy).first());
     }
 
     searchInFilter(option) {
-        let inputElement = this.filter.element(this.inputBy);
+        let inputElement = this.filter.all(this.inputBy).first();
         Util.waitUntilElementIsClickable(this.filter);
         Util.waitUntilElementIsClickable(inputElement);
 
         inputElement.clear();
-        this.filter.element(this.inputBy).sendKeys(option);
+        this.filter.all(this.inputBy).first().sendKeys(option);
     }
 
     checkShowLessButtonIsNotDisplayed() {
diff --git a/e2e/pages/adf/content_services/search/components/search-radio.ts b/e2e/pages/adf/content_services/search/components/search-radio.ts
index a439d635e5..ce02a8ee4f 100644
--- a/e2e/pages/adf/content_services/search/components/search-radio.ts
+++ b/e2e/pages/adf/content_services/search/components/search-radio.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import Util = require('../../../../../util/util');
+import { Util } from '../../../../../util/util';
 import { element, by, browser } from 'protractor';
 
 export class SearchRadioPage {
diff --git a/e2e/pages/adf/content_services/search/components/search-slider.page.ts b/e2e/pages/adf/content_services/search/components/search-slider.page.ts
index cac441b1b6..d1bb92f9f5 100644
--- a/e2e/pages/adf/content_services/search/components/search-slider.page.ts
+++ b/e2e/pages/adf/content_services/search/components/search-slider.page.ts
@@ -16,7 +16,7 @@
  */
 
 import { browser, by, protractor } from 'protractor';
-import Util = require('../../../../../util/util');
+import { Util } from '../../../../../util/util';
 
 export class SearchSliderPage {
 
diff --git a/e2e/pages/adf/content_services/search/components/search-text.ts b/e2e/pages/adf/content_services/search/components/search-text.ts
index 539d0d2df4..9c4da23e7c 100644
--- a/e2e/pages/adf/content_services/search/components/search-text.ts
+++ b/e2e/pages/adf/content_services/search/components/search-text.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import Util = require('../../../../../util/util');
+import { Util } from '../../../../../util/util';
 import { protractor, by } from 'protractor';
 
 export class SearchTextPage {
diff --git a/e2e/pages/adf/content_services/search/search-categories.ts b/e2e/pages/adf/content_services/search/search-categories.ts
index b649621a08..87e612ed3f 100644
--- a/e2e/pages/adf/content_services/search/search-categories.ts
+++ b/e2e/pages/adf/content_services/search/search-categories.ts
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import Util = require('../../../../util/util');
-import { by } from 'protractor';
+import { Util } from '../../../../util/util';
+import { by, ElementFinder } from 'protractor';
 import { SearchTextPage } from './components/search-text';
 import { SearchCheckListPage } from './components/search-checkList';
 import { SearchRadioPage } from './components/search-radio';
@@ -26,56 +26,56 @@ import { SearchSliderPage } from './components/search-slider.page';
 
 export class SearchCategoriesPage {
 
-    checkListFiltersPage(filter) {
+    checkListFiltersPage(filter: ElementFinder) {
         return new SearchCheckListPage(filter);
     }
 
-    textFiltersPage(filter) {
+    textFiltersPage(filter: ElementFinder) {
         return new SearchTextPage(filter);
     }
 
-    radioFiltersPage(filter) {
+    radioFiltersPage(filter: ElementFinder) {
         return new SearchRadioPage(filter);
     }
 
-    dateRangeFilter(filter) {
+    dateRangeFilter(filter: ElementFinder) {
         return new DateRangeFilterPage(filter);
     }
 
-    numberRangeFilter(filter) {
+    numberRangeFilter(filter: ElementFinder) {
         return new NumberRangeFilterPage(filter);
     }
 
-    sliderFilter(filter) {
+    sliderFilter(filter: ElementFinder) {
         return new SearchSliderPage(filter);
     }
 
-    checkFilterIsDisplayed(filter) {
+    checkFilterIsDisplayed(filter: ElementFinder) {
         Util.waitUntilElementIsVisible(filter);
         return this;
     }
 
-    clickFilter(filter) {
+    clickFilter(filter: ElementFinder) {
         Util.waitUntilElementIsVisible(filter);
         filter.element(by.css('mat-expansion-panel-header')).click();
         return this;
     }
 
-    clickFilterHeader(filter) {
+    clickFilterHeader(filter: ElementFinder) {
         let fileSizeFilterHeader = filter.element(by.css('mat-expansion-panel-header'));
         Util.waitUntilElementIsClickable(fileSizeFilterHeader);
         fileSizeFilterHeader.click();
         return this;
     }
 
-    checkFilterIsCollapsed(filter) {
+    checkFilterIsCollapsed(filter: ElementFinder) {
         filter.getAttribute('class').then((elementClass) => {
             expect(elementClass).not.toContain('mat-expanded');
         });
         return this;
     }
 
-    checkFilterIsExpanded(filter) {
+    checkFilterIsExpanded(filter: ElementFinder) {
         filter.getAttribute('class').then((elementClass) => {
             expect(elementClass).toContain('mat-expanded');
         });
diff --git a/e2e/pages/adf/content_services/treeViewPage.ts b/e2e/pages/adf/content_services/treeViewPage.ts
index 0ec34ebe68..b51a6a3e9e 100644
--- a/e2e/pages/adf/content_services/treeViewPage.ts
+++ b/e2e/pages/adf/content_services/treeViewPage.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import Util = require('../../../util/util');
+import { Util } from '../../../util/util';
 import { element, by, protractor } from 'protractor';
 
 export class TreeViewPage {
diff --git a/e2e/pages/adf/core/headerPage.ts b/e2e/pages/adf/core/headerPage.ts
index e34ac19a4e..8994b274f1 100644
--- a/e2e/pages/adf/core/headerPage.ts
+++ b/e2e/pages/adf/core/headerPage.ts
@@ -17,7 +17,7 @@
 
 import { element, by, protractor } from 'protractor';
 
-import Util = require('../../../util/util');
+import { Util } from '../../../util/util';
 
 export class HeaderPage {
 
diff --git a/e2e/pages/adf/dataTablePage.js b/e2e/pages/adf/dataTablePage.js
deleted file mode 100644
index 570251cb68..0000000000
--- a/e2e/pages/adf/dataTablePage.js
+++ /dev/null
@@ -1,354 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { element, by, browser } from 'protractor';
-
-var TestConfig = require('../../test.config');
-var Util = require('../../util/util');
-
-var DataTablePage = function (rootElement = element(by.css("adf-datatable"))) {
-
-    var dataTableURL = TestConfig.adf.url + TestConfig.adf.port + "/datatable";
-
-    var contents = element.all(by.css('div[class="adf-datatable-body"] span'));
-    var multiSelect = element(by.css("div[data-automation-id='multiselect'] label > div[class='mat-checkbox-inner-container']"));
-    var selectionButton = element(by.css("div[class='mat-select-arrow']"));
-    var selectionDropDown = element(by.css("div[class*='ng-trigger-transformPanel']"));
-    var allSelectedRows = element.all(by.css("div[class*='is-selected']"));
-    var selectedRowNumber = element(by.css("div[class*='is-selected'] div[data-automation-id*='text_']"));
-    var selectAll = element(by.css("div[class*='header'] label"));
-    var list = rootElement.all(by.css("div[class*=adf-datatable-body] div[class*=adf-datatable-row]"));
-    var addRow = element(by.xpath("//span[contains(text(),'Add row')]/.."));
-    var replaceRows = element(by.xpath("//span[contains(text(),'Replace rows')]/.."));
-    var reset = element(by.xpath("//span[contains(text(),'Reset to default')]/.."));
-    var replaceColumns = element(by.xpath("//span[contains(text(),'Replace columns')]/.."));
-    var createdOnColumn = element(by.css("div[data-automation-id='auto_id_createdOn']"));
-    var pageLoaded = element(by.css("div[data-automation-id='auto_id_id']"));
-    var tableBody = element.all(by.css("div[class='adf-datatable-body']")).first();
-    var spinner = element(by.css('mat-progress-spinner'));
-    var rows = by.css("adf-datatable div[class*='adf-datatable-body'] div[class*='adf-datatable-row']");
-    var nameColumn = by.css("adf-datatable div[class*='adf-datatable-body'] div[class*='adf-datatable-row'] div[title='Name'] span");
-
-    this.goToDatatable = function () {
-        browser.driver.get(dataTableURL);
-        Util.waitUntilElementIsVisible(pageLoaded);
-    };
-
-    this.getAllDisplayedRows = function () {
-        return element.all(rows).count();
-    };
-
-    this.getAllRowsNameColumn = function () {
-        return this.getAllRowsColumnValues(nameColumn);
-    };
-
-    this.getAllRowsColumnValues = function (locator) {
-        var deferred = protractor.promise.defer();
-        Util.waitUntilElementIsVisible(element.all(locator).first());
-        var initialList = [];
-
-        element.all(locator).each(function (element) {
-            element.getText().then(function (text) {
-                if (text !== '') {
-                    initialList.push(text);
-                }
-            });
-        }).then(function () {
-            deferred.fulfill(initialList);
-        });
-
-        return deferred.promise;
-    };
-
-    /**
-     * Retrieve row by row number
-     *
-     * @param rowNumber
-     */
-    this.getRowByRowNumber = function (rowNumber) {
-        Util.waitUntilElementIsVisible(element(by.css("div[data-automation-id='text_" + rowNumber + "']")));
-        return element(by.css("div[data-automation-id='text_" + rowNumber + "']"));
-    };
-
-    /**
-     * Retrieve the checkbox of the row
-     *
-     * @param rowNumber
-     */
-    this.getRowCheckbox = function (rowNumber) {
-        return this.getRowByRowNumber(rowNumber).element(by.xpath("ancestor::div/div/mat-checkbox[contains(@class, 'mat-checkbox-checked')]"));
-    };
-
-    /**
-     * Click multiselect option
-     * */
-    this.clickMultiSelect = function () {
-        Util.waitUntilElementIsVisible(multiSelect);
-        multiSelect.click();
-    };
-
-    /**
-     * Click reset option
-     * */
-    this.clickReset = function () {
-        Util.waitUntilElementIsVisible(reset);
-        reset.click();
-    };
-
-    /**
-     * Click specific checkbox in row
-     * @method clickCheckbox
-     * @param {String} row number
-     */
-    this.clickCheckbox = function (rowNumber) {
-        var checkbox = this.getRowByRowNumber(rowNumber).element(by.xpath("ancestor::div[contains(@class, 'adf-datatable-row')]//mat-checkbox/label"));
-        Util.waitUntilElementIsVisible(checkbox);
-        checkbox.click();
-    };
-
-    /**
-     * Select a specific row
-     * @method selectRow
-     * @param {String} row number
-     */
-    this.selectRow = function (rowNumber) {
-        return this.getRowByRowNumber(rowNumber).click();
-    };
-
-    /**
-     * Select a specific row using command key
-     * @method selectRow
-     * @param {String} row number
-     */
-    this.selectRowWithKeyboard = function (rowNumber) {
-        let row = this.getRowByRowNumber(rowNumber);
-        browser.actions().sendKeys(protractor.Key.COMMAND).click(row).perform();
-    };
-
-    /**
-     * Select a specific selection mode
-     * @method selectSelectionMode
-     * @param {String} selection mode
-     */
-    this.selectSelectionMode = function (selectionMode) {
-        let selectMode = element(by.cssContainingText("span[class='mat-option-text']", selectionMode));
-        selectionButton.click();
-        Util.waitUntilElementIsVisible(selectionDropDown);
-        selectMode.click();
-    };
-
-    /**
-     * Check if a specific row is selected
-     * @method checkRowIsSelected
-     * @param {String} row number
-     */
-    this.checkRowIsSelected = function (rowNumber) {
-        let isRowSelected = this.getRowByRowNumber(rowNumber).element(by.xpath("ancestor::div[contains(@class, 'is-selected')]"));
-        Util.waitUntilElementIsVisible(isRowSelected);
-    };
-
-    /**
-     * Check if a specific row is not selected
-     * @method checkRowIsNotSelected
-     * @param {String} row number
-     */
-    this.checkRowIsNotSelected = function (rowNumber) {
-        let isRowSelected = this.getRowByRowNumber(rowNumber).element(by.xpath("ancestor::div[contains(@class, 'adf-datatable-row custom-row-style ng-star-inserted is-selected')]"));
-        Util.waitUntilElementIsNotOnPage(isRowSelected);
-    };
-
-    /**
-     * Check no row is selected
-     * @method checkNoRowIsSelected
-     */
-    this.checkNoRowIsSelected = function () {
-        Util.waitUntilElementIsNotOnPage(selectedRowNumber);
-    };
-
-    this.checkAllRows = function () {
-        Util.waitUntilElementIsVisible(selectAll);
-        selectAll.click();
-    };
-
-    /**
-     * Check specfic row is checked
-     * @method checkRowIsChecked
-     * @param {String} row number
-     */
-    this.checkRowIsChecked = function (rowNumber) {
-        Util.waitUntilElementIsVisible(this.getRowCheckbox(rowNumber));
-    };
-
-    /**
-     * Check specfic row is not checked
-     * @method checkRowIsNotChecked
-     * @param {String} row number
-     */
-    this.checkRowIsNotChecked = function (rowNumber) {
-        Util.waitUntilElementIsNotOnPage(this.getRowCheckbox(rowNumber));
-    };
-
-    /**
-     * Add a row to the table
-     * @method addRow
-     */
-    this.addRow = function () {
-        Util.waitUntilElementIsVisible(addRow);
-        addRow.click();
-    };
-
-    /**
-     * Get the number of rows of the table
-     * @method getNumberOfRows
-     */
-    this.getNumberOfRows = function () {
-        return list.count();
-    };
-
-    /**
-     * Get the number of selected rows of the table
-     * @method getNumberOfSelectedRows
-     */
-    this.getNumberOfSelectedRows = function () {
-        return allSelectedRows.count();
-    };
-
-    /**
-     * replace rows
-     * @method replaceRows
-     * @param {String} id
-     */
-    this.replaceRows = function (id) {
-        let rowID = this.getRowByRowNumber(id);
-        Util.waitUntilElementIsVisible(rowID);
-        replaceRows.click();
-        Util.waitUntilElementIsNotOnPage(rowID);
-    };
-
-    /**
-     * replace columns
-     * @method replaceColumns
-     */
-    this.replaceColumns = function () {
-        Util.waitUntilElementIsVisible(replaceColumns);
-        replaceColumns.click();
-        Util.waitUntilElementIsNotOnPage(createdOnColumn);
-    };
-
-    this.getRowsName = function (content) {
-        let row = element(by.css("div[data-automation-id*='" + content + "']"));
-        Util.waitUntilElementIsPresent(row);
-        return row;
-    };
-
-    this.doubleClickRow = function (rowName) {
-        let row = this.getRowByRowName(rowName);
-        Util.waitUntilElementIsVisible(row);
-        Util.waitUntilElementIsClickable(row);
-        row.click();
-        Util.waitUntilElementIsVisible(row.all(by.css("div[class*='--image'] mat-icon[svgicon*='selected']")).first());
-        browser.actions().sendKeys(protractor.Key.ENTER).perform();
-        return this;
-    };
-
-    this.getRowByRowName = function (content) {
-        let rowByRowName = by.xpath("ancestor::div[contains(@class, 'adf-datatable-row')]");
-        Util.waitUntilElementIsPresent(this.getRowsName(content).element(rowByRowName));
-        return this.getRowsName(content).element(rowByRowName);
-    };
-
-    this.waitForTableBody = function () {
-        Util.waitUntilElementIsVisible(tableBody);
-    };
-
-    this.insertFilter = function (filterText) {
-        let inputFilter = element(by.xpath("//*[@id=\"adf-datatable-filter-input\"]"));
-        inputFilter.clear();
-        return inputFilter.sendKeys(filterText);
-    };
-
-    this.getNodeIdFirstElement = function () {
-        let firstNode = element.all(by.css('adf-datatable div[title="Node id"] span')).first();
-        return firstNode.getText();
-    };
-
-    this.sortByColumn = function (sortOrder, locator) {
-        Util.waitUntilElementIsVisible(element(locator));
-        return element(locator).getAttribute('class').then(function (result) {
-            if (sortOrder === true) {
-                if (!result.includes('sorted-asc')) {
-                    if (result.includes('sorted-desc') || result.includes('sortable')) {
-                        element(locator).click();
-                    }
-                }
-            }
-            else {
-                if (result.includes('sorted-asc')) {
-                    element(locator).click();
-                } else if (result.includes('sortable')) {
-                    element(locator).click();
-                    element(locator).click();
-                }
-            }
-
-            return Promise.resolve();
-        });
-    };
-
-    this.checkContentIsDisplayed = function(content) {
-        var row = by.cssContainingText("span", content);
-        Util.waitUntilElementIsVisible(tableBody.all(row).first());
-        return this;
-    };
-
-    this.checkContentIsNotDisplayed = function(content) {
-        var row = by.cssContainingText("span", content);
-        Util.waitUntilElementIsNotOnPage(tableBody.all(row).first());
-        return this;
-    };
-
-    this.selectRowByContentName = function(content) {
-        var row = by.cssContainingText("span", content);
-        Util.waitUntilElementIsVisible(tableBody.element(row));
-        tableBody.element(row).click();
-        return this;
-    };
-
-    this.contentInPosition = function (position){
-        Util.waitUntilElementIsVisible(contents);
-        return contents.get(position -1).getText();
-    };
-
-    this.checkSpinnerIsDisplayed = function () {
-        Util.waitUntilElementIsPresent(spinner);
-    };
-
-    this.checkRowIsDisplayedByName = function (name) {
-        Util.waitUntilElementIsVisible(element(by.css("div[filename='"+name+"']")));
-    };
-
-    this.checkRowIsNotDisplayedByName = function (taskName) {
-        Util.waitUntilElementIsNotOnPage(element(by.css("div[filename='"+taskName+"']")));
-    };
-
-    this.getNumberOfRowsDisplayedWithSameName = function (taskName) {
-        Util.waitUntilElementIsVisible(element(by.css("div[filename='"+taskName+"']")));
-        return element.all(by.css("div[title='Name'][filename='"+taskName+"']")).count();
-    };
-
-};
-module.exports = DataTablePage;
diff --git a/e2e/pages/adf/dataTablePage.ts b/e2e/pages/adf/dataTablePage.ts
new file mode 100644
index 0000000000..370f88eaf4
--- /dev/null
+++ b/e2e/pages/adf/dataTablePage.ts
@@ -0,0 +1,271 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { browser, by, element, protractor } from 'protractor';
+import { Util } from '../../util/util';
+import { ElementFinder } from 'protractor/built/element';
+
+export class DataTablePage {
+
+    rootElement: ElementFinder;
+    list: ElementFinder;
+    contents = element.all(by.css('div[class="adf-datatable-body"] span'));
+    multiSelect = element(by.css(`div[data-automation-id='multiselect'] label > div[class='mat-checkbox-inner-container']`));
+    selectionButton = element(by.css(`div[class='mat-select-arrow']`));
+    selectionDropDown = element(by.css(`div[class*='ng-trigger-transformPanel']`));
+    allSelectedRows = element.all(by.css(`div[class*='is-selected']`));
+    selectedRowNumber = element(by.css(`div[class*='is-selected'] div[data-automation-id*='text_']`));
+    selectAll = element(by.css(`div[class*='header'] label`));
+    addRowElement = element(by.xpath(`//span[contains(text(),'Add row')]/..`));
+    replaceRowsElement = element(by.xpath(`//span[contains(text(),'Replace rows')]/..`));
+    reset = element(by.xpath(`//span[contains(text(),'Reset to default')]/..`));
+    replaceColumnsElement = element(by.xpath(`//span[contains(text(),'Replace columns')]/..`));
+    createdOnColumn = element(by.css(`div[data-automation-id='auto_id_createdOn']`));
+    pageLoaded = element(by.css(`div[data-automation-id='auto_id_id']`));
+    tableBody = element.all(by.css(`div[class='adf-datatable-body']`)).first();
+    spinner = element(by.css('mat-progress-spinner'));
+    rows = by.css(`adf-datatable div[class*='adf-datatable-body'] div[class*='adf-datatable-row']`);
+    nameColumn = by.css(`adf-datatable div[class*='adf-datatable-body'] div[class*='adf-datatable-row'] div[title='Name'] span`);
+
+    constructor(rootElement: ElementFinder = element(by.css('adf-datatable'))) {
+        this.rootElement = rootElement;
+        this.list = this.rootElement.all(by.css(`div[class*=adf-datatable-body] div[class*=adf-datatable-row]`));
+
+    }
+
+    getAllDisplayedRows() {
+        return element.all(this.rows).count();
+    }
+
+    getAllRowsNameColumn() {
+        return this.getAllRowsColumnValues(this.nameColumn);
+    }
+
+    getAllRowsColumnValues(locator) {
+        let deferred = protractor.promise.defer();
+        Util.waitUntilElementIsVisible(element.all(locator).first());
+        let initialList = [];
+
+        element.all(locator).each(function (currentElement) {
+            currentElement.getText().then(function (text) {
+                if (text !== '') {
+                    initialList.push(text);
+                }
+            });
+        }).then(function () {
+            deferred.fulfill(initialList);
+        });
+
+        return deferred.promise;
+    }
+
+    getRowByRowNumber(rowNumber) {
+        Util.waitUntilElementIsVisible(element(by.css(`div[data-automation-id='text_` + rowNumber + `']`)));
+        return element(by.css(`div[data-automation-id='text_` + rowNumber + `']`));
+    }
+
+    getRowCheckbox(rowNumber) {
+        return this.getRowByRowNumber(rowNumber).element(by.xpath(`ancestor::div/div/mat-checkbox[contains(@class, 'mat-checkbox-checked')]`));
+    }
+
+    clickMultiSelect() {
+        Util.waitUntilElementIsVisible(this.multiSelect);
+        this.multiSelect.click();
+    }
+
+    clickReset() {
+        Util.waitUntilElementIsVisible(this.reset);
+        this.reset.click();
+    }
+
+    clickCheckbox(rowNumber) {
+        let checkbox = this.getRowByRowNumber(rowNumber).element(by.xpath(`ancestor::div[contains(@class, 'adf-datatable-row')]//mat-checkbox/label`));
+        Util.waitUntilElementIsVisible(checkbox);
+        checkbox.click();
+    }
+
+    selectRow(rowNumber) {
+        return this.getRowByRowNumber(rowNumber).click();
+    }
+
+    selectRowWithKeyboard(rowNumber) {
+        let row = this.getRowByRowNumber(rowNumber);
+        browser.actions().sendKeys(protractor.Key.COMMAND).click(row).perform();
+    }
+
+    selectSelectionMode(selectionMode) {
+        let selectMode = element(by.cssContainingText(`span[class='mat-option-text']`, selectionMode));
+        this.selectionButton.click();
+        Util.waitUntilElementIsVisible(this.selectionDropDown);
+        selectMode.click();
+    }
+
+    checkRowIsSelected(rowNumber) {
+        let isRowSelected = this.getRowByRowNumber(rowNumber).element(by.xpath(`ancestor::div[contains(@class, 'is-selected')]`));
+        Util.waitUntilElementIsVisible(isRowSelected);
+    }
+
+    checkRowIsNotSelected(rowNumber) {
+        let isRowSelected = this.getRowByRowNumber(rowNumber)
+            .element(by.xpath(`ancestor::div[contains(@class, 'adf-datatable-row custom-row-style ng-star-inserted is-selected')]`));
+        Util.waitUntilElementIsNotOnPage(isRowSelected);
+    }
+
+    checkNoRowIsSelected() {
+        Util.waitUntilElementIsNotOnPage(this.selectedRowNumber);
+    }
+
+    checkAllRows() {
+        Util.waitUntilElementIsVisible(this.selectAll);
+        this.selectAll.click();
+    }
+
+    checkRowIsChecked(rowNumber) {
+        Util.waitUntilElementIsVisible(this.getRowCheckbox(rowNumber));
+    }
+
+    checkRowIsNotChecked(rowNumber) {
+        Util.waitUntilElementIsNotOnPage(this.getRowCheckbox(rowNumber));
+    }
+
+    addRow() {
+        Util.waitUntilElementIsVisible(this.addRowElement);
+        this.addRowElement.click();
+    }
+
+    getNumberOfRows() {
+        return this.list.count();
+    }
+
+    getNumberOfSelectedRows() {
+        return this.allSelectedRows.count();
+    }
+
+    replaceRows(id) {
+        let rowID = this.getRowByRowNumber(id);
+        Util.waitUntilElementIsVisible(rowID);
+        this.replaceRowsElement.click();
+        Util.waitUntilElementIsNotOnPage(rowID);
+    }
+
+    replaceColumns() {
+        Util.waitUntilElementIsVisible(this.replaceColumnsElement);
+        this.replaceColumnsElement.click();
+        Util.waitUntilElementIsNotOnPage(this.createdOnColumn);
+    }
+
+    getRowsName(content) {
+        let row = element(by.css(`div[data-automation-id*='` + content + `']`));
+        Util.waitUntilElementIsPresent(row);
+        return row;
+    }
+
+    doubleClickRow(rowName) {
+        let row = this.getRowByRowName(rowName);
+        Util.waitUntilElementIsVisible(row);
+        Util.waitUntilElementIsClickable(row);
+        row.click();
+        Util.waitUntilElementIsVisible(row.all(by.css(`div[class*='--image'] mat-icon[svgicon*='selected']`)).first());
+        browser.actions().sendKeys(protractor.Key.ENTER).perform();
+        return this;
+    }
+
+    getRowByRowName(content) {
+        let rowByRowName = by.xpath(`ancestor::div[contains(@class, 'adf-datatable-row')]`);
+        Util.waitUntilElementIsPresent(this.getRowsName(content).element(rowByRowName));
+        return this.getRowsName(content).element(rowByRowName);
+    }
+
+    waitForTableBody() {
+        Util.waitUntilElementIsVisible(this.tableBody);
+    }
+
+    insertFilter(filterText) {
+        let inputFilter = element(by.css(`#adf-datatable-filter-input`));
+        inputFilter.clear();
+        return inputFilter.sendKeys(filterText);
+    }
+
+    getNodeIdFirstElement() {
+        let firstNode = element.all(by.css('adf-datatable div[title="Node id"] span')).first();
+        return firstNode.getText();
+    }
+
+    sortByColumn(sortOrder, locator) {
+        Util.waitUntilElementIsVisible(element(locator));
+        return element(locator).getAttribute('class').then(function (result) {
+            if (sortOrder === true) {
+                if (!result.includes('sorted-asc')) {
+                    if (result.includes('sorted-desc') || result.includes('sortable')) {
+                        element(locator).click();
+                    }
+                }
+            } else {
+                if (result.includes('sorted-asc')) {
+                    element(locator).click();
+                } else if (result.includes('sortable')) {
+                    element(locator).click();
+                    element(locator).click();
+                }
+            }
+
+            return Promise.resolve();
+        });
+    }
+
+    checkContentIsDisplayed(content) {
+        let row = by.cssContainingText(`span`, content);
+        Util.waitUntilElementIsVisible(this.tableBody.all(row).first());
+        return this;
+    }
+
+    checkContentIsNotDisplayed(content) {
+        let row = by.cssContainingText(`span`, content);
+        Util.waitUntilElementIsNotOnPage(this.tableBody.all(row).first());
+        return this;
+    }
+
+    selectRowByContentName(content) {
+        let row = by.cssContainingText(`span`, content);
+        Util.waitUntilElementIsVisible(this.tableBody.element(row));
+        this.tableBody.element(row).click();
+        return this;
+    }
+
+    contentInPosition(position) {
+        Util.waitUntilElementIsVisible(this.contents);
+        return this.contents.get(position - 1).getText();
+    }
+
+    checkSpinnerIsDisplayed() {
+        Util.waitUntilElementIsPresent(this.spinner);
+    }
+
+    checkRowIsDisplayedByName(filename) {
+        Util.waitUntilElementIsVisible(element.all(by.css(`div[filename="${filename}"]`)).first());
+    }
+
+    checkRowIsNotDisplayedByName(filename) {
+        Util.waitUntilElementIsNotOnPage(element.all(by.css(`div[filename="${filename}"]`)).first());
+    }
+
+    getNumberOfRowsDisplayedWithSameName(filename) {
+        Util.waitUntilElementIsVisible(element(by.css(`div[filename="${filename}"]`)));
+        return element.all(by.css(`div[title='Name'][filename="${filename}"]`)).count();
+    }
+
+}
diff --git a/e2e/pages/adf/demo-shell/taskFiltersDemoPage.ts b/e2e/pages/adf/demo-shell/taskFiltersDemoPage.ts
index de3342158b..76c58895f6 100644
--- a/e2e/pages/adf/demo-shell/taskFiltersDemoPage.ts
+++ b/e2e/pages/adf/demo-shell/taskFiltersDemoPage.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import Util = require('../../../util/util');
+import { Util } from '../../../util/util';
 
 import { element, by } from 'protractor';
 import { TaskFiltersPage } from '../process_services/taskFiltersPage';
diff --git a/e2e/pages/adf/demo-shell/taskListDemoPage.ts b/e2e/pages/adf/demo-shell/taskListDemoPage.ts
index 72dff77856..fab3581ca0 100644
--- a/e2e/pages/adf/demo-shell/taskListDemoPage.ts
+++ b/e2e/pages/adf/demo-shell/taskListDemoPage.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import Util = require('../../../util/util');
-import DataTable = require('../dataTablePage');
-import TaskListPage = require('../process_services/tasksListPage');
-import PaginationPage = require('../paginationPage');
+import { Util } from '../../../util/util';
+import { TasksListPage } from '../process_services/tasksListPage';
+import { PaginationPage } from '../paginationPage';
 import { element, by } from 'protractor';
 
 export class TaskListDemoPage {
 
+    taskListPage: TasksListPage = new TasksListPage();
     appId = element(by.css("input[data-automation-id='appId input']"));
     itemsPerPage = element(by.css("input[data-automation-id='items per page']"));
     itemsPerPageForm = element(by.css("mat-form-field[data-automation-id='items per page']"));
@@ -40,10 +40,11 @@ export class TaskListDemoPage {
     sortDropDownArrow = element(by.css("mat-form-field[data-automation-id='sort'] div[class*='arrow']"));
     sortSelector = element(by.css("div[class*='mat-select-content']"));
     processDefinitionIdColumn = by.css("adf-datatable div[class*='adf-datatable-body'] div[class*='adf-datatable-row'] div[title='Process Definition Id'] span");
-    processInstanceIdColumn = by.css("adf-datatable div[class*='adf-datatable-body'] div[class*='adf-datatable-row'] div[title='Process Instance Id'] span");
+    processInstanceIdColumn = by.css("adf-datatable div[class*='adf-datatable-body'] div[class*='a" +
+        "df-datatable-row'] div[title='Process Instance Id'] span");
 
-    taskList() {
-        return new TaskListPage();
+    taskList(): TasksListPage {
+        return this.taskListPage;
     }
 
     paginationPage() {
@@ -161,11 +162,6 @@ export class TaskListDemoPage {
         return this;
     }
 
-    getDueAfter() {
-        Util.waitUntilElementIsVisible(this.dueAfter);
-        return this.dueAfter.getAttribute('value');
-    }
-
     typeDueBefore(input) {
         Util.waitUntilElementIsVisible(this.dueBefore);
         this.clearText(this.dueBefore);
@@ -173,14 +169,9 @@ export class TaskListDemoPage {
         return this;
     }
 
-    getDueBefore() {
-        Util.waitUntilElementIsVisible(this.dueBefore);
-        return this.dueBefore.getAttribute('value');
-    }
-
-    clearText(input) {

+    clearText(input) {
         Util.waitUntilElementIsVisible(input);
-        return input.clear();

+        return input.clear();
     }
 
     clickResetButton() {
diff --git a/e2e/pages/adf/demo-shell/tasksCloudDemoPage.ts b/e2e/pages/adf/demo-shell/tasksCloudDemoPage.ts
index 834e00f45b..df35ed4025 100644
--- a/e2e/pages/adf/demo-shell/tasksCloudDemoPage.ts
+++ b/e2e/pages/adf/demo-shell/tasksCloudDemoPage.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import Util = require('../../../util/util');
+import { Util } from '../../../util/util';
 
 import { TaskFiltersCloudComponent } from '../process_cloud/taskFiltersCloudComponent';
 import { TaskListCloudComponent } from '../process_cloud/taskListCloudComponent';
diff --git a/e2e/pages/adf/dialog/contentList.js b/e2e/pages/adf/dialog/contentList.js
deleted file mode 100644
index 930f4d05c1..0000000000
--- a/e2e/pages/adf/dialog/contentList.js
+++ /dev/null
@@ -1,391 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var Util = require('../../../util/util');
-
-var ContentList = function () {
-
-    var deleteContent = element(by.css("button[data-automation-id*='DELETE']"));
-    var metadataAction = element(by.css("button[data-automation-id*='METADATA']"));
-    var versionManagerAction = element(by.css("button[data-automation-id*='VERSIONS']"));
-    var moveContent = element(by.css("button[data-automation-id*='MOVE']"));
-    var copyContent = element(by.css("button[data-automation-id*='COPY']"));
-    var downloadContent = element(by.css("button[data-automation-id*='DOWNLOAD']"));
-    var actionMenu = element(by.css("div[role='menu']"));
-    var optionButton = by.css("button[data-automation-id*='action_menu_']");
-    var rowByRowName = by.xpath("ancestor::div[contains(@class, 'adf-datatable-row')]");
-    var nameColumn = by.css('div[class*="datatable-body"] div[class*="adf-data-table-cell"][title="Display name"]');
-    var nameColumnHeader = by.css("div[data-automation-id='auto_id_name']");
-    var createdByColumn = by.css("div[class*='--text'][title='Created by'] span");
-    var sizeColumn = by.css("div[id*='document-list-container'] div[class*='adf-datatable-row'] .adf-filesize-cell");
-    var createdByColumnHeader = by.css("div[data-automation-id*='auto_id_createdByUser']");
-    var createdColumn = by.css("div[class*='--date'] span");
-    var createdColumnHeader = by.css("div[data-automation-id*='auto_id_createdAt']");
-    var rows = by.css("div[id='document-list-container'] div[class*='adf-datatable-body'] div[class*='adf-datatable-row']");
-    var emptyFolderMessage = element(by.css("div[class='adf-empty-folder-this-space-is-empty']"));
-    var table = element(by.css("div[class*='upload-border']"));
-    var tableBody = element.all(by.css("adf-document-list div[class='adf-datatable-body']")).first();
-
-    this.getRowsName = function (content) {
-        var row = element.all(by.xpath("//div[@id='document-list-container']//div[@filename='" + content + "']")).first();
-        Util.waitUntilElementIsVisible(row);
-        return row;
-    };
-
-    this.getRowByRowName = function (content) {
-        Util.waitUntilElementIsOnPage(this.getRowsName(content).element(rowByRowName));
-        Util.waitUntilElementIsVisible(this.getRowsName(content).element(rowByRowName));
-        return this.getRowsName(content).element(rowByRowName);
-    };
-
-    this.getAllDisplayedRows = function () {
-        return element.all(rows).count();
-    };
-
-    this.getAllRowsNameColumn = function () {
-        return this.getAllRowsColumnValues(nameColumn);
-    };
-
-    this.getAllRowsColumnValues = function (locator) {
-        var deferred = protractor.promise.defer();
-        Util.waitUntilElementIsVisible(element.all(locator).first());
-        var initialList = [];
-
-        element.all(locator).each(function (element) {
-            element.getText().then(function (text) {
-                if (text !== '') {
-                    initialList.push(text);
-                }
-            });
-        }).then(function () {
-            deferred.fulfill(initialList);
-        });
-
-        return deferred.promise;
-    };
-
-    this.deleteContent = function (content) {
-        this.clickOnActionMenu(content);
-        this.waitForContentOptions();
-        deleteContent.click();
-    };
-
-    this.checkDeleteIsDisabled = function (content) {
-        this.clickOnActionMenu(content);
-        this.waitForContentOptions();
-        let disabledDelete = element(by.css("button[data-automation-id*='DELETE'][disabled='true']"));
-        Util.waitUntilElementIsVisible(disabledDelete);
-    };
-
-    this.metadataContent = function (content) {
-        this.clickOnActionMenu(content);
-        this.waitForContentOptions();
-        metadataAction.click();
-    };
-
-    this.versionManagerContent = function (content) {
-        this.clickOnActionMenu(content);
-        this.waitForContentOptions();
-        versionManagerAction.click();
-    };
-
-    this.moveContent = function (content) {
-        this.clickOnActionMenu(content);
-        moveContent.click();
-    };
-
-    this.copyContent = function (content) {
-        this.clickOnActionMenu(content);
-        copyContent.click();
-    };
-
-    this.waitForContentOptions = function () {
-        Util.waitUntilElementIsVisible(copyContent);
-        Util.waitUntilElementIsVisible(moveContent);
-        Util.waitUntilElementIsVisible(deleteContent);
-        Util.waitUntilElementIsVisible(downloadContent);
-    };
-
-    this.clickOnActionMenu = function (content) {
-        this.getRowByRowName(content).element(optionButton).click();
-        Util.waitUntilElementIsVisible(actionMenu);
-        return this;
-    };
-
-    this.sortByColumn = function (sortOrder, locator) {
-        Util.waitUntilElementIsVisible(element(locator));
-        return element(locator).getAttribute('class').then(function (result) {
-            if (sortOrder === true) {
-                if (!result.includes('sorted-asc')) {
-                    if (result.includes('sorted-desc') || result.includes('sortable')) {
-                        element(locator).click();
-                    }
-                }
-            }
-            else {
-                if (result.includes('sorted-asc')) {
-                    element(locator).click();
-                } else if (result.includes('sortable')) {
-                    element(locator).click();
-                    element(locator).click();
-                }
-            }
-
-            return Promise.resolve();
-        });
-    };
-
-    /**
-     * Sort the list by name column.
-     *
-     * @param sortOrder: 'true' to sort the list ascendant and 'false' for descendant
-     */
-    this.sortByName = function (sortOrder) {
-        this.sortByColumn(sortOrder, nameColumnHeader);
-    };
-
-    /**
-     * Sort the list by author column.
-     *
-     * @param sortOrder: 'true' to sort the list ascendant and 'false' for descendant
-     */
-    this.sortByAuthor = function (sortOrder) {
-        this.sortByColumn(sortOrder, createdByColumnHeader);
-    };
-
-    /**
-     * Sort the list by created column.
-     *
-     * @param sortOrder: 'true' to sort the list ascendant and 'false' for descendant
-     */
-    this.sortByCreated = function (sortOrder) {
-        this.sortByColumn(sortOrder, createdColumnHeader);
-    };
-
-    /**
-     * Check the list is sorted by name column.
-     *
-     * @param sortOrder: 'true' if the list is expected to be sorted ascendant and 'false' for descendant
-     * @return sorted : 'true' if the list is sorted as expected and 'false' if it isn't
-     */
-    this.checkListIsOrderedByNameColumn = function (sortOrder) {
-        var deferred = protractor.promise.defer();
-        deferred.fulfill(this.checkListIsSorted(sortOrder, nameColumn));
-        return deferred.promise;
-    };
-
-    /**
-     * Check the list is sorted by author column.
-     *
-     * @param sortOrder: 'true' if the list is expected to be sorted ascendant and 'false' for descendant
-     * @return sorted : 'true' if the list is sorted as expected and 'false' if it isn't
-     */
-    this.checkListIsOrderedByAuthorColumn = function (sortOrder) {
-        var deferred = protractor.promise.defer();
-        deferred.fulfill(this.checkListIsSorted(sortOrder, createdByColumn));
-        return deferred.promise;
-    };
-
-    this.checkListIsOrderedBySizeColumn = function (sortOrder) {
-        var deferred = protractor.promise.defer();
-        deferred.fulfill(this.checkListIsSorted(sortOrder, sizeColumn));
-        return deferred.promise;
-    };
-
-    /**
-     * Check the list is sorted by created column.
-     *
-     * @param sortOrder: 'true' if the list is expected to be sorted ascendant and 'false' for descendant
-     * @return sorted : 'true' if the list is sorted as expected and 'false' if it isn't
-     */
-    this.checkListIsOrderedByCreatedColumn = function (sortOrder) {
-        var deferred = protractor.promise.defer();
-        var lastValue;
-        var sorted = true;
-
-        element.all(createdColumn).map(function (element) {
-            return element.getText();
-        }).then(function (texts) {
-            texts.forEach(function (text) {
-                if (lastValue !== undefined) {
-                    var currentDate = new Date(text);
-                    var lastDate = new Date(lastValue);
-                    if (sortOrder === true && currentDate.getTime() < lastDate.getTime()) {
-                        sorted = false;
-                    }
-                    if (sortOrder === false && currentDate.getTime() > lastDate.getTime()) {
-                        sorted = false;
-                    }
-                }
-                lastValue = text;
-            });
-            deferred.fulfill(sorted);
-        });
-        return deferred.promise;
-    };
-
-    /**
-     * Check the list is sorted.
-     *
-     * @param sortOrder: 'true' if the list is expected to be sorted ascendant and 'false' for descendant
-     * @param locator: locator for column
-     * @return 'true' if the list is sorted as expected and 'false' if it isn't
-     */
-    this.checkListIsSorted = function (sortOrder, locator) {
-        var deferred = protractor.promise.defer();
-        Util.waitUntilElementIsVisible(element.all(locator).first());
-        var initialList = [];
-        element.all(locator).each(function (element) {
-            element.getText().then(function (text) {
-                initialList.push(text);
-            });
-        }).then(function () {
-            var sortedList = initialList;
-            sortedList = sortedList.sort();
-            if (sortOrder === false) {
-                sortedList = sortedList.reverse();
-            }
-            deferred.fulfill(initialList.toString() === sortedList.toString());
-        });
-        return deferred.promise;
-    };
-
-    this.navigateToFolder = function (folder) {
-        var row = this.getRowsName(folder);
-        Util.waitUntilElementIsVisible(row);
-        Util.waitUntilElementIsOnPage(row);
-        row.click();
-        this.checkRowIsSelected(folder);
-        browser.actions().sendKeys(protractor.Key.ENTER).perform();
-        return this;
-    };
-
-    this.doubleClickRow = function (selectRow) {
-        var row = this.getRowsName(selectRow);
-        Util.waitUntilElementIsVisible(row);
-        Util.waitUntilElementIsClickable(row);
-        row.click();
-        Util.waitUntilElementIsVisible(this.getRowByRowName(selectRow).element(by.css("div[class*='--image'] mat-icon[svgicon*='selected']")));
-        browser.actions().sendKeys(protractor.Key.ENTER).perform();
-        return this;
-    };
-
-    this.doubleClickEntireRow = function (selectRow) {
-        var row = this.getRowByRowName(selectRow);
-        Util.waitUntilElementIsVisible(row);
-        Util.waitUntilElementIsClickable(row);
-        row.click();
-        Util.waitUntilElementIsVisible(this.getRowByRowName(selectRow).element(by.css("div[class*='--image'] mat-icon[svgicon*='selected']")));
-        browser.actions().sendKeys(protractor.Key.ENTER).perform();
-        return this;
-    };
-
-    this.checkRowIsSelected = function (content) {
-        var isRowSelected = this.getRowsName(content).element(by.xpath("ancestor::div[contains(@class, 'is-selected')]"));
-        Util.waitUntilElementIsVisible(isRowSelected);
-    };
-
-    this.checkContentIsDisplayed = function (content) {
-        Util.waitUntilElementIsVisible(this.getRowByRowName(content));
-        return this;
-    };
-
-    this.checkContentIsNotDisplayed = function (filename) {
-        Util.waitUntilElementIsNotVisible(element.all(by.xpath("//div[@id='document-list-container']//div[@filename='" + filename + "']")).first());
-        return this;
-    };
-
-    this.getNodeIdByFilename = function (filename) {
-        var nodeIdColumn = element.all(by.xpath("//div[@id='document-list-container']//div[@filename='" + filename + "' and @title='Node id']"));
-        var text = nodeIdColumn.getText();
-        return text;
-    };
-
-    this.getAllNodeIdInList = async function (filename) {
-        var nodeIdColumns = await element.all(by.xpath("//div[@id='document-list-container']//div[@title='Node id']"));
-        return await nodeIdColumns.map(async (currentElement) => {
-            return await currentElement.getText().then((nodeText)=>{
-                return nodeText;
-            });
-        });
-    };
-
-    this.checkEmptyFolderMessageIsDisplayed = function () {
-        Util.waitUntilElementIsVisible(emptyFolderMessage);
-        return this;
-    };
-
-    this.tableIsLoaded = function () {
-        Util.waitUntilElementIsVisible(table);
-        return this;
-    };
-
-    this.checkIconColumn = function (file, extension) {
-        var row = this.getRowByRowName(file);
-        Util.waitUntilElementIsVisible(row.element(by.css("div[class*='--image'] img[alt*='" + extension + "']")));
-    };
-
-    this.rightClickOnRowNamed = function (rowName) {
-        let row = this.getRowByRowName(rowName);
-        browser.actions().click(row, protractor.Button.RIGHT).perform();
-        Util.waitUntilElementIsVisible(element(by.id('adf-context-menu-content')));
-    };
-
-    this.checkContextActionIsVisible = function (actionName) {
-        let actionButton = element(by.css(`button[data-automation-id="context-${actionName}"`));
-        Util.waitUntilElementIsVisible(actionButton);
-        Util.waitUntilElementIsClickable(actionButton);
-        return actionButton;
-    };
-
-    this.pressContextMenuActionNamed = function (actionName) {
-        let actionButton = this.checkContextActionIsVisible(actionName);
-        actionButton.click();
-    };
-
-    this.clickRowToSelect = function (rowName) {
-        let row = this.getRowByRowName(rowName);
-        browser.actions().keyDown(protractor.Key.COMMAND).click(row).perform();
-        this.checkRowIsSelected(rowName);
-        return this;
-    };
-
-    this.clickContentLockIcon = function (content) {
-        var lockIcon = element(by.css('div[filename="'+ content +'"] button'));
-        Util.waitUntilElementIsClickable(lockIcon);
-        lockIcon.click();
-        return this;
-    };
-
-    this.checkLockedIcon = function (content) {
-        var lockIcon = element(by.cssContainingText('div[filename="'+ content +'"] mat-icon', 'lock'));
-        Util.waitUntilElementIsVisible(lockIcon);
-        return this;
-    };
-
-    this.checkUnlockedIcon = function (content) {
-        var lockIcon = element(by.cssContainingText('div[filename="'+ content +'"] mat-icon', 'lock_open'));
-        Util.waitUntilElementIsVisible(lockIcon);
-        return this;
-    };
-
-    this.waitForTableBody = function () {
-        Util.waitUntilElementIsVisible(tableBody);
-    };
-
-};
-module.exports = ContentList;
diff --git a/e2e/pages/adf/dialog/contentListPage.ts b/e2e/pages/adf/dialog/contentListPage.ts
new file mode 100644
index 0000000000..9661e6dbf5
--- /dev/null
+++ b/e2e/pages/adf/dialog/contentListPage.ts
@@ -0,0 +1,454 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { browser, by, element } from 'protractor';
+import { Util } from '../../../util/util';
+
+export class ContentListPage {
+
+    deleteContentElement = element(by.css('button[data-automation-id*="DELETE"]'));
+    metadataAction = element(by.css('button[data-automation-id*="METADATA"]'));
+    versionManagerAction = element(by.css('button[data-automation-id*="VERSIONS"]'));
+    moveContentElement = element(by.css('button[data-automation-id*="MOVE"]'));
+    copyContentElement = element(by.css('button[data-automation-id*="COPY"]'));
+    lockContentElement = element(by.css('button[data-automation-id="DOCUMENT_LIST.ACTIONS.LOCK"]'));
+    downloadContent = element(by.css('button[data-automation-id*="DOWNLOAD"]'));
+    actionMenu = element(by.css('div[role="menu"]'));
+    optionButton = by.css('button[data-automation-id*="action_menu_"]');
+    rowByRowName = by.xpath('ancestor::div[contains(@class, "adf-datatable-row")]');
+    nameColumn = by.css('div[class*="datatable-body"] div[class*="adf-data-table-cell"][title="Display name"]');
+    nameColumnHeader = by.css('div[data-automation-id="auto_id_name"]');
+    createdByColumn = by.css('div[class*="--text"][title="Created by"] span');
+    sizeColumn = by.css('div[id*="document-list-container"] div[class*="adf-datatable-row"] .adf-filesize-cell');
+    createdByColumnHeader = by.css('div[data-automation-id*="auto_id_createdByUser"]');
+    createdColumn = by.css('div[class*="--date"] span');
+    createdColumnHeader = by.css('div[data-automation-id*="auto_id_createdAt"]');
+    rows = by.css('div[id="document-list-container"] div[class*="adf-datatable-body"] div[class*="adf-datatable-row"]');
+    emptyFolderMessage = element(by.css('div[class="adf-empty-folder-this-space-is-empty"]'));
+    table = element(by.css('div[class*="upload-border"]'));
+    tableBody = element.all(by.css('adf-document-list div[class="adf-datatable-body"]')).first();
+
+    getTooltip(nodeName) {
+        return this.getRowByRowName(nodeName).element(by.css(`#document-list-container span[title="${nodeName}"]`)).getAttribute('title');
+    }
+
+    getRowsName(content) {
+        let row = element.all(by.css(`#document-list-container span[title='${content}']`)).first();
+        Util.waitUntilElementIsVisible(row);
+        return row;
+    }
+
+    getRowByRowName(content) {
+        Util.waitUntilElementIsVisible(this.getRowsName(content).element(this.rowByRowName));
+        return this.getRowsName(content).element(this.rowByRowName);
+    }
+
+    getAllDisplayedRows() {
+        return element.all(this.rows).count();
+    }
+
+    getAllRowsNameColumn() {
+        return this.getAllRowsColumnValues(this.nameColumn);
+    }
+
+    getAllRowsColumnValues(locator) {
+        let deferred = protractor.promise.defer();
+        Util.waitUntilElementIsVisible(element.all(locator).first());
+        let initialList = [];
+
+        element.all(locator).each(function (currentElement) {
+            currentElement.getText().then(function (text) {
+                if (text !== '') {
+                    initialList.push(text);
+                }
+            });
+        }).then(function () {
+            deferred.fulfill(initialList);
+        });
+
+        return deferred.promise;
+    }
+
+    deleteContent(content) {
+        this.clickOnActionMenu(content);
+        this.waitForContentOptions();
+        this.deleteContentElement.click();
+    }
+
+    checkDeleteIsDisabled(content) {
+        this.clickOnActionMenu(content);
+        this.waitForContentOptions();
+        let disabledDelete = element(by.css(`button[data-automation-id*='DELETE'][disabled='true']`));
+        Util.waitUntilElementIsVisible(disabledDelete);
+    }
+
+    metadataContent(content) {
+        this.clickOnActionMenu(content);
+        this.waitForContentOptions();
+        this.metadataAction.click();
+    }
+
+    versionManagerContent(content) {
+        this.clickOnActionMenu(content);
+        this.waitForContentOptions();
+        this.versionManagerAction.click();
+    }
+
+    moveContent(content) {
+        this.clickOnActionMenu(content);
+        this.moveContentElement.click();
+    }
+
+    copyContent(content) {
+        this.clickOnActionMenu(content);
+        this.copyContentElement.click();
+    }
+
+    lockContent(content) {
+        this.clickOnActionMenu(content);
+        this.lockContentElement.click();
+    }
+
+    waitForContentOptions() {
+        Util.waitUntilElementIsVisible(this.copyContentElement);
+        Util.waitUntilElementIsVisible(this.moveContentElement);
+        Util.waitUntilElementIsVisible(this.deleteContentElement);
+        Util.waitUntilElementIsVisible(this.downloadContent);
+    }
+
+    clickOnActionMenu(content) {
+        this.getRowByRowName(content).element(this.optionButton).click();
+        Util.waitUntilElementIsVisible(this.actionMenu);
+        browser.sleep(500);
+        return this;
+    }
+
+    sortByColumn(sortOrder, locator) {
+        Util.waitUntilElementIsVisible(element(locator));
+        return element(locator).getAttribute('class').then(function (result) {
+            if (sortOrder === true) {
+                if (!result.includes('sorted-asc')) {
+                    if (result.includes('sorted-desc') || result.includes('sortable')) {
+                        element(locator).click();
+                    }
+                }
+            } else {
+                if (result.includes('sorted-asc')) {
+                    element(locator).click();
+                } else if (result.includes('sortable')) {
+                    element(locator).click();
+                    element(locator).click();
+                }
+            }
+
+            return Promise.resolve();
+        });
+    }
+
+    /**
+     * Sort the list by name column.
+     *
+     * @param sortOrder: 'true' to sort the list ascendant and 'false' for descendant
+     */
+    sortByName(sortOrder) {
+        this.sortByColumn(sortOrder, this.nameColumnHeader);
+    }
+
+    /**
+     * Sort the list by author column.
+     *
+     * @param sortOrder: 'true' to sort the list ascendant and 'false' for descendant
+     */
+    sortByAuthor(sortOrder) {
+        this.sortByColumn(sortOrder, this.createdByColumnHeader);
+    }
+
+    /**
+     * Sort the list by created column.
+     *
+     * @param sortOrder: 'true' to sort the list ascendant and 'false' for descendant
+     */
+    sortByCreated(sortOrder) {
+        this.sortByColumn(sortOrder, this.createdColumnHeader);
+    }
+
+    /**
+     * Check the list is sorted by name column.
+     *
+     * @param sortOrder: 'true' if the list is expected to be sorted ascendant and 'false' for descendant
+     * @return sorted : 'true' if the list is sorted as expected and 'false' if it isn't
+     */
+    checkListIsOrderedByNameColumn(sortOrder) {
+        let deferred = protractor.promise.defer();
+        deferred.fulfill(this.checkListIsSorted(sortOrder, this.nameColumn));
+        return deferred.promise;
+    }
+
+    /**
+     * Check the list is sorted by author column.
+     *
+     * @param sortOrder: 'true' if the list is expected to be sorted ascendant and 'false' for descendant
+     * @return sorted : 'true' if the list is sorted as expected and 'false' if it isn't
+     */
+    checkListIsOrderedByAuthorColumn(sortOrder) {
+        let deferred = protractor.promise.defer();
+        deferred.fulfill(this.checkListIsSorted(sortOrder, this.createdByColumn));
+        return deferred.promise;
+    }
+
+    checkListIsOrderedBySizeColumn(sortOrder) {
+        let deferred = protractor.promise.defer();
+        deferred.fulfill(this.checkListIsSorted(sortOrder, this.sizeColumn));
+        return deferred.promise;
+    }
+
+    /**
+     * Check the list is sorted by created column.
+     *
+     * @param sortOrder: 'true' if the list is expected to be sorted ascendant and 'false' for descendant
+     * @return sorted : 'true' if the list is sorted as expected and 'false' if it isn't
+     */
+    checkListIsOrderedByCreatedColumn(sortOrder) {
+        let deferred = protractor.promise.defer();
+        let lastValue;
+        let sorted = true;
+
+        element.all(this.createdColumn).map(function (currentElement) {
+            return currentElement.getText();
+        }).then(function (texts) {
+            texts.forEach(function (text) {
+                if (lastValue !== undefined) {
+                    let currentDate = new Date(text);
+                    let lastDate = new Date(lastValue);
+                    if (sortOrder === true && currentDate.getTime() < lastDate.getTime()) {
+                        sorted = false;
+                    }
+                    if (sortOrder === false && currentDate.getTime() > lastDate.getTime()) {
+                        sorted = false;
+                    }
+                }
+                lastValue = text;
+            });
+            deferred.fulfill(sorted);
+        });
+        return deferred.promise;
+    }
+
+    /**
+     * Check the list is sorted.
+     *
+     * @param sortOrder: 'true' if the list is expected to be sorted ascendant and 'false' for descendant
+     * @param locator: locator for column
+     * @return 'true' if the list is sorted as expected and 'false' if it isn't
+     */
+    checkListIsSorted(sortOrder, locator) {
+        let deferred = protractor.promise.defer();
+        Util.waitUntilElementIsVisible(element.all(locator).first());
+        let initialList = [];
+        element.all(locator).each(function (currentElement) {
+            currentElement.getText().then(function (text) {
+                initialList.push(text);
+            });
+        }).then(function () {
+            let sortedList = initialList;
+            sortedList = sortedList.sort();
+            if (sortOrder === false) {
+                sortedList = sortedList.reverse();
+            }
+            deferred.fulfill(initialList.toString() === sortedList.toString());
+        });
+        return deferred.promise;
+    }
+
+    navigateToFolder(folder) {
+        let row = this.getRowsName(folder);
+        Util.waitUntilElementIsVisible(row);
+        Util.waitUntilElementIsOnPage(row);
+        row.click();
+        this.checkRowIsSelected(folder);
+        browser.actions().sendKeys(protractor.Key.ENTER).perform();
+        return this;
+    }
+
+    doubleClickRow(selectRow) {
+        let row = this.getRowsName(selectRow);
+        Util.waitUntilElementIsVisible(row);
+        Util.waitUntilElementIsClickable(row);
+        row.click();
+        Util.waitUntilElementIsVisible(this.getRowByRowName(selectRow).element(by.css(`div[class*='--image'] mat-icon[svgicon*='selected']`)));
+        browser.actions().sendKeys(protractor.Key.ENTER).perform();
+        return this;
+    }
+
+    doubleClickEntireRow(selectRow) {
+        let row = this.getRowByRowName(selectRow);
+        Util.waitUntilElementIsVisible(row);
+        Util.waitUntilElementIsClickable(row);
+        row.click();
+        Util.waitUntilElementIsVisible(this.getRowByRowName(selectRow).element(by.css(`div[class*='--image'] mat-icon[svgicon*='selected']`)));
+        browser.actions().sendKeys(protractor.Key.ENTER).perform();
+        return this;
+    }
+
+    checkRowIsSelected(content) {
+        let isRowSelected = this.getRowsName(content).element(by.xpath(`ancestor::div[contains(@class, 'is-selected')]`));
+        Util.waitUntilElementIsVisible(isRowSelected);
+    }
+
+    checkContentIsDisplayed(content) {
+        Util.waitUntilElementIsVisible(this.getRowByRowName(content));
+        return this;
+    }
+
+    getNodeIdByFilename(filename) {
+        let nodeIdColumn = element.all(by.xpath(`//div[@id='document-list-container']//div[@filename='${filename}' and @title='Node id']`));
+        return nodeIdColumn.getText();
+    }
+
+    async getAllNodeIdInList() {
+        let nodeIdColumns = await element.all(by.xpath(`//div[@id='document-list-container']//div[@title='Node id']`));
+        return await nodeIdColumns.map(async (currentElement) => {
+            return await currentElement.getText().then((nodeText) => {
+                return nodeText;
+            });
+        });
+    }
+
+    checkEmptyFolderMessageIsDisplayed() {
+        Util.waitUntilElementIsVisible(this.emptyFolderMessage);
+        return this;
+    }
+
+    tableIsLoaded() {
+        Util.waitUntilElementIsVisible(this.table);
+        return this;
+    }
+
+    checkIconColumn(file, extension) {
+        let row = this.getRowByRowName(file);
+        Util.waitUntilElementIsVisible(row.element(by.css(`div[class*='--image'] img[alt*="${extension}"]`)));
+    }
+
+    rightClickOnRowNamed(rowName) {
+        let row = this.getRowByRowName(rowName);
+        browser.actions().click(row, protractor.Button.RIGHT).perform();
+        Util.waitUntilElementIsVisible(element(by.id('adf-context-menu-content')));
+    }
+
+    checkContextActionIsVisible(actionName) {
+        let actionButton = element(by.css(`button[data-automation-id="context-${actionName}"`));
+        Util.waitUntilElementIsVisible(actionButton);
+        Util.waitUntilElementIsClickable(actionButton);
+        return actionButton;
+    }
+
+    pressContextMenuActionNamed(actionName) {
+        let actionButton = this.checkContextActionIsVisible(actionName);
+        actionButton.click();
+    }
+
+    clickRowToSelect(rowName) {
+        let row = this.getRowByRowName(rowName);
+        browser.actions().keyDown(protractor.Key.COMMAND).click(row).perform();
+        this.checkRowIsSelected(rowName);
+        return this;
+    }
+
+    checkLockedIcon(content) {
+        let lockIcon = element(by.cssContainingText('div[filename="' + content + '"] mat-icon', 'lock'));
+        Util.waitUntilElementIsVisible(lockIcon);
+        return this;
+    }
+
+    checkUnlockedIcon(content) {
+        let lockIcon = element(by.cssContainingText('div[filename="' + content + '"] mat-icon', 'lock_open'));
+        Util.waitUntilElementIsVisible(lockIcon);
+        return this;
+    }
+
+    waitForTableBody() {
+        Util.waitUntilElementIsVisible(this.tableBody);
+    }
+
+    checkContentIsNotDisplayed(filename) {
+        Util.waitUntilElementIsNotVisible(element.all(by.css(`#document-list-container span[title='${filename}']`)).first());
+        return this;
+    }
+
+    getNodeIdByFilename(filename) {
+        let nodeIdColumn = element.all(by.xpath(`//div[@id='document-list-container']//div[@filename="${filename}" and @title='Node id']`));
+        let text = nodeIdColumn.getText();
+        return text;
+    }
+
+    checkEmptyFolderMessageIsDisplayed() {
+        Util.waitUntilElementIsVisible(this.emptyFolderMessage);
+        return this;
+    }
+
+    tableIsLoaded() {
+        Util.waitUntilElementIsVisible(this.table);
+        return this;
+    }
+
+    checkIconColumn(file, extension) {
+        let row = this.getRowByRowName(file);
+        Util.waitUntilElementIsVisible(row.element(by.css(`div[class*='--image'] img[alt*="${extension}"]`)));
+    }
+
+    rightClickOnRowNamed(rowName) {
+        let row = this.getRowByRowName(rowName);
+        browser.actions().click(row, protractor.Button.RIGHT).perform();
+        Util.waitUntilElementIsVisible(element(by.id('adf-context-menu-content')));
+    }
+
+    checkContextActionIsVisible(actionName) {
+        let actionButton = element(by.css(`button[data-automation-id="context-${actionName}"`));
+        Util.waitUntilElementIsVisible(actionButton);
+        Util.waitUntilElementIsClickable(actionButton);
+        return actionButton;
+    }
+
+    pressContextMenuActionNamed(actionName) {
+        let actionButton = this.checkContextActionIsVisible(actionName);
+        actionButton.click();
+    }
+
+    clickRowToSelect(rowName) {
+        let row = this.getRowByRowName(rowName);
+        browser.actions().keyDown(protractor.Key.COMMAND).click(row).perform();
+        this.checkRowIsSelected(rowName);
+        return this;
+    }
+
+    checkLockedIcon(content) {
+        let lockIcon = element(by.cssContainingText('div[filename="' + content + '"] mat-icon', 'lock'));
+        Util.waitUntilElementIsVisible(lockIcon);
+        return this;
+    }
+
+    checkUnlockedIcon(content) {
+        let lockIcon = element(by.cssContainingText('div[filename="' + content + '"] mat-icon', 'lock_open'));
+        Util.waitUntilElementIsVisible(lockIcon);
+        return this;
+    }
+
+    waitForTableBody() {
+        Util.waitUntilElementIsVisible(this.tableBody);
+    }
+
+}
diff --git a/e2e/pages/adf/dialog/createFolderDialog.js b/e2e/pages/adf/dialog/createFolderDialog.js
deleted file mode 100644
index 4580f8c0a2..0000000000
--- a/e2e/pages/adf/dialog/createFolderDialog.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var Util = require('../../../util/util');
-
-var CreateFolderDialog = function () {
-
-    var folderNameField = element(by.id('adf-folder-name-input'));
-    var folderDescriptionField = element(by.id('adf-folder-description-input'));
-    var createButton = element(by.id('adf-folder-create-button'));
-    var cancelButton = element(by.id('adf-folder-cancel-button'));
-
-    this.clickOnCreateButton = function () {
-        Util.waitUntilElementIsVisible(createButton);
-        createButton.click();
-        return this;
-    };
-
-    this.checkCreateBtnIsDisabled = function () {
-        Util.waitUntilElementIsVisible(createButton.getAttribute("disabled"));
-        return this;
-    };
-
-    this.checkCreateBtnIsEnabled = function () {
-        createButton.isEnabled();
-        return this;
-    };
-
-    this.clickOnCancelButton = function () {
-        Util.waitUntilElementIsVisible(cancelButton);
-        cancelButton.click();
-        return this;
-    };
-
-    this.addFolderName = function (folderName) {
-        Util.waitUntilElementIsVisible(folderNameField);
-        folderNameField.clear().sendKeys(folderName);
-        browser.driver.sleep(500);
-        return this;
-    };
-
-    this.addFolderDescription = function (folderDescription) {
-        Util.waitUntilElementIsVisible(folderDescriptionField);
-        folderDescriptionField.clear().sendKeys(folderDescription);
-        return this;
-    };
-
-};
-module.exports = CreateFolderDialog;
diff --git a/e2e/pages/adf/dialog/createFolderDialog.ts b/e2e/pages/adf/dialog/createFolderDialog.ts
new file mode 100644
index 0000000000..43fe4f9aeb
--- /dev/null
+++ b/e2e/pages/adf/dialog/createFolderDialog.ts
@@ -0,0 +1,65 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { browser, by, element } from 'protractor';
+import { Util } from '../../../util/util';
+
+export class CreateFolderDialog {
+    folderNameField = element(by.id('adf-folder-name-input'));
+    folderDescriptionField = element(by.id('adf-folder-description-input'));
+    createButton = element(by.id('adf-folder-create-button'));
+    cancelButton = element(by.id('adf-folder-cancel-button'));
+
+    clickOnCreateButton() {
+        Util.waitUntilElementIsVisible(this.createButton);
+        this.createButton.click();
+        return this;
+    }
+
+    checkCreateBtnIsDisabled() {
+        Util.waitUntilElementIsVisible(this.createButton);
+        expect(this.createButton.getAttribute('disabled')).toEqual('true');
+        return this;
+    }
+
+    checkCreateBtnIsEnabled() {
+        this.createButton.isEnabled();
+        return this;
+    }
+
+    clickOnCancelButton() {
+        Util.waitUntilElementIsVisible(this.cancelButton);
+        this.cancelButton.click();
+        return this;
+    }
+
+    addFolderName(folderName) {
+        Util.waitUntilElementIsVisible(this.folderNameField);
+        this.folderNameField.clear();
+        this.folderNameField.sendKeys(folderName);
+        browser.driver.sleep(500);
+        return this;
+    }
+
+    addFolderDescription(folderDescription) {
+        Util.waitUntilElementIsVisible(this.folderDescriptionField);
+        this.folderDescriptionField.clear();
+        this.folderDescriptionField.sendKeys(folderDescription);
+        return this;
+    }
+
+}
diff --git a/e2e/pages/adf/dialog/searchDialog.js b/e2e/pages/adf/dialog/searchDialog.js
deleted file mode 100644
index eb7fb51df6..0000000000
--- a/e2e/pages/adf/dialog/searchDialog.js
+++ /dev/null
@@ -1,129 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var Util = require('../../../util/util');
-
-var SearchDialog = function () {
-
-    var searchIcon = element(by.css("button[class*='adf-search-button']"));
-    var searchBar = element(by.css("adf-search-control div[style*='translateX(0%)'] input"));
-    var searchBarNotExpanded = element(by.css("adf-search-control div[style*='translateX(81%)']"));
-    var no_result_message = element(by.css("p[class*='adf-search-fixed-text']"));
-    var rowsAuthor = by.css("div[class='mat-list-text'] p[class*='adf-search-fixed-text']");
-    var completeName = by.css("h4[class*='adf-search-fixed-text']");
-    var highlightName = by.css("div[id*='results-content'] span[class='highlight']");
-    var searchDialog = element(by.css("mat-list[id*='autocomplete-search-result-list']"));
-
-    this.pressDownArrowAndEnter = function () {
-        element(by.css("adf-search-control div input")).sendKeys(protractor.Key.ARROW_DOWN);
-        return browser.actions().sendKeys(protractor.Key.ENTER).perform();
-    };
-
-
-    this.clickOnSearchIcon = function () {
-        Util.waitUntilElementIsVisible(searchIcon);
-        searchIcon.click();
-        return this;
-    };
-
-    this.checkSearchIconIsVisible = function () {
-        Util.waitUntilElementIsVisible(searchIcon);
-        return this;
-    };
-
-    this.checkSearchBarIsVisible = function () {
-        Util.waitUntilElementIsVisible(searchBar);
-        return this;
-    };
-
-    this.checkSearchBarIsNotVisible = function () {
-        Util.waitUntilElementIsVisible(searchBarNotExpanded);
-        return this;
-    };
-
-    this.checkNoResultMessageIsDisplayed = function () {
-        Util.waitUntilElementIsVisible(no_result_message);
-        return this;
-    };
-
-    this.checkNoResultMessageIsNotDisplayed = function () {
-        Util.waitUntilElementIsNotOnPage(no_result_message);
-        return this;
-    };
-
-    this.enterText = function (text) {
-        Util.waitUntilElementIsVisible(searchBar);
-        searchBar.click();
-        searchBar.sendKeys(text);
-        return this;
-    };
-
-    this.enterTextAndPressEnter = function (text) {
-        Util.waitUntilElementIsVisible(searchBar);
-        searchBar.click();
-        searchBar.sendKeys(text);
-        searchBar.sendKeys(protractor.Key.ENTER);
-        return this;
-    };
-
-    this.resultTableContainsRow = function (name) {
-        Util.waitUntilElementIsVisible(searchDialog);
-        Util.waitUntilElementIsVisible(this.getRowByRowName(name));
-        return this;
-    };
-    this.clickOnSpecificRow = function (name) {
-        this.resultTableContainsRow(name);
-        this.getRowByRowName(name).click();
-        return this;
-    };
-
-    this.getRowByRowName = function (name) {
-        return element(by.css("mat-list-item[data-automation-id='autocomplete_for_" + name + "']"));
-    };
-
-    this.getSpecificRowsHighlightName = function (name) {
-        var deferred = protractor.promise.defer();
-        this.getRowByRowName(name).element(highlightName).getText().then(function (result) {
-            deferred.fulfill(result);
-        })
-        return deferred.promise;
-    };
-
-    this.getSpecificRowsCompleteName = function (name) {
-        var deferred = protractor.promise.defer();
-        this.getRowByRowName(name).element(completeName).getText().then(function (result) {
-            deferred.fulfill(result);
-        })
-        return deferred.promise;
-    };
-
-    this.getSpecificRowsAuthor = function (name) {
-        var deferred = protractor.promise.defer();
-        this.getRowByRowName(name).element(rowsAuthor).getText().then(function (result) {
-            deferred.fulfill(result);
-        })
-        return deferred.promise;
-    };
-
-    this.clearText = function () {
-        Util.waitUntilElementIsVisible(searchBar);
-        var deferred = protractor.promise.defer();
-        searchBar.clear();
-        return deferred.promise;
-    };
-};
-module.exports = SearchDialog;
diff --git a/e2e/pages/adf/dialog/searchDialog.ts b/e2e/pages/adf/dialog/searchDialog.ts
new file mode 100644
index 0000000000..d71d90c203
--- /dev/null
+++ b/e2e/pages/adf/dialog/searchDialog.ts
@@ -0,0 +1,116 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Util } from '../../../util/util';
+import { browser, by, element, protractor } from 'protractor';
+
+export class SearchDialog {
+
+    searchIcon = element(by.css(`button[class*='adf-search-button']`));
+    searchBar = element(by.css(`adf-search-control div[style*='translateX(0%)'] input`));
+    searchBarNotExpanded = element(by.css(`adf-search-control div[style*='translateX(81%)'] input`));
+    noResultMessage = element(by.css(`p[class*='adf-search-fixed-text']`));
+    rowsAuthor = by.css(`div[class='mat-list-text'] p[class*='adf-search-fixed-text']`);
+    completeName = by.css(`h4[class*='adf-search-fixed-text']`);
+    highlightName = by.css(`.adf-highlight`);
+    searchDialog = element(by.css(`mat-list[id='autocomplete-search-result-list']`));
+
+    pressDownArrowAndEnter() {
+        element(by.css(`adf-search-control div input`)).sendKeys(protractor.Key.ARROW_DOWN);
+        return browser.actions().sendKeys(protractor.Key.ENTER).perform();
+    }
+
+    clickOnSearchIcon() {
+        Util.waitUntilElementIsVisible(this.searchIcon);
+        this.searchIcon.click();
+        return this;
+    }
+
+    checkSearchIconIsVisible() {
+        Util.waitUntilElementIsVisible(this.searchIcon);
+        return this;
+    }
+
+    checkSearchBarIsVisible() {
+        Util.waitUntilElementIsVisible(this.searchBar);
+        return this;
+    }
+
+    checkSearchBarIsNotVisible() {
+        browser.sleep(400);
+        Util.waitUntilElementIsVisible(this.searchBarNotExpanded);
+        return this;
+    }
+
+    checkNoResultMessageIsDisplayed() {
+        Util.waitUntilElementIsVisible(this.noResultMessage);
+        return this;
+    }
+
+    checkNoResultMessageIsNotDisplayed() {
+        Util.waitUntilElementIsNotOnPage(this.noResultMessage);
+        return this;
+    }
+
+    enterText(text) {
+        Util.waitUntilElementIsVisible(this.searchBar);
+        this.searchBar.click();
+        this.searchBar.sendKeys(text);
+        return this;
+    }
+
+    enterTextAndPressEnter(text) {
+        Util.waitUntilElementIsVisible(this.searchBar);
+        this.searchBar.click();
+        this.searchBar.sendKeys(text);
+        this.searchBar.sendKeys(protractor.Key.ENTER);
+        return this;
+    }
+
+    resultTableContainsRow(name) {
+        Util.waitUntilElementIsVisible(this.searchDialog);
+        Util.waitUntilElementIsVisible(this.getRowByRowName(name));
+        return this;
+    }
+
+    clickOnSpecificRow(name) {
+        this.resultTableContainsRow(name);
+        this.getRowByRowName(name).click();
+        return this;
+    }
+
+    getRowByRowName(name) {
+        return element(by.css(`mat-list-item[data-automation-id='autocomplete_for_${name}']`));
+    }
+
+    getSpecificRowsHighlightName(name) {
+        return this.getRowByRowName(name).element(this.highlightName).getText();
+    }
+
+    getSpecificRowsCompleteName(name) {
+        return this.getRowByRowName(name).element(this.completeName).getText();
+    }
+
+    getSpecificRowsAuthor(name) {
+        return this.getRowByRowName(name).element(this.rowsAuthor).getText();
+    }
+
+    clearText() {
+        Util.waitUntilElementIsVisible(this.searchBar);
+        return this.searchBar.clear();
+    }
+}
diff --git a/e2e/pages/adf/dialog/shareDialog.ts b/e2e/pages/adf/dialog/shareDialog.ts
index fafea4c9e6..f9ee6523aa 100644
--- a/e2e/pages/adf/dialog/shareDialog.ts
+++ b/e2e/pages/adf/dialog/shareDialog.ts
@@ -16,12 +16,12 @@
  */
 
 import { element, by } from 'protractor';
-import Util = require('../../../util/util');
+import { Util } from '../../../util/util';
 import { FormControllersPage } from '../material/formControllersPage';
 
 export class ShareDialog {
-    formControllersPage = new FormControllersPage();
 
+    formControllersPage = new FormControllersPage();
     shareDialog = element(by.css('adf-share-dialog'));
     dialogTitle = element(by.css('[data-automation-id="adf-share-dialog-title"]'));
     shareToggle = element(by.css('[data-automation-id="adf-share-toggle"] label'));
@@ -116,15 +116,16 @@ export class ShareDialog {
     }
 
     setDefaultDay() {
-        const selector = '.mat-datetimepicker-calendar-body-active .mat-datetimepicker-calendar-body-cell-content';
+        const selector = '.mat-datetimepicker-calendar-body-cell:not(.mat-datetimepicker-calendar-body-disabled)';
         Util.waitUntilElementIsVisible(this.dayPicker);
-        let tomorrow = new Date(new Date().getTime() + 24 * 60 * 60 * 1000).getDate().toString();
+        let tomorrow = new Date(new Date().getTime() + 48 * 60 * 60 * 1000).getDate().toString();
         this.dayPicker.element(by.cssContainingText(selector, tomorrow)).click();
     }
 
     setDefaultHour() {
         const selector = '.mat-datetimepicker-clock-cell:not(.mat-datetimepicker-clock-cell-disabled)';
         Util.waitUntilElementIsVisible(this.clockPicker);
+        Util.waitUntilElementIsVisible(this.hoursPicker);
         this.hoursPicker.all(by.css(selector)).first().click();
     }
 
diff --git a/e2e/pages/adf/dialog/uploadDialog.js b/e2e/pages/adf/dialog/uploadDialog.js
deleted file mode 100644
index 4b54f61c5d..0000000000
--- a/e2e/pages/adf/dialog/uploadDialog.js
+++ /dev/null
@@ -1,191 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-var Util = require('../../../util/util');
-
-var UploadDialog = function () {
-
-    var closeButton = element((by.css('footer[class*="upload-dialog__actions"] button[id="adf-upload-dialog-close"]')));
-    var dialog = element(by.css("div[id='upload-dialog']"));
-    var minimizedDialog = element(by.css("div[class*='upload-dialog--minimized']"));
-    var uploadedStatusIcon = by.css("mat-icon[class*='status--done']");
-    var cancelledStatusIcon = by.css("div[class*='status--cancelled']");
-    var errorStatusIcon = by.css("div[class*='status--error']");
-    var cancelWhileUploadingIcon = by.css("mat-icon[class*='adf-file-uploading-row__action adf-file-uploading-row__action--cancel']");
-    var rowByRowName = by.xpath("ancestor::adf-file-uploading-list-row");
-    var title = element(by.css("span[class*='upload-dialog__title']"));
-    var minimizeButton = element(by.css("mat-icon[title='Minimize']"));
-    var maximizeButton = element(by.css("mat-icon[title='Maximize']"));
-    var sizeUploaded = by.css("span[class='adf-file-uploading-row__status']");
-    var canUploadConfirmationTitle = element(by.css("p[class='upload-dialog__confirmation--title']"));
-    var canUploadConfirmationDescription = element(by.css("p[class='upload-dialog__confirmation--text']"));
-    var confirmationDialogNoButton = element(by.partialButtonText("No"));
-    var confirmationDialogYesButton = element(by.partialButtonText("Yes"));
-    var cancelUploads = element((by.css('footer[class*="upload-dialog__actions"] button[id="adf-upload-dialog-cancel-all"]')));
-
-    this.clickOnCloseButton = function () {
-        this.checkCloseButtonIsDisplayed();
-        closeButton.click();
-        return this;
-    };
-
-    this.checkCloseButtonIsDisplayed = function() {
-        Util.waitUntilElementIsVisible(closeButton);
-        return this;
-    };
-
-    this.dialogIsDisplayed = function () {
-        Util.waitUntilElementIsVisible(dialog);
-        return this;
-    };
-
-    this.dialogIsMinimized = function () {
-        Util.waitUntilElementIsVisible(minimizedDialog);
-        return this;
-    };
-
-    this.dialogIsNotDisplayed = function () {
-        Util.waitUntilElementIsNotOnPage(dialog);
-        return this;
-    };
-
-    this.getRowsName = function (content) {
-        var row = element.all(by.css("div[class*='uploading-row'] span[title='" + content +"']")).first();
-        Util.waitUntilElementIsVisible(row);
-        return row;
-    };
-
-    this.getRowByRowName = function (content) {
-        return this.getRowsName(content).element(rowByRowName);
-    };
-
-    this.fileIsUploaded = function (content) {
-        Util.waitUntilElementIsVisible(this.getRowByRowName(content).element(uploadedStatusIcon));
-        return this;
-    };
-
-    this.fileIsError = function (content) {
-        Util.waitUntilElementIsVisible(this.getRowByRowName(content).element(errorStatusIcon));
-        return this;
-    };
-
-    this.filesAreUploaded = function (content) {
-        for (var i=0; i<content.length; i++) {
-            this.fileIsUploaded(content[i]);
-        }
-        return this;
-    };
-
-    this.fileIsNotDisplayedInDialog = function (content) {
-        Util.waitUntilElementIsNotVisible(element(by.css("div[class*='uploading-row'] span[title='" + content +"']")));
-        return this;
-    };
-
-     this.cancelUploads = function () {
-         Util.waitUntilElementIsVisible(cancelUploads);
-         cancelUploads.click();
-         return this;
-     };
-
-    this.fileIsCancelled = function (content) {
-        Util.waitUntilElementIsVisible(this.getRowByRowName(content).element(cancelledStatusIcon));
-        return this;
-    };
-
-    this.removeUploadedFile = function (content) {
-        Util.waitUntilElementIsVisible(this.getRowByRowName(content).element(uploadedStatusIcon));
-        this.getRowByRowName(content).element(uploadedStatusIcon).click();
-        return this;
-    };
-
-    this.removeFileWhileUploading = function (content) {
-        browser.driver.actions().mouseMove(this.getRowByRowName(content).element(sizeUploaded)).perform();
-        this.getRowByRowName(content).element(cancelWhileUploadingIcon).click();
-        return this;
-    };
-
-    this.getTitleText = function () {
-        Util.waitUntilElementIsVisible(title);
-        var deferred = protractor.promise.defer();
-        title.getText().then( function (text) {
-            deferred.fulfill(text);
-        });
-        return deferred.promise;
-    };
-
-    this.getConfirmationDialogTitleText = function () {
-        Util.waitUntilElementIsVisible(canUploadConfirmationTitle);
-        var deferred = protractor.promise.defer();
-        canUploadConfirmationTitle.getText().then( function (text) {
-            deferred.fulfill(text);
-        });
-        return deferred.promise;
-    };
-
-    this.getConfirmationDialogDescriptionText = function () {
-        Util.waitUntilElementIsVisible(canUploadConfirmationDescription);
-        var deferred = protractor.promise.defer();
-        canUploadConfirmationDescription.getText().then( function (text) {
-            deferred.fulfill(text);
-        });
-        return deferred.promise;
-    };
-
-    this.clickOnConfirmationDialogYesButton = function () {
-        Util.waitUntilElementIsVisible(confirmationDialogYesButton);
-        confirmationDialogYesButton.click();
-        return this;
-    };
-
-    this.clickOnConfirmationDialogNoButton = function () {
-        Util.waitUntilElementIsVisible(confirmationDialogNoButton);
-        confirmationDialogNoButton.click();
-        return this;
-    };
-
-    this.numberOfCurrentFilesUploaded = function () {
-        var deferred = protractor.promise.defer();
-        this.getTitleText().then(function (text) {
-            deferred.fulfill(text.split('Uploaded ')[1].split(' / ')[0]);
-        });
-        return deferred.promise;
-    };
-
-    this.numberOfInitialFilesUploaded = function () {
-        var deferred = protractor.promise.defer();
-        this.getTitleText().then(function (text) {
-            deferred.fulfill(text.split('Uploaded ')[1].split(' / ')[1]);
-        });
-        return deferred.promise;
-    };
-
-    this.minimizeUploadDialog = function () {
-        Util.waitUntilElementIsVisible(minimizeButton);
-        minimizeButton.click();
-        return this;
-    };
-
-    this.maximizeUploadDialog = function () {
-        Util.waitUntilElementIsVisible(maximizeButton);
-        maximizeButton.click();
-        return this;
-    };
-
-};
-module.exports = UploadDialog;
-
diff --git a/e2e/pages/adf/dialog/uploadDialog.ts b/e2e/pages/adf/dialog/uploadDialog.ts
new file mode 100644
index 0000000000..902ffa10a8
--- /dev/null
+++ b/e2e/pages/adf/dialog/uploadDialog.ts
@@ -0,0 +1,188 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Util } from '../../../util/util';
+
+export class UploadDialog {
+
+    closeButton = element((by.css('footer[class*="upload-dialog__actions"] button[id="adf-upload-dialog-close"]')));
+    dialog = element(by.css('div[id="upload-dialog"]'));
+    minimizedDialog = element(by.css('div[class*="upload-dialog--minimized"]'));
+    uploadedStatusIcon = by.css('mat-icon[class*="status--done"]');
+    cancelledStatusIcon = by.css('div[class*="status--cancelled"]');
+    errorStatusIcon = by.css('div[class*="status--error"]');
+    cancelWhileUploadingIcon = by.css('mat-icon[class*="adf-file-uploading-row__action adf-file-uploading-row__action--cancel"]');
+    rowByRowName = by.xpath('ancestor::adf-file-uploading-list-row');
+    title = element(by.css('span[class*="upload-dialog__title"]'));
+    minimizeButton = element(by.css('mat-icon[title="Minimize"]'));
+    maximizeButton = element(by.css('mat-icon[title="Maximize"]'));
+    sizeUploaded = by.css('span[class="adf-file-uploading-row__status"]');
+    canUploadConfirmationTitle = element(by.css('p[class="upload-dialog__confirmation--title"]'));
+    canUploadConfirmationDescription = element(by.css('p[class="upload-dialog__confirmation--text"]'));
+    confirmationDialogNoButton = element(by.partialButtonText('No'));
+    confirmationDialogYesButton = element(by.partialButtonText('Yes'));
+    cancelUploadsElement = element((by.css('footer[class*="upload-dialog__actions"] button[id="adf-upload-dialog-cancel-all"]')));
+
+    clickOnCloseButton() {
+        this.checkCloseButtonIsDisplayed();
+        this.closeButton.click();
+        return this;
+    }
+
+    checkCloseButtonIsDisplayed() {
+        Util.waitUntilElementIsVisible(this.closeButton);
+        return this;
+    }
+
+    dialogIsDisplayed() {
+        Util.waitUntilElementIsVisible(this.dialog);
+        return this;
+    }
+
+    dialogIsMinimized() {
+        Util.waitUntilElementIsVisible(this.minimizedDialog);
+        return this;
+    }
+
+    dialogIsNotDisplayed() {
+        Util.waitUntilElementIsNotOnPage(this.dialog);
+        return this;
+    }
+
+    getRowsName(content) {
+        let row = element.all(by.css(`div[class*='uploading-row'] span[title="${content}"]`)).first();
+        Util.waitUntilElementIsVisible(row);
+        return row;
+    }
+
+    getRowByRowName(content) {
+        return this.getRowsName(content).element(this.rowByRowName);
+    }
+
+    fileIsUploaded(content) {
+        Util.waitUntilElementIsVisible(this.getRowByRowName(content).element(this.uploadedStatusIcon));
+        return this;
+    }
+
+    fileIsError(content) {
+        Util.waitUntilElementIsVisible(this.getRowByRowName(content).element(this.errorStatusIcon));
+        return this;
+    }
+
+    filesAreUploaded(content) {
+        for (let i = 0; i < content.length; i++) {
+            this.fileIsUploaded(content[i]);
+        }
+        return this;
+    }
+
+    fileIsNotDisplayedInDialog(content) {
+        Util.waitUntilElementIsNotVisible(element(by.css(`div[class*='uploading-row'] span[title="${content}"]`)));
+        return this;
+    }
+
+    cancelUploads() {
+        Util.waitUntilElementIsVisible(this.cancelUploadsElement);
+        this.cancelUploadsElement.click();
+        return this;
+    }
+
+    fileIsCancelled(content) {
+        Util.waitUntilElementIsVisible(this.getRowByRowName(content).element(this.cancelledStatusIcon));
+        return this;
+    }
+
+    removeUploadedFile(content) {
+        Util.waitUntilElementIsVisible(this.getRowByRowName(content).element(this.uploadedStatusIcon));
+        this.getRowByRowName(content).element(this.uploadedStatusIcon).click();
+        return this;
+    }
+
+    removeFileWhileUploading(content) {
+        browser.driver.actions().mouseMove(this.getRowByRowName(content).element(this.sizeUploaded)).perform();
+        this.getRowByRowName(content).element(this.cancelWhileUploadingIcon).click();
+        return this;
+    }
+
+    getTitleText() {
+        Util.waitUntilElementIsVisible(this.title);
+        let deferred = protractor.promise.defer();
+        this.title.getText().then((text) => {
+            deferred.fulfill(text);
+        });
+        return deferred.promise;
+    }
+
+    getConfirmationDialogTitleText() {
+        Util.waitUntilElementIsVisible(this.canUploadConfirmationTitle);
+        let deferred = protractor.promise.defer();
+        this.canUploadConfirmationTitle.getText().then((text) => {
+            deferred.fulfill(text);
+        });
+        return deferred.promise;
+    }
+
+    getConfirmationDialogDescriptionText() {
+        Util.waitUntilElementIsVisible(this.canUploadConfirmationDescription);
+        let deferred = protractor.promise.defer();
+        this.canUploadConfirmationDescription.getText().then((text) => {
+            deferred.fulfill(text);
+        });
+        return deferred.promise;
+    }
+
+    clickOnConfirmationDialogYesButton() {
+        Util.waitUntilElementIsVisible(this.confirmationDialogYesButton);
+        this.confirmationDialogYesButton.click();
+        return this;
+    }
+
+    clickOnConfirmationDialogNoButton() {
+        Util.waitUntilElementIsVisible(this.confirmationDialogNoButton);
+        this.confirmationDialogNoButton.click();
+        return this;
+    }
+
+    numberOfCurrentFilesUploaded() {
+        let deferred = protractor.promise.defer();
+        this.getTitleText().then((text) => {
+            deferred.fulfill(text.split('Uploaded ')[1].split(' / ')[0]);
+        });
+        return deferred.promise;
+    }
+
+    numberOfInitialFilesUploaded() {
+        let deferred = protractor.promise.defer();
+        this.getTitleText().then((text) => {
+            deferred.fulfill(text.split('Uploaded ')[1].split(' / ')[1]);
+        });
+        return deferred.promise;
+    }
+
+    minimizeUploadDialog() {
+        Util.waitUntilElementIsVisible(this.minimizeButton);
+        this.minimizeButton.click();
+        return this;
+    }
+
+    maximizeUploadDialog() {
+        Util.waitUntilElementIsVisible(this.maximizeButton);
+        this.maximizeButton.click();
+        return this;
+    }
+
+}
diff --git a/e2e/pages/adf/dialog/uploadToggles.ts b/e2e/pages/adf/dialog/uploadToggles.ts
index 9c0efa2f6e..3ab7acd7b8 100644
--- a/e2e/pages/adf/dialog/uploadToggles.ts
+++ b/e2e/pages/adf/dialog/uploadToggles.ts
@@ -17,7 +17,8 @@
 
 import { FormControllersPage } from '../material/formControllersPage';
 
-import Util = require('../../../util/util');
+import { Util } from '../../../util/util';
+import { by, element, protractor } from 'protractor';
 
 export class UploadToggles {
 
diff --git a/e2e/pages/adf/dialog/userInfoDialog.ts b/e2e/pages/adf/dialog/userInfoDialog.ts
index d56936b515..f3fcd1ceb6 100644
--- a/e2e/pages/adf/dialog/userInfoDialog.ts
+++ b/e2e/pages/adf/dialog/userInfoDialog.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import Util = require('../../../util/util');
+import { Util } from '../../../util/util';
 import { TabsPage } from '../material/tabsPage';
 import { element, by, browser, protractor } from 'protractor';
 
diff --git a/e2e/pages/adf/documentListPage.js b/e2e/pages/adf/documentListPage.js
deleted file mode 100644
index bfc3150b8b..0000000000
--- a/e2e/pages/adf/documentListPage.js
+++ /dev/null
@@ -1,778 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var Page = require('astrolabe').Page;
-var Util = require('../../util/util');
-
-var contentServices = element(by.css("a[data-automation-id='files'] span"));
-var siteList = element(by.css("md-select[class*='dropdown-list']"));
-var folderID = element(by.css('adf-files-component p'));
-var folderText = element(by.css("md-input-container[class*='adf-create-folder--name'] input"));
-var createButtonDialog = element(by.xpath("//span[contains(text(), 'Create')]/ancestor::button"));
-var createFolderButton = element(by.xpath("//md-icon[contains(text(), 'create_new_folder')]"));
-var currentFolder = element(by.xpath("//div[@class='adf-breadcrumb-container']/li[last()]/div"));
-var deleteContent = element(by.css("button[adf-node-permission='delete']"));
-
-/**
- * Provides the Login Page.
- * @module pages
- * @submodule share
- * @class pages.share.LoginPage
- */
-module.exports = Page.create({
-
-    /**
-     * Provides the document list.
-     * @property documentList
-     * @type protractor.Element
-     */
-    documentList: {
-        get: function () {
-            return element(by.css("tr[class='alfresco-datatable__row'] > td"));
-        }
-    },
-
-    /**
-     * Provides the upload button.
-     * @property uploadButton
-     * @type protractor.Element
-     */
-    uploadButton: {
-        get: function () {
-            return element(by.css("input[data-automation-id='upload-single-file']"));
-        }
-    },
-
-    /**
-     * Provides the mutiple upload button .
-     * @property uploadButton
-     * @type protractor.Elementx
-     */
-    multipleUploadButton: {
-        get: function () {
-            return element(by.css("input[data-automation-id='upload-multiple-files']"));
-        }
-    },
-
-    /**
-     * Provides the mutiple upload button enabled
-     * @property multipleUploadEnabled
-     * @type protractor.Element
-     */
-    multipleUploadEnabled: {
-        get: function () {
-            return element(by.css("alfresco-upload-button[data-automation-id='multiple-file-upload'][ng-reflect-multiple-files='true']"));
-        }
-    },
-
-    /**
-     * Provides the extensions accepted text field
-     * @property acceptedFilesText
-     * @type protractor.Element
-     */
-    acceptedFilesText: {
-        get: function () {
-            return element(by.css("input[data-automation-id='accepted-files-type']"));
-        }
-    },
-
-    /**
-     * Provides the create folder button
-     * @property createFolderButton
-     * @type protractor.Element
-     */
-    createFolderButton: {
-        get: function () {
-            return element(by.cssContainingText("button[id='actions'] > i", "add"));
-        }
-    },
-
-    /**
-     * Provides the create new folder button in dialog
-     * @property createFolderButton
-     * @type protractor.Element
-     */
-    createFolderButtonDialog: {
-        get: function () {
-            return element(by.cssContainingText("span[class='mdl-menu__text']", "New Folder"));
-        }
-    },
-
-    /**
-     * Provides the longer wait required
-     * @property goToDocList
-     * @type protractor.Element
-     * */
-    goToDocList: {
-        value: function () {
-            Util.waitUntilElementIsVisible(contentServices);
-            contentServices.click();
-            Util.waitUntilElementIsVisible(siteList);
-        }
-    },
-
-    /**
-     * Provides the longer wait required
-     * @property waitForElements
-     * @type protractor.Element
-     * */
-    waitForElements: {
-        value: function () {
-            Util.waitUntilElementIsVisible(this.uploadButton);
-        }
-    },
-
-    /**
-     * Creates new folder
-     * @property createFolder
-     * */
-    createFolder: {
-        value: function (folderName) {
-            Util.waitUntilElementIsVisible(createFolderButton);
-            createFolderButton.click();
-            Util.waitUntilElementIsVisible(folderText);
-            folderText.sendKeys(folderName);
-            createButtonDialog.click();
-            this.checkItemInDocList(folderName);
-        }
-    },
-
-    /**
-     * Deletes content
-     * @property deleteContent
-     * */
-    deleteContent: {
-        value: function (contentName) {
-            var contentElement = element(by.css("div[data-automation-id*='text_" + contentName + "']"));
-            Util.waitUntilElementIsVisible(contentElement);
-            contentElement.click();
-            deleteContent.click();
-        }
-    },
-
-    /**
-     * Retrieve row by row number
-     *
-     * @param rowNumber
-     */
-    getRowByRowNumber: {
-        value: function (rowNumber) {
-            return element(by.css("div[data-automation-id='text_" + rowNumber + "']"));
-        }
-    },
-
-
-    /**
-     * Go into folder
-     * @property goIntoFolder
-     * */
-    goIntoFolder: {
-        value: function (folderName) {
-            this.checkItemInDocList(folderName);
-            browser.actions().doubleClick(element(by.css("div[data-automation-id*='text_" + folderName + "']"))).perform();
-        }
-    },
-
-    /**
-     * Go into folder via breadcrumb
-     * @property goIntoFolderViaBreadcrumbs
-     * */
-    goIntoFolderViaBreadcrumbs: {
-        value: function (folderName) {
-            var breadcrumb = element(by.cssContainingText("a[data-automation-id='breadcrumb_" + folderName + "']", folderName));
-
-            Util.waitUntilElementIsVisible(breadcrumb);
-            breadcrumb.click();
-            this.waitForElements();
-        }
-    },
-
-    currentFolderName: {
-        value: function () {
-            var deferred = protractor.promise.defer();
-            Util.waitUntilElementIsVisible(currentFolder);
-            currentFolder.getText().then(function (result) {
-                deferred.fulfill(result);
-            })
-            return deferred.promise;
-        }
-    },
-
-    /**
-     * Go into folder
-     * @property goIntoFolder
-     * */
-    checkFolderInBreadcrumbs: {
-        value: function (folderName) {
-            var breadcrumb = element(by.cssContainingText("a[data-automation-id='breadcrumb_" + folderName + "']", folderName));
-
-            Util.waitUntilElementIsVisible(breadcrumb);
-        }
-    },
-
-    /**
-     * Check file/fodler in document list
-     * @property checkItemInDocList
-     * */
-    checkItemInDocList: {
-        value: function (fileName) {
-            Util.waitUntilElementIsVisible(element(by.cssContainingText("div[data-automation-id='text_" + fileName + "']", fileName)));
-        }
-    },
-
-    /**
-     * Check file is not in document list
-     * @property checkFileIsNotInDocList
-     * */
-    checkFileIsNotInDocList: {
-        value: function (fileName) {
-            Util.waitUntilElementIsNotOnPage(element(by.cssContainingText("div[data-automation-id='text_" + fileName + "']", fileName)));
-        }
-    },
-
-    /**
-     * Check number of times file appears in document list
-     * @property checkNumberOfFilesInDocList
-     * */
-    checkNumberOfFilesInDocList: {
-        value: function (fileName, numberOfFiles) {
-            this.checkItemInDocList(fileName);
-
-            var file = element.all(by.cssContainingText("div[data-automation-id='text_" + fileName + "']", fileName));
-            expect(file.count()).toEqual(numberOfFiles);
-        }
-    },
-
-    /**
-     * uploads file
-     * @property uploadFile
-     * */
-    uploadFile: {
-        value: function (fileLocation, fileName) {
-            var uploadButton = element(by.css("input[data-automation-id='upload-single-file']"));
-            Util.waitUntilElementIsVisible(uploadButton);
-            Util.uploadFile(uploadButton, uploadButton, fileLocation);
-            this.checkItemInDocList(fileName);
-        }
-    },
-
-    /**
-     * uploads file without checking document list
-     * @property uploadFileWithoutCheck
-     * */
-    uploadFileWithoutCheck: {
-        value: function (fileLocation) {
-            Util.waitUntilElementIsVisible(this.uploadButton);
-            Util.uploadFile(this.uploadButton, this.uploadButton, fileLocation);
-        }
-    },
-
-    /**
-     * Check file in upload dialog
-     * @property checkFileInUploadDialog
-     * */
-    checkFileInUploadDialog: {
-        value: function (fileName) {
-            Util.waitUntilElementIsVisible(element(by.cssContainingText("td[data-automation-id='dialog_" + fileName + "'] > div", fileName)));
-        }
-    },
-
-    /**
-     * Check all uploads are complete
-     * @property checkAllUploadsComplete
-     * */
-    checkAllUploadsComplete: {
-        value: function (fileName) {
-            var dialogUpload = element.all(by.css("td[data-automation-id*='dialog_']"));
-            var singleUpload = element(by.cssContainingText("div[ng-reflect-klass='file-dialog'] div[class='title'] ", "upload complete"));
-            var multipleUploads = element(by.cssContainingText("div[ng-reflect-klass='file-dialog'] div[class='title'] ", "uploads complete"));
-
-            dialogUpload.count().then(function (count) {
-                if (count === 1) {
-                    Util.waitUntilElementIsVisible(singleUpload);
-                }
-                else if (count > 1) {
-                    Util.waitUntilElementIsVisible(multipleUploads);
-                }
-            });
-        }
-    },
-
-    /**
-     * Check done icon for file
-     * @property checkDoneIcon
-     * */
-    checkDoneIcon: {
-        value: function (fileName) {
-            Util.waitUntilElementIsVisible(element(by.xpath("//i[contains(@data-automation-id, 'done_icon')]/../../../td[contains(@data-automation-id, '" + fileName + "')]")));
-        }
-    },
-
-    /**
-     * Check abort icon for file
-     * @property checkUploadAbortedIcon
-     * */
-    checkAbortedIcon: {
-        value: function (fileName) {
-            Util.waitUntilElementIsVisible(element(by.xpath("//i[contains(@data-automation-id, 'upload_stopped')]/../../../td[contains(@data-automation-id, '" + fileName + "')]")));
-        }
-    },
-
-    /**
-     * Check progress bar in dialog
-     * @property checkDoneIcon
-     * */
-    checkProgressBar: {
-        value: function (fileName) {
-            Util.waitUntilElementIsVisible(element(by.css("div[data-automation-id='dialog_progress_" + fileName + "']")));
-        }
-    },
-
-    /**
-     * check upload dialog
-     * @property checkUploadDialog
-     * */
-    checkUploadDialog: {
-        value: function (fileName) {
-            var uploadDialog = element(by.css("file-uploading-dialog[class='dialog-show'] > div[class='file-dialog show']"));
-
-            Util.waitUntilElementIsVisible(uploadDialog);
-            this.checkFileInUploadDialog(fileName);
-            this.checkAllUploadsComplete();
-            this.checkDoneIcon(fileName);
-            this.checkProgressBar(fileName);
-        }
-    },
-
-    /**
-     * Close upload dialog
-     * @property closeUploadDialog
-     * */
-    closeUploadDialog: {
-        value: function () {
-            var closeDialog = element(by.css("div[title='close upload list'] > i"));
-            Util.waitUntilElementIsVisible(closeDialog);
-            closeDialog.click();
-            Util.waitUntilElementIsNotOnPage(closeDialog);
-        }
-    },
-
-    /**
-     * Minimise upload dialog
-     * @property minimiseUploadDialog
-     * */
-    minimiseUploadDialog: {
-        value: function () {
-            var minimiseDialog = element(by.css("div[class='minimize-button'] > i[title='minimize upload list']"));
-            Util.waitUntilElementIsVisible(minimiseDialog);
-            minimiseDialog.click();
-            Util.waitUntilElementIsNotOnPage(minimiseDialog);
-        }
-    },
-
-    /**
-     * Maximise upload dialog
-     * @property maximiseUploadDialog
-     * */
-    maximiseUploadDialog: {
-        value: function () {
-            var maximiseDialog = element(by.css("div[class='minimize-button active'] > i[title='expand upload list']"));
-            Util.waitUntilElementIsVisible(maximiseDialog);
-            maximiseDialog.click();
-            Util.waitUntilElementIsNotOnPage(maximiseDialog);
-        }
-    },
-
-    /**
-     * Click undo upload via message window
-     * @property clickUndoUploadViaWindow
-     * */
-    clickUndoUploadViaWindow: {
-        value: function () {
-            var notificationWindow = element(by.css("div[id='undo-notification-bar']"));
-            var undoButton = element(by.css("alfresco-upload-button div[id='undo-notification-bar'] > button[data-automation-id='undo_upload_button']"));
-
-            Util.waitUntilElementIsVisible(notificationWindow);
-            Util.waitUntilElementIsVisible(undoButton);
-            undoButton.click();
-        }
-    },
-
-    /**
-     * Undo upload via window
-     * @property undoUploadViaWindow
-     * */
-    undoUploadViaWindow: {
-        value: function (fileName) {
-            this.clickUndoUploadViaWindow();
-            this.checkFileIsNotInDocList(fileName);
-            this.checkAbortedIcon(fileName);
-        }
-    },
-
-    /**
-     * Click undo upload via upload dialog
-     * @property clickUndoUploadViaWindow
-     * */
-    clickUndoUploadViaDialog: {
-        value: function (fileName) {
-            var dialog = element(by.css("file-uploading-dialog[class='dialog-show']"));
-            var undoIcon = element(by.xpath("//i[contains(@data-automation-id, 'abort_cancel_upload')]/../../../td[contains(@data-automation-id, '" + fileName + "')]"));
-
-            Util.waitUntilElementIsVisible(dialog);
-            Util.waitUntilElementIsVisible(undoIcon);
-            undoIcon.click();
-        }
-    },
-
-    /**
-     * Undo upload via dialog
-     * @property undoUploadViaDialog
-     * */
-    undoUploadViaDialog: {
-        value: function (fileName) {
-            this.clickUndoUploadViaDialog(fileName);
-            this.checkFileIsNotInDocList(fileName);
-            this.checkAbortedIcon(fileName);
-        }
-    },
-
-    /**
-     * Click cancel upload via upload dialog
-     * @property clickUndoUploadViaWindow
-     * */
-    clickCancelUploadViaDialog: {
-        value: function () {
-            var dialog = element(by.css("file-uploading-dialog[class='dialog-show']"));
-            var cancelButton = element(by.css("a[data-automation-id='cancel_upload_all']"));
-
-            Util.waitUntilElementIsVisible(dialog);
-            Util.waitUntilElementIsVisible(cancelButton);
-            cancelButton.click();
-        }
-    },
-
-    /**
-     * cancel upload via dialog
-     * @property undoUploadViaDialog
-     * */
-    cancelUploadViaDialog: {
-        value: function (fileName) {
-            this.clickCancelUploadViaDialog();
-            this.checkFileIsNotInDocList(fileName);
-            this.checkAbortedIcon(fileName);
-        }
-    },
-
-    /**
-     * Enable multiple file upload
-     * @property enableMultipleFileUpload
-     * */
-    enableMultipleFileUpload: {
-        value: function () {
-            var multiFileUploadSwitch = element(by.css("label[for='switch-multiple-file']"));
-
-            Util.waitUntilElementIsVisible(multiFileUploadSwitch);
-            multiFileUploadSwitch.click();
-            Util.waitUntilElementIsVisible(this.multipleUploadButton);
-            Util.waitUntilElementIsVisible(this.multipleUploadEnabled);
-        }
-    },
-
-    /**
-     * Disable multiple file upload
-     * @property diableMultipleFileUpload
-     * */
-    disableMultipleFileUpload: {
-        value: function () {
-            var multiFileUploadSwitch = element(by.css("label[for='switch-multiple-file']"));
-
-            Util.waitUntilElementIsVisible(multiFileUploadSwitch);
-            multiFileUploadSwitch.click();
-            Util.waitUntilElementIsNotOnPage(this.multipleUploadButton);
-            Util.waitUntilElementIsNotOnPage(this.multipleUploadEnabled);
-            Util.waitUntilElementIsVisible(this.uploadButton);
-        }
-    },
-
-    /**
-     * upload mutiple files, 3
-     * @property uploadMutipleFiles
-     * */
-    uploadMutipleFiles: {
-        value: function (file1Location, file2Location) {
-            Util.waitUntilElementIsVisible(this.multipleUploadButton);
-            Util.waitUntilElementIsVisible(this.multipleUploadEnabled);
-
-            var firstFile = Util.uploadParentFolder(file1Location);
-            var secondFile = Util.uploadParentFolder(file2Location);
-
-            Util.uploadFile(this.multipleUploadButton, this.multipleUploadButton, firstFile + "\n" + secondFile);
-        }
-    },
-
-    /**
-     * Enable filter on
-     * @property enableFilter
-     * */
-    enableFilter: {
-        value: function () {
-            var acceptedFileTypeSwitch = element(by.css("label[for='switch-accepted-file-type']"));
-
-            Util.waitUntilElementIsVisible(acceptedFileTypeSwitch);
-            acceptedFileTypeSwitch.click();
-            Util.waitUntilElementIsVisible(this.acceptedFilesText);
-            Util.waitUntilElementIsVisible(this.uploadButton);
-        }
-    },
-
-    /**
-     * Disable multiple file upload
-     * @property disableFilter
-     * */
-    disableFilter: {
-        value: function () {
-            var acceptedFileTypeSwitch = element(by.css("label[for='switch-accepted-file-type']"));
-
-            Util.waitUntilElementIsVisible(acceptedFileTypeSwitch);
-            acceptedFileTypeSwitch.click();
-            Util.waitUntilElementIsNotOnPage(this.acceptedFilesText);
-            Util.waitUntilElementIsVisible(this.uploadButton);
-        }
-    },
-
-    /**
-     * Enter allowed file types
-     * @property allowedFileTypes
-     * */
-    setAllowedFileTypes: {
-        value: function (allowedFileTypes) {
-            var uploadButtonRestricted = element(by.css("input[data-automation-id='upload-single-file'][ng-reflect-accept='" + allowedFileTypes + "']"));
-
-            Util.waitUntilElementIsVisible(this.acceptedFilesText);
-            this.acceptedFilesText.clear();
-            this.acceptedFilesText.sendKeys(allowedFileTypes);
-            Util.waitUntilElementIsVisible(uploadButtonRestricted);
-        }
-    },
-
-    /**
-     * Enable versioning
-     * @property enableVersioning
-     * */
-    enableVersioning: {
-        value: function () {
-            var versioningSwitch = element(by.css("label[for='switch-versioning']"));
-            var versioningEnabled = element(by.css("alfresco-upload-button[data-automation-id='multiple-file-upload'][ng-reflect-versioning='true']"));
-
-            Util.waitUntilElementIsVisible(versioningSwitch);
-            versioningSwitch.click();
-            Util.waitUntilElementIsVisible(versioningEnabled);
-            Util.waitUntilElementIsVisible(this.uploadButton);
-        }
-    },
-
-    /**
-     * Disable versioning
-     * @property disableVersioning
-     * */
-    disableVersioning: {
-        value: function () {
-            var versioningSwitch = element(by.css("label[for='switch-versioning']"));
-            var versioningEnabled = element(by.css("alfresco-upload-button[data-automation-id='multiple-file-upload'][ng-reflect-versioning='true']"));
-
-            Util.waitUntilElementIsVisible(versioningSwitch);
-            versioningSwitch.click();
-            Util.waitUntilElementIsNotOnPage(versioningEnabled);
-            Util.waitUntilElementIsVisible(this.uploadButton);
-        }
-    },
-
-    /**
-     * adds versioning additon to to filename
-     * @property  versionedFileName
-     * */
-    versionedFileName: {
-        value: function (fileName, versioningAddition) {
-            var fullFileName = fileName.split(".");
-            var nameWithoutExtension = fullFileName[0];
-            var extension = fullFileName[1];
-            return  nameWithoutExtension + versioningAddition + "." + extension;
-        }
-    },
-
-    /**
-     * sort document list by display name, ascending/descending
-     * @property  sortDisplayName
-     * */
-    sortDisplayName: {
-        value: function (sorting) {
-            var sortingIcon = element(by.css("th[class*='header--sorted-" + sorting + "'][data-automation-id='auto_id_name']"));
-
-            Util.waitUntilElementIsVisible(sortingIcon);
-            sortingIcon.click();
-        }
-    },
-
-    /**
-     * check first folder name
-     * @property  checkFirstFolderName
-     * */
-    checkFirstFolderName: {
-        value: function (folderName) {
-            var firstFolder = element(by.xpath("//img[(contains(@src, 'folder.svg'))]/../../../../td/div/div[(contains(@data-automation-id, 'text_" + folderName + "'))]"));
-
-            Util.waitUntilElementIsVisible(firstFolder);
-            Util.waitUntilElementIsVisible(this.documentList);
-            expect(firstFolder.getText()).toEqual(folderName);
-
-        }
-    },
-
-    /**
-     * check first file's name
-     * @property  checkFirstFilesName
-     * */
-    checkFirstFilesName: {
-        value: function (fileName) {
-            var firstFile = element(by.xpath("//img[not (contains(@src, 'folder.svg'))]/../../../../td/div/div[(contains(@data-automation-id, 'text_" + fileName + "'))]"));
-
-            Util.waitUntilElementIsVisible(firstFile);
-            Util.waitUntilElementIsVisible(this.documentList);
-            expect(firstFile.getText()).toEqual(fileName);
-        }
-    },
-
-    /**
-     * click created by when no icon is displayed
-     * @property  clickCreatedBy
-     * */
-    clickCreatedBy: {
-        value: function () {
-            var createdBy = element(by.css("th[data-automation-id='auto_id_createdByUser.displayName']"));
-
-            Util.waitUntilElementIsVisible(createdBy);
-            createdBy.click();
-        }
-    },
-
-    /**
-     * sort document list by created by, ascending/descending
-     * @property  sortCreatedBy
-     * */
-    sortCreatedBy: {
-        value: function (sorting) {
-            var sortingIcon = element(by.css("th[class*='header--sorted-" + sorting + "'][data-automation-id='auto_id_createdByUser.displayName']"));
-
-            Util.waitUntilElementIsVisible(sortingIcon);
-            sortingIcon.click();
-        }
-    },
-
-    /**
-     * check first folder creator
-     * @property  checkFirstFolderName
-     * */
-    checkFirstFolderCreator: {
-        value: function (folderName, creator) {
-            var firstFolder = element(by.xpath("//img[(contains(@src, 'folder.svg'))]/../../../../td/div/div[(contains(@data-automation-id, 'text_" + creator + "'))]"));
-
-            Util.waitUntilElementIsVisible(firstFolder);
-            Util.waitUntilElementIsVisible(this.documentList);
-            expect(firstFolder.getText()).toContain(creator);
-        }
-    },
-
-    /**
-     * check first file creator
-     * @property  checkFirstFileName
-     * */
-    checkFirstFilesCreator: {
-        value: function (fileName, creator) {
-            var firstFile = element(by.xpath("//img[not (contains(@src, 'folder.svg'))]/../../../../td/div/div[(contains(@data-automation-id, 'text_" + creator + "'))]"));
-
-            Util.waitUntilElementIsVisible(firstFile);
-            Util.waitUntilElementIsVisible(this.documentList);
-            expect(firstFile.getText()).toContain(creator);
-        }
-    },
-
-    /**
-     * click created on when no icon is displayed
-     * @property  clickCreatedOn
-     * */
-    clickCreatedOn: {
-        value: function () {
-            var createdOn = element(by.css("th[data-automation-id='auto_id_createdAt']"));
-
-            Util.waitUntilElementIsVisible(createdOn);
-            createdOn.click();
-        }
-    },
-
-    /**
-     * sort document list by created on, ascending/descending
-     * @property  sortCreatedBy
-     * */
-    sortCreatedBy: {
-        value: function (sorting) {
-            var sortingIcon = element(by.css("th[class*='header--sorted-" + sorting + "'][data-automation-id='auto_id_createdAt']"));
-
-            Util.waitUntilElementIsVisible(sortingIcon);
-            sortingIcon.click();
-        }
-    },
-
-    /**
-     * check first folder created on date
-     * @property  checkFirstFolderDate
-     * */
-    checkFirstFolderDate: {
-        value: function () {
-            var firstFolder = element(by.xpath("//img[not (contains(@src, 'folder.svg'))]/../../../../td/div/div[(contains(@data-automation-id, 'date_'))]"));
-
-            var todaysDate = Util.getCrtDateLongFormat();
-
-            Util.waitUntilElementIsVisible(firstFolder);
-            Util.waitUntilElementIsVisible(this.documentList);
-            expect(firstFolder.getText()).toContain(todaysDate);
-        }
-    },
-
-    /**
-     * check first files created on date
-     * @property  checkFirstFilesDate
-     * */
-    checkFirstFilesDate: {
-        value: function () {
-            var firstFile = element(by.xpath("//img[not (contains(@src, 'folder.svg'))]/../../../../td/div/div[(contains(@data-automation-id, 'date_'))]"));
-
-            var todaysDate = Util.getCrtDateLongFormat();
-
-            Util.waitUntilElementIsVisible(firstFile);
-            Util.waitUntilElementIsVisible(this.documentList);
-            expect(firstFile.getText()).toContain(todaysDate);
-        }
-    },
-
-    getCurrentFolderID: {
-        value: function () {
-            return folderID.getText();
-        }
-    },
-
-});
diff --git a/e2e/pages/adf/errorPage.js b/e2e/pages/adf/errorPage.js
deleted file mode 100644
index 141cad216e..0000000000
--- a/e2e/pages/adf/errorPage.js
+++ /dev/null
@@ -1,76 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var Util = require('../../util/util');
-
-var ErrorPage = function(){
-
-    var errorPage = element(by.css("adf-error-content"));
-    var errorPageCode = element(by.css("adf-error-content .adf-error-content-code"));
-    var errorPageTitle = element(by.css("adf-error-content .adf-error-content-title"));
-    var errorPageDescription = element(by.css("adf-error-content .adf-error-content-description"));
-    var backButton = element(by.id("adf-return-button"));
-    var secondButton = element(by.id("adf-secondary-button"));
-
-    this.checkErrorPage = function(){
-        Util.waitUntilElementIsVisible(errorPage);
-    };
-
-    this.clickBackButton = function(){
-        Util.waitUntilElementIsVisible(backButton);
-        backButton.click();
-    };
-
-    this.clickSecondButton = function(){
-        Util.waitUntilElementIsVisible(secondButton);
-        secondButton.click();
-    };
-
-    this.checkErrorTitle = function(){
-        Util.waitUntilElementIsVisible(errorPageTitle);
-    };
-
-    this.checkErrorCode = function(){
-        Util.waitUntilElementIsVisible(errorPageCode);
-    };
-
-    this.checkErrorDescription = function(){
-        Util.waitUntilElementIsVisible(errorPageDescription);
-    };
-
-    this.getErrorCode = function() {
-        Util.waitUntilElementIsVisible(errorPageCode);
-        return errorPageCode.getText();
-    };
-
-    this.getErrorTitle = function() {
-        Util.waitUntilElementIsVisible(errorPageTitle);
-        return errorPageTitle.getText();
-    };
-
-    this.getErrorDescription = function() {
-        Util.waitUntilElementIsVisible(errorPageDescription);
-        return errorPageDescription.getText();
-    };
-
-    this.checkBackButton = function () {
-        return Util.waitUntilElementIsVisible(backButton);
-    };
-
-};
-
-module.exports = ErrorPage;
diff --git a/e2e/pages/adf/errorPage.ts b/e2e/pages/adf/errorPage.ts
new file mode 100644
index 0000000000..c814212632
--- /dev/null
+++ b/e2e/pages/adf/errorPage.ts
@@ -0,0 +1,57 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Util } from '../../util/util';
+import { element, by } from 'protractor';
+
+export class ErrorPage {
+
+    errorPageCode = element(by.css('adf-error-content .adf-error-content-code'));
+    errorPageTitle = element(by.css('adf-error-content .adf-error-content-title'));
+    errorPageDescription = element(by.css('adf-error-content .adf-error-content-description'));
+    backButton = element(by.id('adf-return-button'));
+    secondButton = element(by.id('adf-secondary-button'));
+
+    clickBackButton() {
+        Util.waitUntilElementIsVisible(this.backButton);
+        this.backButton.click();
+    }
+
+    clickSecondButton() {
+        Util.waitUntilElementIsVisible(this.secondButton);
+        this.secondButton.click();
+    }
+
+    checkErrorCode() {
+        Util.waitUntilElementIsVisible(this.errorPageCode);
+    }
+
+    getErrorCode() {
+        Util.waitUntilElementIsVisible(this.errorPageCode);
+        return this.errorPageCode.getText();
+    }
+
+    getErrorTitle() {
+        Util.waitUntilElementIsVisible(this.errorPageTitle);
+        return this.errorPageTitle.getText();
+    }
+
+    getErrorDescription() {
+        Util.waitUntilElementIsVisible(this.errorPageDescription);
+        return this.errorPageDescription.getText();
+    }
+}
diff --git a/e2e/pages/adf/filePreviewPage.js b/e2e/pages/adf/filePreviewPage.js
deleted file mode 100644
index 0e5448f7bb..0000000000
--- a/e2e/pages/adf/filePreviewPage.js
+++ /dev/null
@@ -1,475 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var Page = require('astrolabe').Page;
-var Util = require('../../util/util');
-var documentList = require('./documentListPage');
-
-var pdfTitleFromSearch = element(by.css("span[id='adf-viewer-display-name']"));
-var textLayer = element.all(by.css("div[class='textLayer']")).first();
-var closeButton = element(by.css('button[data-automation-id="adf-toolbar-back"]'));
-
-/**
- * Provides the file preview Page.
- * @module pages
- * @submodule share
- * @class pages.adf.filePreviewPage
- */
-module.exports = Page.create({
-
-    /**
-     * Wait for elements to appear
-     * @property waitForElements
-     * @type protractor.Element
-     * */
-    waitForElements: {
-        value: function () {
-            Util.waitUntilElementIsVisible(element(by.css("i[id='viewer-close-button']")));
-        }
-    },
-
-    /**
-     * Click view file
-     * @property viewFile
-     * */
-    viewFile: {
-        value: function (fileName) {
-            documentList.checkItemInDocList(fileName);
-            browser.actions().doubleClick(element(by.cssContainingText("div[data-automation-id='text_" + fileName + "']", fileName))).perform();
-            this.waitForElements();
-        }
-    },
-
-    /**
-     * get file title
-     * @method getPDFTitle
-     */
-    getPDFTitleFromSearch: {
-        value: function () {
-            var deferred = protractor.promise.defer();
-            Util.waitUntilElementIsVisible(pdfTitleFromSearch);
-            Util.waitUntilElementIsVisible(textLayer);
-            pdfTitleFromSearch.getText().then(function (result) {
-                deferred.fulfill(result);
-            })
-            return deferred.promise;
-        }
-    },
-
-    /**
-     * Check close button is displayed
-     * @method checkCloseButton
-     */
-    checkCloseButton: {
-        value: function () {
-            Util.waitUntilElementIsVisible(element(by.css("i[id='viewer-close-button']")));
-        }
-    },
-
-    /**
-     * Check original size button
-     * @method checkOriginalSizeButton
-     */
-    checkOriginalSizeButton: {
-        value: function () {
-            Util.waitUntilElementIsVisible(element(by.cssContainingText("div[id='viewer-scale-page-button'] > i ", "zoom_out_map")));
-        }
-    },
-
-    /**
-     * Check zoom in button
-     * @method checkZoomInButton
-     */
-    checkZoomInButton: {
-        value: function () {
-            Util.waitUntilElementIsVisible(element(by.css("div[id='viewer-zoom-in-button']")));
-        }
-    },
-
-    /**
-     * Check zoom out button
-     * @method checkZoomOutButton
-     */
-    checkZoomOutButton: {
-        value: function () {
-            Util.waitUntilElementIsVisible(element(by.css("div[id='viewer-zoom-out-button']")));
-        }
-    },
-
-    /**
-     * Check previous page button
-     * @method checkPreviousPageButton
-     */
-    checkPreviousPageButton: {
-        value: function () {
-            Util.waitUntilElementIsVisible(element(by.css("div[id='viewer-previous-page-button']")));
-        }
-    },
-
-    /**
-     * Check next page button
-     * @method checkNextPageButton
-     */
-    checkNextPageButton: {
-        value: function () {
-            Util.waitUntilElementIsVisible(element(by.css("div[id='viewer-next-page-button']")));
-        }
-    },
-
-    /**
-     * Check download button on unsupported documents
-     * @method checkDownloadButton
-     */
-    checkDownloadButton: {
-        value: function () {
-            Util.waitUntilElementIsVisible(element(by.css("button[id='viewer-download-button']")));
-        }
-    },
-
-    /**
-     * Check current pageNumber
-     * @method checkCurrentPageNumber
-     */
-    checkCurrentPageNumber: {
-        value: function (pageNumber) {
-            Util.waitUntilElementIsVisible(element(by.css("input[id='viewer-pagenumber-input'][ng-reflect-value='" + pageNumber + "']")));
-        }
-    },
-
-    /**
-     * Check text in file
-     * @method checkText
-     */
-    checkText: {
-        value: function (pageNumber, text) {
-            var allPages = element.all(by.css("div[class='canvasWrapper'] > canvas")).first();
-            var pageLoaded = element(by.css("div[id='pageContainer" + pageNumber + "'][data-loaded='true']"));
-            var textLayerLoaded = element(by.css("div[id='pageContainer" + pageNumber + "'] div[class='textLayer'] > div"));
-            var specificText = element(by.cssContainingText("div[id='pageContainer" + pageNumber + "'] div[class='textLayer'] > div", text));
-
-            Util.waitUntilElementIsVisible(allPages);
-            Util.waitUntilElementIsVisible(pageLoaded);
-            Util.waitUntilElementIsVisible(textLayerLoaded);
-            Util.waitUntilElementIsVisible(specificText);
-        }
-    },
-
-    /**
-     * Check total amount of pages
-     * @method checkTitle
-     */
-    checktotalPages: {
-        value: function (totalPages) {
-            var totalPagesElement = element(by.cssContainingText("div[id='viewer-total-pages']", totalPages));
-            Util.waitUntilElementIsVisible(totalPagesElement);
-        }
-    },
-
-    /**
-     * Go to next page
-     * @method goToNextPage
-     */
-    goToNextPage: {
-        value: function () {
-            var nextPageIcon = element(by.css("div[id='viewer-next-page-button']"));
-            Util.waitUntilElementIsVisible(nextPageIcon);
-            nextPageIcon.click();
-        }
-    },
-
-    /**
-     * Go to previous page
-     * @method goToPreviousPage
-     */
-    goToPreviousPage: {
-        value: function () {
-            var previousPageIcon = element(by.css("div[id='viewer-previous-page-button']"));
-            Util.waitUntilElementIsVisible(previousPageIcon);
-            previousPageIcon.click();
-        }
-    },
-
-    /**
-     * Go to certain page
-     * @method goToPage
-     */
-    goToPage: {
-        value: function (page) {
-            var pageInput = element(by.css("input[id='viewer-pagenumber-input']"));
-
-            Util.waitUntilElementIsVisible(pageInput);
-            pageInput.clear().sendKeys(page);
-            pageInput.sendKeys(protractor.Key.ENTER);
-        }
-    },
-
-    /**
-     * Close preview with close option
-     * @method closePreviewWithButton
-     */
-    closePreviewWithButton: {
-        value: function () {
-            Util.waitUntilElementIsVisible(closeButton);
-            closeButton.click();
-        }
-    },
-
-    /**
-     * Close preview by pressing esc key
-     * @method closePreviewWithEsc
-     */
-    closePreviewWithEsc: {
-        value: function (fileName) {
-            var filePreview = element.all(by.css("div[class='canvasWrapper'] > canvas")).first();
-
-            browser.actions().sendKeys(protractor.Key.ESCAPE).perform();
-            documentList.checkItemInDocList(fileName);
-            Util.waitUntilElementIsNotOnPage(filePreview);
-        }
-    },
-
-    /**
-     * Close preview by pressing esc key
-     * @method clickDownload
-     */
-    clickDownload: {
-        value: function (fileName) {
-            var downloadButton = element(by.css("button[id='viewer-download-button']"));
-
-            Util.waitUntilElementIsVisible(downloadButton);
-            downloadButton.click();
-        }
-    },
-
-    /**
-     * Click zoom in
-     * @method clickZoomIn
-     */
-    clickZoomIn: {
-        value: function () {
-            var zoomInButton = element(by.css("div[id='viewer-zoom-in-button']"));
-
-            Util.waitUntilElementIsVisible(zoomInButton);
-            zoomInButton.click();
-        }
-    },
-
-    /**
-     * Click zoom in
-     * @method clickZoomIn
-     */
-    clickZoomOut: {
-        value: function () {
-            var zoomOutButton = element(by.css("div[id='viewer-zoom-out-button']"));
-
-            Util.waitUntilElementIsVisible(zoomOutButton);
-            zoomOutButton.click();
-        }
-    },
-
-    /**
-     * Click actual size
-     * @method clickActualSize
-     */
-    clickActualSize: {
-        value: function () {
-            var actualSizeButton = element(by.css("div[id='viewer-scale-page-button']"));
-
-            Util.waitUntilElementIsVisible(actualSizeButton);
-            actualSizeButton.click();
-        }
-    },
-
-    /**
-     * Check canvas width
-     * @method checkCanvasWidth
-     */
-    checkCanvasWidth: {
-        value: function () {
-            return element.all(by.css("div[class='canvasWrapper'] > canvas")).first().getAttribute("width").then(function(width) {
-                return width;
-            });
-        }
-    },
-
-    /**
-     * Check canvas height
-     * @method checkCanvasHeight
-     */
-    checkCanvasHeight: {
-        value: function () {
-            return element.all(by.css("div[class='canvasWrapper'] > canvas")).first().getAttribute("height").then(function(height) {
-                return height;
-            });
-        }
-    },
-
-    /**
-     * Zoom in and check
-     * @method zoomIn
-     */
-    zoomIn: {
-        value: function () {
-            var canvasLayer = element.all(by.css("div[class='canvasWrapper'] > canvas")).first();
-            var textLayer = element(by.css("div[id*='pageContainer'] div[class='textLayer'] > div"));
-
-            Util.waitUntilElementIsVisible(canvasLayer);
-            Util.waitUntilElementIsVisible(textLayer);
-
-            var actualWidth,
-                zoomedInWidth,
-                actualHeight,
-                zoomedInHeight;
-
-            this.checkCanvasWidth().then(function (width) {
-                actualWidth = width;
-                if (actualWidth && zoomedInWidth) {
-                    expect(zoomedInWidth).toBeGreaterThan(actualWidth);
-                }
-            });
-
-            this.checkCanvasHeight().then(function (height) {
-                actualHeight = height;
-                if (actualHeight && zoomedInHeight) {
-                    expect(zoomedInHeight).toBeGreaterThan(actualHeight);
-                }
-            });
-
-            this.clickZoomIn();
-
-            this.checkCanvasWidth().then(function (width) {
-                zoomedInWidth = width;
-                if (actualWidth && zoomedInWidth) {
-                    expect(zoomedInWidth).toBeGreaterThan(actualWidth);
-                }
-            });
-
-            this.checkCanvasHeight().then(function (height) {
-                zoomedInHeight = height;
-                if (actualHeight && zoomedInHeight) {
-                    expect(zoomedInHeight).toBeGreaterThan(actualHeight);
-                }
-            });
-        }
-    },
-
-    /**
-     * Check actual size of document, zoom in, actual size
-     * @method zoomIn
-     */
-    actualSize: {
-        value: function () {
-            var canvasLayer = element.all(by.css("div[class='canvasWrapper'] > canvas")).first();
-            var textLayer = element(by.css("div[id*='pageContainer'] div[class='textLayer'] > div"));
-
-            Util.waitUntilElementIsVisible(canvasLayer);
-            Util.waitUntilElementIsVisible(textLayer);
-
-            var actualWidth,
-                actualHeight,
-                zoomedWidth,
-                zoomedHeight,
-                newWidth,
-                newHeight;
-
-            this.checkCanvasWidth().then(function (width) {
-                actualWidth = width;
-            });
-
-            this.checkCanvasHeight().then(function (height) {
-                actualHeight = height;
-            });
-
-            this.clickZoomIn();
-
-            this.checkCanvasWidth().then(function (width) {
-                zoomedWidth = width;
-            });
-
-            this.checkCanvasHeight().then(function (height) {
-                zoomedHeight = height;
-            });
-
-            this.clickActualSize();
-
-            this.checkCanvasWidth().then(function (width) {
-                newWidth = width;
-                if (actualWidth && zoomedWidth && newWidth) {
-                    expect(newWidth).toBeLessThan(zoomedWidth);
-                    expect(newWidth).toEqual(actualWidth);
-                }
-            });
-
-            this.checkCanvasHeight().then(function (height) {
-                newHeight = height;
-                if (actualHeight && zoomedHeight && newHeight) {
-                    expect(newHeight).toBeLessThan(zoomedHeight);
-                    expect(newHeight).toEqual(actualHeight);
-                }
-            });
-        }
-    },
-
-    /**
-     * Zoom out and check
-     * @method zoomOut
-     */
-    zoomOut: {
-        value: function () {
-            var canvasLayer = element.all(by.css("div[class='canvasWrapper'] > canvas")).first();
-            var textLayer = element(by.css("div[id*='pageContainer'] div[class='textLayer'] > div"));
-
-            Util.waitUntilElementIsVisible(canvasLayer);
-            Util.waitUntilElementIsVisible(textLayer);
-
-            var actualWidth,
-                zoomedOutWidth,
-                actualHeight,
-                zoomedOutHeight;
-
-            this.checkCanvasWidth().then(function (width) {
-                actualWidth = width;
-                if (actualWidth && zoomedOutWidth) {
-                    expect(zoomedOutWidth).toBeLessThan(actualWidth);
-                }
-            });
-
-            this.checkCanvasHeight().then(function (height) {
-                actualHeight = height;
-                if (actualHeight && zoomedOutHeight) {
-                    expect(zoomedOutHeight).toBeLessThan(actualHeight);
-                }
-            });
-
-            this.clickZoomOut();
-
-            this.checkCanvasWidth().then(function (width) {
-                zoomedOutWidth = width;
-                if (actualWidth && zoomedOutWidth) {
-                    expect(zoomedOutWidth).toBeLessThan(actualWidth);
-                }
-            });
-
-            this.checkCanvasHeight().then(function (height) {
-                zoomedInHeight = height;
-                if (actualHeight && zoomedOutHeight) {
-                    expect(zoomedOutHeight).toBeLessThan(actualHeight);
-                }
-            });
-        }
-    },
-});
diff --git a/e2e/pages/adf/filePreviewPage.ts b/e2e/pages/adf/filePreviewPage.ts
new file mode 100644
index 0000000000..fc41eeae62
--- /dev/null
+++ b/e2e/pages/adf/filePreviewPage.ts
@@ -0,0 +1,303 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { browser, by, element, protractor } from 'protractor';
+import { Util } from '../../util/util';
+
+export class FilePreviewPage {
+
+    pdfTitleFromSearch = element(by.css(`span[id='adf-viewer-display-name']`));
+    textLayer = element.all(by.css(`div[class='textLayer']`)).first();
+    closeButton = element(by.css('button[data-automation-id="adf-toolbar-back"]'));
+
+    waitForElements() {
+        Util.waitUntilElementIsVisible(element(by.css(`i[id='viewer-close-button']`)));
+    }
+
+    viewFile(fileName) {
+        Util.waitUntilElementIsVisible(element(by.cssContainingText(`div[data-automation-id="${filename}"]`, fileName)));
+        browser.actions().doubleClick(element(by.cssContainingText(`div[data-automation-id="${filename}"]`, fileName))).perform();
+        this.waitForElements();
+    }
+
+    getPDFTitleFromSearch() {
+        let deferred = protractor.promise.defer();
+        Util.waitUntilElementIsVisible(this.pdfTitleFromSearch);
+        Util.waitUntilElementIsVisible(this.textLayer);
+        this.pdfTitleFromSearch.getText().then(function (result) {
+            deferred.fulfill(result);
+        });
+        return deferred.promise;
+    }
+
+    checkCloseButton() {
+        Util.waitUntilElementIsVisible(element(by.css(`i[id='viewer-close-button']`)));
+    }
+
+    checkOriginalSizeButton() {
+        Util.waitUntilElementIsVisible(element(by.cssContainingText(`div[id='viewer-scale-page-button'] > i `, `zoom_out_map`)));
+    }
+
+    checkZoomInButton() {
+        Util.waitUntilElementIsVisible(element(by.css(`div[id='viewer-zoom-in-button']`)));
+
+    }
+
+    checkZoomOutButton() {
+        Util.waitUntilElementIsVisible(element(by.css(`div[id='viewer-zoom-out-button']`)));
+    }
+
+    checkPreviousPageButton() {
+        Util.waitUntilElementIsVisible(element(by.css(`div[id='viewer-previous-page-button']`)));
+    }
+
+    checkNextPageButton() {
+        Util.waitUntilElementIsVisible(element(by.css(`div[id='viewer-next-page-button']`)));
+    }
+
+    checkDownloadButton() {
+        Util.waitUntilElementIsVisible(element(by.css(`button[id='viewer-download-button']`)));
+    }
+
+    checkCurrentPageNumber(pageNumber) {
+        Util.waitUntilElementIsVisible(element(by.css(`input[id='viewer-pagenumber-input'][ng-reflect-value="${pageNumber}"]`)));
+    }
+
+    checkText(pageNumber, text) {
+        let allPages = element.all(by.css(`div[class='canvasWrapper'] > canvas`)).first();
+        let pageLoaded = element(by.css(`div[id="pageContainer${pageNumber}"][data-loaded='true']`));
+        let textLayerLoaded = element(by.css(`div[id="pageContainer${pageNumber}"] div[class='textLayer'] > div`));
+        let specificText = element(by.cssContainingText(`div[id="pageContainer${pageNumber}"] div[class='textLayer'] > div`, text));
+
+        Util.waitUntilElementIsVisible(allPages);
+        Util.waitUntilElementIsVisible(pageLoaded);
+        Util.waitUntilElementIsVisible(textLayerLoaded);
+        Util.waitUntilElementIsVisible(specificText);
+    }
+
+    goToNextPage() {
+        let nextPageIcon = element(by.css(`div[id='viewer-next-page-button']`));
+        Util.waitUntilElementIsVisible(nextPageIcon);
+        nextPageIcon.click();
+    }
+
+    goToPreviousPage() {
+        let previousPageIcon = element(by.css(`div[id='viewer-previous-page-button']`));
+        Util.waitUntilElementIsVisible(previousPageIcon);
+        previousPageIcon.click();
+    }
+
+    goToPage(page) {
+        let pageInput = element(by.css(`input[id='viewer-pagenumber-input']`));
+
+        Util.waitUntilElementIsVisible(pageInput);
+        pageInput.clear();
+        pageInput.sendKeys(page);
+        pageInput.sendKeys(protractor.Key.ENTER);
+    }
+
+    closePreviewWithButton() {
+        Util.waitUntilElementIsVisible(this.closeButton);
+        this.closeButton.click();
+    }
+
+    closePreviewWithEsc(fileName) {
+        let filePreview = element.all(by.css(`div[class='canvasWrapper'] > canvas`)).first();
+
+        browser.actions().sendKeys(protractor.Key.ESCAPE).perform();
+        Util.waitUntilElementIsVisible(element(by.cssContainingText(`div[data-automation-id="text_${fileName}"]`, fileName)));
+        Util.waitUntilElementIsNotOnPage(filePreview);
+    }
+
+    clickDownload(fileName) {
+        let downloadButton = element(by.css(`button[id='viewer-download-button']`));
+
+        Util.waitUntilElementIsVisible(downloadButton);
+        downloadButton.click();
+    }
+
+    clickZoomIn() {
+        let zoomInButton = element(by.css(`div[id='viewer-zoom-in-button']`));
+
+        Util.waitUntilElementIsVisible(zoomInButton);
+        zoomInButton.click();
+    }
+
+    clickZoomOut() {
+        let zoomOutButton = element(by.css(`div[id='viewer-zoom-out-button']`));
+
+        Util.waitUntilElementIsVisible(zoomOutButton);
+        zoomOutButton.click();
+    }
+
+    clickActualSize() {
+        let actualSizeButton = element(by.css(`div[id='viewer-scale-page-button']`));
+
+        Util.waitUntilElementIsVisible(actualSizeButton);
+        actualSizeButton.click();
+    }
+
+    checkCanvasWidth() {
+        return element.all(by.css(`div[class='canvasWrapper'] > canvas`)).first().getAttribute(`width`).then(function (width) {
+            return width;
+        });
+    }
+
+    checkCanvasHeight() {
+        return element.all(by.css(`div[class='canvasWrapper'] > canvas`)).first().getAttribute(`height`).then(function (height) {
+            return height;
+        });
+    }
+
+    zoomIn() {
+        let canvasLayer = element.all(by.css(`div[class='canvasWrapper'] > canvas`)).first();
+        let textLayer = element(by.css(`div[id*='pageContainer'] div[class='textLayer'] > div`));
+
+        Util.waitUntilElementIsVisible(canvasLayer);
+        Util.waitUntilElementIsVisible(textLayer);
+
+        let actualWidth,
+            zoomedInWidth,
+            actualHeight,
+            zoomedInHeight;
+
+        this.checkCanvasWidth().then(function (width) {
+            actualWidth = width;
+            if (actualWidth && zoomedInWidth) {
+                expect(zoomedInWidth).toBeGreaterThan(actualWidth);
+            }
+        });
+
+        this.checkCanvasHeight().then(function (height) {
+            actualHeight = height;
+            if (actualHeight && zoomedInHeight) {
+                expect(zoomedInHeight).toBeGreaterThan(actualHeight);
+            }
+        });
+
+        this.clickZoomIn();
+
+        this.checkCanvasWidth().then(function (width) {
+            zoomedInWidth = width;
+            if (actualWidth && zoomedInWidth) {
+                expect(zoomedInWidth).toBeGreaterThan(actualWidth);
+            }
+        });
+
+        this.checkCanvasHeight().then(function (height) {
+            zoomedInHeight = height;
+            if (actualHeight && zoomedInHeight) {
+                expect(zoomedInHeight).toBeGreaterThan(actualHeight);
+            }
+        });
+    }
+
+    actualSize() {
+        let canvasLayer = element.all(by.css(`div[class='canvasWrapper'] > canvas`)).first();
+        let textLayer = element(by.css(`div[id*='pageContainer'] div[class='textLayer'] > div`));
+
+        Util.waitUntilElementIsVisible(canvasLayer);
+        Util.waitUntilElementIsVisible(textLayer);
+
+        let actualWidth,
+            actualHeight,
+            zoomedWidth,
+            zoomedHeight,
+            newWidth,
+            newHeight;
+
+        this.checkCanvasWidth().then(function (width) {
+            actualWidth = width;
+        });
+
+        this.checkCanvasHeight().then(function (height) {
+            actualHeight = height;
+        });
+
+        this.clickZoomIn();
+
+        this.checkCanvasWidth().then(function (width) {
+            zoomedWidth = width;
+        });
+
+        this.checkCanvasHeight().then(function (height) {
+            zoomedHeight = height;
+        });
+
+        this.clickActualSize();
+
+        this.checkCanvasWidth().then(function (width) {
+            newWidth = width;
+            if (actualWidth && zoomedWidth && newWidth) {
+                expect(newWidth).toBeLessThan(zoomedWidth);
+                expect(newWidth).toEqual(actualWidth);
+            }
+        });
+
+        this.checkCanvasHeight().then(function (height) {
+            newHeight = height;
+            if (actualHeight && zoomedHeight && newHeight) {
+                expect(newHeight).toBeLessThan(zoomedHeight);
+                expect(newHeight).toEqual(actualHeight);
+            }
+        });
+    }
+
+    zoomOut() {
+        let canvasLayer = element.all(by.css(`div[class='canvasWrapper'] > canvas`)).first();
+        let textLayer = element(by.css(`div[id*='pageContainer'] div[class='textLayer'] > div`));
+
+        Util.waitUntilElementIsVisible(canvasLayer);
+        Util.waitUntilElementIsVisible(textLayer);
+
+        let actualWidth,
+            zoomedOutWidth,
+            actualHeight,
+            zoomedOutHeight,
+            zoomedInHeight;
+
+        this.checkCanvasWidth().then(function (width) {
+            actualWidth = width;
+            if (actualWidth && zoomedOutWidth) {
+                expect(zoomedOutWidth).toBeLessThan(actualWidth);
+            }
+        });
+
+        this.checkCanvasHeight().then(function (height) {
+            actualHeight = height;
+            if (actualHeight && zoomedOutHeight) {
+                expect(zoomedOutHeight).toBeLessThan(actualHeight);
+            }
+        });
+
+        this.clickZoomOut();
+
+        this.checkCanvasWidth().then(function (width) {
+            zoomedOutWidth = width;
+            if (actualWidth && zoomedOutWidth) {
+                expect(zoomedOutWidth).toBeLessThan(actualWidth);
+            }
+        });
+
+        this.checkCanvasHeight().then(function (height) {
+            zoomedInHeight = height;
+            if (actualHeight && zoomedOutHeight) {
+                expect(zoomedOutHeight).toBeLessThan(actualHeight);
+            }
+        });
+    }
+}
diff --git a/e2e/pages/adf/lockFilePage.ts b/e2e/pages/adf/lockFilePage.ts
index f061a857ff..aa9a09f764 100644
--- a/e2e/pages/adf/lockFilePage.ts
+++ b/e2e/pages/adf/lockFilePage.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import Util = require('../../util/util');
+import { Util } from '../../util/util';
 import { element, by } from 'protractor';
 
 export class LockFilePage {
@@ -23,7 +23,7 @@ export class LockFilePage {
     cancelButton =  element(by.css('button[aria-label="Close dialog"]'));
     saveButton = element(by.cssContainingText('button span', 'Save'));
     lockFileCheckboxText = element(by.cssContainingText('mat-checkbox label span', ' Lock file '));
-    lockFileCheckbox = element(by.css('mat-checkbox[class*="adf-lock-file-name"]'));
+    lockFileCheckbox = element(by.css('mat-checkbox[data-automation-id="adf-lock-node-checkbox"]'));
     allowOwnerCheckbox = element(by.cssContainingText('mat-checkbox[class*="adf-lock-file-name"] span', ' Allow the owner to modify this file '));
 
     checkLockFileCheckboxIsDisplayed() {
diff --git a/e2e/pages/adf/loginPage.ts b/e2e/pages/adf/loginPage.ts
index 6fee064018..39a3a2cae4 100644
--- a/e2e/pages/adf/loginPage.ts
+++ b/e2e/pages/adf/loginPage.ts
@@ -17,7 +17,7 @@
 
 import { FormControllersPage } from './material/formControllersPage';
 
-import Util = require('../../util/util');
+import { Util } from '../../util/util';
 import TestConfig = require('../../test.config');
 import { SettingsPage } from './settingsPage';
 import { element, by, protractor, browser } from 'protractor';
@@ -161,9 +161,8 @@ export class LoginPage {
     }
 
     goToLoginPage() {
-        browser.controlFlow().execute(async () => {
-            await browser.driver.get(TestConfig.adf.url + TestConfig.adf.port + '/login');
-        });
+        browser.waitForAngularEnabled(true);
+        browser.driver.get(TestConfig.adf.url + TestConfig.adf.port + '/login');
         this.waitForElements();
     }
 
diff --git a/e2e/pages/adf/loginApsPage.ts b/e2e/pages/adf/loginSSOPage.ts
similarity index 56%
rename from e2e/pages/adf/loginApsPage.ts
rename to e2e/pages/adf/loginSSOPage.ts
index 9f7c4cdcf8..990bab9d4c 100644
--- a/e2e/pages/adf/loginApsPage.ts
+++ b/e2e/pages/adf/loginSSOPage.ts
@@ -15,42 +15,46 @@
  * limitations under the License.
  */
 
-import Util = require('../../util/util');
-import { element, by } from 'protractor';
+import { Util } from '../../util/util';
+import { element, by, browser, protractor } from 'protractor';
 
-export class LoginAPSPage {
+export class LoginSSOPage {
 
     ssoButton = element(by.css(`[data-automation-id="login-button-sso"]`));
     usernameField = element(by.id('username'));
     passwordField = element(by.id('password'));
     loginButton = element(by.id('kc-login'));
+    header = element(by.id('adf-header'));
 
-    async loginAPS (username, password) {
-        await this.enterUsername(username);
-        await this.enterPassword(password);
-        await this.clickLoginButton();
+    loginAPS(username, password) {
+        browser.ignoreSynchronization = true;
+        this.enterUsername(username);
+        this.enterPassword(password);
+        this.clickLoginButton();
+        browser.actions().sendKeys(protractor.Key.ENTER).perform();
+        return Util.waitUntilElementIsVisible(this.header);
     }
 
-    async clickOnSSOButton () {
+    clickOnSSOButton() {
         Util.waitUntilElementIsVisible(this.ssoButton);
-        await this.ssoButton.click();
+        this.ssoButton.click();
     }
 
-    async enterUsername (username) {
+    enterUsername(username) {
         Util.waitUntilElementIsVisible(this.usernameField);
-        await this.usernameField.clear();
-        await this.usernameField.sendKeys(username);
+        this.usernameField.clear();
+        this.usernameField.sendKeys(username);
     }
 
-    async enterPassword (password) {
+    enterPassword(password) {
         Util.waitUntilElementIsVisible(this.passwordField);
-        await this.passwordField.clear();
-        await this.passwordField.sendKeys(password);
+        this.passwordField.clear();
+        this.passwordField.sendKeys(password);
     }
 
-    async clickLoginButton () {
+    clickLoginButton() {
         Util.waitUntilElementIsVisible(this.loginButton);
-        await this.loginButton.click();
+        return this.loginButton.click();
     }
 
 }
diff --git a/e2e/pages/adf/material/datePickerPage.ts b/e2e/pages/adf/material/datePickerPage.ts
index 9978e6e578..afab00346b 100644
--- a/e2e/pages/adf/material/datePickerPage.ts
+++ b/e2e/pages/adf/material/datePickerPage.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import Util = require('../../../util/util');
+import { Util } from '../../../util/util';
 import { element, by, browser, protractor } from 'protractor';
 
 export class DatePickerPage {
diff --git a/e2e/pages/adf/material/formControllersPage.ts b/e2e/pages/adf/material/formControllersPage.ts
index dc7e249de5..051a2931f9 100644
--- a/e2e/pages/adf/material/formControllersPage.ts
+++ b/e2e/pages/adf/material/formControllersPage.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import Util = require('../../../util/util');
+import { Util } from '../../../util/util';
 
 export class FormControllersPage {
 
@@ -23,7 +23,8 @@ export class FormControllersPage {
         Util.waitUntilElementIsVisible(toggle);
         toggle.getAttribute('class').then((check) => {
             if (check.indexOf('mat-checked') < 0) {
-                toggle.click();
+                Util.waitUntilElementIsClickable(toggle.element(by.css('div')));
+                toggle.element(by.css('div')).click();
             }
         });
     }
@@ -32,7 +33,8 @@ export class FormControllersPage {
         Util.waitUntilElementIsVisible(toggle);
         toggle.getAttribute('class').then((check) => {
             if (check.indexOf('mat-checked') >= 0) {
-                toggle.click();
+                Util.waitUntilElementIsClickable(toggle.element(by.css('div')));
+                toggle.element(by.css('div')).click();
             }
         });
     }
diff --git a/e2e/pages/adf/material/tabsPage.ts b/e2e/pages/adf/material/tabsPage.ts
index edf66dd2f5..d16500696a 100644
--- a/e2e/pages/adf/material/tabsPage.ts
+++ b/e2e/pages/adf/material/tabsPage.ts
@@ -16,7 +16,7 @@
  */
 
 import { element, by } from 'protractor';
-import Util = require('../../../util/util');
+import { Util } from '../../../util/util';
 
 export class TabsPage {
 
diff --git a/e2e/pages/adf/metadataViewPage.js b/e2e/pages/adf/metadataViewPage.js
deleted file mode 100644
index fbcf14b389..0000000000
--- a/e2e/pages/adf/metadataViewPage.js
+++ /dev/null
@@ -1,411 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var Util = require('../../util/util');
-
-var MetadataViewPage = function () {
-
-    var title = element(by.css("div[info-drawer-title]"));
-    var expandedAspect = element(by.css("mat-expansion-panel-header[aria-expanded='true']"));
-    var aspectTitle = by.css("mat-panel-title");
-    var name = element(by.css("span[data-automation-id='card-textitem-value-name'] span"));
-    var creator = element(by.css("span[data-automation-id='card-textitem-value-createdByUser.displayName'] span"));
-    var createdDate = element(by.css("span[data-automation-id='card-dateitem-createdAt'] span"));
-    var modifier = element(by.css("span[data-automation-id='card-textitem-value-modifiedByUser.displayName'] span"));
-    var modifiedDate = element(by.css("span[data-automation-id='card-dateitem-modifiedAt'] span"));
-    var mimetypeName = element(by.css("span[data-automation-id='card-textitem-value-content.mimeTypeName']"));
-    var size = element(by.css("span[data-automation-id='card-textitem-value-content.sizeInBytes']"));
-    var description = element(by.css("span[data-automation-id='card-textitem-value-properties.cm:description'] span"));
-    var author = element(by.css("span[data-automation-id='card-textitem-value-properties.cm:author'] span"));
-    var titleProperty = element(by.css("span[data-automation-id='card-textitem-value-properties.cm:title'] span"));
-    var editIcon = element(by.css("button[data-automation-id='meta-data-card-toggle-edit']"));
-    var informationButton = element(by.css("button[data-automation-id='meta-data-card-toggle-expand']"));
-    var informationSpan = element(by.css("span[data-automation-id='meta-data-card-toggle-expand-label']"));
-    var informationIcon = element(by.css("span[data-automation-id='meta-data-card-toggle-expand-label'] ~ mat-icon"));
-    var rightChevron = element(by.css("div[class*='header-pagination-after']"));
-    var displayEmptySwitch = element(by.id("adf-metadata-empty"));
-    var readonlySwitch = element(by.id("adf-metadata-readonly"));
-    var multiSwitch = element(by.id("adf-metadata-multi"));
-    var presetSwitch = element(by.id('adf-toggle-custom-preset'));
-    var defaultPropertiesSwitch = element(by.id('adf-metadata-default-properties'));
-
-    this.getTitle = function () {
-        Util.waitUntilElementIsVisible(title);
-        return title.getText();
-    };
-
-    this.getExpandedAspectName = function () {
-        Util.waitUntilElementIsVisible(expandedAspect);
-        return expandedAspect.element(aspectTitle).getText();
-    };
-
-    this.getName = function () {
-        Util.waitUntilElementIsVisible(name);
-        return name.getText();
-    };
-
-    this.getCreator = function () {
-        Util.waitUntilElementIsVisible(creator);
-        return creator.getText();
-    };
-
-    this.getCreatedDate = function () {
-        Util.waitUntilElementIsVisible(createdDate);
-        return createdDate.getText();
-    };
-
-    this.getModifier = function () {
-        Util.waitUntilElementIsVisible(modifier);
-        return modifier.getText();
-    };
-
-    this.getModifiedDate = function () {
-        Util.waitUntilElementIsVisible(modifiedDate);
-        return modifiedDate.getText();
-    };
-
-    this.getMimetypeName = function () {
-        Util.waitUntilElementIsVisible(mimetypeName);
-        return mimetypeName.getText();
-    };
-
-    this.getSize = function () {
-        Util.waitUntilElementIsVisible(size);
-        return size.getText();
-    };
-
-    this.getDescription = function () {
-        Util.waitUntilElementIsVisible(description);
-        return description.getText();
-    };
-
-    this.getAuthor = function () {
-        Util.waitUntilElementIsVisible(author);
-        return author.getText();
-    };
-
-    this.getTitleProperty = function () {
-        Util.waitUntilElementIsVisible(titleProperty);
-        return titleProperty.getText();
-    };
-
-    this.editIconIsDisplayed = function () {
-        return Util.waitUntilElementIsVisible(editIcon);
-    };
-
-    this.editIconIsNotDisplayed = function () {
-        return Util.waitUntilElementIsNotVisible(editIcon);
-    };
-
-    this.editIconClick = function () {
-        Util.waitUntilElementIsVisible(editIcon);
-        return editIcon.click();
-    };
-
-    this.informationButtonIsDisplayed = function () {
-        Util.waitUntilElementIsVisible(informationButton);
-        Util.waitUntilElementIsClickable(informationButton);
-    };
-
-    this.informationButtonIsNotDisplayed = function () {
-        Util.waitUntilElementIsNotVisible(informationButton);
-    };
-
-    this.clickOnInformationButton = function () {
-        this.informationButtonIsDisplayed();
-        informationButton.click();
-        return this;
-    };
-
-    this.getInformationButtonText = function () {
-        Util.waitUntilElementIsVisible(informationSpan);
-        return informationSpan.getText();
-    };
-
-    this.getInformationIconText = function () {
-        Util.waitUntilElementIsVisible(informationIcon);
-        return informationIcon.getText();
-    };
-
-    this.clickOnPropertiesTab = function () {
-        let propertiesTab = element(by.cssContainingText(".adf-info-drawer-layout-content div.mat-tab-labels div .mat-tab-label-content", "Properties"));
-        Util.waitUntilElementIsVisible(propertiesTab);
-        propertiesTab.click();
-        return this;
-    };
-
-    this.clickRightChevron = function () {
-        Util.waitUntilElementIsVisible(rightChevron);
-        rightChevron.click();
-        return this;
-    };
-
-    this.getEditIconTooltip = function () {
-        return editIcon.getAttribute('title');
-    };
-
-    this.getInformationButtonTooltip = function () {
-        return informationSpan.getAttribute('title');
-    };
-
-    this.editPropertyIconIsDisplayed = function (propertyName) {
-        var editPropertyIcon = element(by.css('mat-icon[data-automation-id="card-textitem-edit-icon-' + propertyName + '"]'));
-        Util.waitUntilElementIsVisible(editPropertyIcon);
-    };
-
-    this.updatePropertyIconIsDisplayed = function (propertyName) {
-        var updatePropertyIcon = element(by.css('mat-icon[data-automation-id="card-textitem-update-' + propertyName + '"]'));
-        Util.waitUntilElementIsVisible(updatePropertyIcon);
-    };
-
-    this.clickUpdatePropertyIcon = function (propertyName) {
-        var updatePropertyIcon = element(by.css('mat-icon[data-automation-id="card-textitem-update-' + propertyName + '"]'));
-        Util.waitUntilElementIsVisible(updatePropertyIcon);
-        return updatePropertyIcon.click();
-    };
-
-    this.clickClearPropertyIcon = function (propertyName) {
-        var clearPropertyIcon = element(by.css('mat-icon[data-automation-id="card-textitem-reset-' + propertyName + '"]'));
-        Util.waitUntilElementIsVisible(clearPropertyIcon);
-        return clearPropertyIcon.click();
-    };
-
-    this.enterPropertyText = function (propertyName, text) {
-        const textField = element(by.css('input[data-automation-id="card-textitem-editinput-' + propertyName + '"]'));
-        Util.waitUntilElementIsVisible(textField);
-        textField.sendKeys('');
-        textField.clear().sendKeys(text);
-        return this;
-    };
-
-    this.enterPresetText = function (text) {
-        const presetField = element(by.css('input[data-automation-id="adf-text-custom-preset"]'));
-        Util.waitUntilElementIsVisible(presetField);
-        presetField.sendKeys('');
-        presetField.clear().sendKeys(text);
-        const applyButton = element(by.css('button[id="adf-metadata-aplly"]'));
-        applyButton.click();
-        return this;
-    };
-
-    this.enterDescriptionText = function (text) {
-        const textField = element(by.css('textarea[data-automation-id="card-textitem-edittextarea-properties.cm:description"]'));
-        Util.waitUntilElementIsVisible(textField);
-        textField.sendKeys('');
-        textField.clear().sendKeys(text);
-        return this;
-    };
-
-    this.getPropertyText = function (propertyName, type) {
-        let propertyType = !type ? 'textitem' : type;
-        const textField = element(by.css('span[data-automation-id="card-' + propertyType + '-value-' + propertyName + '"]'));
-        Util.waitUntilElementIsVisible(textField);
-        return textField.getText();
-    };
-
-    this.clearPropertyIconIsDisplayed = function (propertyName) {
-        var clearPropertyIcon = element(by.css('mat-icon[data-automation-id="card-textitem-reset-' + propertyName + '"]'));
-        Util.waitUntilElementIsVisible(clearPropertyIcon);
-    };
-
-    this.clickEditPropertyIcons = function (propertyName) {
-        var editPropertyIcon = element(by.css('mat-icon[data-automation-id="card-textitem-edit-icon-' + propertyName + '"]'));
-        Util.waitUntilElementIsVisible(editPropertyIcon);
-        editPropertyIcon.click();
-    };
-
-    this.getPropertyIconTooltip = function (propertyName) {
-        var editPropertyIcon = element(by.css('mat-icon[data-automation-id="card-textitem-edit-icon-' + propertyName + '"]'));
-        return editPropertyIcon.getAttribute('title');
-    };
-
-    this.clickMetadataGroup = function (groupName) {
-        var group = element(by.css('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"]'));
-        Util.waitUntilElementIsVisible(group);
-        group.click();
-    };
-
-    this.checkMetadataGroupIsPresent = function (groupName) {
-        var group = element(by.css('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"]'));
-        return Util.waitUntilElementIsVisible(group);
-    };
-
-    this.checkMetadataGroupIsNotPresent = function (groupName) {
-        var group = element(by.css('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"]'));
-        return Util.waitUntilElementIsNotVisible(group);
-    };
-
-    this.checkMetadataGroupIsExpand = function (groupName) {
-        var group = element(by.css('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"] > mat-expansion-panel-header'));
-        Util.waitUntilElementIsVisible(group);
-        expect(group.getAttribute('class')).toContain('mat-expanded')
-    };
-
-    this.checkMetadataGroupIsNotExpand = function (groupName) {
-        var group = element(by.css('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"] > mat-expansion-panel-header'));
-        Util.waitUntilElementIsVisible(group);
-        expect(group.getAttribute('class')).not.toContain('mat-expanded')
-    };
-
-    this.getMetadataGroupTitle = function (groupName) {
-        var group = element(by.css('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"] > mat-expansion-panel-header > span > mat-panel-title'));
-        Util.waitUntilElementIsVisible(group);
-        return group.getText();
-    };
-
-    /**
-     * disables displayEmpty
-     */
-    this.disableDisplayEmpty = function () {
-        Util.waitUntilElementIsVisible(displayEmptySwitch);
-        displayEmptySwitch.getAttribute('class').then(function (check) {
-            if (check === 'mat-slide-toggle mat-primary mat-checked') {
-                displayEmptySwitch.click();
-                expect(displayEmptySwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary');
-            }
-        })
-    };
-
-    /**
-     * enables displayEmpty
-     */
-    this.enableDisplayEmpty = function () {
-        Util.waitUntilElementIsVisible(displayEmptySwitch);
-        displayEmptySwitch.getAttribute('class').then(function (check) {
-            if (check === 'mat-slide-toggle mat-primary') {
-                displayEmptySwitch.click();
-                expect(displayEmptySwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary mat-checked');
-            }
-        })
-    };
-
-    /**
-     * disables Readonly
-     */
-    this.disableReadonly = function () {
-        Util.waitUntilElementIsVisible(readonlySwitch);
-        readonlySwitch.getAttribute('class').then(function (check) {
-            if (check === 'mat-slide-toggle mat-primary mat-checked') {
-                readonlySwitch.click();
-                expect(readonlySwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary');
-            }
-        })
-    };
-
-    /**
-     * enables Readonly
-     */
-    this.enableReadonly = function () {
-        Util.waitUntilElementIsVisible(readonlySwitch);
-        readonlySwitch.getAttribute('class').then(function (check) {
-            if (check === 'mat-slide-toggle mat-primary') {
-                readonlySwitch.click();
-                expect(readonlySwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary mat-checked');
-            }
-        })
-    };
-
-    /**
-     * disables multi
-     */
-    this.disableMulti = function () {
-        Util.waitUntilElementIsVisible(multiSwitch);
-        multiSwitch.getAttribute('class').then(function (check) {
-            if (check === 'mat-slide-toggle mat-primary mat-checked') {
-                multiSwitch.click();
-                expect(multiSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary');
-            }
-        })
-    };
-
-    /**
-     * enables multi
-     */
-    this.enableMulti = function () {
-        Util.waitUntilElementIsVisible(multiSwitch);
-        multiSwitch.getAttribute('class').then(function (check) {
-            if (check === 'mat-slide-toggle mat-primary') {
-                multiSwitch.click();
-                expect(multiSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary mat-checked');
-            }
-        })
-    };
-
-    /**
-     * disables preset
-     */
-    this.disablePreset = function () {
-        Util.waitUntilElementIsVisible(presetSwitch);
-        presetSwitch.getAttribute('class').then(function (check) {
-            if (check === 'mat-slide-toggle mat-primary mat-checked') {
-                presetSwitch.click();
-                expect(presetSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary');
-            }
-        })
-    };
-
-    /**
-     * enables preset
-     */
-    this.enablePreset = function () {
-        Util.waitUntilElementIsVisible(presetSwitch);
-        presetSwitch.getAttribute('class').then(function (check) {
-            if (check === 'mat-slide-toggle mat-primary') {
-                presetSwitch.click();
-                expect(presetSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary mat-checked');
-            }
-        })
-    };
-
-    /**
-     * disables preset
-     */
-    this.disabledDefaultProperties = function () {
-        Util.waitUntilElementIsVisible(defaultPropertiesSwitch);
-        defaultPropertiesSwitch.getAttribute('class').then(function (check) {
-            if (check === 'mat-slide-toggle mat-primary mat-checked') {
-                defaultPropertiesSwitch.click();
-                expect(defaultPropertiesSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary');
-            }
-        })
-    };
-
-    /**
-     * enables preset
-     */
-    this.enabledDefaultProperties = function () {
-        Util.waitUntilElementIsVisible(defaultPropertiesSwitch);
-        defaultPropertiesSwitch.getAttribute('class').then(function (check) {
-            if (check === 'mat-slide-toggle mat-primary') {
-                defaultPropertiesSwitch.click();
-                expect(defaultPropertiesSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary mat-checked');
-            }
-        })
-    };
-
-    this.checkPropertyIsVisible = function (propertyName, type) {
-        var property = element(by.css('div[data-automation-id="card-' + type + '-label-' + propertyName + '"]'));
-        Util.waitUntilElementIsVisible(property);
-    };
-
-    this.checkPropertyIsNotVisible = function (propertyName, type) {
-        var property = element(by.css('div[data-automation-id="card-' + type + '-label-' + propertyName + '"]'));
-        Util.waitUntilElementIsNotVisible(property);
-    };
-};
-
-module.exports = MetadataViewPage;
diff --git a/e2e/pages/adf/metadataViewPage.ts b/e2e/pages/adf/metadataViewPage.ts
new file mode 100644
index 0000000000..d006499c84
--- /dev/null
+++ b/e2e/pages/adf/metadataViewPage.ts
@@ -0,0 +1,414 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Util } from '../../util/util';
+import { browser, by, element } from 'protractor';
+
+export class MetadataViewPage {
+
+    title = element(by.css(`div[info-drawer-title]`));
+    expandedAspect = element(by.css(`mat-expansion-panel-header[aria-expanded='true']`));
+    aspectTitle = by.css(`mat-panel-title`);
+    name = element(by.css(`span[data-automation-id='card-textitem-value-name'] span`));
+    creator = element(by.css(`span[data-automation-id='card-textitem-value-createdByUser.displayName'] span`));
+    createdDate = element(by.css(`span[data-automation-id='card-dateitem-createdAt'] span`));
+    modifier = element(by.css(`span[data-automation-id='card-textitem-value-modifiedByUser.displayName'] span`));
+    modifiedDate = element(by.css(`span[data-automation-id='card-dateitem-modifiedAt'] span`));
+    mimetypeName = element(by.css(`span[data-automation-id='card-textitem-value-content.mimeTypeName']`));
+    size = element(by.css(`span[data-automation-id='card-textitem-value-content.sizeInBytes']`));
+    description = element(by.css(`span[data-automation-id='card-textitem-value-properties.cm:description'] span`));
+    author = element(by.css(`span[data-automation-id='card-textitem-value-properties.cm:author'] span`));
+    titleProperty = element(by.css(`span[data-automation-id='card-textitem-value-properties.cm:title'] span`));
+    editIcon = element(by.css(`button[data-automation-id='meta-data-card-toggle-edit']`));
+    informationButton = element(by.css(`button[data-automation-id='meta-data-card-toggle-expand']`));
+    informationSpan = element(by.css(`span[data-automation-id='meta-data-card-toggle-expand-label']`));
+    informationIcon = element(by.css(`span[data-automation-id='meta-data-card-toggle-expand-label'] ~ mat-icon`));
+    rightChevron = element(by.css(`div[class*='header-pagination-after']`));
+    displayEmptySwitch = element(by.id(`adf-metadata-empty`));
+    readonlySwitch = element(by.id(`adf-metadata-readonly`));
+    multiSwitch = element(by.id(`adf-metadata-multi`));
+    presetSwitch = element(by.id('adf-toggle-custom-preset'));
+    defaultPropertiesSwitch = element(by.id('adf-metadata-default-properties'));
+
+    getTitle() {
+        Util.waitUntilElementIsVisible(this.title);
+        return this.title.getText();
+    }
+
+    getExpandedAspectName() {
+        Util.waitUntilElementIsVisible(this.expandedAspect);
+        return this.expandedAspect.element(this.aspectTitle).getText();
+    }
+
+    getName() {
+        Util.waitUntilElementIsVisible(this.name);
+        return this.name.getText();
+    }
+
+    getCreator() {
+        Util.waitUntilElementIsVisible(this.creator);
+        return this.creator.getText();
+    }
+
+    getCreatedDate() {
+        Util.waitUntilElementIsVisible(this.createdDate);
+        return this.createdDate.getText();
+    }
+
+    getModifier() {
+        Util.waitUntilElementIsVisible(this.modifier);
+        return this.modifier.getText();
+    }
+
+    getModifiedDate() {
+        Util.waitUntilElementIsVisible(this.modifiedDate);
+        return this.modifiedDate.getText();
+    }
+
+    getMimetypeName() {
+        Util.waitUntilElementIsVisible(this.mimetypeName);
+        return this.mimetypeName.getText();
+    }
+
+    getSize() {
+        Util.waitUntilElementIsVisible(this.size);
+        return this.size.getText();
+    }
+
+    getDescription() {
+        Util.waitUntilElementIsVisible(this.description);
+        return this.description.getText();
+    }
+
+    getAuthor() {
+        Util.waitUntilElementIsVisible(this.author);
+        return this.author.getText();
+    }
+
+    getTitleProperty() {
+        Util.waitUntilElementIsVisible(this.titleProperty);
+        return this.titleProperty.getText();
+    }
+
+    editIconIsDisplayed() {
+        return Util.waitUntilElementIsVisible(this.editIcon);
+    }
+
+    editIconIsNotDisplayed() {
+        return Util.waitUntilElementIsNotVisible(this.editIcon);
+    }
+
+    editIconClick() {
+        Util.waitUntilElementIsVisible(this.editIcon);
+        return this.editIcon.click();
+    }
+
+    informationButtonIsDisplayed() {
+        Util.waitUntilElementIsVisible(this.informationButton);
+        Util.waitUntilElementIsClickable(this.informationButton);
+    }
+
+    informationButtonIsNotDisplayed() {
+        Util.waitUntilElementIsNotVisible(this.informationButton);
+    }
+
+    clickOnInformationButton() {
+        this.informationButtonIsDisplayed();
+        browser.sleep(600);
+        this.informationButton.click();
+        return this;
+    }
+
+    getInformationButtonText() {
+        Util.waitUntilElementIsVisible(this.informationSpan);
+        return this.informationSpan.getText();
+    }
+
+    getInformationIconText() {
+        Util.waitUntilElementIsVisible(this.informationIcon);
+        return this.informationIcon.getText();
+    }
+
+    clickOnPropertiesTab() {
+        let propertiesTab = element(by.cssContainingText(`.adf-info-drawer-layout-content div.mat-tab-labels div .mat-tab-label-content`, `Properties`));
+        Util.waitUntilElementIsVisible(propertiesTab);
+        propertiesTab.click();
+        return this;
+    }
+
+    clickRightChevron() {
+        Util.waitUntilElementIsVisible(this.rightChevron);
+        this.rightChevron.click();
+        return this;
+    }
+
+    getEditIconTooltip() {
+        return this.editIcon.getAttribute('title');
+    }
+
+    getInformationButtonTooltip() {
+        return this.informationSpan.getAttribute('title');
+    }
+
+    editPropertyIconIsDisplayed(propertyName) {
+        let editPropertyIcon = element(by.css('mat-icon[data-automation-id="card-textitem-edit-icon-' + propertyName + '"]'));
+        Util.waitUntilElementIsVisible(editPropertyIcon);
+    }
+
+    updatePropertyIconIsDisplayed(propertyName) {
+        let updatePropertyIcon = element(by.css('mat-icon[data-automation-id="card-textitem-update-' + propertyName + '"]'));
+        Util.waitUntilElementIsVisible(updatePropertyIcon);
+    }
+
+    clickUpdatePropertyIcon(propertyName) {
+        let updatePropertyIcon = element(by.css('mat-icon[data-automation-id="card-textitem-update-' + propertyName + '"]'));
+        Util.waitUntilElementIsVisible(updatePropertyIcon);
+        return updatePropertyIcon.click();
+    }
+
+    clickClearPropertyIcon(propertyName) {
+        let clearPropertyIcon = element(by.css('mat-icon[data-automation-id="card-textitem-reset-' + propertyName + '"]'));
+        Util.waitUntilElementIsVisible(clearPropertyIcon);
+        return clearPropertyIcon.click();
+    }
+
+    enterPropertyText(propertyName, text) {
+        const textField = element(by.css('input[data-automation-id="card-textitem-editinput-' + propertyName + '"]'));
+        Util.waitUntilElementIsVisible(textField);
+        textField.sendKeys('');
+        textField.clear();
+        textField.sendKeys(text);
+        return this;
+    }
+
+    enterPresetText(text) {
+        const presetField = element(by.css('input[data-automation-id="adf-text-custom-preset"]'));
+        Util.waitUntilElementIsVisible(presetField);
+        presetField.sendKeys('');
+        presetField.clear();
+        presetField.sendKeys(text);
+        const applyButton = element(by.css('button[id="adf-metadata-aplly"]'));
+        applyButton.click();
+        return this;
+    }
+
+    enterDescriptionText(text) {
+        const textField = element(by.css('textarea[data-automation-id="card-textitem-edittextarea-properties.cm:description"]'));
+        Util.waitUntilElementIsVisible(textField);
+        textField.sendKeys('');
+        textField.clear();
+        textField.sendKeys(text);
+        return this;
+    }
+
+    getPropertyText(propertyName, type) {
+        let propertyType = !type ? 'textitem' : type;
+        const textField = element(by.css('span[data-automation-id="card-' + propertyType + '-value-' + propertyName + '"]'));
+        Util.waitUntilElementIsVisible(textField);
+        return textField.getText();
+    }
+
+    clearPropertyIconIsDisplayed(propertyName) {
+        let clearPropertyIcon = element(by.css('mat-icon[data-automation-id="card-textitem-reset-' + propertyName + '"]'));
+        Util.waitUntilElementIsVisible(clearPropertyIcon);
+    }
+
+    clickEditPropertyIcons(propertyName) {
+        let editPropertyIcon = element(by.css('mat-icon[data-automation-id="card-textitem-edit-icon-' + propertyName + '"]'));
+        Util.waitUntilElementIsVisible(editPropertyIcon);
+        editPropertyIcon.click();
+    }
+
+    getPropertyIconTooltip(propertyName) {
+        let editPropertyIcon = element(by.css('mat-icon[data-automation-id="card-textitem-edit-icon-' + propertyName + '"]'));
+        return editPropertyIcon.getAttribute('title');
+    }
+
+    clickMetadataGroup(groupName) {
+        let group = element(by.css('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"]'));
+        Util.waitUntilElementIsVisible(group);
+        group.click();
+    }
+
+    checkMetadataGroupIsPresent(groupName) {
+        let group = element(by.css('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"]'));
+        return Util.waitUntilElementIsVisible(group);
+    }
+
+    checkMetadataGroupIsNotPresent(groupName) {
+        let group = element(by.css('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"]'));
+        return Util.waitUntilElementIsNotVisible(group);
+    }
+
+    checkMetadataGroupIsExpand(groupName) {
+        let group = element(by.css('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"] > mat-expansion-panel-header'));
+        Util.waitUntilElementIsVisible(group);
+        expect(group.getAttribute('class')).toContain('mat-expanded');
+    }
+
+    checkMetadataGroupIsNotExpand(groupName) {
+        let group = element(by.css('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"] > mat-expansion-panel-header'));
+        Util.waitUntilElementIsVisible(group);
+        expect(group.getAttribute('class')).not.toContain('mat-expanded');
+    }
+
+    getMetadataGroupTitle(groupName) {
+        let group = element(by.css('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"] > mat-expansion-panel-header > span > mat-panel-title'));
+        Util.waitUntilElementIsVisible(group);
+        return group.getText();
+    }
+
+    /**
+     * disables displayEmpty
+     */
+    disableDisplayEmpty() {
+        Util.waitUntilElementIsVisible(this.displayEmptySwitch);
+        this.displayEmptySwitch.getAttribute('class').then((check) => {
+            if (check === 'mat-slide-toggle mat-primary mat-checked') {
+                this.displayEmptySwitch.click();
+                expect(this.displayEmptySwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary');
+            }
+        });
+    }
+
+    /**
+     * enables displayEmpty
+     */
+    enableDisplayEmpty() {
+        Util.waitUntilElementIsVisible(this.displayEmptySwitch);
+        this.displayEmptySwitch.getAttribute('class').then((check) => {
+            if (check === 'mat-slide-toggle mat-primary') {
+                this.displayEmptySwitch.click();
+                expect(this.displayEmptySwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary mat-checked');
+            }
+        });
+    }
+
+    /**
+     * disables Readonly
+     */
+    disableReadonly() {
+        Util.waitUntilElementIsVisible(this.readonlySwitch);
+        this.readonlySwitch.getAttribute('class').then((check) => {
+            if (check === 'mat-slide-toggle mat-primary mat-checked') {
+                this.readonlySwitch.click();
+                expect(this.readonlySwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary');
+            }
+        });
+    }
+
+    /**
+     * enables Readonly
+     */
+    enableReadonly() {
+        Util.waitUntilElementIsVisible(this.readonlySwitch);
+        this.readonlySwitch.getAttribute('class').then((check) => {
+            if (check === 'mat-slide-toggle mat-primary') {
+                this.readonlySwitch.click();
+                expect(this.readonlySwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary mat-checked');
+            }
+        });
+    }
+
+    /**
+     * disables multi
+     */
+    disableMulti() {
+        Util.waitUntilElementIsVisible(this.multiSwitch);
+        this.multiSwitch.getAttribute('class').then((check) => {
+            if (check === 'mat-slide-toggle mat-primary mat-checked') {
+                this.multiSwitch.click();
+                expect(this.multiSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary');
+            }
+        });
+    }
+
+    /**
+     * enables multi
+     */
+    enableMulti() {
+        Util.waitUntilElementIsVisible(this.multiSwitch);
+        this.multiSwitch.getAttribute('class').then((check) => {
+            if (check === 'mat-slide-toggle mat-primary') {
+                this.multiSwitch.click();
+                expect(this.multiSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary mat-checked');
+            }
+        });
+    }
+
+    /**
+     * disables preset
+     */
+    disablePreset() {
+        Util.waitUntilElementIsVisible(this.presetSwitch);
+        this.presetSwitch.getAttribute('class').then((check) => {
+            if (check === 'mat-slide-toggle mat-primary mat-checked') {
+                this.presetSwitch.click();
+                expect(this.presetSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary');
+            }
+        });
+    }
+
+    /**
+     * enables preset
+     */
+    enablePreset() {
+        Util.waitUntilElementIsVisible(this.presetSwitch);
+        this.presetSwitch.getAttribute('class').then((check) => {
+            if (check === 'mat-slide-toggle mat-primary') {
+                this.presetSwitch.click();
+                expect(this.presetSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary mat-checked');
+            }
+        });
+    }
+
+    /**
+     * disables preset
+     */
+    disabledDefaultProperties() {
+        Util.waitUntilElementIsVisible(this.defaultPropertiesSwitch);
+        this.defaultPropertiesSwitch.getAttribute('class').then((check) => {
+            if (check === 'mat-slide-toggle mat-primary mat-checked') {
+                this.defaultPropertiesSwitch.click();
+                expect(this.defaultPropertiesSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary');
+            }
+        });
+    }
+
+    /**
+     * enables preset
+     */
+    enabledDefaultProperties() {
+        Util.waitUntilElementIsVisible(this.defaultPropertiesSwitch);
+        this.defaultPropertiesSwitch.getAttribute('class').then((check) => {
+            if (check === 'mat-slide-toggle mat-primary') {
+                this.defaultPropertiesSwitch.click();
+                expect(this.defaultPropertiesSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary mat-checked');
+            }
+        });
+    }
+
+    checkPropertyIsVisible(propertyName, type) {
+        let property = element(by.css('div[data-automation-id="card-' + type + '-label-' + propertyName + '"]'));
+        Util.waitUntilElementIsVisible(property);
+    }
+
+    checkPropertyIsNotVisible(propertyName, type) {
+        let property = element(by.css('div[data-automation-id="card-' + type + '-label-' + propertyName + '"]'));
+        Util.waitUntilElementIsNotVisible(property);
+    }
+}
diff --git a/e2e/pages/adf/navigationBarPage.ts b/e2e/pages/adf/navigationBarPage.ts
index 0d2c7d2106..8241e4c13b 100644
--- a/e2e/pages/adf/navigationBarPage.ts
+++ b/e2e/pages/adf/navigationBarPage.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import Util = require('../../util/util');
+import { Util } from '../../util/util';
 import TestConfig = require('../../test.config');
 import { element, by, browser } from 'protractor';
 import { ProcessServicesPage } from './process_services/processServicesPage';
@@ -24,6 +24,7 @@ import { AppListCloudComponent } from './process_cloud/appListCloudComponent';
 export class NavigationBarPage {
 
     contentServicesButton = element(by.css('a[data-automation-id="Content Services"]'));
+    dataTableButton = element(by.css('a[data-automation-id="Datatable"]'));
     taskListButton = element(by.css("a[data-automation-id='Task List']"));
     configEditorButton = element(by.css('a[data-automation-id="Configuration Editor"]'));
     processServicesButton = element(by.css('a[data-automation-id="Process Services"]'));
@@ -43,6 +44,11 @@ export class NavigationBarPage {
     formButton = element(by.css('a[data-automation-id="Form"]'));
     treeViewButton = element(by.css('a[data-automation-id="Tree View"]'));
 
+    navigateToDatatable() {
+        Util.waitUntilElementIsVisible(this.dataTableButton);
+        this.dataTableButton.click();
+    }
+
     clickContentServicesButton() {
         Util.waitUntilElementIsVisible(this.contentServicesButton);
         this.contentServicesButton.click();
@@ -160,10 +166,10 @@ export class NavigationBarPage {
         this.appTitle.click();
     }
 
-    clickFormButton = function () {
+    clickFormButton() {
         Util.waitUntilElementIsVisible(this.formButton);
         return this.formButton.click();
-    };
+    }
 
     checkLogoTooltip(logoTooltipTitle) {
         let logoTooltip = element(by.css('a[title="' + logoTooltipTitle + '"]'));
@@ -179,10 +185,6 @@ export class NavigationBarPage {
         browser.get(TestConfig.adf.url + `/files/${site.entry.guid}/display/list`);
     }
 
-    checkContentServicesButtonIsDisplayed() {
-        Util.waitUntilElementIsVisible(this.contentServicesButton);
-    }
-
     clickTreeViewButton() {
         Util.waitUntilElementIsVisible(this.treeViewButton);
         this.treeViewButton.click();
diff --git a/e2e/pages/adf/notificationPage.ts b/e2e/pages/adf/notificationPage.ts
index 662a7fcdea..5987a3182f 100644
--- a/e2e/pages/adf/notificationPage.ts
+++ b/e2e/pages/adf/notificationPage.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import Util = require('../../util/util');
+import { Util } from '../../util/util';
 import { element, by, protractor, browser } from 'protractor';
 
 export class NotificationPage {
diff --git a/e2e/pages/adf/paginationPage.js b/e2e/pages/adf/paginationPage.js
deleted file mode 100644
index b5e3d26e3f..0000000000
--- a/e2e/pages/adf/paginationPage.js
+++ /dev/null
@@ -1,160 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var Util = require('../../util/util');
-
-var PaginationPage = function () {
-
-    var itemsPerPageDropdown = element(by.css("div[class*='adf-pagination__perpage-block'] button"));
-    var pageSelectorDropDown = element(by.css("div[class*='adf-pagination__page-selector']"));
-    var pageSelectorArrow = element(by.css("button[aria-label='Current page selector']"));
-    var itemsPerPage = element(by.css("span[class='adf-pagination__max-items']"));
-    var currentPage = element(by.css("span[class='adf-pagination__current-page']"));
-    var totalPages = element(by.css("span[class='adf-pagination__total-pages']"));
-    var paginationRange = element(by.css("span[class='adf-pagination__range']"));
-    var nextPageButton = element(by.css("button[class*='adf-pagination__next-button']"));
-    var previousPageButton = element(by.css("button[class*='adf-pagination__previous-button']"));
-    var nextButtonDisabled = element(by.css("button[class*='adf-pagination__next-button'][disabled]"));
-    var previousButtonDisabled = element(by.css("button[class*='adf-pagination__previous-button'][disabled]"));
-    var pageDropDown = element(by.css("div[class*='adf-pagination__actualinfo-block'] button"));
-    var pageDropDownOptions = by.css("div[class*='mat-menu-content'] button");
-    var paginationSection = element(by.css("adf-pagination"));
-    var paginationSectionEmpty = element(by.css("adf-pagination[class*='adf-pagination__empty']"));
-    var totalFiles = element(by.css('span[class="adf-pagination__range"]'));
-
-    this.selectItemsPerPage = function (item) {
-        Util.waitUntilElementIsVisible(itemsPerPageDropdown);
-        Util.waitUntilElementIsClickable(itemsPerPageDropdown);
-        browser.actions().mouseMove(itemsPerPageDropdown).perform();
-        Util.waitUntilElementIsVisible(itemsPerPageDropdown);
-        Util.waitUntilElementIsClickable(itemsPerPageDropdown).then(()=>{
-            browser.driver.sleep(2000);
-            itemsPerPageDropdown.click();
-        });
-        Util.waitUntilElementIsVisible(pageSelectorDropDown);
-
-        var itemsPerPage = element.all(by.cssContainingText(".mat-menu-item", item)).first();
-        Util.waitUntilElementIsClickable(itemsPerPage);
-        Util.waitUntilElementIsVisible(itemsPerPage);
-        itemsPerPage.click();
-        return this;
-    };
-
-    this.checkPageSelectorIsNotDisplayed = function() {
-        Util.waitUntilElementIsNotOnPage(pageSelectorArrow);
-    };
-
-    this.checkPageSelectorIsDisplayed = function() {
-        Util.waitUntilElementIsVisible(pageSelectorArrow);
-    };
-
-    this.checkPaginationIsNotDisplayed = function () {
-        Util.waitUntilElementIsOnPage(paginationSectionEmpty);
-        return this;
-    };
-
-    this.getCurrentItemsPerPage = function () {
-        Util.waitUntilElementIsVisible(itemsPerPage);
-        return itemsPerPage.getText();
-    };
-
-    this.getCurrentPage = function () {
-        Util.waitUntilElementIsVisible(paginationSection);
-        Util.waitUntilElementIsVisible(currentPage);
-        return currentPage.getText();
-    };
-
-    this.getTotalPages = function () {
-        Util.waitUntilElementIsVisible(totalPages);
-        return totalPages.getText();
-    };
-
-    this.getPaginationRange = function () {
-        Util.waitUntilElementIsVisible(paginationRange);
-        return paginationRange.getText();
-    };
-
-    this.clickOnNextPage = function () {
-        Util.waitUntilElementIsVisible(nextPageButton);
-        Util.waitUntilElementIsClickable(nextPageButton);
-        browser.actions().mouseMove(nextPageButton).perform();
-        Util.waitUntilElementIsVisible(nextPageButton);
-        Util.waitUntilElementIsClickable(nextPageButton).then(()=> {
-            browser.driver.sleep(2000);
-        });
-        return nextPageButton.click();
-    };
-
-    this.clickOnPageDropdown = function () {
-        Util.waitUntilElementIsVisible(pageDropDown);
-        Util.waitUntilElementIsClickable(pageDropDown);
-        return pageDropDown.click();
-    };
-
-    this.clickOnPageDropdownOption = function (item) {
-        Util.waitUntilElementIsVisible(element.all(pageDropDownOptions).first());
-        var option = element(by.cssContainingText("div[class*='mat-menu-content'] button", item));
-        Util.waitUntilElementIsVisible(option);
-        option.click();
-        return this;
-    };
-
-    this.getPageDropdownOptions = function() {
-        var deferred = protractor.promise.defer();
-        Util.waitUntilElementIsVisible(element.all(pageDropDownOptions).first());
-        var initialList = [];
-        element.all(pageDropDownOptions).each(function(element) {
-            element.getText().then(function(text) {
-                if(text !== '') {
-                    initialList.push(text);
-                }
-            });
-        }).then(function () {
-            deferred.fulfill(initialList);
-        });
-        return deferred.promise;
-    };
-
-    this.checkNextPageButtonIsDisabled = function() {
-        Util.waitUntilElementIsVisible(nextButtonDisabled);
-    };
-
-    this.checkPreviousPageButtonIsDisabled = function() {
-        Util.waitUntilElementIsVisible(previousButtonDisabled);
-    };
-
-    this.checkNextPageButtonIsEnabled = function() {
-        Util.waitUntilElementIsNotOnPage(nextButtonDisabled);
-    };
-
-    this.checkPreviousPageButtonIsEnabled = function() {
-        Util.waitUntilElementIsNotOnPage(previousButtonDisabled);
-    };
-
-    this.getTotalNumberOfFiles = function () {
-        Util.waitUntilElementIsVisible(totalFiles);
-        var numberOfFiles = totalFiles.getText().then(function (totalNumber) {
-            var totalNumberOfFiles = totalNumber.split('of ')[1];
-          return totalNumberOfFiles;
-        });
-
-        return numberOfFiles;
-    }
-};
-
-module.exports = PaginationPage;
-
diff --git a/e2e/pages/adf/paginationPage.ts b/e2e/pages/adf/paginationPage.ts
new file mode 100644
index 0000000000..52e89ded10
--- /dev/null
+++ b/e2e/pages/adf/paginationPage.ts
@@ -0,0 +1,157 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Util } from '../../util/util';
+import { browser, by, element, protractor } from 'protractor';
+
+export class PaginationPage {
+
+    itemsPerPageDropdown = element(by.css('div[class*="adf-pagination__perpage-block"] button'));
+    pageSelectorDropDown = element(by.css('div[class*="adf-pagination__page-selector"]'));
+    pageSelectorArrow = element(by.css('button[aria-label="Current page selector"]'));
+    itemsPerPage = element(by.css('span[class="adf-pagination__max-items"]'));
+    currentPage = element(by.css('span[class="adf-pagination__current-page"]'));
+    totalPages = element(by.css('span[class="adf-pagination__total-pages"]'));
+    paginationRange = element(by.css('span[class="adf-pagination__range"]'));
+    nextPageButton = element(by.css('button[class*="adf-pagination__next-button"]'));
+    nextButtonDisabled = element(by.css('button[class*="adf-pagination__next-button"][disabled]'));
+    previousButtonDisabled = element(by.css('button[class*="adf-pagination__previous-button"][disabled]'));
+    pageDropDown = element(by.css('div[class*="adf-pagination__actualinfo-block"] button'));
+    pageDropDownOptions = by.css('div[class*="mat-menu-content"] button');
+    paginationSection = element(by.css('adf-pagination'));
+    paginationSectionEmpty = element(by.css('adf-pagination[class*="adf-pagination__empty"]'));
+    totalFiles = element(by.css('span[class="adf-pagination__range"]'));
+
+    selectItemsPerPage(numberOfItem: string) {
+        Util.waitUntilElementIsVisible(this.itemsPerPageDropdown);
+        Util.waitUntilElementIsClickable(this.itemsPerPageDropdown);
+        browser.actions().mouseMove(this.itemsPerPageDropdown).perform();
+        Util.waitUntilElementIsVisible(this.itemsPerPageDropdown);
+        Util.waitUntilElementIsClickable(this.itemsPerPageDropdown).then(() => {
+            browser.driver.sleep(2000);
+            this.itemsPerPageDropdown.click();
+        });
+        Util.waitUntilElementIsVisible(this.pageSelectorDropDown);
+
+        let itemsPerPage = element.all(by.cssContainingText('.mat-menu-item', numberOfItem)).first();
+        Util.waitUntilElementIsClickable(itemsPerPage);
+        Util.waitUntilElementIsVisible(itemsPerPage);
+        itemsPerPage.click();
+        return this;
+    }
+
+    checkPageSelectorIsNotDisplayed() {
+        Util.waitUntilElementIsNotOnPage(this.pageSelectorArrow);
+    }
+
+    checkPageSelectorIsDisplayed() {
+        Util.waitUntilElementIsVisible(this.pageSelectorArrow);
+    }
+
+    checkPaginationIsNotDisplayed() {
+        Util.waitUntilElementIsOnPage(this.paginationSectionEmpty);
+        return this;
+    }
+
+    getCurrentItemsPerPage() {
+        Util.waitUntilElementIsVisible(this.itemsPerPage);
+        return this.itemsPerPage.getText();
+    }
+
+    getCurrentPage() {
+        Util.waitUntilElementIsVisible(this.paginationSection);
+        Util.waitUntilElementIsVisible(this.currentPage);
+        return this.currentPage.getText();
+    }
+
+    getTotalPages() {
+        Util.waitUntilElementIsVisible(this.totalPages);
+        return this.totalPages.getText();
+    }
+
+    getPaginationRange() {
+        Util.waitUntilElementIsVisible(this.paginationRange);
+        return this.paginationRange.getText();
+    }
+
+    clickOnNextPage() {
+        Util.waitUntilElementIsVisible(this.nextPageButton);
+        Util.waitUntilElementIsClickable(this.nextPageButton);
+        browser.actions().mouseMove(this.nextPageButton).perform();
+        Util.waitUntilElementIsVisible(this.nextPageButton);
+        Util.waitUntilElementIsClickable(this.nextPageButton).then(() => {
+            browser.driver.sleep(2000);
+        });
+        return this.nextPageButton.click();
+    }
+
+    clickOnPageDropdown() {
+        Util.waitUntilElementIsVisible(this.pageDropDown);
+        Util.waitUntilElementIsClickable(this.pageDropDown);
+        return this.pageDropDown.click();
+    }
+
+    clickOnPageDropdownOption(numberOfItemPerPage: string) {
+        Util.waitUntilElementIsVisible(element.all(this.pageDropDownOptions).first());
+        let option = element(by.cssContainingText('div[class*="mat-menu-content"] button', numberOfItemPerPage));
+        Util.waitUntilElementIsVisible(option);
+        option.click();
+        return this;
+    }
+
+    getPageDropdownOptions() {
+        let deferred = protractor.promise.defer();
+        Util.waitUntilElementIsVisible(element.all(this.pageDropDownOptions).first());
+        let initialList = [];
+        element.all(this.pageDropDownOptions).each(function (currentOption) {
+            currentOption.getText().then(function (text) {
+                if (text !== '') {
+                    initialList.push(text);
+                }
+            });
+        }).then(function () {
+            deferred.fulfill(initialList);
+        });
+        return deferred.promise;
+    }
+
+    checkNextPageButtonIsDisabled() {
+        Util.waitUntilElementIsVisible(this.nextButtonDisabled);
+    }
+
+    checkPreviousPageButtonIsDisabled() {
+        Util.waitUntilElementIsVisible(this.previousButtonDisabled);
+    }
+
+    checkNextPageButtonIsEnabled() {
+        Util.waitUntilElementIsNotOnPage(this.nextButtonDisabled);
+    }
+
+    checkPreviousPageButtonIsEnabled() {
+        Util.waitUntilElementIsNotOnPage(this.previousButtonDisabled);
+    }
+
+    getTotalNumberOfFiles() {
+        Util.waitUntilElementIsVisible(this.totalFiles);
+        let numberOfFiles = this.totalFiles.getText().then(function (totalNumber) {
+            let totalNumberOfFiles = totalNumber.split('of ')[1];
+            return totalNumberOfFiles;
+        });
+
+        return numberOfFiles;
+    }
+}
diff --git a/e2e/pages/adf/permissionsPage.ts b/e2e/pages/adf/permissionsPage.ts
index 6a93f05c13..670215db8d 100644
--- a/e2e/pages/adf/permissionsPage.ts
+++ b/e2e/pages/adf/permissionsPage.ts
@@ -17,7 +17,7 @@
 
 import { element, by } from 'protractor';
 
-import Util = require('../../util/util');
+import { Util } from '../../util/util';
 
 export class PermissionsPage {
 
diff --git a/e2e/pages/adf/process_cloud/appListCloudComponent.ts b/e2e/pages/adf/process_cloud/appListCloudComponent.ts
index 7892fd5bd9..51e5bc4ae2 100644
--- a/e2e/pages/adf/process_cloud/appListCloudComponent.ts
+++ b/e2e/pages/adf/process_cloud/appListCloudComponent.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import Util = require('../../../util/util');
+import { Util } from '../../../util/util';
 
 import { element, by } from 'protractor';
 
diff --git a/e2e/pages/adf/process_cloud/taskFiltersCloudComponent.ts b/e2e/pages/adf/process_cloud/taskFiltersCloudComponent.ts
index b236be3dba..862d625dc5 100644
--- a/e2e/pages/adf/process_cloud/taskFiltersCloudComponent.ts
+++ b/e2e/pages/adf/process_cloud/taskFiltersCloudComponent.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import Util = require('../../../util/util');
+import { Util } from '../../../util/util';
 import { by } from 'protractor';
 
 export class TaskFiltersCloudComponent {
diff --git a/e2e/pages/adf/process_cloud/taskListCloudComponent.ts b/e2e/pages/adf/process_cloud/taskListCloudComponent.ts
index 9b485cbd8b..8f2aa12356 100644
--- a/e2e/pages/adf/process_cloud/taskListCloudComponent.ts
+++ b/e2e/pages/adf/process_cloud/taskListCloudComponent.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import Util = require('../../../util/util');
-import DataTablePage = require('../dataTablePage');
+import { Util } from '../../../util/util';
+import { DataTablePage } from '../dataTablePage';
 import { element, by } from 'protractor';
 
 export class TaskListCloudComponent {
 
     taskList = element(by.css('adf-tasklist'));
-    noTasksFound = element(by.css("p[class='adf-empty-content__title']"));
+    noTasksFound = element.all(by.css("p[class='adf-empty-content__title']")).first();
 
     dataTable = new DataTablePage(this.taskList);
 
diff --git a/e2e/pages/adf/process_services/analyticsPage.js b/e2e/pages/adf/process_services/analyticsPage.js
deleted file mode 100644
index b6f674eda3..0000000000
--- a/e2e/pages/adf/process_services/analyticsPage.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var Util = require('../../../util/util');
-
-var AnalyticsPage = function () {
-
-    var toolbarTitleInput = element(by.css("input[data-automation-id='reportName']"));
-    var toolbarTitleContainer = element(by.css("div[class='adf-report-title ng-star-inserted']"));
-    var toolbarTitle =  element(by.xpath("//mat-toolbar/adf-toolbar-title/div/h4"));
-    var reportContainer = element(by.css("div[class='adf-report-report-container']"));
-    var reportMessage = element(by.css("div[class='ng-star-inserted'] span"));
-
-    this.getReport = function (title) {
-        var reportTitle = element(by.css(`mat-icon[data-automation-id="${title}_filter"]`));
-        Util.waitUntilElementIsVisible(reportTitle);
-        reportTitle.click();
-    };
-
-    this.changeReportTitle = function (title) {
-        Util.waitUntilElementIsVisible(reportContainer);
-        Util.waitUntilElementIsVisible(toolbarTitleContainer);
-        Util.waitUntilElementIsClickable(toolbarTitleContainer);
-        toolbarTitleContainer.click();
-        Util.waitUntilElementIsVisible(toolbarTitleInput);
-        toolbarTitleInput.click();
-        this.clearReportTitle();
-        toolbarTitleInput.sendKeys(title);
-        toolbarTitleInput.sendKeys(protractor.Key.ENTER);
-    };
-
-    this.clearReportTitle = function() {
-        Util.waitUntilElementIsVisible(toolbarTitleInput);
-        toolbarTitleInput.getAttribute('value').then( function (value) {
-            var i;
-            for (i = value.length; i >= 0; i--) {
-                toolbarTitleInput.sendKeys(protractor.Key.BACK_SPACE);
-            }
-        });
-        Util.waitUntilElementIsVisible(toolbarTitleInput);
-    }
-
-    this.getReportTitle = function () {
-        Util.waitUntilElementIsVisible(toolbarTitle);
-        return toolbarTitle.getText();
-    };
-
-    this.checkNoReportMessage = function () {
-        Util.waitUntilElementIsVisible(reportMessage);
-    };
-
-};
-
-module.exports = AnalyticsPage;
-
diff --git a/e2e/pages/adf/process_services/analyticsPage.ts b/e2e/pages/adf/process_services/analyticsPage.ts
new file mode 100644
index 0000000000..9c93119c56
--- /dev/null
+++ b/e2e/pages/adf/process_services/analyticsPage.ts
@@ -0,0 +1,66 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Util } from '../../../util/util';
+
+export class AnalyticsPage {
+
+    toolbarTitleInput = element(by.css('input[data-automation-id="reportName"]'));
+    toolbarTitleContainer = element(by.css('div[class="adf-report-title ng-star-inserted"]'));
+    toolbarTitle = element(by.xpath('//mat-toolbar/adf-toolbar-title/div/h4'));
+    reportContainer = element(by.css('div[class="adf-report-report-container"]'));
+    reportMessage = element(by.css('div[class="ng-star-inserted"] span'));
+
+    getReport(title) {
+        let reportTitle = element(by.css(`mat-icon[data-automation-id="${title}_filter"]`));
+        Util.waitUntilElementIsVisible(reportTitle);
+        reportTitle.click();
+    }
+
+    changeReportTitle(title) {
+        Util.waitUntilElementIsVisible(this.reportContainer);
+        Util.waitUntilElementIsVisible(this.toolbarTitleContainer);
+        Util.waitUntilElementIsClickable(this.toolbarTitleContainer);
+        this.toolbarTitleContainer.click();
+        Util.waitUntilElementIsVisible(this.toolbarTitleInput);
+        this.toolbarTitleInput.click();
+        this.clearReportTitle();
+        this.toolbarTitleInput.sendKeys(title);
+        this.toolbarTitleInput.sendKeys(protractor.Key.ENTER);
+    }
+
+    clearReportTitle() {
+        Util.waitUntilElementIsVisible(this.toolbarTitleInput);
+        this.toolbarTitleInput.getAttribute('value').then((value) => {
+            let i;
+            for (i = value.length; i >= 0; i--) {
+                this.toolbarTitleInput.sendKeys(protractor.Key.BACK_SPACE);
+            }
+        });
+        Util.waitUntilElementIsVisible(this.toolbarTitleInput);
+    }
+
+    getReportTitle() {
+        Util.waitUntilElementIsVisible(this.toolbarTitle);
+        return this.toolbarTitle.getText();
+    }
+
+    checkNoReportMessage() {
+        Util.waitUntilElementIsVisible(this.reportMessage);
+    }
+
+}
diff --git a/e2e/pages/adf/process_services/appNavigationBarPage.ts b/e2e/pages/adf/process_services/appNavigationBarPage.ts
index 0a365eaea5..f09e461a27 100644
--- a/e2e/pages/adf/process_services/appNavigationBarPage.ts
+++ b/e2e/pages/adf/process_services/appNavigationBarPage.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import Util = require('../../../util/util');
+import { Util } from '../../../util/util';
 import { element, by } from 'protractor';
 
 export class AppNavigationBarPage {
@@ -29,11 +29,13 @@ export class AppNavigationBarPage {
 
     clickTasksButton() {
         Util.waitUntilElementIsVisible(this.tasksButton);
-        return this.tasksButton.click();
+        this.tasksButton.click();
+        return browser.sleep(400);
     }
 
     clickProcessButton() {
-        return this.processButton.click();
+        this.processButton.click();
+        return browser.sleep(400);
     }
 
     clickTagButton() {
@@ -41,7 +43,8 @@ export class AppNavigationBarPage {
     }
 
     clickSettingsButton() {
-        return this.settingsButton.click();
+        this.settingsButton.click();
+        return browser.sleep(400);
     }
 
     clickReportsButton() {
diff --git a/e2e/pages/adf/process_services/attachFormPage.ts b/e2e/pages/adf/process_services/attachFormPage.ts
index db65655c45..a418954e13 100644
--- a/e2e/pages/adf/process_services/attachFormPage.ts
+++ b/e2e/pages/adf/process_services/attachFormPage.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import Util = require('../../../util/util');
+import { Util } from '../../../util/util';
 import { element, by } from 'protractor';
 
 export class AttachFormPage {
diff --git a/e2e/pages/adf/process_services/attachmentListPage.ts b/e2e/pages/adf/process_services/attachmentListPage.ts
index 7f85406282..901b05f94b 100644
--- a/e2e/pages/adf/process_services/attachmentListPage.ts
+++ b/e2e/pages/adf/process_services/attachmentListPage.ts
@@ -17,7 +17,7 @@
 
 import { element, by, protractor, browser } from 'protractor';
 
-import Util = require('../../../util/util');
+import { Util } from '../../../util/util';
 import TestConfig = require('../../../test.config');
 import path = require('path');
 import remote = require('selenium-webdriver/remote');
diff --git a/e2e/pages/adf/process_services/dialog/createChecklistDialog.js b/e2e/pages/adf/process_services/dialog/createChecklistDialog.js
deleted file mode 100644
index df014edfca..0000000000
--- a/e2e/pages/adf/process_services/dialog/createChecklistDialog.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var Util = require('../../../../util/util');
-
-var ChecklistDialog = function () {
-
-    var nameField = element(by.css("input[data-automation-id='checklist-name']"));
-    var addChecklistButton = element(by.css("button[id='add-check'] span"));
-    var closeButton = element(by.css("button[id='close-check-dialog'] span"));
-    var dialogTitle = element(by.id("add-checklist-title"));
-
-    this.addName = function (name) {
-        Util.waitUntilElementIsVisible(nameField);
-        nameField.sendKeys(name);
-        return this;
-    };
-
-    this.clickCreateChecklistButton = function () {
-        Util.waitUntilElementIsVisible(addChecklistButton);
-        addChecklistButton.click();
-    };
-
-    this.clickCancelButton = function () {
-        Util.waitUntilElementIsVisible(closeButton);
-        closeButton.click();
-    };
-
-    this.getDialogTitle = function () {
-        Util.waitUntilElementIsVisible(dialogTitle);
-        return dialogTitle.getText();
-    };
-
-    this.getNameFieldPlaceholder = function () {
-        Util.waitUntilElementIsVisible(nameField);
-        return nameField.getAttribute('placeholder');
-    };
-
-    this.checkCancelButtonIsEnabled = function () {
-        Util.waitUntilElementIsVisible(closeButton);
-        Util.waitUntilElementIsClickable(closeButton);
-        return this;
-    };
-
-    this.checkAddChecklistButtonIsEnabled = function () {
-        Util.waitUntilElementIsVisible(addChecklistButton);
-        Util.waitUntilElementIsClickable(addChecklistButton);
-        return this;
-    };
-
-};
-module.exports = ChecklistDialog;
diff --git a/e2e/pages/adf/process_services/dialog/createChecklistDialog.ts b/e2e/pages/adf/process_services/dialog/createChecklistDialog.ts
new file mode 100644
index 0000000000..92e2b04803
--- /dev/null
+++ b/e2e/pages/adf/process_services/dialog/createChecklistDialog.ts
@@ -0,0 +1,66 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { element, by } from 'protractor';
+import { Util } from '../../../../util/util';
+
+export class ChecklistDialog {
+
+    nameField = element(by.css('input[data-automation-id="checklist-name"]'));
+    addChecklistButton = element(by.css('button[id="add-check"] span'));
+    closeButton = element(by.css('button[id="close-check-dialog"] span'));
+    dialogTitle = element(by.id('add-checklist-title'));
+
+    addName(name) {
+        Util.waitUntilElementIsVisible(this.nameField);
+        this.nameField.sendKeys(name);
+        return this;
+    }
+
+    clickCreateChecklistButton() {
+        Util.waitUntilElementIsVisible(this.addChecklistButton);
+        this.addChecklistButton.click();
+    }
+
+    clickCancelButton() {
+        Util.waitUntilElementIsVisible(this.closeButton);
+        this.closeButton.click();
+    }
+
+    getDialogTitle() {
+        Util.waitUntilElementIsVisible(this.dialogTitle);
+        return this.dialogTitle.getText();
+    }
+
+    getNameFieldPlaceholder() {
+        Util.waitUntilElementIsVisible(this.nameField);
+        return this.nameField.getAttribute('placeholder');
+    }
+
+    checkCancelButtonIsEnabled() {
+        Util.waitUntilElementIsVisible(this.closeButton);
+        Util.waitUntilElementIsClickable(this.closeButton);
+        return this;
+    }
+
+    checkAddChecklistButtonIsEnabled() {
+        Util.waitUntilElementIsVisible(this.addChecklistButton);
+        Util.waitUntilElementIsClickable(this.addChecklistButton);
+        return this;
+    }
+
+}
diff --git a/e2e/pages/adf/process_services/dialog/startTaskDialog.js b/e2e/pages/adf/process_services/dialog/startTaskDialog.js
deleted file mode 100644
index 607bea4d2a..0000000000
--- a/e2e/pages/adf/process_services/dialog/startTaskDialog.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var Util = require('../../../../util/util');
-
-var StartTaskDialog = function () {
-
-    var name = element(by.css("input[id='name_id']"));
-    var dueDate = element(by.css("input[id='date_id']"));
-    var description = element(by.css("textarea[id='description_id']"));
-    var assignee = element(by.css("div#people-widget-content input"));
-    var formDropDown = element(by.css("mat-select[id='form_id']"));
-    var startButton = element(by.css("button[id='button-start']"));
-    var startButtonEnabled = element(by.css("button[id='button-start']:not(disabled)"));
-    var cancelButton = element(by.css("button[id='button-cancel']"));
-    var removeAssigneeIcon = element(by.css("button[data-automation-id='adf-people-selector-deselect']"));
-
-    this.addName = function (userName) {
-        Util.waitUntilElementIsVisible(name);
-        name.clear();
-        name.sendKeys(userName);
-        return this;
-    };
-
-    this.addDescription = function (userDescription) {
-        Util.waitUntilElementIsVisible(description);
-        description.sendKeys(userDescription);
-        return this;
-    };
-
-    this.addDueDate = function (date) {
-        Util.waitUntilElementIsVisible(dueDate);
-        dueDate.sendKeys(date);
-        return this;
-    };
-
-    this.addAssignee = function (name) {
-        Util.waitUntilElementIsVisible(assignee);
-        assignee.sendKeys(name);
-        this.selectAssigneeFromList(name);
-        return this;
-    };
-
-    this.selectAssigneeFromList = function (name) {
-        var assigneeRow = element(by.cssContainingText("mat-option span.adf-people-label-name", name));
-        Util.waitUntilElementIsVisible(assigneeRow);
-        assigneeRow.click();
-        Util.waitUntilElementIsNotVisible(assigneeRow);
-        return this;
-    };
-
-    this.getAssignee = function () {
-        Util.waitUntilElementIsVisible(assignee);
-        return assignee.getAttribute('placeholder');
-    };
-
-    this.addForm = function (form) {
-        Util.waitUntilElementIsVisible(formDropDown);
-        formDropDown.click();
-        return this.selectForm(form);
-    };
-
-    this.selectForm = function (form) {
-        var option = element(by.cssContainingText("span[class*='mat-option-text']", form));
-        Util.waitUntilElementIsVisible(option);
-        Util.waitUntilElementIsClickable(option);
-        option.click();
-        return this;
-    };
-
-    this.clickStartButton = function () {
-        Util.waitUntilElementIsVisible(startButton);
-        Util.waitUntilElementIsClickable(startButton);
-        return startButton.click();
-    };
-
-    this.checkStartButtonIsEnabled = function () {
-        Util.waitUntilElementIsVisible(startButtonEnabled);
-        return this;
-    };
-
-    this.checkStartButtonIsDisabled = function () {
-        Util.waitUntilElementIsVisible(startButton.getAttribute("disabled"));
-        return this;
-    };
-
-    this.clickCancelButton = function () {
-        Util.waitUntilElementIsVisible(cancelButton);
-        Util.waitUntilElementIsClickable(cancelButton);
-        return cancelButton.click();
-    };
-};
-
-module.exports = StartTaskDialog;
diff --git a/e2e/pages/adf/process_services/dialog/startTaskDialog.ts b/e2e/pages/adf/process_services/dialog/startTaskDialog.ts
new file mode 100644
index 0000000000..4561011fc4
--- /dev/null
+++ b/e2e/pages/adf/process_services/dialog/startTaskDialog.ts
@@ -0,0 +1,106 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { element, by } from 'protractor';
+import { Util } from '../../../../util/util';
+
+export class StartTaskDialog {
+
+    name = element(by.css('input[id="name_id"]'));
+    dueDate = element(by.css('input[id="date_id"]'));
+    description = element(by.css('textarea[id="description_id"]'));
+    assignee = element(by.css('div#people-widget-content input'));
+    formDropDown = element(by.css('mat-select[id="form_id"]'));
+    startButton = element(by.css('button[id="button-start"]'));
+    startButtonEnabled = element(by.css('button[id="button-start"]:not(disabled)'));
+    cancelButton = element(by.css('button[id="button-cancel"]'));
+
+    addName(userName) {
+        Util.waitUntilElementIsVisible(this.name);
+        this.name.clear();
+        this.name.sendKeys(userName);
+        return this;
+    }
+
+    addDescription(userDescription) {
+        Util.waitUntilElementIsVisible(this.description);
+        this.description.sendKeys(userDescription);
+        return this;
+    }
+
+    addDueDate(date) {
+        Util.waitUntilElementIsVisible(this.dueDate);
+        this.dueDate.sendKeys(date);
+        return this;
+    }
+
+    addAssignee(name) {
+        Util.waitUntilElementIsVisible(this.assignee);
+        this.assignee.sendKeys(name);
+        this.selectAssigneeFromList(name);
+        return this;
+    }
+
+    selectAssigneeFromList(name) {
+        let assigneeRow = element(by.cssContainingText('mat-option span.adf-people-label-name', name));
+        Util.waitUntilElementIsVisible(assigneeRow);
+        assigneeRow.click();
+        Util.waitUntilElementIsNotVisible(assigneeRow);
+        return this;
+    }
+
+    getAssignee() {
+        Util.waitUntilElementIsVisible(this.assignee);
+        return this.assignee.getAttribute('placeholder');
+    }
+
+    addForm(form) {
+        Util.waitUntilElementIsVisible(this.formDropDown);
+        this.formDropDown.click();
+        return this.selectForm(form);
+    }
+
+    selectForm(form) {
+        let option = element(by.cssContainingText('span[class*="mat-option-text"]', form));
+        Util.waitUntilElementIsVisible(option);
+        Util.waitUntilElementIsClickable(option);
+        option.click();
+        return this;
+    }
+
+    clickStartButton() {
+        Util.waitUntilElementIsVisible(this.startButton);
+        Util.waitUntilElementIsClickable(this.startButton);
+        return this.startButton.click();
+    }
+
+    checkStartButtonIsEnabled() {
+        Util.waitUntilElementIsVisible(this.startButtonEnabled);
+        return this;
+    }
+
+    checkStartButtonIsDisabled() {
+        Util.waitUntilElementIsVisible(this.startButton.getAttribute('disabled'));
+        return this;
+    }
+
+    clickCancelButton() {
+        Util.waitUntilElementIsVisible(this.cancelButton);
+        Util.waitUntilElementIsClickable(this.cancelButton);
+        return this.cancelButton.click();
+    }
+}
diff --git a/e2e/pages/adf/process_services/filtersPage.js b/e2e/pages/adf/process_services/filtersPage.js
deleted file mode 100644
index fe9d8dcd23..0000000000
--- a/e2e/pages/adf/process_services/filtersPage.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var Util = require('../../../util/util');
-var ContentList = require('../dialog/contentList');
-
-var FiltersPage = function () {
-
-    var activeFilter = element(by.css("mat-list-item[class*='active']"));
-    var nameColumn = by.css("div[class*='adf-datatable-body'] div[class*='adf-datatable-row'] div[class*='--text'] span");
-    var contentList = new ContentList();
-
-    this.getActiveFilter = function () {
-        Util.waitUntilElementIsVisible(activeFilter);
-        return activeFilter.getText();
-    };
-
-    this.goToFilter = function (filterName) {
-        var filter = element(by.css("span[data-automation-id='" + filterName + "_filter']"));
-        Util.waitUntilElementIsVisible(filter);
-        filter.click();
-        return this;
-    };
-
-    this.sortByName = function (sortOrder) {
-        contentList.sortByName(sortOrder);
-    };
-
-    this.getAllRowsNameColumn = function () {
-        return contentList.getAllRowsColumnValues(nameColumn);
-    };
-
-};
-
-module.exports = FiltersPage;
-
diff --git a/e2e/pages/adf/process_services/filtersPage.ts b/e2e/pages/adf/process_services/filtersPage.ts
new file mode 100644
index 0000000000..0214ca5911
--- /dev/null
+++ b/e2e/pages/adf/process_services/filtersPage.ts
@@ -0,0 +1,48 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { by, element } from 'protractor';
+import { Util } from '../../../util/util';
+import { ContentListPage } from '../dialog/contentListPage';
+
+export class FiltersPage {
+
+    activeFilter = element(by.css('mat-list-item[class*="active"]'));
+    nameColumn = by.css('div[class*="adf-datatable-body"] div[class*="adf-datatable-row"] div[class*="--text"] span');
+    contentList = new ContentListPage();
+
+    getActiveFilter() {
+        Util.waitUntilElementIsVisible(this.activeFilter);
+        return this.activeFilter.getText();
+    }
+
+    goToFilter(filterName) {
+        let filter = element(by.css(`span[data-automation-id="${filterName}_filter"]`));
+        Util.waitUntilElementIsVisible(filter);
+        filter.click();
+        return this;
+    }
+
+    sortByName(sortOrder) {
+        this.contentList.sortByName(sortOrder);
+    }
+
+    getAllRowsNameColumn() {
+        return this.contentList.getAllRowsColumnValues(this.nameColumn);
+    }
+
+}
diff --git a/e2e/pages/adf/process_services/formFields.js b/e2e/pages/adf/process_services/formFields.js
deleted file mode 100644
index e3d52a1a96..0000000000
--- a/e2e/pages/adf/process_services/formFields.js
+++ /dev/null
@@ -1,170 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var Util = require('../../../util/util');
-
-var FormFields = function () {
-
-    var formContent = element(by.css("adf-form"));
-    var refreshButton = element(by.css("div[class*='form-reload-button'] mat-icon"));
-    var saveButton = element(by.cssContainingText("mat-card-actions[class*='adf-form'] span", "SAVE"));
-    var valueLocator = by.css("input");
-    var labelLocator = by.css("label");
-    var noFormMessage = element(by.css("span[id*='no-form-message']"));
-    var completedTaskNoFormMessage = element(by.css("div[id*='completed-form-message'] p"));
-    var attachFormButton = element(by.id("adf-no-form-attach-form-button"));
-    var selectFormDropDownArrow = element.all(by.css("adf-attach-form div[class*='mat-select-arrow']")).first();
-    var selectFormContent = element(by.css("div[class*='mat-select-content']"));
-    var completeButton = element(by.id('adf-form-complete'));
-    var errorMessage = by.css('.adf-error-text-container .adf-error-text');
-
-    this.setFieldValue = function (By, field, value) {
-        var fieldElement =  element(By(field));
-        Util.waitUntilElementIsVisible(fieldElement);
-        fieldElement.clear().sendKeys(value);
-        return this;
-    };
-
-    this.checkWidgetIsVisible = function (fieldId) {
-        var fieldElement = element(by.css("adf-form-field div[id='field-"+fieldId+"-container']"));
-        Util.waitUntilElementIsVisible(fieldElement);
-    }
-
-    this.checkWidgetIsHidden = function (fieldId) {
-        var hiddenElement = element(by.css("adf-form-field div[id='field-"+fieldId+"-container'][hidden]"));
-        Util.waitUntilElementIsVisible(hiddenElement);
-    }
-
-    this.getWidget = function (fieldId) {
-        var widget = element(by.css("adf-form-field div[id='field-" + fieldId + "-container']"));
-        Util.waitUntilElementIsVisible(widget);
-        return widget;
-    };
-
-    this.getFieldValue = function (fieldId, valueLocatorParam) {
-        var value = this.getWidget(fieldId).element(valueLocatorParam || valueLocator);
-        Util.waitUntilElementIsVisible(value);
-        return value.getAttribute('value');
-    };
-
-    this.getFieldLabel = function (fieldId, labelLocatorParam) {
-        var label = this.getWidget(fieldId).element(labelLocatorParam || labelLocator);
-        Util.waitUntilElementIsVisible(label);
-        return label.getText();
-    };
-
-    this.getFieldErrorMessage = function (fieldId) {
-        var error = this.getWidget(fieldId).element(errorMessage);
-        return error.getText();
-    }
-
-    this.getFieldText = function (fieldId, labelLocatorParam) {
-        var label = this.getWidget(fieldId).element(labelLocatorParam || labelLocator);
-        Util.waitUntilElementIsVisible(label);
-        return label.getText();
-    };
-
-    this.getFieldPlaceHolder = function (fieldId, locator='input') {
-        let placeHolderLocator = element(by.css(`${locator}#${fieldId}`)).getAttribute('placeholder');
-        Util.waitUntilElementIsVisible(placeHolderLocator);
-        return placeHolderLocator;
-    };
-
-    this.checkFieldValue = function (By, field, val) {
-        Util.waitUntilElementHasValue(element(By(field)), val);
-        return this;
-    };
-
-    this.refreshForm = function () {
-        Util.waitUntilElementIsVisible(refreshButton);
-        refreshButton.click();
-        return this;
-    };
-
-    this.saveForm = function () {
-        Util.waitUntilElementIsVisible(saveButton);
-        Util.waitUntilElementIsClickable(saveButton);
-        saveButton.click();
-        return this;
-    };
-
-    this.noFormIsDisplayed = function () {
-        Util.waitUntilElementIsNotOnPage(formContent);
-        return this;
-    };
-
-    this.checkFormIsDisplayed = function () {
-        Util.waitUntilElementIsVisible(formContent);
-        return this;
-    };
-
-    this.getNoFormMessage = function () {
-        Util.waitUntilElementIsVisible(noFormMessage);
-        return noFormMessage.getText();
-    };
-
-    this.getCompletedTaskNoFormMessage = function () {
-        Util.waitUntilElementIsVisible(completedTaskNoFormMessage);
-        return completedTaskNoFormMessage.getText();
-    };
-
-    this.clickOnAttachFormButton = function () {
-        Util.waitUntilElementIsVisible(attachFormButton);
-        attachFormButton.click();
-        return this;
-    };
-
-    this.selectForm = function (formName) {
-        Util.waitUntilElementIsVisible(selectFormDropDownArrow);
-        selectFormDropDownArrow.click();
-        Util.waitUntilElementIsVisible(selectFormContent);
-        this.selectFormFromDropDown(formName);
-        return this;
-    };
-
-    this.selectFormFromDropDown = function (formName) {
-        var formNameElement = element(by.cssContainingText("span", formName));
-        Util.waitUntilElementIsVisible(formNameElement);
-        formNameElement.click();
-    };
-
-    this.checkWidgetIsReadOnlyMode = function (fieldId) {
-        var widget = element(by.css("adf-form-field div[id='field-" + fieldId + "-container']"));
-        var widgetReadOnly = widget.element(by.css('div[class*="adf-readonly"]'));
-        Util.waitUntilElementIsVisible(widgetReadOnly);
-        return widgetReadOnly;
-    };
-
-    this.completeForm = function () {
-        Util.waitUntilElementIsVisible(completeButton);
-        return completeButton.click();
-    };
-
-    this.setValueInInputById = function(fieldId, value) {
-        let input = element(by.id(fieldId));
-        Util.waitUntilElementIsVisible(input);
-        input.clear().sendKeys(value);
-        return this;
-    }
-
-    this.isCompleteFormButtonDisabled = function() {
-        Util.waitUntilElementIsVisible(completeButton);
-        return completeButton.getAttribute('disabled');
-    }
-};
-
-module.exports = FormFields;
diff --git a/e2e/pages/adf/process_services/formFields.ts b/e2e/pages/adf/process_services/formFields.ts
new file mode 100644
index 0000000000..5cf915548b
--- /dev/null
+++ b/e2e/pages/adf/process_services/formFields.ts
@@ -0,0 +1,169 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Util } from '../../../util/util';
+import { by, element } from 'protractor';
+
+export class FormFields {
+
+    formContent = element(by.css('adf-form'));
+    refreshButton = element(by.css('div[class*="form-reload-button"] mat-icon'));
+    saveButton = element(by.cssContainingText('mat-card-actions[class*="adf-for"] span', 'SAVE'));
+    valueLocator = by.css('input');
+    labelLocator = by.css('label');
+    noFormMessage = element(by.css('span[id*="no-form-message"]'));
+    completedTaskNoFormMessage = element(by.css('div[id*="completed-form-message"] p'));
+    attachFormButton = element(by.id('adf-no-form-attach-form-button'));
+    selectFormDropDownArrow = element.all(by.css('adf-attach-form div[class*="mat-select-arrow"]')).first();
+    selectFormContent = element(by.css('div[class*="mat-select-content"]'));
+    completeButton = element(by.id('adf-form-complete'));
+    errorMessage = by.css('.adf-error-text-container .adf-error-text');
+
+    setFieldValue(locator, field, value) {
+        let fieldElement = element(locator(field));
+        Util.waitUntilElementIsVisible(fieldElement);
+        fieldElement.clear().sendKeys(value);
+        return this;
+    }
+
+    checkWidgetIsVisible(fieldId) {
+        let fieldElement = element.all(by.css(`adf-form-field div[id='field-${fieldId}-container']`)).first();
+        Util.waitUntilElementIsVisible(fieldElement);
+    }
+
+    checkWidgetIsHidden(fieldId) {
+        let hiddenElement = element(by.css(`adf-form-field div[id='field-${fieldId}-container'][hidden]`));
+        Util.waitUntilElementIsVisible(hiddenElement);
+    }
+
+    getWidget(fieldId) {
+        let widget = element(by.css(`adf-form-field div[id='field-${fieldId}-container']`));
+        Util.waitUntilElementIsVisible(widget);
+        return widget;
+    }
+
+    getFieldValue(fieldId, valueLocatorParam) {
+        let value = this.getWidget(fieldId).element(valueLocatorParam || this.valueLocator);
+        Util.waitUntilElementIsVisible(value);
+        return value.getAttribute('value');
+    }
+
+    getFieldLabel(fieldId, labelLocatorParam) {
+        let label = this.getWidget(fieldId).all(labelLocatorParam || this.labelLocator).first();
+        Util.waitUntilElementIsVisible(label);
+        return label.getText();
+    }
+
+    getFieldErrorMessage(fieldId) {
+        let error = this.getWidget(fieldId).element(this.errorMessage);
+        return error.getText();
+    }
+
+    getFieldText(fieldId, labelLocatorParam) {
+        let label = this.getWidget(fieldId).element(labelLocatorParam || this.labelLocator);
+        Util.waitUntilElementIsVisible(label);
+        return label.getText();
+    }
+
+    getFieldPlaceHolder(fieldId, locator = 'input') {
+        let placeHolderLocator = element(by.css(`${locator}#${fieldId}`)).getAttribute('placeholder');
+        Util.waitUntilElementIsVisible(placeHolderLocator);
+        return placeHolderLocator;
+    }
+
+    checkFieldValue(locator, field, val) {
+        Util.waitUntilElementHasValue(element(locator(field)), val);
+        return this;
+    }
+
+    refreshForm() {
+        Util.waitUntilElementIsVisible(this.refreshButton);
+        this.refreshButton.click();
+        return this;
+    }
+
+    saveForm() {
+        Util.waitUntilElementIsVisible(this.saveButton);
+        Util.waitUntilElementIsClickable(this.saveButton);
+        this.saveButton.click();
+        return this;
+    }
+
+    noFormIsDisplayed() {
+        Util.waitUntilElementIsNotOnPage(this.formContent);
+        return this;
+    }
+
+    checkFormIsDisplayed() {
+        Util.waitUntilElementIsVisible(this.formContent);
+        return this;
+    }
+
+    getNoFormMessage() {
+        Util.waitUntilElementIsVisible(this.noFormMessage);
+        return this.noFormMessage.getText();
+    }
+
+    getCompletedTaskNoFormMessage() {
+        Util.waitUntilElementIsVisible(this.completedTaskNoFormMessage);
+        return this.completedTaskNoFormMessage.getText();
+    }
+
+    clickOnAttachFormButton() {
+        Util.waitUntilElementIsVisible(this.attachFormButton);
+        this.attachFormButton.click();
+        return this;
+    }
+
+    selectForm(formName) {
+        Util.waitUntilElementIsVisible(this.selectFormDropDownArrow);
+        this.selectFormDropDownArrow.click();
+        Util.waitUntilElementIsVisible(this.selectFormContent);
+        this.selectFormFromDropDown(formName);
+        return this;
+    }
+
+    selectFormFromDropDown(formName) {
+        let formNameElement = element(by.cssContainingText('span', formName));
+        Util.waitUntilElementIsVisible(formNameElement);
+        formNameElement.click();
+    }
+
+    checkWidgetIsReadOnlyMode(fieldId) {
+        let widget = element(by.css(`adf-form-field div[id='field-${fieldId}-container']`));
+        let widgetReadOnly = widget.element(by.css('div[class*="adf-readonly"]'));
+        Util.waitUntilElementIsVisible(widgetReadOnly);
+        return widgetReadOnly;
+    }
+
+    completeForm() {
+        Util.waitUntilElementIsVisible(this.completeButton);
+        return this.completeButton.click();
+    }
+
+    setValueInInputById(fieldId, value) {
+        let input = element(by.id(fieldId));
+        Util.waitUntilElementIsVisible(input);
+        input.clear().sendKeys(value);
+        return this;
+    }
+
+    isCompleteFormButtonDisabled() {
+        Util.waitUntilElementIsVisible(this.completeButton);
+        return this.completeButton.getAttribute('disabled');
+    }
+}
diff --git a/e2e/pages/adf/process_services/formPage.ts b/e2e/pages/adf/process_services/formPage.ts
index 692178c4be..0da4f58ddb 100644
--- a/e2e/pages/adf/process_services/formPage.ts
+++ b/e2e/pages/adf/process_services/formPage.ts
@@ -16,7 +16,7 @@
  */
 
 import { element, by } from 'protractor';
-import Util = require('../../../util/util');
+import { Util } from '../../../util/util';
 
 export class FormPage {
 
diff --git a/e2e/pages/adf/process_services/processDetailsPage.js b/e2e/pages/adf/process_services/processDetailsPage.js
deleted file mode 100644
index dec45068e3..0000000000
--- a/e2e/pages/adf/process_services/processDetailsPage.js
+++ /dev/null
@@ -1,178 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var Util = require('../../../util/util');
-
-var ProcessDetailsPage = function () {
-
-    //Process Details
-    var processTitle = element(by.css("mat-card-title[class='mat-card-title']"));
-    var processDetailsMessage = element(by.css('adf-process-instance-details div[class="ng-star-inserted"]'));
-    var processStatusField = element(by.css("span[data-automation-id='card-textitem-value-status']"));
-    var processEndDateField = element(by.css("span[data-automation-id='card-dateitem-ended']"));
-    var processCategoryField = element(by.css("span[data-automation-id='card-textitem-value-category']"));
-    var processBusinessKeyField = element(by.css("span[data-automation-id='card-textitem-value-businessKey']"));
-    var processCreatedByField = element(by.css("span[data-automation-id='card-textitem-value-assignee']"));
-    var processCreatedField = element(by.css("span[data-automation-id='card-dateitem-created']"));
-    var processIdField = element(by.css("span[data-automation-id='card-textitem-value-id']"));
-    var processDescription = element(by.css("span[data-automation-id='card-textitem-value-description']"));
-    var showDiagramButtonDisabled = element(by.css('button[id="show-diagram-button"][disabled]'));
-    var propertiesList = element(by.css("div[class='adf-property-list']"));
-    //Show Diagram
-    var showDiagramButton = element(by.id('show-diagram-button'));
-    var diagramCanvas = element(by.css('svg[xmlns="http://www.w3.org/2000/svg"]'));
-    var backButton = element(by.css("app-show-diagram button[class='mat-mini-fab mat-accent']"));
-    //Comments
-    var commentInput = element(by.id('comment-input'));
-    //Audit Log
-    var auditLogButton = element(by.css("button[adf-process-audit]"));
-    //Cancel Process button
-    var cancelProcessButton = element(by.css('div[data-automation-id="header-status"] > button'));
-    //Tasks
-    var activeTask = element(by.css('div[data-automation-id="active-tasks"]'));
-    var completedTask = element(by.css('div[data-automation-id="completed-tasks"]'));
-    var taskTitle = element(by.css("h2[class='adf-activiti-task-details__header']"));
-
-    this.checkDetailsAreDisplayed = function () {
-        Util.waitUntilElementIsVisible(processStatusField);
-        Util.waitUntilElementIsVisible(processEndDateField);
-        Util.waitUntilElementIsVisible(processCategoryField);
-        Util.waitUntilElementIsVisible(processBusinessKeyField);
-        Util.waitUntilElementIsVisible(processCreatedByField);
-        Util.waitUntilElementIsVisible(processCreatedField);
-        Util.waitUntilElementIsVisible(processIdField);
-        Util.waitUntilElementIsVisible(processDescription);
-        Util.waitUntilElementIsVisible(showDiagramButton);
-        Util.waitUntilElementIsVisible(activeTask);
-        Util.waitUntilElementIsVisible(cancelProcessButton);
-        Util.waitUntilElementIsVisible(commentInput);
-        Util.waitUntilElementIsVisible(auditLogButton);
-        return this;
-    };
-
-    this.checkProcessTitleIsDisplayed = function () {
-        Util.waitUntilElementIsVisible(processTitle);
-        return processTitle.getText();
-    };
-
-    this.checkProcessDetailsMessage = function () {
-        Util.waitUntilElementIsVisible(processDetailsMessage);
-        return processDetailsMessage.getText();
-    };
-
-    this.getProcessStatus = function () {
-        Util.waitUntilElementIsVisible(processStatusField);
-        return processStatusField.getText();
-    };
-
-    this.getEndDate = function () {
-        Util.waitUntilElementIsVisible(processEndDateField);
-        return processEndDateField.getText();
-    };
-
-    this.getProcessCategory = function () {
-        Util.waitUntilElementIsVisible(processCategoryField);
-        return processCategoryField.getText();
-    };
-
-    this.getBusinessKey = function () {
-        Util.waitUntilElementIsVisible(processBusinessKeyField);
-        return processBusinessKeyField.getText();
-    };
-
-    this.getCreatedBy = function () {
-        Util.waitUntilElementIsVisible(processCreatedByField);
-        return processCreatedByField.getText();
-    };
-
-    this.getCreated = function () {
-        Util.waitUntilElementIsVisible(processCreatedField);
-        return processCreatedField.getText();
-    };
-
-    this.getId = function () {
-        Util.waitUntilElementIsVisible(processIdField);
-        return processIdField.getText();
-    };
-
-    this.getProcessDescription = function () {
-        Util.waitUntilElementIsVisible(processDescription);
-        return processDescription.getText();
-    };
-
-    //Show Diagram
-    this.clickShowDiagram = function () {
-        Util.waitUntilElementIsVisible(showDiagramButton);
-        Util.waitUntilElementIsClickable(showDiagramButton);
-        showDiagramButton.click();
-        Util.waitUntilElementIsVisible(diagramCanvas);
-        Util.waitUntilElementIsVisible(backButton);
-        Util.waitUntilElementIsClickable(backButton);
-        backButton.click();
-    };
-
-    this.checkShowDiagramIsDisabled = function () {
-        Util.waitUntilElementIsVisible(showDiagramButtonDisabled);
-    };
-
-    //Add comment
-    this.addComment = function (comment) {
-        Util.waitUntilElementIsVisible(commentInput);
-        commentInput.sendKeys(comment);
-        commentInput.sendKeys(protractor.Key.ENTER);
-        return this;
-    };
-
-    this.checkCommentIsDisplayed = function (comment) {
-        var commentInserted = element(by.cssContainingText("div[id='comment-message']", comment));
-        Util.waitUntilElementIsVisible(commentInserted);
-        return this;
-    };
-
-    // Click Audit log
-    this.clickAuditLogButton = function () {
-        Util.waitUntilElementIsVisible(auditLogButton);
-        Util.waitUntilElementIsClickable(auditLogButton);
-        auditLogButton.click();
-    };
-
-    this.clickCancelProcessButton = function () {
-        Util.waitUntilElementIsVisible(cancelProcessButton);
-        Util.waitUntilElementIsClickable(cancelProcessButton);
-        cancelProcessButton.click();
-    };
-
-    this.clickOnActiveTask = function () {
-        Util.waitUntilElementIsVisible(activeTask);
-        return activeTask.click();
-    };
-
-    this.clickOnCompletedTask = function () {
-        Util.waitUntilElementIsClickable(completedTask);
-        return completedTask.click();
-    };
-
-    this.checkActiveTaskTitleIsDisplayed = function () {
-        Util.waitUntilElementIsVisible(taskTitle);
-    };
-
-    this.checkProcessDetailsCard = function () {
-        Util.waitUntilElementIsVisible(propertiesList);
-    };
-};
-
-module.exports = ProcessDetailsPage;
diff --git a/e2e/pages/adf/process_services/processDetailsPage.ts b/e2e/pages/adf/process_services/processDetailsPage.ts
new file mode 100644
index 0000000000..45796acc3f
--- /dev/null
+++ b/e2e/pages/adf/process_services/processDetailsPage.ts
@@ -0,0 +1,174 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Util } from '../../../util/util';
+import { by, element } from 'protractor';
+
+export class ProcessDetailsPage {
+
+    // Process Details
+    processTitle = element(by.css('mat-card-title[class="mat-card-title"]'));
+    processDetailsMessage = element(by.css('adf-process-instance-details div[class="ng-star-inserted"]'));
+    processStatusField = element(by.css('span[data-automation-id="card-textitem-value-status"]'));
+    processEndDateField = element(by.css('span[data-automation-id="card-dateitem-ended"]'));
+    processCategoryField = element(by.css('span[data-automation-id="card-textitem-value-category"]'));
+    processBusinessKeyField = element(by.css('span[data-automation-id="card-textitem-value-businessKey"]'));
+    processCreatedByField = element(by.css('span[data-automation-id="card-textitem-value-assignee"]'));
+    processCreatedField = element(by.css('span[data-automation-id="card-dateitem-created"]'));
+    processIdField = element(by.css('span[data-automation-id="card-textitem-value-id"]'));
+    processDescription = element(by.css('span[data-automation-id="card-textitem-value-description"]'));
+    showDiagramButtonDisabled = element(by.css('button[id="show-diagram-button"][disabled]'));
+    propertiesList = element(by.css('div[class="adf-property-list"]'));
+    // Show Diagram
+    showDiagramButton = element(by.id('show-diagram-button'));
+    diagramCanvas = element(by.css('svg[xmlns="http://www.w3.org/2000/svg"]'));
+    backButton = element(by.css('app-show-diagram button[class="mat-mini-fab mat-accent"]'));
+    // Comments
+    commentInput = element(by.id('comment-input'));
+    // Audit Log
+    auditLogButton = element(by.css('button[adf-process-audit]'));
+    // Cancel Process button
+    cancelProcessButton = element(by.css('div[data-automation-id="header-status"] > button'));
+    // Tasks
+    activeTask = element(by.css('div[data-automation-id="active-tasks"]'));
+    completedTask = element(by.css('div[data-automation-id="completed-tasks"]'));
+    taskTitle = element(by.css('h2[class="adf-activiti-task-details__header"]'));
+
+    checkDetailsAreDisplayed() {
+        Util.waitUntilElementIsVisible(this.processStatusField);
+        Util.waitUntilElementIsVisible(this.processEndDateField);
+        Util.waitUntilElementIsVisible(this.processCategoryField);
+        Util.waitUntilElementIsVisible(this.processBusinessKeyField);
+        Util.waitUntilElementIsVisible(this.processCreatedByField);
+        Util.waitUntilElementIsVisible(this.processCreatedField);
+        Util.waitUntilElementIsVisible(this.processIdField);
+        Util.waitUntilElementIsVisible(this.processDescription);
+        Util.waitUntilElementIsVisible(this.showDiagramButton);
+        Util.waitUntilElementIsVisible(this.activeTask);
+        Util.waitUntilElementIsVisible(this.cancelProcessButton);
+        Util.waitUntilElementIsVisible(this.commentInput);
+        Util.waitUntilElementIsVisible(this.auditLogButton);
+        return this;
+    }
+
+    checkProcessTitleIsDisplayed() {
+        Util.waitUntilElementIsVisible(this.processTitle);
+        return this.processTitle.getText();
+    }
+
+    checkProcessDetailsMessage() {
+        Util.waitUntilElementIsVisible(this.processDetailsMessage);
+        return this.processDetailsMessage.getText();
+    }
+
+    getProcessStatus() {
+        Util.waitUntilElementIsVisible(this.processStatusField);
+        return this.processStatusField.getText();
+    }
+
+    getEndDate() {
+        Util.waitUntilElementIsVisible(this.processEndDateField);
+        return this.processEndDateField.getText();
+    }
+
+    getProcessCategory() {
+        Util.waitUntilElementIsVisible(this.processCategoryField);
+        return this.processCategoryField.getText();
+    }
+
+    getBusinessKey() {
+        Util.waitUntilElementIsVisible(this.processBusinessKeyField);
+        return this.processBusinessKeyField.getText();
+    }
+
+    getCreatedBy() {
+        Util.waitUntilElementIsVisible(this.processCreatedByField);
+        return this.processCreatedByField.getText();
+    }
+
+    getCreated() {
+        Util.waitUntilElementIsVisible(this.processCreatedField);
+        return this.processCreatedField.getText();
+    }
+
+    getId() {
+        Util.waitUntilElementIsVisible(this.processIdField);
+        return this.processIdField.getText();
+    }
+
+    getProcessDescription() {
+        Util.waitUntilElementIsVisible(this.processDescription);
+        return this.processDescription.getText();
+    }
+
+    clickShowDiagram() {
+        Util.waitUntilElementIsVisible(this.showDiagramButton);
+        Util.waitUntilElementIsClickable(this.showDiagramButton);
+        this.showDiagramButton.click();
+        Util.waitUntilElementIsVisible(this.diagramCanvas);
+        Util.waitUntilElementIsVisible(this.backButton);
+        Util.waitUntilElementIsClickable(this.backButton);
+        this.backButton.click();
+    }
+
+    checkShowDiagramIsDisabled() {
+        Util.waitUntilElementIsVisible(this.showDiagramButtonDisabled);
+    }
+
+    addComment(comment) {
+        Util.waitUntilElementIsVisible(this.commentInput);
+        this.commentInput.sendKeys(comment);
+        this.commentInput.sendKeys(protractor.Key.ENTER);
+        return this;
+    }
+
+    checkCommentIsDisplayed(comment) {
+        let commentInserted = element(by.cssContainingText('div[id="comment-message"]', comment));
+        Util.waitUntilElementIsVisible(commentInserted);
+        return this;
+    }
+
+    clickAuditLogButton() {
+        Util.waitUntilElementIsVisible(this.auditLogButton);
+        Util.waitUntilElementIsClickable(this.auditLogButton);
+        this.auditLogButton.click();
+    }
+
+    clickCancelProcessButton() {
+        Util.waitUntilElementIsVisible(this.cancelProcessButton);
+        Util.waitUntilElementIsClickable(this.cancelProcessButton);
+        this.cancelProcessButton.click();
+    }
+
+    clickOnActiveTask() {
+        Util.waitUntilElementIsVisible(this.activeTask);
+        return this.activeTask.click();
+    }
+
+    clickOnCompletedTask() {
+        Util.waitUntilElementIsClickable(this.completedTask);
+        return this.completedTask.click();
+    }
+
+    checkActiveTaskTitleIsDisplayed() {
+        Util.waitUntilElementIsVisible(this.taskTitle);
+    }
+
+    checkProcessDetailsCard() {
+        Util.waitUntilElementIsVisible(this.propertiesList);
+    }
+}
diff --git a/e2e/pages/adf/process_services/processFiltersPage.js b/e2e/pages/adf/process_services/processFiltersPage.js
deleted file mode 100644
index a83750177a..0000000000
--- a/e2e/pages/adf/process_services/processFiltersPage.js
+++ /dev/null
@@ -1,156 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var Util = require('../../../util/util');
-var ContentList = require('../dialog/contentList');
-var StartProcessPage = require('./startProcessPage');
-
-var ProcessFiltersPage = function () {
-
-    var runningFilter = element(by.css("span[data-automation-id='Running_filter']"));
-    var completedFilter = element(by.css("div[class='mat-list-text'] > span[data-automation-id='Completed_filter']"));
-    var allFilter = element(by.css("span[data-automation-id='All_filter']"));
-    var createProcessButton = element(by.css(".adf-processes-menu button[data-automation-id='create-button'] > span"));
-    var newProcessButton = element(by.css("div > button[data-automation-id='btn-start-process']"));
-    var processesPage = element(by.css("div[class='adf-grid'] > div[class='adf-grid-item adf-processes-menu']"));
-    var accordionMenu = element(by.css(".adf-processes-menu mat-accordion"));
-    var buttonWindow = element(by.css("div > button[data-automation-id='btn-start-process'] > div"));
-    var noContentMessage = element.all(by.css("p[class='adf-empty-content__title']")).first();
-    var rows = by.css("adf-process-instance-list div[class='adf-datatable-body'] div[class*='adf-datatable-row']");
-    var tableBody = element.all(by.css("adf-datatable div[class='adf-datatable-body']")).first();
-    var contentList = new ContentList();
-    var nameColumn = by.css("div[class*='adf-datatable-body'] div[class*='adf-datatable-row'] div[title='Name'] span");
-    var processIcon = by.xpath("ancestor::div[@class='mat-list-item-content']/mat-icon");
-
-    this.startProcess = function () {
-        this.clickCreateProcessButton();
-        this.clickNewProcessDropdown();
-        return new StartProcessPage();
-    };
-
-    this.clickRunningFilterButton = function () {
-        Util.waitUntilElementIsVisible(runningFilter);
-        Util.waitUntilElementIsClickable(runningFilter);
-        return runningFilter.click();
-    };
-
-    this.clickCompletedFilterButton = function () {
-        Util.waitUntilElementIsVisible(completedFilter);
-        Util.waitUntilElementIsClickable(completedFilter);
-        completedFilter.click();
-        expect(completedFilter.isEnabled()).toBe(true);
-    };
-
-    this.clickAllFilterButton = function () {
-        Util.waitUntilElementIsVisible(allFilter);
-        Util.waitUntilElementIsClickable(allFilter);
-        allFilter.click();
-        expect(allFilter.isEnabled()).toBe(true);
-    };
-
-    this.clickCreateProcessButton = function () {
-        Util.waitUntilElementIsOnPage(accordionMenu);
-        Util.waitUntilElementIsVisible(processesPage);
-        Util.waitUntilElementIsPresent(createProcessButton);
-        createProcessButton.click();
-    };
-
-    this.clickNewProcessDropdown = function () {
-        Util.waitUntilElementIsOnPage(buttonWindow);
-        Util.waitUntilElementIsVisible(newProcessButton);
-        Util.waitUntilElementIsClickable(newProcessButton);
-        newProcessButton.click();
-    };
-
-    this.checkNoContentMessage = function () {
-        return Util.waitUntilElementIsVisible(noContentMessage);
-    };
-
-    this.selectFromProcessList = function (title) {
-        var processName = element.all(by.css('div[data-automation-id="text_' + title + '"]')).first();
-        Util.waitUntilElementIsVisible(processName);
-        processName.click();
-    };
-
-    this.checkFilterIsHighlighted = function (filterName) {
-        var processNameHighlighted = element(by.css("mat-list-item.adf-active span[data-automation-id='" + filterName + "_filter']"));
-        Util.waitUntilElementIsVisible(processNameHighlighted);
-    };
-
-    this.numberOfProcessRows = function () {
-        return element.all(rows).count();
-    };
-
-    this.waitForTableBody = function () {
-        Util.waitUntilElementIsVisible(tableBody);
-    };
-
-    /**
-     *  Sort the list by name column.
-     *
-     * @param sortOrder : 'true' to sort the list ascendant and 'false' for descendant
-     */
-    this.sortByName = function (sortOrder) {
-        contentList.sortByName(sortOrder);
-    };
-
-    this.getAllRowsNameColumn = function () {
-        return contentList.getAllRowsColumnValues(nameColumn);
-    };
-
-    this.checkFilterIsDisplayed = function (name) {
-        var filterName = element(by.css("span[data-automation-id='" + name + "_filter']"));
-        return Util.waitUntilElementIsVisible(filterName);
-    };
-
-    this.checkFilterHasNoIcon = function(name) {
-        var filterName = element(by.css("span[data-automation-id='" + name + "_filter']"));
-        Util.waitUntilElementIsVisible(filterName);
-        return Util.waitUntilElementIsNotOnPage(filterName.element(processIcon));
-    };
-
-    this.getFilterIcon = function (name) {
-        var filterName = element(by.css("span[data-automation-id='" + name + "_filter']"));
-        Util.waitUntilElementIsVisible(filterName);
-        var icon = filterName.element(processIcon);
-        Util.waitUntilElementIsVisible(icon);
-        return icon.getText();
-    };
-
-    this.checkFilterIsNotDisplayed = function (name) {
-        var filterName = element(by.css("span[data-automation-id='" + name + "_filter']"));
-        return Util.waitUntilElementIsNotVisible(filterName);
-    };
-
-    this.checkProcessesSortedByNameAsc = function () {
-        this.getAllRowsNameColumn().then(function (list) {
-            for (let i = 1 ; i < list.length ; i++) {
-                expect(JSON.stringify(list[i]) > JSON.stringify(list[i - 1])).toEqual(true);
-            }
-        });
-    };
-
-    this.checkProcessesSortedByNameDesc = function () {
-        this.getAllRowsNameColumn().then(function (list) {
-            for (let i = 1 ; i < list.length ; i++) {
-                expect(JSON.stringify(list[i]) < JSON.stringify(list[i - 1])).toEqual(true);
-            }
-        });
-    };
-};
-
-module.exports = ProcessFiltersPage;
diff --git a/e2e/pages/adf/process_services/processFiltersPage.ts b/e2e/pages/adf/process_services/processFiltersPage.ts
new file mode 100644
index 0000000000..ccacf4c7b6
--- /dev/null
+++ b/e2e/pages/adf/process_services/processFiltersPage.ts
@@ -0,0 +1,155 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Util } from '../../../util/util';
+import { ContentListPage } from '../dialog/contentListPage';
+import { element, by } from 'protractor';
+import { StartProcessPage } from './startProcessPage';
+
+export class ProcessFiltersPage {
+
+    runningFilter = element(by.css('span[data-automation-id="Running_filter"]'));
+    completedFilter = element(by.css('div[class="mat-list-text"] > span[data-automation-id="Completed_filter"]'));
+    allFilter = element(by.css('span[data-automation-id="All_filter"]'));
+    createProcessButton = element(by.css('.adf-processes-menu button[data-automation-id="create-button"] > span'));
+    newProcessButton = element(by.css('div > button[data-automation-id="btn-start-process"]'));
+    processesPage = element(by.css('div[class="adf-grid"] > div[class="adf-grid-item adf-processes-menu"]'));
+    accordionMenu = element(by.css('.adf-processes-menu mat-accordion'));
+    buttonWindow = element(by.css('div > button[data-automation-id="btn-start-process"] > div'));
+    noContentMessage = element.all(by.css('p[class="adf-empty-content__title"]')).first();
+    rows = by.css('adf-process-instance-list div[class="adf-datatable-body"] div[class*="adf-datatable-row"]');
+    tableBody = element.all(by.css('adf-datatable div[class="adf-datatable-body"]')).first();
+    contentList = new ContentListPage();
+    nameColumn = by.css('div[class*="adf-datatable-body"] div[class*="adf-datatable-row"] div[title="Name"] span');
+    processIcon = by.xpath('ancestor::div[@class="mat-list-item-content"]/mat-icon');
+
+    startProcess() {
+        this.clickCreateProcessButton();
+        this.clickNewProcessDropdown();
+        return new StartProcessPage();
+    }
+
+    clickRunningFilterButton() {
+        Util.waitUntilElementIsVisible(this.runningFilter);
+        Util.waitUntilElementIsClickable(this.runningFilter);
+        return this.runningFilter.click();
+    }
+
+    clickCompletedFilterButton() {
+        Util.waitUntilElementIsVisible(this.completedFilter);
+        Util.waitUntilElementIsClickable(this.completedFilter);
+        this.completedFilter.click();
+        expect(this.completedFilter.isEnabled()).toBe(true);
+    }
+
+    clickAllFilterButton() {
+        Util.waitUntilElementIsVisible(this.allFilter);
+        Util.waitUntilElementIsClickable(this.allFilter);
+        this.allFilter.click();
+        expect(this.allFilter.isEnabled()).toBe(true);
+    }
+
+    clickCreateProcessButton() {
+        Util.waitUntilElementIsOnPage(this.accordionMenu);
+        Util.waitUntilElementIsVisible(this.processesPage);
+        Util.waitUntilElementIsPresent(this.createProcessButton);
+        this.createProcessButton.click();
+    }
+
+    clickNewProcessDropdown() {
+        Util.waitUntilElementIsOnPage(this.buttonWindow);
+        Util.waitUntilElementIsVisible(this.newProcessButton);
+        Util.waitUntilElementIsClickable(this.newProcessButton);
+        this.newProcessButton.click();
+    }
+
+    checkNoContentMessage() {
+        return Util.waitUntilElementIsVisible(this.noContentMessage);
+    }
+
+    selectFromProcessList(title) {
+        let processName = element.all(by.css(`div[data-automation-id="text_${title}"]`)).first();
+        Util.waitUntilElementIsVisible(processName);
+        processName.click();
+    }
+
+    checkFilterIsHighlighted(filterName) {
+        let processNameHighlighted = element(by.css(`mat-list-item.adf-active span[data-automation-id='${filterName}_filter']`));
+        Util.waitUntilElementIsVisible(processNameHighlighted);
+    }
+
+    numberOfProcessRows() {
+        return element.all(this.rows).count();
+    }
+
+    waitForTableBody() {
+        Util.waitUntilElementIsVisible(this.tableBody);
+    }
+
+    /**
+     *  Sort the list by name column.
+     *
+     * @param sortOrder : 'true' to sort the list ascendant and 'false' for descendant
+     */
+    sortByName(sortOrder) {
+        this.contentList.sortByName(sortOrder);
+    }
+
+    getAllRowsNameColumn() {
+        return this.contentList.getAllRowsColumnValues(this.nameColumn);
+    }
+
+    checkFilterIsDisplayed(name) {
+        let filterName = element(by.css(`span[data-automation-id='${name}_filter']`));
+        return Util.waitUntilElementIsVisible(filterName);
+    }
+
+    checkFilterHasNoIcon(name) {
+        let filterName = element(by.css(`span[data-automation-id='${name}_filter']`));
+        Util.waitUntilElementIsVisible(filterName);
+        return Util.waitUntilElementIsNotOnPage(filterName.element(this.processIcon));
+    }
+
+    getFilterIcon(name) {
+        let filterName = element(by.css(`span[data-automation-id='${name}_filter']`));
+        Util.waitUntilElementIsVisible(filterName);
+        let icon = filterName.element(this.processIcon);
+        Util.waitUntilElementIsVisible(icon);
+        return icon.getText();
+    }
+
+    checkFilterIsNotDisplayed(name) {
+        let filterName = element(by.css(`span[data-automation-id='${name}_filter']`));
+        return Util.waitUntilElementIsNotVisible(filterName);
+    }
+
+    checkProcessesSortedByNameAsc() {
+        this.getAllRowsNameColumn().then((list) => {
+            for (let i = 1; i < list.length; i++) {
+                expect(JSON.stringify(list[i]) > JSON.stringify(list[i - 1])).toEqual(true);
+            }
+        });
+    }
+
+    checkProcessesSortedByNameDesc() {
+        this.getAllRowsNameColumn().then((list) => {
+            for (let i = 1; i < list.length; i++) {
+                expect(JSON.stringify(list[i]) < JSON.stringify(list[i - 1])).toEqual(true);
+            }
+        });
+    }
+}
diff --git a/e2e/pages/adf/process_services/processListPage.ts b/e2e/pages/adf/process_services/processListPage.ts
index 5c9210e63e..947a6e6234 100644
--- a/e2e/pages/adf/process_services/processListPage.ts
+++ b/e2e/pages/adf/process_services/processListPage.ts
@@ -15,13 +15,12 @@
  * limitations under the License.
  */
 
-import Util = require('../../../util/util');
-
+import { Util } from '../../../util/util';
 import { element, by } from 'protractor';
 
 export class ProcessListPage {
 
-    processListTitle = element(by.css('p[class="adf-empty-content__title"]'));
+    processListTitle = element.all(by.css("p[class='adf-empty-content__title']")).first();
     processInstanceList = element(by.css('adf-process-instance-list'));
 
     checkProcessListTitleIsDisplayed() {
diff --git a/e2e/pages/adf/process_services/processServicesPage.ts b/e2e/pages/adf/process_services/processServicesPage.ts
index 157d561629..88007e2ba1 100644
--- a/e2e/pages/adf/process_services/processServicesPage.ts
+++ b/e2e/pages/adf/process_services/processServicesPage.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import Util = require('../../../util/util');
+import { Util } from '../../../util/util';
 import { AppNavigationBarPage } from './appNavigationBarPage';
 
 import { element, by } from 'protractor';
diff --git a/e2e/pages/adf/process_services/startProcessPage.js b/e2e/pages/adf/process_services/startProcessPage.js
deleted file mode 100644
index ca5055cad7..0000000000
--- a/e2e/pages/adf/process_services/startProcessPage.js
+++ /dev/null
@@ -1,147 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var Util = require('../../../util/util');
-
-var StartProcessPage = function () {
-
-    var defaultProcessName = element(by.css("input[id='processName']"));
-    var processNameInput = element(by.id('processName'));
-    var selectProcessDropdownArrow = element(by.css("button[id='adf-select-process-dropdown']"));
-    var cancelProcessButton = element(by.id('cancel_process'));
-    var formStartProcessButton = element(by.css('button[data-automation-id="adf-form-start process"]'));
-    var startProcessButton = element(by.css("button[data-automation-id='btn-start']"));
-    var noProcess = element(by.id('no-process-message'));
-    var processDefinition = element(by.css("input[id='processDefinitionName']"));
-    var processDefinitionOptionsPanel = element(by.css("div[class*='processDefinitionOptions']"));
-
-    this.checkNoProcessMessage = function () {
-        Util.waitUntilElementIsVisible(noProcess);
-    };
-
-    this.pressDownArrowAndEnter = function () {
-        processDefinition.sendKeys(protractor.Key.ARROW_DOWN);
-        return browser.actions().sendKeys(protractor.Key.ENTER).perform();
-    };
-
-    this.checkNoProcessDefinitionOptionIsDisplayed = function () {
-        Util.waitUntilElementIsNotOnPage(processDefinitionOptionsPanel);
-    };
-
-    this.getDefaultName = function () {
-        Util.waitUntilElementIsVisible(defaultProcessName);
-        return defaultProcessName.getAttribute("value");
-    };
-
-    this.deleteDefaultName = function (value) {
-        Util.waitUntilElementIsVisible(processNameInput);
-        processNameInput.getAttribute('value').then(function (value){
-            for (var i = value.length; i >= 0; i--) {
-                processNameInput.sendKeys(protractor.Key.BACK_SPACE);
-            }
-        });
-    };
-
-    this.enterProcessName = function (name) {
-        Util.waitUntilElementIsVisible(processNameInput);
-        this.clearProcessName();
-        processNameInput.sendKeys(name);
-    };
-
-    this.clearProcessName = function () {
-        processNameInput.clear();
-    };
-
-    this.selectFromProcessDropdown = function (name) {
-        this.clickProcessDropdownArrow();
-        return this.selectOption(name);
-    };
-
-    this.clickProcessDropdownArrow = function() {
-        Util.waitUntilElementIsVisible(selectProcessDropdownArrow);
-        Util.waitUntilElementIsClickable(selectProcessDropdownArrow)
-        selectProcessDropdownArrow.click();
-    };
-
-    this.checkOptionIsDisplayed = function (name) {
-        var selectProcessDropdown = element(by.cssContainingText('.mat-option-text', name));
-        Util.waitUntilElementIsVisible(selectProcessDropdown);
-        Util.waitUntilElementIsClickable(selectProcessDropdown);
-        return this;
-    };
-
-    this.checkOptionIsNotDisplayed = function (name) {
-        var selectProcessDropdown = element(by.cssContainingText('.mat-option-text', name));
-        Util.waitUntilElementIsNotOnPage(selectProcessDropdown);
-        return this;
-    };
-
-    this.selectOption = function (name) {
-        var selectProcessDropdown = element(by.cssContainingText('.mat-option-text', name));
-        Util.waitUntilElementIsVisible(selectProcessDropdown);
-        Util.waitUntilElementIsClickable(selectProcessDropdown);
-        selectProcessDropdown.click();
-        return this;
-    };
-
-    this.typeProcessDefinition = function (name) {
-        Util.waitUntilElementIsVisible(processDefinition);
-        Util.waitUntilElementIsClickable(processDefinition);
-        processDefinition.clear();
-        processDefinition.sendKeys(name);
-        return this;
-    };
-
-    this.getProcessDefinitionValue = function () {
-        Util.waitUntilElementIsVisible(processDefinition);
-        return processDefinition.getAttribute('value');
-    };
-
-    this.clickCancelProcessButton = function () {
-        Util.waitUntilElementIsVisible(cancelProcessButton);
-        cancelProcessButton.click();
-    };
-
-    this.clickFormStartProcessButton = function () {
-        Util.waitUntilElementIsVisible(formStartProcessButton);
-        Util.waitUntilElementIsClickable(formStartProcessButton);
-        return formStartProcessButton.click();
-    };
-
-    this.checkStartProcessButtonIsEnabled = function () {
-        expect(startProcessButton.isEnabled()).toBe(true);
-    };
-
-    this.checkStartProcessButtonIsDisabled = function () {
-        expect(startProcessButton.isEnabled()).toBe(false);
-    };
-
-    this.clickStartProcessButton = function () {
-        return startProcessButton.click();
-    };
-
-    this.checkSelectProcessPlaceholderIsDisplayed = function () {
-        Util.waitUntilElementIsVisible(processDefinition);
-        var processPlaceholder = processDefinition.getAttribute('value').then((function (result) {
-            return result;
-        }));
-        return processPlaceholder;
-    };
-
-};
-
-module.exports = StartProcessPage;
diff --git a/e2e/pages/adf/process_services/startProcessPage.ts b/e2e/pages/adf/process_services/startProcessPage.ts
new file mode 100644
index 0000000000..88d031e0a4
--- /dev/null
+++ b/e2e/pages/adf/process_services/startProcessPage.ts
@@ -0,0 +1,148 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Util } from '../../../util/util';
+import { by, element } from 'protractor';
+
+export class StartProcessPage {
+
+    defaultProcessName = element(by.css('input[id="processName"]'));
+    processNameInput = element(by.id('processName'));
+    selectProcessDropdownArrow = element(by.css('button[id="adf-select-process-dropdown"]'));
+    cancelProcessButton = element(by.id('cancel_process'));
+    formStartProcessButton = element(by.css('button[data-automation-id="adf-form-start process"]'));
+    startProcessButton = element(by.css('button[data-automation-id="btn-start"]'));
+    noProcess = element(by.id('no-process-message'));
+    processDefinition = element(by.css('input[id="processDefinitionName"]'));
+    processDefinitionOptionsPanel = element(by.css('div[class*="processDefinitionOptions"]'));
+
+    checkNoProcessMessage() {
+        Util.waitUntilElementIsVisible(this.noProcess);
+    }
+
+    pressDownArrowAndEnter() {
+        this.processDefinition.sendKeys(protractor.Key.ARROW_DOWN);
+        return browser.actions().sendKeys(protractor.Key.ENTER).perform();
+    }
+
+    checkNoProcessDefinitionOptionIsDisplayed() {
+        Util.waitUntilElementIsNotOnPage(this.processDefinitionOptionsPanel);
+    }
+
+    getDefaultName() {
+        Util.waitUntilElementIsVisible(this.defaultProcessName);
+        return this.defaultProcessName.getAttribute('value');
+    }
+
+    deleteDefaultName(name) {
+        Util.waitUntilElementIsVisible(this.processNameInput);
+        this.processNameInput.getAttribute('value').then((currentValue) => {
+            for (let i = currentValue.length; i >= 0; i--) {
+                if (currentValue === name) {
+                    this.processNameInput.sendKeys(protractor.Key.BACK_SPACE);
+                }
+            }
+        });
+    }
+
+    enterProcessName(name) {
+        Util.waitUntilElementIsVisible(this.processNameInput);
+        this.clearProcessName();
+        this.processNameInput.sendKeys(name);
+    }
+
+    clearProcessName() {
+        this.processNameInput.clear();
+    }
+
+    selectFromProcessDropdown(name) {
+        this.clickProcessDropdownArrow();
+        return this.selectOption(name);
+    }
+
+    clickProcessDropdownArrow() {
+        Util.waitUntilElementIsVisible(this.selectProcessDropdownArrow);
+        Util.waitUntilElementIsClickable(this.selectProcessDropdownArrow);
+        this.selectProcessDropdownArrow.click();
+    }
+
+    checkOptionIsDisplayed(name) {
+        let selectProcessDropdown = element(by.cssContainingText('.mat-option-text', name));
+        Util.waitUntilElementIsVisible(selectProcessDropdown);
+        Util.waitUntilElementIsClickable(selectProcessDropdown);
+        return this;
+    }
+
+    checkOptionIsNotDisplayed(name) {
+        let selectProcessDropdown = element(by.cssContainingText('.mat-option-text', name));
+        Util.waitUntilElementIsNotOnPage(selectProcessDropdown);
+        return this;
+    }
+
+    selectOption(name) {
+        let selectProcessDropdown = element(by.cssContainingText('.mat-option-text', name));
+        Util.waitUntilElementIsVisible(selectProcessDropdown);
+        Util.waitUntilElementIsClickable(selectProcessDropdown);
+        selectProcessDropdown.click();
+        return this;
+    }
+
+    typeProcessDefinition(name) {
+        Util.waitUntilElementIsVisible(this.processDefinition);
+        Util.waitUntilElementIsClickable(this.processDefinition);
+        this.processDefinition.clear();
+        this.processDefinition.sendKeys(name);
+        return this;
+    }
+
+    getProcessDefinitionValue() {
+        Util.waitUntilElementIsVisible(this.processDefinition);
+        return this.processDefinition.getAttribute('value');
+    }
+
+    clickCancelProcessButton() {
+        Util.waitUntilElementIsVisible(this.cancelProcessButton);
+        this.cancelProcessButton.click();
+    }
+
+    clickFormStartProcessButton() {
+        Util.waitUntilElementIsVisible(this.formStartProcessButton);
+        Util.waitUntilElementIsClickable(this.formStartProcessButton);
+        return this.formStartProcessButton.click();
+    }
+
+    checkStartProcessButtonIsEnabled() {
+        expect(this.startProcessButton.isEnabled()).toBe(true);
+    }
+
+    checkStartProcessButtonIsDisabled() {
+        expect(this.startProcessButton.isEnabled()).toBe(false);
+    }
+
+    clickStartProcessButton() {
+        return this.startProcessButton.click();
+    }
+
+    checkSelectProcessPlaceholderIsDisplayed() {
+        Util.waitUntilElementIsVisible(this.processDefinition);
+        let processPlaceholder = this.processDefinition.getAttribute('value').then(((result) => {
+            return result;
+        }));
+        return processPlaceholder;
+    }
+
+}
diff --git a/e2e/pages/adf/process_services/taskDetailsPage.ts b/e2e/pages/adf/process_services/taskDetailsPage.ts
index 680f3ce13e..2756fb3830 100644
--- a/e2e/pages/adf/process_services/taskDetailsPage.ts
+++ b/e2e/pages/adf/process_services/taskDetailsPage.ts
@@ -16,7 +16,7 @@
  */
 
 import { AppSettingsToggles } from './dialog/appSettingsToggles';
-import Util = require('../../../util/util');
+import { Util } from '../../../util/util';
 import { element, by, protractor, browser } from 'protractor';
 import { TabsPage } from '../material/tabsPage';
 
@@ -31,9 +31,9 @@ export class TaskDetailsPage {
     parentNameField = element(by.css('span[data-automation-id*="parentName"] span'));
     parentTaskIdField = element(by.css('span[data-automation-id*="parentTaskId"] span'));
     durationField = element(by.css('span[data-automation-id*="duration"] span'));
-    endDateField = element(by.css('span[data-automation-id*="endDate"] span'));
+    endDateField = element.all(by.css('span[data-automation-id*="endDate"] span')).first();
     createdField = element(by.css('span[data-automation-id="card-dateitem-created"] span'));
-    idField = element(by.css('span[data-automation-id*="id"] span'));
+    idField = element.all(by.css('span[data-automation-id*="id"] span')).first();
     descriptionField = element(by.css('span[data-automation-id*="description"] span'));
     dueDateField = element(by.css('span[data-automation-id*="dueDate"] span'));
     activitiesTitle = element(by.css('div[class*="adf-info-drawer-layout-header-title"] div'));
diff --git a/e2e/pages/adf/process_services/taskFiltersPage.ts b/e2e/pages/adf/process_services/taskFiltersPage.ts
index b9da04cfe8..a7b513b06e 100644
--- a/e2e/pages/adf/process_services/taskFiltersPage.ts
+++ b/e2e/pages/adf/process_services/taskFiltersPage.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import Util = require('../../../util/util');
+import { Util } from '../../../util/util';
 import { by } from 'protractor';
 
 export class TaskFiltersPage {
diff --git a/e2e/pages/adf/process_services/tasksListPage.js b/e2e/pages/adf/process_services/tasksListPage.js
deleted file mode 100644
index bacda592d6..0000000000
--- a/e2e/pages/adf/process_services/tasksListPage.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var Util = require('../../../util/util');
-var DataTablePage = require('../dataTablePage');
-
-var TasksListPage = function () {
-
-    var taskList = element(by.css("adf-tasklist"));
-    var noTasksFound = element(by.css("p[class='adf-empty-content__title']"));
-
-    var dataTable = new DataTablePage(taskList);
-
-    this.getDataTable = function() {
-        return dataTable;
-    };
-
-    this.checkTaskListIsLoaded = function() {
-        Util.waitUntilElementIsVisible(taskList);
-        return this;
-    };
-
-    this.getNoTasksFoundMessage = function() {
-        Util.waitUntilElementIsVisible(noTasksFound);
-        return noTasksFound.getText();
-    };
-
-};
-
-module.exports = TasksListPage;
diff --git a/e2e/pages/adf/process_services/tasksListPage.ts b/e2e/pages/adf/process_services/tasksListPage.ts
new file mode 100644
index 0000000000..3a6badd614
--- /dev/null
+++ b/e2e/pages/adf/process_services/tasksListPage.ts
@@ -0,0 +1,42 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Util } from '../../../util/util';
+import { DataTablePage } from '../dataTablePage';
+import { by, element } from 'protractor';
+
+export class TasksListPage {
+
+    taskList = element(by.css('adf-tasklist'));
+    noTasksFound = element.all(by.css("p[class='adf-empty-content__title']")).first();
+    dataTable = new DataTablePage(this.taskList);
+
+    getDataTable() {
+        return this.dataTable;
+    }
+
+    checkTaskListIsLoaded() {
+        Util.waitUntilElementIsVisible(this.taskList);
+        return this;
+    }
+
+    getNoTasksFoundMessage() {
+        Util.waitUntilElementIsVisible(this.noTasksFound);
+        return this.noTasksFound.getText();
+    }
+
+}
diff --git a/e2e/pages/adf/process_services/tasksPage.ts b/e2e/pages/adf/process_services/tasksPage.ts
index c4de6171c5..f9b929dd8f 100644
--- a/e2e/pages/adf/process_services/tasksPage.ts
+++ b/e2e/pages/adf/process_services/tasksPage.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import Util = require('../../../util/util');
-import StartTaskDialog = require('./dialog/startTaskDialog');
-import FormFields = require('./formFields');
-import {  TaskDetailsPage } from './taskDetailsPage';
+import { Util } from '../../../util/util';
+import { StartTaskDialog } from './dialog/startTaskDialog';
+import { FormFields } from './formFields';
+import { TaskDetailsPage } from './taskDetailsPage';
 
-import FiltersPage = require('./filtersPage');
-import ChecklistDialog = require('./dialog/createChecklistDialog');
-import TasksListPage = require('./tasksListPage');
+import { FiltersPage } from './filtersPage';
+import { ChecklistDialog } from './dialog/createChecklistDialog';
+import { TasksListPage } from './tasksListPage';
 import { element, by } from 'protractor';
 
 export class TasksPage {
diff --git a/e2e/pages/adf/process_services/widgets/amountWidget.ts b/e2e/pages/adf/process_services/widgets/amountWidget.ts
index 5c4b3ed748..d505928b17 100644
--- a/e2e/pages/adf/process_services/widgets/amountWidget.ts
+++ b/e2e/pages/adf/process_services/widgets/amountWidget.ts
@@ -16,8 +16,8 @@
  */
 
 import { element, by, protractor } from 'protractor';
-import Util = require('../../../../util/util');
-import FormFields = require('../formFields');
+import { Util } from '../../../../util/util';
+import { FormFields } from '../formFields';
 
 export class AmountWidget {
 
@@ -25,7 +25,7 @@ export class AmountWidget {
     formFields = new FormFields();
 
     getAmountFieldLabel(fieldId) {
-        let label = element(by.css(`adf-form-field div[id="field-${fieldId}-container"] label`));
+        let label = element.all(by.css(`adf-form-field div[id="field-${fieldId}-container"] label`)).first();
         Util.waitUntilElementIsVisible(label);
         return label.getText();
     }
diff --git a/e2e/pages/adf/process_services/widgets/attachFileWidget.ts b/e2e/pages/adf/process_services/widgets/attachFileWidget.ts
index 704a858842..56828742a1 100644
--- a/e2e/pages/adf/process_services/widgets/attachFileWidget.ts
+++ b/e2e/pages/adf/process_services/widgets/attachFileWidget.ts
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-import FormFields = require('../formFields');
+import { FormFields } from '../formFields';
 import TestConfig = require('../../../../test.config');
 import path = require('path');
-import Util = require('../../../../util/util');
+import { Util } from '../../../../util/util';
 import remote = require('selenium-webdriver/remote');
 import { element, by, browser } from 'protractor';
 
diff --git a/e2e/pages/adf/process_services/widgets/checkboxWidget.ts b/e2e/pages/adf/process_services/widgets/checkboxWidget.ts
index 0e9dab12ff..bd423e40b8 100644
--- a/e2e/pages/adf/process_services/widgets/checkboxWidget.ts
+++ b/e2e/pages/adf/process_services/widgets/checkboxWidget.ts
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import FormFields = require('../formFields');
-import Util = require('../../../../util/util');
+import { FormFields } from '../formFields';
+import { Util } from '../../../../util/util';
 import { by, element } from 'protractor';
 
 export class CheckboxWidget {
diff --git a/e2e/pages/adf/process_services/widgets/containerWidget.ts b/e2e/pages/adf/process_services/widgets/containerWidget.ts
index be0cd412f7..938d5f3dfb 100644
--- a/e2e/pages/adf/process_services/widgets/containerWidget.ts
+++ b/e2e/pages/adf/process_services/widgets/containerWidget.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import FormFields = require('../formFields');
+import { FormFields } from '../formFields';
 import { by } from 'protractor';
 
 export class ContainerWidget {
diff --git a/e2e/pages/adf/process_services/widgets/dateTimeWidget.ts b/e2e/pages/adf/process_services/widgets/dateTimeWidget.ts
index 060926b6e1..4fa61b2a9b 100644
--- a/e2e/pages/adf/process_services/widgets/dateTimeWidget.ts
+++ b/e2e/pages/adf/process_services/widgets/dateTimeWidget.ts
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-import FormFields = require('../formFields');
+import { FormFields } from '../formFields';
 import { element, by, protractor } from 'protractor';
-import Util = require('../../../../util/util');
+import { Util } from '../../../../util/util';
 
 export class DateTimeWidget {
 
diff --git a/e2e/pages/adf/process_services/widgets/dateWidget.ts b/e2e/pages/adf/process_services/widgets/dateWidget.ts
index 93e337e8e9..e23de56670 100644
--- a/e2e/pages/adf/process_services/widgets/dateWidget.ts
+++ b/e2e/pages/adf/process_services/widgets/dateWidget.ts
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-import FormFields = require('../formFields');
+import { FormFields } from '../formFields';
 import { element, by, protractor } from 'protractor';
-import Util = require('../../../../util/util');
+import { Util } from '../../../../util/util';
 
 export class DateWidget {
 
@@ -32,7 +32,7 @@ export class DateWidget {
     }
 
     getDateLabel(fieldId) {
-        let label = element(by.css(`adf-form-field div[id="field-${fieldId}-container"] label`));
+        let label = element.all(by.css(`adf-form-field div[id="field-${fieldId}-container"] label`)).first();
         Util.waitUntilElementIsVisible(label);
         return label.getText();
     }
diff --git a/e2e/pages/adf/process_services/widgets/displayTextWidget.ts b/e2e/pages/adf/process_services/widgets/displayTextWidget.ts
index 76d00cbb97..027b1735b4 100644
--- a/e2e/pages/adf/process_services/widgets/displayTextWidget.ts
+++ b/e2e/pages/adf/process_services/widgets/displayTextWidget.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import FormFields = require('../formFields');
+import { FormFields } from '../formFields';
 import { by } from 'protractor';
 
 export class DisplayTextWidget {
diff --git a/e2e/pages/adf/process_services/widgets/displayValueWidget.ts b/e2e/pages/adf/process_services/widgets/displayValueWidget.ts
index 34416ec98a..83483aae78 100644
--- a/e2e/pages/adf/process_services/widgets/displayValueWidget.ts
+++ b/e2e/pages/adf/process_services/widgets/displayValueWidget.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import FormFields = require('../formFields');
+import { FormFields } from '../formFields';
 import { by } from 'protractor';
 
 export class DisplayValueWidget {
diff --git a/e2e/pages/adf/process_services/widgets/documentWidget.ts b/e2e/pages/adf/process_services/widgets/documentWidget.ts
index 1ebbd57fcc..d5bce10118 100644
--- a/e2e/pages/adf/process_services/widgets/documentWidget.ts
+++ b/e2e/pages/adf/process_services/widgets/documentWidget.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import FormFields = require('../formFields');
+import { FormFields } from '../formFields';
 import { by } from 'protractor';
 
 export class DocumentWidget {
diff --git a/e2e/pages/adf/process_services/widgets/dropdownWidget.ts b/e2e/pages/adf/process_services/widgets/dropdownWidget.ts
index 075d5e28a4..bd1087a498 100644
--- a/e2e/pages/adf/process_services/widgets/dropdownWidget.ts
+++ b/e2e/pages/adf/process_services/widgets/dropdownWidget.ts
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-import FormFields = require('../formFields');
+import { FormFields } from '../formFields';
 import { by, element } from 'protractor';
-import Util = require('../../../../util/util');
+import { Util } from '../../../../util/util';
 
 export class DropdownWidget {
 
diff --git a/e2e/pages/adf/process_services/widgets/dynamicTableWidget.ts b/e2e/pages/adf/process_services/widgets/dynamicTableWidget.ts
index 278964d54d..038e34d91f 100644
--- a/e2e/pages/adf/process_services/widgets/dynamicTableWidget.ts
+++ b/e2e/pages/adf/process_services/widgets/dynamicTableWidget.ts
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import FormFields = require('../formFields');
-import Util = require('../../../../util/util');
+import { FormFields } from '../formFields';
+import { Util } from '../../../../util/util';
 import { by, element, browser, protractor } from 'protractor';
 
 export class DynamicTableWidget {
diff --git a/e2e/pages/adf/process_services/widgets/headerWidget.ts b/e2e/pages/adf/process_services/widgets/headerWidget.ts
index 399f95e1ff..824eea8862 100644
--- a/e2e/pages/adf/process_services/widgets/headerWidget.ts
+++ b/e2e/pages/adf/process_services/widgets/headerWidget.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import FormFields = require('../formFields');
+import { FormFields } from '../formFields';
 import { by } from 'protractor';
 
 export class HeaderWidget {
diff --git a/e2e/pages/adf/process_services/widgets/hyperlinkWidget.ts b/e2e/pages/adf/process_services/widgets/hyperlinkWidget.ts
index 01c8dbcaf7..b39ea12310 100644
--- a/e2e/pages/adf/process_services/widgets/hyperlinkWidget.ts
+++ b/e2e/pages/adf/process_services/widgets/hyperlinkWidget.ts
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-import FormFields = require('../formFields');
+import { FormFields } from '../formFields';
 import { by, element } from 'protractor';
-import Util = require('../../../../util/util');
+import { Util } from '../../../../util/util';
 
 export class HyperlinkWidget {
 
@@ -30,7 +30,7 @@ export class HyperlinkWidget {
     }
 
     getFieldLabel(fieldId) {
-        let label = element(by.css(`adf-form-field div[id="field-${fieldId}-container"] label`));
+        let label = element.all(by.css(`adf-form-field div[id="field-${fieldId}-container"] label`)).first();
         Util.waitUntilElementIsVisible(label);
         return label.getText();
     }
diff --git a/e2e/pages/adf/process_services/widgets/multilineTextWidget.ts b/e2e/pages/adf/process_services/widgets/multilineTextWidget.ts
index dce3386484..aa5ed122f5 100644
--- a/e2e/pages/adf/process_services/widgets/multilineTextWidget.ts
+++ b/e2e/pages/adf/process_services/widgets/multilineTextWidget.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import FormFields = require('../formFields');
+import { FormFields } from '../formFields';
 import { by } from 'protractor';
 
 export class MultilineTextWidget {
diff --git a/e2e/pages/adf/process_services/widgets/numberWidget.ts b/e2e/pages/adf/process_services/widgets/numberWidget.ts
index 45f68e3122..158367567d 100644
--- a/e2e/pages/adf/process_services/widgets/numberWidget.ts
+++ b/e2e/pages/adf/process_services/widgets/numberWidget.ts
@@ -16,15 +16,15 @@
  */
 
 import { element, by } from 'protractor';
-import Util = require('../../../../util/util');
-import FormFields = require('../formFields');
+import { Util } from '../../../../util/util';
+import { FormFields } from '../formFields';
 
 export class NumberWidget {
 
     formFields = new FormFields();
 
     getNumberFieldLabel(fieldId) {
-        let label = element(by.css(`adf-form-field div[id="field-${fieldId}-container"] label`));
+        let label = element.all(by.css(`adf-form-field div[id="field-${fieldId}-container"] label`)).first();
         Util.waitUntilElementIsVisible(label);
         return label.getText();
     }
diff --git a/e2e/pages/adf/process_services/widgets/peopleWidget.ts b/e2e/pages/adf/process_services/widgets/peopleWidget.ts
index 63690d164f..b3c35ebdcf 100644
--- a/e2e/pages/adf/process_services/widgets/peopleWidget.ts
+++ b/e2e/pages/adf/process_services/widgets/peopleWidget.ts
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import FormFields = require('../formFields');
-import Util = require('../../../../util/util');
+import { FormFields } from '../formFields';
+import { Util } from '../../../../util/util';
 import { by, element } from 'protractor';
 
 export class PeopleWidget {
diff --git a/e2e/pages/adf/process_services/widgets/radioButtonsWidget.ts b/e2e/pages/adf/process_services/widgets/radioButtonsWidget.ts
index 688a09913b..50f9f2469a 100644
--- a/e2e/pages/adf/process_services/widgets/radioButtonsWidget.ts
+++ b/e2e/pages/adf/process_services/widgets/radioButtonsWidget.ts
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import FormFields = require('../formFields');
-import Util = require('../../../../util/util');
+import { FormFields } from '../formFields';
+import { Util } from '../../../../util/util';
 import { by, element } from 'protractor';
 
 export class RadioButtonsWidget {
@@ -26,7 +26,7 @@ export class RadioButtonsWidget {
     formFields = new FormFields();
 
     getSpecificOptionLabel(fieldId, optionNumber) {
-        let optionLocator = by.css('label[for*="radiobuttons-option_' + optionNumber + '"] div[class*="adf-content"]');
+        let optionLocator = by.css('label[for*="radiobuttons-option_' + optionNumber + '"]');
 
         let option = this.formFields.getWidget(fieldId).element(optionLocator);
         Util.waitUntilElementIsVisible(option);
@@ -34,7 +34,7 @@ export class RadioButtonsWidget {
     }
 
     selectOption(fieldId, optionNumber) {
-        let optionLocator = by.css(`label[for*="${fieldId}-option_${optionNumber}"] div[class*="adf-content"]`);
+        let optionLocator = by.css(`label[for*="${fieldId}-option_${optionNumber}"]`);
 
         let option = this.formFields.getWidget(fieldId).element(optionLocator);
         Util.waitUntilElementIsVisible(option);
@@ -47,7 +47,7 @@ export class RadioButtonsWidget {
     }
 
     getRadioWidgetLabel(fieldId) {
-        let label = element(by.css(`adf-form-field div[id="field-${fieldId}-container"] label`));
+        let label = element.all(by.css(`adf-form-field div[id="field-${fieldId}-container"] label`)).first();
         Util.waitUntilElementIsVisible(label);
         return label.getText();
     }
diff --git a/e2e/pages/adf/process_services/widgets/textWidget.ts b/e2e/pages/adf/process_services/widgets/textWidget.ts
index 6bd5c35bb6..2bef51ab9b 100644
--- a/e2e/pages/adf/process_services/widgets/textWidget.ts
+++ b/e2e/pages/adf/process_services/widgets/textWidget.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import FormFields = require('../formFields');
+import { FormFields } from '../formFields';
 import { by } from 'protractor';
 
 export class TextWidget {
diff --git a/e2e/pages/adf/searchFiltersPage.ts b/e2e/pages/adf/searchFiltersPage.ts
index 6d624a04fb..2a5156d2b4 100644
--- a/e2e/pages/adf/searchFiltersPage.ts
+++ b/e2e/pages/adf/searchFiltersPage.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import Util = require('../../util/util');
+import { Util } from '../../util/util';
 import { element, by } from 'protractor';
 import { SearchCategoriesPage } from './content_services/search/search-categories';
 
diff --git a/e2e/pages/adf/searchResultsPage.ts b/e2e/pages/adf/searchResultsPage.ts
index 87d3ff4478..26ab772be8 100644
--- a/e2e/pages/adf/searchResultsPage.ts
+++ b/e2e/pages/adf/searchResultsPage.ts
@@ -15,17 +15,17 @@
  * limitations under the License.
  */
 
-import Util = require('../../util/util');
-import ContentList = require('./dialog/contentList');
-import DatatablePage = require('./dataTablePage');
+import { Util } from '../../util/util';
+import { ContentListPage } from './dialog/contentListPage';
+import { DataTablePage } from './dataTablePage';
 import { element, by, protractor, browser } from 'protractor';
 
 export class SearchResultsPage {
 
     noResultsMessage = element(by.css('div[class="adf-no-result-message"]'));
-    noResultsMessageBy = by.css('div[class="adf-no-result-message"]');
-    contentList = new ContentList();
-    dataTable = new DatatablePage();
+    noResultsMessageBy = element(by.css('div[class="adf-no-result-message"]'));
+    contentList = new ContentListPage();
+    dataTable = new DataTablePage();
     sortArrowLocator = by.css('adf-sorting-picker button mat-icon');
     sortingArrow = element(by.css('adf-sorting-picker div[class="mat-select-arrow"]'));
 
@@ -55,8 +55,7 @@ export class SearchResultsPage {
     }
 
     checkNoResultMessageIsDisplayed() {
-        Util.waitUntilElementIsPresent(element(this.noResultsMessageBy));
-        Util.waitUntilElementIsVisible(element(this.noResultsMessageBy));
+        Util.waitUntilElementIsVisible(this.noResultsMessageBy);
         return this;
     }
 
diff --git a/e2e/pages/adf/settingsPage.ts b/e2e/pages/adf/settingsPage.ts
index d5e691446d..f57c7627dc 100644
--- a/e2e/pages/adf/settingsPage.ts
+++ b/e2e/pages/adf/settingsPage.ts
@@ -16,7 +16,7 @@
  */
 
 import TestConfig = require('../../test.config');
-import Util = require('../../util/util');
+import { Util } from '../../util/util';
 import { element, by, browser } from 'protractor';
 
 export class SettingsPage {
@@ -51,6 +51,7 @@ export class SettingsPage {
     applyButton = element(by.css('button[data-automation-id*="host-button"]'));
 
     goToSettingsPage() {
+        browser.waitForAngularEnabled(true);
         browser.driver.get(this.settingsURL);
         Util.waitUntilElementIsVisible(this.providerDropdown);
         return this;
diff --git a/e2e/pages/adf/tagPage.ts b/e2e/pages/adf/tagPage.ts
index e400a6c2c8..17777a7653 100644
--- a/e2e/pages/adf/tagPage.ts
+++ b/e2e/pages/adf/tagPage.ts
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import Util = require('../../util/util');
-import ContentList = require('./dialog/contentList');
+import { Util } from '../../util/util';
+import { ContentListPage } from './dialog/contentListPage';
 
 import { element, by, protractor, browser } from 'protractor';
 
@@ -66,7 +66,7 @@ export class TagPage {
     }
 
     deleteTagFromTagListByNodeId(name) {
-        let deleteChip = element(by.id('tag_chips_delete_' + name ));
+        let deleteChip = element(by.id('tag_chips_delete_' + name));
         Util.waitUntilElementIsVisible(deleteChip);
         deleteChip.click();
         return this;
@@ -134,7 +134,7 @@ export class TagPage {
 
     checkTagListIsOrderedAscending() {
         let deferred = protractor.promise.defer();
-        new ContentList().checkListIsSorted(false, this.tagListRowLocator).then((result) => {
+        new ContentListPage().checkListIsSorted(false, this.tagListRowLocator).then((result) => {
             deferred.fulfill(result);
         });
         return deferred.promise;
@@ -142,7 +142,7 @@ export class TagPage {
 
     checkTagListByNodeIdIsOrderedAscending() {
         let deferred = protractor.promise.defer();
-        new ContentList().checkListIsSorted(false, this.tagListByNodeIdRowLocator).then((result) => {
+        new ContentListPage().checkListIsSorted(false, this.tagListByNodeIdRowLocator).then((result) => {
             deferred.fulfill(result);
         });
         return deferred.promise;
@@ -150,19 +150,19 @@ export class TagPage {
 
     checkTagListContentServicesIsOrderedAscending() {
         let deferred = protractor.promise.defer();
-        new ContentList().checkListIsSorted(false, this.tagListContentServicesRowLocator).then((result) => {
+        new ContentListPage().checkListIsSorted(false, this.tagListContentServicesRowLocator).then((result) => {
             deferred.fulfill(result);
         });
         return deferred.promise;
     }
 
     checkDeleteTagFromTagListByNodeIdIsDisplayed(name) {
-        let deleteChip =  element(by.id('tag_chips_delete_' + name ));
+        let deleteChip = element(by.id('tag_chips_delete_' + name));
         return Util.waitUntilElementIsVisible(deleteChip);
     }
 
     checkDeleteTagFromTagListByNodeIdIsNotDisplayed(name) {
-        let deleteChip =  element(by.id('tag_chips_delete_' + name ));
+        let deleteChip = element(by.id('tag_chips_delete_' + name));
         return Util.waitUntilElementIsNotVisible(deleteChip);
     }
 
@@ -197,7 +197,6 @@ export class TagPage {
         this.showMoreButton.isDisplayed().then((visible) => {
             if (visible) {
                 this.showMoreButton.click();
-
                 this.clickShowMoreButtonUntilNotDisplayed();
             }
         }, (err) => {
diff --git a/e2e/pages/adf/trashcanPage.ts b/e2e/pages/adf/trashcanPage.ts
index 3718fa4fac..dd74233d9a 100644
--- a/e2e/pages/adf/trashcanPage.ts
+++ b/e2e/pages/adf/trashcanPage.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import Util = require('../../util/util');
+import { Util } from '../../util/util';
 
 import { element, by } from 'protractor';
 
diff --git a/e2e/pages/adf/versionManagerPage.ts b/e2e/pages/adf/versionManagerPage.ts
index 26b72aa4fd..1af2ad622a 100644
--- a/e2e/pages/adf/versionManagerPage.ts
+++ b/e2e/pages/adf/versionManagerPage.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import Util = require('../../util/util');
+import { Util } from '../../util/util';
 import TestConfig = require('../../test.config');
 import path = require('path');
 import remote = require('selenium-webdriver/remote');
diff --git a/e2e/pages/adf/viewerPage.ts b/e2e/pages/adf/viewerPage.ts
index 976c177b4c..44f951c459 100644
--- a/e2e/pages/adf/viewerPage.ts
+++ b/e2e/pages/adf/viewerPage.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import Util = require('../../util/util');
+import { Util } from '../../util/util';
 
 import { TabsPage } from './material/tabsPage';
 import { FormControllersPage } from './material/formControllersPage';
@@ -95,7 +95,7 @@ export class ViewerPage {
     bugButton = element(by.id('adf-viewer-bug'));
 
     viewFile(fileName) {
-        let fileView = element.all(by.xpath('//div[@id="document-list-container"]//div[@filename="' + fileName + '"]')).first();
+        let fileView = element.all(by.css(`#document-list-container div[filename="${fileName}"]`)).first();
         Util.waitUntilElementIsVisible(fileView);
         fileView.click();
         browser.actions().sendKeys(protractor.Key.ENTER).perform();
@@ -157,7 +157,7 @@ export class ViewerPage {
 
     checkCurrentThumbnailIsSelected() {
         let selectedThumbnail = element(by.css('adf-pdf-thumb[class="adf-pdf-thumbnails__thumb ng-star-inserted adf-pdf-thumbnails__thumb--selected"] > img'));
-        this.pageSelectorInput.getAttribute('value').then(function (pageNumber) {
+        this.pageSelectorInput.getAttribute('value').then((pageNumber) => {
             browser.controlFlow().execute(async () => {
                 expect('Page ' + pageNumber).toEqual(await selectedThumbnail.getAttribute('title'));
             });
@@ -236,7 +236,7 @@ export class ViewerPage {
 
     checkPageSelectorInputIsDisplayed(checkNumber) {
         Util.waitUntilElementIsVisible(this.pageSelectorInput);
-        this.pageSelectorInput.getAttribute('value').then(function (pageNumber) {
+        this.pageSelectorInput.getAttribute('value').then((pageNumber) => {
             expect(pageNumber).toEqual(checkNumber);
         });
     }
diff --git a/e2e/process-services-cloud/apps_section_cloud.e2e.ts b/e2e/process-services-cloud/apps_section_cloud.e2e.ts
index 15734d3eeb..0c759a1ff4 100644
--- a/e2e/process-services-cloud/apps_section_cloud.e2e.ts
+++ b/e2e/process-services-cloud/apps_section_cloud.e2e.ts
@@ -15,28 +15,27 @@
  * limitations under the License.
  */
 
-import { LoginAPSPage } from '../pages/adf/loginApsPage';
+import { LoginSSOPage } from '../pages/adf/loginSSOPage';
 import { SettingsPage } from '../pages/adf/settingsPage';
 import { AppListCloudComponent } from '../pages/adf/process_cloud/appListCloudComponent';
 import TestConfig = require('../test.config');
-import { browser } from 'protractor';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 
 describe('Applications list', () => {
 
     const settingsPage = new SettingsPage();
-    const loginApsPage = new LoginAPSPage();
+    const loginSSOPage = new LoginSSOPage();
     const navigationBarPage = new NavigationBarPage();
     const appListCloudComponent = new AppListCloudComponent();
     const path = '/auth/realms/springboot';
     const appName = 'task-app';
 
-    it ('[C289910] Should the app be displayed on dashboard when is deployed on APS', async () => {
+    it('[C289910] Should the app be displayed on dashboard when is deployed on APS', () => {
 
-        await settingsPage.setProviderBpmSso(TestConfig.adf.hostSso, TestConfig.adf.hostSso + path);
-        browser.ignoreSynchronization = true;
-        await loginApsPage.loginAPS(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
-        await navigationBarPage.navigateToProcessServicesCloudPage();
+        settingsPage.setProviderBpmSso(TestConfig.adf.hostSso, TestConfig.adf.hostSso + path);
+        loginSSOPage.loginAPS(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        navigationBarPage.navigateToProcessServicesCloudPage();
 
         appListCloudComponent.checkApsContainer();
 
diff --git a/e2e/process-services-cloud/task_filters_cloud.e2e.ts b/e2e/process-services-cloud/task_filters_cloud.e2e.ts
index 570bd03e95..44e249e71d 100644
--- a/e2e/process-services-cloud/task_filters_cloud.e2e.ts
+++ b/e2e/process-services-cloud/task_filters_cloud.e2e.ts
@@ -17,20 +17,19 @@
 
 import TestConfig = require('../test.config');
 
-import { LoginAPSPage } from '../pages/adf/loginApsPage';
+import { LoginSSOPage } from '../pages/adf/loginSSOPage';
 import { SettingsPage } from '../pages/adf/settingsPage';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 import { TasksCloudDemoPage } from '../pages/adf/demo-shell/tasksCloudDemoPage';
 import { AppListCloudComponent } from '../pages/adf/process_cloud/appListCloudComponent';
 
 import { Tasks } from '../actions/APS-cloud/tasks';
-import { browser } from 'protractor';
 
 describe('Task filters cloud', () => {
 
     describe('Filters', () => {
         const settingsPage = new SettingsPage();
-        const loginApsPage = new LoginAPSPage();
+        const loginSSOPage = new LoginSSOPage();
         const navigationBarPage = new NavigationBarPage();
         let appListCloudComponent = new AppListCloudComponent();
         let tasksCloudDemoPage = new TasksCloudDemoPage();
@@ -40,20 +39,18 @@ describe('Task filters cloud', () => {
         let silentLogin;
         const newTask = 'newTask', completedTask = 'completedTask1', myTask = 'myTask';
         const simpleApp = 'simple-app';
-        const user = 'devopsuser', password = 'password';
 
-        beforeAll(async () => {
+        beforeAll(() => {
             silentLogin = false;
-            await settingsPage.setProviderBpmSso(TestConfig.adf.hostSso, TestConfig.adf.hostSso + path, silentLogin);
-            await loginApsPage.clickOnSSOButton();
-            browser.ignoreSynchronization = true;
-            await loginApsPage.loginAPS(user, password);
+            settingsPage.setProviderBpmSso(TestConfig.adf.hostSso, TestConfig.adf.hostSso + path, silentLogin);
+            loginSSOPage.clickOnSSOButton();
+            loginSSOPage.loginAPS(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
         });
 
-        beforeEach(async (done) => {
-            await navigationBarPage.navigateToProcessServicesCloudPage();
-            await appListCloudComponent.checkApsContainer();
-            await appListCloudComponent.goToApp(simpleApp);
+        beforeEach((done) => {
+            navigationBarPage.navigateToProcessServicesCloudPage();
+            appListCloudComponent.checkApsContainer();
+            appListCloudComponent.goToApp(simpleApp);
             done();
         });
 
@@ -61,9 +58,9 @@ describe('Task filters cloud', () => {
             tasksCloudDemoPage.myTasksFilter().checkTaskFilterIsDisplayed();
         });
 
-        xit('[C290009] Should display default filters and created task', async() => {
-            await tasksService.init(user, password);
-            await tasksService.createStandaloneTask(newTask, simpleApp);
+        xit('[C290009] Should display default filters and created task', () => {
+            tasksService.init(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+            tasksService.createStandaloneTask(newTask, simpleApp);
 
             tasksCloudDemoPage.completedTasksFilter().clickTaskFilter();
             expect(tasksCloudDemoPage.checkActiveFilterActive()).toBe('Completed Tasks');
@@ -75,12 +72,12 @@ describe('Task filters cloud', () => {
         });
 
         // failing due to ACTIVITI-2463
-        xit('[C289955] Should display task in Complete Tasks List when task is completed', async() => {
-            await tasksService.init(user, password);
-            let task = await tasksService.createStandaloneTask(completedTask, simpleApp);
+        xit('[C289955] Should display task in Complete Tasks List when task is completed', () => {
+            tasksService.init(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+            let task = tasksService.createStandaloneTask(completedTask, simpleApp);
 
-            await tasksService.claimTask(task.entry.id, simpleApp);
-            await tasksService.completeTask(task.entry.id, simpleApp);
+            tasksService.claimTask(task.entry.id, simpleApp);
+            tasksService.completeTask(task.entry.id, simpleApp);
 
             tasksCloudDemoPage.myTasksFilter().clickTaskFilter();
             expect(tasksCloudDemoPage.checkActiveFilterActive()).toBe('My Tasks');
@@ -91,9 +88,9 @@ describe('Task filters cloud', () => {
             tasksCloudDemoPage.taskListCloudComponent().getDataTable().checkContentIsDisplayed(completedTask);
         });
 
-        xit('[C289957] Should display task filter results when task filter is selected', async () => {
-            await tasksService.init(user, password);
-            let task = await tasksService.createStandaloneTask(myTask, simpleApp);
+        xit('[C289957] Should display task filter results when task filter is selected', () => {
+            tasksService.init(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+            let task = tasksService.createStandaloneTask(myTask, simpleApp);
 
             tasksCloudDemoPage.myTasksFilter().clickTaskFilter();
             expect(tasksCloudDemoPage.checkActiveFilterActive()).toBe('My Tasks');
diff --git a/e2e/process-services/Task_details_no_form.e2e.ts b/e2e/process-services/Task_details_no_form.e2e.ts
index 097fceb22e..2d990ec8a0 100644
--- a/e2e/process-services/Task_details_no_form.e2e.ts
+++ b/e2e/process-services/Task_details_no_form.e2e.ts
@@ -21,7 +21,7 @@ import { TasksPage } from '../pages/adf/process_services/tasksPage';
 
 import CONSTANTS = require('../util/constants');
 
-import Tenant = require('../models/APS/Tenant');
+import { Tenant } from '../models/APS/Tenant';
 
 import TestConfig = require('../test.config');
 import resources = require('../util/resources');
diff --git a/e2e/process-services/attach-file-widget.e2e.ts b/e2e/process-services/attach-file-widget.e2e.ts
index 3210c653b6..2e6461b40e 100644
--- a/e2e/process-services/attach-file-widget.e2e.ts
+++ b/e2e/process-services/attach-file-widget.e2e.ts
@@ -22,7 +22,7 @@ import { TasksPage } from '../pages/adf/process_services/tasksPage';
 
 import CONSTANTS = require('../util/constants');
 
-import FileModel = require('../models/ACS/fileModel');
+import { FileModel } from '../models/ACS/fileModel';
 
 import TestConfig = require('../test.config');
 import resources = require('../util/resources');
diff --git a/e2e/process-services/attach_form_component.e2e.ts b/e2e/process-services/attach_form_component.e2e.ts
index 5a74a0daf5..489e720034 100644
--- a/e2e/process-services/attach_form_component.e2e.ts
+++ b/e2e/process-services/attach_form_component.e2e.ts
@@ -19,7 +19,7 @@ import { LoginPage } from '../pages/adf/loginPage';
 import { TasksPage } from '../pages/adf/process_services/tasksPage';
 import { AttachFormPage } from '../pages/adf/process_services/attachFormPage';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
-import FormFields = require('../pages/adf/process_services/formFields');
+import { FormFields } from '../pages/adf/process_services/formFields';
 
 import CONSTANTS = require('../util/constants');
 
@@ -51,7 +51,7 @@ describe('Attach Form Component', () => {
         formFieldValue: 'Test value'
     };
 
-    beforeAll(async(done) => {
+    beforeAll(async (done) => {
 
         this.alfrescoJsApi = new AlfrescoApi({
             provider: 'BPM',
@@ -61,7 +61,7 @@ describe('Attach Form Component', () => {
         done();
     });
 
-    beforeEach(async(done) => {
+    beforeEach(async (done) => {
         let users = new UsersActions();
         let appsActions = new AppsActions();
 
@@ -77,14 +77,14 @@ describe('Attach Form Component', () => {
 
         appId = appModel.id;
 
-        await this.alfrescoJsApi.activiti.taskApi.createNewTask({name: testNames.taskName});
+        await this.alfrescoJsApi.activiti.taskApi.createNewTask({ name: testNames.taskName });
 
         await loginPage.loginToProcessServicesUsingUserModel(user);
 
         done();
     });
 
-    afterEach(async(done) => {
+    afterEach(async (done) => {
         await this.alfrescoJsApi.activiti.modelsApi.deleteModel(appId);
 
         await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
diff --git a/e2e/process-services/checklist_component.e2e.ts b/e2e/process-services/checklist_component.e2e.ts
index 6992077edb..48cecd1372 100644
--- a/e2e/process-services/checklist_component.e2e.ts
+++ b/e2e/process-services/checklist_component.e2e.ts
@@ -21,7 +21,7 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 
 import CONSTANTS = require('../util/constants');
 
-import Tenant = require('../models/APS/Tenant');
+import { Tenant } from '../models/APS/Tenant';
 
 import TestConfig = require('../test.config');
 import resources = require('../util/resources');
diff --git a/e2e/process-services/comment_component_processes.e2e.ts b/e2e/process-services/comment_component_processes.e2e.ts
index f320e6dd7a..d9b1758cbb 100644
--- a/e2e/process-services/comment_component_processes.e2e.ts
+++ b/e2e/process-services/comment_component_processes.e2e.ts
@@ -17,7 +17,7 @@
 
 import { browser } from 'protractor';
 import { LoginPage } from '../pages/adf/loginPage';
-import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage');
+import { ProcessFiltersPage } from '../pages/adf/process_services/processFiltersPage';
 import { CommentsPage } from '../pages/adf/commentsPage';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 
diff --git a/e2e/process-services/custom_process_filters.e2e.ts b/e2e/process-services/custom_process_filters.e2e.ts
index b8dfe08b9a..6a70a1c33e 100644
--- a/e2e/process-services/custom_process_filters.e2e.ts
+++ b/e2e/process-services/custom_process_filters.e2e.ts
@@ -18,7 +18,7 @@
 import { browser } from 'protractor';
 
 import { LoginPage } from '../pages/adf/loginPage';
-import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage');
+import { ProcessFiltersPage } from '../pages/adf/process_services/processFiltersPage';
 import { AppNavigationBarPage } from '../pages/adf/process_services/appNavigationBarPage';
 import { AppSettingsToggles } from '../pages/adf/process_services/dialog/appSettingsToggles';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
diff --git a/e2e/process-services/custom_process_filters_sorting.e2e.ts b/e2e/process-services/custom_process_filters_sorting.e2e.ts
index 37f7d01f0d..21c706c8b2 100644
--- a/e2e/process-services/custom_process_filters_sorting.e2e.ts
+++ b/e2e/process-services/custom_process_filters_sorting.e2e.ts
@@ -19,8 +19,8 @@ import { browser } from 'protractor';
 
 import { LoginPage } from '../pages/adf/loginPage';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
-import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage');
-import FiltersPage = require('../pages/adf/process_services/filtersPage');
+import { ProcessFiltersPage } from '../pages/adf/process_services/processFiltersPage';
+import { FiltersPage } from '../pages/adf/process_services/filtersPage';
 
 import TestConfig = require('../test.config');
 import resources = require('../util/resources');
diff --git a/e2e/process-services/custom_tasks_filters.e2e.ts b/e2e/process-services/custom_tasks_filters.e2e.ts
index c360c84106..86c3394562 100644
--- a/e2e/process-services/custom_tasks_filters.e2e.ts
+++ b/e2e/process-services/custom_tasks_filters.e2e.ts
@@ -15,40 +15,23 @@
  * limitations under the License.
  */
 
-import { by } from 'protractor';
-
 import { LoginPage } from '../pages/adf/loginPage';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
-import {  TaskListDemoPage } from '../pages/adf/demo-shell/taskListDemoPage';
-import ProcessServicesPage = require('../pages/adf/process_services/processServicesPage');
-import PaginationPage = require('../pages/adf/paginationPage');
-import TasksPage = require('../pages/adf/process_services/tasksPage');
-import AppPublish = require('../models/APS/AppPublish');
-import CONSTANTS = require('../util/constants');
+import { TaskListDemoPage } from '../pages/adf/demo-shell/taskListDemoPage';
+import { PaginationPage } from '../pages/adf/paginationPage';
 import moment = require('moment');
 
-import Task = require('../models/APS/Task');
-import ProcessModel = require('../models/APS/UpdateProcessModel');
-import Tenant = require('../models/APS/Tenant');
-
-import TaskModel = require('../models/APS/TaskModel');
-import FileModel = require('../models/ACS/fileModel');
-import FormModel = require('../models/APS/FormModel');
+import { Tenant } from '../models/APS/Tenant';
 
 import TestConfig = require('../test.config');
 import resources = require('../util/resources');
-import Util = require('../util/util');
-
-import dateFormat = require('dateformat');
+import { Util } from '../util/util';
 
 import AlfrescoApi = require('alfresco-js-api-node');
 import { AppsActions } from '../actions/APS/apps.actions';
 import { AppsRuntimeActions } from '../actions/APS/appsRuntime.actions';
 import { UsersActions } from '../actions/users.actions';
 
-import path = require('path');
-import fs = require('fs');
-
 describe('Start Task - Custom App', () => {
 
     let loginPage = new LoginPage();
@@ -119,16 +102,21 @@ describe('Start Task - Custom App', () => {
         await apps.startProcess(this.alfrescoJsApi, secondAppModel);
 
         for (let i = 1; i < paginationTasksName.length; i++) {
-            await this.alfrescoJsApi.activiti.taskApi.createNewTask({'name': paginationTasksName[i]});
+            await this.alfrescoJsApi.activiti.taskApi.createNewTask({ 'name': paginationTasksName[i] });
         }
 
         for (let i = 0; i < 3; i++) {
-            completedTasks[i] = await this.alfrescoJsApi.activiti.taskApi.createNewTask({'name': completedTasksName[i],
-                'dueDate': Util.getSpecificDateAfterCrtDateInFormat('YYYY-MM-DDTHH:mm:ss.SSSZ', i + 2)});
+            completedTasks[i] = await this.alfrescoJsApi.activiti.taskApi.createNewTask({
+                'name': completedTasksName[i],
+                'dueDate': Util.getSpecificDateAfterCrtDateInFormat('YYYY-MM-DDTHH:mm:ss.SSSZ', i + 2)
+            });
             await this.alfrescoJsApi.activiti.taskActionsApi.completeTask(completedTasks[i].id);
         }
 
-        taskWithDueDate = await this.alfrescoJsApi.activiti.taskApi.createNewTask({'name': paginationTasksName[0], 'dueDate': currentDateStandardFormat});
+        taskWithDueDate = await this.alfrescoJsApi.activiti.taskApi.createNewTask({
+            'name': paginationTasksName[0],
+            'dueDate': currentDateStandardFormat
+        });
 
         loginPage.loginToProcessServicesUsingUserModel(processUserModel);
 
diff --git a/e2e/process-services/dynamic_table_date_picker.e2e.ts b/e2e/process-services/dynamic_table_date_picker.e2e.ts
index 40f06aef6d..3eef241c6c 100644
--- a/e2e/process-services/dynamic_table_date_picker.e2e.ts
+++ b/e2e/process-services/dynamic_table_date_picker.e2e.ts
@@ -16,7 +16,7 @@
  */
 
 import { LoginPage } from '../pages/adf/loginPage';
-import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage');
+import { ProcessFiltersPage } from '../pages/adf/process_services/processFiltersPage';
 import { AppNavigationBarPage } from '../pages/adf/process_services/appNavigationBarPage';
 import { DynamicTableWidget } from '../pages/adf/process_services/widgets/dynamicTableWidget';
 import { DropdownWidget } from '../pages/adf/process_services/widgets/dropdownWidget';
diff --git a/e2e/process-services/empty_process_list_component.e2e.ts b/e2e/process-services/empty_process_list_component.e2e.ts
index caf4c7d646..34d4213735 100644
--- a/e2e/process-services/empty_process_list_component.e2e.ts
+++ b/e2e/process-services/empty_process_list_component.e2e.ts
@@ -20,10 +20,10 @@ import resources = require('../util/resources');
 import { LoginPage } from '../pages/adf/loginPage';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage';
-import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage');
-import ProcessDetailsPage = require('../pages/adf/process_services/processDetailsPage');
+import { ProcessFiltersPage } from '../pages/adf/process_services/processFiltersPage';
+import { ProcessDetailsPage } from '../pages/adf/process_services/processDetailsPage';
 import { ProcessListPage } from '../pages/adf/process_services/processListPage';
-import StartProcessPage = require('../pages/adf/process_services/startProcessPage');
+import { StartProcessPage } from '../pages/adf/process_services/startProcessPage';
 
 import AlfrescoApi = require('alfresco-js-api-node');
 import { AppsActions } from '../actions/APS/apps.actions';
diff --git a/e2e/process-services/form_people_widget.e2e.ts b/e2e/process-services/form_people_widget.e2e.ts
index 022e1fc61a..e8878e9a55 100644
--- a/e2e/process-services/form_people_widget.e2e.ts
+++ b/e2e/process-services/form_people_widget.e2e.ts
@@ -16,10 +16,10 @@
  */
 
 import { LoginPage } from '../pages/adf/loginPage';
-import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage');
+import { ProcessFiltersPage } from '../pages/adf/process_services/processFiltersPage';
 import { Widget } from '../pages/adf/process_services/widgets/widget';
-import StartProcess = require('../pages/adf/process_services/startProcessPage');
-import ProcessDetailsPage = require('../pages/adf/process_services/processDetailsPage');
+import { StartProcessPage } from '../pages/adf/process_services/startProcessPage';
+import { ProcessDetailsPage } from '../pages/adf/process_services/processDetailsPage';
 import { TaskDetailsPage } from '../pages/adf/process_services/taskDetailsPage';
 import { AppNavigationBarPage } from '../pages/adf/process_services/appNavigationBarPage';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
@@ -41,7 +41,7 @@ describe('Form widgets - People', () => {
     let appModel;
     let alfrescoJsApi;
     let widget = new Widget();
-    let startProcess = new StartProcess();
+    let startProcess = new StartProcessPage();
     let processDetailsPage = new ProcessDetailsPage();
     let taskDetails = new TaskDetailsPage();
     let appNavigationBar = new AppNavigationBarPage();
diff --git a/e2e/process-services/form_widgets_component.e2e.ts b/e2e/process-services/form_widgets_component.e2e.ts
index abb06ee3e8..a105c16d19 100644
--- a/e2e/process-services/form_widgets_component.e2e.ts
+++ b/e2e/process-services/form_widgets_component.e2e.ts
@@ -16,7 +16,6 @@
  */
 
 import { LoginPage } from '../pages/adf/loginPage';
-import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage';
 import { TasksPage } from '../pages/adf/process_services/tasksPage';
 import { Widget } from '../pages/adf/process_services/widgets/widget';
 
@@ -41,7 +40,6 @@ describe('Form widgets', () => {
     let taskPage = new TasksPage();
     let newTask = 'First task';
     let loginPage = new LoginPage();
-    let processServicesPage = new ProcessServicesPage();
     let processUserModel;
     let appModel;
     let widget = new Widget();
diff --git a/e2e/process-services/pagination_processlist_addingProcesses.e2e.ts b/e2e/process-services/pagination_processlist_addingProcesses.e2e.ts
index 6aff7beb1f..e219613230 100644
--- a/e2e/process-services/pagination_processlist_addingProcesses.e2e.ts
+++ b/e2e/process-services/pagination_processlist_addingProcesses.e2e.ts
@@ -16,9 +16,9 @@
  */
 
 import { LoginPage } from '../pages/adf/loginPage';
-import PaginationPage = require('../pages/adf/paginationPage');
-import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage');
-import ProcessDetailsPage = require('../pages/adf/process_services/processDetailsPage');
+import { PaginationPage } from '../pages/adf/paginationPage';
+import { ProcessFiltersPage } from '../pages/adf/process_services/processFiltersPage';
+import { ProcessDetailsPage } from '../pages/adf/process_services/processDetailsPage';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 
 import TestConfig = require('../test.config');
diff --git a/e2e/process-services/pagination_tasklist_addingTasks.e2e.ts b/e2e/process-services/pagination_tasklist_addingTasks.e2e.ts
index c333b574d0..4bf016b30f 100644
--- a/e2e/process-services/pagination_tasklist_addingTasks.e2e.ts
+++ b/e2e/process-services/pagination_tasklist_addingTasks.e2e.ts
@@ -17,7 +17,7 @@
 
 import { LoginPage } from '../pages/adf/loginPage';
 import { TasksPage } from '../pages/adf/process_services/tasksPage';
-import PaginationPage = require('../pages/adf/paginationPage');
+import { PaginationPage } from '../pages/adf/paginationPage';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 
 import CONSTANTS = require('../util/constants');
diff --git a/e2e/process-services/people_component.e2e.ts b/e2e/process-services/people_component.e2e.ts
index 9f1dae94b9..be3b4542c7 100644
--- a/e2e/process-services/people_component.e2e.ts
+++ b/e2e/process-services/people_component.e2e.ts
@@ -21,7 +21,7 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 
 import CONSTANTS = require('../util/constants');
 
-import Tenant = require('../models/APS/Tenant');
+import { Tenant } from '../models/APS/Tenant';
 
 import TestConfig = require('../test.config');
 import resources = require('../util/resources');
diff --git a/e2e/process-services/process_attachmentList_actionMenu.e2e.ts b/e2e/process-services/process_attachmentList_actionMenu.e2e.ts
index 5e9d1574bc..d1cb98b11d 100644
--- a/e2e/process-services/process_attachmentList_actionMenu.e2e.ts
+++ b/e2e/process-services/process_attachmentList_actionMenu.e2e.ts
@@ -16,22 +16,22 @@
  */
 
 import { LoginPage } from '../pages/adf/loginPage';
-import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage');
-import ProcessDetailsPage = require('../pages/adf/process_services/processDetailsPage');
+import { ProcessFiltersPage } from '../pages/adf/process_services/processFiltersPage';
+import { ProcessDetailsPage } from '../pages/adf/process_services/processDetailsPage';
 import { AttachmentListPage } from '../pages/adf/process_services/attachmentListPage';
 import { ViewerPage } from '../pages/adf/viewerPage';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 
 import TestConfig = require('../test.config');
 import resources = require('../util/resources');
-import Util = require('../util/util');
+import { Util } from '../util/util';
 
 import path = require('path');
 
 import AlfrescoApi = require('alfresco-js-api-node');
 import { UsersActions } from '../actions/users.actions';
 import { AppsActions } from '../actions/APS/apps.actions';
-import FileModel = require('../models/ACS/fileModel');
+import { FileModel } from '../models/ACS/fileModel';
 import { browser } from 'protractor';
 
 describe('Attachment list action menu for processes', () => {
diff --git a/e2e/process-services/process_filters_component.e2e.ts b/e2e/process-services/process_filters_component.e2e.ts
index d37a112dea..bcb6d62c51 100644
--- a/e2e/process-services/process_filters_component.e2e.ts
+++ b/e2e/process-services/process_filters_component.e2e.ts
@@ -21,10 +21,10 @@ import { LoginPage } from '../pages/adf/loginPage';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 
 import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage';
-import StartProcessPage = require('../pages/adf/process_services/startProcessPage');
-import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage');
+import { StartProcessPage } from '../pages/adf/process_services/startProcessPage';
+import { ProcessFiltersPage } from '../pages/adf/process_services/processFiltersPage';
 import { AppNavigationBarPage } from '../pages/adf/process_services/appNavigationBarPage';
-import ProcessDetailsPage = require('../pages/adf/process_services/processDetailsPage');
+import { ProcessDetailsPage } from '../pages/adf/process_services/processDetailsPage';
 import { ProcessListPage } from '../pages/adf/process_services/processListPage';
 
 import AlfrescoApi = require('alfresco-js-api-node');
diff --git a/e2e/process-services/processlist_pagination.e2e.ts b/e2e/process-services/processlist_pagination.e2e.ts
index f94e265725..ed62c19d5c 100644
--- a/e2e/process-services/processlist_pagination.e2e.ts
+++ b/e2e/process-services/processlist_pagination.e2e.ts
@@ -17,9 +17,9 @@
 
 import { LoginPage } from '../pages/adf/loginPage';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
-import PaginationPage = require('../pages/adf/paginationPage');
-import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage');
-import ProcessDetailsPage = require('../pages/adf/process_services/processDetailsPage');
+import { PaginationPage } from '../pages/adf/paginationPage';
+import { ProcessFiltersPage } from '../pages/adf/process_services/processFiltersPage';
+import { ProcessDetailsPage } from '../pages/adf/process_services/processDetailsPage';
 
 import TestConfig = require('../test.config');
 import resources = require('../util/resources');
diff --git a/e2e/process-services/sort_tasklist_pagination.e2e.ts b/e2e/process-services/sort_tasklist_pagination.e2e.ts
index 3c1a250ad1..b3ad0a41fe 100644
--- a/e2e/process-services/sort_tasklist_pagination.e2e.ts
+++ b/e2e/process-services/sort_tasklist_pagination.e2e.ts
@@ -16,16 +16,15 @@
  */
 
 import { LoginPage } from '../pages/adf/loginPage';
-import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage';
 import { TasksPage } from '../pages/adf/process_services/tasksPage';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
-import PaginationPage = require('../pages/adf/paginationPage');
+import { PaginationPage } from '../pages/adf/paginationPage';
 
 import CONSTANTS = require('../util/constants');
 
 import TestConfig = require('../test.config');
 import resources = require('../util/resources');
-import Util = require('../util/util');
+import { Util } from '../util/util';
 
 import AlfrescoApi = require('alfresco-js-api-node');
 import { AppsActions } from '../actions/APS/apps.actions';
@@ -34,7 +33,6 @@ import { UsersActions } from '../actions/users.actions';
 describe('Task List Pagination - Sorting', () => {
 
     let loginPage = new LoginPage();
-    let processServicesPage = new ProcessServicesPage();
     let taskPage = new TasksPage();
     let paginationPage = new PaginationPage();
 
diff --git a/e2e/process-services/standalone_task.e2e.ts b/e2e/process-services/standalone_task.e2e.ts
index 968f52b603..26b85f96e9 100644
--- a/e2e/process-services/standalone_task.e2e.ts
+++ b/e2e/process-services/standalone_task.e2e.ts
@@ -23,7 +23,7 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 
 import CONSTANTS = require('../util/constants');
 
-import Tenant = require('../models/APS/Tenant');
+import { Tenant } from '../models/APS/Tenant';
 import Task = require('../models/APS/Task');
 
 import TestConfig = require('../test.config');
diff --git a/e2e/process-services/start_process_component.e2e.ts b/e2e/process-services/start_process_component.e2e.ts
index 7daa55d8c6..aec8a4b310 100644
--- a/e2e/process-services/start_process_component.e2e.ts
+++ b/e2e/process-services/start_process_component.e2e.ts
@@ -15,25 +15,25 @@
  * limitations under the License.
  */
 
-import Util = require('../util/util');
+import { Util } from '../util/util';
 import TestConfig = require('../test.config');
 import resources = require('../util/resources');
 import CONSTANTS = require('../util/constants');
 import { LoginPage } from '../pages/adf/loginPage';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage';
-import StartProcessPage = require('../pages/adf/process_services/startProcessPage');
-import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage');
+import { StartProcessPage } from '../pages/adf/process_services/startProcessPage';
+import { ProcessFiltersPage } from '../pages/adf/process_services/processFiltersPage';
 import { AppNavigationBarPage } from '../pages/adf/process_services/appNavigationBarPage';
-import ProcessDetailsPage = require('../pages/adf/process_services/processDetailsPage');
+import { ProcessDetailsPage } from '../pages/adf/process_services/processDetailsPage';
 import { AttachmentListPage } from '../pages/adf/process_services/attachmentListPage';
 import { AppsActions } from '../actions/APS/apps.actions';
 import { browser } from 'protractor';
 
-import User = require('../models/APS/User');
-import Tenant = require('../models/APS/Tenant');
+import { User } from '../models/APS/User';
+import { Tenant } from '../models/APS/Tenant';
 
-import FileModel = require('../models/ACS/fileModel');
+import { FileModel } from '../models/ACS/fileModel';
 import dateFormat = require('dateformat');
 
 import AlfrescoApi = require('alfresco-js-api-node');
diff --git a/e2e/process-services/start_task_custom_app.e2e.ts b/e2e/process-services/start_task_custom_app.e2e.ts
index a27a9a1d55..382d6337c1 100644
--- a/e2e/process-services/start_task_custom_app.e2e.ts
+++ b/e2e/process-services/start_task_custom_app.e2e.ts
@@ -23,9 +23,9 @@ import { AttachmentListPage } from '../pages/adf/process_services/attachmentList
 import { AppNavigationBarPage } from '../pages/adf/process_services/appNavigationBarPage';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 
-import Tenant = require('../models/APS/Tenant');
+import { Tenant } from '../models/APS/Tenant';
 
-import FileModel = require('../models/ACS/fileModel');
+import { FileModel } from '../models/ACS/fileModel';
 
 import TestConfig = require('../test.config');
 import resources = require('../util/resources');
@@ -283,7 +283,7 @@ describe('Start Task - Custom App', () => {
         taskPage.taskDetails().taskInfoDrawerIsDisplayed();
     });
 
-    it('[C263950] Should be able to see Spinner loading on task list when clicking on Tasks on custom app', () => {
+    xit('[C263950] Should be able to see Spinner loading on task list when clicking on Tasks on custom app', () => {
         navigationBarPage.navigateToProcessServicesPage().goToApp(appModel.name).clickTasksButton();
         taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS);
         taskPage.createNewTask().addName(tasks[7]).clickStartButton();
diff --git a/e2e/process-services/start_task_task_app.e2e.ts b/e2e/process-services/start_task_task_app.e2e.ts
index 1ef1da8e48..fafccdebc2 100644
--- a/e2e/process-services/start_task_task_app.e2e.ts
+++ b/e2e/process-services/start_task_task_app.e2e.ts
@@ -25,8 +25,8 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 
 import CONSTANTS = require('../util/constants');
 
-import Tenant = require('../models/APS/Tenant');
-import FileModel = require('../models/ACS/fileModel');
+import { Tenant } from '../models/APS/Tenant';
+import { FileModel } from '../models/ACS/fileModel';
 
 import TestConfig = require('../test.config');
 import resources = require('../util/resources');
@@ -179,7 +179,7 @@ describe('Start Task - Task App', () => {
         taskPage.taskDetails().taskInfoDrawerIsDisplayed();
     });
 
-    it('[C260424] Should be able to see Spinner loading on task list when clicking on Tasks', () => {
+    xit('[C260424] Should be able to see Spinner loading on task list when clicking on Tasks', () => {
         navigationBarPage.navigateToProcessServicesPage().goToTaskApp();
         taskPage.tasksListPage().getDataTable().checkSpinnerIsDisplayed();
     });
diff --git a/e2e/process-services/task-audit.e2e.ts b/e2e/process-services/task-audit.e2e.ts
index 1d59cee152..d955851317 100644
--- a/e2e/process-services/task-audit.e2e.ts
+++ b/e2e/process-services/task-audit.e2e.ts
@@ -21,7 +21,7 @@ import { TasksPage } from '../pages/adf/process_services/tasksPage';
 
 import CONSTANTS = require('../util/constants');
 
-import Tenant = require('../models/APS/Tenant');
+import { Tenant } from '../models/APS/Tenant';
 
 import TestConfig = require('../test.config');
 import resources = require('../util/resources');
@@ -31,7 +31,7 @@ import { UsersActions } from '../actions/users.actions';
 import { AppsActions } from '../actions/APS/apps.actions';
 
 import path = require('path');
-import Util = require('../util/util');
+import { Util } from '../util/util';
 
 describe('Task Audit', () => {
 
diff --git a/e2e/process-services/task_attachmentList_actionMenu.e2e.ts b/e2e/process-services/task_attachmentList_actionMenu.e2e.ts
index a587f3c278..2d98bb8bc1 100644
--- a/e2e/process-services/task_attachmentList_actionMenu.e2e.ts
+++ b/e2e/process-services/task_attachmentList_actionMenu.e2e.ts
@@ -27,7 +27,7 @@ import CONSTANTS = require('../util/constants');
 
 import TestConfig = require('../test.config');
 import resources = require('../util/resources');
-import Util = require('../util/util');
+import { Util } from '../util/util';
 
 import path = require('path');
 import fs = require('fs');
@@ -35,7 +35,7 @@ import fs = require('fs');
 import AlfrescoApi = require('alfresco-js-api-node');
 import { UsersActions } from '../actions/users.actions';
 import { AppsActions } from '../actions/APS/apps.actions';
-import FileModel = require('../models/ACS/fileModel');
+import { FileModel } from '../models/ACS/fileModel';
 
 describe('Attachment list action menu for tasks', () => {
 
diff --git a/e2e/process-services/task_details.e2e.ts b/e2e/process-services/task_details.e2e.ts
index e4c0432015..8e4933011f 100644
--- a/e2e/process-services/task_details.e2e.ts
+++ b/e2e/process-services/task_details.e2e.ts
@@ -19,7 +19,7 @@ import TestConfig = require('../test.config');
 
 import AlfrescoApi = require('alfresco-js-api-node');
 import { UsersActions } from '../actions/users.actions';
-import Tenant = require('../models/APS/Tenant');
+import { Tenant } from '../models/APS/Tenant';
 import Task = require('../models/APS/Task');
 import TaskModel = require('../models/APS/TaskModel');
 import FormModel = require('../models/APS/FormModel');
diff --git a/e2e/process-services/task_details_form.e2e.ts b/e2e/process-services/task_details_form.e2e.ts
index d3a22ef0a7..88f998e19e 100644
--- a/e2e/process-services/task_details_form.e2e.ts
+++ b/e2e/process-services/task_details_form.e2e.ts
@@ -16,34 +16,44 @@
  */
 
 import TestConfig = require('../test.config');
-import Util = require('../util/util');
+import { Util } from '../util/util';
 import CONSTANTS = require('../util/constants');
 
 import { LoginPage } from '../pages/adf/loginPage';
-import { NavigationBarPage } from '../pages/adf/navigationBarPage';
-import TasksListPage = require('../pages/adf/process_services/tasksListPage');
-import { TaskDetailsPage } from '../pages/adf/process_services/taskDetailsPage';
-import FiltersPage = require('../pages/adf/process_services/filtersPage');
 
-import TaskModel = require('../models/APS/StandaloneTask');
+import { NavigationBarPage } from '../pages/adf/navigationBarPage';
+import { TasksListPage } from '../pages/adf/process_services/tasksListPage';
+import { TaskDetailsPage } from '../pages/adf/process_services/taskDetailsPage';
+import { FiltersPage } from '../pages/adf/process_services/filtersPage';
+
+import { StandaloneTask } from '../models/APS/StandaloneTask';
 
 import AlfrescoApi = require('alfresco-js-api-node');
 import { UsersActions } from '../actions/users.actions';
 
 describe('Task Details - Form', () => {
     let loginPage = new LoginPage();
-    let navigationBarPage = new NavigationBarPage();
     let tasksListPage = new TasksListPage();
     let taskDetailsPage = new TaskDetailsPage();
     let filtersPage = new FiltersPage();
     let task, otherTask, user, newForm, attachedForm, otherAttachedForm;
 
-    beforeAll(async(done) => {
+    beforeAll(async (done) => {
         let users = new UsersActions();
-        let attachedFormModel = {'name': Util.generateRandomString(), 'description': '', 'modelType': 2, 'stencilSet': 0};
-        let otherTaskModel = new TaskModel();
-        let otherAttachedFormModel = {'name': Util.generateRandomString(), 'description': '', 'modelType': 2, 'stencilSet': 0};
-        let newFormModel = {'name': Util.generateRandomString(), 'description': '', 'modelType': 2, 'stencilSet': 0};
+        let attachedFormModel = {
+            'name': Util.generateRandomString(),
+            'description': '',
+            'modelType': 2,
+            'stencilSet': 0
+        };
+        let otherTaskModel = new StandaloneTask();
+        let otherAttachedFormModel = {
+            'name': Util.generateRandomString(),
+            'description': '',
+            'modelType': 2,
+            'stencilSet': 0
+        };
+        let newFormModel = { 'name': Util.generateRandomString(), 'description': '', 'modelType': 2, 'stencilSet': 0 };
 
         this.alfrescoJsApi = new AlfrescoApi({
             provider: 'BPM',
@@ -64,7 +74,7 @@ describe('Task Details - Form', () => {
 
         otherAttachedForm = await this.alfrescoJsApi.activiti.modelsApi.createModel(otherAttachedFormModel);
 
-        await this.alfrescoJsApi.activiti.taskApi.attachForm(otherEmptyTask.id, {'formId': otherAttachedForm.id});
+        await this.alfrescoJsApi.activiti.taskApi.attachForm(otherEmptyTask.id, { 'formId': otherAttachedForm.id });
 
         otherTask = await this.alfrescoJsApi.activiti.taskApi.getTask(otherEmptyTask.id);
 
@@ -74,11 +84,11 @@ describe('Task Details - Form', () => {
     });
 
     beforeEach(async (done) => {
-        let taskModel = new TaskModel();
+        let taskModel = new StandaloneTask();
 
         let emptyTask = await this.alfrescoJsApi.activiti.taskApi.createNewTask(taskModel);
 
-        await this.alfrescoJsApi.activiti.taskApi.attachForm(emptyTask.id, {'formId': attachedForm.id});
+        await this.alfrescoJsApi.activiti.taskApi.attachForm(emptyTask.id, { 'formId': attachedForm.id });
 
         task = await this.alfrescoJsApi.activiti.taskApi.getTask(emptyTask.id);
 
diff --git a/e2e/process-services/task_filters_component.e2e.ts b/e2e/process-services/task_filters_component.e2e.ts
index 48dc7f2533..fe98d2e51f 100644
--- a/e2e/process-services/task_filters_component.e2e.ts
+++ b/e2e/process-services/task_filters_component.e2e.ts
@@ -22,7 +22,7 @@ import { LoginPage } from '../pages/adf/loginPage';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage';
 import { TasksPage } from '../pages/adf/process_services/tasksPage';
-import TasksListPage = require('../pages/adf/process_services/tasksListPage');
+import { TasksListPage } from '../pages/adf/process_services/tasksListPage';
 import { TaskDetailsPage } from '../pages/adf/process_services/taskDetailsPage';
 import { AppNavigationBarPage } from '../pages/adf/process_services/appNavigationBarPage';
 import { AppSettingsToggles } from '../pages/adf/process_services/dialog/appSettingsToggles';
@@ -291,6 +291,7 @@ describe('Task', () => {
 
             browser.refresh();
             appNavigationBarPage.clickSettingsButton();
+            browser.sleep(500);
             appSettingsToggles.enableTaskFiltersIcon();
             appNavigationBarPage.clickTasksButton();
 
@@ -384,6 +385,9 @@ describe('Task', () => {
 
             browser.refresh();
             appNavigationBarPage.clickSettingsButton();
+
+            browser.sleep(500);
+
             appSettingsToggles.enableTaskFiltersIcon();
             appNavigationBarPage.clickTasksButton();
 
diff --git a/e2e/process-services/task_filters_sorting.e2e.ts b/e2e/process-services/task_filters_sorting.e2e.ts
index 81bbd5e251..ba37c1ddcd 100644
--- a/e2e/process-services/task_filters_sorting.e2e.ts
+++ b/e2e/process-services/task_filters_sorting.e2e.ts
@@ -21,7 +21,7 @@ import { LoginPage } from '../pages/adf/loginPage';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage';
 import { TasksPage } from '../pages/adf/process_services/tasksPage';
-import TasksListPage = require('../pages/adf/process_services/tasksListPage');
+import { TasksListPage } from '../pages/adf/process_services/tasksListPage';
 import { TaskDetailsPage } from '../pages/adf/process_services/taskDetailsPage';
 import { TaskFiltersDemoPage } from '../pages/adf/demo-shell/taskFiltersDemoPage';
 
diff --git a/e2e/process-services/task_list_pagination.e2e.ts b/e2e/process-services/task_list_pagination.e2e.ts
index 3b0ab93b32..c89791a3d9 100644
--- a/e2e/process-services/task_list_pagination.e2e.ts
+++ b/e2e/process-services/task_list_pagination.e2e.ts
@@ -18,7 +18,7 @@
 import { LoginPage } from '../pages/adf/loginPage';
 import { TasksPage } from '../pages/adf/process_services/tasksPage';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
-import PaginationPage = require('../pages/adf/paginationPage');
+import { PaginationPage } from '../pages/adf/paginationPage';
 
 import CONSTANTS = require('../util/constants');
 
diff --git a/e2e/restAPI/ACS/PeopleAPI.js b/e2e/restAPI/ACS/PeopleAPI.js
index 1505920007..b7f86babd8 100644
--- a/e2e/restAPI/ACS/PeopleAPI.js
+++ b/e2e/restAPI/ACS/PeopleAPI.js
@@ -25,7 +25,6 @@ var TestConfig = require('../../test.config');
 
 var peopleBaseUrl = 'people';
 
-
 function read(initialFile) {
     return new Promise(function (resolve, reject) {
         fs.readFile(initialFile, function (err, file) {
diff --git a/e2e/restAPI/APIUtil.js b/e2e/restAPI/APIUtil.js
index 3bbdebbae5..10885d975d 100644
--- a/e2e/restAPI/APIUtil.js
+++ b/e2e/restAPI/APIUtil.js
@@ -60,4 +60,3 @@ var APIUtils = function () {
 };
 
 module.exports = APIUtils;
-
diff --git a/e2e/content-services/search/components/search-checkList.e2e.ts b/e2e/search/components/search-checkList.e2e.ts
similarity index 95%
rename from e2e/content-services/search/components/search-checkList.e2e.ts
rename to e2e/search/components/search-checkList.e2e.ts
index 5513fb6bb8..a8761ececf 100644
--- a/e2e/content-services/search/components/search-checkList.e2e.ts
+++ b/e2e/search/components/search-checkList.e2e.ts
@@ -15,28 +15,28 @@
  * limitations under the License.
  */
 
-import { LoginPage } from '../../../pages/adf/loginPage';
-import { SearchFiltersPage } from '../../../pages/adf/searchFiltersPage';
-import ContentList = require('../../../pages/adf/dialog/contentList');
-import { ConfigEditorPage } from '../../../pages/adf/configEditorPage';
-import { NavigationBarPage } from '../../../pages/adf/navigationBarPage';
-import SearchDialog = require('../../../pages/adf/dialog/searchDialog');
+import { LoginPage } from '../../pages/adf/loginPage';
+import { SearchFiltersPage } from '../../pages/adf/searchFiltersPage';
+import { ContentListPage } from '../../pages/adf/dialog/contentListPage';
+import { ConfigEditorPage } from '../../pages/adf/configEditorPage';
+import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
+import { SearchDialog } from '../../pages/adf/dialog/searchDialog';
 
-import AcsUserModel = require('../../../models/ACS/acsUserModel');
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
 
-import TestConfig = require('../../../test.config');
+import TestConfig = require('../../test.config');
 
 import { SearchConfiguration } from '../search.config';
 
 import AlfrescoApi = require('alfresco-js-api-node');
-import { UploadActions } from '../../../actions/ACS/upload.actions';
+import { UploadActions } from '../../actions/ACS/upload.actions';
 import { browser } from 'protractor';
 
 describe('Search Radio Component', () => {
 
     const loginPage = new LoginPage();
     const searchFiltersPage = new SearchFiltersPage();
-    const contentList =  new ContentList();
+    const contentList =  new ContentListPage();
     const configEditorPage = new ConfigEditorPage();
     const navigationBarPage = new NavigationBarPage();
     const searchDialog = new SearchDialog();
diff --git a/e2e/content-services/search/components/search-date-range.e2e.ts b/e2e/search/components/search-date-range.e2e.ts
similarity index 92%
rename from e2e/content-services/search/components/search-date-range.e2e.ts
rename to e2e/search/components/search-date-range.e2e.ts
index 1884e676f8..e9538be00d 100644
--- a/e2e/content-services/search/components/search-date-range.e2e.ts
+++ b/e2e/search/components/search-date-range.e2e.ts
@@ -15,17 +15,17 @@
  * limitations under the License.
  */
 
-import { LoginPage } from '../../../pages/adf/loginPage';
-import SearchDialog = require('../../../pages/adf/dialog/searchDialog');
-import DataTablePage = require('../../../pages/adf/dataTablePage');
-import { SearchResultsPage } from '../../../pages/adf/searchResultsPage';
-import { DatePickerPage } from '../../../pages/adf/material/datePickerPage';
-import { NavigationBarPage } from '../../../pages/adf/navigationBarPage';
-import { ConfigEditorPage } from '../../../pages/adf/configEditorPage';
-import { SearchFiltersPage } from '../../../pages/adf/searchFiltersPage';
+import { LoginPage } from '../../pages/adf/loginPage';
+import { SearchDialog } from '../../pages/adf/dialog/searchDialog';
+import { DataTablePage } from '../../pages/adf/dataTablePage';
+import { SearchResultsPage } from '../../pages/adf/searchResultsPage';
+import { DatePickerPage } from '../../pages/adf/material/datePickerPage';
+import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
+import { ConfigEditorPage } from '../../pages/adf/configEditorPage';
+import { SearchFiltersPage } from '../../pages/adf/searchFiltersPage';
 import { SearchConfiguration } from '../search.config';
 
-import TestConfig = require('../../../test.config');
+import TestConfig = require('../../test.config');
 
 import AlfrescoApi = require('alfresco-js-api-node');
 import { browser } from 'protractor';
@@ -211,7 +211,7 @@ describe('Search Date Range Filter', () => {
             navigationBar.clickConfigEditorButton();
             configEditor.clickSearchConfiguration();
             configEditor.clickClearButton();
-            configEditor.enterBigConfigurationText(JSON.stringify(jsonFile));
+            configEditor.enterConfiguration(JSON.stringify(jsonFile));
             configEditor.clickSaveButton();
 
             searchDialog.clickOnSearchIcon().enterTextAndPressEnter('*');
diff --git a/e2e/content-services/search/components/search-number-range.e2e.ts b/e2e/search/components/search-number-range.e2e.ts
similarity index 96%
rename from e2e/content-services/search/components/search-number-range.e2e.ts
rename to e2e/search/components/search-number-range.e2e.ts
index 85df46c769..c15d0169b8 100644
--- a/e2e/content-services/search/components/search-number-range.e2e.ts
+++ b/e2e/search/components/search-number-range.e2e.ts
@@ -15,22 +15,22 @@
  * limitations under the License.
  */
 
-import { LoginPage } from '../../../pages/adf/loginPage';
-import SearchDialog = require('../../../pages/adf/dialog/searchDialog');
-import DataTablePage = require('../../../pages/adf/dataTablePage');
-import { SearchResultsPage } from '../../../pages/adf/searchResultsPage';
-import { NavigationBarPage } from '../../../pages/adf/navigationBarPage';
-import { ConfigEditorPage } from '../../../pages/adf/configEditorPage';
-import { SearchFiltersPage } from '../../../pages/adf/searchFiltersPage';
+import { LoginPage } from '../../pages/adf/loginPage';
+import { SearchDialog } from '../../pages/adf/dialog/searchDialog';
+import { DataTablePage } from '../../pages/adf/dataTablePage';
+import { SearchResultsPage } from '../../pages/adf/searchResultsPage';
+import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
+import { ConfigEditorPage } from '../../pages/adf/configEditorPage';
+import { SearchFiltersPage } from '../../pages/adf/searchFiltersPage';
 
-import TestConfig = require('../../../test.config');
+import TestConfig = require('../../test.config');
 
 import AlfrescoApi = require('alfresco-js-api-node');
-import { UploadActions } from '../../../actions/ACS/upload.actions';
-import AcsUserModel = require('../../../models/ACS/acsUserModel');
-import FileModel = require('../../../models/ACS/fileModel');
+import { UploadActions } from '../../actions/ACS/upload.actions';
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
+import { FileModel } from '../../models/ACS/fileModel';
 import { browser } from 'protractor';
-import resources = require('../../../util/resources');
+import resources = require('../../util/resources');
 import { SearchConfiguration } from '../search.config';
 
 describe('Search Number Range Filter', () => {
diff --git a/e2e/content-services/search/components/search-radio.e2e.ts b/e2e/search/components/search-radio.e2e.ts
similarity index 95%
rename from e2e/content-services/search/components/search-radio.e2e.ts
rename to e2e/search/components/search-radio.e2e.ts
index 323f530afe..7896af7bab 100644
--- a/e2e/content-services/search/components/search-radio.e2e.ts
+++ b/e2e/search/components/search-radio.e2e.ts
@@ -15,28 +15,28 @@
  * limitations under the License.
  */
 
-import { LoginPage } from '../../../pages/adf/loginPage';
-import { SearchFiltersPage } from '../../../pages/adf/searchFiltersPage';
-import ContentList = require('../../../pages/adf/dialog/contentList');
-import { ConfigEditorPage } from '../../../pages/adf/configEditorPage';
-import { NavigationBarPage } from '../../../pages/adf/navigationBarPage';
-import SearchDialog = require('../../../pages/adf/dialog/searchDialog');
+import { LoginPage } from '../../pages/adf/loginPage';
+import { SearchFiltersPage } from '../../pages/adf/searchFiltersPage';
+import { ContentListPage } from '../../pages/adf/dialog/contentListPage';
+import { ConfigEditorPage } from '../../pages/adf/configEditorPage';
+import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
+import { SearchDialog } from '../../pages/adf/dialog/searchDialog';
 
-import AcsUserModel = require('../../../models/ACS/acsUserModel');
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
 
-import TestConfig = require('../../../test.config');
+import TestConfig = require('../../test.config');
 
 import { SearchConfiguration } from '../search.config';
 
 import AlfrescoApi = require('alfresco-js-api-node');
-import { UploadActions } from '../../../actions/ACS/upload.actions';
+import { UploadActions } from '../../actions/ACS/upload.actions';
 import { browser } from 'protractor';
 
 describe('Search Radio Component', () => {
 
     const loginPage = new LoginPage();
     const searchFiltersPage = new SearchFiltersPage();
-    const contentList = new ContentList();
+    const contentList = new ContentListPage();
     const configEditorPage = new ConfigEditorPage();
     const navigationBarPage = new NavigationBarPage();
     const searchDialog = new SearchDialog();
diff --git a/e2e/content-services/search/components/search-slider.e2e.ts b/e2e/search/components/search-slider.e2e.ts
similarity index 87%
rename from e2e/content-services/search/components/search-slider.e2e.ts
rename to e2e/search/components/search-slider.e2e.ts
index e10de06cd0..bbc5de0824 100644
--- a/e2e/content-services/search/components/search-slider.e2e.ts
+++ b/e2e/search/components/search-slider.e2e.ts
@@ -15,22 +15,22 @@
  * limitations under the License.
  */
 
-import { LoginPage } from '../../../pages/adf/loginPage';
-import SearchDialog = require('../../../pages/adf/dialog/searchDialog');
-import DataTablePage = require('../../../pages/adf/dataTablePage');
-import { SearchResultsPage } from '../../../pages/adf/searchResultsPage';
-import { NavigationBarPage } from '../../../pages/adf/navigationBarPage';
-import { ConfigEditorPage } from '../../../pages/adf/configEditorPage';
-import { SearchFiltersPage } from '../../../pages/adf/searchFiltersPage';
+import { LoginPage } from '../../pages/adf/loginPage';
+import { SearchDialog } from '../../pages/adf/dialog/searchDialog';
+import { DataTablePage } from '../../pages/adf/dataTablePage';
+import { SearchResultsPage } from '../../pages/adf/searchResultsPage';
+import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
+import { ConfigEditorPage } from '../../pages/adf/configEditorPage';
+import { SearchFiltersPage } from '../../pages/adf/searchFiltersPage';
 
-import TestConfig = require('../../../test.config');
+import TestConfig = require('../../test.config');
 
 import AlfrescoApi = require('alfresco-js-api-node');
-import { UploadActions } from '../../../actions/ACS/upload.actions';
-import AcsUserModel = require('../../../models/ACS/acsUserModel');
-import FileModel = require('../../../models/ACS/fileModel');
+import { UploadActions } from '../../actions/ACS/upload.actions';
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
+import { FileModel } from '../../models/ACS/fileModel';
 import { browser } from 'protractor';
-import resources = require('../../../util/resources');
+import resources = require('../../util/resources');
 import { SearchConfiguration } from '../search.config';
 
 describe('Search Number Range Filter', () => {
@@ -157,7 +157,7 @@ describe('Search Number Range Filter', () => {
             navigationBar.clickConfigEditorButton();
             configEditor.clickSearchConfiguration();
             configEditor.clickClearButton();
-            configEditor.enterBigConfigurationText(JSON.stringify(jsonFile)).clickSaveButton();
+            configEditor.enterConfiguration(JSON.stringify(jsonFile)).clickSaveButton();
 
             searchDialog.checkSearchIconIsVisible()
                 .clickOnSearchIcon()
@@ -177,7 +177,7 @@ describe('Search Number Range Filter', () => {
             navigationBar.clickConfigEditorButton();
             configEditor.clickSearchConfiguration();
             configEditor.clickClearButton();
-            configEditor.enterBigConfigurationText(JSON.stringify(jsonFile)).clickSaveButton();
+            configEditor.enterConfiguration(JSON.stringify(jsonFile)).clickSaveButton();
 
             searchDialog.checkSearchIconIsVisible()
                 .clickOnSearchIcon()
@@ -199,7 +199,7 @@ describe('Search Number Range Filter', () => {
             navigationBar.clickConfigEditorButton();
             configEditor.clickSearchConfiguration();
             configEditor.clickClearButton();
-            configEditor.enterBigConfigurationText(JSON.stringify(jsonFile)).clickSaveButton();
+            configEditor.enterConfiguration(JSON.stringify(jsonFile)).clickSaveButton();
 
             searchDialog.checkSearchIconIsVisible()
                 .clickOnSearchIcon()
@@ -221,7 +221,7 @@ describe('Search Number Range Filter', () => {
             navigationBar.clickConfigEditorButton();
             configEditor.clickSearchConfiguration();
             configEditor.clickClearButton();
-            configEditor.enterBigConfigurationText(JSON.stringify(jsonFile)).clickSaveButton();
+            configEditor.enterConfiguration(JSON.stringify(jsonFile)).clickSaveButton();
 
             searchDialog.checkSearchIconIsVisible()
                 .clickOnSearchIcon()
diff --git a/e2e/content-services/search/components/search-text.e2e.ts b/e2e/search/components/search-text.e2e.ts
similarity index 88%
rename from e2e/content-services/search/components/search-text.e2e.ts
rename to e2e/search/components/search-text.e2e.ts
index 957b768151..9f72c4af83 100644
--- a/e2e/content-services/search/components/search-text.e2e.ts
+++ b/e2e/search/components/search-text.e2e.ts
@@ -17,19 +17,19 @@
 
 import { browser } from 'protractor';
 
-import AcsUserModel = require('../../../models/ACS/acsUserModel');
-import FolderModel = require('../../../models/ACS/folderModel');
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
+import { FolderModel } from '../../models/ACS/folderModel';
 
-import TestConfig = require('../../../test.config');
+import TestConfig = require('../../test.config');
 
 import AlfrescoApi = require('alfresco-js-api-node');
 
-import { LoginPage } from '../../../pages/adf/loginPage';
-import SearchDialog = require('../../../pages/adf/dialog/searchDialog');
-import { SearchResultsPage } from '../../../pages/adf/searchResultsPage';
-import { SearchFiltersPage } from '../../../pages/adf/searchFiltersPage';
-import { ConfigEditorPage } from '../../../pages/adf/configEditorPage';
-import { NavigationBarPage } from '../../../pages/adf/navigationBarPage';
+import { LoginPage } from '../../pages/adf/loginPage';
+import { SearchDialog } from '../../pages/adf/dialog/searchDialog';
+import { SearchResultsPage } from '../../pages/adf/searchResultsPage';
+import { SearchFiltersPage } from '../../pages/adf/searchFiltersPage';
+import { ConfigEditorPage } from '../../pages/adf/configEditorPage';
+import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
 
 import { SearchConfiguration } from '../search.config';
 
diff --git a/e2e/content-services/search/search.config.ts b/e2e/search/search.config.ts
similarity index 100%
rename from e2e/content-services/search/search.config.ts
rename to e2e/search/search.config.ts
diff --git a/e2e/content-services/search/search_component.e2e.ts b/e2e/search/search_component.e2e.ts
similarity index 70%
rename from e2e/content-services/search/search_component.e2e.ts
rename to e2e/search/search_component.e2e.ts
index 416a482ddd..acac883dfa 100644
--- a/e2e/content-services/search/search_component.e2e.ts
+++ b/e2e/search/search_component.e2e.ts
@@ -17,23 +17,23 @@
 
 import { browser } from 'protractor';
 
-import { LoginPage } from '../../pages/adf/loginPage';
-import SearchDialog = require('../../pages/adf/dialog/searchDialog');
-import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
-import filePreviewPage = require('../../pages/adf/filePreviewPage');
-import { SearchResultsPage } from '../../pages/adf/searchResultsPage';
+import { LoginPage } from '../pages/adf/loginPage';
+import { SearchDialog } from '../pages/adf/dialog/searchDialog';
+import { ContentServicesPage } from '../pages/adf/contentServicesPage';
+import { FilePreviewPage } from '../pages/adf/filePreviewPage';
+import { SearchResultsPage } from '../pages/adf/searchResultsPage';
 
-import AcsUserModel = require('../../models/ACS/acsUserModel');
-import FileModel = require('../../models/ACS/fileModel');
-import FolderModel = require('../../models/ACS/folderModel');
+import { AcsUserModel } from '../models/ACS/acsUserModel';
+import { FileModel } from '../models/ACS/fileModel';
+import { FolderModel } from '../models/ACS/folderModel';
 
-import TestConfig = require('../../test.config');
-import Util = require('../../util/util');
+import TestConfig = require('../test.config');
+import { Util } from '../util/util';
 
 import AlfrescoApi = require('alfresco-js-api-node');
-import { UploadActions } from '../../actions/ACS/upload.actions';
+import { UploadActions } from '../actions/ACS/upload.actions';
 
-describe('Search component - Search Bar', () => {
+xdescribe('Search component - Search Bar', () => {
 
     let search = {
         inactive: {
@@ -48,6 +48,7 @@ describe('Search component - Search Bar', () => {
     let contentServicesPage = new ContentServicesPage();
     let searchDialog = new SearchDialog();
     let searchResultPage = new SearchResultsPage();
+    let filePreviewPage = new FilePreviewPage();
 
     let acsUser = new AcsUserModel();
 
@@ -96,8 +97,6 @@ describe('Search component - Search Bar', () => {
 
         loginPage.loginToContentServicesUsingUserModel(acsUser);
 
-        contentServicesPage.goToDocumentList();
-
         done();
     });
 
@@ -112,28 +111,57 @@ describe('Search component - Search Bar', () => {
         done();
     });
 
+    beforeEach(() => {
+        contentServicesPage.goToDocumentList();
+    });
+
     it('[C272798] Search bar should be visible', () => {
-        searchDialog.checkSearchBarIsNotVisible().checkSearchIconIsVisible();
-        searchDialog.clickOnSearchIcon().checkSearchBarIsVisible().checkSearchIconIsVisible();
-        searchDialog.clickOnSearchIcon().checkSearchBarIsNotVisible().checkSearchIconIsVisible();
+        searchDialog
+            .checkSearchBarIsNotVisible()
+            .checkSearchIconIsVisible();
+
+        searchDialog
+            .clickOnSearchIcon()
+            .checkSearchBarIsVisible()
+            .checkSearchIconIsVisible();
+
+        searchDialog
+            .clickOnSearchIcon()
+            .checkSearchBarIsNotVisible()
+            .checkSearchIconIsVisible();
     });
 
     it('[C272799] Should be possible to hide search bar after input', () => {
-        searchDialog.checkSearchIconIsVisible().clickOnSearchIcon().enterText(firstFolderModel.shortName);
-        searchDialog.clickOnSearchIcon().checkSearchBarIsNotVisible().checkSearchIconIsVisible();
+        searchDialog
+            .checkSearchIconIsVisible()
+            .clickOnSearchIcon()
+            .enterText(firstFolderModel.shortName);
+
+        searchDialog
+            .clickOnSearchIcon()
+            .checkSearchBarIsNotVisible()
+            .checkSearchIconIsVisible();
+
         contentServicesPage.checkAcsContainer();
     });
 
     it('[C260255] Should display message when searching for an inexistent file', () => {
-        searchDialog.checkSearchBarIsNotVisible().clickOnSearchIcon().checkNoResultMessageIsNotDisplayed()
-            .enterText(search.inactive.name).checkNoResultMessageIsDisplayed();
+        searchDialog
+            .checkSearchBarIsNotVisible()
+            .clickOnSearchIcon()
+            .checkNoResultMessageIsNotDisplayed()
+            .enterText(search.inactive.name)
+            .checkNoResultMessageIsDisplayed();
+
         searchDialog.clearText();
         searchDialog.checkSearchBarIsNotVisible();
     });
 
     it('[C260256] Should display file/folder in search suggestion when typing first characters', () => {
-        contentServicesPage.goToDocumentList();
-        searchDialog.clickOnSearchIcon().checkSearchBarIsVisible().enterText(firstFolderModel.shortName);
+        searchDialog
+            .clickOnSearchIcon()
+            .checkSearchBarIsVisible()
+            .enterText(firstFolderModel.shortName);
 
         searchDialog.resultTableContainsRow(firstFolderModel.name);
 
@@ -157,8 +185,11 @@ describe('Search component - Search Bar', () => {
     });
 
     it('[C272800] Should display file/folder in search suggestion when typing name', () => {
-        contentServicesPage.goToDocumentList();
-        searchDialog.clickOnSearchIcon().checkSearchBarIsVisible().enterText(firstFolderModel.name);
+        searchDialog
+            .clickOnSearchIcon()
+            .checkSearchBarIsVisible()
+            .enterText(firstFolderModel.name);
+
         searchDialog.resultTableContainsRow(firstFolderModel.name);
 
         expect(searchDialog.getSpecificRowsHighlightName(firstFolderModel.name)).toEqual(firstFolderModel.name);
@@ -180,17 +211,29 @@ describe('Search component - Search Bar', () => {
     });
 
     it('[C260257] Should display content when clicking on folder from search suggestions', () => {
-        searchDialog.clickOnSearchIcon().enterText(firstFolderModel.shortName);
+        searchDialog
+            .clickOnSearchIcon()
+            .checkSearchBarIsVisible()
+            .enterText(firstFolderModel.shortName);
+
         searchDialog.resultTableContainsRow(firstFolderModel.name);
         searchDialog.clickOnSpecificRow(firstFolderModel.name);
-        contentServicesPage.checkAcsContainer().waitForTableBody();
+
+        contentServicesPage
+            .checkAcsContainer()
+            .waitForTableBody();
 
         expect(contentServicesPage.currentFolderName()).toEqual(firstFolderModel.name);
 
         contentServicesPage.goToDocumentList();
 
-        searchDialog.checkSearchIconIsVisible().clickOnSearchIcon().checkSearchBarIsVisible();
-        searchDialog.enterText(firstFileModel.name).resultTableContainsRow(firstFileModel.name);
+        searchDialog
+            .checkSearchIconIsVisible()
+            .clickOnSearchIcon()
+            .checkSearchBarIsVisible()
+            .enterText(firstFileModel.name)
+            .resultTableContainsRow(firstFileModel.name);
+
         searchDialog.clickOnSpecificRow(firstFileModel.name);
         expect(filePreviewPage.getPDFTitleFromSearch()).toEqual(firstFileModel.name);
 
@@ -198,31 +241,40 @@ describe('Search component - Search Bar', () => {
     });
 
     it('[C272801] Should display message when searching for non-existent folder', () => {
-        searchDialog.checkSearchIconIsVisible().clickOnSearchIcon();
-        searchDialog.enterTextAndPressEnter(search.inactive.name);
+        searchDialog
+            .checkSearchIconIsVisible()
+            .clickOnSearchIcon()
+            .checkSearchBarIsVisible()
+            .enterTextAndPressEnter(search.inactive.name);
+
         searchResultPage.checkNoResultMessageIsDisplayed();
-        contentServicesPage.goToDocumentList();
     });
 
     it('[C272802] Should be able to find an existent folder in search results', () => {
-        searchDialog.clickOnSearchIcon();
-        browser.driver.sleep(1000);
-        searchDialog.enterTextAndPressEnter(firstFolderModel.name);
+        searchDialog
+            .checkSearchIconIsVisible()
+            .clickOnSearchIcon()
+            .checkSearchBarIsVisible()
+            .enterTextAndPressEnter(firstFolderModel.name);
+
         searchResultPage.checkContentIsDisplayed(firstFolderModel.name);
     });
 
     it('[C260258] Should be able to find an existent file in search results', () => {
-        contentServicesPage.goToDocumentList();
-        searchDialog.clickOnSearchIcon();
-        searchDialog.enterTextAndPressEnter(firstFileModel.name);
+        searchDialog
+            .checkSearchIconIsVisible()
+            .clickOnSearchIcon()
+            .checkSearchBarIsVisible()
+            .enterTextAndPressEnter(firstFileModel.name);
+
         searchResultPage.checkContentIsDisplayed(firstFileModel.name);
     });
 
     it('[C91321] Should be able to use down arrow key when navigating throw suggestions', () => {
-        contentServicesPage.goToDocumentList();
-
         searchDialog
+            .checkSearchIconIsVisible()
             .clickOnSearchIcon()
+            .checkSearchBarIsVisible()
             .enterText(secondFolder.shortName)
             .pressDownArrowAndEnter();
 
@@ -230,11 +282,11 @@ describe('Search component - Search Bar', () => {
         expect(contentServicesPage.currentFolderName()).toEqual(secondFolder.name);
     });
 
-    it('[C260254] Search bar should get closed when changing browser tab', () => {
-        contentServicesPage.goToDocumentList();
-
+    xit('[C260254] Search bar should get closed when changing browser tab', () => {
         searchDialog
+            .checkSearchIconIsVisible()
             .clickOnSearchIcon()
+            .checkSearchBarIsVisible()
             .enterText(secondFolder.shortName);
 
         searchDialog.resultTableContainsRow(secondFolder.name);
@@ -242,6 +294,7 @@ describe('Search component - Search Bar', () => {
         Util.openNewTabInBrowser();
         Util.switchToWindowHandler(0);
 
+        browser.sleep(500);
         searchDialog.checkSearchBarIsNotVisible().checkSearchIconIsVisible();
     });
 });
diff --git a/e2e/content-services/search/search_filters.e2e.ts b/e2e/search/search_filters.e2e.ts
similarity index 83%
rename from e2e/content-services/search/search_filters.e2e.ts
rename to e2e/search/search_filters.e2e.ts
index 61c9f431af..abff053840 100644
--- a/e2e/content-services/search/search_filters.e2e.ts
+++ b/e2e/search/search_filters.e2e.ts
@@ -15,22 +15,21 @@
  * limitations under the License.
  */
 
-import { LoginPage } from '../../pages/adf/loginPage';
-import SearchDialog = require('../../pages/adf/dialog/searchDialog');
-import { SearchFiltersPage } from '../../pages/adf/searchFiltersPage';
-import PaginationPage = require('../../pages/adf/paginationPage');
-import ContentList = require('../../pages/adf/dialog/contentList');
-import { SearchCategoriesPage } from '../../pages/adf/content_services/search/search-categories';
+import { LoginPage } from '../pages/adf/loginPage';
+import { SearchDialog } from '../pages/adf/dialog/searchDialog';
+import { SearchFiltersPage } from '../pages/adf/searchFiltersPage';
+import { PaginationPage } from '../pages/adf/paginationPage';
+import { ContentListPage } from '../pages/adf/dialog/contentListPage';
 
-import AcsUserModel = require('../../models/ACS/acsUserModel');
-import FileModel = require('../../models/ACS/fileModel');
+import { AcsUserModel } from '../models/ACS/acsUserModel';
+import { FileModel } from '../models/ACS/fileModel';
 
-import TestConfig = require('../../test.config');
-import Util = require('../../util/util');
-import resources = require('../../util/resources');
+import TestConfig = require('../test.config');
+import { Util } from '../util/util';
+import resources = require('../util/resources');
 
 import AlfrescoApi = require('alfresco-js-api-node');
-import { UploadActions } from '../../actions/ACS/upload.actions';
+import { UploadActions } from '../actions/ACS/upload.actions';
 import { browser } from 'protractor';
 
 describe('Search Filters', () => {
@@ -38,10 +37,9 @@ describe('Search Filters', () => {
     let loginPage = new LoginPage();
     let searchDialog = new SearchDialog();
     let searchFiltersPage = new SearchFiltersPage();
-    const searchCategoriesPage = new SearchCategoriesPage();
     let uploadActions = new UploadActions();
     let paginationPage = new PaginationPage();
-    let contentList = new ContentList();
+    let contentList = new ContentListPage();
 
     let acsUser = new AcsUserModel();
 
@@ -58,7 +56,7 @@ describe('Search Filters', () => {
 
     let fileUploaded, fileTypePng;
 
-    let filter = {type: 'TYPE-PNG Image'};
+    let filter = { type: 'TYPE-PNG Image' };
 
     beforeAll(async (done) => {
 
@@ -131,7 +129,7 @@ describe('Search Filters', () => {
             .checkFileSizeFilterIsCollapsed();
     });
 
-    it('[C287796] Should be able to display the correct bucket number after selecting a filter',  () => {
+    it('[C287796] Should be able to display the correct bucket number after selecting a filter', () => {
         browser.get(TestConfig.adf.url + '/search;q=*');
 
         searchFiltersPage.fileTypeCheckListFiltersPage().clickCheckListOption('PNG Image');
diff --git a/e2e/content-services/search/search_multiselect.e2e.ts b/e2e/search/search_multiselect.e2e.ts
similarity index 93%
rename from e2e/content-services/search/search_multiselect.e2e.ts
rename to e2e/search/search_multiselect.e2e.ts
index 7725d48100..fdbe05815d 100644
--- a/e2e/content-services/search/search_multiselect.e2e.ts
+++ b/e2e/search/search_multiselect.e2e.ts
@@ -15,22 +15,22 @@
  * limitations under the License.
  */
 
-import TestConfig = require('../../test.config');
+import TestConfig = require('../test.config');
 import AlfrescoApi = require('alfresco-js-api-node');
 
-import Util = require('../../util/util');
-import resources = require('../../util/resources');
-import CONSTANTS = require('../../util/constants');
-import { UploadActions } from '../../actions/ACS/upload.actions';
+import { Util } from '../util/util';
+import resources = require('../util/resources');
+import CONSTANTS = require('../util/constants');
+import { UploadActions } from '../actions/ACS/upload.actions';
 import { browser } from 'protractor';
 
-import { LoginPage } from '../../pages/adf/loginPage';
-import SearchDialog = require('../../pages/adf/dialog/searchDialog');
-import { SearchResultsPage } from '../../pages/adf/searchResultsPage';
-import { SearchFiltersPage } from '../../pages/adf/searchFiltersPage';
+import { LoginPage } from '../pages/adf/loginPage';
+import { SearchDialog } from '../pages/adf/dialog/searchDialog';
+import { SearchResultsPage } from '../pages/adf/searchResultsPage';
+import { SearchFiltersPage } from '../pages/adf/searchFiltersPage';
 
-import AcsUserModel = require('../../models/ACS/acsUserModel');
-import FileModel = require('../../models/ACS/fileModel');
+import { AcsUserModel } from '../models/ACS/acsUserModel';
+import { FileModel } from '../models/ACS/fileModel';
 
 describe('Search Component - Multi-Select Facet', () => {
     let loginPage = new LoginPage();
diff --git a/e2e/content-services/search/search_page_component.e2e.ts b/e2e/search/search_page_component.e2e.ts
similarity index 93%
rename from e2e/content-services/search/search_page_component.e2e.ts
rename to e2e/search/search_page_component.e2e.ts
index db742b2cdf..a6fe2d2e69 100644
--- a/e2e/content-services/search/search_page_component.e2e.ts
+++ b/e2e/search/search_page_component.e2e.ts
@@ -17,23 +17,23 @@
 
 import { browser } from 'protractor';
 
-import { LoginPage } from '../../pages/adf/loginPage';
+import { LoginPage } from '../pages/adf/loginPage';
 
-import SearchDialog = require('../../pages/adf/dialog/searchDialog');
-import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
-import { SearchResultsPage } from '../../pages/adf/searchResultsPage';
-import filePreviewPage = require('../../pages/adf/filePreviewPage');
+import { SearchDialog } from '../pages/adf/dialog/searchDialog';
+import { ContentServicesPage } from '../pages/adf/contentServicesPage';
+import { SearchResultsPage } from '../pages/adf/searchResultsPage';
+import { FilePreviewPage } from '../pages/adf/filePreviewPage';
 
-import AcsUserModel = require('../../models/ACS/acsUserModel');
-import FolderModel = require('../../models/ACS/folderModel');
-import FileModel = require('../../models/ACS/fileModel');
+import { AcsUserModel } from '../models/ACS/acsUserModel';
+import { FolderModel } from '../models/ACS/folderModel';
+import { FileModel } from '../models/ACS/fileModel';
 
-import TestConfig = require('../../test.config');
-import Util = require('../../util/util');
-import resources = require('../../util/resources');
+import TestConfig = require('../test.config');
+import { Util } from '../util/util';
+import resources = require('../util/resources');
 
 import AlfrescoApi = require('alfresco-js-api-node');
-import { UploadActions } from '../../actions/ACS/upload.actions';
+import { UploadActions } from '../actions/ACS/upload.actions';
 
 describe('Search component - Search Page', () => {
     let search = {
@@ -53,6 +53,7 @@ describe('Search component - Search Page', () => {
     let contentServicesPage = new ContentServicesPage();
     let searchDialog = new SearchDialog();
     let searchResultPage = new SearchResultsPage();
+    let filePreviewPage = new FilePreviewPage();
 
     let acsUser = new AcsUserModel();
     let emptyFolderModel = new FolderModel({ 'name': 'search' + Util.generateRandomString() });
diff --git a/e2e/test.config.js b/e2e/test.config.js
index 41c22499b0..2a4e0d63e0 100644
--- a/e2e/test.config.js
+++ b/e2e/test.config.js
@@ -8,15 +8,12 @@ const HOST_SSO = process.env.URL_HOST_SSO_ADF;
 var USERNAME = process.env.USERNAME_ADF;
 var PASSWORD = process.env.PASSWORD_ADF;
 var EMAIL = process.env.EMAIL_ADF;
-var TIMEOUT = process.env.TIMEOUT || 20000;
+var TIMEOUT = parseInt(process.env.TIMEOUT, 10);
 
 module.exports = {
 
     main: {
         timeout: TIMEOUT,
-
-        presence_timeout: 60000,
-
         rootPath: __dirname
     },
 
diff --git a/e2e/util/util.js b/e2e/util/util.js
deleted file mode 100644
index 4068a2b50e..0000000000
--- a/e2e/util/util.js
+++ /dev/null
@@ -1,526 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var exports = module.exports = {};
-var fs = require('fs');
-var path = require('path');
-
-var until = protractor.ExpectedConditions;
-var TestConfig = require('../test.config');
-var moment = require('moment');
-
-var DEFAULT_TIMEOUT = parseInt(TestConfig.main.timeout);
-/**
- * Provides utility methods used throughout the testing framework.
- *
- * @class util.Util
- */
-
-/**
- * creates an absolute path string if multiple file uploads are required
- */
-exports.uploadParentFolder = function (filePath) {
-    var parentFolder = path.resolve(path.join(__dirname, 'test'));
-    return path.resolve(path.join(parentFolder, filePath));
-};
-
-/**
- * Sleeps the main thread for time millieconds
- * @param time {int} Milliseconds to sleep
- * @param callback
- * @method sleep
- */
-exports.sleep = function (time, callback) {
-    var stop = new Date().getTime();
-    while (new Date().getTime() < stop + time) {
-    }
-    callback();
-};
-
-/**
- * Get current date in long format: Oct 24, 2016
- *
- * @return {string}
- * @method getCrtDateLongFormat
- */
-exports.getCrtDateLongFormat = function () {
-    var currentDate = new Date();
-    var months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
-        'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'
-    ];
-
-    currentDate = months[currentDate.getMonth()] + ' ' + currentDate.getDate() + ', ' + (currentDate.getYear() + 1900);
-
-    return currentDate;
-};
-
-/**
- * Get current date in specified format
- *
- * @return {string}
- * @method getCrtDateInFormat
- */
-exports.getCrtDateInFormat = function (dateFormat) {
-    return moment().format(dateFormat);
-};
-
-/**
- * Get specific date after current date in specific format
- *
- * @return {string}
- * @method getCrtDateInFormat
- */
-exports.getSpecificDateAfterCrtDateInFormat = function (dateFormat, days) {
-    return moment(new Date()).add(days, 'days').format(dateFormat);
-};
-
-/**
- * Generates a random string.
- *
- * @param length {int} If this parameter is not provided the length is set to 8 by default.
- * @return {string}
- * @method generateRandomString
- */
-exports.generateRandomString = function (length) {
-    length = typeof length !== 'undefined' ? length : 8;
-    var text = '';
-    var possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-
-    for (var i = 0; i < length; i++)
-        text += possible.charAt(Math.floor(Math.random() * possible.length));
-
-    return text;
-};
-
-exports.generatePasswordString = function (length) {
-    length = typeof length !== 'undefined' ? length : 8;
-    var text = '';
-    var possibleUpperCase = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
-    var possibleLowerCase = 'abcdefghijklmnopqrstuvwxyz';
-    var lowerCaseLimit = Math.floor(length / 2);
-
-    for (let i = 0; i < lowerCaseLimit; i++) {
-        text += possibleLowerCase.charAt(Math.floor(Math.random() * possibleLowerCase.length));
-    }
-
-    for (let i = 0; i < length - lowerCaseLimit; i++) {
-        text += possibleUpperCase.charAt(Math.floor(Math.random() * possibleUpperCase.length));
-    }
-
-    return text;
-};
-
-/**
- * Generates a random string - digits only.
- *
- * @param length {int} If this parameter is not provided the length is set to 8 by default.
- * @return {string}
- * @method generateRandomString
- */
-exports.generateRandomStringDigits = function (length) {
-    length = typeof length !== 'undefined' ? length : 8;
-    var text = '';
-    var possible = '0123456789';
-
-    for (var i = 0; i < length; i++)
-        text += possible.charAt(Math.floor(Math.random() * possible.length));
-
-    return text;
-};
-
-/**
- * Generates a random string - non-latin characters only.
- *
- * @param length {int} If this parameter is not provided the length is set to 3 by default.
- * @return {string}
- * @method generateRandomString
- */
-exports.generateRandomStringNonLatin = function (length) {
-    length = typeof length !== 'undefined' ? length : 3;
-    var text = '';
-    var possible = '密码你好𠮷';
-
-    for (var i = 0; i < length; i++)
-        text += possible.charAt(Math.floor(Math.random() * possible.length));
-
-    return text;
-};
-
-/**
- * Generates a random string to lowercase.
- *
- * @param length {int} If this parameter is not provided the length is set to 8 by default.
- * @return {string}
- * @method generateRandomString
- */
-exports.generateRandomStringToLowerCase = function (length) {
-
-    return this.generateRandomString().toLowerCase();
-};
-
-/**
- * Generates a random string to uppercase.
- *
- * @param length {int} If this parameter is not provided the length is set to 8 by default.
- * @return {string}
- * @method generateRandomString
- */
-exports.generateRandomStringToUpperCase = function (length) {
-
-    return this.generateRandomString().toUpperCase();
-};
-
-
-/**
- * Generates a sequence of files with name: baseName + index + extension (e.g.) baseName1.txt, baseName2.txt, ...
- *
- * @param startIndex {int}
- * @param endIndex {int}
- * @param baseName{string} the base name of all files
- * @param extension{string} the extension of the file
- * @return fileNames
- * @method generateSequenceFiles
- */
-exports.generateSequenceFiles = function (startIndex, endIndex, baseName, extension) {
-    var fileNames = [];
-    for (var i = startIndex; i <= endIndex; i++) {
-        fileNames.push(baseName + i + extension);
-    }
-    return fileNames;
-};
-
-/**
- * Generates a random number (as int) in the interval [min, max).
- *
- * @param min {int}
- * @param max {int}
- * @return {number}
- * @method generateRandomInt
- */
-exports.generateRandomInt = function (min, max) {
-    return Math.floor(Math.random() * (max - min) + min);
-};
-
-/**
- * Generates a random email address following the format: abcdef@activiti.test.com
- *
- * @param length {int}
- * @return {string}
- * @method generateRandomEmail
- */
-exports.generateRandomEmail = function (length) {
-    length = typeof length !== 'undefined' ? length : 5;
-    var email = '';
-    var possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-
-    for (var i = 0; i < length; i++)
-        email += possible.charAt(Math.floor(Math.random() * possible.length));
-
-    email += '@activiti.test.com';
-    return email.toLowerCase();
-};
-
-
-/**
- * Generates a random date inside the interval [1990, 2100) following the format ddmmyyyy.
- *
- * @return {string}
- * @method generateRandomDateFormat
- */
-exports.generateRandomDateFormat = function () {
-    var day = Math.floor(Math.random() * (29 - 1) + 1);
-    var month = Math.floor(Math.random() * (12 - 1) + 1);
-    var year = Math.floor(Math.random() * (2100 - 1990) + 1990);
-
-    return day + '.' + month + '.' + year;
-};
-
-/**
- * Generates a random date inside the interval [1990, 2100) following the format dd-mm-yyyy.
- *
- * @return {string}
- * @method generateRandomDate
- */
-exports.generateRandomDate = function () {
-    var day = Math.floor(Math.random() * (29 - 1) + 1);
-    if (day < 10) day = '0' + day;
-    var month = Math.floor(Math.random() * (12 - 1) + 1);
-    if (month < 10) month = '0' + month;
-    var year = Math.floor(Math.random() * (2100 - 1990) + 1990);
-
-    return day + '-' + month + '-' + year;
-};
-
-/**
- * Returns TRUE if the first array contains all elements from the second one.
- *
- * @param {array} superset
- * @param {array} subset
- *
- * @return {boolean}
- * @method arrayContainsArray
- */
-exports.arrayContainsArray = function (superset, subset) {
-    if (0 === subset.length) {
-        return false;
-    }
-    return subset.every(function (value) {
-        return (superset.indexOf(value) >= 0);
-    });
-};
-
-/**
- * Reads the content of the file and provides it on callback
- *
- * @param filePath
- * @param callback
- * @method readFile
- */
-exports.readFile = function (filePath, callback) {
-    var absolutePath = path.join(TestConfig.main.rootPath + filePath);
-    fs.readFile(absolutePath, {encoding: 'utf8'}, function (err, data) {
-        if (err) throw err;
-        callback(data);
-    });
-};
-
-/**
- * Executes external script that simulates dragndrop
- * Waits for the form to open
- */
-exports.prepareFieldDndOnForm = function (script) {
-    // TODO
-    // Currently all fields are added to the second column
-    // Ability to add fields to first column is needed as well
-    // dnd simulation script may need to be modified for this to be possible
-    browser.driver.executeScript(script);
-    browser.waitForAngular();
-};
-
-/**
- * Wait for url
- */
-exports.waitUntilUrlIsShowed = function (urlToWait, timeout) {
-    var waitTimeout = timeout || DEFAULT_TIMEOUT;
-
-    browser.wait(() => {
-        return browser.getCurrentUrl().then(function (url) {
-            return (url.indexOf(TestConfig.main.host + urlToWait.toString()) !== -1);
-        }, waitTimeout, urlToWait + 'is not showed');
-    });
-};
-
-exports.waitUntilElementIsVisible = function (elementToCheck, timeout) {
-    var waitTimeout = timeout || DEFAULT_TIMEOUT;
-
-    this.waitUntilElementIsPresent(elementToCheck, timeout);
-
-    var isDisplayed = false;
-    return browser.wait(() => {
-        elementToCheck.isDisplayed().then(
-            () => {
-                isDisplayed = true;
-            },
-            (err) => {
-                isDisplayed = false;
-            }
-        );
-        return isDisplayed;
-    }, waitTimeout, 'Element is not visible ' + elementToCheck.locator());
-};
-
-exports.waitUntilElementIsPresent = function (elementToCheck, timeout) {
-    var waitTimeout = timeout || DEFAULT_TIMEOUT;
-
-    var isPresent = false;
-    return browser.wait(() => {
-        elementToCheck.isPresent().then(
-            () => {
-                isPresent = true;
-            },
-            (err) => {
-                isPresent = false;
-            }
-        );
-        return isPresent;
-    }, waitTimeout, 'Element is not present ' + elementToCheck.locator());
-};
-
-/**
- * Click element
- */
-exports.clickElement = function (elementToClick, timeout) {
-    var waitTimeout = timeout || DEFAULT_TIMEOUT;
-
-    waitUntilElementIsVisible(elementToClick, timeout);
-    elementToClick.click();
-};
-
-/**
- * Type in  element
- */
-exports.typeElement = function (elementToType, valueToType, timeout) {
-    var waitTimeout = timeout || DEFAULT_TIMEOUT;
-
-    waitUntilElementIsVisible(elementToType, timeout);
-    elementToType.clear().sendKeys(valueToType);
-};
-
-
-/*
- * Wait for element to have value
- */
-exports.waitUntilElementHasValue = function (elementToCheck, elementValue, timeout) {
-    var waitTimeout = timeout || DEFAULT_TIMEOUT;
-
-    browser.wait(until.textToBePresentInElementValue(elementToCheck, elementValue), waitTimeout, 'Element doesn\'t have a value ' + elementToCheck.locator());
-};
-
-/*
- * Wait for element to be clickable
- */
-exports.waitUntilElementIsClickable = function (elementToCheck, timeout) {
-    var waitTimeout = timeout || DEFAULT_TIMEOUT;
-
-    return browser.wait(() => {
-        return until.elementToBeClickable(elementToCheck);
-    }, waitTimeout, 'Element is not Clickable' + elementToCheck.locator());
-};
-
-/*
- * Wait for element to not be visibile
- */
-exports.waitUntilElementIsNotVisible = function (elementToCheck, timeout) {
-    var waitTimeout = timeout || DEFAULT_TIMEOUT;
-
-    return browser.wait(() => {
-        return elementToCheck.isPresent().then(function (present) {
-            return !present;
-        })
-    }, waitTimeout, 'Element is Visible and it should not' + elementToCheck.locator());
-};
-
-exports.waitUntilElementIsNotDisplayed = function (elementToCheck, timeout) {
-    var waitTimeout = timeout || DEFAULT_TIMEOUT;
-
-    return browser.wait(() => {
-        return elementToCheck.isDisplayed().then(function (present) {
-            return !present;
-        })
-    }, waitTimeout, 'Element is dysplayed and it should not' + elementToCheck.locator());
-};
-
-/*
- * Wait for element to not be visibile
- */
-exports.waitUntilElementIsStale = function (elementToCheck, timeout) {
-    var waitTimeout = timeout || DEFAULT_TIMEOUT;
-
-    return browser.wait(until.stalenessOf(elementToCheck), waitTimeout, 'Element is not in stale ' + elementToCheck.locator());
-};
-
-/*
- * Wait for element to not be visibile
- */
-exports.waitUntilElementIsNotOnPage = function (elementToCheck, timeout) {
-    var waitTimeout = timeout || DEFAULT_TIMEOUT;
-
-    return browser.wait(() => {
-        return browser.wait(until.not(until.visibilityOf(elementToCheck)));
-    }, waitTimeout, 'Element is not in the page ' + elementToCheck.locator());
-};
-
-exports.waitUntilElementIsOnPage = function (elementToCheck, timeout) {
-    var waitTimeout = timeout || DEFAULT_TIMEOUT;
-
-    return browser.wait(browser.wait(until.visibilityOf(elementToCheck)), timeout);
-};
-
-/*
- * Wait for top message 'form saved' etc to not be visible
- * @param URL is url navigating to
- */
-exports.waitUntilTopMessageIsNotVisible = function (URL) {
-    this.waitUntilUrlIsShowed(URL);
-    this.waitUntilElementIsNotVisible(element(by.css("div[ng-click='dismissAlert()'] > i[class='glyphicon glyphicon-ok']")));
-    this.waitUntilElementIsNotOnPage(element(by.css("div[class='alert fadein ng-animate info-remove ng-hide-add ng-hide info-remove-active ng-hide-add-active']")));
-    this.waitUntilElementIsNotOnPage(element(by.css("div[ng-click='dismissAlert()']")));
-};
-
-
-/*
- * Wait for top message 'process model contains error' etc to not be visible
- * @param URL is url navigating to
- */
-exports.waitUntilTopErrorMessageIsNotVisible = function (URL) {
-    this.waitUntilUrlIsShowed(URL);
-    this.waitUntilElementIsNotVisible(element(by.css("div[ng-click='dismissAlert()'] > i[class='glyphicon glyphicon-remove']")));
-    this.waitUntilElementIsNotOnPage(element(by.css("div[class='alert fadein ng-animate error-remove ng-hide-add ng-hide error-remove-active ng-hide-add-active']")));
-    this.waitUntilElementIsNotOnPage(element(by.css("div[ng-click='dismissAlert()']")));
-};
-
-/**
- * @method waitForPage
- */
-exports.waitForPage = function () {
-    browser.wait(function () {
-        var deferred = protractor.promise.defer();
-        browser.executeScript('return document.readyState').then(function (text) {
-            deferred.fulfill(function (text) {
-                return text === 'complete';
-            });
-        });
-        return deferred.promise;
-    })
-};
-
-exports.openNewTabInBrowser = function () {
-    browser.driver.executeScript("window.open('about: blank', '_blank');");
-};
-
-exports.switchToWindowHandler = function (number) {
-    browser.driver.getAllWindowHandles().then((handles) => {
-        browser.driver.switchTo().window(handles[number]);
-    });
-};
-
-/**
- * Verify file exists
- * @param filePath - absolute path to the searched file
- * @param retries - number of retries
- * @returns - true if file is found, false otherwise
- */
-exports.fileExists = function (filePath, retries) {
-    var tries = 0;
-    return new Promise(function (resolve, reject) {
-        var checkExist = setInterval(() => {
-            fs.stat(filePath, function (error, stats) {
-                tries++;
-
-                if (error && tries === retries) {
-                    clearInterval(checkExist);
-                    resolve(false);
-                }
-
-                if (!error) {
-                    clearInterval(checkExist);
-                    resolve(true);
-                }
-            });
-        }, 2000);
-    });
-};
diff --git a/e2e/util/util.ts b/e2e/util/util.ts
new file mode 100644
index 0000000000..547b332c42
--- /dev/null
+++ b/e2e/util/util.ts
@@ -0,0 +1,421 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { browser, protractor } from 'protractor';
+import * as moment from 'moment';
+import fs = require('fs');
+import path = require('path');
+import TestConfig = require('../test.config');
+
+let until = protractor.ExpectedConditions;
+let DEFAULT_TIMEOUT = parseInt(TestConfig.main.timeout, 10);
+
+export class Util {
+
+    /**
+     * creates an absolute path string if multiple file uploads are required
+     */
+    static uploadParentFolder(filePath) {
+        let parentFolder = path.resolve(path.join(__dirname, 'test'));
+        return path.resolve(path.join(parentFolder, filePath));
+    }
+
+    /**
+     * Get current date in long format: Oct 24, 2016
+     *
+     * @return {string}
+     * @method getCrtDateLongFormat
+     */
+    static getCrtDateLongFormat() {
+        let currentDate = new Date();
+        let months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+            'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'
+        ];
+
+        return months[currentDate.getMonth()] + ' ' + currentDate.getDate() + ', ' + (currentDate.getFullYear() + 1900);
+    }
+
+    /**
+     * Get current date in specified format
+     *
+     * @return {string}
+     * @method getCrtDateInFormat
+     */
+    static getCrtDateInFormat(dateFormat) {
+        return moment().format(dateFormat);
+    }
+
+    /**
+     * Get specific date after current date in specific format
+     *
+     * @return {string}
+     * @method getCrtDateInFormat
+     */
+    static getSpecificDateAfterCrtDateInFormat(dateFormat, days) {
+        return moment(new Date()).add(days, 'days').format(dateFormat);
+    }
+
+    /**
+     * Generates a random string.
+     *
+     * @param length {int} If this parameter is not provided the length is set to 8 by default.
+     * @return {string}
+     * @method generateRandomString
+     */
+    static generateRandomString(length: number = 8): string {
+        let text = '';
+        let possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+
+        for (let i = 0; i < length; i++) {
+            text += possible.charAt(Math.floor(Math.random() * possible.length));
+        }
+
+        return text;
+    }
+
+    static generatePasswordString(length: number = 8): string {
+        let text = '';
+        let possibleUpperCase = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+        let possibleLowerCase = 'abcdefghijklmnopqrstuvwxyz';
+        let lowerCaseLimit = Math.floor(length / 2);
+
+        for (let i = 0; i < lowerCaseLimit; i++) {
+            text += possibleLowerCase.charAt(Math.floor(Math.random() * possibleLowerCase.length));
+        }
+
+        for (let i = 0; i < length - lowerCaseLimit; i++) {
+            text += possibleUpperCase.charAt(Math.floor(Math.random() * possibleUpperCase.length));
+        }
+
+        return text;
+    }
+
+    /**
+     * Generates a random string - digits only.
+     *
+     * @param length {int} If this parameter is not provided the length is set to 8 by default.
+     * @return {string}
+     * @method generateRandomString
+     */
+    static generateRandomStringDigits(length: number = 8): string {
+        let text = '';
+        let possible = '0123456789';
+
+        for (let i = 0; i < length; i++) {
+            text += possible.charAt(Math.floor(Math.random() * possible.length));
+        }
+
+        return text;
+    }
+
+    /**
+     * Generates a random string - non-latin characters only.
+     *
+     * @param length {int} If this parameter is not provided the length is set to 3 by default.
+     * @return {string}
+     * @method generateRandomString
+     */
+    static generateRandomStringNonLatin(length: number = 3): string {
+        let text = '';
+        let possible = '密码你好𠮷';
+
+        for (let i = 0; i < length; i++) {
+            text += possible.charAt(Math.floor(Math.random() * possible.length));
+        }
+
+        return text;
+    }
+
+    /**
+     * Generates a random string to lowercase.
+     *
+     * @param length {int} If this parameter is not provided the length is set to 8 by default.
+     * @return {string}
+     * @method generateRandomString
+     */
+    static generateRandomStringToLowerCase(length?: number): string {
+        return this.generateRandomString(length).toLowerCase();
+    }
+
+    /**
+     * Generates a random string to uppercase.
+     *
+     * @param length {int} If this parameter is not provided the length is set to 8 by default.
+     * @return {string}
+     * @method generateRandomString
+     */
+    static generateRandomStringToUpperCase(length?: number): string {
+        return this.generateRandomString(length).toUpperCase();
+    }
+
+    /**
+     * Generates a sequence of files with name: baseName + index + extension (e.g.) baseName1.txt, baseName2.txt, ...
+     *
+     * @param startIndex {int}
+     * @param endIndex {int}
+     * @param baseName{string} the base name of all files
+     * @param extension{string} the extension of the file
+     * @return fileNames
+     * @method generateSequenceFiles
+     */
+    static generateSequenceFiles(startIndex, endIndex, baseName, extension) {
+        let fileNames = [];
+        for (let i = startIndex; i <= endIndex; i++) {
+            fileNames.push(baseName + i + extension);
+        }
+        return fileNames;
+    }
+
+    /**
+     * Generates a random number (as int) in the interval [min, max).
+     *
+     * @param min {int}
+     * @param max {int}
+     * @return {number}
+     * @method generateRandomInt
+     */
+    static generateRandomInt(min, max) {
+        return Math.floor(Math.random() * (max - min) + min);
+    }
+
+    /**
+     * Generates a random email address following the format: abcdef@activiti.test.com
+     *
+     * @param length {int}
+     * @return {string}
+     * @method generateRandomEmail
+     */
+    static generateRandomEmail(length: number = 5): string {
+        let email = '';
+        let possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+
+        for (let i = 0; i < length; i++) {
+            email += possible.charAt(Math.floor(Math.random() * possible.length));
+        }
+
+        email += '@activiti.test.com';
+        return email.toLowerCase();
+    }
+
+    /**
+     * Generates a random date inside the interval [1990, 2100) following the format dd.mm.yyyy
+     *
+     * @return {string}
+     * @method generateRandomDateFormat
+     */
+    static generateRandomDateFormat() {
+        let day = Math.floor(Math.random() * (29 - 1) + 1);
+        let month = Math.floor(Math.random() * (12 - 1) + 1);
+        let year = Math.floor(Math.random() * (2100 - 1990) + 1990);
+
+        return day + '.' + month + '.' + year;
+    }
+
+    /**
+     * Generates a random date inside the interval [1990, 2100) following the format dd-mm-yyyy.
+     *
+     * @return {string}
+     * @method generateRandomDate
+     */
+    static generateRandomDate() {
+        let dayText, monthText;
+
+        let day = (Math.floor(Math.random() * (29 - 1) + 1));
+        if (day < 10) {
+            dayText = '0' + day.toString();
+        }
+        let month = Math.floor(Math.random() * (12 - 1) + 1);
+        if (month < 10) {
+            monthText = '0' + month.toString();
+        }
+        let year = Math.floor(Math.random() * (2100 - 1990) + 1990);
+
+        return dayText + '-' + monthText + '-' + year.toString();
+    }
+
+    /**
+     * Returns TRUE if the first array contains all elements from the second one.
+     *
+     * @param {array} superset
+     * @param {array} subset
+     *
+     * @return {boolean}
+     * @method arrayContainsArray
+     */
+    static arrayContainsArray(superset, subset) {
+        if (0 === subset.length) {
+            return false;
+        }
+        return subset.every(function (value) {
+            return (superset.indexOf(value) >= 0);
+        });
+    }
+
+    /**
+     * Reads the content of the file and provides it on callback
+     *
+     * @param filePath
+     * @param callback
+     * @method readFile
+     */
+    static readFile(filePath, callback) {
+        let absolutePath = path.join(TestConfig.main.rootPath + filePath);
+        fs.readFile(absolutePath, { encoding: 'utf8' }, function (err, data) {
+            if (err) {
+                throw err;
+            }
+            callback(data);
+        });
+    }
+
+    static waitUntilElementIsVisible(elementToCheck, waitTimeout: number = DEFAULT_TIMEOUT) {
+        let isDisplayed = false;
+        return browser.wait(() => {
+            browser.waitForAngularEnabled();
+
+            elementToCheck.isDisplayed().then(
+                () => {
+                    isDisplayed = true;
+                },
+                (err) => {
+                    isDisplayed = false;
+                }
+            );
+            return isDisplayed;
+        }, waitTimeout, 'Element is not visible ' + elementToCheck.locator());
+    }
+
+    static waitUntilElementIsPresent(elementToCheck, waitTimeout: number = DEFAULT_TIMEOUT) {
+        browser.waitForAngularEnabled();
+
+        return browser.wait(until.presenceOf(elementToCheck), waitTimeout, 'Element is not present ' + elementToCheck.locator());
+    }
+
+    /*
+     * Wait for element to have value
+     */
+    static waitUntilElementHasValue(elementToCheck, elementValue, waitTimeout: number = DEFAULT_TIMEOUT) {
+        browser.waitForAngularEnabled();
+
+        browser.wait(until.textToBePresentInElementValue(elementToCheck, elementValue), waitTimeout, 'Element doesn\'t have a value ' + elementToCheck.locator());
+    }
+
+    /*
+     * Wait for element to be clickable
+     */
+    static waitUntilElementIsClickable(elementToCheck, waitTimeout: number = DEFAULT_TIMEOUT) {
+        return browser.wait(() => {
+            browser.waitForAngularEnabled();
+            return until.elementToBeClickable(elementToCheck);
+        }, waitTimeout, 'Element is not Clickable' + elementToCheck.locator());
+    }
+
+    /*
+     * Wait for element to not be visible
+     */
+    static waitUntilElementIsNotVisible(elementToCheck, waitTimeout: number = DEFAULT_TIMEOUT) {
+        return browser.wait(() => {
+            browser.waitForAngularEnabled();
+            return elementToCheck.isPresent().then(function (present) {
+                return !present;
+            });
+        }, waitTimeout, 'Element is Visible and it should not' + elementToCheck.locator());
+    }
+
+    static waitUntilElementIsNotDisplayed(elementToCheck, waitTimeout: number = DEFAULT_TIMEOUT) {
+        return browser.wait(() => {
+            browser.waitForAngularEnabled();
+            return elementToCheck.isDisplayed().then(function (present) {
+                return !present;
+            });
+        }, waitTimeout, 'Element is dysplayed and it should not' + elementToCheck.locator());
+    }
+
+    /*
+     * Wait for element to not be visible
+     */
+    static waitUntilElementIsStale(elementToCheck, waitTimeout: number = DEFAULT_TIMEOUT) {
+        return browser.wait(until.stalenessOf(elementToCheck), waitTimeout, 'Element is not in stale ' + elementToCheck.locator());
+    }
+
+    /*
+     * Wait for element to not be visible
+     */
+    static waitUntilElementIsNotOnPage(elementToCheck, waitTimeout: number = DEFAULT_TIMEOUT) {
+        return browser.wait(() => {
+            browser.waitForAngularEnabled();
+            return browser.wait(until.not(until.visibilityOf(elementToCheck)));
+        }, waitTimeout, 'Element is not in the page ' + elementToCheck.locator());
+    }
+
+    static waitUntilElementIsOnPage(elementToCheck, waitTimeout: number = DEFAULT_TIMEOUT) {
+        return browser.wait(browser.wait(until.visibilityOf(elementToCheck)), waitTimeout);
+    }
+
+    /**
+     * @method waitForPage
+     */
+    static waitForPage() {
+        browser.wait(function () {
+            let deferred = protractor.promise.defer();
+            browser.executeScript('return document.readyState').then((text) => {
+                deferred.fulfill(() => {
+                    return text === 'complete';
+                });
+            });
+            return deferred.promise;
+        });
+    }
+
+    static openNewTabInBrowser() {
+        browser.driver.executeScript("window.open('about: blank', '_blank');");
+    }
+
+    static switchToWindowHandler(windowNumber) {
+        browser.driver.getAllWindowHandles().then((handles) => {
+            browser.waitForAngularEnabled();
+            browser.driver.switchTo().window(handles[windowNumber]);
+        });
+    }
+
+    /**
+     * Verify file exists
+     * @param filePath - absolute path to the searched file
+     * @param retries - number of retries
+     * @returns - true if file is found, false otherwise
+     */
+    static fileExists(filePath, retries) {
+        let tries = 0;
+        return new Promise(function (resolve, reject) {
+            let checkExist = setInterval(() => {
+                fs.stat(filePath, function (error, stats) {
+                    tries++;
+
+                    if (error && tries === retries) {
+                        clearInterval(checkExist);
+                        resolve(false);
+                    }
+
+                    if (!error) {
+                        clearInterval(checkExist);
+                        resolve(true);
+                    }
+                });
+            }, 2000);
+        });
+    }
+}
diff --git a/lib/content-services/dialogs/dialog.module.ts b/lib/content-services/dialogs/dialog.module.ts
index e0ce6fd724..2b30def510 100644
--- a/lib/content-services/dialogs/dialog.module.ts
+++ b/lib/content-services/dialogs/dialog.module.ts
@@ -27,6 +27,7 @@ import { NodeLockDialogComponent } from './node-lock.dialog';
 import { ConfirmDialogComponent } from './confirm.dialog';
 import { MatDatetimepickerModule } from '@mat-datetimepicker/core';
 import { MatMomentDatetimeModule } from '@mat-datetimepicker/moment';
+import { LibraryDialogComponent } from './library/library.dialog';
 
 @NgModule({
     imports: [
@@ -42,19 +43,22 @@ import { MatMomentDatetimeModule } from '@mat-datetimepicker/moment';
         DownloadZipDialogComponent,
         FolderDialogComponent,
         NodeLockDialogComponent,
-        ConfirmDialogComponent
+        ConfirmDialogComponent,
+        LibraryDialogComponent
     ],
     exports: [
         DownloadZipDialogComponent,
         FolderDialogComponent,
         NodeLockDialogComponent,
-        ConfirmDialogComponent
+        ConfirmDialogComponent,
+        LibraryDialogComponent
     ],
     entryComponents: [
         DownloadZipDialogComponent,
         FolderDialogComponent,
         NodeLockDialogComponent,
-        ConfirmDialogComponent
+        ConfirmDialogComponent,
+        LibraryDialogComponent
     ]
 })
 export class DialogModule {}
diff --git a/lib/content-services/dialogs/library/library.dialog.html b/lib/content-services/dialogs/library/library.dialog.html
new file mode 100644
index 0000000000..b8d1c31629
--- /dev/null
+++ b/lib/content-services/dialogs/library/library.dialog.html
@@ -0,0 +1,85 @@
+<h2 mat-dialog-title>{{ createTitle | translate }}</h2>
+
+<mat-dialog-content>
+  <form novalidate [formGroup]="form" (submit)="submit()">
+    <mat-form-field>
+      <input
+        placeholder="{{ 'LIBRARY.DIALOG.FORM.NAME' | translate }}"
+        required
+        matInput
+        autofocus
+        formControlName="title"
+        autocomplete="off"
+      />
+
+      <mat-hint *ngIf="libraryTitleExists">{{
+        'LIBRARY.HINTS.SITE_TITLE_EXISTS' | translate
+      }}</mat-hint>
+      <mat-error *ngIf="form.controls['title'].hasError('maxlength')">
+        {{ 'LIBRARY.ERRORS.TITLE_TOO_LONG' | translate }}
+      </mat-error>
+    </mat-form-field>
+
+    <mat-form-field>
+      <input
+        required
+        placeholder="{{ 'LIBRARY.DIALOG.FORM.SITE_ID' | translate }}"
+        matInput
+        formControlName="id"
+        autocomplete="off"
+      />
+
+      <mat-error *ngIf="form.controls['id'].errors?.message">
+        {{ form.controls['id'].errors?.message | translate }}
+      </mat-error>
+
+      <mat-error *ngIf="form.controls['id'].hasError('maxlength')">
+        {{ 'LIBRARY.ERRORS.ID_TOO_LONG' | translate }}
+      </mat-error>
+    </mat-form-field>
+
+    <mat-form-field>
+      <textarea
+        matInput
+        placeholder="{{ 'LIBRARY.DIALOG.FORM.DESCRIPTION' | translate }}"
+        rows="3"
+        formControlName="description"
+      ></textarea>
+
+      <mat-error *ngIf="form.controls['description'].hasError('maxlength')">
+        {{ 'LIBRARY.ERRORS.DESCRIPTION_TOO_LONG' | translate }}
+      </mat-error>
+    </mat-form-field>
+
+    <mat-radio-group
+      [ngModelOptions]="{ standalone: true }"
+      [(ngModel)]="visibilityOption"
+      (change)="visibilityChangeHandler($event)"
+    >
+      <mat-radio-button
+        color="primary"
+        [disabled]="option.disabled"
+        *ngFor="let option of visibilityOptions"
+        [value]="option.value"
+        [checked]="visibilityOption.value === option.value"
+      >
+        {{ option.label | translate }}
+      </mat-radio-button>
+    </mat-radio-group>
+  </form>
+</mat-dialog-content>
+
+<mat-dialog-actions class="adf-action-buttons">
+  <button mat-button mat-dialog-close>
+    {{ 'LIBRARY.DIALOG.CANCEL' | translate }}
+  </button>
+
+  <button
+    color="primary"
+    mat-button
+    (click)="submit()"
+    [disabled]="!form.valid"
+  >
+    {{ 'LIBRARY.DIALOG.CREATE' | translate }}
+  </button>
+</mat-dialog-actions>
diff --git a/lib/content-services/dialogs/library/library.dialog.scss b/lib/content-services/dialogs/library/library.dialog.scss
new file mode 100644
index 0000000000..f8ddbcc305
--- /dev/null
+++ b/lib/content-services/dialogs/library/library.dialog.scss
@@ -0,0 +1,29 @@
+.adf-library-dialog {
+    .mat-radio-group {
+        display: flex;
+        flex-direction: column;
+        margin: 0 0 20px;
+    }
+
+    .mat-radio-group .mat-radio-button {
+        margin: 10px 0;
+    }
+
+    .mat-form-field {
+        width: 100%;
+    }
+
+    mat-form-field {
+        padding-top: 20px;
+    }
+
+    .adf-action-buttons {
+        display: flex;
+        flex-direction: row;
+        justify-content: flex-end;
+
+        .mat-button {
+            text-transform: uppercase;
+        }
+    }
+}
diff --git a/lib/content-services/dialogs/library/library.dialog.spec.ts b/lib/content-services/dialogs/library/library.dialog.spec.ts
new file mode 100644
index 0000000000..cce2047417
--- /dev/null
+++ b/lib/content-services/dialogs/library/library.dialog.spec.ts
@@ -0,0 +1,198 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { ReactiveFormsModule } from '@angular/forms';
+import { CoreModule } from '@alfresco/adf-core';
+import { LibraryDialogComponent } from './library.dialog';
+import { TestBed, fakeAsync, tick, flush } from '@angular/core/testing';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { MatDialogRef } from '@angular/material';
+import {
+  AlfrescoApiService,
+  AlfrescoApiServiceMock,
+  setupTestBed
+} from '@alfresco/adf-core';
+
+describe('LibraryDialogComponent', () => {
+  let fixture;
+  let component;
+  let alfrescoApi;
+  const dialogRef = {
+    close: jasmine.createSpy('close')
+  };
+
+  setupTestBed({
+    imports: [NoopAnimationsModule, CoreModule, ReactiveFormsModule],
+    declarations: [LibraryDialogComponent],
+    providers: [
+      {
+        provide: AlfrescoApiService,
+        useClass: AlfrescoApiServiceMock
+      },
+      { provide: MatDialogRef, useValue: dialogRef }
+    ],
+    schemas: [NO_ERRORS_SCHEMA]
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(LibraryDialogComponent);
+    component = fixture.componentInstance;
+    alfrescoApi = TestBed.get(AlfrescoApiService);
+
+    spyOn(
+      alfrescoApi.getInstance().core.queriesApi,
+      'findSites'
+    ).and.returnValue(
+      Promise.resolve({
+        list: { entries: [] }
+      })
+    );
+  });
+
+  it('should set library id automatically on title input', fakeAsync(() => {
+    spyOn(alfrescoApi.sitesApi, 'getSite').and.callFake(() => {
+      return new Promise((resolve, reject) => reject());
+    });
+
+    fixture.detectChanges();
+    component.form.controls.title.setValue('libraryTitle');
+    tick(500);
+    flush();
+    fixture.detectChanges();
+
+    expect(component.form.controls.id.value).toBe('libraryTitle');
+  }));
+
+  it('should translate library title space character to dash for library id', fakeAsync(() => {
+    spyOn(alfrescoApi.sitesApi, 'getSite').and.callFake(() => {
+      return new Promise((resolve, reject) => reject());
+    });
+
+    fixture.detectChanges();
+    component.form.controls.title.setValue('library title');
+    tick(500);
+    flush();
+    fixture.detectChanges();
+
+    expect(component.form.controls.id.value).toBe('library-title');
+  }));
+
+  it('should not change custom library id on title input', fakeAsync(() => {
+    spyOn(alfrescoApi.sitesApi, 'getSite').and.callFake(() => {
+      return new Promise((resolve, reject) => reject());
+    });
+
+    fixture.detectChanges();
+    component.form.controls.id.setValue('custom-id');
+    component.form.controls.id.markAsDirty();
+    tick(500);
+    flush();
+    fixture.detectChanges();
+
+    component.form.controls.title.setValue('library title');
+    tick(500);
+    flush();
+    fixture.detectChanges();
+
+    expect(component.form.controls.id.value).toBe('custom-id');
+  }));
+
+  it('should invalidate form when library id already exists', fakeAsync(() => {
+    spyOn(alfrescoApi.sitesApi, 'getSite').and.returnValue(Promise.resolve());
+
+    fixture.detectChanges();
+    component.form.controls.id.setValue('existingLibrary');
+    tick(500);
+    flush();
+    fixture.detectChanges();
+
+    expect(component.form.controls.id.errors).toEqual({
+      message: 'LIBRARY.ERRORS.EXISTENT_SITE'
+    });
+    expect(component.form.valid).toBe(false);
+  }));
+
+  it('should create site when form is valid', fakeAsync(() => {
+    spyOn(alfrescoApi.sitesApi, 'createSite').and.returnValue(
+      Promise.resolve()
+    );
+    spyOn(alfrescoApi.sitesApi, 'getSite').and.callFake(() => {
+      return new Promise((resolve, reject) => reject());
+    });
+
+    fixture.detectChanges();
+    component.form.controls.title.setValue('library title');
+    tick(500);
+    flush();
+    fixture.detectChanges();
+
+    component.submit();
+    fixture.detectChanges();
+    flush();
+
+    expect(alfrescoApi.sitesApi.createSite).toHaveBeenCalledWith({
+      id: 'library-title',
+      title: 'library title',
+      description: '',
+      visibility: 'PUBLIC'
+    });
+  }));
+
+  it('should not create site when form is invalid', fakeAsync(() => {
+    spyOn(alfrescoApi.sitesApi, 'createSite').and.returnValue(
+      Promise.resolve({})
+    );
+    spyOn(alfrescoApi.sitesApi, 'getSite').and.returnValue(Promise.resolve());
+
+    fixture.detectChanges();
+    component.form.controls.title.setValue('existingLibrary');
+    tick(500);
+    flush();
+    fixture.detectChanges();
+
+    component.submit();
+    fixture.detectChanges();
+    flush();
+
+    expect(alfrescoApi.sitesApi.createSite).not.toHaveBeenCalled();
+  }));
+
+  it('should notify on 409 conflict error (might be in trash)', fakeAsync(() => {
+    const error = { message: '{ "error": { "statusCode": 409 } }' };
+    spyOn(alfrescoApi.sitesApi, 'createSite').and.callFake(() => {
+      return new Promise((resolve, reject) => reject(error));
+    });
+    spyOn(alfrescoApi.sitesApi, 'getSite').and.callFake(() => {
+      return new Promise((resolve, reject) => reject());
+    });
+
+    fixture.detectChanges();
+    component.form.controls.title.setValue('test');
+    tick(500);
+    flush();
+    fixture.detectChanges();
+
+    component.submit();
+    fixture.detectChanges();
+    flush();
+
+    expect(component.form.controls.id.errors).toEqual({
+      message: 'LIBRARY.ERRORS.CONFLICT'
+    });
+  }));
+});
diff --git a/lib/content-services/dialogs/library/library.dialog.ts b/lib/content-services/dialogs/library/library.dialog.ts
new file mode 100644
index 0000000000..e116a0bcae
--- /dev/null
+++ b/lib/content-services/dialogs/library/library.dialog.ts
@@ -0,0 +1,243 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Observable, Subject, from } from 'rxjs';
+import {
+  Component,
+  OnInit,
+  Output,
+  EventEmitter,
+  OnDestroy,
+  ViewEncapsulation
+} from '@angular/core';
+import {
+  FormBuilder,
+  FormGroup,
+  Validators,
+  FormControl,
+  AbstractControl
+} from '@angular/forms';
+import { MatDialogRef } from '@angular/material';
+import { SiteBody, SiteEntry, SitePaging } from 'alfresco-js-api';
+import { AlfrescoApiService } from '@alfresco/adf-core';
+import { debounceTime, mergeMap, takeUntil } from 'rxjs/operators';
+
+@Component({
+  selector: 'adf-library-dialog',
+  styleUrls: ['./library.dialog.scss'],
+  templateUrl: './library.dialog.html',
+  encapsulation: ViewEncapsulation.None,
+  host: { class: 'adf-library-dialog' }
+})
+export class LibraryDialogComponent implements OnInit, OnDestroy {
+  @Output()
+  error: EventEmitter<any> = new EventEmitter<any>();
+
+  @Output()
+  success: EventEmitter<any> = new EventEmitter<any>();
+
+  onDestroy$: Subject<boolean> = new Subject<boolean>();
+
+  createTitle = 'LIBRARY.DIALOG.CREATE_TITLE';
+  libraryTitleExists = false;
+  form: FormGroup;
+  visibilityOption: any;
+  visibilityOptions = [
+    { value: 'PUBLIC', label: 'LIBRARY.VISIBILITY.PUBLIC', disabled: false },
+    { value: 'PRIVATE', label: 'LIBRARY.VISIBILITY.PRIVATE', disabled: false },
+    {
+      value: 'MODERATED',
+      label: 'LIBRARY.VISIBILITY.MODERATED',
+      disabled: false
+    }
+  ];
+
+  constructor(
+    private alfrescoApiService: AlfrescoApiService,
+    private formBuilder: FormBuilder,
+    private dialog: MatDialogRef<LibraryDialogComponent>
+  ) {}
+
+  ngOnInit() {
+    const validators = {
+      id: [
+        Validators.required,
+        Validators.maxLength(72),
+        this.forbidSpecialCharacters
+      ],
+      title: [Validators.required, Validators.maxLength(256)],
+      description: [Validators.maxLength(512)]
+    };
+
+    this.form = this.formBuilder.group({
+      title: ['', validators.title],
+      id: ['', validators.id, this.createSiteIdValidator()],
+      description: ['', validators.description]
+    });
+
+    this.visibilityOption = this.visibilityOptions[0].value;
+
+    this.form.controls['title'].valueChanges
+      .pipe(
+        debounceTime(300),
+        mergeMap(
+            (title) => this.checkLibraryNameExists(title),
+            (title) => title
+        ),
+        takeUntil(this.onDestroy$)
+      )
+      .subscribe((title: string) => {
+        if (!title.trim().length) {
+          return;
+        }
+
+        if (!this.form.controls['id'].dirty) {
+          this.form.patchValue({ id: this.sanitize(title.trim()) });
+          this.form.controls['id'].markAsTouched();
+        }
+      });
+  }
+
+  ngOnDestroy() {
+    this.onDestroy$.next(true);
+    this.onDestroy$.complete();
+  }
+
+  get title(): string {
+    const { title } = this.form.value;
+
+    return (title || '').trim();
+  }
+
+  get id(): string {
+    const { id } = this.form.value;
+
+    return (id || '').trim();
+  }
+
+  get description(): string {
+    const { description } = this.form.value;
+
+    return (description || '').trim();
+  }
+
+  get visibility(): string {
+    return this.visibilityOption || '';
+  }
+
+  submit() {
+    const { form, dialog } = this;
+
+    if (!form.valid) {
+      return;
+    }
+
+    this.create().subscribe(
+      (node: SiteEntry) => {
+        this.success.emit(node);
+        dialog.close(node);
+      },
+      (error) => this.handleError(error)
+    );
+  }
+
+  visibilityChangeHandler(event) {
+    this.visibilityOption = event.value;
+  }
+
+  private create(): Observable<SiteEntry> {
+    const { title, id, description, visibility } = this;
+    const siteBody = <SiteBody> {
+      id,
+      title,
+      description,
+      visibility
+    };
+
+    return from(this.alfrescoApiService.sitesApi.createSite(siteBody));
+  }
+
+  private sanitize(input: string) {
+    return input.replace(/[\s]/g, '-').replace(/[^A-Za-z0-9-]/g, '');
+  }
+
+  private handleError(error: any): any {
+    const {
+      error: { statusCode }
+    } = JSON.parse(error.message);
+
+    if (statusCode === 409) {
+      this.form.controls['id'].setErrors({
+        message: 'LIBRARY.ERRORS.CONFLICT'
+      });
+    }
+
+    return error;
+  }
+
+  private async checkLibraryNameExists(libraryTitle: string) {
+    const { entries } = (await this.findLibraryByTitle(libraryTitle)).list;
+
+    if (entries.length) {
+      this.libraryTitleExists = entries[0].entry.title === libraryTitle;
+    } else {
+      this.libraryTitleExists = false;
+    }
+  }
+
+  private findLibraryByTitle(libraryTitle: string): Promise<SitePaging> {
+    return this.alfrescoApiService
+      .getInstance()
+      .core.queriesApi.findSites(libraryTitle, {
+        maxItems: 1,
+        fields: ['title']
+      })
+      .catch(() => ({ list: { entries: [] } }));
+  }
+
+  private forbidSpecialCharacters({ value }: FormControl) {
+    const validCharacters: RegExp = /[^A-Za-z0-9-]/;
+    const isValid: boolean = !validCharacters.test(value);
+
+    return isValid
+      ? null
+      : {
+          message: 'LIBRARY.ERRORS.ILLEGAL_CHARACTERS'
+        };
+  }
+
+  private createSiteIdValidator() {
+    let timer;
+
+    return (control: AbstractControl) => {
+      if (timer) {
+        clearTimeout(timer);
+      }
+
+      return new Promise((resolve) => {
+        timer = setTimeout(() => {
+          return from(
+            this.alfrescoApiService.sitesApi.getSite(control.value)
+          ).subscribe(
+            () => resolve({ message: 'LIBRARY.ERRORS.EXISTENT_SITE' }),
+            () => resolve(null)
+          );
+        }, 300);
+      });
+    };
+  }
+}
diff --git a/lib/content-services/dialogs/node-lock.dialog.html b/lib/content-services/dialogs/node-lock.dialog.html
index dfcdc8fc8d..5f4095d53d 100644
--- a/lib/content-services/dialogs/node-lock.dialog.html
+++ b/lib/content-services/dialogs/node-lock.dialog.html
@@ -5,7 +5,7 @@
 <mat-dialog-content>
     <br />
     <form [formGroup]="form" (submit)="submit()">
-        <mat-checkbox class="adf-lock-file-name" [formControl]="form.controls['isLocked']" ngDefaultControl>
+        <mat-checkbox  data-automation-id="adf-lock-node-checkbox" class="adf-lock-file-name" [formControl]="form.controls['isLocked']" ngDefaultControl>
             {{ 'CORE.FILE_DIALOG.FILE_LOCK_CHECKBOX' | translate }} <strong>"{{ nodeName }}"</strong>
         </mat-checkbox>
 
diff --git a/lib/content-services/dialogs/public-api.ts b/lib/content-services/dialogs/public-api.ts
index a44bcf2e5a..6ff9033c9b 100644
--- a/lib/content-services/dialogs/public-api.ts
+++ b/lib/content-services/dialogs/public-api.ts
@@ -21,3 +21,4 @@ export * from './node-lock.dialog';
 export * from './confirm.dialog';
 
 export * from './dialog.module';
+export * from './library/library.dialog';
diff --git a/lib/content-services/i18n/de.json b/lib/content-services/i18n/de.json
index a979f90495..77db718ace 100644
--- a/lib/content-services/i18n/de.json
+++ b/lib/content-services/i18n/de.json
@@ -287,5 +287,31 @@
       "DUPLICATE-PERMISSION": "Mindestens eine der von Ihnen bestimmten Berechtigungen ist bereits vorhanden: {{list}}",
       "NOT-ALLOWED": "Sie sind nicht zum Ändern von Berechtigungen berechtigt."
     }
+  },
+  "LIBRARY": {
+    "DIALOG": {
+      "CREATE_TITLE": "Bibliothek erstellen",
+      "CREATE": "Erstellen",
+      "CANCEL": "Abbrechen",
+      "FORM": {
+        "DESCRIPTION": "Beschreibung",
+        "SITE_ID": "Bibliotheks-ID",
+        "NAME": "Name"
+      }
+    },
+    "VISIBILITY": {
+      "PRIVATE": "Privat",
+      "PUBLIC": "Öffentlich",
+      "MODERATED": "Moderiert"
+    },
+    "ERRORS": {
+      "GENERIC": "Es ist ein Problem aufgetreten",
+      "EXISTENT_SITE": "Diese Bibliotheks-ID ist nicht verfügbar. Versuchen Sie es mit einer anderen Bibliothek.",
+      "CONFLICT": "Diese Bibliotheks-ID wird bereits verwendet. Sehen Sie im Papierkorb nach.",
+      "ID_TOO_LONG": "Der URL-Name darf höchstens 72 Zeichen lang sein",
+      "DESCRIPTION_TOO_LONG": "Die Beschreibung darf höchstens 512 Zeichen lang sein",
+      "TITLE_TOO_LONG": "Der Titel darf höchstens 256 Zeichen lang sein",
+      "ILLEGAL_CHARACTERS": "Verwenden Sie nur Zahlen und Buchstaben"
+    }
   }
 }
diff --git a/lib/content-services/i18n/en.json b/lib/content-services/i18n/en.json
index 957dc22782..9760557c75 100644
--- a/lib/content-services/i18n/en.json
+++ b/lib/content-services/i18n/en.json
@@ -292,5 +292,41 @@
   },
   "ADF-TREE-VIEW": {
     "MISSING-ID": "No nodeId provided!"
+  },
+  "LIBRARY": {
+    "DIALOG": {
+      "CREATE_TITLE": "Create Library",
+      "CREATE": "Create",
+      "UPDATE": "Update",
+      "EDIT": "Edit",
+      "CANCEL": "Cancel",
+      "FORM": {
+        "DESCRIPTION": "Description",
+        "SITE_ID": "Library ID",
+        "NAME": "Name",
+        "VISIBILITY": "Visibility"
+      }
+    },
+    "VISIBILITY": {
+      "PRIVATE": "Private",
+      "PUBLIC": "Public",
+      "MODERATED": "Moderated"
+    },
+    "HINTS": {
+      "SITE_TITLE_EXISTS": "Library name already in use"
+    },
+    "ERRORS": {
+      "GENERIC": "We hit a problem",
+      "EXISTENT_SITE": "This Library ID isn't available. Try a different Library ID.",
+      "CONFLICT": "This Library ID is already used. Check the trashcan.",
+      "ID_TOO_LONG": "Use 72 characters or less for the URL name",
+      "DESCRIPTION_TOO_LONG": "Use 512 characters or less for description",
+      "TITLE_TOO_LONG": "Use 256 characters or less for title",
+      "ILLEGAL_CHARACTERS": "Use numbers and letters only",
+      "LIBRARY_UPDATE_ERROR": "There was an error updating library properties"
+    },
+    "SUCCESS": {
+      "LIBRARY_UPDATED": "Library properties updated"
+    }
   }
 }
diff --git a/lib/content-services/i18n/es.json b/lib/content-services/i18n/es.json
index 9a09ee9c1e..8167e57f3a 100644
--- a/lib/content-services/i18n/es.json
+++ b/lib/content-services/i18n/es.json
@@ -287,5 +287,31 @@
       "DUPLICATE-PERMISSION": "Uno o más de los permisos que ha establecido ya existe: {{list}}",
       "NOT-ALLOWED": "No puede cambiar los permisos"
     }
+  },
+  "LIBRARY": {
+    "DIALOG": {
+      "CREATE_TITLE": "Crear biblioteca",
+      "CREATE": "Crear",
+      "CANCEL": "Cancelar",
+      "FORM": {
+        "DESCRIPTION": "Descripción",
+        "SITE_ID": "ID de biblioteca",
+        "NAME": "Nombre"
+      }
+    },
+    "VISIBILITY": {
+      "PRIVATE": "Lista privada",
+      "PUBLIC": "Público",
+      "MODERATED": "Moderado"
+    },
+    "ERRORS": {
+      "GENERIC": "Se ha producido un error",
+      "EXISTENT_SITE": "La ID de biblioteca no está disponible. Pruebe una biblioteca diferente.",
+      "CONFLICT": "Esta ID de biblioteca ya está utilizada. Compruebe la papelera.",
+      "ID_TOO_LONG": "Utilice como máximo 72 caracteres para el nombre de la URL",
+      "DESCRIPTION_TOO_LONG": "Utilice como máximo 512 caracteres para la descripción",
+      "TITLE_TOO_LONG": "Utilice como máximo 256 caracteres para el título",
+      "ILLEGAL_CHARACTERS": "Use solo números y letras"
+    }
   }
 }
diff --git a/lib/content-services/i18n/fr.json b/lib/content-services/i18n/fr.json
index 5e9e543b6a..8f010b0d08 100644
--- a/lib/content-services/i18n/fr.json
+++ b/lib/content-services/i18n/fr.json
@@ -287,5 +287,31 @@
       "DUPLICATE-PERMISSION": "Un ou plusieurs droits d'accès définis existent déjà : {{list}}",
       "NOT-ALLOWED": "Vous n'avez pas le droit de modifier les droits d'accès"
     }
+  },
+  "LIBRARY": {
+    "DIALOG": {
+      "CREATE_TITLE": "Créer une Bibliothèque",
+      "CREATE": "Créer",
+      "CANCEL": "Annuler",
+      "FORM": {
+        "DESCRIPTION": "Description",
+        "SITE_ID": "ID de Bibliothèque",
+        "NAME": "Nom"
+      }
+    },
+    "VISIBILITY": {
+      "PRIVATE": "Liste privée",
+      "PUBLIC": "Public",
+      "MODERATED": "Modéré"
+    },
+    "ERRORS": {
+      "GENERIC": "Une erreur est survenue",
+      "EXISTENT_SITE": "Cet ID de Bibliothèque est indisponible. Essayez avec une autre Bibliothèque.",
+      "CONFLICT": "Cet ID de Bibliothèque est déjà utilisé. Vérifiez la corbeille.",
+      "ID_TOO_LONG": "L'URL doit contenir 72 caractères maximum",
+      "DESCRIPTION_TOO_LONG": "La description doit contenir 512 caractères maximum",
+      "TITLE_TOO_LONG": "Le titre doit contenir 256 caractères maximum",
+      "ILLEGAL_CHARACTERS": "Utilisez uniquement des chiffres et des lettres"
+    }
   }
 }
diff --git a/lib/content-services/i18n/it.json b/lib/content-services/i18n/it.json
index 986a958830..1255969919 100644
--- a/lib/content-services/i18n/it.json
+++ b/lib/content-services/i18n/it.json
@@ -287,5 +287,31 @@
       "DUPLICATE-PERMISSION": "Uno o più autorizzazioni impostate sono già presenti: {{list}}",
       "NOT-ALLOWED": "Non è consentito modificare le autorizzazioni"
     }
+  },
+  "LIBRARY": {
+    "DIALOG": {
+      "CREATE_TITLE": "Crea libreria",
+      "CREATE": "Crea",
+      "CANCEL": "Annulla",
+      "FORM": {
+        "DESCRIPTION": "Descrizione",
+        "SITE_ID": "ID libreria",
+        "NAME": "Nome"
+      }
+    },
+    "VISIBILITY": {
+      "PRIVATE": "Privato",
+      "PUBLIC": "Pubblico",
+      "MODERATED": "Moderato"
+    },
+    "ERRORS": {
+      "GENERIC": "Si è verificato un errore",
+      "EXISTENT_SITE": "L'ID libreria specificato non è disponibile. Provare con un'altra libreria.",
+      "CONFLICT": "L'ID libreria specificato è già in uso. Verificare il cestino.",
+      "ID_TOO_LONG": "Utilizzare 72 caratteri o meno per il nome URL",
+      "DESCRIPTION_TOO_LONG": "Utilizzare 512 o meno per la descrizione",
+      "TITLE_TOO_LONG": "Utilizzare 256 caratteri o meno per il titolo",
+      "ILLEGAL_CHARACTERS": "Utilizzare solo lettere e numeri"
+    }
   }
 }
diff --git a/lib/content-services/i18n/ja.json b/lib/content-services/i18n/ja.json
index bbf970d6a1..3a7d3b5bae 100644
--- a/lib/content-services/i18n/ja.json
+++ b/lib/content-services/i18n/ja.json
@@ -287,5 +287,31 @@
       "DUPLICATE-PERMISSION": "設定済みの権限が既にあります: {{list}}",
       "NOT-ALLOWED": "権限を変更することはできません"
     }
+  },
+  "LIBRARY": {
+    "DIALOG": {
+      "CREATE_TITLE": "ライブラリの作成",
+      "CREATE": "作成",
+      "CANCEL": "キャンセル",
+      "FORM": {
+        "DESCRIPTION": "説明",
+        "SITE_ID": "ライブラリ ID",
+        "NAME": "名前"
+      }
+    },
+    "VISIBILITY": {
+      "PRIVATE": "非公開",
+      "PUBLIC": "公開",
+      "MODERATED": "条件付き公開"
+    },
+    "ERRORS": {
+      "GENERIC": "問題が発生しました",
+      "EXISTENT_SITE": "このライブラリ ID は使用できません。別のライブラリを使用してください。",
+      "CONFLICT": "このライブラリ ID は既に使われています。ごみ箱をチェックしてください。",
+      "ID_TOO_LONG": "URL 名は 72 文字以内で入力してください",
+      "DESCRIPTION_TOO_LONG": "説明は 512 文字以内で入力してください",
+      "TITLE_TOO_LONG": "タイトルは 256 文字以内で入力してください",
+      "ILLEGAL_CHARACTERS": "英数字だけを使用してください"
+    }
   }
 }
diff --git a/lib/content-services/i18n/nb.json b/lib/content-services/i18n/nb.json
index a2c6ef7148..1b3ffee540 100644
--- a/lib/content-services/i18n/nb.json
+++ b/lib/content-services/i18n/nb.json
@@ -287,5 +287,31 @@
       "DUPLICATE-PERMISSION": "Én eller flere av tillatelsene du har angitt, er allerede til stede: {{list}}",
       "NOT-ALLOWED": "Du har ikke lov til å endre tillatelser"
     }
+  },
+  "LIBRARY": {
+    "DIALOG": {
+      "CREATE_TITLE": "Opprett bibliotek",
+      "CREATE": "Opprett",
+      "CANCEL": "Avbryt",
+      "FORM": {
+        "DESCRIPTION": "Beskrivelse",
+        "SITE_ID": "Biblioteks-ID",
+        "NAME": "Navn"
+      }
+    },
+    "VISIBILITY": {
+      "PRIVATE": "Privat",
+      "PUBLIC": "Offentlig",
+      "MODERATED": "Moderert"
+    },
+    "ERRORS": {
+      "GENERIC": "Vi støtte på et problem",
+      "EXISTENT_SITE": "Denne biblioteks-ID-en er ikke tilgjengelig. Prøv et annet bibliotek.",
+      "CONFLICT": "Denne biblioteks-ID-en er alt brukt. Sjekk papirkurven.",
+      "ID_TOO_LONG": "Bruk 72 tegn eller mindre i URL-navnet",
+      "DESCRIPTION_TOO_LONG": "Bruk 512 tegn eller mindre i beskrivelsen",
+      "TITLE_TOO_LONG": "Bruk 256 tegn eller mindre i tittelen",
+      "ILLEGAL_CHARACTERS": "Bruk kun tall og bokstaver"
+    }
   }
 }
diff --git a/lib/content-services/i18n/nl.json b/lib/content-services/i18n/nl.json
index dc12e20e52..c4beafb012 100644
--- a/lib/content-services/i18n/nl.json
+++ b/lib/content-services/i18n/nl.json
@@ -287,5 +287,31 @@
       "DUPLICATE-PERMISSION": "Een of meerdere machtigingen die u hebt ingesteld zijn al aanwezig: {{list}}",
       "NOT-ALLOWED": "Het is u niet toegestaan om machtigingen te wijzigen"
     }
+  },
+  "LIBRARY": {
+    "DIALOG": {
+      "CREATE_TITLE": "Bibliotheek maken",
+      "CREATE": "Maken",
+      "CANCEL": "Annuleren",
+      "FORM": {
+        "DESCRIPTION": "Beschrijving",
+        "SITE_ID": "Bibliotheek-id",
+        "NAME": "Naam"
+      }
+    },
+    "VISIBILITY": {
+      "PRIVATE": "Privé",
+      "PUBLIC": "Openbaar",
+      "MODERATED": "Onder toezicht"
+    },
+    "ERRORS": {
+      "GENERIC": "Er is een probleem opgetreden",
+      "EXISTENT_SITE": "Deze bibliotheek-id is niet beschikbaar. Probeer een andere bibliotheek.",
+      "CONFLICT": "Deze bibliotheek wordt al gebruikt. Controleer de prullenbak.",
+      "ID_TOO_LONG": "Gebruik 72 tekens of minder voor de URL-naam",
+      "DESCRIPTION_TOO_LONG": "Gebruik 512 tekens of minder voor de beschrijving",
+      "TITLE_TOO_LONG": "Gebruik 256 tekens of minder voor de titel",
+      "ILLEGAL_CHARACTERS": "Gebruik alleen cijfers en letters"
+    }
   }
 }
diff --git a/lib/content-services/i18n/pt-BR.json b/lib/content-services/i18n/pt-BR.json
index 1824080394..8a3e8e01cd 100644
--- a/lib/content-services/i18n/pt-BR.json
+++ b/lib/content-services/i18n/pt-BR.json
@@ -287,5 +287,31 @@
       "DUPLICATE-PERMISSION": "Uma ou mais permissões definidas já está presente: {{list}}",
       "NOT-ALLOWED": "Você não pode alterar permissões"
     }
+  },
+  "LIBRARY": {
+    "DIALOG": {
+      "CREATE_TITLE": "Criar Biblioteca",
+      "CREATE": "Criar",
+      "CANCEL": "Cancelar",
+      "FORM": {
+        "DESCRIPTION": "Descrição",
+        "SITE_ID": "ID de Biblioteca",
+        "NAME": "Nome"
+      }
+    },
+    "VISIBILITY": {
+      "PRIVATE": "Privado",
+      "PUBLIC": "Público",
+      "MODERATED": "Moderado"
+    },
+    "ERRORS": {
+      "GENERIC": "Ocorreu um erro",
+      "EXISTENT_SITE": "Este ID de Biblioteca não está disponível. Tente uma Biblioteca diferente.",
+      "CONFLICT": "Este ID de Biblioteca já foi usado. Verifique a lixeira.",
+      "ID_TOO_LONG": "Use 72 caracteres ou menos para o nome da URL",
+      "DESCRIPTION_TOO_LONG": "Use 512 caracteres ou menos para a descrição",
+      "TITLE_TOO_LONG": "Use 256 caracteres ou menos para o título",
+      "ILLEGAL_CHARACTERS": "Use somente números e letras"
+    }
   }
 }
diff --git a/lib/content-services/i18n/ru.json b/lib/content-services/i18n/ru.json
index df984be7f3..6f372ea2e8 100644
--- a/lib/content-services/i18n/ru.json
+++ b/lib/content-services/i18n/ru.json
@@ -287,5 +287,31 @@
       "DUPLICATE-PERMISSION": "Одно или несколько установленных вами разрешений уже присутствует: {{list}}",
       "NOT-ALLOWED": "У вас нет прав на изменение разрешений"
     }
+  },
+  "LIBRARY": {
+    "DIALOG": {
+      "CREATE_TITLE": "Создание библиотеки",
+      "CREATE": "Создать",
+      "CANCEL": "Отмена",
+      "FORM": {
+        "DESCRIPTION": "Описание",
+        "SITE_ID": "Идентификатор библиотеки",
+        "NAME": "Имя"
+      }
+    },
+    "VISIBILITY": {
+      "PRIVATE": "Частный",
+      "PUBLIC": "Общедоступный",
+      "MODERATED": "Модерируемый"
+    },
+    "ERRORS": {
+      "GENERIC": "Возникла проблема",
+      "EXISTENT_SITE": "Идентификатор библиотеки недоступен. Попробуйте использовать другую библиотеку.",
+      "CONFLICT": "Этот идентификатор библиотеки уже используется. Проверьте корзину.",
+      "ID_TOO_LONG": "Имя URL должно содержать не более 72 символов",
+      "DESCRIPTION_TOO_LONG": "Описание должно содержать не более 512 символов",
+      "TITLE_TOO_LONG": "Название должно содержать не более 256 символов",
+      "ILLEGAL_CHARACTERS": "Используйте только буквы и цифры"
+    }
   }
 }
diff --git a/lib/content-services/i18n/zh-CN.json b/lib/content-services/i18n/zh-CN.json
index 34d4e89116..65d13adbb3 100644
--- a/lib/content-services/i18n/zh-CN.json
+++ b/lib/content-services/i18n/zh-CN.json
@@ -287,5 +287,31 @@
       "DUPLICATE-PERMISSION": "您所设置的一个或多个权限已经存在：{{list}}",
       "NOT-ALLOWED": "不允许更改权限"
     }
+  },
+  "LIBRARY": {
+    "DIALOG": {
+      "CREATE_TITLE": "创建库",
+      "CREATE": "创建",
+      "CANCEL": "取消",
+      "FORM": {
+        "DESCRIPTION": "说明",
+        "SITE_ID": "库 ID",
+        "NAME": "名称"
+      }
+    },
+    "VISIBILITY": {
+      "PRIVATE": "私有",
+      "PUBLIC": "公共",
+      "MODERATED": "适中"
+    },
+    "ERRORS": {
+      "GENERIC": "我们遇到了问题",
+      "EXISTENT_SITE": "此库 ID 不可用。请尝试使用其他库。",
+      "CONFLICT": "此库 ID 已被使用。请检查回收站。",
+      "ID_TOO_LONG": "对 URL 名称使用 72 个字符或更少字符",
+      "DESCRIPTION_TOO_LONG": "对描述使用 512 个字符或更少字符",
+      "TITLE_TOO_LONG": "对标题使用 256 个字符或更少字符",
+      "ILLEGAL_CHARACTERS": "仅使用数字和字母"
+    }
   }
 }
diff --git a/lib/content-services/search/components/search-control.component.html b/lib/content-services/search/components/search-control.component.html
index ebe0c2a99a..3c84080c52 100644
--- a/lib/content-services/search/components/search-control.component.html
+++ b/lib/content-services/search/components/search-control.component.html
@@ -1,4 +1,4 @@
-<div class="adf-search-container">
+<div class="adf-search-container" [attr.state]="subscriptAnimationState">
     <div *ngIf="isLoggedIn()" [@transitionMessages]="subscriptAnimationState"
          (@transitionMessages.done)="applySearchFocus($event)">
         <button mat-icon-button
diff --git a/lib/core/buttons-menu/buttons-menu.component.scss b/lib/core/buttons-menu/buttons-menu.component.scss
index 0156936b38..fbf65418a0 100644
--- a/lib/core/buttons-menu/buttons-menu.component.scss
+++ b/lib/core/buttons-menu/buttons-menu.component.scss
@@ -23,7 +23,7 @@
                 display: none;
             }
 
-            button > mat-icon.mat-icon.adf-material-icons {
+            button > mat-icon.mat-icon.material-icons {
                 color: black;
                 margin: 0 10px;
             }
diff --git a/lib/core/form/components/form.component.html b/lib/core/form/components/form.component.html
index ee9d50ec07..d897b4bc62 100644
--- a/lib/core/form/components/form.component.html
+++ b/lib/core/form/components/form.component.html
@@ -9,9 +9,9 @@
             <mat-card-title>
                 <h4>
                     <div *ngIf="showValidationIcon" class="adf-form-validation-button">
-                        <i id="adf-valid-form-icon" class="adf-material-icons" *ngIf="form.isValid; else no_valid_form">check_circle</i>
+                        <i id="adf-valid-form-icon" class="material-icons" *ngIf="form.isValid; else no_valid_form">check_circle</i>
                         <ng-template #no_valid_form>
-                            <i id="adf-invalid-form-icon" class="adf-material-icons adf-invalid-color">error</i>
+                            <i id="adf-invalid-form-icon" class="material-icons adf-invalid-color">error</i>
                         </ng-template>
                     </div>
                     <div *ngIf="showRefreshButton" class="adf-form-reload-button">
diff --git a/lib/core/services/highlight-transform.service.ts b/lib/core/services/highlight-transform.service.ts
index d4a6860ca6..447b33d8c6 100644
--- a/lib/core/services/highlight-transform.service.ts
+++ b/lib/core/services/highlight-transform.service.ts
@@ -34,7 +34,7 @@ export class HighlightTransformService {
      * @param wrapperClass CSS class used to provide highlighting style
      * @returns New text along with boolean value to indicate whether anything was highlighted
      */
-    public highlight(text: string, search: string, wrapperClass: string = 'highlight'): HighlightTransformResult {
+    public highlight(text: string, search: string, wrapperClass: string = 'adf-highlight'): HighlightTransformResult {
         let isMatching = false,
             result = text;
 
diff --git a/package-lock.json b/package-lock.json
index c186f24777..d5b0efb330 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-2.7.0-beta5.tgz",
       "integrity": "sha512-aD2IfsiS1vbFBSKpKheLHSYrFDMiGPSLXlLhocE7mt+YqKUB5AAb6TeWFDjYMq4/Xi3CTwHcrzK47zy1UZFZtA==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "@alfresco/adf-core": {
@@ -17,7 +17,7 @@
       "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-2.7.0-beta5.tgz",
       "integrity": "sha512-WjReRby8OPipCrYMDSWRiEPlmiYXujjh7heK8buHYMnwfTeDC9MSa+VUEUmcnN6JQJ+AagqElHXJ2dzQSNnNVg==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "@alfresco/adf-extensions": {
@@ -25,7 +25,7 @@
       "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-2.7.0-beta5.tgz",
       "integrity": "sha512-Pqom/uksZD43rnJ1vskqsYxg//KTQOX2G8WHq8yrA75DQz1WkVrtvfI7OhH1Nw0NzSHQE1+kXntjE78lHA1+Wg==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "@alfresco/adf-insights": {
@@ -33,7 +33,7 @@
       "resolved": "https://registry.npmjs.org/@alfresco/adf-insights/-/adf-insights-2.7.0-beta5.tgz",
       "integrity": "sha512-eyu1ZWYDigHXflqSy/ukY3z9/kE8I1QbTEbH8H1SdDrYuUf+PvTKQ9RMqlYwYhGsKeHDfe44j2tgM8Nq41r5cw==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "@alfresco/adf-process-services": {
@@ -41,7 +41,7 @@
       "resolved": "https://registry.npmjs.org/@alfresco/adf-process-services/-/adf-process-services-2.7.0-beta5.tgz",
       "integrity": "sha512-JIcsFj6cpxAiKEDqDzV4WyYLnVBnPdybyGg+WsTgBuDItCfCg4V+23YN94qGj7p0+b1njF8xV8edabJJ+346Lg==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "@alfresco/adf-process-services-cloud": {
@@ -49,7 +49,7 @@
       "resolved": "https://registry.npmjs.org/@alfresco/adf-process-services-cloud/-/adf-process-services-cloud-2.7.0-beta5.tgz",
       "integrity": "sha512-EFFeZVEXc5Wo0kBVLJUpicVSNo1Q2ExLOpXdj89fJAAq7aaDyDaMp/3Xk0rykiIqIQZh0eMCqXEifFA59ioKjA==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "@angular-devkit/architect": {
@@ -59,7 +59,7 @@
       "dev": true,
       "requires": {
         "@angular-devkit/core": "0.8.6",
-        "rxjs": "~6.2.0"
+        "rxjs": "6.2.2"
       },
       "dependencies": {
         "rxjs": {
@@ -68,7 +68,7 @@
           "integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
           "dev": true,
           "requires": {
-            "tslib": "^1.9.0"
+            "tslib": "1.9.3"
           }
         }
       }
@@ -84,50 +84,50 @@
         "@angular-devkit/build-webpack": "0.8.6",
         "@angular-devkit/core": "0.8.6",
         "@ngtools/webpack": "6.2.6",
-        "ajv": "~6.4.0",
-        "autoprefixer": "^8.4.1",
-        "circular-dependency-plugin": "^5.0.2",
-        "clean-css": "^4.1.11",
+        "ajv": "6.4.0",
+        "autoprefixer": "8.6.5",
+        "circular-dependency-plugin": "5.0.2",
+        "clean-css": "4.2.1",
         "copy-webpack-plugin": "4.5.2",
-        "file-loader": "^1.1.11",
-        "glob": "^7.0.3",
-        "html-webpack-plugin": "^3.0.6",
-        "istanbul": "^0.4.5",
-        "istanbul-instrumenter-loader": "^3.0.1",
-        "karma-source-map-support": "^1.2.0",
-        "less": "^3.7.1",
-        "less-loader": "^4.1.0",
-        "license-webpack-plugin": "^1.3.1",
-        "loader-utils": "^1.1.0",
-        "mini-css-extract-plugin": "~0.4.0",
-        "minimatch": "^3.0.4",
-        "node-sass": "^4.9.3",
-        "opn": "^5.1.0",
-        "parse5": "^4.0.0",
-        "portfinder": "^1.0.13",
-        "postcss": "^6.0.22",
-        "postcss-import": "^11.1.0",
-        "postcss-loader": "^2.1.5",
-        "postcss-url": "^7.3.2",
-        "raw-loader": "^0.5.1",
-        "rxjs": "~6.2.0",
-        "sass-loader": "^7.1.0",
-        "semver": "^5.5.0",
-        "source-map-loader": "^0.2.3",
-        "source-map-support": "^0.5.0",
-        "stats-webpack-plugin": "^0.6.2",
-        "style-loader": "^0.21.0",
-        "stylus": "^0.54.5",
-        "stylus-loader": "^3.0.2",
-        "tree-kill": "^1.2.0",
-        "uglifyjs-webpack-plugin": "^1.2.5",
-        "url-loader": "^1.0.1",
-        "webpack": "^4.15.1",
-        "webpack-dev-middleware": "^3.1.3",
-        "webpack-dev-server": "^3.1.4",
-        "webpack-merge": "^4.1.2",
-        "webpack-sources": "^1.1.0",
-        "webpack-subresource-integrity": "^1.1.0-rc.4"
+        "file-loader": "1.1.11",
+        "glob": "7.1.3",
+        "html-webpack-plugin": "3.2.0",
+        "istanbul": "0.4.5",
+        "istanbul-instrumenter-loader": "3.0.1",
+        "karma-source-map-support": "1.3.0",
+        "less": "3.8.1",
+        "less-loader": "4.1.0",
+        "license-webpack-plugin": "1.5.0",
+        "loader-utils": "1.1.0",
+        "mini-css-extract-plugin": "0.4.4",
+        "minimatch": "3.0.4",
+        "node-sass": "4.9.4",
+        "opn": "5.4.0",
+        "parse5": "4.0.0",
+        "portfinder": "1.0.19",
+        "postcss": "6.0.23",
+        "postcss-import": "11.1.0",
+        "postcss-loader": "2.1.6",
+        "postcss-url": "7.3.2",
+        "raw-loader": "0.5.1",
+        "rxjs": "6.2.2",
+        "sass-loader": "7.1.0",
+        "semver": "5.6.0",
+        "source-map-loader": "0.2.4",
+        "source-map-support": "0.5.9",
+        "stats-webpack-plugin": "0.6.2",
+        "style-loader": "0.21.0",
+        "stylus": "0.54.5",
+        "stylus-loader": "3.0.2",
+        "tree-kill": "1.2.0",
+        "uglifyjs-webpack-plugin": "1.3.0",
+        "url-loader": "1.1.2",
+        "webpack": "4.22.0",
+        "webpack-dev-middleware": "3.4.0",
+        "webpack-dev-server": "3.1.10",
+        "webpack-merge": "4.1.4",
+        "webpack-sources": "1.3.0",
+        "webpack-subresource-integrity": "1.2.0"
       },
       "dependencies": {
         "ajv": {
@@ -136,10 +136,10 @@
           "integrity": "sha1-06/3jpJ3VJdx2vAWTP9ISCt1T8Y=",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "^1.0.0",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.3.0",
-            "uri-js": "^3.0.2"
+            "fast-deep-equal": "1.1.0",
+            "fast-json-stable-stringify": "2.0.0",
+            "json-schema-traverse": "0.3.1",
+            "uri-js": "3.0.2"
           }
         },
         "ansi-regex": {
@@ -162,12 +162,12 @@
           "integrity": "sha512-PLWJN3Xo/rycNkx+mp8iBDMTm3FeWe4VmYaZDSqL5QQB9sLsQkG5k8n+LNDFnhh9kdq2K+egL/icpctOmDHwig==",
           "dev": true,
           "requires": {
-            "browserslist": "^3.2.8",
-            "caniuse-lite": "^1.0.30000864",
-            "normalize-range": "^0.1.2",
-            "num2fraction": "^1.2.2",
-            "postcss": "^6.0.23",
-            "postcss-value-parser": "^3.2.3"
+            "browserslist": "3.2.8",
+            "caniuse-lite": "1.0.30000898",
+            "normalize-range": "0.1.2",
+            "num2fraction": "1.2.2",
+            "postcss": "6.0.23",
+            "postcss-value-parser": "3.3.1"
           }
         },
         "chalk": {
@@ -177,11 +177,11 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "cross-spawn": {
@@ -191,8 +191,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "lru-cache": "^4.0.1",
-            "which": "^1.2.9"
+            "lru-cache": "4.1.3",
+            "which": "1.3.1"
           }
         },
         "fast-deep-equal": {
@@ -214,25 +214,25 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "async-foreach": "^0.1.3",
-            "chalk": "^1.1.1",
-            "cross-spawn": "^3.0.0",
-            "gaze": "^1.0.0",
-            "get-stdin": "^4.0.1",
-            "glob": "^7.0.3",
-            "in-publish": "^2.0.0",
-            "lodash.assign": "^4.2.0",
-            "lodash.clonedeep": "^4.3.2",
-            "lodash.mergewith": "^4.6.0",
-            "meow": "^3.7.0",
-            "mkdirp": "^0.5.1",
-            "nan": "^2.10.0",
-            "node-gyp": "^3.8.0",
-            "npmlog": "^4.0.0",
-            "request": "^2.88.0",
-            "sass-graph": "^2.2.4",
-            "stdout-stream": "^1.4.0",
-            "true-case-path": "^1.0.2"
+            "async-foreach": "0.1.3",
+            "chalk": "1.1.3",
+            "cross-spawn": "3.0.1",
+            "gaze": "1.1.3",
+            "get-stdin": "4.0.1",
+            "glob": "7.1.3",
+            "in-publish": "2.0.0",
+            "lodash.assign": "4.2.0",
+            "lodash.clonedeep": "4.5.0",
+            "lodash.mergewith": "4.6.1",
+            "meow": "3.7.0",
+            "mkdirp": "0.5.1",
+            "nan": "2.11.1",
+            "node-gyp": "3.8.0",
+            "npmlog": "4.1.2",
+            "request": "2.88.0",
+            "sass-graph": "2.2.4",
+            "stdout-stream": "1.4.1",
+            "true-case-path": "1.0.3"
           }
         },
         "parse5": {
@@ -247,7 +247,7 @@
           "integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
           "dev": true,
           "requires": {
-            "tslib": "^1.9.0"
+            "tslib": "1.9.3"
           }
         },
         "sass-loader": {
@@ -256,12 +256,12 @@
           "integrity": "sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==",
           "dev": true,
           "requires": {
-            "clone-deep": "^2.0.1",
-            "loader-utils": "^1.0.1",
-            "lodash.tail": "^4.1.1",
-            "neo-async": "^2.5.0",
-            "pify": "^3.0.0",
-            "semver": "^5.5.0"
+            "clone-deep": "2.0.2",
+            "loader-utils": "1.1.0",
+            "lodash.tail": "4.1.1",
+            "neo-async": "2.6.0",
+            "pify": "3.0.0",
+            "semver": "5.6.0"
           }
         },
         "strip-ansi": {
@@ -271,7 +271,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "2.1.1"
           }
         },
         "supports-color": {
@@ -287,7 +287,7 @@
           "integrity": "sha1-+QuFhQf4HepNz7s8TD2/orVX+qo=",
           "dev": true,
           "requires": {
-            "punycode": "^2.1.0"
+            "punycode": "2.1.1"
           }
         },
         "webpack-merge": {
@@ -296,7 +296,7 @@
           "integrity": "sha512-TmSe1HZKeOPey3oy1Ov2iS3guIZjWvMT2BBJDzzT5jScHTjVC3mpjJofgueEzaEd6ibhxRDD6MIblDr8tzh8iQ==",
           "dev": true,
           "requires": {
-            "lodash": "^4.17.5"
+            "lodash": "4.17.11"
           }
         }
       }
@@ -309,8 +309,8 @@
       "requires": {
         "@angular-devkit/architect": "0.8.6",
         "@angular-devkit/core": "0.8.6",
-        "rxjs": "~6.2.0",
-        "semver": "^5.3.0"
+        "rxjs": "6.2.2",
+        "semver": "5.6.0"
       },
       "dependencies": {
         "rxjs": {
@@ -319,7 +319,7 @@
           "integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
           "dev": true,
           "requires": {
-            "tslib": "^1.9.0"
+            "tslib": "1.9.3"
           }
         }
       }
@@ -330,10 +330,10 @@
       "integrity": "sha512-W/rxEb8My9nOjX0ZH8Kd7w3WGO+yaEBSUP3WBiWQ8caVTPtwsHEkJ16dIgV/U0RjC/grvlD13MhU/7AuFFK69Q==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0",
-        "source-map": "^0.5.6",
-        "typescript": "~2.9.2",
-        "webpack-sources": "^1.1.0"
+        "loader-utils": "1.1.0",
+        "source-map": "0.5.6",
+        "typescript": "2.9.2",
+        "webpack-sources": "1.3.0"
       }
     },
     "@angular-devkit/build-webpack": {
@@ -344,7 +344,7 @@
       "requires": {
         "@angular-devkit/architect": "0.8.6",
         "@angular-devkit/core": "0.8.6",
-        "rxjs": "~6.2.0"
+        "rxjs": "6.2.2"
       },
       "dependencies": {
         "rxjs": {
@@ -353,7 +353,7 @@
           "integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
           "dev": true,
           "requires": {
-            "tslib": "^1.9.0"
+            "tslib": "1.9.3"
           }
         }
       }
@@ -364,10 +364,10 @@
       "integrity": "sha512-VEx363a5u2nJYgng7wZZ5yXp/SXyw28LBR7P8Rudux7RpquH3Wfoss0rIScIykhXC8sDbRidwxmi1mSd9KEKKw==",
       "dev": true,
       "requires": {
-        "ajv": "~6.4.0",
-        "chokidar": "^2.0.3",
-        "rxjs": "~6.2.0",
-        "source-map": "^0.5.6"
+        "ajv": "6.4.0",
+        "chokidar": "2.0.4",
+        "rxjs": "6.2.2",
+        "source-map": "0.5.6"
       },
       "dependencies": {
         "ajv": {
@@ -376,10 +376,10 @@
           "integrity": "sha1-06/3jpJ3VJdx2vAWTP9ISCt1T8Y=",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "^1.0.0",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.3.0",
-            "uri-js": "^3.0.2"
+            "fast-deep-equal": "1.1.0",
+            "fast-json-stable-stringify": "2.0.0",
+            "json-schema-traverse": "0.3.1",
+            "uri-js": "3.0.2"
           }
         },
         "fast-deep-equal": {
@@ -400,7 +400,7 @@
           "integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
           "dev": true,
           "requires": {
-            "tslib": "^1.9.0"
+            "tslib": "1.9.3"
           }
         },
         "uri-js": {
@@ -409,7 +409,7 @@
           "integrity": "sha1-+QuFhQf4HepNz7s8TD2/orVX+qo=",
           "dev": true,
           "requires": {
-            "punycode": "^2.1.0"
+            "punycode": "2.1.1"
           }
         }
       }
@@ -421,7 +421,7 @@
       "dev": true,
       "requires": {
         "@angular-devkit/core": "0.8.6",
-        "rxjs": "~6.2.0"
+        "rxjs": "6.2.2"
       },
       "dependencies": {
         "rxjs": {
@@ -430,7 +430,7 @@
           "integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
           "dev": true,
           "requires": {
-            "tslib": "^1.9.0"
+            "tslib": "1.9.3"
           }
         }
       }
@@ -440,7 +440,7 @@
       "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-6.1.8.tgz",
       "integrity": "sha512-OUetZPkEfUz0o58bVmx42Jdd/ep+KcgV5xaFvRTwXI/mVbTYgODJUos7aaoyBz6J2EPB/pTA4NMyZU3XFKjDiw==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "@angular/cdk": {
@@ -448,7 +448,7 @@
       "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-6.4.7.tgz",
       "integrity": "sha512-18x0U66fLD5kGQWZ9n3nb75xQouXlWs7kUDaTd8HTrHpT1s2QIAqlLd1KxfrYiVhsEC2jPQaoiae7VnBlcvkBg==",
       "requires": {
-        "tslib": "^1.7.1"
+        "tslib": "1.9.3"
       }
     },
     "@angular/cli": {
@@ -462,12 +462,12 @@
         "@angular-devkit/schematics": "0.8.6",
         "@schematics/angular": "0.8.6",
         "@schematics/update": "0.8.6",
-        "json-schema-traverse": "^0.4.1",
-        "opn": "^5.3.0",
-        "rxjs": "~6.2.0",
-        "semver": "^5.1.0",
-        "symbol-observable": "^1.2.0",
-        "yargs-parser": "^10.0.0"
+        "json-schema-traverse": "0.4.1",
+        "opn": "5.4.0",
+        "rxjs": "6.2.2",
+        "semver": "5.6.0",
+        "symbol-observable": "1.2.0",
+        "yargs-parser": "10.1.0"
       },
       "dependencies": {
         "rxjs": {
@@ -476,7 +476,7 @@
           "integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
           "dev": true,
           "requires": {
-            "tslib": "^1.9.0"
+            "tslib": "1.9.3"
           }
         },
         "yargs-parser": {
@@ -485,7 +485,7 @@
           "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
           "dev": true,
           "requires": {
-            "camelcase": "^4.1.0"
+            "camelcase": "4.1.0"
           }
         }
       }
@@ -495,7 +495,7 @@
       "resolved": "https://registry.npmjs.org/@angular/common/-/common-6.1.8.tgz",
       "integrity": "sha512-v8U49a7w2hXKX229WCLNF40RYY3v26+QKlN/jxdzKpP4wu5dguX6s6d3+AJdtywvsE8WS1NwOTHWCCWuMiVxrg==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "@angular/compiler": {
@@ -503,7 +503,7 @@
       "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-6.1.8.tgz",
       "integrity": "sha512-a+OblYNKzjBVsYy3FlZd8QkZvWpsDlqb8xGCfUBPazPFlbeDGp4Bvz5KdX0uCTv46OQyh6jeAmKWPt0PVxLrhg==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "@angular/compiler-cli": {
@@ -512,10 +512,10 @@
       "integrity": "sha512-oL7ghO1Yjfp+J349hWrOqsrwJZ6ZAC0mRsXY0SkadnPI3oLzcmysmZV91UUjjZ43KR6lmXXkxo52Gt8bIRYEWQ==",
       "dev": true,
       "requires": {
-        "chokidar": "^1.4.2",
-        "minimist": "^1.2.0",
-        "reflect-metadata": "^0.1.2",
-        "tsickle": "^0.32.1"
+        "chokidar": "1.7.0",
+        "minimist": "1.2.0",
+        "reflect-metadata": "0.1.10",
+        "tsickle": "0.32.1"
       },
       "dependencies": {
         "anymatch": {
@@ -524,8 +524,8 @@
           "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
           "dev": true,
           "requires": {
-            "micromatch": "^2.1.5",
-            "normalize-path": "^2.0.0"
+            "micromatch": "2.3.11",
+            "normalize-path": "2.1.1"
           }
         },
         "arr-diff": {
@@ -534,7 +534,7 @@
           "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
           "dev": true,
           "requires": {
-            "arr-flatten": "^1.0.1"
+            "arr-flatten": "1.1.0"
           }
         },
         "array-unique": {
@@ -549,9 +549,9 @@
           "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
           "dev": true,
           "requires": {
-            "expand-range": "^1.8.1",
-            "preserve": "^0.2.0",
-            "repeat-element": "^1.1.2"
+            "expand-range": "1.8.2",
+            "preserve": "0.2.0",
+            "repeat-element": "1.1.3"
           }
         },
         "chokidar": {
@@ -560,15 +560,15 @@
           "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
           "dev": true,
           "requires": {
-            "anymatch": "^1.3.0",
-            "async-each": "^1.0.0",
-            "fsevents": "^1.0.0",
-            "glob-parent": "^2.0.0",
-            "inherits": "^2.0.1",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^2.0.0",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.0.0"
+            "anymatch": "1.3.2",
+            "async-each": "1.0.1",
+            "fsevents": "1.2.4",
+            "glob-parent": "2.0.0",
+            "inherits": "2.0.3",
+            "is-binary-path": "1.0.1",
+            "is-glob": "2.0.1",
+            "path-is-absolute": "1.0.1",
+            "readdirp": "2.2.1"
           }
         },
         "expand-brackets": {
@@ -577,7 +577,7 @@
           "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
           "dev": true,
           "requires": {
-            "is-posix-bracket": "^0.1.0"
+            "is-posix-bracket": "0.1.1"
           }
         },
         "extglob": {
@@ -586,7 +586,7 @@
           "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
           "dev": true,
           "requires": {
-            "is-extglob": "^1.0.0"
+            "is-extglob": "1.0.0"
           }
         },
         "glob-parent": {
@@ -595,7 +595,7 @@
           "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
           "dev": true,
           "requires": {
-            "is-glob": "^2.0.0"
+            "is-glob": "2.0.1"
           }
         },
         "is-extglob": {
@@ -610,7 +610,7 @@
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
           "requires": {
-            "is-extglob": "^1.0.0"
+            "is-extglob": "1.0.0"
           }
         },
         "kind-of": {
@@ -619,7 +619,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         },
         "micromatch": {
@@ -628,19 +628,19 @@
           "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
           "dev": true,
           "requires": {
-            "arr-diff": "^2.0.0",
-            "array-unique": "^0.2.1",
-            "braces": "^1.8.2",
-            "expand-brackets": "^0.1.4",
-            "extglob": "^0.3.1",
-            "filename-regex": "^2.0.0",
-            "is-extglob": "^1.0.0",
-            "is-glob": "^2.0.1",
-            "kind-of": "^3.0.2",
-            "normalize-path": "^2.0.1",
-            "object.omit": "^2.0.0",
-            "parse-glob": "^3.0.4",
-            "regex-cache": "^0.4.2"
+            "arr-diff": "2.0.0",
+            "array-unique": "0.2.1",
+            "braces": "1.8.5",
+            "expand-brackets": "0.1.5",
+            "extglob": "0.3.2",
+            "filename-regex": "2.0.1",
+            "is-extglob": "1.0.0",
+            "is-glob": "2.0.1",
+            "kind-of": "3.2.2",
+            "normalize-path": "2.1.1",
+            "object.omit": "2.0.1",
+            "parse-glob": "3.0.4",
+            "regex-cache": "0.4.4"
           }
         },
         "minimist": {
@@ -656,7 +656,7 @@
       "resolved": "https://registry.npmjs.org/@angular/core/-/core-6.1.8.tgz",
       "integrity": "sha512-6bMVQmPqpKJZspjNRIEMaGOxCmDWrAZENlofXNgPhQ0mUNh17iTH7XpqjKbW7UWtnTqGcdnDC9dI++P08ggD3g==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "@angular/flex-layout": {
@@ -664,7 +664,7 @@
       "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-6.0.0-beta.18.tgz",
       "integrity": "sha512-1Alv3YSIZYp0CTUIESIaSQLoSVyLzuNKPa5bGM/RzOmeSrndm5plVgI9wopGfJUDiwM18R97rq/4XjDvNT/+ig==",
       "requires": {
-        "tslib": "^1.7.1"
+        "tslib": "1.9.3"
       }
     },
     "@angular/forms": {
@@ -672,7 +672,7 @@
       "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-6.1.8.tgz",
       "integrity": "sha512-S+spi72wxXTTIdB+02xgYdl8UlCYMJ13ast0dfCGStwx/fRUsgo0sWppDpMJz9sseC7xKEJ4U5tsfjTiCQ9dqw==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "@angular/http": {
@@ -680,7 +680,7 @@
       "resolved": "https://registry.npmjs.org/@angular/http/-/http-6.1.8.tgz",
       "integrity": "sha512-WqOm3mAjU9SdPazi7DTJzPosRzb4+3Dk3gdzMpKwDNP40Zg940UBt62udVmK2ERReIQlQbHgq/+JLiPe3q5O5A==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "@angular/material": {
@@ -688,8 +688,8 @@
       "resolved": "https://registry.npmjs.org/@angular/material/-/material-6.4.7.tgz",
       "integrity": "sha512-SdNx7Xovi24Kw9eU6lkLhY/7f2M7L9F+/uh6XuPr4jbGgCUVVpeeVI5ztZhsZRbj1sN+/r1p5w8u62apWWl5Ww==",
       "requires": {
-        "parse5": "^5.0.0",
-        "tslib": "^1.7.1"
+        "parse5": "5.1.0",
+        "tslib": "1.9.3"
       }
     },
     "@angular/material-moment-adapter": {
@@ -697,7 +697,7 @@
       "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-6.4.7.tgz",
       "integrity": "sha512-OGdDtpu/yRioOQXhJFCNuiOF2OgiL9VUj8ewFPi1lDtFGUFfVwU2h3hWkKLn+yuPW+DBVYla11tCNsn5dLElmA==",
       "requires": {
-        "tslib": "^1.7.1"
+        "tslib": "1.9.3"
       }
     },
     "@angular/platform-browser": {
@@ -705,7 +705,7 @@
       "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-6.1.8.tgz",
       "integrity": "sha512-ZjnlnKj6K+Z+LvA9dbzckOfB0CwaamTkQGxyODXdYpwEJ/7YOoz+v+LYf6BpKdyqiDHEyVQnkU0YiniNNy+CWA==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "@angular/platform-browser-dynamic": {
@@ -713,7 +713,7 @@
       "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.1.8.tgz",
       "integrity": "sha512-rXsyY6xpeuBTGyEmgx3KFMv1PTgaa1efA1bo8I3KIuUn595GnQamszpXISSySGeMYxEhKFeQWafb/ZDnSg0vWQ==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "@angular/router": {
@@ -721,7 +721,7 @@
       "resolved": "https://registry.npmjs.org/@angular/router/-/router-6.1.8.tgz",
       "integrity": "sha512-0J7xkN8l4vdmtFETgJFYqHYxUPZz9grTnjeKmEkBSogxpOfJE5doDkAcBraRzB/Nb95MSb+zc4rIjx9Otx2IjA==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "@babel/code-frame": {
@@ -730,7 +730,7 @@
       "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
       "dev": true,
       "requires": {
-        "@babel/highlight": "^7.0.0"
+        "@babel/highlight": "7.0.0"
       }
     },
     "@babel/core": {
@@ -739,20 +739,20 @@
       "integrity": "sha512-Hz6PJT6e44iUNpAn8AoyAs6B3bl60g7MJQaI0rZEar6ECzh6+srYO1xlIdssio34mPaUtAb1y+XlkkSJzok3yw==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/generator": "^7.1.6",
-        "@babel/helpers": "^7.1.5",
-        "@babel/parser": "^7.1.6",
-        "@babel/template": "^7.1.2",
-        "@babel/traverse": "^7.1.6",
-        "@babel/types": "^7.1.6",
-        "convert-source-map": "^1.1.0",
-        "debug": "^4.1.0",
-        "json5": "^2.1.0",
-        "lodash": "^4.17.10",
-        "resolve": "^1.3.2",
-        "semver": "^5.4.1",
-        "source-map": "^0.5.0"
+        "@babel/code-frame": "7.0.0",
+        "@babel/generator": "7.1.6",
+        "@babel/helpers": "7.1.5",
+        "@babel/parser": "7.1.6",
+        "@babel/template": "7.1.2",
+        "@babel/traverse": "7.1.6",
+        "@babel/types": "7.1.6",
+        "convert-source-map": "1.6.0",
+        "debug": "4.1.0",
+        "json5": "2.1.0",
+        "lodash": "4.17.11",
+        "resolve": "1.8.1",
+        "semver": "5.6.0",
+        "source-map": "0.5.6"
       },
       "dependencies": {
         "debug": {
@@ -761,7 +761,7 @@
           "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.1"
           }
         },
         "json5": {
@@ -770,7 +770,7 @@
           "integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==",
           "dev": true,
           "requires": {
-            "minimist": "^1.2.0"
+            "minimist": "1.2.0"
           }
         },
         "minimist": {
@@ -785,7 +785,7 @@
           "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==",
           "dev": true,
           "requires": {
-            "path-parse": "^1.0.5"
+            "path-parse": "1.0.6"
           }
         }
       }
@@ -796,11 +796,11 @@
       "integrity": "sha512-brwPBtVvdYdGxtenbQgfCdDPmtkmUBZPjUoK5SXJEBuHaA5BCubh9ly65fzXz7R6o5rA76Rs22ES8Z+HCc0YIQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.1.6",
-        "jsesc": "^2.5.1",
-        "lodash": "^4.17.10",
-        "source-map": "^0.5.0",
-        "trim-right": "^1.0.1"
+        "@babel/types": "7.1.6",
+        "jsesc": "2.5.2",
+        "lodash": "4.17.11",
+        "source-map": "0.5.6",
+        "trim-right": "1.0.1"
       },
       "dependencies": {
         "jsesc": {
@@ -817,9 +817,9 @@
       "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
       "dev": true,
       "requires": {
-        "@babel/helper-get-function-arity": "^7.0.0",
-        "@babel/template": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@babel/helper-get-function-arity": "7.0.0",
+        "@babel/template": "7.1.2",
+        "@babel/types": "7.1.6"
       }
     },
     "@babel/helper-get-function-arity": {
@@ -828,7 +828,7 @@
       "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.0.0"
+        "@babel/types": "7.1.6"
       }
     },
     "@babel/helper-split-export-declaration": {
@@ -837,7 +837,7 @@
       "integrity": "sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.0.0"
+        "@babel/types": "7.1.6"
       }
     },
     "@babel/helpers": {
@@ -846,9 +846,9 @@
       "integrity": "sha512-2jkcdL02ywNBry1YNFAH/fViq4fXG0vdckHqeJk+75fpQ2OH+Az6076tX/M0835zA45E0Cqa6pV5Kiv9YOqjEg==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.1.2",
-        "@babel/traverse": "^7.1.5",
-        "@babel/types": "^7.1.5"
+        "@babel/template": "7.1.2",
+        "@babel/traverse": "7.1.6",
+        "@babel/types": "7.1.6"
       }
     },
     "@babel/highlight": {
@@ -857,9 +857,9 @@
       "integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
       "dev": true,
       "requires": {
-        "chalk": "^2.0.0",
-        "esutils": "^2.0.2",
-        "js-tokens": "^4.0.0"
+        "chalk": "2.4.1",
+        "esutils": "2.0.2",
+        "js-tokens": "4.0.0"
       },
       "dependencies": {
         "js-tokens": {
@@ -882,9 +882,9 @@
       "integrity": "sha512-SY1MmplssORfFiLDcOETrW7fCLl+PavlwMh92rrGcikQaRq4iWPVH0MpwPpY3etVMx6RnDjXtr6VZYr/IbP/Ag==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/parser": "^7.1.2",
-        "@babel/types": "^7.1.2"
+        "@babel/code-frame": "7.0.0",
+        "@babel/parser": "7.1.6",
+        "@babel/types": "7.1.6"
       }
     },
     "@babel/traverse": {
@@ -893,15 +893,15 @@
       "integrity": "sha512-CXedit6GpISz3sC2k2FsGCUpOhUqKdyL0lqNrImQojagnUMXf8hex4AxYFRuMkNGcvJX5QAFGzB5WJQmSv8SiQ==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/generator": "^7.1.6",
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/helper-split-export-declaration": "^7.0.0",
-        "@babel/parser": "^7.1.6",
-        "@babel/types": "^7.1.6",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.10"
+        "@babel/code-frame": "7.0.0",
+        "@babel/generator": "7.1.6",
+        "@babel/helper-function-name": "7.1.0",
+        "@babel/helper-split-export-declaration": "7.0.0",
+        "@babel/parser": "7.1.6",
+        "@babel/types": "7.1.6",
+        "debug": "4.1.0",
+        "globals": "11.9.0",
+        "lodash": "4.17.11"
       },
       "dependencies": {
         "debug": {
@@ -910,7 +910,7 @@
           "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.1"
           }
         },
         "globals": {
@@ -927,9 +927,9 @@
       "integrity": "sha512-DMiUzlY9DSjVsOylJssxLHSgj6tWM9PRFJOGW/RaOglVOK9nzTxoOMfTfRQXGUCUQ/HmlG2efwC+XqUEJ5ay4w==",
       "dev": true,
       "requires": {
-        "esutils": "^2.0.2",
-        "lodash": "^4.17.10",
-        "to-fast-properties": "^2.0.0"
+        "esutils": "2.0.2",
+        "lodash": "4.17.11",
+        "to-fast-properties": "2.0.0"
       },
       "dependencies": {
         "to-fast-properties": {
@@ -945,7 +945,7 @@
       "resolved": "https://registry.npmjs.org/@mat-datetimepicker/core/-/core-2.0.1-beta.1.tgz",
       "integrity": "sha1-XS8BnbPvZOn83mwZjJpAHv3MaII=",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "@mat-datetimepicker/moment": {
@@ -953,7 +953,7 @@
       "resolved": "https://registry.npmjs.org/@mat-datetimepicker/moment/-/moment-2.0.1-beta.1.tgz",
       "integrity": "sha1-gDoTUvKT6nXrFYxpQJr48H4tlo8=",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "@mrmlnc/readdir-enhanced": {
@@ -962,8 +962,8 @@
       "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
       "dev": true,
       "requires": {
-        "call-me-maybe": "^1.0.1",
-        "glob-to-regexp": "^0.3.0"
+        "call-me-maybe": "1.0.1",
+        "glob-to-regexp": "0.3.0"
       }
     },
     "@ngtools/json-schema": {
@@ -979,9 +979,9 @@
       "dev": true,
       "requires": {
         "@angular-devkit/core": "0.8.6",
-        "rxjs": "~6.2.0",
-        "tree-kill": "^1.0.0",
-        "webpack-sources": "^1.1.0"
+        "rxjs": "6.2.2",
+        "tree-kill": "1.2.0",
+        "webpack-sources": "1.3.0"
       },
       "dependencies": {
         "rxjs": {
@@ -990,7 +990,7 @@
           "integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
           "dev": true,
           "requires": {
-            "tslib": "^1.9.0"
+            "tslib": "1.9.3"
           }
         }
       }
@@ -1000,7 +1000,7 @@
       "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-10.0.2.tgz",
       "integrity": "sha512-7nM3DrJaqKswwtJlbu2kuKNl+hE8Isr18sKsKvGGpSxQk+G0gO0reDlx2PhUNus7TJTkA1C59vU/JoN8hIvZ4g==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "@nodelib/fs.stat": {
@@ -1019,18 +1019,18 @@
       "resolved": "https://registry.npmjs.org/@nrwl/schematics/-/schematics-6.3.1.tgz",
       "integrity": "sha512-Dy4D6RaD+4BZFMfRr+5QaE9J5AjZ7UlldIpsyWvh6VofR9JseVpbetsvcSUsTT3fpjmORIHGMQM7Kpp+gnHaeA==",
       "requires": {
-        "@types/yargs": "^11.0.0",
-        "app-root-path": "^2.0.1",
+        "@types/yargs": "11.1.2",
+        "app-root-path": "2.0.1",
         "cosmiconfig": "4.0.0",
         "fs-extra": "6.0.0",
         "graphviz": "0.0.8",
         "npm-run-all": "4.1.2",
-        "opn": "^5.3.0",
+        "opn": "5.4.0",
         "semver": "5.4.1",
         "strip-json-comments": "2.0.1",
         "tmp": "0.0.33",
-        "viz.js": "^1.8.1",
-        "yargs": "^11.0.0",
+        "viz.js": "1.8.2",
+        "yargs": "11.1.0",
         "yargs-parser": "10.0.0"
       },
       "dependencies": {
@@ -1039,9 +1039,9 @@
           "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.0.tgz",
           "integrity": "sha512-lk2cUCo8QzbiEWEbt7Cw3m27WMiRG321xsssbcIpfMhpRjrlC08WBOVQqj1/nQYYNnPtyIhP1oqLO3QwT2tPCw==",
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
+            "graceful-fs": "4.1.11",
+            "jsonfile": "4.0.0",
+            "universalify": "0.1.2"
           }
         },
         "semver": {
@@ -1054,7 +1054,7 @@
           "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
           "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
           "requires": {
-            "os-tmpdir": "~1.0.2"
+            "os-tmpdir": "1.0.2"
           }
         },
         "yargs-parser": {
@@ -1062,7 +1062,7 @@
           "resolved": "http://registry.npmjs.org/yargs-parser/-/yargs-parser-10.0.0.tgz",
           "integrity": "sha512-+DHejWujTVYeMHLff8U96rLc4uE4Emncoftvn5AjhB1Jw1pWxLzgBUT/WYbPrHmy6YPEBTZQx5myHhVcuuu64g==",
           "requires": {
-            "camelcase": "^4.1.0"
+            "camelcase": "4.1.0"
           }
         }
       }
@@ -1073,7 +1073,7 @@
       "integrity": "sha512-awpB28hmZ8HcW+bEIvjPoSSc7vcCt0Hvh3x6HpBV6P/GB9YIrDukjQUsEZDK5s0BbPPhvJYdWKkubeQbVAwEtA==",
       "dev": true,
       "requires": {
-        "esquery": "^1.0.1"
+        "esquery": "1.0.1"
       }
     },
     "@schematics/angular": {
@@ -1084,7 +1084,7 @@
       "requires": {
         "@angular-devkit/core": "0.8.6",
         "@angular-devkit/schematics": "0.8.6",
-        "typescript": ">=2.6.2 <2.10"
+        "typescript": "2.9.2"
       }
     },
     "@schematics/update": {
@@ -1095,10 +1095,10 @@
       "requires": {
         "@angular-devkit/core": "0.8.6",
         "@angular-devkit/schematics": "0.8.6",
-        "npm-registry-client": "^8.5.1",
-        "rxjs": "~6.2.0",
-        "semver": "^5.3.0",
-        "semver-intersect": "^1.1.2"
+        "npm-registry-client": "8.6.0",
+        "rxjs": "6.2.2",
+        "semver": "5.6.0",
+        "semver-intersect": "1.4.0"
       },
       "dependencies": {
         "rxjs": {
@@ -1107,7 +1107,7 @@
           "integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
           "dev": true,
           "requires": {
-            "tslib": "^1.9.0"
+            "tslib": "1.9.3"
           }
         }
       }
@@ -1130,7 +1130,7 @@
       "integrity": "sha512-h3wnflb+jMTipvbbZnClgA2BexrT4w0GcfoCz5qyxd0IRsbqhLSyesM6mqZTAnhbVmhyTm5tuxfRu9R+8l+lGw==",
       "dev": true,
       "requires": {
-        "@types/node": "*"
+        "@types/node": "6.0.90"
       }
     },
     "@types/glob": {
@@ -1139,9 +1139,9 @@
       "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==",
       "dev": true,
       "requires": {
-        "@types/events": "*",
-        "@types/minimatch": "*",
-        "@types/node": "*"
+        "@types/events": "1.2.0",
+        "@types/minimatch": "3.0.3",
+        "@types/node": "6.0.90"
       }
     },
     "@types/hammerjs": {
@@ -1174,7 +1174,7 @@
       "integrity": "sha512-1awkm/O4pQCR9hI2F80HmIOda/L+ogkSL8Arj1k00eue5VLY5ooewhSOyF/cUJE0S+/34uD5EYY3zmd6fu2OCA==",
       "dev": true,
       "requires": {
-        "@types/jasmine": "*"
+        "@types/jasmine": "2.8.9"
       }
     },
     "@types/lodash": {
@@ -1225,8 +1225,8 @@
       "integrity": "sha512-M2giRw93PxKS7YjU6GZjtdV9HASdB7TWqizBXe4Ju7AqbKlWvTr0gNO92XH56D/gMxqD/jNHLNfC5hA34yGqrQ==",
       "dev": true,
       "requires": {
-        "@types/glob": "*",
-        "@types/node": "*"
+        "@types/glob": "7.1.1",
+        "@types/node": "6.0.90"
       }
     },
     "@types/strip-bom": {
@@ -1320,7 +1320,7 @@
       "integrity": "sha512-tOarWChdG1a3y1yqCX0JMDKzrat5tQe4pV6K/TX19BcXsBLYxFQOL1DEDa5KG9syeyvCrvZ+i1+Mv1ExngvktQ==",
       "dev": true,
       "requires": {
-        "@xtuc/ieee754": "^1.2.0"
+        "@xtuc/ieee754": "1.2.0"
       }
     },
     "@webassemblyjs/leb128": {
@@ -1442,7 +1442,7 @@
       "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
       "dev": true,
       "requires": {
-        "mime-types": "~2.1.18",
+        "mime-types": "2.1.21",
         "negotiator": "0.6.1"
       }
     },
@@ -1458,7 +1458,7 @@
       "integrity": "sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==",
       "dev": true,
       "requires": {
-        "acorn": "^5.0.0"
+        "acorn": "5.7.3"
       }
     },
     "addressparser": {
@@ -1487,12 +1487,12 @@
           "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-3.1.2.tgz",
           "integrity": "sha1-n/HwQfubXuXb60W6hm368EmDrwQ=",
           "requires": {
-            "app-root-path": "^2.0.1",
-            "css-selector-tokenizer": "^0.7.0",
-            "cssauron": "^1.4.0",
-            "semver-dsl": "^1.0.1",
-            "source-map": "^0.5.6",
-            "sprintf-js": "^1.0.3"
+            "app-root-path": "2.0.1",
+            "css-selector-tokenizer": "0.7.0",
+            "cssauron": "1.4.0",
+            "semver-dsl": "1.0.1",
+            "source-map": "0.5.6",
+            "sprintf-js": "1.0.3"
           }
         }
       }
@@ -1515,7 +1515,7 @@
       "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==",
       "dev": true,
       "requires": {
-        "es6-promisify": "^5.0.0"
+        "es6-promisify": "5.0.0"
       }
     },
     "ajv": {
@@ -1523,10 +1523,10 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.4.tgz",
       "integrity": "sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==",
       "requires": {
-        "fast-deep-equal": "^2.0.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
+        "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-cli": {
@@ -1535,12 +1535,12 @@
       "integrity": "sha1-WCMjH2TigzBUEwaQsYCZYJ6YDyk=",
       "dev": true,
       "requires": {
-        "ajv": "^6.0.0",
-        "ajv-pack": "^0.3.0",
-        "fast-json-patch": "^0.5.6",
-        "glob": "^7.0.3",
-        "json-schema-migrate": "^0.2.0",
-        "minimist": "^1.2.0"
+        "ajv": "6.5.4",
+        "ajv-pack": "0.3.1",
+        "fast-json-patch": "0.5.7",
+        "glob": "7.1.3",
+        "json-schema-migrate": "0.2.0",
+        "minimist": "1.2.0"
       },
       "dependencies": {
         "minimist": {
@@ -1568,8 +1568,8 @@
       "integrity": "sha1-tyxNQhnjko5ihC10Le2Tv1B5ZWA=",
       "dev": true,
       "requires": {
-        "js-beautify": "^1.6.4",
-        "require-from-string": "^1.2.0"
+        "js-beautify": "1.8.8",
+        "require-from-string": "1.2.1"
       },
       "dependencies": {
         "require-from-string": {
@@ -1604,9 +1604,9 @@
       "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
       "dev": true,
       "requires": {
-        "kind-of": "^3.0.2",
-        "longest": "^1.0.1",
-        "repeat-string": "^1.5.2"
+        "kind-of": "3.2.2",
+        "longest": "1.0.1",
+        "repeat-string": "1.6.1"
       },
       "dependencies": {
         "kind-of": {
@@ -1615,7 +1615,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -1633,11 +1633,11 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "bitsyntax": "~0.0.4",
-        "bluebird": "^3.4.6",
+        "bitsyntax": "0.0.4",
+        "bluebird": "3.5.2",
         "buffer-more-ints": "0.0.2",
-        "readable-stream": "1.x >=1.1.9",
-        "safe-buffer": "^5.0.1"
+        "readable-stream": "1.1.14",
+        "safe-buffer": "5.1.2"
       },
       "dependencies": {
         "isarray": {
@@ -1654,10 +1654,10 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
             "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
+            "string_decoder": "0.10.31"
           }
         },
         "string_decoder": {
@@ -1675,7 +1675,7 @@
       "integrity": "sha1-wNROkP/w+sleiyPwQ6zaf9HFHXw=",
       "dev": true,
       "requires": {
-        "loader-utils": "^0.2.15"
+        "loader-utils": "0.2.17"
       },
       "dependencies": {
         "loader-utils": {
@@ -1684,10 +1684,10 @@
           "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
           "dev": true,
           "requires": {
-            "big.js": "^3.1.3",
-            "emojis-list": "^2.0.0",
-            "json5": "^0.5.0",
-            "object-assign": "^4.0.1"
+            "big.js": "3.2.0",
+            "emojis-list": "2.1.0",
+            "json5": "0.5.1",
+            "object-assign": "4.1.1"
           }
         }
       }
@@ -1698,7 +1698,7 @@
       "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=",
       "dev": true,
       "requires": {
-        "string-width": "^2.0.0"
+        "string-width": "2.1.1"
       }
     },
     "ansi-colors": {
@@ -1756,7 +1756,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "requires": {
-        "color-convert": "^1.9.0"
+        "color-convert": "1.9.3"
       },
       "dependencies": {
         "color-convert": {
@@ -1786,8 +1786,8 @@
       "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
       "dev": true,
       "requires": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
+        "micromatch": "3.1.10",
+        "normalize-path": "2.1.1"
       }
     },
     "app-root-path": {
@@ -1801,7 +1801,7 @@
       "integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=",
       "dev": true,
       "requires": {
-        "default-require-extensions": "^1.0.0"
+        "default-require-extensions": "1.0.0"
       }
     },
     "aproba": {
@@ -1816,13 +1816,13 @@
       "integrity": "sha512-5QeR6Xc5hSA9X1rbQfcuQ6VZuUXOaEdB65Dhmk9duuRJHYif/ZyJfuyJqsQrj34PFjU5emv5/MmfgA8un06onw==",
       "dev": true,
       "requires": {
-        "archiver-utils": "^2.0.0",
-        "async": "^2.0.0",
-        "buffer-crc32": "^0.2.1",
-        "glob": "^7.0.0",
-        "readable-stream": "^2.0.0",
-        "tar-stream": "^1.5.0",
-        "zip-stream": "^2.0.1"
+        "archiver-utils": "2.0.0",
+        "async": "2.6.1",
+        "buffer-crc32": "0.2.13",
+        "glob": "7.1.3",
+        "readable-stream": "2.3.6",
+        "tar-stream": "1.6.2",
+        "zip-stream": "2.0.1"
       },
       "dependencies": {
         "async": {
@@ -1831,7 +1831,7 @@
           "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
           "dev": true,
           "requires": {
-            "lodash": "^4.17.10"
+            "lodash": "4.17.11"
           }
         }
       }
@@ -1842,18 +1842,18 @@
       "integrity": "sha512-JRBgcVvDX4Mwu2RBF8bBaHcQCSxab7afsxAPYDQ5W+19quIPP5CfKE7Ql+UHs9wYvwsaNR8oDuhtf5iqrKmzww==",
       "dev": true,
       "requires": {
-        "glob": "^7.0.0",
-        "graceful-fs": "^4.1.0",
-        "lazystream": "^1.0.0",
-        "lodash.assign": "^4.2.0",
-        "lodash.defaults": "^4.2.0",
-        "lodash.difference": "^4.5.0",
-        "lodash.flatten": "^4.4.0",
-        "lodash.isplainobject": "^4.0.6",
-        "lodash.toarray": "^4.4.0",
-        "lodash.union": "^4.6.0",
-        "normalize-path": "^3.0.0",
-        "readable-stream": "^2.0.0"
+        "glob": "7.1.3",
+        "graceful-fs": "4.1.11",
+        "lazystream": "1.0.0",
+        "lodash.assign": "4.2.0",
+        "lodash.defaults": "4.2.0",
+        "lodash.difference": "4.5.0",
+        "lodash.flatten": "4.4.0",
+        "lodash.isplainobject": "4.0.6",
+        "lodash.toarray": "4.4.0",
+        "lodash.union": "4.6.0",
+        "normalize-path": "3.0.0",
+        "readable-stream": "2.3.6"
       },
       "dependencies": {
         "normalize-path": {
@@ -1876,8 +1876,8 @@
       "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
       "dev": true,
       "requires": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^2.0.6"
+        "delegates": "1.0.0",
+        "readable-stream": "2.3.6"
       }
     },
     "argparse": {
@@ -1885,7 +1885,7 @@
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "requires": {
-        "sprintf-js": "~1.0.2"
+        "sprintf-js": "1.0.3"
       }
     },
     "arr-diff": {
@@ -1951,7 +1951,7 @@
       "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
       "dev": true,
       "requires": {
-        "array-uniq": "^1.0.1"
+        "array-uniq": "1.0.3"
       }
     },
     "array-uniq": {
@@ -1989,7 +1989,7 @@
       "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
       "dev": true,
       "requires": {
-        "safer-buffer": "~2.1.0"
+        "safer-buffer": "2.1.2"
       }
     },
     "asn1.js": {
@@ -1998,9 +1998,9 @@
       "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
+        "bn.js": "4.11.8",
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.1"
       }
     },
     "assert": {
@@ -2059,9 +2059,9 @@
       "integrity": "sha1-bT8cztp4DEw88FDvMtfHRFBFewE=",
       "dev": true,
       "requires": {
-        "exceptions": "~0.1.1",
-        "protractor": "*",
-        "underscore": "*"
+        "exceptions": "0.1.1",
+        "protractor": "5.4.1",
+        "underscore": "1.9.1"
       }
     },
     "async": {
@@ -2117,12 +2117,12 @@
       "integrity": "sha1-E4brZwjM/zau//cK3GlOz9YK8bA=",
       "dev": true,
       "requires": {
-        "browserslist": "~1.4.0",
-        "caniuse-db": "^1.0.30000597",
-        "normalize-range": "^0.1.2",
-        "num2fraction": "^1.2.2",
-        "postcss": "^5.2.6",
-        "postcss-value-parser": "^3.2.3"
+        "browserslist": "1.4.0",
+        "caniuse-db": "1.0.30000898",
+        "normalize-range": "0.1.2",
+        "num2fraction": "1.2.2",
+        "postcss": "5.2.18",
+        "postcss-value-parser": "3.3.1"
       },
       "dependencies": {
         "ansi-regex": {
@@ -2143,7 +2143,7 @@
           "integrity": "sha1-nP3PU4TZFY9bcNoqoAsw6P8BkEk=",
           "dev": true,
           "requires": {
-            "caniuse-db": "^1.0.30000539"
+            "caniuse-db": "1.0.30000898"
           }
         },
         "chalk": {
@@ -2152,11 +2152,11 @@
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           },
           "dependencies": {
             "supports-color": {
@@ -2179,10 +2179,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
+            "chalk": "1.1.3",
+            "js-base64": "2.4.9",
+            "source-map": "0.5.6",
+            "supports-color": "3.2.3"
           }
         },
         "strip-ansi": {
@@ -2191,7 +2191,7 @@
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "2.1.1"
           }
         },
         "supports-color": {
@@ -2200,7 +2200,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "^1.0.0"
+            "has-flag": "1.0.0"
           }
         }
       }
@@ -2223,8 +2223,8 @@
       "integrity": "sha1-uk+S8XFn37q0CYN4VFS5rBScPG0=",
       "dev": true,
       "requires": {
-        "follow-redirects": "^1.2.3",
-        "is-buffer": "^1.1.5"
+        "follow-redirects": "1.5.9",
+        "is-buffer": "1.1.6"
       }
     },
     "babel-code-frame": {
@@ -2233,9 +2233,9 @@
       "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
       "dev": true,
       "requires": {
-        "chalk": "^1.1.3",
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.2"
+        "chalk": "1.1.3",
+        "esutils": "2.0.2",
+        "js-tokens": "3.0.2"
       },
       "dependencies": {
         "ansi-regex": {
@@ -2256,11 +2256,11 @@
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "strip-ansi": {
@@ -2269,7 +2269,7 @@
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "2.1.1"
           }
         },
         "supports-color": {
@@ -2286,25 +2286,25 @@
       "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
       "dev": true,
       "requires": {
-        "babel-code-frame": "^6.26.0",
-        "babel-generator": "^6.26.0",
-        "babel-helpers": "^6.24.1",
-        "babel-messages": "^6.23.0",
-        "babel-register": "^6.26.0",
-        "babel-runtime": "^6.26.0",
-        "babel-template": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "convert-source-map": "^1.5.1",
-        "debug": "^2.6.9",
-        "json5": "^0.5.1",
-        "lodash": "^4.17.4",
-        "minimatch": "^3.0.4",
-        "path-is-absolute": "^1.0.1",
-        "private": "^0.1.8",
-        "slash": "^1.0.0",
-        "source-map": "^0.5.7"
+        "babel-code-frame": "6.26.0",
+        "babel-generator": "6.26.1",
+        "babel-helpers": "6.24.1",
+        "babel-messages": "6.23.0",
+        "babel-register": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "convert-source-map": "1.6.0",
+        "debug": "2.6.9",
+        "json5": "0.5.1",
+        "lodash": "4.17.11",
+        "minimatch": "3.0.4",
+        "path-is-absolute": "1.0.1",
+        "private": "0.1.8",
+        "slash": "1.0.0",
+        "source-map": "0.5.7"
       },
       "dependencies": {
         "debug": {
@@ -2336,14 +2336,14 @@
       "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
       "dev": true,
       "requires": {
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "detect-indent": "^4.0.0",
-        "jsesc": "^1.3.0",
-        "lodash": "^4.17.4",
-        "source-map": "^0.5.7",
-        "trim-right": "^1.0.1"
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "detect-indent": "4.0.0",
+        "jsesc": "1.3.0",
+        "lodash": "4.17.11",
+        "source-map": "0.5.7",
+        "trim-right": "1.0.1"
       },
       "dependencies": {
         "jsesc": {
@@ -2366,8 +2366,8 @@
       "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-helpers": {
@@ -2376,8 +2376,8 @@
       "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
       }
     },
     "babel-messages": {
@@ -2386,7 +2386,7 @@
       "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-cjs-system-require": {
@@ -2401,8 +2401,8 @@
       "integrity": "sha1-6FUHiHe1bU0bkrn5Gzf1mdsCAOM=",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-cjs-system-require": "^0.1.1",
-        "babel-template": "^6.9.0"
+        "babel-plugin-transform-cjs-system-require": "0.1.1",
+        "babel-template": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-modules-systemjs": {
@@ -2411,9 +2411,9 @@
       "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
       "dev": true,
       "requires": {
-        "babel-helper-hoist-variables": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+        "babel-helper-hoist-variables": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
       }
     },
     "babel-plugin-transform-global-system-wrapper": {
@@ -2422,7 +2422,7 @@
       "integrity": "sha1-r7RpzsDgRom5/n6LH9KA/JSm2PI=",
       "dev": true,
       "requires": {
-        "babel-template": "^6.9.0"
+        "babel-template": "6.26.0"
       }
     },
     "babel-plugin-transform-system-register": {
@@ -2437,9 +2437,9 @@
       "integrity": "sha1-g2TKYt+Or7gwSZ9pkXdGbDsDSZ0=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.10.0"
+        "babel-runtime": "6.26.0",
+        "core-js": "2.5.7",
+        "regenerator-runtime": "0.10.5"
       },
       "dependencies": {
         "regenerator-runtime": {
@@ -2456,13 +2456,13 @@
       "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
       "dev": true,
       "requires": {
-        "babel-core": "^6.26.0",
-        "babel-runtime": "^6.26.0",
-        "core-js": "^2.5.0",
-        "home-or-tmp": "^2.0.0",
-        "lodash": "^4.17.4",
-        "mkdirp": "^0.5.1",
-        "source-map-support": "^0.4.15"
+        "babel-core": "6.26.3",
+        "babel-runtime": "6.26.0",
+        "core-js": "2.5.7",
+        "home-or-tmp": "2.0.0",
+        "lodash": "4.17.11",
+        "mkdirp": "0.5.1",
+        "source-map-support": "0.4.18"
       },
       "dependencies": {
         "source-map-support": {
@@ -2471,7 +2471,7 @@
           "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
           "dev": true,
           "requires": {
-            "source-map": "^0.5.6"
+            "source-map": "0.5.6"
           }
         }
       }
@@ -2482,8 +2482,8 @@
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
       "dev": true,
       "requires": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
+        "core-js": "2.5.7",
+        "regenerator-runtime": "0.11.1"
       }
     },
     "babel-template": {
@@ -2492,11 +2492,11 @@
       "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "lodash": "^4.17.4"
+        "babel-runtime": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "lodash": "4.17.11"
       }
     },
     "babel-traverse": {
@@ -2505,15 +2505,15 @@
       "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
       "dev": true,
       "requires": {
-        "babel-code-frame": "^6.26.0",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "debug": "^2.6.8",
-        "globals": "^9.18.0",
-        "invariant": "^2.2.2",
-        "lodash": "^4.17.4"
+        "babel-code-frame": "6.26.0",
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "debug": "2.6.9",
+        "globals": "9.18.0",
+        "invariant": "2.2.4",
+        "lodash": "4.17.11"
       },
       "dependencies": {
         "debug": {
@@ -2539,10 +2539,10 @@
       "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.26.0",
-        "esutils": "^2.0.2",
-        "lodash": "^4.17.4",
-        "to-fast-properties": "^1.0.3"
+        "babel-runtime": "6.26.0",
+        "esutils": "2.0.2",
+        "lodash": "4.17.11",
+        "to-fast-properties": "1.0.3"
       }
     },
     "babylon": {
@@ -2574,13 +2574,13 @@
       "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
       "dev": true,
       "requires": {
-        "cache-base": "^1.0.1",
-        "class-utils": "^0.3.5",
-        "component-emitter": "^1.2.1",
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.1",
-        "mixin-deep": "^1.2.0",
-        "pascalcase": "^0.1.1"
+        "cache-base": "1.0.1",
+        "class-utils": "0.3.6",
+        "component-emitter": "1.2.1",
+        "define-property": "1.0.0",
+        "isobject": "3.0.1",
+        "mixin-deep": "1.3.1",
+        "pascalcase": "0.1.1"
       },
       "dependencies": {
         "define-property": {
@@ -2589,7 +2589,7 @@
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "^1.0.0"
+            "is-descriptor": "1.0.2"
           }
         },
         "is-accessor-descriptor": {
@@ -2598,7 +2598,7 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-data-descriptor": {
@@ -2607,7 +2607,7 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-descriptor": {
@@ -2616,9 +2616,9 @@
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
           }
         }
       }
@@ -2653,7 +2653,7 @@
       "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
       "dev": true,
       "requires": {
-        "tweetnacl": "^0.14.3"
+        "tweetnacl": "0.14.5"
       }
     },
     "beeper": {
@@ -2677,9 +2677,9 @@
       "integrity": "sha512-SOmOsowQWfXc7ybFARsK3C4MCOWzERaOMV/Fl3Tgjs+5dJWyzo3oa127jL44eMbQiAN17J7SvAs2TRxEScTUmg==",
       "dev": true,
       "requires": {
-        "bluebird": "^3.5.1",
-        "check-types": "^7.3.0",
-        "tryer": "^1.0.0"
+        "bluebird": "3.5.2",
+        "check-types": "7.4.0",
+        "tryer": "1.0.1"
       }
     },
     "big.js": {
@@ -2693,8 +2693,8 @@
       "integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=",
       "dev": true,
       "requires": {
-        "buffers": "~0.1.1",
-        "chainsaw": "~0.1.0"
+        "buffers": "0.1.1",
+        "chainsaw": "0.1.0"
       }
     },
     "binary-extensions": {
@@ -2719,8 +2719,8 @@
       "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
       "dev": true,
       "requires": {
-        "readable-stream": "^2.3.5",
-        "safe-buffer": "^5.1.1"
+        "readable-stream": "2.3.6",
+        "safe-buffer": "5.1.2"
       }
     },
     "blob": {
@@ -2735,7 +2735,7 @@
       "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
       "dev": true,
       "requires": {
-        "inherits": "~2.0.0"
+        "inherits": "2.0.3"
       }
     },
     "blocking-proxy": {
@@ -2744,7 +2744,7 @@
       "integrity": "sha512-KE8NFMZr3mN2E0HcvCgRtX7DjhiIQrwle+nSVJVC/yqFb9+xznHl2ZcoBp2L9qzkI4t4cBFJ1efXF8Dwi132RA==",
       "dev": true,
       "requires": {
-        "minimist": "^1.2.0"
+        "minimist": "1.2.0"
       },
       "dependencies": {
         "minimist": {
@@ -2774,15 +2774,15 @@
       "dev": true,
       "requires": {
         "bytes": "3.0.0",
-        "content-type": "~1.0.4",
+        "content-type": "1.0.4",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "~1.6.3",
+        "depd": "1.1.2",
+        "http-errors": "1.6.3",
         "iconv-lite": "0.4.23",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.3.0",
         "qs": "6.5.2",
         "raw-body": "2.3.3",
-        "type-is": "~1.6.16"
+        "type-is": "1.6.16"
       },
       "dependencies": {
         "debug": {
@@ -2808,12 +2808,12 @@
       "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
       "dev": true,
       "requires": {
-        "array-flatten": "^2.1.0",
-        "deep-equal": "^1.0.1",
-        "dns-equal": "^1.0.0",
-        "dns-txt": "^2.0.2",
-        "multicast-dns": "^6.0.1",
-        "multicast-dns-service-types": "^1.1.0"
+        "array-flatten": "2.1.1",
+        "deep-equal": "1.0.1",
+        "dns-equal": "1.0.0",
+        "dns-txt": "2.0.2",
+        "multicast-dns": "6.2.3",
+        "multicast-dns-service-types": "1.1.0"
       }
     },
     "boolbase": {
@@ -2828,7 +2828,7 @@
       "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
       "dev": true,
       "requires": {
-        "hoek": "2.x.x"
+        "hoek": "2.16.3"
       }
     },
     "boxen": {
@@ -2837,13 +2837,13 @@
       "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==",
       "dev": true,
       "requires": {
-        "ansi-align": "^2.0.0",
-        "camelcase": "^4.0.0",
-        "chalk": "^2.0.1",
-        "cli-boxes": "^1.0.0",
-        "string-width": "^2.0.0",
-        "term-size": "^1.2.0",
-        "widest-line": "^2.0.0"
+        "ansi-align": "2.0.0",
+        "camelcase": "4.1.0",
+        "chalk": "2.4.1",
+        "cli-boxes": "1.0.0",
+        "string-width": "2.1.1",
+        "term-size": "1.2.0",
+        "widest-line": "2.0.1"
       }
     },
     "brace-expansion": {
@@ -2851,7 +2851,7 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "requires": {
-        "balanced-match": "^1.0.0",
+        "balanced-match": "1.0.0",
         "concat-map": "0.0.1"
       }
     },
@@ -2861,16 +2861,16 @@
       "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
       "dev": true,
       "requires": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
+        "arr-flatten": "1.1.0",
+        "array-unique": "0.3.2",
+        "extend-shallow": "2.0.1",
+        "fill-range": "4.0.0",
+        "isobject": "3.0.1",
+        "repeat-element": "1.1.3",
+        "snapdragon": "0.8.2",
+        "snapdragon-node": "2.1.1",
+        "split-string": "3.1.0",
+        "to-regex": "3.0.2"
       },
       "dependencies": {
         "extend-shallow": {
@@ -2879,7 +2879,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         }
       }
@@ -2896,27 +2896,27 @@
       "integrity": "sha512-VLzpjCA4uXqfzkwqWtMM6hvPm2PNHp2RcmzBXcbi6C9WpkUhhFb8SVAr4CFrCsFxDg+oY6HalOjn8F+egyvhag==",
       "dev": true,
       "requires": {
-        "browser-sync-client": "^2.26.2",
-        "browser-sync-ui": "^2.26.2",
+        "browser-sync-client": "2.26.2",
+        "browser-sync-ui": "2.26.2",
         "bs-recipes": "1.3.4",
-        "bs-snippet-injector": "^2.0.1",
-        "chokidar": "^2.0.4",
+        "bs-snippet-injector": "2.0.1",
+        "chokidar": "2.0.4",
         "connect": "3.6.6",
-        "connect-history-api-fallback": "^1",
-        "dev-ip": "^1.0.1",
-        "easy-extender": "^2.3.4",
-        "eazy-logger": "^3",
-        "etag": "^1.8.1",
-        "fresh": "^0.5.2",
+        "connect-history-api-fallback": "1.5.0",
+        "dev-ip": "1.0.1",
+        "easy-extender": "2.3.4",
+        "eazy-logger": "3.0.2",
+        "etag": "1.8.1",
+        "fresh": "0.5.2",
         "fs-extra": "3.0.1",
         "http-proxy": "1.15.2",
-        "immutable": "^3",
+        "immutable": "3.8.2",
         "localtunnel": "1.9.1",
         "micromatch": "2.3.11",
         "opn": "5.3.0",
         "portscanner": "2.1.1",
         "qs": "6.2.3",
-        "raw-body": "^2.3.2",
+        "raw-body": "2.3.3",
         "resp-modifier": "6.0.2",
         "rx": "4.1.0",
         "send": "0.16.2",
@@ -2940,7 +2940,7 @@
           "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
           "dev": true,
           "requires": {
-            "arr-flatten": "^1.0.1"
+            "arr-flatten": "1.1.0"
           }
         },
         "array-unique": {
@@ -2955,9 +2955,9 @@
           "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
           "dev": true,
           "requires": {
-            "expand-range": "^1.8.1",
-            "preserve": "^0.2.0",
-            "repeat-element": "^1.1.2"
+            "expand-range": "1.8.2",
+            "preserve": "0.2.0",
+            "repeat-element": "1.1.3"
           }
         },
         "camelcase": {
@@ -2972,9 +2972,9 @@
           "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
           "dev": true,
           "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wrap-ansi": "^2.0.0"
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wrap-ansi": "2.1.0"
           }
         },
         "debug": {
@@ -2992,12 +2992,12 @@
           "integrity": "sha512-mRbgmAtQ4GAlKwuPnnAvXXwdPhEx+jkc0OBCLrXuD/CRvwNK3AxRSnqK4FSqmAMRRHryVJP8TopOvmEaA64fKw==",
           "dev": true,
           "requires": {
-            "accepts": "~1.3.4",
+            "accepts": "1.3.5",
             "base64id": "1.0.0",
             "cookie": "0.3.1",
-            "debug": "~3.1.0",
-            "engine.io-parser": "~2.1.0",
-            "ws": "~3.3.1"
+            "debug": "3.1.0",
+            "engine.io-parser": "2.1.2",
+            "ws": "3.3.3"
           }
         },
         "engine.io-client": {
@@ -3008,14 +3008,14 @@
           "requires": {
             "component-emitter": "1.2.1",
             "component-inherit": "0.0.3",
-            "debug": "~3.1.0",
-            "engine.io-parser": "~2.1.1",
+            "debug": "3.1.0",
+            "engine.io-parser": "2.1.2",
             "has-cors": "1.1.0",
             "indexof": "0.0.1",
             "parseqs": "0.0.5",
             "parseuri": "0.0.5",
-            "ws": "~3.3.1",
-            "xmlhttprequest-ssl": "~1.5.4",
+            "ws": "3.3.3",
+            "xmlhttprequest-ssl": "1.5.5",
             "yeast": "0.1.2"
           }
         },
@@ -3031,7 +3031,7 @@
           "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
           "dev": true,
           "requires": {
-            "is-posix-bracket": "^0.1.0"
+            "is-posix-bracket": "0.1.1"
           }
         },
         "extglob": {
@@ -3040,7 +3040,7 @@
           "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
           "dev": true,
           "requires": {
-            "is-extglob": "^1.0.0"
+            "is-extglob": "1.0.0"
           }
         },
         "fs-extra": {
@@ -3049,9 +3049,9 @@
           "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^3.0.0",
-            "universalify": "^0.1.0"
+            "graceful-fs": "4.1.11",
+            "jsonfile": "3.0.1",
+            "universalify": "0.1.2"
           }
         },
         "http-proxy": {
@@ -3060,8 +3060,8 @@
           "integrity": "sha1-ZC/cr/5S00SNK9o7AHnpQJBk2jE=",
           "dev": true,
           "requires": {
-            "eventemitter3": "1.x.x",
-            "requires-port": "1.x.x"
+            "eventemitter3": "1.2.0",
+            "requires-port": "1.0.0"
           }
         },
         "is-extglob": {
@@ -3076,7 +3076,7 @@
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
           "requires": {
-            "number-is-nan": "^1.0.0"
+            "number-is-nan": "1.0.1"
           }
         },
         "is-glob": {
@@ -3085,7 +3085,7 @@
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
           "requires": {
-            "is-extglob": "^1.0.0"
+            "is-extglob": "1.0.0"
           }
         },
         "isarray": {
@@ -3100,7 +3100,7 @@
           "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.6"
+            "graceful-fs": "4.1.11"
           }
         },
         "kind-of": {
@@ -3109,7 +3109,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         },
         "micromatch": {
@@ -3118,19 +3118,19 @@
           "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
           "dev": true,
           "requires": {
-            "arr-diff": "^2.0.0",
-            "array-unique": "^0.2.1",
-            "braces": "^1.8.2",
-            "expand-brackets": "^0.1.4",
-            "extglob": "^0.3.1",
-            "filename-regex": "^2.0.0",
-            "is-extglob": "^1.0.0",
-            "is-glob": "^2.0.1",
-            "kind-of": "^3.0.2",
-            "normalize-path": "^2.0.1",
-            "object.omit": "^2.0.0",
-            "parse-glob": "^3.0.4",
-            "regex-cache": "^0.4.2"
+            "arr-diff": "2.0.0",
+            "array-unique": "0.2.1",
+            "braces": "1.8.5",
+            "expand-brackets": "0.1.5",
+            "extglob": "0.3.2",
+            "filename-regex": "2.0.1",
+            "is-extglob": "1.0.0",
+            "is-glob": "2.0.1",
+            "kind-of": "3.2.2",
+            "normalize-path": "2.1.1",
+            "object.omit": "2.0.1",
+            "parse-glob": "3.0.4",
+            "regex-cache": "0.4.4"
           }
         },
         "ms": {
@@ -3145,7 +3145,7 @@
           "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==",
           "dev": true,
           "requires": {
-            "is-wsl": "^1.1.0"
+            "is-wsl": "1.1.0"
           }
         },
         "os-locale": {
@@ -3154,7 +3154,7 @@
           "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
           "dev": true,
           "requires": {
-            "lcid": "^1.0.0"
+            "lcid": "1.0.0"
           }
         },
         "qs": {
@@ -3169,12 +3169,12 @@
           "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==",
           "dev": true,
           "requires": {
-            "debug": "~3.1.0",
-            "engine.io": "~3.2.0",
-            "has-binary2": "~1.0.2",
-            "socket.io-adapter": "~1.1.0",
+            "debug": "3.1.0",
+            "engine.io": "3.2.0",
+            "has-binary2": "1.0.3",
+            "socket.io-adapter": "1.1.1",
             "socket.io-client": "2.1.1",
-            "socket.io-parser": "~3.2.0"
+            "socket.io-parser": "3.2.0"
           }
         },
         "socket.io-client": {
@@ -3187,15 +3187,15 @@
             "base64-arraybuffer": "0.1.5",
             "component-bind": "1.0.0",
             "component-emitter": "1.2.1",
-            "debug": "~3.1.0",
-            "engine.io-client": "~3.2.0",
-            "has-binary2": "~1.0.2",
+            "debug": "3.1.0",
+            "engine.io-client": "3.2.1",
+            "has-binary2": "1.0.3",
             "has-cors": "1.1.0",
             "indexof": "0.0.1",
             "object-component": "0.0.3",
             "parseqs": "0.0.5",
             "parseuri": "0.0.5",
-            "socket.io-parser": "~3.2.0",
+            "socket.io-parser": "3.2.0",
             "to-array": "0.1.4"
           }
         },
@@ -3206,7 +3206,7 @@
           "dev": true,
           "requires": {
             "component-emitter": "1.2.1",
-            "debug": "~3.1.0",
+            "debug": "3.1.0",
             "isarray": "2.0.1"
           }
         },
@@ -3216,9 +3216,9 @@
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
           "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
           }
         },
         "strip-ansi": {
@@ -3227,7 +3227,7 @@
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "2.1.1"
           }
         },
         "which-module": {
@@ -3242,20 +3242,20 @@
           "integrity": "sha1-gW4ahm1VmMzzTlWW3c4i2S2kkNQ=",
           "dev": true,
           "requires": {
-            "camelcase": "^3.0.0",
-            "cliui": "^3.2.0",
-            "decamelize": "^1.1.1",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^1.4.0",
-            "read-pkg-up": "^1.0.1",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^1.0.2",
-            "which-module": "^1.0.0",
-            "window-size": "^0.2.0",
-            "y18n": "^3.2.1",
-            "yargs-parser": "^4.1.0"
+            "camelcase": "3.0.0",
+            "cliui": "3.2.0",
+            "decamelize": "1.2.0",
+            "get-caller-file": "1.0.3",
+            "os-locale": "1.4.0",
+            "read-pkg-up": "1.0.1",
+            "require-directory": "2.1.1",
+            "require-main-filename": "1.0.1",
+            "set-blocking": "2.0.0",
+            "string-width": "1.0.2",
+            "which-module": "1.0.0",
+            "window-size": "0.2.0",
+            "y18n": "3.2.1",
+            "yargs-parser": "4.2.1"
           }
         },
         "yargs-parser": {
@@ -3264,7 +3264,7 @@
           "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=",
           "dev": true,
           "requires": {
-            "camelcase": "^3.0.0"
+            "camelcase": "3.0.0"
           }
         }
       }
@@ -3277,8 +3277,8 @@
       "requires": {
         "etag": "1.8.1",
         "fresh": "0.5.2",
-        "mitt": "^1.1.3",
-        "rxjs": "^5.5.6"
+        "mitt": "1.1.3",
+        "rxjs": "5.5.12"
       },
       "dependencies": {
         "rxjs": {
@@ -3305,11 +3305,11 @@
       "dev": true,
       "requires": {
         "async-each-series": "0.1.1",
-        "connect-history-api-fallback": "^1",
-        "immutable": "^3",
+        "connect-history-api-fallback": "1.5.0",
+        "immutable": "3.8.2",
         "server-destroy": "1.0.1",
-        "socket.io-client": "^2.0.4",
-        "stream-throttle": "^0.1.3"
+        "socket.io-client": "2.0.4",
+        "stream-throttle": "0.1.3"
       }
     },
     "browserify-aes": {
@@ -3318,12 +3318,12 @@
       "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
       "dev": true,
       "requires": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "buffer-xor": "1.0.3",
+        "cipher-base": "1.0.4",
+        "create-hash": "1.2.0",
+        "evp_bytestokey": "1.0.3",
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
       }
     },
     "browserify-cipher": {
@@ -3332,9 +3332,9 @@
       "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
       "dev": true,
       "requires": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
+        "browserify-aes": "1.2.0",
+        "browserify-des": "1.0.2",
+        "evp_bytestokey": "1.0.3"
       }
     },
     "browserify-des": {
@@ -3343,10 +3343,10 @@
       "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
       "dev": true,
       "requires": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
+        "cipher-base": "1.0.4",
+        "des.js": "1.0.0",
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
       }
     },
     "browserify-rsa": {
@@ -3355,8 +3355,8 @@
       "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
-        "randombytes": "^2.0.1"
+        "bn.js": "4.11.8",
+        "randombytes": "2.0.6"
       }
     },
     "browserify-sign": {
@@ -3365,13 +3365,13 @@
       "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.1",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.2",
-        "elliptic": "^6.0.0",
-        "inherits": "^2.0.1",
-        "parse-asn1": "^5.0.0"
+        "bn.js": "4.11.8",
+        "browserify-rsa": "4.0.1",
+        "create-hash": "1.2.0",
+        "create-hmac": "1.1.7",
+        "elliptic": "6.4.1",
+        "inherits": "2.0.3",
+        "parse-asn1": "5.1.1"
       }
     },
     "browserify-zlib": {
@@ -3380,7 +3380,7 @@
       "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
       "dev": true,
       "requires": {
-        "pako": "~1.0.5"
+        "pako": "1.0.6"
       }
     },
     "browserslist": {
@@ -3389,8 +3389,8 @@
       "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30000844",
-        "electron-to-chromium": "^1.3.47"
+        "caniuse-lite": "1.0.30000898",
+        "electron-to-chromium": "1.3.81"
       }
     },
     "browserstack": {
@@ -3399,7 +3399,7 @@
       "integrity": "sha512-O8VMT64P9NOLhuIoD4YngyxBURefaSdR4QdhG8l6HZ9VxtU7jc3m6jLufFwKA5gaf7fetfB2TnRJnMxyob+heg==",
       "dev": true,
       "requires": {
-        "https-proxy-agent": "^2.2.1"
+        "https-proxy-agent": "2.2.1"
       }
     },
     "bs-recipes": {
@@ -3420,9 +3420,9 @@
       "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
       "dev": true,
       "requires": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
+        "base64-js": "1.3.0",
+        "ieee754": "1.1.12",
+        "isarray": "1.0.0"
       }
     },
     "buffer-alloc": {
@@ -3431,8 +3431,8 @@
       "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
       "dev": true,
       "requires": {
-        "buffer-alloc-unsafe": "^1.1.0",
-        "buffer-fill": "^1.0.0"
+        "buffer-alloc-unsafe": "1.1.0",
+        "buffer-fill": "1.0.0"
       }
     },
     "buffer-alloc-unsafe": {
@@ -3531,16 +3531,16 @@
       "integrity": "sha512-CqLtaDKQFZVh9l53Py67lJOLOT//aNrmF9xT1v5cS080bbqyhOdTX5+LuoVI8LOKa351fUikGcxsQDYWQXfizg==",
       "dev": true,
       "requires": {
-        "axios": "^0.16.2",
-        "bytes": "^3.0.0",
-        "ci-env": "^1.4.0",
-        "commander": "^2.11.0",
-        "github-build": "^1.2.0",
-        "glob": "^7.1.2",
-        "gzip-size": "^4.0.0",
-        "opencollective": "^1.0.3",
-        "prettycli": "^1.4.3",
-        "read-pkg-up": "^2.0.0"
+        "axios": "0.16.2",
+        "bytes": "3.0.0",
+        "ci-env": "1.6.1",
+        "commander": "2.19.0",
+        "github-build": "1.2.0",
+        "glob": "7.1.3",
+        "gzip-size": "4.1.0",
+        "opencollective": "1.0.3",
+        "prettycli": "1.4.3",
+        "read-pkg-up": "2.0.0"
       },
       "dependencies": {
         "load-json-file": {
@@ -3549,10 +3549,10 @@
           "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "strip-bom": "^3.0.0"
+            "graceful-fs": "4.1.11",
+            "parse-json": "2.2.0",
+            "pify": "2.3.0",
+            "strip-bom": "3.0.0"
           }
         },
         "path-type": {
@@ -3561,7 +3561,7 @@
           "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
           "dev": true,
           "requires": {
-            "pify": "^2.0.0"
+            "pify": "2.3.0"
           }
         },
         "pify": {
@@ -3576,9 +3576,9 @@
           "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
           "dev": true,
           "requires": {
-            "load-json-file": "^2.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^2.0.0"
+            "load-json-file": "2.0.0",
+            "normalize-package-data": "2.4.0",
+            "path-type": "2.0.0"
           }
         },
         "read-pkg-up": {
@@ -3587,8 +3587,8 @@
           "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
           "dev": true,
           "requires": {
-            "find-up": "^2.0.0",
-            "read-pkg": "^2.0.0"
+            "find-up": "2.1.0",
+            "read-pkg": "2.0.0"
           }
         },
         "strip-bom": {
@@ -3611,19 +3611,19 @@
       "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
       "dev": true,
       "requires": {
-        "bluebird": "^3.5.1",
-        "chownr": "^1.0.1",
-        "glob": "^7.1.2",
-        "graceful-fs": "^4.1.11",
-        "lru-cache": "^4.1.1",
-        "mississippi": "^2.0.0",
-        "mkdirp": "^0.5.1",
-        "move-concurrently": "^1.0.1",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^2.6.2",
-        "ssri": "^5.2.4",
-        "unique-filename": "^1.1.0",
-        "y18n": "^4.0.0"
+        "bluebird": "3.5.2",
+        "chownr": "1.1.1",
+        "glob": "7.1.3",
+        "graceful-fs": "4.1.11",
+        "lru-cache": "4.1.3",
+        "mississippi": "2.0.0",
+        "mkdirp": "0.5.1",
+        "move-concurrently": "1.0.1",
+        "promise-inflight": "1.0.1",
+        "rimraf": "2.6.2",
+        "ssri": "5.3.0",
+        "unique-filename": "1.1.1",
+        "y18n": "4.0.0"
       },
       "dependencies": {
         "y18n": {
@@ -3640,15 +3640,15 @@
       "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
       "dev": true,
       "requires": {
-        "collection-visit": "^1.0.0",
-        "component-emitter": "^1.2.1",
-        "get-value": "^2.0.6",
-        "has-value": "^1.0.0",
-        "isobject": "^3.0.1",
-        "set-value": "^2.0.0",
-        "to-object-path": "^0.3.0",
-        "union-value": "^1.0.0",
-        "unset-value": "^1.0.0"
+        "collection-visit": "1.0.0",
+        "component-emitter": "1.2.1",
+        "get-value": "2.0.6",
+        "has-value": "1.0.0",
+        "isobject": "3.0.1",
+        "set-value": "2.0.0",
+        "to-object-path": "0.3.0",
+        "union-value": "1.0.0",
+        "unset-value": "1.0.0"
       }
     },
     "call-me-maybe": {
@@ -3663,7 +3663,7 @@
       "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
       "dev": true,
       "requires": {
-        "callsites": "^2.0.0"
+        "callsites": "2.0.0"
       }
     },
     "caller-path": {
@@ -3672,7 +3672,7 @@
       "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
       "dev": true,
       "requires": {
-        "caller-callsite": "^2.0.0"
+        "caller-callsite": "2.0.0"
       }
     },
     "callsite": {
@@ -3693,8 +3693,8 @@
       "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
       "dev": true,
       "requires": {
-        "no-case": "^2.2.0",
-        "upper-case": "^1.1.1"
+        "no-case": "2.3.2",
+        "upper-case": "1.1.3"
       }
     },
     "camelcase": {
@@ -3708,8 +3708,8 @@
       "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
       "dev": true,
       "requires": {
-        "camelcase": "^2.0.0",
-        "map-obj": "^1.0.0"
+        "camelcase": "2.1.1",
+        "map-obj": "1.0.1"
       },
       "dependencies": {
         "camelcase": {
@@ -3756,8 +3756,8 @@
       "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
       "dev": true,
       "requires": {
-        "align-text": "^0.1.3",
-        "lazy-cache": "^1.0.3"
+        "align-text": "0.1.4",
+        "lazy-cache": "1.0.4"
       },
       "dependencies": {
         "lazy-cache": {
@@ -3773,9 +3773,9 @@
       "resolved": "http://registry.npmjs.org/chai/-/chai-3.5.0.tgz",
       "integrity": "sha1-TQJjewZ/6Vi9v906QOxW/vc3Mkc=",
       "requires": {
-        "assertion-error": "^1.0.1",
-        "deep-eql": "^0.1.3",
-        "type-detect": "^1.0.0"
+        "assertion-error": "1.1.0",
+        "deep-eql": "0.1.3",
+        "type-detect": "1.0.0"
       }
     },
     "chai-as-promised": {
@@ -3789,7 +3789,7 @@
       "integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=",
       "dev": true,
       "requires": {
-        "traverse": ">=0.3.0 <0.4"
+        "traverse": "0.3.9"
       }
     },
     "chalk": {
@@ -3797,9 +3797,9 @@
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
       "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
       "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "ansi-styles": "3.2.1",
+        "escape-string-regexp": "1.0.5",
+        "supports-color": "5.5.0"
       }
     },
     "character-entities": {
@@ -3837,8 +3837,8 @@
       "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.5.0.tgz",
       "integrity": "sha1-/m51Gok3afVucr7lrZEgfhxZKVc=",
       "requires": {
-        "chartjs-color": "^2.0.0",
-        "moment": "^2.10.6"
+        "chartjs-color": "2.2.0",
+        "moment": "2.22.2"
       }
     },
     "chartjs-color": {
@@ -3846,8 +3846,8 @@
       "resolved": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.2.0.tgz",
       "integrity": "sha1-hKL7dVeH7YXDndbdjHsdiEKbrq4=",
       "requires": {
-        "chartjs-color-string": "^0.5.0",
-        "color-convert": "^0.5.3"
+        "chartjs-color-string": "0.5.0",
+        "color-convert": "0.5.3"
       }
     },
     "chartjs-color-string": {
@@ -3855,7 +3855,7 @@
       "resolved": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.5.0.tgz",
       "integrity": "sha512-amWNvCOXlOUYxZVDSa0YOab5K/lmEhbFNKI55PWc4mlv28BDzA7zaoQTGxSBgJMHIW+hGX8YUrvw/FH4LyhwSQ==",
       "requires": {
-        "color-name": "^1.0.0"
+        "color-name": "1.1.4"
       }
     },
     "check-types": {
@@ -3870,19 +3870,19 @@
       "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
       "dev": true,
       "requires": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.0",
-        "braces": "^2.3.0",
-        "fsevents": "^1.2.2",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.1",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "lodash.debounce": "^4.0.8",
-        "normalize-path": "^2.1.1",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.0.0",
-        "upath": "^1.0.5"
+        "anymatch": "2.0.0",
+        "async-each": "1.0.1",
+        "braces": "2.3.2",
+        "fsevents": "1.2.4",
+        "glob-parent": "3.1.0",
+        "inherits": "2.0.3",
+        "is-binary-path": "1.0.1",
+        "is-glob": "4.0.0",
+        "lodash.debounce": "4.0.8",
+        "normalize-path": "2.1.1",
+        "path-is-absolute": "1.0.1",
+        "readdirp": "2.2.1",
+        "upath": "1.1.0"
       }
     },
     "chownr": {
@@ -3897,7 +3897,7 @@
       "integrity": "sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==",
       "dev": true,
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "ci-env": {
@@ -3918,8 +3918,8 @@
       "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
       }
     },
     "circular-dependency-plugin": {
@@ -3940,10 +3940,10 @@
       "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "dev": true,
       "requires": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
+        "arr-union": "3.1.0",
+        "define-property": "0.2.5",
+        "isobject": "3.0.1",
+        "static-extend": "0.1.2"
       },
       "dependencies": {
         "define-property": {
@@ -3952,7 +3952,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         }
       }
@@ -3968,7 +3968,7 @@
       "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==",
       "dev": true,
       "requires": {
-        "source-map": "~0.6.0"
+        "source-map": "0.6.1"
       },
       "dependencies": {
         "source-map": {
@@ -3991,7 +3991,7 @@
       "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
       "dev": true,
       "requires": {
-        "restore-cursor": "^2.0.0"
+        "restore-cursor": "2.0.0"
       }
     },
     "cli-width": {
@@ -4005,9 +4005,9 @@
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
       "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
       "requires": {
-        "string-width": "^2.1.1",
-        "strip-ansi": "^4.0.0",
-        "wrap-ansi": "^2.0.0"
+        "string-width": "2.1.1",
+        "strip-ansi": "4.0.0",
+        "wrap-ansi": "2.1.0"
       }
     },
     "clone": {
@@ -4022,10 +4022,10 @@
       "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
       "dev": true,
       "requires": {
-        "for-own": "^1.0.0",
-        "is-plain-object": "^2.0.4",
-        "kind-of": "^6.0.0",
-        "shallow-clone": "^1.0.0"
+        "for-own": "1.0.0",
+        "is-plain-object": "2.0.4",
+        "kind-of": "6.0.2",
+        "shallow-clone": "1.0.0"
       }
     },
     "clone-regexp": {
@@ -4034,8 +4034,8 @@
       "integrity": "sha512-Fcij9IwRW27XedRIJnSOEupS7RVcXtObJXbcUOX93UCLqqOdRpkvzKywOOSizmEK/Is3S/RHX9dLdfo6R1Q1mw==",
       "dev": true,
       "requires": {
-        "is-regexp": "^1.0.0",
-        "is-supported-regexp-flag": "^1.0.0"
+        "is-regexp": "1.0.0",
+        "is-supported-regexp-flag": "1.0.1"
       }
     },
     "clone-stats": {
@@ -4061,12 +4061,12 @@
       "integrity": "sha512-RLMrtLwrBS0dfo2/KTP+2NHofCpzcuh0bEp/A/naqvQonbUL4AW/qWQdbpn8dMNudtpmzEx9eS8KEpGdVPg1BA==",
       "dev": true,
       "requires": {
-        "app-root-path": "^2.0.1",
-        "css-selector-tokenizer": "^0.7.0",
-        "cssauron": "^1.4.0",
-        "semver-dsl": "^1.0.1",
-        "source-map": "^0.5.7",
-        "sprintf-js": "^1.0.3"
+        "app-root-path": "2.0.1",
+        "css-selector-tokenizer": "0.7.0",
+        "cssauron": "1.4.0",
+        "semver-dsl": "1.0.1",
+        "source-map": "0.5.7",
+        "sprintf-js": "1.0.3"
       },
       "dependencies": {
         "source-map": {
@@ -4095,8 +4095,8 @@
       "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
       "dev": true,
       "requires": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
+        "map-visit": "1.0.0",
+        "object-visit": "1.0.1"
       }
     },
     "color-convert": {
@@ -4127,7 +4127,7 @@
       "integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=",
       "dev": true,
       "requires": {
-        "lodash": "^4.5.0"
+        "lodash": "4.17.11"
       }
     },
     "combined-stream": {
@@ -4135,7 +4135,7 @@
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
       "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
       "requires": {
-        "delayed-stream": "~1.0.0"
+        "delayed-stream": "1.0.0"
       }
     },
     "commander": {
@@ -4150,7 +4150,7 @@
       "integrity": "sha1-aYbDMw/uDEyeAMI5jNYa+l2PI54=",
       "dev": true,
       "requires": {
-        "json-parser": "^1.0.0"
+        "json-parser": "1.1.5"
       }
     },
     "commondir": {
@@ -4182,10 +4182,10 @@
       "integrity": "sha1-UkqfEJA/OoEzibAiXSfEi7dRiQ8=",
       "dev": true,
       "requires": {
-        "buffer-crc32": "^0.2.1",
-        "crc32-stream": "^2.0.0",
-        "normalize-path": "^2.0.0",
-        "readable-stream": "^2.0.0"
+        "buffer-crc32": "0.2.13",
+        "crc32-stream": "2.0.0",
+        "normalize-path": "2.1.1",
+        "readable-stream": "2.3.6"
       }
     },
     "compressible": {
@@ -4194,7 +4194,7 @@
       "integrity": "sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==",
       "dev": true,
       "requires": {
-        "mime-db": ">= 1.36.0 < 2"
+        "mime-db": "1.37.0"
       }
     },
     "compression": {
@@ -4203,13 +4203,13 @@
       "integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==",
       "dev": true,
       "requires": {
-        "accepts": "~1.3.5",
+        "accepts": "1.3.5",
         "bytes": "3.0.0",
-        "compressible": "~2.0.14",
+        "compressible": "2.0.15",
         "debug": "2.6.9",
-        "on-headers": "~1.0.1",
+        "on-headers": "1.0.1",
         "safe-buffer": "5.1.2",
-        "vary": "~1.1.2"
+        "vary": "1.1.2"
       },
       "dependencies": {
         "debug": {
@@ -4240,10 +4240,10 @@
       "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
       "dev": true,
       "requires": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
+        "buffer-from": "1.1.1",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6",
+        "typedarray": "0.0.6"
       }
     },
     "concurrently": {
@@ -4252,15 +4252,15 @@
       "integrity": "sha512-/+ugz+gwFSEfTGUxn0KHkY+19XPRTXR8+7oUK/HxgiN1n7FjeJmkrbSiXAJfyQ0zORgJYPaenmymwon51YXH9Q==",
       "dev": true,
       "requires": {
-        "chalk": "^2.4.1",
+        "chalk": "2.4.1",
         "commander": "2.6.0",
-        "date-fns": "^1.23.0",
-        "lodash": "^4.5.1",
-        "read-pkg": "^3.0.0",
+        "date-fns": "1.29.0",
+        "lodash": "4.17.11",
+        "read-pkg": "3.0.0",
         "rx": "2.3.24",
-        "spawn-command": "^0.0.2-1",
-        "supports-color": "^3.2.3",
-        "tree-kill": "^1.1.0"
+        "spawn-command": "0.0.2-1",
+        "supports-color": "3.2.3",
+        "tree-kill": "1.2.0"
       },
       "dependencies": {
         "commander": {
@@ -4281,10 +4281,10 @@
           "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^4.0.0",
-            "pify": "^3.0.0",
-            "strip-bom": "^3.0.0"
+            "graceful-fs": "4.1.11",
+            "parse-json": "4.0.0",
+            "pify": "3.0.0",
+            "strip-bom": "3.0.0"
           }
         },
         "parse-json": {
@@ -4293,8 +4293,8 @@
           "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
           "dev": true,
           "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
+            "error-ex": "1.3.2",
+            "json-parse-better-errors": "1.0.2"
           }
         },
         "read-pkg": {
@@ -4303,9 +4303,9 @@
           "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
           "dev": true,
           "requires": {
-            "load-json-file": "^4.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^3.0.0"
+            "load-json-file": "4.0.0",
+            "normalize-package-data": "2.4.0",
+            "path-type": "3.0.0"
           }
         },
         "rx": {
@@ -4326,7 +4326,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "^1.0.0"
+            "has-flag": "1.0.0"
           }
         }
       }
@@ -4337,8 +4337,8 @@
       "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==",
       "dev": true,
       "requires": {
-        "ini": "^1.3.4",
-        "proto-list": "~1.2.1"
+        "ini": "1.3.5",
+        "proto-list": "1.2.4"
       }
     },
     "configstore": {
@@ -4347,12 +4347,12 @@
       "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==",
       "dev": true,
       "requires": {
-        "dot-prop": "^4.1.0",
-        "graceful-fs": "^4.1.2",
-        "make-dir": "^1.0.0",
-        "unique-string": "^1.0.0",
-        "write-file-atomic": "^2.0.0",
-        "xdg-basedir": "^3.0.0"
+        "dot-prop": "4.2.0",
+        "graceful-fs": "4.1.11",
+        "make-dir": "1.3.0",
+        "unique-string": "1.0.0",
+        "write-file-atomic": "2.3.0",
+        "xdg-basedir": "3.0.0"
       }
     },
     "configstore-fork": {
@@ -4361,12 +4361,12 @@
       "integrity": "sha512-sQ31B6Ayj9Tqs2nPBrq+2cg8j9sb1Hd6iyqDx2rH+W1EoBDevYAkLk5ncNqktkj7hCeyrUzcNhQ5kUozKXd75A==",
       "dev": true,
       "requires": {
-        "dot-prop": "^4.1.0",
-        "graceful-fs": "^4.1.2",
-        "make-dir": "^1.0.0",
-        "unique-string": "^1.0.0",
-        "write-file-atomic": "^2.0.0",
-        "xdg-basedir": "^3.0.0"
+        "dot-prop": "4.2.0",
+        "graceful-fs": "4.1.11",
+        "make-dir": "1.3.0",
+        "unique-string": "1.0.0",
+        "write-file-atomic": "2.3.0",
+        "xdg-basedir": "3.0.0"
       }
     },
     "connect": {
@@ -4377,7 +4377,7 @@
       "requires": {
         "debug": "2.6.9",
         "finalhandler": "1.1.0",
-        "parseurl": "~1.3.2",
+        "parseurl": "1.3.2",
         "utils-merge": "1.0.1"
       },
       "dependencies": {
@@ -4397,12 +4397,12 @@
           "dev": true,
           "requires": {
             "debug": "2.6.9",
-            "encodeurl": "~1.0.1",
-            "escape-html": "~1.0.3",
-            "on-finished": "~2.3.0",
-            "parseurl": "~1.3.2",
-            "statuses": "~1.3.1",
-            "unpipe": "~1.0.0"
+            "encodeurl": "1.0.2",
+            "escape-html": "1.0.3",
+            "on-finished": "2.3.0",
+            "parseurl": "1.3.2",
+            "statuses": "1.3.1",
+            "unpipe": "1.0.0"
           }
         },
         "ms": {
@@ -4431,7 +4431,7 @@
       "integrity": "sha1-TZmZeKHSC7RgjnzUNNdBZSJVF0s=",
       "dev": true,
       "requires": {
-        "moment": "*"
+        "moment": "2.22.2"
       }
     },
     "console-browserify": {
@@ -4440,7 +4440,7 @@
       "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
       "dev": true,
       "requires": {
-        "date-now": "^0.1.4"
+        "date-now": "0.1.4"
       }
     },
     "console-control-strings": {
@@ -4473,7 +4473,7 @@
       "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
       "dev": true,
       "requires": {
-        "safe-buffer": "~5.1.1"
+        "safe-buffer": "5.1.2"
       }
     },
     "cookie": {
@@ -4499,12 +4499,12 @@
       "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
       "dev": true,
       "requires": {
-        "aproba": "^1.1.1",
-        "fs-write-stream-atomic": "^1.0.8",
-        "iferr": "^0.1.5",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.0"
+        "aproba": "1.2.0",
+        "fs-write-stream-atomic": "1.0.10",
+        "iferr": "0.1.5",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.2",
+        "run-queue": "1.0.3"
       }
     },
     "copy-descriptor": {
@@ -4519,14 +4519,14 @@
       "integrity": "sha512-zmC33E8FFSq3AbflTvqvPvBo621H36Afsxlui91d+QyZxPIuXghfnTsa1CuqiAaCPgJoSUWfTFbKJnadZpKEbQ==",
       "dev": true,
       "requires": {
-        "cacache": "^10.0.4",
-        "find-cache-dir": "^1.0.0",
-        "globby": "^7.1.1",
-        "is-glob": "^4.0.0",
-        "loader-utils": "^1.1.0",
-        "minimatch": "^3.0.4",
-        "p-limit": "^1.0.0",
-        "serialize-javascript": "^1.4.0"
+        "cacache": "10.0.4",
+        "find-cache-dir": "1.0.0",
+        "globby": "7.1.1",
+        "is-glob": "4.0.0",
+        "loader-utils": "1.1.0",
+        "minimatch": "3.0.4",
+        "p-limit": "1.3.0",
+        "serialize-javascript": "1.5.0"
       }
     },
     "core-js": {
@@ -4544,10 +4544,10 @@
       "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz",
       "integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
       "requires": {
-        "is-directory": "^0.3.1",
-        "js-yaml": "^3.9.0",
-        "parse-json": "^4.0.0",
-        "require-from-string": "^2.0.1"
+        "is-directory": "0.3.1",
+        "js-yaml": "3.12.0",
+        "parse-json": "4.0.0",
+        "require-from-string": "2.0.2"
       },
       "dependencies": {
         "parse-json": {
@@ -4555,8 +4555,8 @@
           "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
           "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
           "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
+            "error-ex": "1.3.2",
+            "json-parse-better-errors": "1.0.2"
           }
         }
       }
@@ -4567,7 +4567,7 @@
       "integrity": "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==",
       "dev": true,
       "requires": {
-        "buffer": "^5.1.0"
+        "buffer": "5.2.1"
       },
       "dependencies": {
         "buffer": {
@@ -4576,8 +4576,8 @@
           "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==",
           "dev": true,
           "requires": {
-            "base64-js": "^1.0.2",
-            "ieee754": "^1.1.4"
+            "base64-js": "1.3.0",
+            "ieee754": "1.1.12"
           }
         }
       }
@@ -4588,8 +4588,8 @@
       "integrity": "sha1-483TtN8xaN10494/u8t7KX/pCPQ=",
       "dev": true,
       "requires": {
-        "crc": "^3.4.4",
-        "readable-stream": "^2.0.0"
+        "crc": "3.8.0",
+        "readable-stream": "2.3.6"
       }
     },
     "create-ecdh": {
@@ -4598,8 +4598,8 @@
       "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.0.0"
+        "bn.js": "4.11.8",
+        "elliptic": "6.4.1"
       }
     },
     "create-error-class": {
@@ -4608,7 +4608,7 @@
       "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
       "dev": true,
       "requires": {
-        "capture-stack-trace": "^1.0.0"
+        "capture-stack-trace": "1.0.1"
       }
     },
     "create-hash": {
@@ -4617,11 +4617,11 @@
       "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
       "dev": true,
       "requires": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
+        "cipher-base": "1.0.4",
+        "inherits": "2.0.3",
+        "md5.js": "1.3.5",
+        "ripemd160": "2.0.2",
+        "sha.js": "2.4.11"
       }
     },
     "create-hmac": {
@@ -4630,12 +4630,12 @@
       "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
       "dev": true,
       "requires": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
+        "cipher-base": "1.0.4",
+        "create-hash": "1.2.0",
+        "inherits": "2.0.3",
+        "ripemd160": "2.0.2",
+        "safe-buffer": "5.1.2",
+        "sha.js": "2.4.11"
       }
     },
     "cross-spawn": {
@@ -4643,9 +4643,9 @@
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
       "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
       "requires": {
-        "lru-cache": "^4.0.1",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
+        "lru-cache": "4.1.3",
+        "shebang-command": "1.2.0",
+        "which": "1.3.1"
       }
     },
     "cryptiles": {
@@ -4655,7 +4655,7 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "boom": "2.x.x"
+        "boom": "2.10.1"
       }
     },
     "crypto-browserify": {
@@ -4664,17 +4664,17 @@
       "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
       "dev": true,
       "requires": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
+        "browserify-cipher": "1.0.1",
+        "browserify-sign": "4.0.4",
+        "create-ecdh": "4.0.3",
+        "create-hash": "1.2.0",
+        "create-hmac": "1.1.7",
+        "diffie-hellman": "5.0.3",
+        "inherits": "2.0.3",
+        "pbkdf2": "3.0.17",
+        "public-encrypt": "4.0.3",
+        "randombytes": "2.0.6",
+        "randomfill": "1.0.4"
       }
     },
     "crypto-random-string": {
@@ -4689,32 +4689,32 @@
       "integrity": "sha512-7N+ssYKkeYrwGRGlScUh3HvEePseY7VIHUpQwpMjDCdcRD91hUfuvphJEbvkWY++s4qjIF2w+9ZWcDO06sqPOQ==",
       "dev": true,
       "requires": {
-        "chalk": "^2.4.1",
-        "commander": "^2.15.1",
-        "comment-json": "^1.1.3",
-        "configstore-fork": "^3.1.6",
-        "cspell-dict-cpp": "^1.1.8",
-        "cspell-dict-django": "^1.0.4",
-        "cspell-dict-elixir": "^1.0.1",
-        "cspell-dict-en-gb": "^1.1.2",
-        "cspell-dict-en_us": "^1.2.5",
-        "cspell-dict-golang": "^1.1.3",
-        "cspell-dict-java": "^1.0.3",
-        "cspell-dict-latex": "^1.0.1",
-        "cspell-dict-lorem-ipsum": "^1.0.1",
-        "cspell-dict-php": "^1.0.2",
-        "cspell-dict-python": "^1.0.3",
-        "cspell-dict-rust": "^1.0.0",
-        "cspell-dict-scala": "^1.0.3",
-        "cspell-lib": "^3.0.2",
-        "cspell-trie": "^3.0.4",
-        "fs-extra": "^5.0.0",
-        "gensequence": "^2.1.1",
-        "glob": "^7.1.2",
-        "minimatch": "^3.0.4",
-        "rxjs": "^6.2.1",
-        "vscode-uri": "^1.0.5",
-        "xregexp": "^4.2.0"
+        "chalk": "2.4.1",
+        "commander": "2.19.0",
+        "comment-json": "1.1.3",
+        "configstore-fork": "3.1.6",
+        "cspell-dict-cpp": "1.1.9",
+        "cspell-dict-django": "1.0.5",
+        "cspell-dict-elixir": "1.0.2",
+        "cspell-dict-en-gb": "1.1.5",
+        "cspell-dict-en_us": "1.2.8",
+        "cspell-dict-golang": "1.1.6",
+        "cspell-dict-java": "1.0.3",
+        "cspell-dict-latex": "1.0.4",
+        "cspell-dict-lorem-ipsum": "1.0.1",
+        "cspell-dict-php": "1.0.5",
+        "cspell-dict-python": "1.0.6",
+        "cspell-dict-rust": "1.0.3",
+        "cspell-dict-scala": "1.0.3",
+        "cspell-lib": "3.0.4",
+        "cspell-trie": "3.0.7",
+        "fs-extra": "5.0.0",
+        "gensequence": "2.1.1",
+        "glob": "7.1.3",
+        "minimatch": "3.0.4",
+        "rxjs": "6.3.3",
+        "vscode-uri": "1.0.6",
+        "xregexp": "4.2.0"
       },
       "dependencies": {
         "fs-extra": {
@@ -4723,9 +4723,9 @@
           "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
+            "graceful-fs": "4.1.11",
+            "jsonfile": "4.0.0",
+            "universalify": "0.1.2"
           }
         },
         "xregexp": {
@@ -4742,7 +4742,7 @@
       "integrity": "sha512-NwKBvGBMzQUwufkCVI8eGxV6s6p0KNU+R6ezT5rD+kFle9qj4eUiGXc89R7u9YaUUPWxtQix6z99JfnzBYywcg==",
       "dev": true,
       "requires": {
-        "configstore": "^3.1.2"
+        "configstore": "3.1.2"
       }
     },
     "cspell-dict-django": {
@@ -4751,7 +4751,7 @@
       "integrity": "sha512-Jj37jYSHekOD6Nmb2SBtEh14OMzybhSMRR6OnvXQPkeRwU53NvYlcA38uDpq38p1ZJ2P8tqPaSLesgoLUAwbiA==",
       "dev": true,
       "requires": {
-        "configstore": "^3.1.0"
+        "configstore": "3.1.2"
       }
     },
     "cspell-dict-elixir": {
@@ -4760,7 +4760,7 @@
       "integrity": "sha512-ovL/uc9rY+c1kS5yNfK5+bH4FngX7w9EVu0ilo7B2WD0YLaVApyNh+qafQ2ajdjhYo241FQMBLZPtfn0szY6RA==",
       "dev": true,
       "requires": {
-        "configstore": "^3.1.0"
+        "configstore": "3.1.2"
       }
     },
     "cspell-dict-en-gb": {
@@ -4769,7 +4769,7 @@
       "integrity": "sha512-mN2HqC0uO3bokVC2/lfSrxC1XnIpIhDCnonH1GCi7Z8VwgvwnOaafkkahb+iiUYYhpAMRSkogJPB7nJJQjyZ/g==",
       "dev": true,
       "requires": {
-        "configstore": "^3.1.2"
+        "configstore": "3.1.2"
       }
     },
     "cspell-dict-en_us": {
@@ -4778,7 +4778,7 @@
       "integrity": "sha512-nCM05nGjfcnR7jHFkscA+8NyrSNuEo5j238i2cBctjR3wevQ2ts+2oxxKj/XV5RQLUvelnG8pS6JBo6YcmXbUg==",
       "dev": true,
       "requires": {
-        "configstore": "^3.1.2"
+        "configstore": "3.1.2"
       }
     },
     "cspell-dict-golang": {
@@ -4787,7 +4787,7 @@
       "integrity": "sha512-cOXEiNy7Wl7/pGKbNQ0mSgjoz/LJO32TqHGOBamRiIISx8bebeiJjwdusOxcxyNsI4PAVvAQKKx4A2CJlNhQSQ==",
       "dev": true,
       "requires": {
-        "configstore": "^3.1.2"
+        "configstore": "3.1.2"
       }
     },
     "cspell-dict-java": {
@@ -4796,7 +4796,7 @@
       "integrity": "sha512-0ZIvoXco3DczG0LSJMWYDCYESjBU9JNPSaVetKwKymQ2TrYi6vk5N18B5TNNRVlRh6hv2hw4DtDB6sz+TyP/yw==",
       "dev": true,
       "requires": {
-        "configstore": "^3.1.0"
+        "configstore": "3.1.2"
       }
     },
     "cspell-dict-latex": {
@@ -4805,7 +4805,7 @@
       "integrity": "sha512-xZCTkG9W8sBYqOO3TejkOIPWMUwpkiu2QsGia9gpmChG976Hi67+BsWRknbbSX1F+gY2ZDYym8Qy2j/FpkQb/w==",
       "dev": true,
       "requires": {
-        "configstore": "^3.1.2"
+        "configstore": "3.1.2"
       }
     },
     "cspell-dict-lorem-ipsum": {
@@ -4814,7 +4814,7 @@
       "integrity": "sha512-r9O2rD1KQN8URw9sAecXfcAAYyt4xr7OpCXHp4ps/Iw9xH/X6eNxigRtOiv7Xl9NhyX9nPDeD9y3RgVsvSr2kQ==",
       "dev": true,
       "requires": {
-        "configstore": "^3.1.0"
+        "configstore": "3.1.2"
       }
     },
     "cspell-dict-php": {
@@ -4823,7 +4823,7 @@
       "integrity": "sha512-K1YXDXucVPHZ3nNGQQC4m3YJ3FMNcVYn1FxX6fIS6n2Snm1MAiHBsMyAh58n2phhejEuQUEXg7bX61ARe0baqw==",
       "dev": true,
       "requires": {
-        "configstore": "^3.1.2"
+        "configstore": "3.1.2"
       }
     },
     "cspell-dict-python": {
@@ -4832,7 +4832,7 @@
       "integrity": "sha512-yb4PyF/7pI5l58Wz3qvUKSPapChqQJB7cSOGhYz/nIyT3TPGtd0qQhd5l5eTsfkp7tNsagCaBX51PUJ2feMVYg==",
       "dev": true,
       "requires": {
-        "configstore": "^3.1.2"
+        "configstore": "3.1.2"
       }
     },
     "cspell-dict-rust": {
@@ -4841,7 +4841,7 @@
       "integrity": "sha512-31Ujs2CzyEEu8XUlY+TzDreuaAd4FQ9jnGgOT1AVK6bkcuTdoB6OZh4H2TY1QgbbmkNn77YXTFyD3YxtMt72zg==",
       "dev": true,
       "requires": {
-        "configstore": "^3.1.0"
+        "configstore": "3.1.2"
       }
     },
     "cspell-dict-scala": {
@@ -4850,7 +4850,7 @@
       "integrity": "sha512-kYcnQcLk042pTn9EGyOEM9bZXZ/6NAnGKb/IhRJiF2+iStHm5u1jBMeTuHqiU4hOPDbVcE6lK6pZv7lDYQPNZA==",
       "dev": true,
       "requires": {
-        "configstore": "^3.1.0"
+        "configstore": "3.1.2"
       }
     },
     "cspell-lib": {
@@ -4859,8 +4859,8 @@
       "integrity": "sha512-EVmoSqLS743+0lBCz260jpRUKM1K1OQg46saQb0v3b/jlalzlXH9R0pcm7T3/8rgS5IZwls4+E7acpLMPk8uLQ==",
       "dev": true,
       "requires": {
-        "iconv-lite": "^0.4.24",
-        "rxjs-stream": "^3.0.1"
+        "iconv-lite": "0.4.24",
+        "rxjs-stream": "3.0.1"
       },
       "dependencies": {
         "iconv-lite": {
@@ -4869,7 +4869,7 @@
           "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
           "dev": true,
           "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
+            "safer-buffer": "2.1.2"
           }
         }
       }
@@ -4880,13 +4880,13 @@
       "integrity": "sha512-ASunLF5cb9qr8aLw23mcD6150Ipcn3c2pGcbIgN6Qoenk12An3JYZIi9+SLDvsf/LgPFa+EccUiFw1ox+WpvKg==",
       "dev": true,
       "requires": {
-        "commander": "^2.18.0",
-        "cspell-lib": "^3.0.4",
-        "fs-extra": "^7.0.0",
-        "gensequence": "^2.1.1",
-        "hunspell-reader": "^2.0.3",
-        "rxjs": "^6.3.3",
-        "rxjs-stream": "^3.0.1"
+        "commander": "2.19.0",
+        "cspell-lib": "3.0.4",
+        "fs-extra": "7.0.0",
+        "gensequence": "2.1.1",
+        "hunspell-reader": "2.0.4",
+        "rxjs": "6.3.3",
+        "rxjs-stream": "3.0.1"
       },
       "dependencies": {
         "fs-extra": {
@@ -4895,9 +4895,9 @@
           "integrity": "sha512-EglNDLRpmaTWiD/qraZn6HREAEAHJcJOmxNEYwq6xeMKnVMAy3GUcFB+wXt2C6k4CNvB/mP1y/U3dzvKKj5OtQ==",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
+            "graceful-fs": "4.1.11",
+            "jsonfile": "4.0.0",
+            "universalify": "0.1.2"
           }
         }
       }
@@ -4914,10 +4914,10 @@
       "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
       "dev": true,
       "requires": {
-        "boolbase": "~1.0.0",
-        "css-what": "2.1",
+        "boolbase": "1.0.0",
+        "css-what": "2.1.2",
         "domutils": "1.5.1",
-        "nth-check": "~1.0.1"
+        "nth-check": "1.0.2"
       }
     },
     "css-selector-tokenizer": {
@@ -4925,9 +4925,9 @@
       "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz",
       "integrity": "sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=",
       "requires": {
-        "cssesc": "^0.1.0",
-        "fastparse": "^1.1.1",
-        "regexpu-core": "^1.0.0"
+        "cssesc": "0.1.0",
+        "fastparse": "1.1.1",
+        "regexpu-core": "1.0.0"
       }
     },
     "css-what": {
@@ -4941,7 +4941,7 @@
       "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz",
       "integrity": "sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=",
       "requires": {
-        "through": "X.X.X"
+        "through": "2.3.8"
       }
     },
     "cssesc": {
@@ -4961,7 +4961,7 @@
       "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
       "dev": true,
       "requires": {
-        "array-find-index": "^1.0.1"
+        "array-find-index": "1.0.2"
       }
     },
     "custom-event": {
@@ -4986,7 +4986,7 @@
       "resolved": "http://registry.npmjs.org/d/-/d-0.1.1.tgz",
       "integrity": "sha1-2hhMU10Y2O57oqoim5FACfrhEwk=",
       "requires": {
-        "es5-ext": "~0.10.2"
+        "es5-ext": "0.10.46"
       }
     },
     "dashdash": {
@@ -4995,7 +4995,7 @@
       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
       "dev": true,
       "requires": {
-        "assert-plus": "^1.0.0"
+        "assert-plus": "1.0.0"
       }
     },
     "data-uri-to-buffer": {
@@ -5029,8 +5029,8 @@
       "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
       "dev": true,
       "requires": {
-        "get-stdin": "^4.0.1",
-        "meow": "^3.3.0"
+        "get-stdin": "4.0.1",
+        "meow": "3.7.0"
       }
     },
     "debug": {
@@ -5038,7 +5038,7 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
       "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
       "requires": {
-        "ms": "^2.1.1"
+        "ms": "2.1.1"
       }
     },
     "decamelize": {
@@ -5052,8 +5052,8 @@
       "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
       "dev": true,
       "requires": {
-        "decamelize": "^1.1.0",
-        "map-obj": "^1.0.0"
+        "decamelize": "1.2.0",
+        "map-obj": "1.0.1"
       }
     },
     "decode-uri-component": {
@@ -5101,8 +5101,8 @@
       "integrity": "sha512-lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==",
       "dev": true,
       "requires": {
-        "execa": "^0.10.0",
-        "ip-regex": "^2.1.0"
+        "execa": "0.10.0",
+        "ip-regex": "2.1.0"
       },
       "dependencies": {
         "cross-spawn": {
@@ -5111,11 +5111,11 @@
           "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
           "dev": true,
           "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
+            "nice-try": "1.0.5",
+            "path-key": "2.0.1",
+            "semver": "5.6.0",
+            "shebang-command": "1.2.0",
+            "which": "1.3.1"
           }
         },
         "execa": {
@@ -5124,13 +5124,13 @@
           "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
           "dev": true,
           "requires": {
-            "cross-spawn": "^6.0.0",
-            "get-stream": "^3.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
+            "cross-spawn": "6.0.5",
+            "get-stream": "3.0.0",
+            "is-stream": "1.1.0",
+            "npm-run-path": "2.0.2",
+            "p-finally": "1.0.0",
+            "signal-exit": "3.0.2",
+            "strip-eof": "1.0.0"
           }
         }
       }
@@ -5141,7 +5141,7 @@
       "integrity": "sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=",
       "dev": true,
       "requires": {
-        "strip-bom": "^2.0.0"
+        "strip-bom": "2.0.0"
       }
     },
     "define-properties": {
@@ -5149,7 +5149,7 @@
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
       "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
       "requires": {
-        "object-keys": "^1.0.12"
+        "object-keys": "1.0.12"
       }
     },
     "define-property": {
@@ -5158,8 +5158,8 @@
       "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
       "dev": true,
       "requires": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
+        "is-descriptor": "1.0.2",
+        "isobject": "3.0.1"
       },
       "dependencies": {
         "is-accessor-descriptor": {
@@ -5168,7 +5168,7 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-data-descriptor": {
@@ -5177,7 +5177,7 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-descriptor": {
@@ -5186,9 +5186,9 @@
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
           }
         }
       }
@@ -5200,9 +5200,9 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "ast-types": "0.x.x",
-        "escodegen": "1.x.x",
-        "esprima": "3.x.x"
+        "ast-types": "0.11.6",
+        "escodegen": "1.8.1",
+        "esprima": "3.1.3"
       },
       "dependencies": {
         "esprima": {
@@ -5220,12 +5220,12 @@
       "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
       "dev": true,
       "requires": {
-        "globby": "^6.1.0",
-        "is-path-cwd": "^1.0.0",
-        "is-path-in-cwd": "^1.0.0",
-        "p-map": "^1.1.1",
-        "pify": "^3.0.0",
-        "rimraf": "^2.2.8"
+        "globby": "6.1.0",
+        "is-path-cwd": "1.0.0",
+        "is-path-in-cwd": "1.0.1",
+        "p-map": "1.2.0",
+        "pify": "3.0.0",
+        "rimraf": "2.6.2"
       },
       "dependencies": {
         "globby": {
@@ -5234,11 +5234,11 @@
           "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
           "dev": true,
           "requires": {
-            "array-union": "^1.0.1",
-            "glob": "^7.0.3",
-            "object-assign": "^4.0.1",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "array-union": "1.0.2",
+            "glob": "7.1.3",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
           },
           "dependencies": {
             "pify": {
@@ -5274,8 +5274,8 @@
       "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.1"
       }
     },
     "destroy": {
@@ -5290,7 +5290,7 @@
       "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
       "dev": true,
       "requires": {
-        "repeating": "^2.0.0"
+        "repeating": "2.0.1"
       }
     },
     "detect-node": {
@@ -5335,9 +5335,9 @@
       "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
+        "bn.js": "4.11.8",
+        "miller-rabin": "4.0.1",
+        "randombytes": "2.0.6"
       }
     },
     "dir-glob": {
@@ -5346,8 +5346,8 @@
       "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
       "dev": true,
       "requires": {
-        "arrify": "^1.0.1",
-        "path-type": "^3.0.0"
+        "arrify": "1.0.1",
+        "path-type": "3.0.0"
       }
     },
     "dns-equal": {
@@ -5362,8 +5362,8 @@
       "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
       "dev": true,
       "requires": {
-        "ip": "^1.1.0",
-        "safe-buffer": "^5.0.1"
+        "ip": "1.1.5",
+        "safe-buffer": "5.1.2"
       }
     },
     "dns-txt": {
@@ -5372,7 +5372,7 @@
       "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
       "dev": true,
       "requires": {
-        "buffer-indexof": "^1.0.0"
+        "buffer-indexof": "1.1.1"
       }
     },
     "dom-converter": {
@@ -5381,7 +5381,7 @@
       "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
       "dev": true,
       "requires": {
-        "utila": "~0.4"
+        "utila": "0.4.0"
       }
     },
     "dom-serialize": {
@@ -5390,10 +5390,10 @@
       "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
       "dev": true,
       "requires": {
-        "custom-event": "~1.0.0",
-        "ent": "~2.2.0",
-        "extend": "^3.0.0",
-        "void-elements": "^2.0.0"
+        "custom-event": "1.0.1",
+        "ent": "2.2.0",
+        "extend": "3.0.2",
+        "void-elements": "2.0.1"
       }
     },
     "dom-serializer": {
@@ -5402,8 +5402,8 @@
       "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
       "dev": true,
       "requires": {
-        "domelementtype": "~1.1.1",
-        "entities": "~1.1.1"
+        "domelementtype": "1.1.3",
+        "entities": "1.1.2"
       },
       "dependencies": {
         "domelementtype": {
@@ -5432,7 +5432,7 @@
       "integrity": "sha1-0mRvXlf2w7qxHPbLBdPArPdBJZQ=",
       "dev": true,
       "requires": {
-        "domelementtype": "1"
+        "domelementtype": "1.2.1"
       }
     },
     "domutils": {
@@ -5441,8 +5441,8 @@
       "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
       "dev": true,
       "requires": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
+        "dom-serializer": "0.1.0",
+        "domelementtype": "1.2.1"
       }
     },
     "dot-prop": {
@@ -5451,7 +5451,7 @@
       "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
       "dev": true,
       "requires": {
-        "is-obj": "^1.0.0"
+        "is-obj": "1.0.1"
       }
     },
     "double-ended-queue": {
@@ -5472,7 +5472,7 @@
       "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
       "dev": true,
       "requires": {
-        "readable-stream": "~1.1.9"
+        "readable-stream": "1.1.14"
       },
       "dependencies": {
         "isarray": {
@@ -5487,10 +5487,10 @@
           "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
             "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
+            "string_decoder": "0.10.31"
           }
         },
         "string_decoder": {
@@ -5513,10 +5513,10 @@
       "integrity": "sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==",
       "dev": true,
       "requires": {
-        "end-of-stream": "^1.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0",
-        "stream-shift": "^1.0.0"
+        "end-of-stream": "1.4.1",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6",
+        "stream-shift": "1.0.0"
       }
     },
     "easy-extender": {
@@ -5525,7 +5525,7 @@
       "integrity": "sha512-8cAwm6md1YTiPpOvDULYJL4ZS6WfM5/cTeVVh4JsvyYZAoqlRVUpHL9Gr5Fy7HA6xcSZicUia3DeAgO3Us8E+Q==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.10"
+        "lodash": "4.17.11"
       }
     },
     "eazy-logger": {
@@ -5534,7 +5534,7 @@
       "integrity": "sha1-oyWqXlPROiIliJsqxBE7K5Y29Pw=",
       "dev": true,
       "requires": {
-        "tfunk": "^3.0.1"
+        "tfunk": "3.1.0"
       }
     },
     "ecc-jsbn": {
@@ -5543,8 +5543,8 @@
       "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
       "dev": true,
       "requires": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
+        "jsbn": "0.1.1",
+        "safer-buffer": "2.1.2"
       }
     },
     "editorconfig": {
@@ -5553,12 +5553,12 @@
       "integrity": "sha512-GWjSI19PVJAM9IZRGOS+YKI8LN+/sjkSjNyvxL5ucqP9/IqtYNXBaQ/6c/hkPNYQHyOHra2KoXZI/JVpuqwmcQ==",
       "dev": true,
       "requires": {
-        "@types/node": "^10.11.7",
-        "@types/semver": "^5.5.0",
-        "commander": "^2.19.0",
-        "lru-cache": "^4.1.3",
-        "semver": "^5.6.0",
-        "sigmund": "^1.0.1"
+        "@types/node": "10.12.0",
+        "@types/semver": "5.5.0",
+        "commander": "2.19.0",
+        "lru-cache": "4.1.3",
+        "semver": "5.6.0",
+        "sigmund": "1.0.1"
       },
       "dependencies": {
         "@types/node": {
@@ -5593,13 +5593,13 @@
       "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.4.0",
-        "brorand": "^1.0.1",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.0"
+        "bn.js": "4.11.8",
+        "brorand": "1.1.0",
+        "hash.js": "1.1.5",
+        "hmac-drbg": "1.0.1",
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.1",
+        "minimalistic-crypto-utils": "1.0.1"
       }
     },
     "emoji-regex": {
@@ -5625,7 +5625,7 @@
       "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
       "dev": true,
       "requires": {
-        "iconv-lite": "~0.4.13"
+        "iconv-lite": "0.4.23"
       }
     },
     "end-of-stream": {
@@ -5634,7 +5634,7 @@
       "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
       "dev": true,
       "requires": {
-        "once": "^1.4.0"
+        "once": "1.4.0"
       }
     },
     "engine.io": {
@@ -5643,13 +5643,13 @@
       "integrity": "sha512-D06ivJkYxyRrcEe0bTpNnBQNgP9d3xog+qZlLbui8EsMr/DouQpf5o9FzJnWYHEYE0YsFHllUv2R1dkgYZXHcA==",
       "dev": true,
       "requires": {
-        "accepts": "~1.3.4",
+        "accepts": "1.3.5",
         "base64id": "1.0.0",
         "cookie": "0.3.1",
-        "debug": "~3.1.0",
-        "engine.io-parser": "~2.1.0",
-        "uws": "~9.14.0",
-        "ws": "~3.3.1"
+        "debug": "3.1.0",
+        "engine.io-parser": "2.1.2",
+        "uws": "9.14.0",
+        "ws": "3.3.3"
       },
       "dependencies": {
         "debug": {
@@ -5677,14 +5677,14 @@
       "requires": {
         "component-emitter": "1.2.1",
         "component-inherit": "0.0.3",
-        "debug": "~3.1.0",
-        "engine.io-parser": "~2.1.1",
+        "debug": "3.1.0",
+        "engine.io-parser": "2.1.2",
         "has-cors": "1.1.0",
         "indexof": "0.0.1",
         "parseqs": "0.0.5",
         "parseuri": "0.0.5",
-        "ws": "~3.3.1",
-        "xmlhttprequest-ssl": "~1.5.4",
+        "ws": "3.3.3",
+        "xmlhttprequest-ssl": "1.5.5",
         "yeast": "0.1.2"
       },
       "dependencies": {
@@ -5712,10 +5712,10 @@
       "dev": true,
       "requires": {
         "after": "0.8.2",
-        "arraybuffer.slice": "~0.0.7",
+        "arraybuffer.slice": "0.0.7",
         "base64-arraybuffer": "0.1.5",
         "blob": "0.0.4",
-        "has-binary2": "~1.0.2"
+        "has-binary2": "1.0.3"
       }
     },
     "enhanced-resolve": {
@@ -5724,9 +5724,9 @@
       "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.4.0",
-        "tapable": "^1.0.0"
+        "graceful-fs": "4.1.11",
+        "memory-fs": "0.4.1",
+        "tapable": "1.1.0"
       }
     },
     "ent": {
@@ -5747,7 +5747,7 @@
       "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
       "dev": true,
       "requires": {
-        "prr": "~1.0.1"
+        "prr": "1.0.1"
       }
     },
     "error-ex": {
@@ -5755,7 +5755,7 @@
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
       "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
       "requires": {
-        "is-arrayish": "^0.2.1"
+        "is-arrayish": "0.2.1"
       }
     },
     "es-abstract": {
@@ -5763,11 +5763,11 @@
       "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz",
       "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==",
       "requires": {
-        "es-to-primitive": "^1.1.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.1",
-        "is-callable": "^1.1.3",
-        "is-regex": "^1.0.4"
+        "es-to-primitive": "1.2.0",
+        "function-bind": "1.1.1",
+        "has": "1.0.3",
+        "is-callable": "1.1.4",
+        "is-regex": "1.0.4"
       }
     },
     "es-to-primitive": {
@@ -5775,9 +5775,9 @@
       "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
       "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
       "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
+        "is-callable": "1.1.4",
+        "is-date-object": "1.0.1",
+        "is-symbol": "1.0.2"
       }
     },
     "es5-ext": {
@@ -5785,9 +5785,9 @@
       "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.46.tgz",
       "integrity": "sha512-24XxRvJXNFwEMpJb3nOkiRJKRoupmjYmOPVlI65Qy2SrtxwOTB+g6ODjBKOtwEHbYrhWRty9xxOWLNdClT2djw==",
       "requires": {
-        "es6-iterator": "~2.0.3",
-        "es6-symbol": "~3.1.1",
-        "next-tick": "1"
+        "es6-iterator": "2.0.3",
+        "es6-symbol": "3.1.1",
+        "next-tick": "1.0.0"
       }
     },
     "es6-iterator": {
@@ -5795,9 +5795,9 @@
       "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
       "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
       "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.35",
-        "es6-symbol": "^3.1.1"
+        "d": "1.0.0",
+        "es5-ext": "0.10.46",
+        "es6-symbol": "3.1.1"
       },
       "dependencies": {
         "d": {
@@ -5805,7 +5805,7 @@
           "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
           "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
           "requires": {
-            "es5-ext": "^0.10.9"
+            "es5-ext": "0.10.46"
           }
         }
       }
@@ -5822,7 +5822,7 @@
       "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
       "dev": true,
       "requires": {
-        "es6-promise": "^4.0.3"
+        "es6-promise": "4.2.5"
       }
     },
     "es6-symbol": {
@@ -5830,8 +5830,8 @@
       "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
       "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
       "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14"
+        "d": "1.0.0",
+        "es5-ext": "0.10.46"
       },
       "dependencies": {
         "d": {
@@ -5839,7 +5839,7 @@
           "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
           "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
           "requires": {
-            "es5-ext": "^0.10.9"
+            "es5-ext": "0.10.46"
           }
         }
       }
@@ -5850,8 +5850,8 @@
       "integrity": "sha1-sWbGpiVi9Hi7d3X2ypYQOlmbSyw=",
       "dev": true,
       "requires": {
-        "es5-ext": "^0.10.12",
-        "esniff": "^1.1"
+        "es5-ext": "0.10.46",
+        "esniff": "1.1.0"
       }
     },
     "escape-html": {
@@ -5871,11 +5871,11 @@
       "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
       "dev": true,
       "requires": {
-        "esprima": "^2.7.1",
-        "estraverse": "^1.9.1",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1",
-        "source-map": "~0.2.0"
+        "esprima": "2.7.3",
+        "estraverse": "1.9.3",
+        "esutils": "2.0.2",
+        "optionator": "0.8.2",
+        "source-map": "0.2.0"
       },
       "dependencies": {
         "source-map": {
@@ -5885,7 +5885,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "amdefine": ">=0.0.4"
+            "amdefine": "1.0.1"
           }
         }
       }
@@ -5896,8 +5896,8 @@
       "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
       "dev": true,
       "requires": {
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
+        "esrecurse": "4.2.1",
+        "estraverse": "4.2.0"
       },
       "dependencies": {
         "estraverse": {
@@ -5914,8 +5914,8 @@
       "integrity": "sha1-xmhJIp+RRk3t4uDUAgHtar9l8qw=",
       "dev": true,
       "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.12"
+        "d": "1.0.0",
+        "es5-ext": "0.10.46"
       },
       "dependencies": {
         "d": {
@@ -5924,7 +5924,7 @@
           "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
           "dev": true,
           "requires": {
-            "es5-ext": "^0.10.9"
+            "es5-ext": "0.10.46"
           }
         }
       }
@@ -5941,7 +5941,7 @@
       "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
       "dev": true,
       "requires": {
-        "estraverse": "^4.0.0"
+        "estraverse": "4.2.0"
       },
       "dependencies": {
         "estraverse": {
@@ -5958,7 +5958,7 @@
       "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
       "dev": true,
       "requires": {
-        "estraverse": "^4.1.0"
+        "estraverse": "4.2.0"
       },
       "dependencies": {
         "estraverse": {
@@ -6003,8 +6003,8 @@
       "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.4.tgz",
       "integrity": "sha1-jWPd+0z+H647MsomXExyAiIIC7U=",
       "requires": {
-        "d": "~0.1.1",
-        "es5-ext": "~0.10.7"
+        "d": "0.1.1",
+        "es5-ext": "0.10.46"
       }
     },
     "event-stream": {
@@ -6012,13 +6012,13 @@
       "resolved": "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
       "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
       "requires": {
-        "duplexer": "~0.1.1",
-        "from": "~0",
-        "map-stream": "~0.1.0",
+        "duplexer": "0.1.1",
+        "from": "0.1.7",
+        "map-stream": "0.1.0",
         "pause-stream": "0.0.11",
-        "split": "0.3",
-        "stream-combiner": "~0.0.4",
-        "through": "~2.3.1"
+        "split": "0.3.3",
+        "stream-combiner": "0.0.4",
+        "through": "2.3.8"
       }
     },
     "eventemitter3": {
@@ -6039,7 +6039,7 @@
       "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
       "dev": true,
       "requires": {
-        "original": "^1.0.0"
+        "original": "1.0.2"
       }
     },
     "evp_bytestokey": {
@@ -6048,8 +6048,8 @@
       "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
       "dev": true,
       "requires": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
+        "md5.js": "1.3.5",
+        "safe-buffer": "5.1.2"
       }
     },
     "exceptions": {
@@ -6066,13 +6066,13 @@
       "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
       "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
       "requires": {
-        "cross-spawn": "^5.0.1",
-        "get-stream": "^3.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
+        "cross-spawn": "5.1.0",
+        "get-stream": "3.0.0",
+        "is-stream": "1.1.0",
+        "npm-run-path": "2.0.2",
+        "p-finally": "1.0.0",
+        "signal-exit": "3.0.2",
+        "strip-eof": "1.0.0"
       }
     },
     "execall": {
@@ -6081,7 +6081,7 @@
       "integrity": "sha1-c9CQTjlbPKsGWLCNCewlMH8pu3M=",
       "dev": true,
       "requires": {
-        "clone-regexp": "^1.0.0"
+        "clone-regexp": "1.0.1"
       }
     },
     "exit": {
@@ -6096,9 +6096,9 @@
       "integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=",
       "dev": true,
       "requires": {
-        "array-slice": "^0.2.3",
-        "array-unique": "^0.2.1",
-        "braces": "^0.1.2"
+        "array-slice": "0.2.3",
+        "array-unique": "0.2.1",
+        "braces": "0.1.5"
       },
       "dependencies": {
         "array-unique": {
@@ -6113,7 +6113,7 @@
           "integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=",
           "dev": true,
           "requires": {
-            "expand-range": "^0.1.0"
+            "expand-range": "0.1.1"
           }
         },
         "expand-range": {
@@ -6122,8 +6122,8 @@
           "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=",
           "dev": true,
           "requires": {
-            "is-number": "^0.1.1",
-            "repeat-string": "^0.2.2"
+            "is-number": "0.1.1",
+            "repeat-string": "0.2.2"
           }
         },
         "is-number": {
@@ -6146,13 +6146,13 @@
       "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
       "dev": true,
       "requires": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
+        "debug": "2.6.9",
+        "define-property": "0.2.5",
+        "extend-shallow": "2.0.1",
+        "posix-character-classes": "0.1.1",
+        "regex-not": "1.0.2",
+        "snapdragon": "0.8.2",
+        "to-regex": "3.0.2"
       },
       "dependencies": {
         "debug": {
@@ -6170,7 +6170,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         },
         "extend-shallow": {
@@ -6179,7 +6179,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         },
         "ms": {
@@ -6196,7 +6196,7 @@
       "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
       "dev": true,
       "requires": {
-        "fill-range": "^2.1.0"
+        "fill-range": "2.2.4"
       },
       "dependencies": {
         "fill-range": {
@@ -6205,11 +6205,11 @@
           "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
           "dev": true,
           "requires": {
-            "is-number": "^2.1.0",
-            "isobject": "^2.0.0",
-            "randomatic": "^3.0.0",
-            "repeat-element": "^1.1.2",
-            "repeat-string": "^1.5.2"
+            "is-number": "2.1.0",
+            "isobject": "2.1.0",
+            "randomatic": "3.1.1",
+            "repeat-element": "1.1.3",
+            "repeat-string": "1.6.1"
           }
         },
         "is-number": {
@@ -6218,7 +6218,7 @@
           "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "kind-of": "3.2.2"
           }
         },
         "isobject": {
@@ -6236,7 +6236,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -6247,7 +6247,7 @@
       "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
       "dev": true,
       "requires": {
-        "homedir-polyfill": "^1.0.1"
+        "homedir-polyfill": "1.0.1"
       }
     },
     "express": {
@@ -6256,36 +6256,36 @@
       "integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
       "dev": true,
       "requires": {
-        "accepts": "~1.3.5",
+        "accepts": "1.3.5",
         "array-flatten": "1.1.1",
         "body-parser": "1.18.3",
         "content-disposition": "0.5.2",
-        "content-type": "~1.0.4",
+        "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",
+        "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",
+        "methods": "1.1.2",
+        "on-finished": "2.3.0",
+        "parseurl": "1.3.2",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.4",
+        "proxy-addr": "2.0.4",
         "qs": "6.5.2",
-        "range-parser": "~1.2.0",
+        "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",
+        "statuses": "1.4.0",
+        "type-is": "1.6.16",
         "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
+        "vary": "1.1.2"
       },
       "dependencies": {
         "array-flatten": {
@@ -6322,8 +6322,8 @@
       "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
       "dev": true,
       "requires": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
+        "assign-symbols": "1.0.0",
+        "is-extendable": "1.0.1"
       },
       "dependencies": {
         "is-extendable": {
@@ -6332,7 +6332,7 @@
           "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "dev": true,
           "requires": {
-            "is-plain-object": "^2.0.4"
+            "is-plain-object": "2.0.4"
           }
         }
       }
@@ -6343,9 +6343,9 @@
       "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
       "dev": true,
       "requires": {
-        "chardet": "^0.4.0",
-        "iconv-lite": "^0.4.17",
-        "tmp": "^0.0.33"
+        "chardet": "0.4.2",
+        "iconv-lite": "0.4.23",
+        "tmp": "0.0.33"
       },
       "dependencies": {
         "tmp": {
@@ -6354,7 +6354,7 @@
           "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
           "dev": true,
           "requires": {
-            "os-tmpdir": "~1.0.2"
+            "os-tmpdir": "1.0.2"
           }
         }
       }
@@ -6365,14 +6365,14 @@
       "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
       "dev": true,
       "requires": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
+        "array-unique": "0.3.2",
+        "define-property": "1.0.0",
+        "expand-brackets": "2.1.4",
+        "extend-shallow": "2.0.1",
+        "fragment-cache": "0.2.1",
+        "regex-not": "1.0.2",
+        "snapdragon": "0.8.2",
+        "to-regex": "3.0.2"
       },
       "dependencies": {
         "define-property": {
@@ -6381,7 +6381,7 @@
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "^1.0.0"
+            "is-descriptor": "1.0.2"
           }
         },
         "extend-shallow": {
@@ -6390,7 +6390,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         },
         "is-accessor-descriptor": {
@@ -6399,7 +6399,7 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-data-descriptor": {
@@ -6408,7 +6408,7 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-descriptor": {
@@ -6417,9 +6417,9 @@
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
           }
         }
       }
@@ -6430,10 +6430,10 @@
       "integrity": "sha512-Hypkn9jUTnFr0DpekNam53X47tXn3ucY08BQumv7kdGgeVUBLq3DJHJTi6HNxv4jl9W+Skxjz9+RnK0sJyqqjA==",
       "dev": true,
       "requires": {
-        "async": "^2.4.1",
-        "loader-utils": "^1.1.0",
-        "schema-utils": "^0.4.5",
-        "webpack-sources": "^1.1.0"
+        "async": "2.6.1",
+        "loader-utils": "1.1.0",
+        "schema-utils": "0.4.7",
+        "webpack-sources": "1.3.0"
       },
       "dependencies": {
         "async": {
@@ -6442,7 +6442,7 @@
           "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
           "dev": true,
           "requires": {
-            "lodash": "^4.17.10"
+            "lodash": "4.17.11"
           }
         }
       }
@@ -6459,9 +6459,9 @@
       "integrity": "sha1-9BEl49hPLn2JpD0G2VjI94vha+E=",
       "dev": true,
       "requires": {
-        "ansi-gray": "^0.1.1",
-        "color-support": "^1.1.3",
-        "time-stamp": "^1.0.0"
+        "ansi-gray": "0.1.1",
+        "color-support": "1.1.3",
+        "time-stamp": "1.1.0"
       }
     },
     "fast-deep-equal": {
@@ -6475,12 +6475,12 @@
       "integrity": "sha512-FjK2nCGI/McyzgNtTESqaWP3trPvHyRyoyY70hxjc3oKPNmDe8taohLZpoVKoUjW85tbU5txaYUZCNtVzygl1g==",
       "dev": true,
       "requires": {
-        "@mrmlnc/readdir-enhanced": "^2.2.1",
-        "@nodelib/fs.stat": "^1.1.2",
-        "glob-parent": "^3.1.0",
-        "is-glob": "^4.0.0",
-        "merge2": "^1.2.3",
-        "micromatch": "^3.1.10"
+        "@mrmlnc/readdir-enhanced": "2.2.1",
+        "@nodelib/fs.stat": "1.1.3",
+        "glob-parent": "3.1.0",
+        "is-glob": "4.0.0",
+        "merge2": "1.2.3",
+        "micromatch": "3.1.10"
       }
     },
     "fast-json-patch": {
@@ -6511,7 +6511,7 @@
       "integrity": "sha512-o2eo/X2syzzERAtN5LcGbiVQ0WwZSlN3qLtadwAz3X8Bu+XWD16dja/KMsjZLiQr+BLGPDnHGkc4yUJf1Xpkpw==",
       "dev": true,
       "requires": {
-        "format": "^0.2.2"
+        "format": "0.2.2"
       }
     },
     "faye-websocket": {
@@ -6520,7 +6520,7 @@
       "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
       "dev": true,
       "requires": {
-        "websocket-driver": ">=0.5.1"
+        "websocket-driver": "0.7.0"
       }
     },
     "figures": {
@@ -6529,7 +6529,7 @@
       "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
       "dev": true,
       "requires": {
-        "escape-string-regexp": "^1.0.5"
+        "escape-string-regexp": "1.0.5"
       }
     },
     "file-entry-cache": {
@@ -6538,8 +6538,8 @@
       "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
       "dev": true,
       "requires": {
-        "flat-cache": "^1.2.1",
-        "object-assign": "^4.0.1"
+        "flat-cache": "1.3.4",
+        "object-assign": "4.1.1"
       }
     },
     "file-loader": {
@@ -6548,8 +6548,8 @@
       "integrity": "sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.0.2",
-        "schema-utils": "^0.4.5"
+        "loader-utils": "1.1.0",
+        "schema-utils": "0.4.7"
       }
     },
     "file-uri-to-path": {
@@ -6571,8 +6571,8 @@
       "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=",
       "dev": true,
       "requires": {
-        "glob": "^7.0.3",
-        "minimatch": "^3.0.3"
+        "glob": "7.1.3",
+        "minimatch": "3.0.4"
       }
     },
     "filesize": {
@@ -6587,10 +6587,10 @@
       "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
       "dev": true,
       "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
+        "extend-shallow": "2.0.1",
+        "is-number": "3.0.0",
+        "repeat-string": "1.6.1",
+        "to-regex-range": "2.1.1"
       },
       "dependencies": {
         "extend-shallow": {
@@ -6599,7 +6599,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         }
       }
@@ -6611,12 +6611,12 @@
       "dev": true,
       "requires": {
         "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.2",
-        "statuses": "~1.4.0",
-        "unpipe": "~1.0.0"
+        "encodeurl": "1.0.2",
+        "escape-html": "1.0.3",
+        "on-finished": "2.3.0",
+        "parseurl": "1.3.2",
+        "statuses": "1.4.0",
+        "unpipe": "1.0.0"
       },
       "dependencies": {
         "debug": {
@@ -6642,9 +6642,9 @@
       "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
       "dev": true,
       "requires": {
-        "commondir": "^1.0.1",
-        "make-dir": "^1.0.0",
-        "pkg-dir": "^2.0.0"
+        "commondir": "1.0.1",
+        "make-dir": "1.3.0",
+        "pkg-dir": "2.0.0"
       }
     },
     "find-parent-dir": {
@@ -6658,7 +6658,7 @@
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
       "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
       "requires": {
-        "locate-path": "^2.0.0"
+        "locate-path": "2.0.0"
       }
     },
     "flat-cache": {
@@ -6667,10 +6667,10 @@
       "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==",
       "dev": true,
       "requires": {
-        "circular-json": "^0.3.1",
-        "graceful-fs": "^4.1.2",
-        "rimraf": "~2.6.2",
-        "write": "^0.2.1"
+        "circular-json": "0.3.3",
+        "graceful-fs": "4.1.11",
+        "rimraf": "2.6.2",
+        "write": "0.2.1"
       },
       "dependencies": {
         "circular-json": {
@@ -6687,8 +6687,8 @@
       "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.4"
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6"
       }
     },
     "follow-redirects": {
@@ -6697,7 +6697,7 @@
       "integrity": "sha512-Bh65EZI/RU8nx0wbYF9shkFZlqLP+6WT/5FnA3cE/djNSuKNHJEinGGZgu/cQEkeeb2GdFOgenAmn8qaqYke2w==",
       "dev": true,
       "requires": {
-        "debug": "=3.1.0"
+        "debug": "3.1.0"
       },
       "dependencies": {
         "debug": {
@@ -6729,7 +6729,7 @@
       "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
       "dev": true,
       "requires": {
-        "for-in": "^1.0.1"
+        "for-in": "1.0.2"
       }
     },
     "forever-agent": {
@@ -6743,9 +6743,9 @@
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
       "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
       "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
+        "asynckit": "0.4.0",
+        "combined-stream": "1.0.7",
+        "mime-types": "2.1.21"
       }
     },
     "format": {
@@ -6781,7 +6781,7 @@
       "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
       "dev": true,
       "requires": {
-        "map-cache": "^0.2.2"
+        "map-cache": "0.2.2"
       }
     },
     "fresh": {
@@ -6801,8 +6801,8 @@
       "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0"
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6"
       }
     },
     "fs": {
@@ -6817,7 +6817,7 @@
       "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
       "dev": true,
       "requires": {
-        "null-check": "^1.0.0"
+        "null-check": "1.0.0"
       }
     },
     "fs-constants": {
@@ -6832,9 +6832,9 @@
       "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
+        "graceful-fs": "4.1.11",
+        "jsonfile": "4.0.0",
+        "universalify": "0.1.2"
       }
     },
     "fs-write-stream-atomic": {
@@ -6843,10 +6843,10 @@
       "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "iferr": "^0.1.5",
-        "imurmurhash": "^0.1.4",
-        "readable-stream": "1 || 2"
+        "graceful-fs": "4.1.11",
+        "iferr": "0.1.5",
+        "imurmurhash": "0.1.4",
+        "readable-stream": "2.3.6"
       }
     },
     "fs.realpath": {
@@ -6862,8 +6862,8 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "nan": "^2.9.2",
-        "node-pre-gyp": "^0.10.0"
+        "nan": "2.11.1",
+        "node-pre-gyp": "0.10.0"
       },
       "dependencies": {
         "abbrev": {
@@ -7390,10 +7390,10 @@
       "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "inherits": "~2.0.0",
-        "mkdirp": ">=0.5 0",
-        "rimraf": "2"
+        "graceful-fs": "4.1.11",
+        "inherits": "2.0.3",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.2"
       }
     },
     "ftp": {
@@ -7403,7 +7403,7 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "readable-stream": "1.1.x",
+        "readable-stream": "1.1.14",
         "xregexp": "2.0.0"
       },
       "dependencies": {
@@ -7421,10 +7421,10 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
             "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
+            "string_decoder": "0.10.31"
           }
         },
         "string_decoder": {
@@ -7454,14 +7454,14 @@
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
       "dev": true,
       "requires": {
-        "aproba": "^1.0.3",
-        "console-control-strings": "^1.0.0",
-        "has-unicode": "^2.0.0",
-        "object-assign": "^4.1.0",
-        "signal-exit": "^3.0.0",
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wide-align": "^1.1.0"
+        "aproba": "1.2.0",
+        "console-control-strings": "1.1.0",
+        "has-unicode": "2.0.1",
+        "object-assign": "4.1.1",
+        "signal-exit": "3.0.2",
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1",
+        "wide-align": "1.1.3"
       },
       "dependencies": {
         "ansi-regex": {
@@ -7476,7 +7476,7 @@
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
           "requires": {
-            "number-is-nan": "^1.0.0"
+            "number-is-nan": "1.0.1"
           }
         },
         "string-width": {
@@ -7485,9 +7485,9 @@
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
           "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
           }
         },
         "strip-ansi": {
@@ -7496,7 +7496,7 @@
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "2.1.1"
           }
         }
       }
@@ -7507,7 +7507,7 @@
       "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
       "dev": true,
       "requires": {
-        "globule": "^1.0.0"
+        "globule": "1.2.1"
       }
     },
     "generate-function": {
@@ -7517,7 +7517,7 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "is-property": "^1.0.2"
+        "is-property": "1.0.2"
       }
     },
     "generate-object-property": {
@@ -7527,7 +7527,7 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "is-property": "^1.0.0"
+        "is-property": "1.0.2"
       }
     },
     "gensequence": {
@@ -7559,12 +7559,12 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "data-uri-to-buffer": "1",
-        "debug": "2",
-        "extend": "3",
-        "file-uri-to-path": "1",
-        "ftp": "~0.3.10",
-        "readable-stream": "2"
+        "data-uri-to-buffer": "1.2.0",
+        "debug": "2.6.9",
+        "extend": "3.0.2",
+        "file-uri-to-path": "1.0.0",
+        "ftp": "0.3.10",
+        "readable-stream": "2.3.6"
       },
       "dependencies": {
         "debug": {
@@ -7598,7 +7598,7 @@
       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
       "dev": true,
       "requires": {
-        "assert-plus": "^1.0.0"
+        "assert-plus": "1.0.0"
       }
     },
     "github-build": {
@@ -7634,7 +7634,7 @@
           "integrity": "sha1-jjQpjL0uF28lTv/sdaHHjMhJ/Tc=",
           "dev": true,
           "requires": {
-            "debug": "^2.2.0"
+            "debug": "2.6.9"
           }
         },
         "ms": {
@@ -7651,7 +7651,7 @@
       "integrity": "sha512-wIaa75k1vZhyPm9yWrD08A5Xnx/V+RmzGrpjQuLemGKSb77Qukiaei58Bogrl/LZSADDfPzKJX8jhLs4CRTl7Q==",
       "dev": true,
       "requires": {
-        "emoji-regex": ">=6.0.0 <=6.1.1"
+        "emoji-regex": "6.1.1"
       }
     },
     "glob": {
@@ -7660,12 +7660,12 @@
       "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
       "dev": true,
       "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "fs.realpath": "1.0.0",
+        "inflight": "1.0.6",
+        "inherits": "2.0.3",
+        "minimatch": "3.0.4",
+        "once": "1.4.0",
+        "path-is-absolute": "1.0.1"
       }
     },
     "glob-base": {
@@ -7674,8 +7674,8 @@
       "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
       "dev": true,
       "requires": {
-        "glob-parent": "^2.0.0",
-        "is-glob": "^2.0.0"
+        "glob-parent": "2.0.0",
+        "is-glob": "2.0.1"
       },
       "dependencies": {
         "glob-parent": {
@@ -7684,7 +7684,7 @@
           "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
           "dev": true,
           "requires": {
-            "is-glob": "^2.0.0"
+            "is-glob": "2.0.1"
           }
         },
         "is-extglob": {
@@ -7699,7 +7699,7 @@
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
           "requires": {
-            "is-extglob": "^1.0.0"
+            "is-extglob": "1.0.0"
           }
         }
       }
@@ -7710,8 +7710,8 @@
       "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
       "dev": true,
       "requires": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
+        "is-glob": "3.1.0",
+        "path-dirname": "1.0.2"
       },
       "dependencies": {
         "is-glob": {
@@ -7720,7 +7720,7 @@
           "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
           "dev": true,
           "requires": {
-            "is-extglob": "^2.1.0"
+            "is-extglob": "2.1.1"
           }
         }
       }
@@ -7737,7 +7737,7 @@
       "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
       "dev": true,
       "requires": {
-        "ini": "^1.3.4"
+        "ini": "1.3.5"
       }
     },
     "global-modules": {
@@ -7746,9 +7746,9 @@
       "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
       "dev": true,
       "requires": {
-        "global-prefix": "^1.0.1",
-        "is-windows": "^1.0.1",
-        "resolve-dir": "^1.0.0"
+        "global-prefix": "1.0.2",
+        "is-windows": "1.0.2",
+        "resolve-dir": "1.0.1"
       }
     },
     "global-modules-path": {
@@ -7763,11 +7763,11 @@
       "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
       "dev": true,
       "requires": {
-        "expand-tilde": "^2.0.2",
-        "homedir-polyfill": "^1.0.1",
-        "ini": "^1.3.4",
-        "is-windows": "^1.0.1",
-        "which": "^1.2.14"
+        "expand-tilde": "2.0.2",
+        "homedir-polyfill": "1.0.1",
+        "ini": "1.3.5",
+        "is-windows": "1.0.2",
+        "which": "1.3.1"
       }
     },
     "globals": {
@@ -7782,12 +7782,12 @@
       "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
       "dev": true,
       "requires": {
-        "array-union": "^1.0.1",
-        "dir-glob": "^2.0.0",
-        "glob": "^7.1.2",
-        "ignore": "^3.3.5",
-        "pify": "^3.0.0",
-        "slash": "^1.0.0"
+        "array-union": "1.0.2",
+        "dir-glob": "2.0.0",
+        "glob": "7.1.3",
+        "ignore": "3.3.10",
+        "pify": "3.0.0",
+        "slash": "1.0.0"
       }
     },
     "globjoin": {
@@ -7802,7 +7802,7 @@
       "integrity": "sha512-D23dWbOq48vlOraoSigbcQV4tWrnhwk+E/Um2cMuDS3/5dwGmdFeA7L/vAvDhLFlQOTDqHcXh35m/71g2A2WzQ==",
       "dev": true,
       "requires": {
-        "glob": "^7.1.1"
+        "glob": "7.1.3"
       }
     },
     "globule": {
@@ -7811,9 +7811,9 @@
       "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
       "dev": true,
       "requires": {
-        "glob": "~7.1.1",
-        "lodash": "~4.17.10",
-        "minimatch": "~3.0.2"
+        "glob": "7.1.3",
+        "lodash": "4.17.11",
+        "minimatch": "3.0.4"
       }
     },
     "glogg": {
@@ -7822,7 +7822,7 @@
       "integrity": "sha512-ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw==",
       "dev": true,
       "requires": {
-        "sparkles": "^1.0.0"
+        "sparkles": "1.0.1"
       }
     },
     "gonzales-pe": {
@@ -7831,7 +7831,7 @@
       "integrity": "sha512-Kjhohco0esHQnOiqqdJeNz/5fyPkOMD/d6XVjwTAoPGUFh0mCollPUTUTa2OZy4dYNAqlPIQdTiNzJTWdd9Htw==",
       "dev": true,
       "requires": {
-        "minimist": "1.1.x"
+        "minimist": "1.1.3"
       },
       "dependencies": {
         "minimist": {
@@ -7848,17 +7848,17 @@
       "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
       "dev": true,
       "requires": {
-        "create-error-class": "^3.0.0",
-        "duplexer3": "^0.1.4",
-        "get-stream": "^3.0.0",
-        "is-redirect": "^1.0.0",
-        "is-retry-allowed": "^1.0.0",
-        "is-stream": "^1.0.0",
-        "lowercase-keys": "^1.0.0",
-        "safe-buffer": "^5.0.1",
-        "timed-out": "^4.0.0",
-        "unzip-response": "^2.0.1",
-        "url-parse-lax": "^1.0.0"
+        "create-error-class": "3.0.2",
+        "duplexer3": "0.1.4",
+        "get-stream": "3.0.0",
+        "is-redirect": "1.0.0",
+        "is-retry-allowed": "1.1.0",
+        "is-stream": "1.1.0",
+        "lowercase-keys": "1.0.1",
+        "safe-buffer": "5.1.2",
+        "timed-out": "4.0.1",
+        "unzip-response": "2.0.1",
+        "url-parse-lax": "1.0.0"
       }
     },
     "graceful-fs": {
@@ -7877,7 +7877,7 @@
       "resolved": "https://registry.npmjs.org/graphviz/-/graphviz-0.0.8.tgz",
       "integrity": "sha1-5ZnkBzPvgOFlO/6JpfAx7PKqSqo=",
       "requires": {
-        "temp": "~0.4.0"
+        "temp": "0.4.0"
       }
     },
     "gray-matter": {
@@ -7886,11 +7886,11 @@
       "integrity": "sha1-MELZrewqHe1qdwep7SOA+KF6Qw4=",
       "dev": true,
       "requires": {
-        "ansi-red": "^0.1.1",
-        "coffee-script": "^1.12.4",
-        "extend-shallow": "^2.0.1",
-        "js-yaml": "^3.8.1",
-        "toml": "^2.3.2"
+        "ansi-red": "0.1.1",
+        "coffee-script": "1.12.7",
+        "extend-shallow": "2.0.1",
+        "js-yaml": "3.12.0",
+        "toml": "2.3.3"
       },
       "dependencies": {
         "extend-shallow": {
@@ -7899,7 +7899,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         }
       }
@@ -7910,24 +7910,24 @@
       "integrity": "sha1-eJJcS4+LSQBawBoBHFV+YhiUHLs=",
       "dev": true,
       "requires": {
-        "array-differ": "^1.0.0",
-        "array-uniq": "^1.0.2",
-        "beeper": "^1.0.0",
-        "chalk": "^1.0.0",
-        "dateformat": "^1.0.11",
-        "fancy-log": "^1.1.0",
-        "gulplog": "^1.0.0",
-        "has-gulplog": "^0.1.0",
-        "lodash._reescape": "^3.0.0",
-        "lodash._reevaluate": "^3.0.0",
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.template": "^3.0.0",
-        "minimist": "^1.1.0",
-        "multipipe": "^0.1.2",
-        "object-assign": "^3.0.0",
+        "array-differ": "1.0.0",
+        "array-uniq": "1.0.3",
+        "beeper": "1.1.1",
+        "chalk": "1.1.3",
+        "dateformat": "1.0.12",
+        "fancy-log": "1.3.2",
+        "gulplog": "1.0.0",
+        "has-gulplog": "0.1.0",
+        "lodash._reescape": "3.0.0",
+        "lodash._reevaluate": "3.0.0",
+        "lodash._reinterpolate": "3.0.0",
+        "lodash.template": "3.6.2",
+        "minimist": "1.2.0",
+        "multipipe": "0.1.2",
+        "object-assign": "3.0.0",
         "replace-ext": "0.0.1",
-        "through2": "^2.0.0",
-        "vinyl": "^0.5.0"
+        "through2": "2.0.3",
+        "vinyl": "0.5.3"
       },
       "dependencies": {
         "ansi-regex": {
@@ -7948,11 +7948,11 @@
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "minimist": {
@@ -7973,7 +7973,7 @@
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "2.1.1"
           }
         },
         "supports-color": {
@@ -7990,7 +7990,7 @@
       "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
       "dev": true,
       "requires": {
-        "glogg": "^1.0.0"
+        "glogg": "1.0.1"
       }
     },
     "gzip-size": {
@@ -7999,8 +7999,8 @@
       "integrity": "sha1-iuCWJX6r59acRb4rZ8RIEk/7UXw=",
       "dev": true,
       "requires": {
-        "duplexer": "^0.1.1",
-        "pify": "^3.0.0"
+        "duplexer": "0.1.1",
+        "pify": "3.0.0"
       }
     },
     "hammerjs": {
@@ -8020,10 +8020,10 @@
       "integrity": "sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==",
       "dev": true,
       "requires": {
-        "async": "^2.5.0",
-        "optimist": "^0.6.1",
-        "source-map": "^0.6.1",
-        "uglify-js": "^3.1.4"
+        "async": "2.6.1",
+        "optimist": "0.6.1",
+        "source-map": "0.6.1",
+        "uglify-js": "3.4.9"
       },
       "dependencies": {
         "async": {
@@ -8032,7 +8032,7 @@
           "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
           "dev": true,
           "requires": {
-            "lodash": "^4.17.10"
+            "lodash": "4.17.11"
           }
         },
         "source-map": {
@@ -8055,8 +8055,8 @@
       "integrity": "sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==",
       "dev": true,
       "requires": {
-        "ajv": "^5.3.0",
-        "har-schema": "^2.0.0"
+        "ajv": "5.5.2",
+        "har-schema": "2.0.0"
       },
       "dependencies": {
         "ajv": {
@@ -8065,10 +8065,10 @@
           "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
           "dev": true,
           "requires": {
-            "co": "^4.6.0",
-            "fast-deep-equal": "^1.0.0",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.3.0"
+            "co": "4.6.0",
+            "fast-deep-equal": "1.1.0",
+            "fast-json-stable-stringify": "2.0.0",
+            "json-schema-traverse": "0.3.1"
           }
         },
         "fast-deep-equal": {
@@ -8090,7 +8090,7 @@
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
       "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
       "requires": {
-        "function-bind": "^1.1.1"
+        "function-bind": "1.1.1"
       }
     },
     "has-ansi": {
@@ -8099,7 +8099,7 @@
       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
       "dev": true,
       "requires": {
-        "ansi-regex": "^2.0.0"
+        "ansi-regex": "2.1.1"
       },
       "dependencies": {
         "ansi-regex": {
@@ -8144,7 +8144,7 @@
       "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
       "dev": true,
       "requires": {
-        "sparkles": "^1.0.0"
+        "sparkles": "1.0.1"
       }
     },
     "has-symbols": {
@@ -8164,9 +8164,9 @@
       "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
       "dev": true,
       "requires": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
+        "get-value": "2.0.6",
+        "has-values": "1.0.0",
+        "isobject": "3.0.1"
       }
     },
     "has-values": {
@@ -8175,8 +8175,8 @@
       "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
       "dev": true,
       "requires": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
+        "is-number": "3.0.0",
+        "kind-of": "4.0.0"
       },
       "dependencies": {
         "kind-of": {
@@ -8185,7 +8185,7 @@
           "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -8196,8 +8196,8 @@
       "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
       }
     },
     "hash.js": {
@@ -8206,8 +8206,8 @@
       "integrity": "sha512-eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.1"
       }
     },
     "hawk": {
@@ -8217,10 +8217,10 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "boom": "2.x.x",
-        "cryptiles": "2.x.x",
-        "hoek": "2.x.x",
-        "sntp": "1.x.x"
+        "boom": "2.10.1",
+        "cryptiles": "2.0.5",
+        "hoek": "2.16.3",
+        "sntp": "1.0.9"
       }
     },
     "he": {
@@ -8242,8 +8242,8 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "lodash": "^4.0.0",
-        "request": "^2.0.0"
+        "lodash": "4.17.11",
+        "request": "2.88.0"
       }
     },
     "hmac-drbg": {
@@ -8252,9 +8252,9 @@
       "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
       "dev": true,
       "requires": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
+        "hash.js": "1.1.5",
+        "minimalistic-assert": "1.0.1",
+        "minimalistic-crypto-utils": "1.0.1"
       }
     },
     "hoek": {
@@ -8269,8 +8269,8 @@
       "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
       "dev": true,
       "requires": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.1"
+        "os-homedir": "1.0.2",
+        "os-tmpdir": "1.0.2"
       }
     },
     "homedir-polyfill": {
@@ -8279,7 +8279,7 @@
       "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=",
       "dev": true,
       "requires": {
-        "parse-passwd": "^1.0.0"
+        "parse-passwd": "1.0.0"
       }
     },
     "hosted-git-info": {
@@ -8293,10 +8293,10 @@
       "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "obuf": "^1.0.0",
-        "readable-stream": "^2.0.1",
-        "wbuf": "^1.1.0"
+        "inherits": "2.0.3",
+        "obuf": "1.1.2",
+        "readable-stream": "2.3.6",
+        "wbuf": "1.7.3"
       }
     },
     "html-entities": {
@@ -8311,13 +8311,13 @@
       "integrity": "sha512-ZmgNLaTp54+HFKkONyLFEfs5dd/ZOtlquKaTnqIWFmx3Av5zG6ZPcV2d0o9XM2fXOTxxIf6eDcwzFFotke/5zA==",
       "dev": true,
       "requires": {
-        "camel-case": "3.0.x",
-        "clean-css": "4.2.x",
-        "commander": "2.17.x",
-        "he": "1.1.x",
-        "param-case": "2.1.x",
-        "relateurl": "0.2.x",
-        "uglify-js": "3.4.x"
+        "camel-case": "3.0.0",
+        "clean-css": "4.2.1",
+        "commander": "2.17.1",
+        "he": "1.1.1",
+        "param-case": "2.1.1",
+        "relateurl": "0.2.7",
+        "uglify-js": "3.4.9"
       },
       "dependencies": {
         "commander": {
@@ -8340,12 +8340,12 @@
       "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=",
       "dev": true,
       "requires": {
-        "html-minifier": "^3.2.3",
-        "loader-utils": "^0.2.16",
-        "lodash": "^4.17.3",
-        "pretty-error": "^2.0.2",
-        "tapable": "^1.0.0",
-        "toposort": "^1.0.0",
+        "html-minifier": "3.5.20",
+        "loader-utils": "0.2.17",
+        "lodash": "4.17.11",
+        "pretty-error": "2.1.1",
+        "tapable": "1.1.0",
+        "toposort": "1.0.7",
         "util.promisify": "1.0.0"
       },
       "dependencies": {
@@ -8355,10 +8355,10 @@
           "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
           "dev": true,
           "requires": {
-            "big.js": "^3.1.3",
-            "emojis-list": "^2.0.0",
-            "json5": "^0.5.0",
-            "object-assign": "^4.0.1"
+            "big.js": "3.2.0",
+            "emojis-list": "2.1.0",
+            "json5": "0.5.1",
+            "object-assign": "4.1.1"
           }
         }
       }
@@ -8369,10 +8369,10 @@
       "integrity": "sha1-zHDQWln2VC5D8OaFyYLhTJJKnv4=",
       "dev": true,
       "requires": {
-        "domelementtype": "1",
-        "domhandler": "2.1",
-        "domutils": "1.1",
-        "readable-stream": "1.0"
+        "domelementtype": "1.2.1",
+        "domhandler": "2.1.0",
+        "domutils": "1.1.6",
+        "readable-stream": "1.0.34"
       },
       "dependencies": {
         "domutils": {
@@ -8381,7 +8381,7 @@
           "integrity": "sha1-vdw94Jm5ou+sxRxiPyj0FuzFdIU=",
           "dev": true,
           "requires": {
-            "domelementtype": "1"
+            "domelementtype": "1.2.1"
           }
         },
         "isarray": {
@@ -8396,10 +8396,10 @@
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
             "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
+            "string_decoder": "0.10.31"
           }
         },
         "string_decoder": {
@@ -8422,10 +8422,10 @@
       "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
       "dev": true,
       "requires": {
-        "depd": "~1.1.2",
+        "depd": "1.1.2",
         "inherits": "2.0.3",
         "setprototypeof": "1.1.0",
-        "statuses": ">= 1.4.0 < 2"
+        "statuses": "1.4.0"
       }
     },
     "http-parser-js": {
@@ -8440,9 +8440,9 @@
       "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
       "dev": true,
       "requires": {
-        "eventemitter3": "^3.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
+        "eventemitter3": "3.1.0",
+        "follow-redirects": "1.5.9",
+        "requires-port": "1.0.0"
       }
     },
     "http-proxy-agent": {
@@ -8451,7 +8451,7 @@
       "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
       "dev": true,
       "requires": {
-        "agent-base": "4",
+        "agent-base": "4.2.1",
         "debug": "3.1.0"
       },
       "dependencies": {
@@ -8478,10 +8478,10 @@
       "integrity": "sha512-Ab/zKDy2B0404mz83bgki0HHv/xqpYKAyFXhopAiJaVAUSJfLYrpBYynTl4ZSUJ7TqrAgjarTsxdX5yBb4unRQ==",
       "dev": true,
       "requires": {
-        "http-proxy": "^1.17.0",
-        "is-glob": "^4.0.0",
-        "lodash": "^4.17.10",
-        "micromatch": "^3.1.10"
+        "http-proxy": "1.17.0",
+        "is-glob": "4.0.0",
+        "lodash": "4.17.11",
+        "micromatch": "3.1.10"
       }
     },
     "http-signature": {
@@ -8490,9 +8490,9 @@
       "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
       "dev": true,
       "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
+        "assert-plus": "1.0.0",
+        "jsprim": "1.4.1",
+        "sshpk": "1.15.1"
       }
     },
     "httpntlm": {
@@ -8501,8 +8501,8 @@
       "integrity": "sha1-rQFScUOi6Hc8+uapb1hla7UqNLI=",
       "dev": true,
       "requires": {
-        "httpreq": ">=0.4.22",
-        "underscore": "~1.7.0"
+        "httpreq": "0.4.24",
+        "underscore": "1.7.0"
       },
       "dependencies": {
         "underscore": {
@@ -8531,8 +8531,8 @@
       "integrity": "sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==",
       "dev": true,
       "requires": {
-        "agent-base": "^4.1.0",
-        "debug": "^3.1.0"
+        "agent-base": "4.2.1",
+        "debug": "3.2.6"
       }
     },
     "hunspell-reader": {
@@ -8541,12 +8541,12 @@
       "integrity": "sha512-I6xc5hQzR1hTcQy6eAG68Rgp4BKID6vasTOZvC6uin6IbE0Y4ewflf8xU1EsjJXy2MT6QM1I6oXgd6A59GGZng==",
       "dev": true,
       "requires": {
-        "commander": "^2.18.0",
-        "cspell-lib": "^3.0.4",
-        "fs-extra": "^7.0.0",
-        "gensequence": "^2.1.1",
-        "rxjs": "^6.3.3",
-        "rxjs-stream": "^3.0.1"
+        "commander": "2.19.0",
+        "cspell-lib": "3.0.4",
+        "fs-extra": "7.0.0",
+        "gensequence": "2.1.1",
+        "rxjs": "6.3.3",
+        "rxjs-stream": "3.0.1"
       },
       "dependencies": {
         "fs-extra": {
@@ -8555,9 +8555,9 @@
           "integrity": "sha512-EglNDLRpmaTWiD/qraZn6HREAEAHJcJOmxNEYwq6xeMKnVMAy3GUcFB+wXt2C6k4CNvB/mP1y/U3dzvKKj5OtQ==",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
+            "graceful-fs": "4.1.11",
+            "jsonfile": "4.0.0",
+            "universalify": "0.1.2"
           }
         }
       }
@@ -8568,16 +8568,16 @@
       "integrity": "sha512-/ib3+iycykXC0tYIxsyqierikVa9DA2DrT32UEirqNEFVqOj1bFMTgP3jAz8HM7FgC/C8pc/BTUa9MV2GEkZaA==",
       "dev": true,
       "requires": {
-        "cosmiconfig": "^5.0.6",
-        "execa": "^1.0.0",
-        "find-up": "^3.0.0",
-        "get-stdin": "^6.0.0",
-        "is-ci": "^1.2.1",
-        "pkg-dir": "^3.0.0",
-        "please-upgrade-node": "^3.1.1",
-        "read-pkg": "^4.0.1",
-        "run-node": "^1.0.0",
-        "slash": "^2.0.0"
+        "cosmiconfig": "5.0.7",
+        "execa": "1.0.0",
+        "find-up": "3.0.0",
+        "get-stdin": "6.0.0",
+        "is-ci": "1.2.1",
+        "pkg-dir": "3.0.0",
+        "please-upgrade-node": "3.1.1",
+        "read-pkg": "4.0.1",
+        "run-node": "1.0.0",
+        "slash": "2.0.0"
       },
       "dependencies": {
         "cosmiconfig": {
@@ -8586,10 +8586,10 @@
           "integrity": "sha512-PcLqxTKiDmNT6pSpy4N6KtuPwb53W+2tzNvwOZw0WH9N6O0vLIBq0x8aj8Oj75ere4YcGi48bDFCL+3fRJdlNA==",
           "dev": true,
           "requires": {
-            "import-fresh": "^2.0.0",
-            "is-directory": "^0.3.1",
-            "js-yaml": "^3.9.0",
-            "parse-json": "^4.0.0"
+            "import-fresh": "2.0.0",
+            "is-directory": "0.3.1",
+            "js-yaml": "3.12.0",
+            "parse-json": "4.0.0"
           }
         },
         "cross-spawn": {
@@ -8598,11 +8598,11 @@
           "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
           "dev": true,
           "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
+            "nice-try": "1.0.5",
+            "path-key": "2.0.1",
+            "semver": "5.6.0",
+            "shebang-command": "1.2.0",
+            "which": "1.3.1"
           }
         },
         "execa": {
@@ -8611,13 +8611,13 @@
           "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
           "dev": true,
           "requires": {
-            "cross-spawn": "^6.0.0",
-            "get-stream": "^4.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
+            "cross-spawn": "6.0.5",
+            "get-stream": "4.1.0",
+            "is-stream": "1.1.0",
+            "npm-run-path": "2.0.2",
+            "p-finally": "1.0.0",
+            "signal-exit": "3.0.2",
+            "strip-eof": "1.0.0"
           }
         },
         "find-up": {
@@ -8626,7 +8626,7 @@
           "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "dev": true,
           "requires": {
-            "locate-path": "^3.0.0"
+            "locate-path": "3.0.0"
           }
         },
         "get-stdin": {
@@ -8641,7 +8641,7 @@
           "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
           "dev": true,
           "requires": {
-            "pump": "^3.0.0"
+            "pump": "3.0.0"
           }
         },
         "locate-path": {
@@ -8650,8 +8650,8 @@
           "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
           "dev": true,
           "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
+            "p-locate": "3.0.0",
+            "path-exists": "3.0.0"
           }
         },
         "p-limit": {
@@ -8660,7 +8660,7 @@
           "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==",
           "dev": true,
           "requires": {
-            "p-try": "^2.0.0"
+            "p-try": "2.0.0"
           }
         },
         "p-locate": {
@@ -8669,7 +8669,7 @@
           "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
           "dev": true,
           "requires": {
-            "p-limit": "^2.0.0"
+            "p-limit": "2.0.0"
           }
         },
         "p-try": {
@@ -8684,8 +8684,8 @@
           "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
           "dev": true,
           "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
+            "error-ex": "1.3.2",
+            "json-parse-better-errors": "1.0.2"
           }
         },
         "pkg-dir": {
@@ -8694,7 +8694,7 @@
           "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
           "dev": true,
           "requires": {
-            "find-up": "^3.0.0"
+            "find-up": "3.0.0"
           }
         },
         "pump": {
@@ -8703,8 +8703,8 @@
           "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
           "dev": true,
           "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
+            "end-of-stream": "1.4.1",
+            "once": "1.4.0"
           }
         },
         "read-pkg": {
@@ -8713,9 +8713,9 @@
           "integrity": "sha1-ljYlN48+HE1IyFhytabsfV0JMjc=",
           "dev": true,
           "requires": {
-            "normalize-package-data": "^2.3.2",
-            "parse-json": "^4.0.0",
-            "pify": "^3.0.0"
+            "normalize-package-data": "2.4.0",
+            "parse-json": "4.0.0",
+            "pify": "3.0.0"
           }
         },
         "slash": {
@@ -8732,7 +8732,7 @@
       "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
       "dev": true,
       "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
+        "safer-buffer": "2.1.2"
       }
     },
     "ieee754": {
@@ -8778,7 +8778,7 @@
       "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
       "dev": true,
       "requires": {
-        "import-from": "^2.1.0"
+        "import-from": "2.1.0"
       }
     },
     "import-fresh": {
@@ -8787,8 +8787,8 @@
       "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
       "dev": true,
       "requires": {
-        "caller-path": "^2.0.0",
-        "resolve-from": "^3.0.0"
+        "caller-path": "2.0.0",
+        "resolve-from": "3.0.0"
       }
     },
     "import-from": {
@@ -8797,7 +8797,7 @@
       "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
       "dev": true,
       "requires": {
-        "resolve-from": "^3.0.0"
+        "resolve-from": "3.0.0"
       }
     },
     "import-lazy": {
@@ -8812,8 +8812,8 @@
       "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
       "dev": true,
       "requires": {
-        "pkg-dir": "^3.0.0",
-        "resolve-cwd": "^2.0.0"
+        "pkg-dir": "3.0.0",
+        "resolve-cwd": "2.0.0"
       },
       "dependencies": {
         "find-up": {
@@ -8822,7 +8822,7 @@
           "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "dev": true,
           "requires": {
-            "locate-path": "^3.0.0"
+            "locate-path": "3.0.0"
           }
         },
         "locate-path": {
@@ -8831,8 +8831,8 @@
           "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
           "dev": true,
           "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
+            "p-locate": "3.0.0",
+            "path-exists": "3.0.0"
           }
         },
         "p-limit": {
@@ -8841,7 +8841,7 @@
           "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==",
           "dev": true,
           "requires": {
-            "p-try": "^2.0.0"
+            "p-try": "2.0.0"
           }
         },
         "p-locate": {
@@ -8850,7 +8850,7 @@
           "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
           "dev": true,
           "requires": {
-            "p-limit": "^2.0.0"
+            "p-limit": "2.0.0"
           }
         },
         "p-try": {
@@ -8865,7 +8865,7 @@
           "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
           "dev": true,
           "requires": {
-            "find-up": "^3.0.0"
+            "find-up": "3.0.0"
           }
         }
       }
@@ -8888,7 +8888,7 @@
       "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
       "dev": true,
       "requires": {
-        "repeating": "^2.0.0"
+        "repeating": "2.0.1"
       }
     },
     "indexes-of": {
@@ -8916,8 +8916,8 @@
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
       "dev": true,
       "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
+        "once": "1.4.0",
+        "wrappy": "1.0.2"
       }
     },
     "inherits": {
@@ -8943,19 +8943,19 @@
       "integrity": "sha1-4EqqnQW3o8ubD0B9BDdfBEcZA0c=",
       "dev": true,
       "requires": {
-        "ansi-escapes": "^1.1.0",
-        "chalk": "^1.0.0",
-        "cli-cursor": "^2.1.0",
-        "cli-width": "^2.0.0",
-        "external-editor": "^2.0.1",
-        "figures": "^2.0.0",
-        "lodash": "^4.3.0",
+        "ansi-escapes": "1.4.0",
+        "chalk": "1.1.3",
+        "cli-cursor": "2.1.0",
+        "cli-width": "2.2.0",
+        "external-editor": "2.2.0",
+        "figures": "2.0.0",
+        "lodash": "4.17.11",
         "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"
+        "run-async": "2.3.0",
+        "rx": "4.1.0",
+        "string-width": "2.1.1",
+        "strip-ansi": "3.0.1",
+        "through": "2.3.8"
       },
       "dependencies": {
         "ansi-regex": {
@@ -8976,11 +8976,11 @@
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "strip-ansi": {
@@ -8989,7 +8989,7 @@
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "2.1.1"
           }
         },
         "supports-color": {
@@ -9006,8 +9006,8 @@
       "integrity": "sha512-NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==",
       "dev": true,
       "requires": {
-        "default-gateway": "^2.6.0",
-        "ipaddr.js": "^1.5.2"
+        "default-gateway": "2.7.2",
+        "ipaddr.js": "1.8.0"
       }
     },
     "interpret": {
@@ -9022,7 +9022,7 @@
       "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
       "dev": true,
       "requires": {
-        "loose-envify": "^1.0.0"
+        "loose-envify": "1.4.0"
       }
     },
     "invert-kv": {
@@ -9054,7 +9054,7 @@
       "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
       "dev": true,
       "requires": {
-        "kind-of": "^3.0.2"
+        "kind-of": "3.2.2"
       },
       "dependencies": {
         "kind-of": {
@@ -9063,7 +9063,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -9086,8 +9086,8 @@
       "integrity": "sha512-pyfU/0kHdISIgslFfZN9nfY1Gk3MquQgUm1mJTjdkEPpkAKNWuBTSqFwewOpR7N351VkErCiyV71zX7mlQQqsg==",
       "dev": true,
       "requires": {
-        "is-alphabetical": "^1.0.0",
-        "is-decimal": "^1.0.0"
+        "is-alphabetical": "1.0.2",
+        "is-decimal": "1.0.2"
       }
     },
     "is-arrayish": {
@@ -9101,7 +9101,7 @@
       "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
       "dev": true,
       "requires": {
-        "binary-extensions": "^1.0.0"
+        "binary-extensions": "1.12.0"
       }
     },
     "is-buffer": {
@@ -9115,7 +9115,7 @@
       "resolved": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
       "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
       "requires": {
-        "builtin-modules": "^1.0.0"
+        "builtin-modules": "1.1.1"
       }
     },
     "is-callable": {
@@ -9129,7 +9129,7 @@
       "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
       "dev": true,
       "requires": {
-        "ci-info": "^1.5.0"
+        "ci-info": "1.6.0"
       }
     },
     "is-data-descriptor": {
@@ -9138,7 +9138,7 @@
       "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
       "dev": true,
       "requires": {
-        "kind-of": "^3.0.2"
+        "kind-of": "3.2.2"
       },
       "dependencies": {
         "kind-of": {
@@ -9147,7 +9147,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -9169,9 +9169,9 @@
       "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
       "dev": true,
       "requires": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+        "is-accessor-descriptor": "0.1.6",
+        "is-data-descriptor": "0.1.4",
+        "kind-of": "5.1.0"
       },
       "dependencies": {
         "kind-of": {
@@ -9199,7 +9199,7 @@
       "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
       "dev": true,
       "requires": {
-        "is-primitive": "^2.0.0"
+        "is-primitive": "2.0.0"
       }
     },
     "is-extendable": {
@@ -9220,7 +9220,7 @@
       "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
       "dev": true,
       "requires": {
-        "number-is-nan": "^1.0.0"
+        "number-is-nan": "1.0.1"
       }
     },
     "is-fullwidth-code-point": {
@@ -9234,7 +9234,7 @@
       "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
       "dev": true,
       "requires": {
-        "is-extglob": "^2.1.1"
+        "is-extglob": "2.1.1"
       }
     },
     "is-hexadecimal": {
@@ -9249,8 +9249,8 @@
       "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=",
       "dev": true,
       "requires": {
-        "global-dirs": "^0.1.0",
-        "is-path-inside": "^1.0.0"
+        "global-dirs": "0.1.1",
+        "is-path-inside": "1.0.1"
       }
     },
     "is-module": {
@@ -9273,11 +9273,11 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "generate-function": "^2.0.0",
-        "generate-object-property": "^1.1.0",
-        "is-my-ip-valid": "^1.0.0",
-        "jsonpointer": "^4.0.0",
-        "xtend": "^4.0.0"
+        "generate-function": "2.3.1",
+        "generate-object-property": "1.2.0",
+        "is-my-ip-valid": "1.0.0",
+        "jsonpointer": "4.0.1",
+        "xtend": "4.0.1"
       }
     },
     "is-npm": {
@@ -9292,7 +9292,7 @@
       "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
       "dev": true,
       "requires": {
-        "kind-of": "^3.0.2"
+        "kind-of": "3.2.2"
       },
       "dependencies": {
         "kind-of": {
@@ -9301,7 +9301,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -9312,7 +9312,7 @@
       "integrity": "sha512-6rZi3ezCyFcn5L71ywzz2bS5b2Igl1En3eTlZlvKjpz1n3IZLAYMbKYAIQgFmEu0GENg92ziU/faEOA/aixjbA==",
       "dev": true,
       "requires": {
-        "lodash.isfinite": "^3.3.2"
+        "lodash.isfinite": "3.3.2"
       }
     },
     "is-obj": {
@@ -9333,7 +9333,7 @@
       "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
       "dev": true,
       "requires": {
-        "is-path-inside": "^1.0.0"
+        "is-path-inside": "1.0.1"
       }
     },
     "is-path-inside": {
@@ -9342,7 +9342,7 @@
       "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
       "dev": true,
       "requires": {
-        "path-is-inside": "^1.0.1"
+        "path-is-inside": "1.0.2"
       }
     },
     "is-plain-obj": {
@@ -9357,7 +9357,7 @@
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
       "requires": {
-        "isobject": "^3.0.1"
+        "isobject": "3.0.1"
       }
     },
     "is-posix-bracket": {
@@ -9395,7 +9395,7 @@
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
       "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
       "requires": {
-        "has": "^1.0.1"
+        "has": "1.0.3"
       }
     },
     "is-regexp": {
@@ -9426,7 +9426,7 @@
       "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
       "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
       "requires": {
-        "has-symbols": "^1.0.0"
+        "has-symbols": "1.0.0"
       }
     },
     "is-typedarray": {
@@ -9475,7 +9475,7 @@
       "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
       "dev": true,
       "requires": {
-        "buffer-alloc": "^1.2.0"
+        "buffer-alloc": "1.2.0"
       }
     },
     "isexe": {
@@ -9501,20 +9501,20 @@
       "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
       "dev": true,
       "requires": {
-        "abbrev": "1.0.x",
-        "async": "1.x",
-        "escodegen": "1.8.x",
-        "esprima": "2.7.x",
-        "glob": "^5.0.15",
-        "handlebars": "^4.0.1",
-        "js-yaml": "3.x",
-        "mkdirp": "0.5.x",
-        "nopt": "3.x",
-        "once": "1.x",
-        "resolve": "1.1.x",
-        "supports-color": "^3.1.0",
-        "which": "^1.1.1",
-        "wordwrap": "^1.0.0"
+        "abbrev": "1.0.9",
+        "async": "1.5.2",
+        "escodegen": "1.8.1",
+        "esprima": "2.7.3",
+        "glob": "5.0.15",
+        "handlebars": "4.0.12",
+        "js-yaml": "3.12.0",
+        "mkdirp": "0.5.1",
+        "nopt": "3.0.6",
+        "once": "1.4.0",
+        "resolve": "1.1.7",
+        "supports-color": "3.2.3",
+        "which": "1.3.1",
+        "wordwrap": "1.0.0"
       },
       "dependencies": {
         "glob": {
@@ -9523,11 +9523,11 @@
           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
           "dev": true,
           "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
           }
         },
         "has-flag": {
@@ -9542,7 +9542,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "^1.0.0"
+            "has-flag": "1.0.0"
           }
         }
       }
@@ -9553,17 +9553,17 @@
       "integrity": "sha512-4/ApBnMVeEPG3EkSzcw25wDe4N66wxwn+KKn6b47vyek8Xb3NBAcg4xfuQbS7BqcZuTX4wxfD5lVagdggR3gyA==",
       "dev": true,
       "requires": {
-        "async": "^2.1.4",
-        "fileset": "^2.0.2",
-        "istanbul-lib-coverage": "^1.2.1",
-        "istanbul-lib-hook": "^1.2.2",
-        "istanbul-lib-instrument": "^1.10.2",
-        "istanbul-lib-report": "^1.1.5",
-        "istanbul-lib-source-maps": "^1.2.6",
-        "istanbul-reports": "^1.5.1",
-        "js-yaml": "^3.7.0",
-        "mkdirp": "^0.5.1",
-        "once": "^1.4.0"
+        "async": "2.6.1",
+        "fileset": "2.0.3",
+        "istanbul-lib-coverage": "1.2.1",
+        "istanbul-lib-hook": "1.2.2",
+        "istanbul-lib-instrument": "1.10.2",
+        "istanbul-lib-report": "1.1.5",
+        "istanbul-lib-source-maps": "1.2.6",
+        "istanbul-reports": "1.5.1",
+        "js-yaml": "3.12.0",
+        "mkdirp": "0.5.1",
+        "once": "1.4.0"
       },
       "dependencies": {
         "async": {
@@ -9572,7 +9572,7 @@
           "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
           "dev": true,
           "requires": {
-            "lodash": "^4.17.10"
+            "lodash": "4.17.11"
           }
         }
       }
@@ -9583,10 +9583,10 @@
       "integrity": "sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w==",
       "dev": true,
       "requires": {
-        "convert-source-map": "^1.5.0",
-        "istanbul-lib-instrument": "^1.7.3",
-        "loader-utils": "^1.1.0",
-        "schema-utils": "^0.3.0"
+        "convert-source-map": "1.6.0",
+        "istanbul-lib-instrument": "1.10.2",
+        "loader-utils": "1.1.0",
+        "schema-utils": "0.3.0"
       },
       "dependencies": {
         "ajv": {
@@ -9595,10 +9595,10 @@
           "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
           "dev": true,
           "requires": {
-            "co": "^4.6.0",
-            "fast-deep-equal": "^1.0.0",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.3.0"
+            "co": "4.6.0",
+            "fast-deep-equal": "1.1.0",
+            "fast-json-stable-stringify": "2.0.0",
+            "json-schema-traverse": "0.3.1"
           }
         },
         "fast-deep-equal": {
@@ -9619,7 +9619,7 @@
           "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
           "dev": true,
           "requires": {
-            "ajv": "^5.0.0"
+            "ajv": "5.5.2"
           }
         }
       }
@@ -9636,7 +9636,7 @@
       "integrity": "sha512-/Jmq7Y1VeHnZEQ3TL10VHyb564mn6VrQXHchON9Jf/AEcmQ3ZIiyD1BVzNOKTZf/G3gE+kiGK6SmpF9y3qGPLw==",
       "dev": true,
       "requires": {
-        "append-transform": "^0.4.0"
+        "append-transform": "0.4.0"
       }
     },
     "istanbul-lib-instrument": {
@@ -9645,13 +9645,13 @@
       "integrity": "sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==",
       "dev": true,
       "requires": {
-        "babel-generator": "^6.18.0",
-        "babel-template": "^6.16.0",
-        "babel-traverse": "^6.18.0",
-        "babel-types": "^6.18.0",
-        "babylon": "^6.18.0",
-        "istanbul-lib-coverage": "^1.2.1",
-        "semver": "^5.3.0"
+        "babel-generator": "6.26.1",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "istanbul-lib-coverage": "1.2.1",
+        "semver": "5.6.0"
       }
     },
     "istanbul-lib-report": {
@@ -9660,10 +9660,10 @@
       "integrity": "sha512-UsYfRMoi6QO/doUshYNqcKJqVmFe9w51GZz8BS3WB0lYxAllQYklka2wP9+dGZeHYaWIdcXUx8JGdbqaoXRXzw==",
       "dev": true,
       "requires": {
-        "istanbul-lib-coverage": "^1.2.1",
-        "mkdirp": "^0.5.1",
-        "path-parse": "^1.0.5",
-        "supports-color": "^3.1.2"
+        "istanbul-lib-coverage": "1.2.1",
+        "mkdirp": "0.5.1",
+        "path-parse": "1.0.6",
+        "supports-color": "3.2.3"
       },
       "dependencies": {
         "has-flag": {
@@ -9678,7 +9678,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "^1.0.0"
+            "has-flag": "1.0.0"
           }
         }
       }
@@ -9689,11 +9689,11 @@
       "integrity": "sha512-TtbsY5GIHgbMsMiRw35YBHGpZ1DVFEO19vxxeiDMYaeOFOCzfnYVxvl6pOUIZR4dtPhAGpSMup8OyF8ubsaqEg==",
       "dev": true,
       "requires": {
-        "debug": "^3.1.0",
-        "istanbul-lib-coverage": "^1.2.1",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.6.1",
-        "source-map": "^0.5.3"
+        "debug": "3.2.6",
+        "istanbul-lib-coverage": "1.2.1",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.2",
+        "source-map": "0.5.6"
       }
     },
     "istanbul-reports": {
@@ -9702,7 +9702,7 @@
       "integrity": "sha512-+cfoZ0UXzWjhAdzosCPP3AN8vvef8XDkWtTfgaN+7L3YTpNYITnCaEkceo5SEYy644VkHka/P1FvkWvrG/rrJw==",
       "dev": true,
       "requires": {
-        "handlebars": "^4.0.3"
+        "handlebars": "4.0.12"
       }
     },
     "jasmine": {
@@ -9711,9 +9711,9 @@
       "integrity": "sha1-awicChFXax8W3xG4AUbZHU6Lij4=",
       "dev": true,
       "requires": {
-        "exit": "^0.1.2",
-        "glob": "^7.0.6",
-        "jasmine-core": "~2.8.0"
+        "exit": "0.1.2",
+        "glob": "7.1.3",
+        "jasmine-core": "2.8.0"
       }
     },
     "jasmine-ajax": {
@@ -9734,7 +9734,7 @@
       "integrity": "sha1-k8zC3MQQKMXd1GBlWAdIOfLe6qg=",
       "dev": true,
       "requires": {
-        "diff": "^3.2.0"
+        "diff": "3.5.0"
       }
     },
     "jasmine-reporters": {
@@ -9743,8 +9743,8 @@
       "integrity": "sha512-u/7AT9SkuZsUfFBLLzbErohTGNsEUCKaQbsVYnLFW1gEuL2DzmBL4n8v90uZsqIqlWvWUgian8J6yOt5Fyk/+A==",
       "dev": true,
       "requires": {
-        "mkdirp": "^0.5.1",
-        "xmldom": "^0.1.22"
+        "mkdirp": "0.5.1",
+        "xmldom": "0.1.27"
       }
     },
     "jasmine-spec-reporter": {
@@ -9762,8 +9762,8 @@
       "integrity": "sha1-QdJ6+qSiWjNV0IIeMRPnZFX8Q7U=",
       "dev": true,
       "requires": {
-        "mkdirp": "^0.5.1",
-        "q": "^1.4.1"
+        "mkdirp": "0.5.1",
+        "q": "1.5.1"
       }
     },
     "jasminewd2": {
@@ -9784,10 +9784,10 @@
       "integrity": "sha512-qVNq7ZZ7ZbLdzorvSlRDadS0Rh5oyItaE95v6I4wbbuSiijxn7SnnsV6dvKlcXuO2jX7lK8tn9fBulx34K/Ejg==",
       "dev": true,
       "requires": {
-        "config-chain": "~1.1.5",
-        "editorconfig": "^0.15.0",
-        "mkdirp": "~0.5.0",
-        "nopt": "~4.0.1"
+        "config-chain": "1.1.12",
+        "editorconfig": "0.15.2",
+        "mkdirp": "0.5.1",
+        "nopt": "4.0.1"
       },
       "dependencies": {
         "nopt": {
@@ -9796,8 +9796,8 @@
           "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
           "dev": true,
           "requires": {
-            "abbrev": "1",
-            "osenv": "^0.1.4"
+            "abbrev": "1.0.9",
+            "osenv": "0.1.5"
           }
         }
       }
@@ -9813,8 +9813,8 @@
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
       "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
       "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
+        "argparse": "1.0.10",
+        "esprima": "4.0.1"
       },
       "dependencies": {
         "esprima": {
@@ -9846,7 +9846,7 @@
       "integrity": "sha1-5i7FJh0aal/CDoEqMgdAxtkAVnc=",
       "dev": true,
       "requires": {
-        "esprima": "^2.7.0"
+        "esprima": "2.7.3"
       }
     },
     "json-schema": {
@@ -9861,7 +9861,7 @@
       "integrity": "sha1-ukelsAcvxyOWRg4b1gtE1SF4u8Y=",
       "dev": true,
       "requires": {
-        "ajv": "^5.0.0"
+        "ajv": "5.5.2"
       },
       "dependencies": {
         "ajv": {
@@ -9870,10 +9870,10 @@
           "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
           "dev": true,
           "requires": {
-            "co": "^4.6.0",
-            "fast-deep-equal": "^1.0.0",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.3.0"
+            "co": "4.6.0",
+            "fast-deep-equal": "1.1.0",
+            "fast-json-stable-stringify": "2.0.0",
+            "json-schema-traverse": "0.3.1"
           }
         },
         "fast-deep-equal": {
@@ -9917,7 +9917,7 @@
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
       "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
       "requires": {
-        "graceful-fs": "^4.1.6"
+        "graceful-fs": "4.1.11"
       }
     },
     "jsonify": {
@@ -9950,11 +9950,11 @@
       "integrity": "sha512-5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ==",
       "dev": true,
       "requires": {
-        "core-js": "~2.3.0",
-        "es6-promise": "~3.0.2",
-        "lie": "~3.1.0",
-        "pako": "~1.0.2",
-        "readable-stream": "~2.0.6"
+        "core-js": "2.3.0",
+        "es6-promise": "3.0.2",
+        "lie": "3.1.1",
+        "pako": "1.0.6",
+        "readable-stream": "2.0.6"
       },
       "dependencies": {
         "core-js": {
@@ -9981,12 +9981,12 @@
           "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
           "dev": true,
           "requires": {
-            "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"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "string_decoder": "0.10.31",
+            "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
@@ -10003,31 +10003,31 @@
       "integrity": "sha512-rECezBeY7mjzGUWhFlB7CvPHgkHJLXyUmWg+6vHCEsdWNUTnmiS6jRrIMcJEWgU2DUGZzGWG0bTRVky8fsDTOA==",
       "dev": true,
       "requires": {
-        "bluebird": "^3.3.0",
-        "body-parser": "^1.16.1",
-        "chokidar": "^2.0.3",
-        "colors": "^1.1.0",
-        "combine-lists": "^1.0.0",
-        "connect": "^3.6.0",
-        "core-js": "^2.2.0",
-        "di": "^0.0.1",
-        "dom-serialize": "^2.2.0",
-        "expand-braces": "^0.1.1",
-        "glob": "^7.1.1",
-        "graceful-fs": "^4.1.2",
-        "http-proxy": "^1.13.0",
-        "isbinaryfile": "^3.0.0",
-        "lodash": "^4.17.4",
-        "log4js": "^2.5.3",
-        "mime": "^1.3.4",
-        "minimatch": "^3.0.2",
-        "optimist": "^0.6.1",
-        "qjobs": "^1.1.4",
-        "range-parser": "^1.2.0",
-        "rimraf": "^2.6.0",
-        "safe-buffer": "^5.0.1",
+        "bluebird": "3.5.2",
+        "body-parser": "1.18.3",
+        "chokidar": "2.0.4",
+        "colors": "1.1.2",
+        "combine-lists": "1.0.1",
+        "connect": "3.6.6",
+        "core-js": "2.5.7",
+        "di": "0.0.1",
+        "dom-serialize": "2.2.1",
+        "expand-braces": "0.1.2",
+        "glob": "7.1.3",
+        "graceful-fs": "4.1.11",
+        "http-proxy": "1.17.0",
+        "isbinaryfile": "3.0.3",
+        "lodash": "4.17.11",
+        "log4js": "2.11.0",
+        "mime": "1.6.0",
+        "minimatch": "3.0.4",
+        "optimist": "0.6.1",
+        "qjobs": "1.2.0",
+        "range-parser": "1.2.0",
+        "rimraf": "2.6.2",
+        "safe-buffer": "5.1.2",
         "socket.io": "2.0.4",
-        "source-map": "^0.6.1",
+        "source-map": "0.6.1",
         "tmp": "0.0.33",
         "useragent": "2.2.1"
       },
@@ -10044,7 +10044,7 @@
           "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
           "dev": true,
           "requires": {
-            "os-tmpdir": "~1.0.2"
+            "os-tmpdir": "1.0.2"
           }
         }
       }
@@ -10055,8 +10055,8 @@
       "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==",
       "dev": true,
       "requires": {
-        "fs-access": "^1.0.0",
-        "which": "^1.2.1"
+        "fs-access": "1.0.1",
+        "which": "1.3.1"
       }
     },
     "karma-cli": {
@@ -10065,7 +10065,7 @@
       "integrity": "sha1-rmw8WKMTodALRRZMRVubhs4X+WA=",
       "dev": true,
       "requires": {
-        "resolve": "^1.1.6"
+        "resolve": "1.1.7"
       }
     },
     "karma-coverage": {
@@ -10074,11 +10074,11 @@
       "integrity": "sha512-eQawj4Cl3z/CjxslYy9ariU4uDh7cCNFZHNWXWRpl0pNeblY/4wHR7M7boTYXWrn9bY0z2pZmr11eKje/S/hIw==",
       "dev": true,
       "requires": {
-        "dateformat": "^1.0.6",
-        "istanbul": "^0.4.0",
-        "lodash": "^4.17.0",
-        "minimatch": "^3.0.0",
-        "source-map": "^0.5.1"
+        "dateformat": "1.0.12",
+        "istanbul": "0.4.5",
+        "lodash": "4.17.11",
+        "minimatch": "3.0.4",
+        "source-map": "0.5.6"
       }
     },
     "karma-coverage-istanbul-reporter": {
@@ -10087,8 +10087,8 @@
       "integrity": "sha1-O13/RmT6W41RlrmInj9hwforgNk=",
       "dev": true,
       "requires": {
-        "istanbul-api": "^1.3.1",
-        "minimatch": "^3.0.4"
+        "istanbul-api": "1.3.7",
+        "minimatch": "3.0.4"
       }
     },
     "karma-jasmine": {
@@ -10103,7 +10103,7 @@
       "integrity": "sha1-eLuS2Jb+MqJaGACYxHci4dlgW/w=",
       "dev": true,
       "requires": {
-        "jasmine-ajax": "^3.0.0"
+        "jasmine-ajax": "3.2.0"
       }
     },
     "karma-jasmine-html-reporter": {
@@ -10112,7 +10112,7 @@
       "integrity": "sha1-SKjl7xiAdhfuK14zwRlMNbQ5Ukw=",
       "dev": true,
       "requires": {
-        "karma-jasmine": "^1.0.2"
+        "karma-jasmine": "1.1.2"
       }
     },
     "karma-mocha-reporter": {
@@ -10121,9 +10121,9 @@
       "integrity": "sha1-FRIAlejtgZGG5HoLAS8810GJVWA=",
       "dev": true,
       "requires": {
-        "chalk": "^2.1.0",
-        "log-symbols": "^2.1.0",
-        "strip-ansi": "^4.0.0"
+        "chalk": "2.4.1",
+        "log-symbols": "2.2.0",
+        "strip-ansi": "4.0.0"
       }
     },
     "karma-remap-istanbul": {
@@ -10132,8 +10132,8 @@
       "integrity": "sha1-l/O3cAZSVPm0ck8tm+SjouG69vw=",
       "dev": true,
       "requires": {
-        "istanbul": "^0.4.3",
-        "remap-istanbul": "^0.9.0"
+        "istanbul": "0.4.5",
+        "remap-istanbul": "0.9.6"
       },
       "dependencies": {
         "process-nextick-args": {
@@ -10148,12 +10148,12 @@
           "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
           "dev": true,
           "requires": {
-            "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"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "string_decoder": "0.10.31",
+            "util-deprecate": "1.0.2"
           }
         },
         "remap-istanbul": {
@@ -10162,11 +10162,11 @@
           "integrity": "sha512-l0WDBsVjaTzP8m3glERJO6bjlAFUahcgfcgvcX+owZw7dKeDLT3CVRpS7UO4L9LfGcMiNsqk223HopwVxlh8Hg==",
           "dev": true,
           "requires": {
-            "amdefine": "^1.0.0",
+            "amdefine": "1.0.1",
             "gulp-util": "3.0.7",
             "istanbul": "0.4.5",
-            "minimatch": "^3.0.3",
-            "source-map": "^0.6.1",
+            "minimatch": "3.0.4",
+            "source-map": "0.6.1",
             "through2": "2.0.1"
           }
         },
@@ -10188,8 +10188,8 @@
           "integrity": "sha1-OE51MU1J8y3hLuu4E2uOtrXVnak=",
           "dev": true,
           "requires": {
-            "readable-stream": "~2.0.0",
-            "xtend": "~4.0.0"
+            "readable-stream": "2.0.6",
+            "xtend": "4.0.1"
           }
         }
       }
@@ -10200,7 +10200,7 @@
       "integrity": "sha512-HcPqdAusNez/ywa+biN4EphGz62MmQyPggUsDfsHqa7tSe4jdsxgvTKuDfIazjL+IOxpVWyT7Pr4dhAV+sxX5Q==",
       "dev": true,
       "requires": {
-        "source-map-support": "^0.5.5"
+        "source-map-support": "0.5.9"
       }
     },
     "karma-systemjs": {
@@ -10209,8 +10209,8 @@
       "integrity": "sha1-/iyB+vpkm8j9DuyMxba9dRXB8V0=",
       "dev": true,
       "requires": {
-        "lodash": "^4.16.2",
-        "minimatch": "^3.0.0"
+        "lodash": "4.17.11",
+        "minimatch": "3.0.4"
       }
     },
     "killable": {
@@ -10231,7 +10231,7 @@
       "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.9"
+        "graceful-fs": "4.1.11"
       }
     },
     "known-css-properties": {
@@ -10246,7 +10246,7 @@
       "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=",
       "dev": true,
       "requires": {
-        "package-json": "^4.0.0"
+        "package-json": "4.0.1"
       }
     },
     "lazy-cache": {
@@ -10255,7 +10255,7 @@
       "integrity": "sha1-uRkKT5EzVGlIQIWfio9whNiCImQ=",
       "dev": true,
       "requires": {
-        "set-getter": "^0.1.0"
+        "set-getter": "0.1.0"
       }
     },
     "lazystream": {
@@ -10264,7 +10264,7 @@
       "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
       "dev": true,
       "requires": {
-        "readable-stream": "^2.0.5"
+        "readable-stream": "2.3.6"
       }
     },
     "lcid": {
@@ -10272,7 +10272,7 @@
       "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
       "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
       "requires": {
-        "invert-kv": "^1.0.0"
+        "invert-kv": "1.0.0"
       }
     },
     "less": {
@@ -10281,15 +10281,15 @@
       "integrity": "sha512-8HFGuWmL3FhQR0aH89escFNBQH/nEiYPP2ltDFdQw2chE28Yx2E3lhAIq9Y2saYwLSwa699s4dBVEfCY8Drf7Q==",
       "dev": true,
       "requires": {
-        "clone": "^2.1.2",
-        "errno": "^0.1.1",
-        "graceful-fs": "^4.1.2",
-        "image-size": "~0.5.0",
-        "mime": "^1.4.1",
-        "mkdirp": "^0.5.0",
-        "promise": "^7.1.1",
-        "request": "^2.83.0",
-        "source-map": "~0.6.0"
+        "clone": "2.1.2",
+        "errno": "0.1.7",
+        "graceful-fs": "4.1.11",
+        "image-size": "0.5.5",
+        "mime": "1.6.0",
+        "mkdirp": "0.5.1",
+        "promise": "7.3.1",
+        "request": "2.88.0",
+        "source-map": "0.6.1"
       },
       "dependencies": {
         "source-map": {
@@ -10307,9 +10307,9 @@
       "integrity": "sha512-KNTsgCE9tMOM70+ddxp9yyt9iHqgmSs0yTZc5XH5Wo+g80RWRIYNqE58QJKm/yMud5wZEvz50ugRDuzVIkyahg==",
       "dev": true,
       "requires": {
-        "clone": "^2.1.1",
-        "loader-utils": "^1.1.0",
-        "pify": "^3.0.0"
+        "clone": "2.1.2",
+        "loader-utils": "1.1.0",
+        "pify": "3.0.0"
       }
     },
     "leven": {
@@ -10324,8 +10324,8 @@
       "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
       "dev": true,
       "requires": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
+        "prelude-ls": "1.1.2",
+        "type-check": "0.3.2"
       }
     },
     "libbase64": {
@@ -10365,7 +10365,7 @@
       "integrity": "sha512-Of/H79rZqm2aeg4RnP9SMSh19qkKemoLT5VaJV58uH5AxeYWEcBgGFs753JEJ/Hm6BPvQVfIlrrjoBwYj8p7Tw==",
       "dev": true,
       "requires": {
-        "ejs": "^2.5.7"
+        "ejs": "2.6.1"
       }
     },
     "lie": {
@@ -10374,7 +10374,7 @@
       "integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=",
       "dev": true,
       "requires": {
-        "immediate": "~3.0.5"
+        "immediate": "3.0.6"
       }
     },
     "limiter": {
@@ -10389,7 +10389,7 @@
       "integrity": "sha1-2UpGSPmxwXnWT6lykSaL22zpQ08=",
       "dev": true,
       "requires": {
-        "uc.micro": "^1.0.1"
+        "uc.micro": "1.0.5"
       }
     },
     "list-item": {
@@ -10398,10 +10398,10 @@
       "integrity": "sha1-DGXQDih8tmPMs8s4Sad+iewmilY=",
       "dev": true,
       "requires": {
-        "expand-range": "^1.8.1",
-        "extend-shallow": "^2.0.1",
-        "is-number": "^2.1.0",
-        "repeat-string": "^1.5.2"
+        "expand-range": "1.8.2",
+        "extend-shallow": "2.0.1",
+        "is-number": "2.1.0",
+        "repeat-string": "1.6.1"
       },
       "dependencies": {
         "extend-shallow": {
@@ -10410,7 +10410,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         },
         "is-number": {
@@ -10419,7 +10419,7 @@
           "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "kind-of": "3.2.2"
           }
         },
         "kind-of": {
@@ -10428,7 +10428,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -10439,10 +10439,10 @@
       "integrity": "sha512-Vo06tHpXrqm37i6T7tVdq5PSbrFmvQRw64+dlFXdh1tltv6KCvpE+xzXz2+x6KWJ8ja+GgwSy4P13GUWyhaDHQ==",
       "dev": true,
       "requires": {
-        "browser-sync": "^2.24.4",
-        "connect-history-api-fallback": "^1.2.0",
+        "browser-sync": "2.26.3",
+        "connect-history-api-fallback": "1.5.0",
         "connect-logger": "0.0.1",
-        "lodash": "^4.11.1",
+        "lodash": "4.17.11",
         "minimist": "1.2.0"
       },
       "dependencies": {
@@ -10460,11 +10460,11 @@
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
+        "graceful-fs": "4.1.11",
+        "parse-json": "2.2.0",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1",
+        "strip-bom": "2.0.0"
       },
       "dependencies": {
         "pify": {
@@ -10486,9 +10486,9 @@
       "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
       "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
       "requires": {
-        "big.js": "^3.1.3",
-        "emojis-list": "^2.0.0",
-        "json5": "^0.5.0"
+        "big.js": "3.2.0",
+        "emojis-list": "2.1.0",
+        "json5": "0.5.1"
       }
     },
     "localtunnel": {
@@ -10515,8 +10515,8 @@
           "integrity": "sha1-LY4+XQvb1zJ/kbyBT1xXZg+Bgk0=",
           "dev": true,
           "requires": {
-            "follow-redirects": "^1.2.5",
-            "is-buffer": "^1.1.5"
+            "follow-redirects": "1.5.9",
+            "is-buffer": "1.1.6"
           }
         },
         "camelcase": {
@@ -10531,9 +10531,9 @@
           "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
           "dev": true,
           "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wrap-ansi": "^2.0.0"
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wrap-ansi": "2.1.0"
           }
         },
         "debug": {
@@ -10551,7 +10551,7 @@
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
           "requires": {
-            "number-is-nan": "^1.0.0"
+            "number-is-nan": "1.0.1"
           }
         },
         "ms": {
@@ -10566,7 +10566,7 @@
           "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
           "dev": true,
           "requires": {
-            "lcid": "^1.0.0"
+            "lcid": "1.0.0"
           }
         },
         "string-width": {
@@ -10575,9 +10575,9 @@
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
           "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
           }
         },
         "strip-ansi": {
@@ -10586,7 +10586,7 @@
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "2.1.1"
           }
         },
         "which-module": {
@@ -10601,19 +10601,19 @@
           "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=",
           "dev": true,
           "requires": {
-            "camelcase": "^3.0.0",
-            "cliui": "^3.2.0",
-            "decamelize": "^1.1.1",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^1.4.0",
-            "read-pkg-up": "^1.0.1",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^1.0.2",
-            "which-module": "^1.0.0",
-            "y18n": "^3.2.1",
-            "yargs-parser": "^4.2.0"
+            "camelcase": "3.0.0",
+            "cliui": "3.2.0",
+            "decamelize": "1.2.0",
+            "get-caller-file": "1.0.3",
+            "os-locale": "1.4.0",
+            "read-pkg-up": "1.0.1",
+            "require-directory": "2.1.1",
+            "require-main-filename": "1.0.1",
+            "set-blocking": "2.0.0",
+            "string-width": "1.0.2",
+            "which-module": "1.0.0",
+            "y18n": "3.2.1",
+            "yargs-parser": "4.2.1"
           }
         },
         "yargs-parser": {
@@ -10622,7 +10622,7 @@
           "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=",
           "dev": true,
           "requires": {
-            "camelcase": "^3.0.0"
+            "camelcase": "3.0.0"
           }
         }
       }
@@ -10632,8 +10632,8 @@
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
       "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
       "requires": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
+        "p-locate": "2.0.0",
+        "path-exists": "3.0.0"
       }
     },
     "lodash": {
@@ -10737,7 +10737,7 @@
       "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
       "dev": true,
       "requires": {
-        "lodash._root": "^3.0.0"
+        "lodash._root": "3.0.1"
       }
     },
     "lodash.flatten": {
@@ -10776,9 +10776,9 @@
       "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
       "dev": true,
       "requires": {
-        "lodash._getnative": "^3.0.0",
-        "lodash.isarguments": "^3.0.0",
-        "lodash.isarray": "^3.0.0"
+        "lodash._getnative": "3.9.1",
+        "lodash.isarguments": "3.1.0",
+        "lodash.isarray": "3.0.4"
       }
     },
     "lodash.mergewith": {
@@ -10805,15 +10805,15 @@
       "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
       "dev": true,
       "requires": {
-        "lodash._basecopy": "^3.0.0",
-        "lodash._basetostring": "^3.0.0",
-        "lodash._basevalues": "^3.0.0",
-        "lodash._isiterateecall": "^3.0.0",
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.escape": "^3.0.0",
-        "lodash.keys": "^3.0.0",
-        "lodash.restparam": "^3.0.0",
-        "lodash.templatesettings": "^3.0.0"
+        "lodash._basecopy": "3.0.1",
+        "lodash._basetostring": "3.0.1",
+        "lodash._basevalues": "3.0.0",
+        "lodash._isiterateecall": "3.0.9",
+        "lodash._reinterpolate": "3.0.0",
+        "lodash.escape": "3.2.0",
+        "lodash.keys": "3.1.2",
+        "lodash.restparam": "3.6.1",
+        "lodash.templatesettings": "3.1.1"
       }
     },
     "lodash.templatesettings": {
@@ -10822,8 +10822,8 @@
       "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
       "dev": true,
       "requires": {
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.escape": "^3.0.0"
+        "lodash._reinterpolate": "3.0.0",
+        "lodash.escape": "3.2.0"
       }
     },
     "lodash.toarray": {
@@ -10844,7 +10844,7 @@
       "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
       "dev": true,
       "requires": {
-        "chalk": "^2.0.1"
+        "chalk": "2.4.1"
       }
     },
     "log4js": {
@@ -10853,18 +10853,18 @@
       "integrity": "sha512-z1XdwyGFg8/WGkOyF6DPJjivCWNLKrklGdViywdYnSKOvgtEBo2UyEMZS5sD2mZrQlU3TvO8wDWLc8mzE1ncBQ==",
       "dev": true,
       "requires": {
-        "amqplib": "^0.5.2",
-        "axios": "^0.15.3",
-        "circular-json": "^0.5.4",
-        "date-format": "^1.2.0",
-        "debug": "^3.1.0",
-        "hipchat-notifier": "^1.1.0",
-        "loggly": "^1.1.0",
-        "mailgun-js": "^0.18.0",
-        "nodemailer": "^2.5.0",
-        "redis": "^2.7.1",
-        "semver": "^5.5.0",
-        "slack-node": "~0.2.0",
+        "amqplib": "0.5.2",
+        "axios": "0.15.3",
+        "circular-json": "0.5.9",
+        "date-format": "1.2.0",
+        "debug": "3.2.6",
+        "hipchat-notifier": "1.1.0",
+        "loggly": "1.1.1",
+        "mailgun-js": "0.18.1",
+        "nodemailer": "2.7.2",
+        "redis": "2.8.0",
+        "semver": "5.6.0",
+        "slack-node": "0.2.0",
         "streamroller": "0.7.0"
       },
       "dependencies": {
@@ -10885,7 +10885,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "debug": "^2.2.0"
+            "debug": "2.6.9"
           },
           "dependencies": {
             "debug": {
@@ -10916,9 +10916,9 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "json-stringify-safe": "5.0.x",
-        "request": "2.75.x",
-        "timespan": "2.3.x"
+        "json-stringify-safe": "5.0.1",
+        "request": "2.75.0",
+        "timespan": "2.3.0"
       },
       "dependencies": {
         "ansi-regex": {
@@ -10956,7 +10956,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "readable-stream": "~2.0.5"
+            "readable-stream": "2.0.6"
           }
         },
         "caseless": {
@@ -10973,11 +10973,11 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "form-data": {
@@ -10987,9 +10987,9 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "^1.0.5",
-            "mime-types": "^2.1.11"
+            "asynckit": "0.4.0",
+            "combined-stream": "1.0.7",
+            "mime-types": "2.1.21"
           }
         },
         "har-validator": {
@@ -10999,10 +10999,10 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "chalk": "^1.1.1",
-            "commander": "^2.9.0",
-            "is-my-json-valid": "^2.12.4",
-            "pinkie-promise": "^2.0.0"
+            "chalk": "1.1.3",
+            "commander": "2.19.0",
+            "is-my-json-valid": "2.19.0",
+            "pinkie-promise": "2.0.1"
           }
         },
         "http-signature": {
@@ -11012,9 +11012,9 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "assert-plus": "^0.2.0",
-            "jsprim": "^1.2.2",
-            "sshpk": "^1.7.0"
+            "assert-plus": "0.2.0",
+            "jsprim": "1.4.1",
+            "sshpk": "1.15.1"
           }
         },
         "node-uuid": {
@@ -11059,12 +11059,12 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "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"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "string_decoder": "0.10.31",
+            "util-deprecate": "1.0.2"
           }
         },
         "request": {
@@ -11074,27 +11074,27 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "aws-sign2": "~0.6.0",
-            "aws4": "^1.2.1",
-            "bl": "~1.1.2",
-            "caseless": "~0.11.0",
-            "combined-stream": "~1.0.5",
-            "extend": "~3.0.0",
-            "forever-agent": "~0.6.1",
-            "form-data": "~2.0.0",
-            "har-validator": "~2.0.6",
-            "hawk": "~3.1.3",
-            "http-signature": "~1.1.0",
-            "is-typedarray": "~1.0.0",
-            "isstream": "~0.1.2",
-            "json-stringify-safe": "~5.0.1",
-            "mime-types": "~2.1.7",
-            "node-uuid": "~1.4.7",
-            "oauth-sign": "~0.8.1",
-            "qs": "~6.2.0",
-            "stringstream": "~0.0.4",
-            "tough-cookie": "~2.3.0",
-            "tunnel-agent": "~0.4.1"
+            "aws-sign2": "0.6.0",
+            "aws4": "1.8.0",
+            "bl": "1.1.2",
+            "caseless": "0.11.0",
+            "combined-stream": "1.0.7",
+            "extend": "3.0.2",
+            "forever-agent": "0.6.1",
+            "form-data": "2.0.0",
+            "har-validator": "2.0.6",
+            "hawk": "3.1.3",
+            "http-signature": "1.1.1",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.21",
+            "node-uuid": "1.4.8",
+            "oauth-sign": "0.8.2",
+            "qs": "6.2.3",
+            "stringstream": "0.0.6",
+            "tough-cookie": "2.3.4",
+            "tunnel-agent": "0.4.3"
           }
         },
         "string_decoder": {
@@ -11111,7 +11111,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "2.1.1"
           }
         },
         "supports-color": {
@@ -11128,7 +11128,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "punycode": "^1.4.1"
+            "punycode": "1.4.1"
           }
         },
         "tunnel-agent": {
@@ -11164,7 +11164,7 @@
       "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
       "dev": true,
       "requires": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
+        "js-tokens": "3.0.2"
       }
     },
     "loud-rejection": {
@@ -11173,8 +11173,8 @@
       "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
       "dev": true,
       "requires": {
-        "currently-unhandled": "^0.4.1",
-        "signal-exit": "^3.0.0"
+        "currently-unhandled": "0.4.1",
+        "signal-exit": "3.0.2"
       }
     },
     "lower-case": {
@@ -11194,8 +11194,8 @@
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
       "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
       "requires": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
+        "pseudomap": "1.0.2",
+        "yallist": "2.1.2"
       }
     },
     "magic-string": {
@@ -11204,7 +11204,7 @@
       "integrity": "sha512-sCuTz6pYom8Rlt4ISPFn6wuFodbKMIHUMv4Qko9P17dpxb7s52KJTmRuZZqHdGmLCK9AOcDare039nRIcfdkEg==",
       "dev": true,
       "requires": {
-        "sourcemap-codec": "^1.4.1"
+        "sourcemap-codec": "1.4.3"
       }
     },
     "mailcomposer": {
@@ -11225,15 +11225,15 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "async": "~2.6.0",
-        "debug": "~3.1.0",
-        "form-data": "~2.3.0",
-        "inflection": "~1.12.0",
-        "is-stream": "^1.1.0",
-        "path-proxy": "~1.0.0",
-        "promisify-call": "^2.0.2",
-        "proxy-agent": "~3.0.0",
-        "tsscmp": "~1.0.0"
+        "async": "2.6.1",
+        "debug": "3.1.0",
+        "form-data": "2.3.3",
+        "inflection": "1.12.0",
+        "is-stream": "1.1.0",
+        "path-proxy": "1.0.0",
+        "promisify-call": "2.0.4",
+        "proxy-agent": "3.0.3",
+        "tsscmp": "1.0.6"
       },
       "dependencies": {
         "async": {
@@ -11243,7 +11243,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "lodash": "^4.17.10"
+            "lodash": "4.17.11"
           }
         },
         "debug": {
@@ -11271,7 +11271,7 @@
       "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
       "dev": true,
       "requires": {
-        "pify": "^3.0.0"
+        "pify": "3.0.0"
       }
     },
     "make-error": {
@@ -11286,7 +11286,7 @@
       "integrity": "sha512-UN1dNocxQq44IhJyMI4TU8phc2m9BddacHRPRjKGLYaF0jqd3xLz0jS0skpAU9WgYyoR4gHtUpzytNBS385FWQ==",
       "dev": true,
       "requires": {
-        "p-defer": "^1.0.0"
+        "p-defer": "1.0.0"
       }
     },
     "map-cache": {
@@ -11312,7 +11312,7 @@
       "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
       "dev": true,
       "requires": {
-        "object-visit": "^1.0.0"
+        "object-visit": "1.0.1"
       }
     },
     "markdown-escapes": {
@@ -11327,11 +11327,11 @@
       "integrity": "sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==",
       "dev": true,
       "requires": {
-        "argparse": "^1.0.7",
-        "entities": "~1.1.1",
-        "linkify-it": "^2.0.0",
-        "mdurl": "^1.0.1",
-        "uc.micro": "^1.0.5"
+        "argparse": "1.0.10",
+        "entities": "1.1.2",
+        "linkify-it": "2.0.3",
+        "mdurl": "1.0.1",
+        "uc.micro": "1.0.5"
       }
     },
     "markdown-link": {
@@ -11352,18 +11352,18 @@
       "integrity": "sha1-GORyN9iVSelEcSHmniyoU8otdSo=",
       "dev": true,
       "requires": {
-        "concat-stream": "^1.5.2",
-        "diacritics-map": "^0.1.0",
-        "gray-matter": "^2.1.0",
-        "lazy-cache": "^2.0.2",
-        "list-item": "^1.1.1",
-        "markdown-link": "^0.1.1",
-        "minimist": "^1.2.0",
-        "mixin-deep": "^1.1.3",
-        "object.pick": "^1.2.0",
-        "remarkable": "^1.7.1",
-        "repeat-string": "^1.6.1",
-        "strip-color": "^0.1.0"
+        "concat-stream": "1.6.2",
+        "diacritics-map": "0.1.0",
+        "gray-matter": "2.1.1",
+        "lazy-cache": "2.0.2",
+        "list-item": "1.1.1",
+        "markdown-link": "0.1.1",
+        "minimist": "1.2.0",
+        "mixin-deep": "1.3.1",
+        "object.pick": "1.3.0",
+        "remarkable": "1.7.1",
+        "repeat-string": "1.6.1",
+        "strip-color": "0.1.0"
       },
       "dependencies": {
         "minimist": {
@@ -11389,15 +11389,15 @@
       "integrity": "sha512-qufCBqpR+uRj9jY+Q4IrrBFf1Z5rISzn/aN6M4MQaci309B5xdoUye2AEoqkfddmFVpgH+s0q9FMdOFw7SDWrA==",
       "dev": true,
       "requires": {
-        "commander": "~2.9.0",
-        "deep-extend": "~0.5.1",
-        "get-stdin": "~5.0.1",
-        "glob": "~7.0.3",
-        "js-yaml": "~3.11.0",
-        "lodash.differencewith": "~4.5.0",
-        "lodash.flatten": "~4.4.0",
-        "markdownlint": "~0.11.0",
-        "rc": "~1.2.7"
+        "commander": "2.9.0",
+        "deep-extend": "0.5.1",
+        "get-stdin": "5.0.1",
+        "glob": "7.0.6",
+        "js-yaml": "3.11.0",
+        "lodash.differencewith": "4.5.0",
+        "lodash.flatten": "4.4.0",
+        "markdownlint": "0.11.0",
+        "rc": "1.2.8"
       },
       "dependencies": {
         "commander": {
@@ -11406,7 +11406,7 @@
           "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
           "dev": true,
           "requires": {
-            "graceful-readlink": ">= 1.0.0"
+            "graceful-readlink": "1.0.1"
           }
         },
         "esprima": {
@@ -11427,12 +11427,12 @@
           "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
           "dev": true,
           "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.2",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
           }
         },
         "js-yaml": {
@@ -11441,8 +11441,8 @@
           "integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==",
           "dev": true,
           "requires": {
-            "argparse": "^1.0.7",
-            "esprima": "^4.0.0"
+            "argparse": "1.0.10",
+            "esprima": "4.0.1"
           }
         }
       }
@@ -11471,9 +11471,9 @@
       "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
       "dev": true,
       "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
+        "hash-base": "3.0.4",
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
       }
     },
     "mdast-comment-marker": {
@@ -11488,7 +11488,7 @@
       "integrity": "sha512-d2WS98JSDVbpSsBfVvD9TaDMlqPRz7ohM/11G0rp5jOBb5q96RJ6YLszQ/09AAixyzh23FeIpCGqfaamEADtWg==",
       "dev": true,
       "requires": {
-        "unist-util-visit": "^1.1.0"
+        "unist-util-visit": "1.4.0"
       }
     },
     "mdast-util-heading-range": {
@@ -11497,7 +11497,7 @@
       "integrity": "sha1-0Pq3tCYbyg2Al8rebSChcpLrTDQ=",
       "dev": true,
       "requires": {
-        "mdast-util-to-string": "^1.0.0"
+        "mdast-util-to-string": "1.0.5"
       }
     },
     "mdast-util-to-string": {
@@ -11512,9 +11512,9 @@
       "integrity": "sha512-ove/QQWSrYOrf9G3xn2MTAjy7PKCtCmm261wpQwecoPAsUtkihkMVczxFqil7VihxgSz4ID9c8bBTsyXR30gQg==",
       "dev": true,
       "requires": {
-        "github-slugger": "^1.1.1",
-        "mdast-util-to-string": "^1.0.2",
-        "unist-util-visit": "^1.1.0"
+        "github-slugger": "1.2.0",
+        "mdast-util-to-string": "1.0.5",
+        "unist-util-visit": "1.4.0"
       }
     },
     "mdast-zone": {
@@ -11523,8 +11523,8 @@
       "integrity": "sha512-CuzjJ5SJUmJbynHZWKZ4Z8b+1t5Uq6G6SHlm8N/htBZfJi9kE1hk+6CulPXXWVhSjTeJ9URhrH1SGaktq5uF6g==",
       "dev": true,
       "requires": {
-        "mdast-comment-marker": "^1.0.1",
-        "unist-util-visit": "^1.0.0"
+        "mdast-comment-marker": "1.0.3",
+        "unist-util-visit": "1.4.0"
       }
     },
     "mdurl": {
@@ -11544,7 +11544,7 @@
       "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
       "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
       "requires": {
-        "mimic-fn": "^1.0.0"
+        "mimic-fn": "1.2.0"
       }
     },
     "memory-fs": {
@@ -11553,8 +11553,8 @@
       "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
       "dev": true,
       "requires": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
+        "errno": "0.1.7",
+        "readable-stream": "2.3.6"
       }
     },
     "memorystream": {
@@ -11568,16 +11568,16 @@
       "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
       "dev": true,
       "requires": {
-        "camelcase-keys": "^2.0.0",
-        "decamelize": "^1.1.2",
-        "loud-rejection": "^1.0.0",
-        "map-obj": "^1.0.1",
-        "minimist": "^1.1.3",
-        "normalize-package-data": "^2.3.4",
-        "object-assign": "^4.0.1",
-        "read-pkg-up": "^1.0.1",
-        "redent": "^1.0.0",
-        "trim-newlines": "^1.0.0"
+        "camelcase-keys": "2.1.0",
+        "decamelize": "1.2.0",
+        "loud-rejection": "1.6.0",
+        "map-obj": "1.0.1",
+        "minimist": "1.2.0",
+        "normalize-package-data": "2.4.0",
+        "object-assign": "4.1.1",
+        "read-pkg-up": "1.0.1",
+        "redent": "1.0.0",
+        "trim-newlines": "1.0.0"
       },
       "dependencies": {
         "minimist": {
@@ -11600,7 +11600,7 @@
       "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
       "dev": true,
       "requires": {
-        "readable-stream": "^2.0.1"
+        "readable-stream": "2.3.6"
       }
     },
     "merge2": {
@@ -11620,19 +11620,19 @@
       "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
       "dev": true,
       "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
+        "arr-diff": "4.0.0",
+        "array-unique": "0.3.2",
+        "braces": "2.3.2",
+        "define-property": "2.0.2",
+        "extend-shallow": "3.0.2",
+        "extglob": "2.0.4",
+        "fragment-cache": "0.2.1",
+        "kind-of": "6.0.2",
+        "nanomatch": "1.2.13",
+        "object.pick": "1.3.0",
+        "regex-not": "1.0.2",
+        "snapdragon": "0.8.2",
+        "to-regex": "3.0.2"
       }
     },
     "miller-rabin": {
@@ -11641,8 +11641,8 @@
       "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
+        "bn.js": "4.11.8",
+        "brorand": "1.1.0"
       }
     },
     "mime": {
@@ -11660,7 +11660,7 @@
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz",
       "integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==",
       "requires": {
-        "mime-db": "~1.37.0"
+        "mime-db": "1.37.0"
       }
     },
     "mimic-fn": {
@@ -11674,9 +11674,9 @@
       "integrity": "sha512-o+Jm+ocb0asEngdM6FsZWtZsRzA8koFUudIDwYUfl94M3PejPHG7Vopw5hN9V8WsMkSFpm3tZP3Fesz89EyrfQ==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0",
-        "schema-utils": "^1.0.0",
-        "webpack-sources": "^1.1.0"
+        "loader-utils": "1.1.0",
+        "schema-utils": "1.0.0",
+        "webpack-sources": "1.3.0"
       },
       "dependencies": {
         "schema-utils": {
@@ -11685,9 +11685,9 @@
           "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
           "dev": true,
           "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
+            "ajv": "6.5.4",
+            "ajv-errors": "1.0.0",
+            "ajv-keywords": "3.2.0"
           }
         }
       }
@@ -11709,7 +11709,7 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
       "requires": {
-        "brace-expansion": "^1.1.7"
+        "brace-expansion": "1.1.11"
       }
     },
     "minimatch-browser": {
@@ -11717,7 +11717,7 @@
       "resolved": "https://registry.npmjs.org/minimatch-browser/-/minimatch-browser-1.0.0.tgz",
       "integrity": "sha512-xET0irkHzT47f9h16H6ZVZw9lFZ33pK5DD5Pt0Gt/PcXAlevXjCz8zzM859gIWEDcD2yjKa31dGfwlKgk/12NQ==",
       "requires": {
-        "brace-expansion": "^1.1.7"
+        "brace-expansion": "1.1.11"
       }
     },
     "minimist": {
@@ -11731,8 +11731,8 @@
       "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==",
       "dev": true,
       "requires": {
-        "arrify": "^1.0.1",
-        "is-plain-obj": "^1.1.0"
+        "arrify": "1.0.1",
+        "is-plain-obj": "1.1.0"
       }
     },
     "mississippi": {
@@ -11741,16 +11741,16 @@
       "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==",
       "dev": true,
       "requires": {
-        "concat-stream": "^1.5.0",
-        "duplexify": "^3.4.2",
-        "end-of-stream": "^1.1.0",
-        "flush-write-stream": "^1.0.0",
-        "from2": "^2.1.0",
-        "parallel-transform": "^1.1.0",
-        "pump": "^2.0.1",
-        "pumpify": "^1.3.3",
-        "stream-each": "^1.1.0",
-        "through2": "^2.0.0"
+        "concat-stream": "1.6.2",
+        "duplexify": "3.6.1",
+        "end-of-stream": "1.4.1",
+        "flush-write-stream": "1.0.3",
+        "from2": "2.3.0",
+        "parallel-transform": "1.1.0",
+        "pump": "2.0.1",
+        "pumpify": "1.5.1",
+        "stream-each": "1.2.3",
+        "through2": "2.0.3"
       }
     },
     "mitt": {
@@ -11765,8 +11765,8 @@
       "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
       "dev": true,
       "requires": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
+        "for-in": "1.0.2",
+        "is-extendable": "1.0.1"
       },
       "dependencies": {
         "is-extendable": {
@@ -11775,7 +11775,7 @@
           "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "dev": true,
           "requires": {
-            "is-plain-object": "^2.0.4"
+            "is-plain-object": "2.0.4"
           }
         }
       }
@@ -11786,8 +11786,8 @@
       "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
       "dev": true,
       "requires": {
-        "for-in": "^0.1.3",
-        "is-extendable": "^0.1.1"
+        "for-in": "0.1.8",
+        "is-extendable": "0.1.1"
       },
       "dependencies": {
         "for-in": {
@@ -11816,7 +11816,7 @@
       "resolved": "https://registry.npmjs.org/moment-es6/-/moment-es6-1.0.0.tgz",
       "integrity": "sha1-VS/PQF1iVlsKH+hObB5peseTMt8=",
       "requires": {
-        "moment": "*"
+        "moment": "2.22.2"
       }
     },
     "move-concurrently": {
@@ -11825,12 +11825,12 @@
       "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
       "dev": true,
       "requires": {
-        "aproba": "^1.1.1",
-        "copy-concurrently": "^1.0.0",
-        "fs-write-stream-atomic": "^1.0.8",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.3"
+        "aproba": "1.2.0",
+        "copy-concurrently": "1.0.5",
+        "fs-write-stream-atomic": "1.0.10",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.2",
+        "run-queue": "1.0.3"
       }
     },
     "ms": {
@@ -11844,8 +11844,8 @@
       "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
       "dev": true,
       "requires": {
-        "dns-packet": "^1.3.1",
-        "thunky": "^1.0.2"
+        "dns-packet": "1.3.1",
+        "thunky": "1.0.3"
       }
     },
     "multicast-dns-service-types": {
@@ -11881,17 +11881,17 @@
       "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
       "dev": true,
       "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "fragment-cache": "^0.2.1",
-        "is-windows": "^1.0.2",
-        "kind-of": "^6.0.2",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
+        "arr-diff": "4.0.0",
+        "array-unique": "0.3.2",
+        "define-property": "2.0.2",
+        "extend-shallow": "3.0.2",
+        "fragment-cache": "0.2.1",
+        "is-windows": "1.0.2",
+        "kind-of": "6.0.2",
+        "object.pick": "1.3.0",
+        "regex-not": "1.0.2",
+        "snapdragon": "0.8.2",
+        "to-regex": "3.0.2"
       }
     },
     "nconf": {
@@ -11900,10 +11900,10 @@
       "integrity": "sha512-fKiXMQrpP7CYWJQzKkPPx9hPgmq+YLDyxcG9N8RpiE9FoCkCbzD0NyW0YhE3xn3Aupe7nnDeIx4PFzYehpHT9Q==",
       "dev": true,
       "requires": {
-        "async": "^1.4.0",
-        "ini": "^1.3.0",
-        "secure-keys": "^1.0.0",
-        "yargs": "^3.19.0"
+        "async": "1.5.2",
+        "ini": "1.3.5",
+        "secure-keys": "1.0.0",
+        "yargs": "3.32.0"
       },
       "dependencies": {
         "ansi-regex": {
@@ -11924,9 +11924,9 @@
           "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
           "dev": true,
           "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wrap-ansi": "^2.0.0"
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wrap-ansi": "2.1.0"
           }
         },
         "is-fullwidth-code-point": {
@@ -11935,7 +11935,7 @@
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
           "requires": {
-            "number-is-nan": "^1.0.0"
+            "number-is-nan": "1.0.1"
           }
         },
         "os-locale": {
@@ -11944,7 +11944,7 @@
           "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
           "dev": true,
           "requires": {
-            "lcid": "^1.0.0"
+            "lcid": "1.0.0"
           }
         },
         "string-width": {
@@ -11953,9 +11953,9 @@
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
           "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
           }
         },
         "strip-ansi": {
@@ -11964,7 +11964,7 @@
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "2.1.1"
           }
         },
         "window-size": {
@@ -11979,13 +11979,13 @@
           "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=",
           "dev": true,
           "requires": {
-            "camelcase": "^2.0.1",
-            "cliui": "^3.0.3",
-            "decamelize": "^1.1.1",
-            "os-locale": "^1.4.0",
-            "string-width": "^1.0.1",
-            "window-size": "^0.1.4",
-            "y18n": "^3.2.0"
+            "camelcase": "2.1.1",
+            "cliui": "3.2.0",
+            "decamelize": "1.2.0",
+            "os-locale": "1.4.0",
+            "string-width": "1.0.2",
+            "window-size": "0.1.4",
+            "y18n": "3.2.1"
           }
         }
       }
@@ -12020,31 +12020,31 @@
       "integrity": "sha512-sd5Q76DOX4skvHjnXWbFBjJ7JfelE4LK7/big0Y0cyzrXeI/vLYH3nnhKQHyWcXNAwlQMlkiTAmNjna7KUDvCw==",
       "dev": true,
       "requires": {
-        "@ngtools/json-schema": "^1.1.0",
-        "autoprefixer": "^9.0.0",
-        "browserslist": "^4.0.0",
-        "chalk": "^2.3.1",
-        "chokidar": "^2.0.3",
-        "clean-css": "^4.1.11",
-        "commander": "^2.12.0",
-        "fs-extra": "^7.0.0",
-        "glob": "^7.1.2",
-        "injection-js": "^2.2.1",
-        "less": "^3.0.0",
-        "node-sass": "^4.5.3",
-        "node-sass-tilde-importer": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-url": "^7.3.0",
-        "read-pkg-up": "^4.0.0",
-        "rimraf": "^2.6.1",
-        "rollup": "^0.63.0",
-        "rollup-plugin-commonjs": "^9.1.3",
-        "rollup-plugin-node-resolve": "^3.0.0",
-        "rollup-plugin-sourcemaps": "^0.4.2",
-        "rxjs": "^6.0.0",
-        "stylus": "^0.54.5",
-        "uglify-js": "^3.0.7",
-        "update-notifier": "^2.3.0"
+        "@ngtools/json-schema": "1.1.0",
+        "autoprefixer": "9.3.1",
+        "browserslist": "4.3.3",
+        "chalk": "2.4.1",
+        "chokidar": "2.0.4",
+        "clean-css": "4.2.1",
+        "commander": "2.19.0",
+        "fs-extra": "7.0.0",
+        "glob": "7.1.3",
+        "injection-js": "2.2.1",
+        "less": "3.8.1",
+        "node-sass": "4.9.2",
+        "node-sass-tilde-importer": "1.0.2",
+        "postcss": "7.0.5",
+        "postcss-url": "7.3.2",
+        "read-pkg-up": "4.0.0",
+        "rimraf": "2.6.2",
+        "rollup": "0.63.5",
+        "rollup-plugin-commonjs": "9.2.0",
+        "rollup-plugin-node-resolve": "3.4.0",
+        "rollup-plugin-sourcemaps": "0.4.2",
+        "rxjs": "6.3.3",
+        "stylus": "0.54.5",
+        "uglify-js": "3.4.9",
+        "update-notifier": "2.5.0"
       },
       "dependencies": {
         "autoprefixer": {
@@ -12053,12 +12053,12 @@
           "integrity": "sha512-DY9gOh8z3tnCbJ13JIWaeQsoYncTGdsrgCceBaQSIL4nvdrLxgbRSBPevg2XbX7u4QCSfLheSJEEIUUSlkbx6Q==",
           "dev": true,
           "requires": {
-            "browserslist": "^4.3.3",
-            "caniuse-lite": "^1.0.30000898",
-            "normalize-range": "^0.1.2",
-            "num2fraction": "^1.2.2",
-            "postcss": "^7.0.5",
-            "postcss-value-parser": "^3.3.1"
+            "browserslist": "4.3.3",
+            "caniuse-lite": "1.0.30000898",
+            "normalize-range": "0.1.2",
+            "num2fraction": "1.2.2",
+            "postcss": "7.0.5",
+            "postcss-value-parser": "3.3.1"
           }
         },
         "browserslist": {
@@ -12067,9 +12067,9 @@
           "integrity": "sha512-6h84UD1mmHeuQ9IucX6yzBc+KBYcBBTLYt2CXtY7GYCra6iE5kOm7oM+zuGw/0tjGtbJxjm58OvxSBmogEMCRQ==",
           "dev": true,
           "requires": {
-            "caniuse-lite": "^1.0.30000898",
-            "electron-to-chromium": "^1.3.81",
-            "node-releases": "^1.0.0-alpha.15"
+            "caniuse-lite": "1.0.30000898",
+            "electron-to-chromium": "1.3.81",
+            "node-releases": "1.0.0-alpha.15"
           }
         },
         "find-up": {
@@ -12078,7 +12078,7 @@
           "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "dev": true,
           "requires": {
-            "locate-path": "^3.0.0"
+            "locate-path": "3.0.0"
           }
         },
         "fs-extra": {
@@ -12087,9 +12087,9 @@
           "integrity": "sha512-EglNDLRpmaTWiD/qraZn6HREAEAHJcJOmxNEYwq6xeMKnVMAy3GUcFB+wXt2C6k4CNvB/mP1y/U3dzvKKj5OtQ==",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
+            "graceful-fs": "4.1.11",
+            "jsonfile": "4.0.0",
+            "universalify": "0.1.2"
           }
         },
         "load-json-file": {
@@ -12098,10 +12098,10 @@
           "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^4.0.0",
-            "pify": "^3.0.0",
-            "strip-bom": "^3.0.0"
+            "graceful-fs": "4.1.11",
+            "parse-json": "4.0.0",
+            "pify": "3.0.0",
+            "strip-bom": "3.0.0"
           }
         },
         "locate-path": {
@@ -12110,8 +12110,8 @@
           "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
           "dev": true,
           "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
+            "p-locate": "3.0.0",
+            "path-exists": "3.0.0"
           }
         },
         "p-limit": {
@@ -12120,7 +12120,7 @@
           "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==",
           "dev": true,
           "requires": {
-            "p-try": "^2.0.0"
+            "p-try": "2.0.0"
           }
         },
         "p-locate": {
@@ -12129,7 +12129,7 @@
           "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
           "dev": true,
           "requires": {
-            "p-limit": "^2.0.0"
+            "p-limit": "2.0.0"
           }
         },
         "p-try": {
@@ -12144,8 +12144,8 @@
           "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
           "dev": true,
           "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
+            "error-ex": "1.3.2",
+            "json-parse-better-errors": "1.0.2"
           }
         },
         "postcss": {
@@ -12154,9 +12154,9 @@
           "integrity": "sha512-HBNpviAUFCKvEh7NZhw1e8MBPivRszIiUnhrJ+sBFVSYSqubrzwX3KG51mYgcRHX8j/cAgZJedONZcm5jTBdgQ==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.5.0"
+            "chalk": "2.4.1",
+            "source-map": "0.6.1",
+            "supports-color": "5.5.0"
           }
         },
         "read-pkg": {
@@ -12165,9 +12165,9 @@
           "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
           "dev": true,
           "requires": {
-            "load-json-file": "^4.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^3.0.0"
+            "load-json-file": "4.0.0",
+            "normalize-package-data": "2.4.0",
+            "path-type": "3.0.0"
           }
         },
         "read-pkg-up": {
@@ -12176,8 +12176,8 @@
           "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==",
           "dev": true,
           "requires": {
-            "find-up": "^3.0.0",
-            "read-pkg": "^3.0.0"
+            "find-up": "3.0.0",
+            "read-pkg": "3.0.0"
           }
         },
         "source-map": {
@@ -12199,7 +12199,7 @@
       "resolved": "https://registry.npmjs.org/ng2-charts/-/ng2-charts-1.6.0.tgz",
       "integrity": "sha512-9w0WH69x5/nuqC1og2WaY39NbaBqTGIP1+5gZaH7/KPN6UEPonNg/pYnsIVklLj1DWPWXKa8+XXIJZ1jy5nLxg==",
       "requires": {
-        "chart.js": "^2.6.0"
+        "chart.js": "2.7.3"
       },
       "dependencies": {
         "chart.js": {
@@ -12207,8 +12207,8 @@
           "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.7.3.tgz",
           "integrity": "sha512-3+7k/DbR92m6BsMUYP6M0dMsMVZpMnwkUyNSAbqolHKsbIzH2Q4LWVEHHYq7v0fmEV8whXE0DrjANulw9j2K5g==",
           "requires": {
-            "chartjs-color": "^2.1.0",
-            "moment": "^2.10.2"
+            "chartjs-color": "2.2.0",
+            "moment": "2.22.2"
           }
         }
       }
@@ -12230,7 +12230,7 @@
       "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
       "dev": true,
       "requires": {
-        "lower-case": "^1.1.1"
+        "lower-case": "1.1.4"
       }
     },
     "node-ensure": {
@@ -12244,8 +12244,8 @@
       "integrity": "sha1-3CNO3WSJmC1Y6PDbT2lQKavNjAQ=",
       "dev": true,
       "requires": {
-        "encoding": "^0.1.11",
-        "is-stream": "^1.0.1"
+        "encoding": "0.1.12",
+        "is-stream": "1.1.0"
       }
     },
     "node-forge": {
@@ -12260,18 +12260,18 @@
       "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
       "dev": true,
       "requires": {
-        "fstream": "^1.0.0",
-        "glob": "^7.0.3",
-        "graceful-fs": "^4.1.2",
-        "mkdirp": "^0.5.0",
-        "nopt": "2 || 3",
-        "npmlog": "0 || 1 || 2 || 3 || 4",
-        "osenv": "0",
-        "request": "^2.87.0",
-        "rimraf": "2",
-        "semver": "~5.3.0",
-        "tar": "^2.0.0",
-        "which": "1"
+        "fstream": "1.0.11",
+        "glob": "7.1.3",
+        "graceful-fs": "4.1.11",
+        "mkdirp": "0.5.1",
+        "nopt": "3.0.6",
+        "npmlog": "4.1.2",
+        "osenv": "0.1.5",
+        "request": "2.88.0",
+        "rimraf": "2.6.2",
+        "semver": "5.3.0",
+        "tar": "2.2.1",
+        "which": "1.3.1"
       },
       "dependencies": {
         "semver": {
@@ -12288,28 +12288,28 @@
       "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==",
       "dev": true,
       "requires": {
-        "assert": "^1.1.1",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^4.3.0",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "^1.0.0",
-        "crypto-browserify": "^3.11.0",
-        "domain-browser": "^1.1.1",
-        "events": "^1.0.0",
-        "https-browserify": "^1.0.0",
-        "os-browserify": "^0.3.0",
+        "assert": "1.4.1",
+        "browserify-zlib": "0.2.0",
+        "buffer": "4.9.1",
+        "console-browserify": "1.1.0",
+        "constants-browserify": "1.0.0",
+        "crypto-browserify": "3.12.0",
+        "domain-browser": "1.2.0",
+        "events": "1.1.1",
+        "https-browserify": "1.0.0",
+        "os-browserify": "0.3.0",
         "path-browserify": "0.0.0",
-        "process": "^0.11.10",
-        "punycode": "^1.2.4",
-        "querystring-es3": "^0.2.0",
-        "readable-stream": "^2.3.3",
-        "stream-browserify": "^2.0.1",
-        "stream-http": "^2.7.2",
-        "string_decoder": "^1.0.0",
-        "timers-browserify": "^2.0.4",
+        "process": "0.11.10",
+        "punycode": "1.4.1",
+        "querystring-es3": "0.2.1",
+        "readable-stream": "2.3.6",
+        "stream-browserify": "2.0.1",
+        "stream-http": "2.8.3",
+        "string_decoder": "1.1.1",
+        "timers-browserify": "2.0.10",
         "tty-browserify": "0.0.0",
-        "url": "^0.11.0",
-        "util": "^0.10.3",
+        "url": "0.11.0",
+        "util": "0.10.4",
         "vm-browserify": "0.0.4"
       },
       "dependencies": {
@@ -12327,7 +12327,7 @@
       "integrity": "sha512-hKG6hd/g6a9OV/ARt2qrxbRhe/4WEMFohTLOB9PNyTYvvI59gICZFzt9/mMgpYUTts06qXlN8H6UjfbIRdnW8A==",
       "dev": true,
       "requires": {
-        "semver": "^5.3.0"
+        "semver": "5.6.0"
       }
     },
     "node-sass": {
@@ -12336,25 +12336,25 @@
       "integrity": "sha512-LdxoJLZutx0aQXHtWIYwJKMj+9pTjneTcLWJgzf2XbGu0q5pRNqW5QvFCEdm3mc5rJOdru/mzln5d0EZLacf6g==",
       "dev": true,
       "requires": {
-        "async-foreach": "^0.1.3",
-        "chalk": "^1.1.1",
-        "cross-spawn": "^3.0.0",
-        "gaze": "^1.0.0",
-        "get-stdin": "^4.0.1",
-        "glob": "^7.0.3",
-        "in-publish": "^2.0.0",
-        "lodash.assign": "^4.2.0",
-        "lodash.clonedeep": "^4.3.2",
-        "lodash.mergewith": "^4.6.0",
-        "meow": "^3.7.0",
-        "mkdirp": "^0.5.1",
-        "nan": "^2.10.0",
-        "node-gyp": "^3.3.1",
-        "npmlog": "^4.0.0",
+        "async-foreach": "0.1.3",
+        "chalk": "1.1.3",
+        "cross-spawn": "3.0.1",
+        "gaze": "1.1.3",
+        "get-stdin": "4.0.1",
+        "glob": "7.1.3",
+        "in-publish": "2.0.0",
+        "lodash.assign": "4.2.0",
+        "lodash.clonedeep": "4.5.0",
+        "lodash.mergewith": "4.6.1",
+        "meow": "3.7.0",
+        "mkdirp": "0.5.1",
+        "nan": "2.11.1",
+        "node-gyp": "3.8.0",
+        "npmlog": "4.1.2",
         "request": "2.87.0",
-        "sass-graph": "^2.2.4",
-        "stdout-stream": "^1.4.0",
-        "true-case-path": "^1.0.2"
+        "sass-graph": "2.2.4",
+        "stdout-stream": "1.4.1",
+        "true-case-path": "1.0.3"
       },
       "dependencies": {
         "ajv": {
@@ -12363,10 +12363,10 @@
           "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
           "dev": true,
           "requires": {
-            "co": "^4.6.0",
-            "fast-deep-equal": "^1.0.0",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.3.0"
+            "co": "4.6.0",
+            "fast-deep-equal": "1.1.0",
+            "fast-json-stable-stringify": "2.0.0",
+            "json-schema-traverse": "0.3.1"
           }
         },
         "ansi-regex": {
@@ -12387,11 +12387,11 @@
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "cross-spawn": {
@@ -12400,8 +12400,8 @@
           "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
           "dev": true,
           "requires": {
-            "lru-cache": "^4.0.1",
-            "which": "^1.2.9"
+            "lru-cache": "4.1.3",
+            "which": "1.3.1"
           }
         },
         "fast-deep-equal": {
@@ -12416,8 +12416,8 @@
           "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
           "dev": true,
           "requires": {
-            "ajv": "^5.1.0",
-            "har-schema": "^2.0.0"
+            "ajv": "5.5.2",
+            "har-schema": "2.0.0"
           }
         },
         "json-schema-traverse": {
@@ -12444,26 +12444,26 @@
           "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==",
           "dev": true,
           "requires": {
-            "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",
-            "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",
-            "tough-cookie": "~2.3.3",
-            "tunnel-agent": "^0.6.0",
-            "uuid": "^3.1.0"
+            "aws-sign2": "0.7.0",
+            "aws4": "1.8.0",
+            "caseless": "0.12.0",
+            "combined-stream": "1.0.7",
+            "extend": "3.0.2",
+            "forever-agent": "0.6.1",
+            "form-data": "2.3.3",
+            "har-validator": "5.0.3",
+            "http-signature": "1.2.0",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.21",
+            "oauth-sign": "0.8.2",
+            "performance-now": "2.1.0",
+            "qs": "6.5.2",
+            "safe-buffer": "5.1.2",
+            "tough-cookie": "2.3.4",
+            "tunnel-agent": "0.6.0",
+            "uuid": "3.3.2"
           }
         },
         "strip-ansi": {
@@ -12472,7 +12472,7 @@
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "2.1.1"
           }
         },
         "supports-color": {
@@ -12487,7 +12487,7 @@
           "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
           "dev": true,
           "requires": {
-            "punycode": "^1.4.1"
+            "punycode": "1.4.1"
           }
         }
       }
@@ -12498,7 +12498,7 @@
       "integrity": "sha512-Swcmr38Y7uB78itQeBm3mThjxBy9/Ah/ykPIaURY/L6Nec9AyRoL/jJ7ECfMR+oZeCTVQNxVMu/aHU+TLRVbdg==",
       "dev": true,
       "requires": {
-        "find-parent-dir": "^0.3.0"
+        "find-parent-dir": "0.3.0"
       }
     },
     "nodemailer": {
@@ -12531,8 +12531,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "ip": "^1.1.2",
-            "smart-buffer": "^1.0.4"
+            "ip": "1.1.5",
+            "smart-buffer": "1.1.15"
           }
         }
       }
@@ -12599,7 +12599,7 @@
       "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
       "dev": true,
       "requires": {
-        "abbrev": "1"
+        "abbrev": "1.0.9"
       }
     },
     "normalize-package-data": {
@@ -12607,10 +12607,10 @@
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
       "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
       "requires": {
-        "hosted-git-info": "^2.1.4",
-        "is-builtin-module": "^1.0.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
+        "hosted-git-info": "2.7.1",
+        "is-builtin-module": "1.0.0",
+        "semver": "5.6.0",
+        "validate-npm-package-license": "3.0.4"
       }
     },
     "normalize-path": {
@@ -12619,7 +12619,7 @@
       "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
       "dev": true,
       "requires": {
-        "remove-trailing-separator": "^1.0.1"
+        "remove-trailing-separator": "1.1.0"
       }
     },
     "normalize-range": {
@@ -12640,10 +12640,10 @@
       "integrity": "sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==",
       "dev": true,
       "requires": {
-        "hosted-git-info": "^2.6.0",
-        "osenv": "^0.1.5",
-        "semver": "^5.5.0",
-        "validate-npm-package-name": "^3.0.0"
+        "hosted-git-info": "2.7.1",
+        "osenv": "0.1.5",
+        "semver": "5.6.0",
+        "validate-npm-package-name": "3.0.0"
       }
     },
     "npm-registry-client": {
@@ -12652,18 +12652,18 @@
       "integrity": "sha512-Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg==",
       "dev": true,
       "requires": {
-        "concat-stream": "^1.5.2",
-        "graceful-fs": "^4.1.6",
-        "normalize-package-data": "~1.0.1 || ^2.0.0",
-        "npm-package-arg": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0",
-        "npmlog": "2 || ^3.1.0 || ^4.0.0",
-        "once": "^1.3.3",
-        "request": "^2.74.0",
-        "retry": "^0.10.0",
-        "safe-buffer": "^5.1.1",
-        "semver": "2 >=2.2.1 || 3.x || 4 || 5",
-        "slide": "^1.1.3",
-        "ssri": "^5.2.4"
+        "concat-stream": "1.6.2",
+        "graceful-fs": "4.1.11",
+        "normalize-package-data": "2.4.0",
+        "npm-package-arg": "6.1.0",
+        "npmlog": "4.1.2",
+        "once": "1.4.0",
+        "request": "2.88.0",
+        "retry": "0.10.1",
+        "safe-buffer": "5.1.2",
+        "semver": "5.6.0",
+        "slide": "1.1.6",
+        "ssri": "5.3.0"
       }
     },
     "npm-run-all": {
@@ -12671,15 +12671,15 @@
       "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.2.tgz",
       "integrity": "sha512-Z2aRlajMK4SQ8u19ZA75NZZu7wupfCNQWdYosIi8S6FgBdGf/8Y6Hgyjdc8zU2cYmIRVCx1nM80tJPkdEd+UYg==",
       "requires": {
-        "ansi-styles": "^3.2.0",
-        "chalk": "^2.1.0",
-        "cross-spawn": "^5.1.0",
-        "memorystream": "^0.3.1",
-        "minimatch": "^3.0.4",
-        "ps-tree": "^1.1.0",
-        "read-pkg": "^3.0.0",
-        "shell-quote": "^1.6.1",
-        "string.prototype.padend": "^3.0.0"
+        "ansi-styles": "3.2.1",
+        "chalk": "2.4.1",
+        "cross-spawn": "5.1.0",
+        "memorystream": "0.3.1",
+        "minimatch": "3.0.4",
+        "ps-tree": "1.2.0",
+        "read-pkg": "3.0.0",
+        "shell-quote": "1.6.1",
+        "string.prototype.padend": "3.0.0"
       },
       "dependencies": {
         "load-json-file": {
@@ -12687,10 +12687,10 @@
           "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
           "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^4.0.0",
-            "pify": "^3.0.0",
-            "strip-bom": "^3.0.0"
+            "graceful-fs": "4.1.11",
+            "parse-json": "4.0.0",
+            "pify": "3.0.0",
+            "strip-bom": "3.0.0"
           }
         },
         "parse-json": {
@@ -12698,8 +12698,8 @@
           "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
           "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
           "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
+            "error-ex": "1.3.2",
+            "json-parse-better-errors": "1.0.2"
           }
         },
         "read-pkg": {
@@ -12707,9 +12707,9 @@
           "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
           "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
           "requires": {
-            "load-json-file": "^4.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^3.0.0"
+            "load-json-file": "4.0.0",
+            "normalize-package-data": "2.4.0",
+            "path-type": "3.0.0"
           }
         },
         "strip-bom": {
@@ -12724,7 +12724,7 @@
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
       "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
       "requires": {
-        "path-key": "^2.0.0"
+        "path-key": "2.0.1"
       }
     },
     "npmlog": {
@@ -12733,10 +12733,10 @@
       "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
       "dev": true,
       "requires": {
-        "are-we-there-yet": "~1.1.2",
-        "console-control-strings": "~1.1.0",
-        "gauge": "~2.7.3",
-        "set-blocking": "~2.0.0"
+        "are-we-there-yet": "1.1.5",
+        "console-control-strings": "1.1.0",
+        "gauge": "2.7.4",
+        "set-blocking": "2.0.0"
       }
     },
     "nth-check": {
@@ -12745,7 +12745,7 @@
       "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
       "dev": true,
       "requires": {
-        "boolbase": "~1.0.0"
+        "boolbase": "1.0.0"
       }
     },
     "null-check": {
@@ -12789,9 +12789,9 @@
       "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
       "dev": true,
       "requires": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
+        "copy-descriptor": "0.1.1",
+        "define-property": "0.2.5",
+        "kind-of": "3.2.2"
       },
       "dependencies": {
         "define-property": {
@@ -12800,7 +12800,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         },
         "kind-of": {
@@ -12809,7 +12809,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -12831,7 +12831,7 @@
       "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
       "dev": true,
       "requires": {
-        "isobject": "^3.0.0"
+        "isobject": "3.0.1"
       }
     },
     "object.getownpropertydescriptors": {
@@ -12840,8 +12840,8 @@
       "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.5.1"
+        "define-properties": "1.1.3",
+        "es-abstract": "1.12.0"
       }
     },
     "object.omit": {
@@ -12850,8 +12850,8 @@
       "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
       "dev": true,
       "requires": {
-        "for-own": "^0.1.4",
-        "is-extendable": "^0.1.1"
+        "for-own": "0.1.5",
+        "is-extendable": "0.1.1"
       },
       "dependencies": {
         "for-own": {
@@ -12860,7 +12860,7 @@
           "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
           "dev": true,
           "requires": {
-            "for-in": "^1.0.1"
+            "for-in": "1.0.2"
           }
         }
       }
@@ -12871,7 +12871,7 @@
       "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
       "dev": true,
       "requires": {
-        "isobject": "^3.0.1"
+        "isobject": "3.0.1"
       }
     },
     "obuf": {
@@ -12901,7 +12901,7 @@
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
       "dev": true,
       "requires": {
-        "wrappy": "1"
+        "wrappy": "1.0.2"
       }
     },
     "onetime": {
@@ -12910,7 +12910,7 @@
       "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
       "dev": true,
       "requires": {
-        "mimic-fn": "^1.0.0"
+        "mimic-fn": "1.2.0"
       }
     },
     "opencollective": {
@@ -12945,11 +12945,11 @@
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "minimist": {
@@ -12964,8 +12964,8 @@
           "integrity": "sha1-erwi5kTf9jsKltWrfyeQwPAavJU=",
           "dev": true,
           "requires": {
-            "object-assign": "^4.0.1",
-            "pinkie-promise": "^2.0.0"
+            "object-assign": "4.1.1",
+            "pinkie-promise": "2.0.1"
           }
         },
         "strip-ansi": {
@@ -12974,7 +12974,7 @@
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "2.1.1"
           }
         },
         "supports-color": {
@@ -13002,7 +13002,7 @@
       "resolved": "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz",
       "integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==",
       "requires": {
-        "is-wsl": "^1.1.0"
+        "is-wsl": "1.1.0"
       }
     },
     "optimist": {
@@ -13011,8 +13011,8 @@
       "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
       "dev": true,
       "requires": {
-        "minimist": "~0.0.1",
-        "wordwrap": "~0.0.2"
+        "minimist": "0.0.8",
+        "wordwrap": "0.0.3"
       },
       "dependencies": {
         "wordwrap": {
@@ -13029,12 +13029,12 @@
       "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
       "dev": true,
       "requires": {
-        "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"
+        "deep-is": "0.1.3",
+        "fast-levenshtein": "2.0.6",
+        "levn": "0.3.0",
+        "prelude-ls": "1.1.2",
+        "type-check": "0.3.2",
+        "wordwrap": "1.0.0"
       }
     },
     "original": {
@@ -13043,7 +13043,7 @@
       "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
       "dev": true,
       "requires": {
-        "url-parse": "^1.4.3"
+        "url-parse": "1.4.3"
       }
     },
     "os-browserify": {
@@ -13063,9 +13063,9 @@
       "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
       "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
       "requires": {
-        "execa": "^0.7.0",
-        "lcid": "^1.0.0",
-        "mem": "^1.1.0"
+        "execa": "0.7.0",
+        "lcid": "1.0.0",
+        "mem": "1.1.0"
       }
     },
     "os-tmpdir": {
@@ -13079,8 +13079,8 @@
       "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
       "dev": true,
       "requires": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.0"
+        "os-homedir": "1.0.2",
+        "os-tmpdir": "1.0.2"
       }
     },
     "p-defer": {
@@ -13105,7 +13105,7 @@
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
       "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
       "requires": {
-        "p-try": "^1.0.0"
+        "p-try": "1.0.0"
       }
     },
     "p-locate": {
@@ -13113,7 +13113,7 @@
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
       "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
       "requires": {
-        "p-limit": "^1.1.0"
+        "p-limit": "1.3.0"
       }
     },
     "p-map": {
@@ -13134,14 +13134,14 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "agent-base": "^4.2.0",
-        "debug": "^3.1.0",
-        "get-uri": "^2.0.0",
-        "http-proxy-agent": "^2.1.0",
-        "https-proxy-agent": "^2.2.1",
-        "pac-resolver": "^3.0.0",
-        "raw-body": "^2.2.0",
-        "socks-proxy-agent": "^4.0.1"
+        "agent-base": "4.2.1",
+        "debug": "3.2.6",
+        "get-uri": "2.0.2",
+        "http-proxy-agent": "2.1.0",
+        "https-proxy-agent": "2.2.1",
+        "pac-resolver": "3.0.0",
+        "raw-body": "2.3.3",
+        "socks-proxy-agent": "4.0.1"
       }
     },
     "pac-resolver": {
@@ -13151,11 +13151,11 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "co": "^4.6.0",
-        "degenerator": "^1.0.4",
-        "ip": "^1.1.5",
-        "netmask": "^1.0.6",
-        "thunkify": "^2.1.2"
+        "co": "4.6.0",
+        "degenerator": "1.0.4",
+        "ip": "1.1.5",
+        "netmask": "1.0.6",
+        "thunkify": "2.1.2"
       }
     },
     "package-json": {
@@ -13164,10 +13164,10 @@
       "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
       "dev": true,
       "requires": {
-        "got": "^6.7.1",
-        "registry-auth-token": "^3.0.1",
-        "registry-url": "^3.0.3",
-        "semver": "^5.1.0"
+        "got": "6.7.1",
+        "registry-auth-token": "3.3.2",
+        "registry-url": "3.1.0",
+        "semver": "5.6.0"
       }
     },
     "pako": {
@@ -13182,9 +13182,9 @@
       "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
       "dev": true,
       "requires": {
-        "cyclist": "~0.2.2",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.1.5"
+        "cyclist": "0.2.2",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6"
       }
     },
     "param-case": {
@@ -13193,7 +13193,7 @@
       "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
       "dev": true,
       "requires": {
-        "no-case": "^2.2.0"
+        "no-case": "2.3.2"
       }
     },
     "parse-asn1": {
@@ -13202,11 +13202,11 @@
       "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
       "dev": true,
       "requires": {
-        "asn1.js": "^4.0.0",
-        "browserify-aes": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3"
+        "asn1.js": "4.10.1",
+        "browserify-aes": "1.2.0",
+        "create-hash": "1.2.0",
+        "evp_bytestokey": "1.0.3",
+        "pbkdf2": "3.0.17"
       }
     },
     "parse-entities": {
@@ -13215,12 +13215,12 @@
       "integrity": "sha512-XXtDdOPLSB0sHecbEapQi6/58U/ODj/KWfIXmmMCJF/eRn8laX6LZbOyioMoETOOJoWRW8/qTSl5VQkUIfKM5g==",
       "dev": true,
       "requires": {
-        "character-entities": "^1.0.0",
-        "character-entities-legacy": "^1.0.0",
-        "character-reference-invalid": "^1.0.0",
-        "is-alphanumerical": "^1.0.0",
-        "is-decimal": "^1.0.0",
-        "is-hexadecimal": "^1.0.0"
+        "character-entities": "1.2.2",
+        "character-entities-legacy": "1.1.2",
+        "character-reference-invalid": "1.1.2",
+        "is-alphanumerical": "1.0.2",
+        "is-decimal": "1.0.2",
+        "is-hexadecimal": "1.0.2"
       }
     },
     "parse-glob": {
@@ -13229,10 +13229,10 @@
       "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
       "dev": true,
       "requires": {
-        "glob-base": "^0.3.0",
-        "is-dotfile": "^1.0.0",
-        "is-extglob": "^1.0.0",
-        "is-glob": "^2.0.0"
+        "glob-base": "0.3.0",
+        "is-dotfile": "1.0.3",
+        "is-extglob": "1.0.0",
+        "is-glob": "2.0.1"
       },
       "dependencies": {
         "is-extglob": {
@@ -13247,7 +13247,7 @@
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
           "requires": {
-            "is-extglob": "^1.0.0"
+            "is-extglob": "1.0.0"
           }
         }
       }
@@ -13258,7 +13258,7 @@
       "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
       "dev": true,
       "requires": {
-        "error-ex": "^1.2.0"
+        "error-ex": "1.3.2"
       }
     },
     "parse-passwd": {
@@ -13279,7 +13279,7 @@
       "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
       "dev": true,
       "requires": {
-        "better-assert": "~1.0.0"
+        "better-assert": "1.0.2"
       }
     },
     "parseuri": {
@@ -13288,7 +13288,7 @@
       "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
       "dev": true,
       "requires": {
-        "better-assert": "~1.0.0"
+        "better-assert": "1.0.2"
       }
     },
     "parseurl": {
@@ -13309,8 +13309,8 @@
       "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=",
       "dev": true,
       "requires": {
-        "process": "^0.11.1",
-        "util": "^0.10.3"
+        "process": "0.11.10",
+        "util": "0.10.4"
       }
     },
     "path-browserify": {
@@ -13360,7 +13360,7 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "inflection": "~1.3.0"
+        "inflection": "1.3.8"
       },
       "dependencies": {
         "inflection": {
@@ -13383,7 +13383,7 @@
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
       "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
       "requires": {
-        "pify": "^3.0.0"
+        "pify": "3.0.0"
       }
     },
     "pause-stream": {
@@ -13391,7 +13391,7 @@
       "resolved": "http://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
       "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
       "requires": {
-        "through": "~2.3"
+        "through": "2.3.8"
       }
     },
     "pbkdf2": {
@@ -13400,11 +13400,11 @@
       "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
       "dev": true,
       "requires": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
+        "create-hash": "1.2.0",
+        "create-hmac": "1.1.7",
+        "ripemd160": "2.0.2",
+        "safe-buffer": "5.1.2",
+        "sha.js": "2.4.11"
       }
     },
     "pdfjs-dist": {
@@ -13412,8 +13412,8 @@
       "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.0.489.tgz",
       "integrity": "sha1-Y+VLKSqGeQpFRpfrRNQ0e4+/rSc=",
       "requires": {
-        "node-ensure": "^0.0.0",
-        "worker-loader": "^1.1.1"
+        "node-ensure": "0.0.0",
+        "worker-loader": "1.1.1"
       }
     },
     "performance-now": {
@@ -13439,7 +13439,7 @@
       "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
       "dev": true,
       "requires": {
-        "pinkie": "^2.0.0"
+        "pinkie": "2.0.4"
       }
     },
     "pkg-dir": {
@@ -13448,7 +13448,7 @@
       "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
       "dev": true,
       "requires": {
-        "find-up": "^2.1.0"
+        "find-up": "2.1.0"
       }
     },
     "please-upgrade-node": {
@@ -13457,7 +13457,7 @@
       "integrity": "sha512-KY1uHnQ2NlQHqIJQpnh/i54rKkuxCEBx+voJIS/Mvb+L2iYd2NMotwduhKTMjfC1uKoX3VXOxLjIYG66dfJTVQ==",
       "dev": true,
       "requires": {
-        "semver-compare": "^1.0.0"
+        "semver-compare": "1.0.0"
       }
     },
     "plugin-error": {
@@ -13466,11 +13466,11 @@
       "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
       "dev": true,
       "requires": {
-        "ansi-cyan": "^0.1.1",
-        "ansi-red": "^0.1.1",
-        "arr-diff": "^1.0.1",
-        "arr-union": "^2.0.1",
-        "extend-shallow": "^1.1.2"
+        "ansi-cyan": "0.1.1",
+        "ansi-red": "0.1.1",
+        "arr-diff": "1.1.0",
+        "arr-union": "2.1.0",
+        "extend-shallow": "1.1.4"
       },
       "dependencies": {
         "arr-diff": {
@@ -13479,8 +13479,8 @@
           "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
           "dev": true,
           "requires": {
-            "arr-flatten": "^1.0.1",
-            "array-slice": "^0.2.3"
+            "arr-flatten": "1.1.0",
+            "array-slice": "0.2.3"
           }
         },
         "arr-union": {
@@ -13495,7 +13495,7 @@
           "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
           "dev": true,
           "requires": {
-            "kind-of": "^1.1.0"
+            "kind-of": "1.1.0"
           }
         },
         "kind-of": {
@@ -13512,9 +13512,9 @@
       "integrity": "sha512-23aeQKW9KgHe6citUrG3r9HjeX6vls0h713TAa+CwTKZwNIr/pD2ApaxYF4Um3ZZyq4ar+Siv3+fhoHaIwSOSw==",
       "dev": true,
       "requires": {
-        "async": "^1.5.2",
-        "debug": "^2.2.0",
-        "mkdirp": "0.5.x"
+        "async": "1.5.2",
+        "debug": "2.6.9",
+        "mkdirp": "0.5.1"
       },
       "dependencies": {
         "debug": {
@@ -13541,7 +13541,7 @@
       "dev": true,
       "requires": {
         "async": "1.5.2",
-        "is-number-like": "^1.0.3"
+        "is-number-like": "1.0.8"
       }
     },
     "posix-character-classes": {
@@ -13556,9 +13556,9 @@
       "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
       "dev": true,
       "requires": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
+        "chalk": "2.4.1",
+        "source-map": "0.6.1",
+        "supports-color": "5.5.0"
       },
       "dependencies": {
         "source-map": {
@@ -13575,7 +13575,7 @@
       "integrity": "sha512-BIW982Kbf9/RikInNhNS3/GA6x/qY/+jhVS9KumqXZtU9ss8Yq15HhPJ6mnaXcU5bFq2ULxpOv96mHPAErpGMQ==",
       "dev": true,
       "requires": {
-        "htmlparser2": "^3.9.2"
+        "htmlparser2": "3.10.0"
       },
       "dependencies": {
         "domelementtype": {
@@ -13590,7 +13590,7 @@
           "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
           "dev": true,
           "requires": {
-            "domelementtype": "1"
+            "domelementtype": "1.3.0"
           }
         },
         "htmlparser2": {
@@ -13599,12 +13599,12 @@
           "integrity": "sha512-J1nEUGv+MkXS0weHNWVKJJ+UrLfePxRWpN3C9bEi9fLxL2+ggW94DQvgYVXsaT30PGwYRIZKNZXuyMhp3Di4bQ==",
           "dev": true,
           "requires": {
-            "domelementtype": "^1.3.0",
-            "domhandler": "^2.3.0",
-            "domutils": "^1.5.1",
-            "entities": "^1.1.1",
-            "inherits": "^2.0.1",
-            "readable-stream": "^3.0.6"
+            "domelementtype": "1.3.0",
+            "domhandler": "2.4.2",
+            "domutils": "1.5.1",
+            "entities": "1.1.2",
+            "inherits": "2.0.3",
+            "readable-stream": "3.0.6"
           }
         },
         "readable-stream": {
@@ -13613,9 +13613,9 @@
           "integrity": "sha512-9E1oLoOWfhSXHGv6QlwXJim7uNzd9EVlWK+21tCU9Ju/kR0/p2AZYPz4qSchgO8PlLIH4FpZYfzwS+rEksZjIg==",
           "dev": true,
           "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
+            "inherits": "2.0.3",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
           }
         }
       }
@@ -13626,10 +13626,10 @@
       "integrity": "sha512-5l327iI75POonjxkXgdRCUS+AlzAdBx4pOvMEhTKTCjb1p8IEeVR9yx3cPbmN7LIWJLbfnIXxAhoB4jpD0c/Cw==",
       "dev": true,
       "requires": {
-        "postcss": "^6.0.1",
-        "postcss-value-parser": "^3.2.3",
-        "read-cache": "^1.0.0",
-        "resolve": "^1.1.7"
+        "postcss": "6.0.23",
+        "postcss-value-parser": "3.3.1",
+        "read-cache": "1.0.0",
+        "resolve": "1.1.7"
       }
     },
     "postcss-jsx": {
@@ -13638,8 +13638,8 @@
       "integrity": "sha512-AU2/9QDmHYJRxTiniMt2bJ9fwCzVF6n00VnR4gdnFGHeXRW2mGwoptpuPgYjfivkdI8LlNIuo+w8TyS6a4JhJw==",
       "dev": true,
       "requires": {
-        "@babel/core": "^7.1.2",
-        "postcss-styled": ">=0.34.0"
+        "@babel/core": "7.1.6",
+        "postcss-styled": "0.34.0"
       }
     },
     "postcss-less": {
@@ -13648,7 +13648,7 @@
       "integrity": "sha512-+JBOampmDnuaf4w8OIEqkCiF+sOm/nWukDsC+1FTrYcIstptOISzGpYZk24Qh+Ewlmzmi53sRyiTbiGvMCDRwA==",
       "dev": true,
       "requires": {
-        "postcss": "^7.0.3"
+        "postcss": "7.0.6"
       },
       "dependencies": {
         "postcss": {
@@ -13657,9 +13657,9 @@
           "integrity": "sha512-Nq/rNjnHFcKgCDDZYO0lNsl6YWe6U7tTy+ESN+PnLxebL8uBtYX59HZqvrj7YLK5UCyll2hqDsJOo3ndzEW8Ug==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.5.0"
+            "chalk": "2.4.1",
+            "source-map": "0.6.1",
+            "supports-color": "5.5.0"
           }
         },
         "source-map": {
@@ -13676,8 +13676,8 @@
       "integrity": "sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==",
       "dev": true,
       "requires": {
-        "cosmiconfig": "^4.0.0",
-        "import-cwd": "^2.0.0"
+        "cosmiconfig": "4.0.0",
+        "import-cwd": "2.1.0"
       }
     },
     "postcss-loader": {
@@ -13686,10 +13686,10 @@
       "integrity": "sha512-hgiWSc13xVQAq25cVw80CH0l49ZKlAnU1hKPOdRrNj89bokRr/bZF2nT+hebPPF9c9xs8c3gw3Fr2nxtmXYnNg==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0",
-        "postcss": "^6.0.0",
-        "postcss-load-config": "^2.0.0",
-        "schema-utils": "^0.4.0"
+        "loader-utils": "1.1.0",
+        "postcss": "6.0.23",
+        "postcss-load-config": "2.0.0",
+        "schema-utils": "0.4.7"
       }
     },
     "postcss-markdown": {
@@ -13698,8 +13698,8 @@
       "integrity": "sha512-cKPggF9OMOKPoqDm5YpYszCqMsImFh78FK6P8p6IsEKZB6IkUJYKz0/QgadYy4jLb60jcFIHJ6v6jsMH7/ZQrA==",
       "dev": true,
       "requires": {
-        "remark": "^9.0.0",
-        "unist-util-find-all-after": "^1.0.2"
+        "remark": "9.0.0",
+        "unist-util-find-all-after": "1.0.2"
       }
     },
     "postcss-media-query-parser": {
@@ -13714,10 +13714,10 @@
       "integrity": "sha512-5xQXm1UPWuFObjbtyQzWvQaupru8yFcFi4HUlm6OPo1o2bUszYASuqRJ7bVArb3svGCdbYtqdMBKrqR1Aoy+tw==",
       "dev": true,
       "requires": {
-        "chalk": "^2.0.1",
-        "lodash": "^4.17.4",
-        "log-symbols": "^2.0.0",
-        "postcss": "^7.0.2"
+        "chalk": "2.4.1",
+        "lodash": "4.17.11",
+        "log-symbols": "2.2.0",
+        "postcss": "7.0.6"
       },
       "dependencies": {
         "postcss": {
@@ -13726,9 +13726,9 @@
           "integrity": "sha512-Nq/rNjnHFcKgCDDZYO0lNsl6YWe6U7tTy+ESN+PnLxebL8uBtYX59HZqvrj7YLK5UCyll2hqDsJOo3ndzEW8Ug==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.5.0"
+            "chalk": "2.4.1",
+            "source-map": "0.6.1",
+            "supports-color": "5.5.0"
           }
         },
         "source-map": {
@@ -13751,7 +13751,7 @@
       "integrity": "sha512-xZsFA3uX8MO3yAda03QrG3/Eg1LN3EPfjjf07vke/46HERLZyHrTsQ9E1r1w1W//fWEhtYNndo2hQplN2cVpCQ==",
       "dev": true,
       "requires": {
-        "postcss": "^7.0.0"
+        "postcss": "7.0.6"
       },
       "dependencies": {
         "postcss": {
@@ -13760,9 +13760,9 @@
           "integrity": "sha512-Nq/rNjnHFcKgCDDZYO0lNsl6YWe6U7tTy+ESN+PnLxebL8uBtYX59HZqvrj7YLK5UCyll2hqDsJOo3ndzEW8Ug==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.5.0"
+            "chalk": "2.4.1",
+            "source-map": "0.6.1",
+            "supports-color": "5.5.0"
           }
         },
         "source-map": {
@@ -13779,8 +13779,8 @@
       "integrity": "sha512-B5z2Kob4xBxFjcufFnhQ2HqJQ2y/Zs/ic5EZbCywCkxKd756Q40cIQ/veRDwSrw1BF6+4wUgmpm0sBASqVi65A==",
       "dev": true,
       "requires": {
-        "gonzales-pe": "^4.2.3",
-        "postcss": "^7.0.1"
+        "gonzales-pe": "4.2.3",
+        "postcss": "7.0.6"
       },
       "dependencies": {
         "postcss": {
@@ -13789,9 +13789,9 @@
           "integrity": "sha512-Nq/rNjnHFcKgCDDZYO0lNsl6YWe6U7tTy+ESN+PnLxebL8uBtYX59HZqvrj7YLK5UCyll2hqDsJOo3ndzEW8Ug==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.5.0"
+            "chalk": "2.4.1",
+            "source-map": "0.6.1",
+            "supports-color": "5.5.0"
           }
         },
         "source-map": {
@@ -13808,7 +13808,7 @@
       "integrity": "sha512-um9zdGKaDZirMm+kZFKKVsnKPF7zF7qBAtIfTSnZXD1jZ0JNZIxdB6TxQOjCnlSzLRInVl2v3YdBh/M881C4ug==",
       "dev": true,
       "requires": {
-        "postcss": "^7.0.0"
+        "postcss": "7.0.6"
       },
       "dependencies": {
         "postcss": {
@@ -13817,9 +13817,9 @@
           "integrity": "sha512-Nq/rNjnHFcKgCDDZYO0lNsl6YWe6U7tTy+ESN+PnLxebL8uBtYX59HZqvrj7YLK5UCyll2hqDsJOo3ndzEW8Ug==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.5.0"
+            "chalk": "2.4.1",
+            "source-map": "0.6.1",
+            "supports-color": "5.5.0"
           }
         },
         "source-map": {
@@ -13836,9 +13836,9 @@
       "integrity": "sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=",
       "dev": true,
       "requires": {
-        "dot-prop": "^4.1.1",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
+        "dot-prop": "4.2.0",
+        "indexes-of": "1.0.1",
+        "uniq": "1.0.1"
       }
     },
     "postcss-styled": {
@@ -13859,11 +13859,11 @@
       "integrity": "sha512-QMV5mA+pCYZQcUEPQkmor9vcPQ2MT+Ipuu8qdi1gVxbNiIiErEGft+eny1ak19qALoBkccS5AHaCaCDzh7b9MA==",
       "dev": true,
       "requires": {
-        "mime": "^1.4.1",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.0",
-        "postcss": "^6.0.1",
-        "xxhashjs": "^0.2.1"
+        "mime": "1.6.0",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.1",
+        "postcss": "6.0.23",
+        "xxhashjs": "0.2.2"
       }
     },
     "postcss-value-parser": {
@@ -13902,8 +13902,8 @@
       "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=",
       "dev": true,
       "requires": {
-        "renderkid": "^2.0.1",
-        "utila": "~0.4"
+        "renderkid": "2.0.2",
+        "utila": "0.4.0"
       }
     },
     "prettycli": {
@@ -13921,9 +13921,9 @@
           "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^3.1.0",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^4.0.0"
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "4.5.0"
           }
         },
         "has-flag": {
@@ -13938,7 +13938,7 @@
           "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
           "dev": true,
           "requires": {
-            "has-flag": "^2.0.0"
+            "has-flag": "2.0.0"
           }
         }
       }
@@ -13973,7 +13973,7 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "asap": "~2.0.3"
+        "asap": "2.0.6"
       }
     },
     "promise-inflight": {
@@ -13989,7 +13989,7 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "with-callback": "^1.0.2"
+        "with-callback": "1.0.2"
       }
     },
     "proto-list": {
@@ -14004,22 +14004,22 @@
       "integrity": "sha512-ORey5ewQMYiXQxcQohsqEiKYOg/r5yJoJbt0tuROmmgajdg/CA3gTOZNIFJncUVMAJIk5YFqBBLUjKVmQO6tfA==",
       "dev": true,
       "requires": {
-        "@types/node": "^6.0.46",
-        "@types/q": "^0.0.32",
-        "@types/selenium-webdriver": "^3.0.0",
-        "blocking-proxy": "^1.0.0",
-        "browserstack": "^1.5.1",
-        "chalk": "^1.1.3",
-        "glob": "^7.0.3",
+        "@types/node": "6.0.90",
+        "@types/q": "0.0.32",
+        "@types/selenium-webdriver": "3.0.12",
+        "blocking-proxy": "1.0.1",
+        "browserstack": "1.5.1",
+        "chalk": "1.1.3",
+        "glob": "7.1.3",
         "jasmine": "2.8.0",
-        "jasminewd2": "^2.1.0",
-        "optimist": "~0.6.0",
+        "jasminewd2": "2.2.0",
+        "optimist": "0.6.1",
         "q": "1.4.1",
-        "saucelabs": "^1.5.0",
+        "saucelabs": "1.5.0",
         "selenium-webdriver": "3.6.0",
-        "source-map-support": "~0.4.0",
+        "source-map-support": "0.4.18",
         "webdriver-js-extender": "2.1.0",
-        "webdriver-manager": "^12.0.6"
+        "webdriver-manager": "12.1.0"
       },
       "dependencies": {
         "ansi-regex": {
@@ -14040,11 +14040,11 @@
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "del": {
@@ -14053,13 +14053,13 @@
           "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
           "dev": true,
           "requires": {
-            "globby": "^5.0.0",
-            "is-path-cwd": "^1.0.0",
-            "is-path-in-cwd": "^1.0.0",
-            "object-assign": "^4.0.1",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0",
-            "rimraf": "^2.2.8"
+            "globby": "5.0.0",
+            "is-path-cwd": "1.0.0",
+            "is-path-in-cwd": "1.0.1",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1",
+            "rimraf": "2.6.2"
           }
         },
         "globby": {
@@ -14068,12 +14068,12 @@
           "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
           "dev": true,
           "requires": {
-            "array-union": "^1.0.1",
-            "arrify": "^1.0.0",
-            "glob": "^7.0.3",
-            "object-assign": "^4.0.1",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "array-union": "1.0.2",
+            "arrify": "1.0.1",
+            "glob": "7.1.3",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
           }
         },
         "minimist": {
@@ -14100,7 +14100,7 @@
           "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
           "dev": true,
           "requires": {
-            "source-map": "^0.5.6"
+            "source-map": "0.5.6"
           }
         },
         "strip-ansi": {
@@ -14109,7 +14109,7 @@
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "2.1.1"
           }
         },
         "supports-color": {
@@ -14124,17 +14124,17 @@
           "integrity": "sha512-oEc5fmkpz6Yh6udhwir5m0eN5mgRPq9P/NU5YWuT3Up5slt6Zz+znhLU7q4+8rwCZz/Qq3Fgpr/4oao7NPCm2A==",
           "dev": true,
           "requires": {
-            "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.87.0",
-            "rimraf": "^2.5.2",
-            "semver": "^5.3.0",
-            "xml2js": "^0.4.17"
+            "adm-zip": "0.4.11",
+            "chalk": "1.1.3",
+            "del": "2.2.2",
+            "glob": "7.1.3",
+            "ini": "1.3.5",
+            "minimist": "1.2.0",
+            "q": "1.4.1",
+            "request": "2.88.0",
+            "rimraf": "2.6.2",
+            "semver": "5.6.0",
+            "xml2js": "0.4.19"
           }
         }
       }
@@ -14146,11 +14146,11 @@
       "dev": true,
       "requires": {
         "fs": "0.0.1-security",
-        "fs-extra": "^1.0.0",
-        "jasmine-reporters": "^2.3.0",
-        "lodash": "^4.17.5",
-        "path": "^0.12.7",
-        "xmldoc": "^0.5.1"
+        "fs-extra": "1.0.0",
+        "jasmine-reporters": "2.3.2",
+        "lodash": "4.17.11",
+        "path": "0.12.7",
+        "xmldoc": "0.5.1"
       },
       "dependencies": {
         "fs-extra": {
@@ -14159,9 +14159,9 @@
           "integrity": "sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^2.1.0",
-            "klaw": "^1.0.0"
+            "graceful-fs": "4.1.11",
+            "jsonfile": "2.4.0",
+            "klaw": "1.3.1"
           }
         },
         "jsonfile": {
@@ -14170,7 +14170,7 @@
           "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.6"
+            "graceful-fs": "4.1.11"
           }
         }
       }
@@ -14180,15 +14180,15 @@
       "resolved": "https://registry.npmjs.org/protractor-retry/-/protractor-retry-1.2.6.tgz",
       "integrity": "sha512-lO9lGgM1Hj0K4N7JxmsW70vkgHY3deaeIgbRb9hw5CJB1LRPpjj7Jo1e3guORSxdbHeS7ykR/CW+1hD3+Oql/Q==",
       "requires": {
-        "array-unique": "~0.3.2",
-        "chai": "3.x",
-        "chai-as-promised": "5.x",
-        "debug": "^2.1.1",
-        "lodash": "^4.13.1",
-        "mkdirp": "^0.5.1",
-        "q": "^1.4.1",
-        "xml2js": "~0.4.17",
-        "yargs": "^11.0.0"
+        "array-unique": "0.3.2",
+        "chai": "3.5.0",
+        "chai-as-promised": "5.3.0",
+        "debug": "2.6.9",
+        "lodash": "4.17.11",
+        "mkdirp": "0.5.1",
+        "q": "1.5.1",
+        "xml2js": "0.4.19",
+        "yargs": "11.1.0"
       },
       "dependencies": {
         "debug": {
@@ -14212,7 +14212,7 @@
       "integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==",
       "dev": true,
       "requires": {
-        "forwarded": "~0.1.2",
+        "forwarded": "0.1.2",
         "ipaddr.js": "1.8.0"
       }
     },
@@ -14223,14 +14223,14 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "agent-base": "^4.2.0",
-        "debug": "^3.1.0",
-        "http-proxy-agent": "^2.1.0",
-        "https-proxy-agent": "^2.2.1",
-        "lru-cache": "^4.1.2",
-        "pac-proxy-agent": "^3.0.0",
-        "proxy-from-env": "^1.0.0",
-        "socks-proxy-agent": "^4.0.1"
+        "agent-base": "4.2.1",
+        "debug": "3.2.6",
+        "http-proxy-agent": "2.1.0",
+        "https-proxy-agent": "2.2.1",
+        "lru-cache": "4.1.3",
+        "pac-proxy-agent": "3.0.0",
+        "proxy-from-env": "1.0.0",
+        "socks-proxy-agent": "4.0.1"
       }
     },
     "proxy-from-env": {
@@ -14251,7 +14251,7 @@
       "resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.2.0.tgz",
       "integrity": "sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==",
       "requires": {
-        "event-stream": "=3.3.4"
+        "event-stream": "3.3.4"
       }
     },
     "pseudomap": {
@@ -14271,12 +14271,12 @@
       "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
       "dev": true,
       "requires": {
-        "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"
+        "bn.js": "4.11.8",
+        "browserify-rsa": "4.0.1",
+        "create-hash": "1.2.0",
+        "parse-asn1": "5.1.1",
+        "randombytes": "2.0.6",
+        "safe-buffer": "5.1.2"
       }
     },
     "pump": {
@@ -14285,8 +14285,8 @@
       "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
       "dev": true,
       "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
+        "end-of-stream": "1.4.1",
+        "once": "1.4.0"
       }
     },
     "pumpify": {
@@ -14295,9 +14295,9 @@
       "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
       "dev": true,
       "requires": {
-        "duplexify": "^3.6.0",
-        "inherits": "^2.0.3",
-        "pump": "^2.0.0"
+        "duplexify": "3.6.1",
+        "inherits": "2.0.3",
+        "pump": "2.0.1"
       }
     },
     "punycode": {
@@ -14351,9 +14351,9 @@
       "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
       "dev": true,
       "requires": {
-        "is-number": "^4.0.0",
-        "kind-of": "^6.0.0",
-        "math-random": "^1.0.1"
+        "is-number": "4.0.0",
+        "kind-of": "6.0.2",
+        "math-random": "1.0.1"
       },
       "dependencies": {
         "is-number": {
@@ -14370,7 +14370,7 @@
       "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
       "dev": true,
       "requires": {
-        "safe-buffer": "^5.1.0"
+        "safe-buffer": "5.1.2"
       }
     },
     "randomfill": {
@@ -14379,8 +14379,8 @@
       "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
       "dev": true,
       "requires": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
+        "randombytes": "2.0.6",
+        "safe-buffer": "5.1.2"
       }
     },
     "range-parser": {
@@ -14421,10 +14421,10 @@
       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
       "dev": true,
       "requires": {
-        "deep-extend": "^0.6.0",
-        "ini": "~1.3.0",
-        "minimist": "^1.2.0",
-        "strip-json-comments": "~2.0.1"
+        "deep-extend": "0.6.0",
+        "ini": "1.3.5",
+        "minimist": "1.2.0",
+        "strip-json-comments": "2.0.1"
       },
       "dependencies": {
         "deep-extend": {
@@ -14447,7 +14447,7 @@
       "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
       "dev": true,
       "requires": {
-        "pify": "^2.3.0"
+        "pify": "2.3.0"
       },
       "dependencies": {
         "pify": {
@@ -14464,9 +14464,9 @@
       "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
       "dev": true,
       "requires": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
+        "load-json-file": "1.1.0",
+        "normalize-package-data": "2.4.0",
+        "path-type": "1.1.0"
       },
       "dependencies": {
         "path-type": {
@@ -14475,9 +14475,9 @@
           "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "graceful-fs": "4.1.11",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
           }
         },
         "pify": {
@@ -14494,8 +14494,8 @@
       "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
       "dev": true,
       "requires": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
+        "find-up": "1.1.2",
+        "read-pkg": "1.1.0"
       },
       "dependencies": {
         "find-up": {
@@ -14504,8 +14504,8 @@
           "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
           "dev": true,
           "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "path-exists": "2.1.0",
+            "pinkie-promise": "2.0.1"
           }
         },
         "path-exists": {
@@ -14514,7 +14514,7 @@
           "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
           "dev": true,
           "requires": {
-            "pinkie-promise": "^2.0.0"
+            "pinkie-promise": "2.0.1"
           }
         }
       }
@@ -14524,13 +14524,13 @@
       "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
       "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
       "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
+        "core-util-is": "1.0.2",
+        "inherits": "2.0.3",
+        "isarray": "1.0.0",
+        "process-nextick-args": "2.0.0",
+        "safe-buffer": "5.1.2",
+        "string_decoder": "1.1.1",
+        "util-deprecate": "1.0.2"
       }
     },
     "readdirp": {
@@ -14539,9 +14539,9 @@
       "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.11",
-        "micromatch": "^3.1.10",
-        "readable-stream": "^2.0.2"
+        "graceful-fs": "4.1.11",
+        "micromatch": "3.1.10",
+        "readable-stream": "2.3.6"
       }
     },
     "rechoir": {
@@ -14550,7 +14550,7 @@
       "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
       "dev": true,
       "requires": {
-        "resolve": "^1.1.6"
+        "resolve": "1.1.7"
       }
     },
     "redent": {
@@ -14559,8 +14559,8 @@
       "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
       "dev": true,
       "requires": {
-        "indent-string": "^2.1.0",
-        "strip-indent": "^1.0.1"
+        "indent-string": "2.1.0",
+        "strip-indent": "1.0.1"
       }
     },
     "redis": {
@@ -14570,9 +14570,9 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "double-ended-queue": "^2.1.0-0",
-        "redis-commands": "^1.2.0",
-        "redis-parser": "^2.6.0"
+        "double-ended-queue": "2.1.0-0",
+        "redis-commands": "1.4.0",
+        "redis-parser": "2.6.0"
       }
     },
     "redis-commands": {
@@ -14611,7 +14611,7 @@
       "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
       "dev": true,
       "requires": {
-        "is-equal-shallow": "^0.1.3"
+        "is-equal-shallow": "0.1.3"
       }
     },
     "regex-not": {
@@ -14620,8 +14620,8 @@
       "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
       "dev": true,
       "requires": {
-        "extend-shallow": "^3.0.2",
-        "safe-regex": "^1.1.0"
+        "extend-shallow": "3.0.2",
+        "safe-regex": "1.1.0"
       }
     },
     "regexpu-core": {
@@ -14629,9 +14629,9 @@
       "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz",
       "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
       "requires": {
-        "regenerate": "^1.2.1",
-        "regjsgen": "^0.2.0",
-        "regjsparser": "^0.1.4"
+        "regenerate": "1.4.0",
+        "regjsgen": "0.2.0",
+        "regjsparser": "0.1.5"
       }
     },
     "registry-auth-token": {
@@ -14640,8 +14640,8 @@
       "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==",
       "dev": true,
       "requires": {
-        "rc": "^1.1.6",
-        "safe-buffer": "^5.0.1"
+        "rc": "1.2.8",
+        "safe-buffer": "5.1.2"
       }
     },
     "registry-url": {
@@ -14650,7 +14650,7 @@
       "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
       "dev": true,
       "requires": {
-        "rc": "^1.0.1"
+        "rc": "1.2.8"
       }
     },
     "regjsgen": {
@@ -14663,7 +14663,7 @@
       "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
       "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
       "requires": {
-        "jsesc": "~0.5.0"
+        "jsesc": "0.5.0"
       }
     },
     "relateurl": {
@@ -14678,11 +14678,11 @@
       "integrity": "sha512-Itv3XvYjD6G+9xDzAeFohx4GUwbFjfqFt0UXlC826jHR18E49fEiEGqZUxUASwMq4z7wwUv2H9/XF2d6qj0iaQ==",
       "dev": true,
       "requires": {
-        "amdefine": "^1.0.0",
+        "amdefine": "1.0.1",
         "istanbul": "0.4.5",
-        "minimatch": "^3.0.3",
-        "plugin-error": "^0.1.2",
-        "source-map": "^0.6.1",
+        "minimatch": "3.0.4",
+        "plugin-error": "0.1.2",
+        "source-map": "0.6.1",
         "through2": "2.0.1"
       },
       "dependencies": {
@@ -14698,12 +14698,12 @@
           "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
           "dev": true,
           "requires": {
-            "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"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "string_decoder": "0.10.31",
+            "util-deprecate": "1.0.2"
           }
         },
         "source-map": {
@@ -14724,8 +14724,8 @@
           "integrity": "sha1-OE51MU1J8y3hLuu4E2uOtrXVnak=",
           "dev": true,
           "requires": {
-            "readable-stream": "~2.0.0",
-            "xtend": "~4.0.0"
+            "readable-stream": "2.0.6",
+            "xtend": "4.0.1"
           }
         }
       }
@@ -14736,9 +14736,9 @@
       "integrity": "sha512-amw8rGdD5lHbMEakiEsllmkdBP+/KpjW/PRK6NSGPZKCQowh0BT4IWXDAkRMyG3SB9dKPXWMviFjNusXzXNn3A==",
       "dev": true,
       "requires": {
-        "remark-parse": "^5.0.0",
-        "remark-stringify": "^5.0.0",
-        "unified": "^6.0.0"
+        "remark-parse": "5.0.0",
+        "remark-stringify": "5.0.0",
+        "unified": "6.2.0"
       }
     },
     "remark-frontmatter": {
@@ -14747,8 +14747,8 @@
       "integrity": "sha512-IUE/T91prnrs2law1DlSLJ9I2vSM+YkfcPfBId8OMvzjZh2sTt0lQVxtsQaY7TcA92TDOApQhCXKgfemz0l5dw==",
       "dev": true,
       "requires": {
-        "fault": "^1.0.1",
-        "xtend": "^4.0.1"
+        "fault": "1.0.2",
+        "xtend": "4.0.1"
       }
     },
     "remark-parse": {
@@ -14757,21 +14757,21 @@
       "integrity": "sha512-b3iXszZLH1TLoyUzrATcTQUZrwNl1rE70rVdSruJFlDaJ9z5aMkhrG43Pp68OgfHndL/ADz6V69Zow8cTQu+JA==",
       "dev": true,
       "requires": {
-        "collapse-white-space": "^1.0.2",
-        "is-alphabetical": "^1.0.0",
-        "is-decimal": "^1.0.0",
-        "is-whitespace-character": "^1.0.0",
-        "is-word-character": "^1.0.0",
-        "markdown-escapes": "^1.0.0",
-        "parse-entities": "^1.1.0",
-        "repeat-string": "^1.5.4",
-        "state-toggle": "^1.0.0",
+        "collapse-white-space": "1.0.4",
+        "is-alphabetical": "1.0.2",
+        "is-decimal": "1.0.2",
+        "is-whitespace-character": "1.0.2",
+        "is-word-character": "1.0.2",
+        "markdown-escapes": "1.0.2",
+        "parse-entities": "1.2.0",
+        "repeat-string": "1.6.1",
+        "state-toggle": "1.0.1",
         "trim": "0.0.1",
-        "trim-trailing-lines": "^1.0.0",
-        "unherit": "^1.0.4",
-        "unist-util-remove-position": "^1.0.0",
-        "vfile-location": "^2.0.0",
-        "xtend": "^4.0.1"
+        "trim-trailing-lines": "1.1.1",
+        "unherit": "1.1.1",
+        "unist-util-remove-position": "1.1.2",
+        "vfile-location": "2.0.3",
+        "xtend": "4.0.1"
       }
     },
     "remark-stringify": {
@@ -14780,20 +14780,20 @@
       "integrity": "sha512-Ws5MdA69ftqQ/yhRF9XhVV29mhxbfGhbz0Rx5bQH+oJcNhhSM6nCu1EpLod+DjrFGrU0BMPs+czVmJZU7xiS7w==",
       "dev": true,
       "requires": {
-        "ccount": "^1.0.0",
-        "is-alphanumeric": "^1.0.0",
-        "is-decimal": "^1.0.0",
-        "is-whitespace-character": "^1.0.0",
-        "longest-streak": "^2.0.1",
-        "markdown-escapes": "^1.0.0",
-        "markdown-table": "^1.1.0",
-        "mdast-util-compact": "^1.0.0",
-        "parse-entities": "^1.0.2",
-        "repeat-string": "^1.5.4",
-        "state-toggle": "^1.0.0",
-        "stringify-entities": "^1.0.1",
-        "unherit": "^1.0.4",
-        "xtend": "^4.0.1"
+        "ccount": "1.0.3",
+        "is-alphanumeric": "1.0.0",
+        "is-decimal": "1.0.2",
+        "is-whitespace-character": "1.0.2",
+        "longest-streak": "2.0.2",
+        "markdown-escapes": "1.0.2",
+        "markdown-table": "1.1.2",
+        "mdast-util-compact": "1.0.2",
+        "parse-entities": "1.2.0",
+        "repeat-string": "1.6.1",
+        "state-toggle": "1.0.1",
+        "stringify-entities": "1.3.2",
+        "unherit": "1.1.1",
+        "xtend": "4.0.1"
       }
     },
     "remarkable": {
@@ -14802,8 +14802,8 @@
       "integrity": "sha1-qspJchALZqZCpjoQIcpLrBvjv/Y=",
       "dev": true,
       "requires": {
-        "argparse": "~0.1.15",
-        "autolinker": "~0.15.0"
+        "argparse": "0.1.16",
+        "autolinker": "0.15.3"
       },
       "dependencies": {
         "argparse": {
@@ -14812,8 +14812,8 @@
           "integrity": "sha1-z9AeD7uj1srtBJ+9dY1A9lGW9Xw=",
           "dev": true,
           "requires": {
-            "underscore": "~1.7.0",
-            "underscore.string": "~2.4.0"
+            "underscore": "1.7.0",
+            "underscore.string": "2.4.0"
           }
         },
         "underscore": {
@@ -14836,11 +14836,11 @@
       "integrity": "sha512-FsygIxevi1jSiPY9h7vZmBFUbAOcbYm9UwyiLNdVsLRs/5We9Ob5NMPbGYUTWiLq5L+ezlVdE0A8bbME5CWTpg==",
       "dev": true,
       "requires": {
-        "css-select": "^1.1.0",
-        "dom-converter": "~0.2",
-        "htmlparser2": "~3.3.0",
-        "strip-ansi": "^3.0.0",
-        "utila": "^0.4.0"
+        "css-select": "1.2.0",
+        "dom-converter": "0.2.0",
+        "htmlparser2": "3.3.0",
+        "strip-ansi": "3.0.1",
+        "utila": "0.4.0"
       },
       "dependencies": {
         "ansi-regex": {
@@ -14855,7 +14855,7 @@
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "2.1.1"
           }
         }
       }
@@ -14878,7 +14878,7 @@
       "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
       "dev": true,
       "requires": {
-        "is-finite": "^1.0.0"
+        "is-finite": "1.0.2"
       }
     },
     "replace-ext": {
@@ -14893,26 +14893,26 @@
       "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
       "dev": true,
       "requires": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.0",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.4.3",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
+        "aws-sign2": "0.7.0",
+        "aws4": "1.8.0",
+        "caseless": "0.12.0",
+        "combined-stream": "1.0.7",
+        "extend": "3.0.2",
+        "forever-agent": "0.6.1",
+        "form-data": "2.3.3",
+        "har-validator": "5.1.0",
+        "http-signature": "1.2.0",
+        "is-typedarray": "1.0.0",
+        "isstream": "0.1.2",
+        "json-stringify-safe": "5.0.1",
+        "mime-types": "2.1.21",
+        "oauth-sign": "0.9.0",
+        "performance-now": "2.1.0",
+        "qs": "6.5.2",
+        "safe-buffer": "5.1.2",
+        "tough-cookie": "2.4.3",
+        "tunnel-agent": "0.6.0",
+        "uuid": "3.3.2"
       }
     },
     "requestretry": {
@@ -14922,10 +14922,10 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "extend": "^3.0.0",
-        "lodash": "^4.15.0",
-        "request": "^2.74.0",
-        "when": "^3.7.7"
+        "extend": "3.0.2",
+        "lodash": "4.17.11",
+        "request": "2.88.0",
+        "when": "3.7.8"
       }
     },
     "require-directory": {
@@ -14961,7 +14961,7 @@
       "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
       "dev": true,
       "requires": {
-        "resolve-from": "^3.0.0"
+        "resolve-from": "3.0.0"
       }
     },
     "resolve-dir": {
@@ -14970,8 +14970,8 @@
       "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
       "dev": true,
       "requires": {
-        "expand-tilde": "^2.0.0",
-        "global-modules": "^1.0.0"
+        "expand-tilde": "2.0.2",
+        "global-modules": "1.0.0"
       }
     },
     "resolve-from": {
@@ -14992,8 +14992,8 @@
       "integrity": "sha1-sSTeXE+6/LpUH0j/pzlw9KpFa08=",
       "dev": true,
       "requires": {
-        "debug": "^2.2.0",
-        "minimatch": "^3.0.2"
+        "debug": "2.6.9",
+        "minimatch": "3.0.4"
       },
       "dependencies": {
         "debug": {
@@ -15019,8 +15019,8 @@
       "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
       "dev": true,
       "requires": {
-        "onetime": "^2.0.0",
-        "signal-exit": "^3.0.2"
+        "onetime": "2.0.1",
+        "signal-exit": "3.0.2"
       }
     },
     "ret": {
@@ -15041,7 +15041,7 @@
       "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
       "dev": true,
       "requires": {
-        "align-text": "^0.1.1"
+        "align-text": "0.1.4"
       }
     },
     "rimraf": {
@@ -15050,7 +15050,7 @@
       "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
       "dev": true,
       "requires": {
-        "glob": "^7.0.5"
+        "glob": "7.1.3"
       }
     },
     "ripemd160": {
@@ -15059,8 +15059,8 @@
       "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
       "dev": true,
       "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
+        "hash-base": "3.0.4",
+        "inherits": "2.0.3"
       }
     },
     "rollup": {
@@ -15070,7 +15070,7 @@
       "dev": true,
       "requires": {
         "@types/estree": "0.0.39",
-        "@types/node": "*"
+        "@types/node": "6.0.90"
       }
     },
     "rollup-plugin-commonjs": {
@@ -15079,10 +15079,10 @@
       "integrity": "sha512-0RM5U4Vd6iHjL6rLvr3lKBwnPsaVml+qxOGaaNUWN1lSq6S33KhITOfHmvxV3z2vy9Mk4t0g4rNlVaJJsNQPWA==",
       "dev": true,
       "requires": {
-        "estree-walker": "^0.5.2",
-        "magic-string": "^0.25.1",
-        "resolve": "^1.8.1",
-        "rollup-pluginutils": "^2.3.3"
+        "estree-walker": "0.5.2",
+        "magic-string": "0.25.1",
+        "resolve": "1.8.1",
+        "rollup-pluginutils": "2.3.3"
       },
       "dependencies": {
         "resolve": {
@@ -15091,7 +15091,7 @@
           "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==",
           "dev": true,
           "requires": {
-            "path-parse": "^1.0.5"
+            "path-parse": "1.0.6"
           }
         }
       }
@@ -15102,9 +15102,9 @@
       "integrity": "sha512-PJcd85dxfSBWih84ozRtBkB731OjXk0KnzN0oGp7WOWcarAFkVa71cV5hTJg2qpVsV2U8EUwrzHP3tvy9vS3qg==",
       "dev": true,
       "requires": {
-        "builtin-modules": "^2.0.0",
-        "is-module": "^1.0.0",
-        "resolve": "^1.1.6"
+        "builtin-modules": "2.0.0",
+        "is-module": "1.0.0",
+        "resolve": "1.1.7"
       },
       "dependencies": {
         "builtin-modules": {
@@ -15121,8 +15121,8 @@
       "integrity": "sha1-YhJaqUCHqt97g+9N+vYptHMTXoc=",
       "dev": true,
       "requires": {
-        "rollup-pluginutils": "^2.0.1",
-        "source-map-resolve": "^0.5.0"
+        "rollup-pluginutils": "2.3.3",
+        "source-map-resolve": "0.5.2"
       }
     },
     "rollup-pluginutils": {
@@ -15131,8 +15131,8 @@
       "integrity": "sha512-2XZwja7b6P5q4RZ5FhyX1+f46xi1Z3qBKigLRZ6VTZjwbN0K1IFGMlwm06Uu0Emcre2Z63l77nq/pzn+KxIEoA==",
       "dev": true,
       "requires": {
-        "estree-walker": "^0.5.2",
-        "micromatch": "^2.3.11"
+        "estree-walker": "0.5.2",
+        "micromatch": "2.3.11"
       },
       "dependencies": {
         "arr-diff": {
@@ -15141,7 +15141,7 @@
           "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
           "dev": true,
           "requires": {
-            "arr-flatten": "^1.0.1"
+            "arr-flatten": "1.1.0"
           }
         },
         "array-unique": {
@@ -15156,9 +15156,9 @@
           "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
           "dev": true,
           "requires": {
-            "expand-range": "^1.8.1",
-            "preserve": "^0.2.0",
-            "repeat-element": "^1.1.2"
+            "expand-range": "1.8.2",
+            "preserve": "0.2.0",
+            "repeat-element": "1.1.3"
           }
         },
         "expand-brackets": {
@@ -15167,7 +15167,7 @@
           "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
           "dev": true,
           "requires": {
-            "is-posix-bracket": "^0.1.0"
+            "is-posix-bracket": "0.1.1"
           }
         },
         "extglob": {
@@ -15176,7 +15176,7 @@
           "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
           "dev": true,
           "requires": {
-            "is-extglob": "^1.0.0"
+            "is-extglob": "1.0.0"
           }
         },
         "is-extglob": {
@@ -15191,7 +15191,7 @@
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
           "requires": {
-            "is-extglob": "^1.0.0"
+            "is-extglob": "1.0.0"
           }
         },
         "kind-of": {
@@ -15200,7 +15200,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         },
         "micromatch": {
@@ -15209,19 +15209,19 @@
           "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
           "dev": true,
           "requires": {
-            "arr-diff": "^2.0.0",
-            "array-unique": "^0.2.1",
-            "braces": "^1.8.2",
-            "expand-brackets": "^0.1.4",
-            "extglob": "^0.3.1",
-            "filename-regex": "^2.0.0",
-            "is-extglob": "^1.0.0",
-            "is-glob": "^2.0.1",
-            "kind-of": "^3.0.2",
-            "normalize-path": "^2.0.1",
-            "object.omit": "^2.0.0",
-            "parse-glob": "^3.0.4",
-            "regex-cache": "^0.4.2"
+            "arr-diff": "2.0.0",
+            "array-unique": "0.2.1",
+            "braces": "1.8.5",
+            "expand-brackets": "0.1.5",
+            "extglob": "0.3.2",
+            "filename-regex": "2.0.1",
+            "is-extglob": "1.0.0",
+            "is-glob": "2.0.1",
+            "kind-of": "3.2.2",
+            "normalize-path": "2.1.1",
+            "object.omit": "2.0.1",
+            "parse-glob": "3.0.4",
+            "regex-cache": "0.4.4"
           }
         }
       }
@@ -15238,7 +15238,7 @@
       "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
       "dev": true,
       "requires": {
-        "is-promise": "^2.1.0"
+        "is-promise": "2.1.0"
       }
     },
     "run-node": {
@@ -15253,7 +15253,7 @@
       "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
       "dev": true,
       "requires": {
-        "aproba": "^1.1.1"
+        "aproba": "1.2.0"
       }
     },
     "run-sequence": {
@@ -15262,8 +15262,8 @@
       "integrity": "sha1-UJWgvr6YczsBQL0I3YDsAw3azes=",
       "dev": true,
       "requires": {
-        "chalk": "*",
-        "gulp-util": "*"
+        "chalk": "2.4.1",
+        "gulp-util": "3.0.7"
       }
     },
     "rx": {
@@ -15277,7 +15277,7 @@
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
       "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "rxjs-stream": {
@@ -15292,11 +15292,11 @@
       "integrity": "sha512-5mjt+gKdnYLMplZfvhwrgXdpGMyzhlyzUWN3KNdu6IOiPzSfPeDXvsThg37l70Lt/JcBP7PBVhHrbuEJjwcpcA==",
       "dev": true,
       "requires": {
-        "@phenomnomnominal/tsquery": "^2.0.0",
-        "decamelize": "^2.0.0",
-        "resolve": "^1.4.0",
-        "tslib": "^1.8.0",
-        "tsutils": "^3.0.0"
+        "@phenomnomnominal/tsquery": "2.1.1",
+        "decamelize": "2.0.0",
+        "resolve": "1.8.1",
+        "tslib": "1.9.3",
+        "tsutils": "3.2.0"
       },
       "dependencies": {
         "decamelize": {
@@ -15314,7 +15314,7 @@
           "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==",
           "dev": true,
           "requires": {
-            "path-parse": "^1.0.5"
+            "path-parse": "1.0.6"
           }
         }
       }
@@ -15330,7 +15330,7 @@
       "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
       "dev": true,
       "requires": {
-        "ret": "~0.1.10"
+        "ret": "0.1.15"
       }
     },
     "safer-buffer": {
@@ -15345,10 +15345,10 @@
       "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
       "dev": true,
       "requires": {
-        "glob": "^7.0.0",
-        "lodash": "^4.0.0",
-        "scss-tokenizer": "^0.2.3",
-        "yargs": "^7.0.0"
+        "glob": "7.1.3",
+        "lodash": "4.17.11",
+        "scss-tokenizer": "0.2.3",
+        "yargs": "7.1.0"
       },
       "dependencies": {
         "ansi-regex": {
@@ -15369,9 +15369,9 @@
           "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
           "dev": true,
           "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wrap-ansi": "^2.0.0"
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wrap-ansi": "2.1.0"
           }
         },
         "is-fullwidth-code-point": {
@@ -15380,7 +15380,7 @@
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
           "requires": {
-            "number-is-nan": "^1.0.0"
+            "number-is-nan": "1.0.1"
           }
         },
         "os-locale": {
@@ -15389,7 +15389,7 @@
           "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
           "dev": true,
           "requires": {
-            "lcid": "^1.0.0"
+            "lcid": "1.0.0"
           }
         },
         "string-width": {
@@ -15398,9 +15398,9 @@
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
           "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
           }
         },
         "strip-ansi": {
@@ -15409,7 +15409,7 @@
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "2.1.1"
           }
         },
         "which-module": {
@@ -15424,19 +15424,19 @@
           "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
           "dev": true,
           "requires": {
-            "camelcase": "^3.0.0",
-            "cliui": "^3.2.0",
-            "decamelize": "^1.1.1",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^1.4.0",
-            "read-pkg-up": "^1.0.1",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^1.0.2",
-            "which-module": "^1.0.0",
-            "y18n": "^3.2.1",
-            "yargs-parser": "^5.0.0"
+            "camelcase": "3.0.0",
+            "cliui": "3.2.0",
+            "decamelize": "1.2.0",
+            "get-caller-file": "1.0.3",
+            "os-locale": "1.4.0",
+            "read-pkg-up": "1.0.1",
+            "require-directory": "2.1.1",
+            "require-main-filename": "1.0.1",
+            "set-blocking": "2.0.0",
+            "string-width": "1.0.2",
+            "which-module": "1.0.0",
+            "y18n": "3.2.1",
+            "yargs-parser": "5.0.0"
           }
         },
         "yargs-parser": {
@@ -15445,7 +15445,7 @@
           "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
           "dev": true,
           "requires": {
-            "camelcase": "^3.0.0"
+            "camelcase": "3.0.0"
           }
         }
       }
@@ -15456,11 +15456,11 @@
       "integrity": "sha1-qEeRDzZEKqVsWYWHnVTrUZ4koyg=",
       "dev": true,
       "requires": {
-        "async": "^2.1.5",
-        "clone-deep": "^0.2.4",
-        "loader-utils": "^1.0.1",
-        "lodash.tail": "^4.1.1",
-        "pify": "^2.3.0"
+        "async": "2.6.1",
+        "clone-deep": "0.2.4",
+        "loader-utils": "1.1.0",
+        "lodash.tail": "4.1.1",
+        "pify": "2.3.0"
       },
       "dependencies": {
         "async": {
@@ -15469,7 +15469,7 @@
           "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
           "dev": true,
           "requires": {
-            "lodash": "^4.17.10"
+            "lodash": "4.17.11"
           }
         },
         "clone-deep": {
@@ -15478,11 +15478,11 @@
           "integrity": "sha1-TnPdCen7lxzDhnDF3O2cGJZIHMY=",
           "dev": true,
           "requires": {
-            "for-own": "^0.1.3",
-            "is-plain-object": "^2.0.1",
-            "kind-of": "^3.0.2",
-            "lazy-cache": "^1.0.3",
-            "shallow-clone": "^0.1.2"
+            "for-own": "0.1.5",
+            "is-plain-object": "2.0.4",
+            "kind-of": "3.2.2",
+            "lazy-cache": "1.0.4",
+            "shallow-clone": "0.1.2"
           }
         },
         "for-own": {
@@ -15491,7 +15491,7 @@
           "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
           "dev": true,
           "requires": {
-            "for-in": "^1.0.1"
+            "for-in": "1.0.2"
           }
         },
         "kind-of": {
@@ -15500,7 +15500,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         },
         "lazy-cache": {
@@ -15521,10 +15521,10 @@
           "integrity": "sha1-WQnodLp3EG1zrEFM/sH/yofZcGA=",
           "dev": true,
           "requires": {
-            "is-extendable": "^0.1.1",
-            "kind-of": "^2.0.1",
-            "lazy-cache": "^0.2.3",
-            "mixin-object": "^2.0.1"
+            "is-extendable": "0.1.1",
+            "kind-of": "2.0.1",
+            "lazy-cache": "0.2.7",
+            "mixin-object": "2.0.1"
           },
           "dependencies": {
             "kind-of": {
@@ -15533,7 +15533,7 @@
               "integrity": "sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=",
               "dev": true,
               "requires": {
-                "is-buffer": "^1.0.2"
+                "is-buffer": "1.1.6"
               }
             },
             "lazy-cache": {
@@ -15552,7 +15552,7 @@
       "integrity": "sha512-jlX3FGdWvYf4Q3LFfFWS1QvPg3IGCGWxIc8QBFdPTbpTJnt/v17FHXYVAn7C8sHf1yUXo2c7yIM0isDryfYtHQ==",
       "dev": true,
       "requires": {
-        "https-proxy-agent": "^2.2.1"
+        "https-proxy-agent": "2.2.1"
       }
     },
     "sax": {
@@ -15565,8 +15565,8 @@
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
       "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
       "requires": {
-        "ajv": "^6.1.0",
-        "ajv-keywords": "^3.1.0"
+        "ajv": "6.5.4",
+        "ajv-keywords": "3.2.0"
       }
     },
     "scss-bundle": {
@@ -15575,13 +15575,13 @@
       "integrity": "sha512-Mp12Wa/PbTBY5E6zlN4Vq8ccK4Ex4WX9dvc8QP3BXzatfo9VvQijZIAsMQ4nT+vD0oM1I4m6Cy9twJWYr9oBew==",
       "dev": true,
       "requires": {
-        "archy": "^1.0.0",
-        "fs-extra": "^5.0.0",
-        "globs": "^0.1.3",
-        "node-sass": "^4.9.0",
-        "pretty-bytes": "^4.0.2",
-        "promise": "^8.0.1",
-        "yargs": "^11.0.0"
+        "archy": "1.0.0",
+        "fs-extra": "5.0.0",
+        "globs": "0.1.4",
+        "node-sass": "4.9.2",
+        "pretty-bytes": "4.0.2",
+        "promise": "8.0.2",
+        "yargs": "11.1.0"
       },
       "dependencies": {
         "fs-extra": {
@@ -15590,9 +15590,9 @@
           "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
+            "graceful-fs": "4.1.11",
+            "jsonfile": "4.0.0",
+            "universalify": "0.1.2"
           }
         },
         "promise": {
@@ -15601,7 +15601,7 @@
           "integrity": "sha512-EIyzM39FpVOMbqgzEHhxdrEhtOSDOtjMZQ0M6iVfCE+kWNgCkAyOdnuCWqfmflylftfadU6FkiMgHZA2kUzwRw==",
           "dev": true,
           "requires": {
-            "asap": "~2.0.6"
+            "asap": "2.0.6"
           }
         }
       }
@@ -15612,8 +15612,8 @@
       "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
       "dev": true,
       "requires": {
-        "js-base64": "^2.1.8",
-        "source-map": "^0.4.2"
+        "js-base64": "2.4.9",
+        "source-map": "0.4.4"
       },
       "dependencies": {
         "source-map": {
@@ -15622,7 +15622,7 @@
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "dev": true,
           "requires": {
-            "amdefine": ">=0.0.4"
+            "amdefine": "1.0.1"
           }
         }
       }
@@ -15645,10 +15645,10 @@
       "integrity": "sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==",
       "dev": true,
       "requires": {
-        "jszip": "^3.1.3",
-        "rimraf": "^2.5.4",
+        "jszip": "3.1.5",
+        "rimraf": "2.6.2",
         "tmp": "0.0.30",
-        "xml2js": "^0.4.17"
+        "xml2js": "0.4.19"
       }
     },
     "selfsigned": {
@@ -15677,7 +15677,7 @@
       "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=",
       "dev": true,
       "requires": {
-        "semver": "^5.0.3"
+        "semver": "5.6.0"
       }
     },
     "semver-dsl": {
@@ -15685,7 +15685,7 @@
       "resolved": "https://registry.npmjs.org/semver-dsl/-/semver-dsl-1.0.1.tgz",
       "integrity": "sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=",
       "requires": {
-        "semver": "^5.3.0"
+        "semver": "5.6.0"
       }
     },
     "semver-intersect": {
@@ -15694,7 +15694,7 @@
       "integrity": "sha512-d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ==",
       "dev": true,
       "requires": {
-        "semver": "^5.0.0"
+        "semver": "5.6.0"
       }
     },
     "send": {
@@ -15704,18 +15704,18 @@
       "dev": true,
       "requires": {
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
+        "depd": "1.1.2",
+        "destroy": "1.0.4",
+        "encodeurl": "1.0.2",
+        "escape-html": "1.0.3",
+        "etag": "1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "~1.6.2",
+        "http-errors": "1.6.3",
         "mime": "1.4.1",
         "ms": "2.0.0",
-        "on-finished": "~2.3.0",
-        "range-parser": "~1.2.0",
-        "statuses": "~1.4.0"
+        "on-finished": "2.3.0",
+        "range-parser": "1.2.0",
+        "statuses": "1.4.0"
       },
       "dependencies": {
         "debug": {
@@ -15753,13 +15753,13 @@
       "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
       "dev": true,
       "requires": {
-        "accepts": "~1.3.4",
+        "accepts": "1.3.5",
         "batch": "0.6.1",
         "debug": "2.6.9",
-        "escape-html": "~1.0.3",
-        "http-errors": "~1.6.2",
-        "mime-types": "~2.1.17",
-        "parseurl": "~1.3.2"
+        "escape-html": "1.0.3",
+        "http-errors": "1.6.3",
+        "mime-types": "2.1.21",
+        "parseurl": "1.3.2"
       },
       "dependencies": {
         "debug": {
@@ -15785,9 +15785,9 @@
       "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
       "dev": true,
       "requires": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.2",
+        "encodeurl": "1.0.2",
+        "escape-html": "1.0.3",
+        "parseurl": "1.3.2",
         "send": "0.16.2"
       }
     },
@@ -15808,7 +15808,7 @@
       "integrity": "sha1-12nBgsnVpR9AkUXy+6guXoboA3Y=",
       "dev": true,
       "requires": {
-        "to-object-path": "^0.3.0"
+        "to-object-path": "0.3.0"
       }
     },
     "set-value": {
@@ -15817,10 +15817,10 @@
       "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
       "dev": true,
       "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
+        "extend-shallow": "2.0.1",
+        "is-extendable": "0.1.1",
+        "is-plain-object": "2.0.4",
+        "split-string": "3.1.0"
       },
       "dependencies": {
         "extend-shallow": {
@@ -15829,7 +15829,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         }
       }
@@ -15852,8 +15852,8 @@
       "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
       }
     },
     "shallow-clone": {
@@ -15862,9 +15862,9 @@
       "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==",
       "dev": true,
       "requires": {
-        "is-extendable": "^0.1.1",
-        "kind-of": "^5.0.0",
-        "mixin-object": "^2.0.1"
+        "is-extendable": "0.1.1",
+        "kind-of": "5.1.0",
+        "mixin-object": "2.0.1"
       },
       "dependencies": {
         "kind-of": {
@@ -15880,7 +15880,7 @@
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
       "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
       "requires": {
-        "shebang-regex": "^1.0.0"
+        "shebang-regex": "1.0.0"
       }
     },
     "shebang-regex": {
@@ -15893,10 +15893,10 @@
       "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz",
       "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=",
       "requires": {
-        "array-filter": "~0.0.0",
-        "array-map": "~0.0.0",
-        "array-reduce": "~0.0.0",
-        "jsonify": "~0.0.0"
+        "array-filter": "0.0.1",
+        "array-map": "0.0.0",
+        "array-reduce": "0.0.0",
+        "jsonify": "0.0.0"
       }
     },
     "shelljs": {
@@ -15905,9 +15905,9 @@
       "integrity": "sha512-pRXeNrCA2Wd9itwhvLp5LZQvPJ0wU6bcjaTMywHHGX5XWhVN2nzSu7WV0q+oUY7mGK3mgSkDDzP3MgjqdyIgbQ==",
       "dev": true,
       "requires": {
-        "glob": "^7.0.0",
-        "interpret": "^1.0.0",
-        "rechoir": "^0.6.2"
+        "glob": "7.1.3",
+        "interpret": "1.1.0",
+        "rechoir": "0.6.2"
       }
     },
     "sigmund": {
@@ -15928,7 +15928,7 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "requestretry": "^1.2.2"
+        "requestretry": "1.13.0"
       }
     },
     "slash": {
@@ -15943,7 +15943,7 @@
       "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
       "dev": true,
       "requires": {
-        "is-fullwidth-code-point": "^2.0.0"
+        "is-fullwidth-code-point": "2.0.0"
       }
     },
     "slide": {
@@ -15974,14 +15974,14 @@
       "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
       "dev": true,
       "requires": {
-        "base": "^0.11.1",
-        "debug": "^2.2.0",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "map-cache": "^0.2.2",
-        "source-map": "^0.5.6",
-        "source-map-resolve": "^0.5.0",
-        "use": "^3.1.0"
+        "base": "0.11.2",
+        "debug": "2.6.9",
+        "define-property": "0.2.5",
+        "extend-shallow": "2.0.1",
+        "map-cache": "0.2.2",
+        "source-map": "0.5.6",
+        "source-map-resolve": "0.5.2",
+        "use": "3.1.1"
       },
       "dependencies": {
         "debug": {
@@ -15999,7 +15999,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         },
         "extend-shallow": {
@@ -16008,7 +16008,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         },
         "ms": {
@@ -16025,9 +16025,9 @@
       "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
       "dev": true,
       "requires": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
+        "define-property": "1.0.0",
+        "isobject": "3.0.1",
+        "snapdragon-util": "3.0.1"
       },
       "dependencies": {
         "define-property": {
@@ -16036,7 +16036,7 @@
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "^1.0.0"
+            "is-descriptor": "1.0.2"
           }
         },
         "is-accessor-descriptor": {
@@ -16045,7 +16045,7 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-data-descriptor": {
@@ -16054,7 +16054,7 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-descriptor": {
@@ -16063,9 +16063,9 @@
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
           }
         }
       }
@@ -16076,7 +16076,7 @@
       "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "dev": true,
       "requires": {
-        "kind-of": "^3.2.0"
+        "kind-of": "3.2.2"
       },
       "dependencies": {
         "kind-of": {
@@ -16085,7 +16085,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -16097,7 +16097,7 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "hoek": "2.x.x"
+        "hoek": "2.16.3"
       }
     },
     "socket.io": {
@@ -16106,11 +16106,11 @@
       "integrity": "sha1-waRZDO/4fs8TxyZS8Eb3FrKeYBQ=",
       "dev": true,
       "requires": {
-        "debug": "~2.6.6",
-        "engine.io": "~3.1.0",
-        "socket.io-adapter": "~1.1.0",
+        "debug": "2.6.9",
+        "engine.io": "3.1.5",
+        "socket.io-adapter": "1.1.1",
         "socket.io-client": "2.0.4",
-        "socket.io-parser": "~3.1.1"
+        "socket.io-parser": "3.1.3"
       },
       "dependencies": {
         "debug": {
@@ -16146,14 +16146,14 @@
         "base64-arraybuffer": "0.1.5",
         "component-bind": "1.0.0",
         "component-emitter": "1.2.1",
-        "debug": "~2.6.4",
-        "engine.io-client": "~3.1.0",
+        "debug": "2.6.9",
+        "engine.io-client": "3.1.6",
         "has-cors": "1.1.0",
         "indexof": "0.0.1",
         "object-component": "0.0.3",
         "parseqs": "0.0.5",
         "parseuri": "0.0.5",
-        "socket.io-parser": "~3.1.1",
+        "socket.io-parser": "3.1.3",
         "to-array": "0.1.4"
       },
       "dependencies": {
@@ -16181,8 +16181,8 @@
       "dev": true,
       "requires": {
         "component-emitter": "1.2.1",
-        "debug": "~3.1.0",
-        "has-binary2": "~1.0.2",
+        "debug": "3.1.0",
+        "has-binary2": "1.0.3",
         "isarray": "2.0.1"
       },
       "dependencies": {
@@ -16215,8 +16215,8 @@
       "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
       "dev": true,
       "requires": {
-        "faye-websocket": "^0.10.0",
-        "uuid": "^3.0.1"
+        "faye-websocket": "0.10.0",
+        "uuid": "3.3.2"
       }
     },
     "sockjs-client": {
@@ -16225,12 +16225,12 @@
       "integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==",
       "dev": true,
       "requires": {
-        "debug": "^3.2.5",
-        "eventsource": "^1.0.7",
-        "faye-websocket": "~0.11.1",
-        "inherits": "^2.0.3",
-        "json3": "^3.3.2",
-        "url-parse": "^1.4.3"
+        "debug": "3.2.6",
+        "eventsource": "1.0.7",
+        "faye-websocket": "0.11.1",
+        "inherits": "2.0.3",
+        "json3": "3.3.2",
+        "url-parse": "1.4.3"
       },
       "dependencies": {
         "faye-websocket": {
@@ -16239,7 +16239,7 @@
           "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
           "dev": true,
           "requires": {
-            "websocket-driver": ">=0.5.1"
+            "websocket-driver": "0.7.0"
           }
         }
       }
@@ -16250,8 +16250,8 @@
       "integrity": "sha512-0GabKw7n9mI46vcNrVfs0o6XzWzjVa3h6GaSo2UPxtWAROXUWavfJWh1M4PR5tnE0dcnQXZIDFP4yrAysLze/w==",
       "dev": true,
       "requires": {
-        "ip": "^1.1.5",
-        "smart-buffer": "^4.0.1"
+        "ip": "1.1.5",
+        "smart-buffer": "4.0.1"
       }
     },
     "socks-proxy-agent": {
@@ -16260,8 +16260,8 @@
       "integrity": "sha512-Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw==",
       "dev": true,
       "requires": {
-        "agent-base": "~4.2.0",
-        "socks": "~2.2.0"
+        "agent-base": "4.2.1",
+        "socks": "2.2.1"
       }
     },
     "source-list-map": {
@@ -16281,8 +16281,8 @@
       "integrity": "sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==",
       "dev": true,
       "requires": {
-        "async": "^2.5.0",
-        "loader-utils": "^1.1.0"
+        "async": "2.6.1",
+        "loader-utils": "1.1.0"
       },
       "dependencies": {
         "async": {
@@ -16291,7 +16291,7 @@
           "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
           "dev": true,
           "requires": {
-            "lodash": "^4.17.10"
+            "lodash": "4.17.11"
           }
         }
       }
@@ -16302,11 +16302,11 @@
       "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
       "dev": true,
       "requires": {
-        "atob": "^2.1.1",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
+        "atob": "2.1.2",
+        "decode-uri-component": "0.2.0",
+        "resolve-url": "0.2.1",
+        "source-map-url": "0.4.0",
+        "urix": "0.1.0"
       }
     },
     "source-map-support": {
@@ -16315,8 +16315,8 @@
       "integrity": "sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==",
       "dev": true,
       "requires": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
+        "buffer-from": "1.1.1",
+        "source-map": "0.6.1"
       },
       "dependencies": {
         "source-map": {
@@ -16356,8 +16356,8 @@
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.2.tgz",
       "integrity": "sha512-q9hedtzyXHr5S0A1vEPoK/7l8NpfkFYTq6iCY+Pno2ZbdZR6WexZFtqeVGkGxW3TEJMN914Z55EnAGMmenlIQQ==",
       "requires": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
+        "spdx-expression-parse": "3.0.0",
+        "spdx-license-ids": "3.0.1"
       }
     },
     "spdx-exceptions": {
@@ -16370,8 +16370,8 @@
       "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
       "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
       "requires": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
+        "spdx-exceptions": "2.2.0",
+        "spdx-license-ids": "3.0.1"
       }
     },
     "spdx-license-ids": {
@@ -16385,12 +16385,12 @@
       "integrity": "sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw=",
       "dev": true,
       "requires": {
-        "debug": "^2.6.8",
-        "handle-thing": "^1.2.5",
-        "http-deceiver": "^1.2.7",
-        "safe-buffer": "^5.0.1",
-        "select-hose": "^2.0.0",
-        "spdy-transport": "^2.0.18"
+        "debug": "2.6.9",
+        "handle-thing": "1.2.5",
+        "http-deceiver": "1.2.7",
+        "safe-buffer": "5.1.2",
+        "select-hose": "2.0.0",
+        "spdy-transport": "2.1.0"
       },
       "dependencies": {
         "debug": {
@@ -16416,13 +16416,13 @@
       "integrity": "sha512-bpUeGpZcmZ692rrTiqf9/2EUakI6/kXX1Rpe0ib/DyOzbiexVfXkw6GnvI9hVGvIwVaUhkaBojjCZwLNRGQg1g==",
       "dev": true,
       "requires": {
-        "debug": "^2.6.8",
-        "detect-node": "^2.0.3",
-        "hpack.js": "^2.1.6",
-        "obuf": "^1.1.1",
-        "readable-stream": "^2.2.9",
-        "safe-buffer": "^5.0.1",
-        "wbuf": "^1.7.2"
+        "debug": "2.6.9",
+        "detect-node": "2.0.4",
+        "hpack.js": "2.1.6",
+        "obuf": "1.1.2",
+        "readable-stream": "2.3.6",
+        "safe-buffer": "5.1.2",
+        "wbuf": "1.7.3"
       },
       "dependencies": {
         "debug": {
@@ -16453,7 +16453,7 @@
       "resolved": "http://registry.npmjs.org/split/-/split-0.3.3.tgz",
       "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
       "requires": {
-        "through": "2"
+        "through": "2.3.8"
       }
     },
     "split-string": {
@@ -16462,7 +16462,7 @@
       "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
       "dev": true,
       "requires": {
-        "extend-shallow": "^3.0.0"
+        "extend-shallow": "3.0.2"
       }
     },
     "sprintf-js": {
@@ -16476,15 +16476,15 @@
       "integrity": "sha512-mSdgNUaidk+dRU5MhYtN9zebdzF2iG0cNPWy8HG+W8y+fT1JnSkh0fzzpjOa0L7P8i1Rscz38t0h4gPcKz43xA==",
       "dev": true,
       "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
+        "asn1": "0.2.4",
+        "assert-plus": "1.0.0",
+        "bcrypt-pbkdf": "1.0.2",
+        "dashdash": "1.14.1",
+        "ecc-jsbn": "0.1.2",
+        "getpass": "0.1.7",
+        "jsbn": "0.1.1",
+        "safer-buffer": "2.1.2",
+        "tweetnacl": "0.14.5"
       }
     },
     "ssri": {
@@ -16493,7 +16493,7 @@
       "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==",
       "dev": true,
       "requires": {
-        "safe-buffer": "^5.1.1"
+        "safe-buffer": "5.1.2"
       }
     },
     "stack-trace": {
@@ -16514,8 +16514,8 @@
       "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
       "dev": true,
       "requires": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
+        "define-property": "0.2.5",
+        "object-copy": "0.1.0"
       },
       "dependencies": {
         "define-property": {
@@ -16524,7 +16524,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         }
       }
@@ -16535,7 +16535,7 @@
       "integrity": "sha1-LFlJtTHgf4eojm6k3PrFOqjHWis=",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.4"
+        "lodash": "4.17.11"
       }
     },
     "statuses": {
@@ -16550,7 +16550,7 @@
       "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
       "dev": true,
       "requires": {
-        "readable-stream": "^2.0.1"
+        "readable-stream": "2.3.6"
       }
     },
     "stream-browserify": {
@@ -16559,8 +16559,8 @@
       "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
       "dev": true,
       "requires": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6"
       }
     },
     "stream-combiner": {
@@ -16568,7 +16568,7 @@
       "resolved": "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
       "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
       "requires": {
-        "duplexer": "~0.1.1"
+        "duplexer": "0.1.1"
       }
     },
     "stream-each": {
@@ -16577,8 +16577,8 @@
       "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
       "dev": true,
       "requires": {
-        "end-of-stream": "^1.1.0",
-        "stream-shift": "^1.0.0"
+        "end-of-stream": "1.4.1",
+        "stream-shift": "1.0.0"
       }
     },
     "stream-http": {
@@ -16587,11 +16587,11 @@
       "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
       "dev": true,
       "requires": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.3.6",
-        "to-arraybuffer": "^1.0.0",
-        "xtend": "^4.0.0"
+        "builtin-status-codes": "3.0.0",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6",
+        "to-arraybuffer": "1.0.1",
+        "xtend": "4.0.1"
       }
     },
     "stream-shift": {
@@ -16606,8 +16606,8 @@
       "integrity": "sha1-rdV8jXzHOoFjDTHNVdOWHPr7qcM=",
       "dev": true,
       "requires": {
-        "commander": "^2.2.0",
-        "limiter": "^1.0.5"
+        "commander": "2.19.0",
+        "limiter": "1.1.3"
       }
     },
     "streamroller": {
@@ -16616,10 +16616,10 @@
       "integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==",
       "dev": true,
       "requires": {
-        "date-format": "^1.2.0",
-        "debug": "^3.1.0",
-        "mkdirp": "^0.5.1",
-        "readable-stream": "^2.3.0"
+        "date-format": "1.2.0",
+        "debug": "3.2.6",
+        "mkdirp": "0.5.1",
+        "readable-stream": "2.3.6"
       }
     },
     "string-width": {
@@ -16627,8 +16627,8 @@
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
       "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
       "requires": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
+        "is-fullwidth-code-point": "2.0.0",
+        "strip-ansi": "4.0.0"
       }
     },
     "string.prototype.padend": {
@@ -16636,9 +16636,9 @@
       "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz",
       "integrity": "sha1-86rvfBcZ8XDF6rHDK/eA2W4h8vA=",
       "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.4.3",
-        "function-bind": "^1.0.2"
+        "define-properties": "1.1.3",
+        "es-abstract": "1.12.0",
+        "function-bind": "1.1.1"
       }
     },
     "string_decoder": {
@@ -16646,7 +16646,7 @@
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "requires": {
-        "safe-buffer": "~5.1.0"
+        "safe-buffer": "5.1.2"
       }
     },
     "stringify-entities": {
@@ -16655,10 +16655,10 @@
       "integrity": "sha512-nrBAQClJAPN2p+uGCVJRPIPakKeKWZ9GtBCmormE7pWOSlHat7+x5A8gx85M7HM5Dt0BP3pP5RhVW77WdbJJ3A==",
       "dev": true,
       "requires": {
-        "character-entities-html4": "^1.0.0",
-        "character-entities-legacy": "^1.0.0",
-        "is-alphanumerical": "^1.0.0",
-        "is-hexadecimal": "^1.0.0"
+        "character-entities-html4": "1.1.2",
+        "character-entities-legacy": "1.1.2",
+        "is-alphanumerical": "1.0.2",
+        "is-hexadecimal": "1.0.2"
       }
     },
     "stringstream": {
@@ -16673,7 +16673,7 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
       "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
       "requires": {
-        "ansi-regex": "^3.0.0"
+        "ansi-regex": "3.0.0"
       }
     },
     "strip-bom": {
@@ -16682,7 +16682,7 @@
       "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
       "dev": true,
       "requires": {
-        "is-utf8": "^0.2.0"
+        "is-utf8": "0.2.1"
       }
     },
     "strip-color": {
@@ -16702,7 +16702,7 @@
       "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
       "dev": true,
       "requires": {
-        "get-stdin": "^4.0.1"
+        "get-stdin": "4.0.1"
       }
     },
     "strip-json-comments": {
@@ -16716,8 +16716,8 @@
       "integrity": "sha512-T+UNsAcl3Yg+BsPKs1vd22Fr8sVT+CJMtzqc6LEw9bbJZb43lm9GoeIfUcDEefBSWC0BhYbcdupV1GtI4DGzxg==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0",
-        "schema-utils": "^0.4.5"
+        "loader-utils": "1.1.0",
+        "schema-utils": "0.4.7"
       }
     },
     "style-search": {
@@ -16732,54 +16732,54 @@
       "integrity": "sha512-qYYgP9UnZ6S4uaXrfEGPIMeNv21gP4t3E7BtnYfJIiHKvz7AbrCP0vj1wPgD6OFyxLT5txQxtoznfSkm2vsUkQ==",
       "dev": true,
       "requires": {
-        "autoprefixer": "^9.0.0",
-        "balanced-match": "^1.0.0",
-        "chalk": "^2.4.1",
-        "cosmiconfig": "^5.0.0",
-        "debug": "^4.0.0",
-        "execall": "^1.0.0",
-        "file-entry-cache": "^2.0.0",
-        "get-stdin": "^6.0.0",
-        "global-modules": "^1.0.0",
-        "globby": "^8.0.0",
-        "globjoin": "^0.1.4",
-        "html-tags": "^2.0.0",
-        "ignore": "^5.0.4",
-        "import-lazy": "^3.1.0",
-        "imurmurhash": "^0.1.4",
-        "known-css-properties": "^0.9.0",
-        "leven": "^2.1.0",
-        "lodash": "^4.17.4",
-        "log-symbols": "^2.0.0",
-        "mathml-tag-names": "^2.0.1",
-        "meow": "^5.0.0",
-        "micromatch": "^3.1.10",
-        "normalize-selector": "^0.2.0",
-        "pify": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-html": "^0.34.0",
-        "postcss-jsx": "^0.35.0",
-        "postcss-less": "^3.0.1",
-        "postcss-markdown": "^0.34.0",
-        "postcss-media-query-parser": "^0.2.3",
-        "postcss-reporter": "^6.0.0",
-        "postcss-resolve-nested-selector": "^0.1.1",
-        "postcss-safe-parser": "^4.0.0",
-        "postcss-sass": "^0.3.5",
-        "postcss-scss": "^2.0.0",
-        "postcss-selector-parser": "^3.1.0",
-        "postcss-styled": "^0.34.0",
-        "postcss-syntax": "^0.34.0",
-        "postcss-value-parser": "^3.3.0",
-        "resolve-from": "^4.0.0",
-        "signal-exit": "^3.0.2",
-        "slash": "^2.0.0",
-        "specificity": "^0.4.1",
-        "string-width": "^2.1.0",
-        "style-search": "^0.1.0",
-        "sugarss": "^2.0.0",
-        "svg-tags": "^1.0.0",
-        "table": "^5.0.0"
+        "autoprefixer": "9.3.1",
+        "balanced-match": "1.0.0",
+        "chalk": "2.4.1",
+        "cosmiconfig": "5.0.7",
+        "debug": "4.1.0",
+        "execall": "1.0.0",
+        "file-entry-cache": "2.0.0",
+        "get-stdin": "6.0.0",
+        "global-modules": "1.0.0",
+        "globby": "8.0.1",
+        "globjoin": "0.1.4",
+        "html-tags": "2.0.0",
+        "ignore": "5.0.4",
+        "import-lazy": "3.1.0",
+        "imurmurhash": "0.1.4",
+        "known-css-properties": "0.9.0",
+        "leven": "2.1.0",
+        "lodash": "4.17.11",
+        "log-symbols": "2.2.0",
+        "mathml-tag-names": "2.1.0",
+        "meow": "5.0.0",
+        "micromatch": "3.1.10",
+        "normalize-selector": "0.2.0",
+        "pify": "4.0.1",
+        "postcss": "7.0.6",
+        "postcss-html": "0.34.0",
+        "postcss-jsx": "0.35.0",
+        "postcss-less": "3.0.2",
+        "postcss-markdown": "0.34.0",
+        "postcss-media-query-parser": "0.2.3",
+        "postcss-reporter": "6.0.0",
+        "postcss-resolve-nested-selector": "0.1.1",
+        "postcss-safe-parser": "4.0.1",
+        "postcss-sass": "0.3.5",
+        "postcss-scss": "2.0.0",
+        "postcss-selector-parser": "3.1.1",
+        "postcss-styled": "0.34.0",
+        "postcss-syntax": "0.34.0",
+        "postcss-value-parser": "3.3.1",
+        "resolve-from": "4.0.0",
+        "signal-exit": "3.0.2",
+        "slash": "2.0.0",
+        "specificity": "0.4.1",
+        "string-width": "2.1.1",
+        "style-search": "0.1.0",
+        "sugarss": "2.0.0",
+        "svg-tags": "1.0.0",
+        "table": "5.1.0"
       },
       "dependencies": {
         "autoprefixer": {
@@ -16788,12 +16788,12 @@
           "integrity": "sha512-DY9gOh8z3tnCbJ13JIWaeQsoYncTGdsrgCceBaQSIL4nvdrLxgbRSBPevg2XbX7u4QCSfLheSJEEIUUSlkbx6Q==",
           "dev": true,
           "requires": {
-            "browserslist": "^4.3.3",
-            "caniuse-lite": "^1.0.30000898",
-            "normalize-range": "^0.1.2",
-            "num2fraction": "^1.2.2",
-            "postcss": "^7.0.5",
-            "postcss-value-parser": "^3.3.1"
+            "browserslist": "4.3.4",
+            "caniuse-lite": "1.0.30000898",
+            "normalize-range": "0.1.2",
+            "num2fraction": "1.2.2",
+            "postcss": "7.0.6",
+            "postcss-value-parser": "3.3.1"
           }
         },
         "browserslist": {
@@ -16802,9 +16802,9 @@
           "integrity": "sha512-u5iz+ijIMUlmV8blX82VGFrB9ecnUg5qEt55CMZ/YJEhha+d8qpBfOFuutJ6F/VKRXjZoD33b6uvarpPxcl3RA==",
           "dev": true,
           "requires": {
-            "caniuse-lite": "^1.0.30000899",
-            "electron-to-chromium": "^1.3.82",
-            "node-releases": "^1.0.1"
+            "caniuse-lite": "1.0.30000910",
+            "electron-to-chromium": "1.3.84",
+            "node-releases": "1.0.4"
           },
           "dependencies": {
             "caniuse-lite": {
@@ -16821,9 +16821,9 @@
           "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
           "dev": true,
           "requires": {
-            "camelcase": "^4.1.0",
-            "map-obj": "^2.0.0",
-            "quick-lru": "^1.0.0"
+            "camelcase": "4.1.0",
+            "map-obj": "2.0.0",
+            "quick-lru": "1.1.0"
           }
         },
         "cosmiconfig": {
@@ -16832,10 +16832,10 @@
           "integrity": "sha512-PcLqxTKiDmNT6pSpy4N6KtuPwb53W+2tzNvwOZw0WH9N6O0vLIBq0x8aj8Oj75ere4YcGi48bDFCL+3fRJdlNA==",
           "dev": true,
           "requires": {
-            "import-fresh": "^2.0.0",
-            "is-directory": "^0.3.1",
-            "js-yaml": "^3.9.0",
-            "parse-json": "^4.0.0"
+            "import-fresh": "2.0.0",
+            "is-directory": "0.3.1",
+            "js-yaml": "3.12.0",
+            "parse-json": "4.0.0"
           }
         },
         "debug": {
@@ -16844,7 +16844,7 @@
           "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.1"
           }
         },
         "electron-to-chromium": {
@@ -16865,13 +16865,13 @@
           "integrity": "sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==",
           "dev": true,
           "requires": {
-            "array-union": "^1.0.1",
-            "dir-glob": "^2.0.0",
-            "fast-glob": "^2.0.2",
-            "glob": "^7.1.2",
-            "ignore": "^3.3.5",
-            "pify": "^3.0.0",
-            "slash": "^1.0.0"
+            "array-union": "1.0.2",
+            "dir-glob": "2.0.0",
+            "fast-glob": "2.2.4",
+            "glob": "7.1.3",
+            "ignore": "3.3.10",
+            "pify": "3.0.0",
+            "slash": "1.0.0"
           },
           "dependencies": {
             "ignore": {
@@ -16918,10 +16918,10 @@
           "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^4.0.0",
-            "pify": "^3.0.0",
-            "strip-bom": "^3.0.0"
+            "graceful-fs": "4.1.11",
+            "parse-json": "4.0.0",
+            "pify": "3.0.0",
+            "strip-bom": "3.0.0"
           },
           "dependencies": {
             "pify": {
@@ -16944,15 +16944,15 @@
           "integrity": "sha512-CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig==",
           "dev": true,
           "requires": {
-            "camelcase-keys": "^4.0.0",
-            "decamelize-keys": "^1.0.0",
-            "loud-rejection": "^1.0.0",
-            "minimist-options": "^3.0.1",
-            "normalize-package-data": "^2.3.4",
-            "read-pkg-up": "^3.0.0",
-            "redent": "^2.0.0",
-            "trim-newlines": "^2.0.0",
-            "yargs-parser": "^10.0.0"
+            "camelcase-keys": "4.2.0",
+            "decamelize-keys": "1.1.0",
+            "loud-rejection": "1.6.0",
+            "minimist-options": "3.0.2",
+            "normalize-package-data": "2.4.0",
+            "read-pkg-up": "3.0.0",
+            "redent": "2.0.0",
+            "trim-newlines": "2.0.0",
+            "yargs-parser": "10.1.0"
           }
         },
         "node-releases": {
@@ -16961,7 +16961,7 @@
           "integrity": "sha512-GqRV9GcHw8JCRDaP/JoeNMNzEGzHAknMvIHqMb2VeTOmg1Cf9+ej8bkV12tHfzWHQMCkQ5zUFgwFUkfraynNCw==",
           "dev": true,
           "requires": {
-            "semver": "^5.3.0"
+            "semver": "5.6.0"
           }
         },
         "parse-json": {
@@ -16970,8 +16970,8 @@
           "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
           "dev": true,
           "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
+            "error-ex": "1.3.2",
+            "json-parse-better-errors": "1.0.2"
           }
         },
         "pify": {
@@ -16986,9 +16986,9 @@
           "integrity": "sha512-Nq/rNjnHFcKgCDDZYO0lNsl6YWe6U7tTy+ESN+PnLxebL8uBtYX59HZqvrj7YLK5UCyll2hqDsJOo3ndzEW8Ug==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.5.0"
+            "chalk": "2.4.1",
+            "source-map": "0.6.1",
+            "supports-color": "5.5.0"
           }
         },
         "read-pkg": {
@@ -16997,9 +16997,9 @@
           "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
           "dev": true,
           "requires": {
-            "load-json-file": "^4.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^3.0.0"
+            "load-json-file": "4.0.0",
+            "normalize-package-data": "2.4.0",
+            "path-type": "3.0.0"
           }
         },
         "read-pkg-up": {
@@ -17008,8 +17008,8 @@
           "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
           "dev": true,
           "requires": {
-            "find-up": "^2.0.0",
-            "read-pkg": "^3.0.0"
+            "find-up": "2.1.0",
+            "read-pkg": "3.0.0"
           }
         },
         "redent": {
@@ -17018,8 +17018,8 @@
           "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
           "dev": true,
           "requires": {
-            "indent-string": "^3.0.0",
-            "strip-indent": "^2.0.0"
+            "indent-string": "3.2.0",
+            "strip-indent": "2.0.0"
           }
         },
         "resolve-from": {
@@ -17064,7 +17064,7 @@
           "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
           "dev": true,
           "requires": {
-            "camelcase": "^4.1.0"
+            "camelcase": "4.1.0"
           }
         }
       }
@@ -17075,12 +17075,12 @@
       "integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=",
       "dev": true,
       "requires": {
-        "css-parse": "1.7.x",
-        "debug": "*",
-        "glob": "7.0.x",
-        "mkdirp": "0.5.x",
-        "sax": "0.5.x",
-        "source-map": "0.1.x"
+        "css-parse": "1.7.0",
+        "debug": "3.2.6",
+        "glob": "7.0.6",
+        "mkdirp": "0.5.1",
+        "sax": "0.5.8",
+        "source-map": "0.1.43"
       },
       "dependencies": {
         "glob": {
@@ -17089,12 +17089,12 @@
           "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
           "dev": true,
           "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.2",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
           }
         },
         "sax": {
@@ -17109,7 +17109,7 @@
           "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
           "dev": true,
           "requires": {
-            "amdefine": ">=0.0.4"
+            "amdefine": "1.0.1"
           }
         }
       }
@@ -17120,9 +17120,9 @@
       "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.0.2",
-        "lodash.clonedeep": "^4.5.0",
-        "when": "~3.6.x"
+        "loader-utils": "1.1.0",
+        "lodash.clonedeep": "4.5.0",
+        "when": "3.6.4"
       },
       "dependencies": {
         "when": {
@@ -17139,7 +17139,7 @@
       "integrity": "sha512-WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ==",
       "dev": true,
       "requires": {
-        "postcss": "^7.0.2"
+        "postcss": "7.0.6"
       },
       "dependencies": {
         "postcss": {
@@ -17148,9 +17148,9 @@
           "integrity": "sha512-Nq/rNjnHFcKgCDDZYO0lNsl6YWe6U7tTy+ESN+PnLxebL8uBtYX59HZqvrj7YLK5UCyll2hqDsJOo3ndzEW8Ug==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.5.0"
+            "chalk": "2.4.1",
+            "source-map": "0.6.1",
+            "supports-color": "5.5.0"
           }
         },
         "source-map": {
@@ -17166,16 +17166,16 @@
       "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.8.2.tgz",
       "integrity": "sha512-gVH4QfYHcY3P0f/BZzavLreHW3T1v7hG9B+hpMQotGQqurOvhv87GcMCd6LWySmBuf+BDR44TQd0aISjVHLeNQ==",
       "requires": {
-        "component-emitter": "^1.2.0",
-        "cookiejar": "^2.1.0",
-        "debug": "^3.1.0",
-        "extend": "^3.0.0",
-        "form-data": "^2.3.1",
-        "formidable": "^1.1.1",
-        "methods": "^1.1.1",
-        "mime": "^1.4.1",
-        "qs": "^6.5.1",
-        "readable-stream": "^2.0.5"
+        "component-emitter": "1.2.1",
+        "cookiejar": "2.1.2",
+        "debug": "3.2.6",
+        "extend": "3.0.2",
+        "form-data": "2.3.3",
+        "formidable": "1.2.1",
+        "methods": "1.1.2",
+        "mime": "1.6.0",
+        "qs": "6.5.2",
+        "readable-stream": "2.3.6"
       }
     },
     "supports-color": {
@@ -17183,7 +17183,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
       "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "requires": {
-        "has-flag": "^3.0.0"
+        "has-flag": "3.0.0"
       }
     },
     "svg-tags": {
@@ -17203,7 +17203,7 @@
       "resolved": "http://registry.npmjs.org/systemjs/-/systemjs-0.19.27.tgz",
       "integrity": "sha1-8XQNVlzmQ3GsDecHKk0eVHG6e6I=",
       "requires": {
-        "when": "^3.7.5"
+        "when": "3.7.8"
       }
     },
     "systemjs-builder": {
@@ -17212,21 +17212,21 @@
       "integrity": "sha1-bxt0N+aB45W72tsuC51L/YbxzlY=",
       "dev": true,
       "requires": {
-        "babel-core": "^6.9.0",
-        "babel-plugin-transform-cjs-system-wrapper": "^0.2.1",
-        "babel-plugin-transform-es2015-modules-systemjs": "^6.6.5",
+        "babel-core": "6.26.3",
+        "babel-plugin-transform-cjs-system-wrapper": "0.2.1",
+        "babel-plugin-transform-es2015-modules-systemjs": "6.24.1",
         "babel-plugin-transform-global-system-wrapper": "0.0.1",
         "babel-plugin-transform-system-register": "0.0.1",
-        "bluebird": "^3.3.4",
+        "bluebird": "3.5.2",
         "data-uri-to-buffer": "0.0.4",
-        "es6-template-strings": "^2.0.0",
-        "glob": "^7.0.3",
-        "mkdirp": "^0.5.1",
-        "rollup": "^0.36.3",
-        "source-map": "^0.5.3",
-        "systemjs": "^0.19.41",
+        "es6-template-strings": "2.0.1",
+        "glob": "7.1.3",
+        "mkdirp": "0.5.1",
+        "rollup": "0.36.4",
+        "source-map": "0.5.6",
+        "systemjs": "0.19.47",
         "traceur": "0.0.105",
-        "uglify-js": "^2.6.1"
+        "uglify-js": "2.8.29"
       },
       "dependencies": {
         "camelcase": {
@@ -17241,8 +17241,8 @@
           "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
           "dev": true,
           "requires": {
-            "center-align": "^0.1.1",
-            "right-align": "^0.1.1",
+            "center-align": "0.1.3",
+            "right-align": "0.1.3",
             "wordwrap": "0.0.2"
           }
         },
@@ -17252,7 +17252,7 @@
           "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
           "dev": true,
           "requires": {
-            "graceful-readlink": ">= 1.0.0"
+            "graceful-readlink": "1.0.1"
           }
         },
         "data-uri-to-buffer": {
@@ -17267,7 +17267,7 @@
           "integrity": "sha1-oiRJTFOGwdc9OPe7hvafXrARo9I=",
           "dev": true,
           "requires": {
-            "source-map-support": "^0.4.0"
+            "source-map-support": "0.4.18"
           }
         },
         "semver": {
@@ -17282,7 +17282,7 @@
           "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
           "dev": true,
           "requires": {
-            "source-map": "^0.5.6"
+            "source-map": "0.5.6"
           }
         },
         "systemjs": {
@@ -17291,7 +17291,7 @@
           "integrity": "sha1-yMk5NxgPP1SBx2nNJyB2P7SjHG8=",
           "dev": true,
           "requires": {
-            "when": "^3.7.5"
+            "when": "3.7.8"
           }
         },
         "traceur": {
@@ -17300,11 +17300,11 @@
           "integrity": "sha1-XPne6D1rd4YcPWxE1ThZrterBHk=",
           "dev": true,
           "requires": {
-            "commander": "2.9.x",
-            "glob": "5.0.x",
-            "rsvp": "^3.0.13",
-            "semver": "^4.3.3",
-            "source-map-support": "~0.2.8"
+            "commander": "2.9.0",
+            "glob": "5.0.15",
+            "rsvp": "3.6.2",
+            "semver": "4.3.6",
+            "source-map-support": "0.2.10"
           },
           "dependencies": {
             "glob": {
@@ -17313,11 +17313,11 @@
               "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
               "dev": true,
               "requires": {
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "2 || 3",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
+                "inflight": "1.0.6",
+                "inherits": "2.0.3",
+                "minimatch": "3.0.4",
+                "once": "1.4.0",
+                "path-is-absolute": "1.0.1"
               }
             },
             "source-map": {
@@ -17326,7 +17326,7 @@
               "integrity": "sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY=",
               "dev": true,
               "requires": {
-                "amdefine": ">=0.0.4"
+                "amdefine": "1.0.1"
               }
             },
             "source-map-support": {
@@ -17346,9 +17346,9 @@
           "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
           "dev": true,
           "requires": {
-            "source-map": "~0.5.1",
-            "uglify-to-browserify": "~1.0.0",
-            "yargs": "~3.10.0"
+            "source-map": "0.5.6",
+            "uglify-to-browserify": "1.0.2",
+            "yargs": "3.10.0"
           }
         },
         "window-size": {
@@ -17369,9 +17369,9 @@
           "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
           "dev": true,
           "requires": {
-            "camelcase": "^1.0.2",
-            "cliui": "^2.1.0",
-            "decamelize": "^1.0.0",
+            "camelcase": "1.2.1",
+            "cliui": "2.1.0",
+            "decamelize": "1.2.0",
             "window-size": "0.1.0"
           }
         }
@@ -17383,10 +17383,10 @@
       "integrity": "sha512-e542in22ZLhD/fOIuXs/8yDZ9W61ltF8daM88rkRNtgTIct+vI2fTnAyu/Db2TCfEcI8i7mjZz6meLq0nW7TYg==",
       "dev": true,
       "requires": {
-        "ajv": "^6.5.3",
-        "lodash": "^4.17.10",
+        "ajv": "6.5.4",
+        "lodash": "4.17.11",
         "slice-ansi": "1.0.0",
-        "string-width": "^2.1.1"
+        "string-width": "2.1.1"
       }
     },
     "tapable": {
@@ -17401,9 +17401,9 @@
       "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
       "dev": true,
       "requires": {
-        "block-stream": "*",
-        "fstream": "^1.0.2",
-        "inherits": "2"
+        "block-stream": "0.0.9",
+        "fstream": "1.0.11",
+        "inherits": "2.0.3"
       }
     },
     "tar-stream": {
@@ -17412,13 +17412,13 @@
       "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
       "dev": true,
       "requires": {
-        "bl": "^1.0.0",
-        "buffer-alloc": "^1.2.0",
-        "end-of-stream": "^1.0.0",
-        "fs-constants": "^1.0.0",
-        "readable-stream": "^2.3.0",
-        "to-buffer": "^1.1.1",
-        "xtend": "^4.0.0"
+        "bl": "1.2.2",
+        "buffer-alloc": "1.2.0",
+        "end-of-stream": "1.4.1",
+        "fs-constants": "1.0.0",
+        "readable-stream": "2.3.6",
+        "to-buffer": "1.1.1",
+        "xtend": "4.0.1"
       }
     },
     "temp": {
@@ -17432,7 +17432,7 @@
       "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=",
       "dev": true,
       "requires": {
-        "execa": "^0.7.0"
+        "execa": "0.7.0"
       }
     },
     "tfunk": {
@@ -17441,8 +17441,8 @@
       "integrity": "sha1-OORBT8ZJd9h6/apy+sttKfgve1s=",
       "dev": true,
       "requires": {
-        "chalk": "^1.1.1",
-        "object-path": "^0.9.0"
+        "chalk": "1.1.3",
+        "object-path": "0.9.2"
       },
       "dependencies": {
         "ansi-regex": {
@@ -17463,11 +17463,11 @@
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "strip-ansi": {
@@ -17476,7 +17476,7 @@
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "2.1.1"
           }
         },
         "supports-color": {
@@ -17498,8 +17498,8 @@
       "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
       "dev": true,
       "requires": {
-        "readable-stream": "^2.1.5",
-        "xtend": "~4.0.1"
+        "readable-stream": "2.3.6",
+        "xtend": "4.0.1"
       }
     },
     "thunkify": {
@@ -17533,7 +17533,7 @@
       "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
       "dev": true,
       "requires": {
-        "setimmediate": "^1.0.4"
+        "setimmediate": "1.0.5"
       }
     },
     "timespan": {
@@ -17549,7 +17549,7 @@
       "integrity": "sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=",
       "dev": true,
       "requires": {
-        "os-tmpdir": "~1.0.1"
+        "os-tmpdir": "1.0.2"
       }
     },
     "to-array": {
@@ -17582,7 +17582,7 @@
       "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
       "dev": true,
       "requires": {
-        "kind-of": "^3.0.2"
+        "kind-of": "3.2.2"
       },
       "dependencies": {
         "kind-of": {
@@ -17591,7 +17591,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -17602,10 +17602,10 @@
       "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "dev": true,
       "requires": {
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "regex-not": "^1.0.2",
-        "safe-regex": "^1.1.0"
+        "define-property": "2.0.2",
+        "extend-shallow": "3.0.2",
+        "regex-not": "1.0.2",
+        "safe-regex": "1.1.0"
       }
     },
     "to-regex-range": {
@@ -17614,8 +17614,8 @@
       "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
       "dev": true,
       "requires": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
+        "is-number": "3.0.0",
+        "repeat-string": "1.6.1"
       }
     },
     "toml": {
@@ -17636,8 +17636,8 @@
       "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
       "dev": true,
       "requires": {
-        "psl": "^1.1.24",
-        "punycode": "^1.4.1"
+        "psl": "1.1.29",
+        "punycode": "1.4.1"
       },
       "dependencies": {
         "punycode": {
@@ -17654,11 +17654,11 @@
       "integrity": "sha1-wE3nTRRpbDNzQn3k/Ajsr5E/w6E=",
       "dev": true,
       "requires": {
-        "commander": "2.9.x",
-        "glob": "5.0.x",
-        "rsvp": "^3.0.13",
-        "semver": "^4.3.3",
-        "source-map-support": "~0.2.8"
+        "commander": "2.9.0",
+        "glob": "5.0.15",
+        "rsvp": "3.6.2",
+        "semver": "4.3.6",
+        "source-map-support": "0.2.10"
       },
       "dependencies": {
         "commander": {
@@ -17667,7 +17667,7 @@
           "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
           "dev": true,
           "requires": {
-            "graceful-readlink": ">= 1.0.0"
+            "graceful-readlink": "1.0.1"
           }
         },
         "glob": {
@@ -17676,11 +17676,11 @@
           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
           "dev": true,
           "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
           }
         },
         "semver": {
@@ -17695,7 +17695,7 @@
           "integrity": "sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY=",
           "dev": true,
           "requires": {
-            "amdefine": ">=0.0.4"
+            "amdefine": "1.0.1"
           }
         },
         "source-map-support": {
@@ -17757,7 +17757,7 @@
       "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
       "dev": true,
       "requires": {
-        "glob": "^7.1.2"
+        "glob": "7.1.3"
       }
     },
     "tryer": {
@@ -17772,16 +17772,16 @@
       "integrity": "sha512-xcZH12oVg9PShKhy3UHyDmuDLV3y7iKwX25aMVPt1SIXSuAfWkFiGPEkg+th8R4YKW/QCxDoW7lJdb15lx6QWg==",
       "dev": true,
       "requires": {
-        "arrify": "^1.0.0",
-        "chalk": "^2.3.0",
-        "diff": "^3.1.0",
-        "make-error": "^1.1.1",
-        "minimist": "^1.2.0",
-        "mkdirp": "^0.5.1",
-        "source-map-support": "^0.5.0",
-        "tsconfig": "^7.0.0",
-        "v8flags": "^3.0.0",
-        "yn": "^2.0.0"
+        "arrify": "1.0.1",
+        "chalk": "2.4.1",
+        "diff": "3.5.0",
+        "make-error": "1.3.5",
+        "minimist": "1.2.0",
+        "mkdirp": "0.5.1",
+        "source-map-support": "0.5.9",
+        "tsconfig": "7.0.0",
+        "v8flags": "3.1.1",
+        "yn": "2.0.0"
       },
       "dependencies": {
         "minimist": {
@@ -17798,10 +17798,10 @@
       "integrity": "sha512-vZXmzPrL+EmC4T/4rVlT2jNVMWCi/O4DIiSj3UHg1OE5kCKbk4mfrXc6dZksLgRM/TZlKnousKH9bbTazUWRRw==",
       "dev": true,
       "requires": {
-        "@types/strip-bom": "^3.0.0",
+        "@types/strip-bom": "3.0.0",
         "@types/strip-json-comments": "0.0.30",
-        "strip-bom": "^3.0.0",
-        "strip-json-comments": "^2.0.0"
+        "strip-bom": "3.0.0",
+        "strip-json-comments": "2.0.1"
       },
       "dependencies": {
         "strip-bom": {
@@ -17818,11 +17818,11 @@
       "integrity": "sha512-JW9j+W0SaMSZGejIFZBk0AiPfnhljK3oLx5SaqxrJhjlvzFyPml5zqG1/PuScUj6yTe1muEqwk5CnDK0cOZmKw==",
       "dev": true,
       "requires": {
-        "jasmine-diff": "^0.1.3",
-        "minimist": "^1.2.0",
-        "mkdirp": "^0.5.1",
-        "source-map": "^0.6.0",
-        "source-map-support": "^0.5.0"
+        "jasmine-diff": "0.1.3",
+        "minimist": "1.2.0",
+        "mkdirp": "0.5.1",
+        "source-map": "0.6.1",
+        "source-map-support": "0.5.9"
       },
       "dependencies": {
         "minimist": {
@@ -17850,18 +17850,18 @@
       "integrity": "sha1-ElX4ej/1frCw4fDmEKi0dIBGya4=",
       "dev": true,
       "requires": {
-        "babel-code-frame": "^6.22.0",
-        "builtin-modules": "^1.1.1",
-        "chalk": "^2.3.0",
-        "commander": "^2.12.1",
-        "diff": "^3.2.0",
-        "glob": "^7.1.1",
-        "js-yaml": "^3.7.0",
-        "minimatch": "^3.0.4",
-        "resolve": "^1.3.2",
-        "semver": "^5.3.0",
-        "tslib": "^1.8.0",
-        "tsutils": "^2.12.1"
+        "babel-code-frame": "6.26.0",
+        "builtin-modules": "1.1.1",
+        "chalk": "2.4.1",
+        "commander": "2.19.0",
+        "diff": "3.5.0",
+        "glob": "7.1.3",
+        "js-yaml": "3.12.0",
+        "minimatch": "3.0.4",
+        "resolve": "1.8.1",
+        "semver": "5.6.0",
+        "tslib": "1.9.3",
+        "tsutils": "2.29.0"
       },
       "dependencies": {
         "resolve": {
@@ -17870,7 +17870,7 @@
           "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==",
           "dev": true,
           "requires": {
-            "path-parse": "^1.0.5"
+            "path-parse": "1.0.6"
           }
         },
         "tsutils": {
@@ -17879,7 +17879,7 @@
           "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
           "dev": true,
           "requires": {
-            "tslib": "^1.8.1"
+            "tslib": "1.9.3"
           }
         }
       }
@@ -17897,7 +17897,7 @@
       "integrity": "sha512-CvWEadl8VwlxOq6F3hfNbGrrRVSAjN2EPCEBgcbCUVDUxmwkV5254OGKsITNxDz8IGDQPAw7YJMtBHniHu2tbA==",
       "dev": true,
       "requires": {
-        "tslib": "^1.8.1"
+        "tslib": "1.9.3"
       }
     },
     "tty-browserify": {
@@ -17912,7 +17912,7 @@
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
       "dev": true,
       "requires": {
-        "safe-buffer": "^5.0.1"
+        "safe-buffer": "5.1.2"
       }
     },
     "tweetnacl": {
@@ -17927,7 +17927,7 @@
       "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
       "dev": true,
       "requires": {
-        "prelude-ls": "~1.1.2"
+        "prelude-ls": "1.1.2"
       }
     },
     "type-detect": {
@@ -17942,7 +17942,7 @@
       "dev": true,
       "requires": {
         "media-typer": "0.3.0",
-        "mime-types": "~2.1.18"
+        "mime-types": "2.1.21"
       }
     },
     "typedarray": {
@@ -17964,15 +17964,15 @@
         "@types/marked": "0.3.0",
         "@types/minimatch": "3.0.3",
         "@types/shelljs": "0.7.8",
-        "fs-extra": "^5.0.0",
-        "handlebars": "^4.0.6",
-        "highlight.js": "^9.0.0",
-        "lodash": "^4.17.5",
-        "marked": "^0.3.17",
-        "minimatch": "^3.0.0",
-        "progress": "^2.0.0",
-        "shelljs": "^0.8.1",
-        "typedoc-default-themes": "^0.5.0",
+        "fs-extra": "5.0.0",
+        "handlebars": "4.0.12",
+        "highlight.js": "9.13.1",
+        "lodash": "4.17.11",
+        "marked": "0.3.19",
+        "minimatch": "3.0.4",
+        "progress": "2.0.1",
+        "shelljs": "0.8.2",
+        "typedoc-default-themes": "0.5.0",
         "typescript": "2.7.2"
       },
       "dependencies": {
@@ -17982,9 +17982,9 @@
           "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
+            "graceful-fs": "4.1.11",
+            "jsonfile": "4.0.0",
+            "universalify": "0.1.2"
           }
         },
         "typescript": {
@@ -18025,8 +18025,8 @@
       "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==",
       "dev": true,
       "requires": {
-        "commander": "~2.17.1",
-        "source-map": "~0.6.1"
+        "commander": "2.17.1",
+        "source-map": "0.6.1"
       },
       "dependencies": {
         "commander": {
@@ -18056,14 +18056,14 @@
       "integrity": "sha512-ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw==",
       "dev": true,
       "requires": {
-        "cacache": "^10.0.4",
-        "find-cache-dir": "^1.0.0",
-        "schema-utils": "^0.4.5",
-        "serialize-javascript": "^1.4.0",
-        "source-map": "^0.6.1",
-        "uglify-es": "^3.3.4",
-        "webpack-sources": "^1.1.0",
-        "worker-farm": "^1.5.2"
+        "cacache": "10.0.4",
+        "find-cache-dir": "1.0.0",
+        "schema-utils": "0.4.7",
+        "serialize-javascript": "1.5.0",
+        "source-map": "0.6.1",
+        "uglify-es": "3.3.9",
+        "webpack-sources": "1.3.0",
+        "worker-farm": "1.6.0"
       },
       "dependencies": {
         "commander": {
@@ -18084,8 +18084,8 @@
           "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
           "dev": true,
           "requires": {
-            "commander": "~2.13.0",
-            "source-map": "~0.6.1"
+            "commander": "2.13.0",
+            "source-map": "0.6.1"
           }
         }
       }
@@ -18114,8 +18114,8 @@
       "integrity": "sha512-+XZuV691Cn4zHsK0vkKYwBEwB74T3IZIcxrgn2E4rKwTfFyI1zCh7X7grwh9Re08fdPlarIdyWgI8aVB3F5A5g==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "xtend": "^4.0.1"
+        "inherits": "2.0.3",
+        "xtend": "4.0.1"
       }
     },
     "unified": {
@@ -18124,12 +18124,12 @@
       "integrity": "sha512-1k+KPhlVtqmG99RaTbAv/usu85fcSRu3wY8X+vnsEhIxNP5VbVIDiXnLqyKIG+UMdyTg0ZX9EI6k2AfjJkHPtA==",
       "dev": true,
       "requires": {
-        "bail": "^1.0.0",
-        "extend": "^3.0.0",
-        "is-plain-obj": "^1.1.0",
-        "trough": "^1.0.0",
-        "vfile": "^2.0.0",
-        "x-is-string": "^0.1.0"
+        "bail": "1.0.3",
+        "extend": "3.0.2",
+        "is-plain-obj": "1.1.0",
+        "trough": "1.0.3",
+        "vfile": "2.3.0",
+        "x-is-string": "0.1.0"
       }
     },
     "union-value": {
@@ -18138,10 +18138,10 @@
       "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
       "dev": true,
       "requires": {
-        "arr-union": "^3.1.0",
-        "get-value": "^2.0.6",
-        "is-extendable": "^0.1.1",
-        "set-value": "^0.4.3"
+        "arr-union": "3.1.0",
+        "get-value": "2.0.6",
+        "is-extendable": "0.1.1",
+        "set-value": "0.4.3"
       },
       "dependencies": {
         "extend-shallow": {
@@ -18150,7 +18150,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         },
         "set-value": {
@@ -18159,10 +18159,10 @@
           "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
           "dev": true,
           "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-extendable": "^0.1.1",
-            "is-plain-object": "^2.0.1",
-            "to-object-path": "^0.3.0"
+            "extend-shallow": "2.0.1",
+            "is-extendable": "0.1.1",
+            "is-plain-object": "2.0.4",
+            "to-object-path": "0.3.0"
           }
         }
       }
@@ -18179,7 +18179,7 @@
       "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
       "dev": true,
       "requires": {
-        "unique-slug": "^2.0.0"
+        "unique-slug": "2.0.1"
       }
     },
     "unique-slug": {
@@ -18188,7 +18188,7 @@
       "integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
       "dev": true,
       "requires": {
-        "imurmurhash": "^0.1.4"
+        "imurmurhash": "0.1.4"
       }
     },
     "unique-string": {
@@ -18197,7 +18197,7 @@
       "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
       "dev": true,
       "requires": {
-        "crypto-random-string": "^1.0.0"
+        "crypto-random-string": "1.0.0"
       }
     },
     "unist-util-find-all-after": {
@@ -18206,7 +18206,7 @@
       "integrity": "sha512-nDl79mKpffXojLpCimVXnxhlH/jjaTnDuScznU9J4jjsaUtBdDbxmlc109XtcqxY4SDO0SwzngsxxW8DIISt1w==",
       "dev": true,
       "requires": {
-        "unist-util-is": "^2.0.0"
+        "unist-util-is": "2.1.2"
       }
     },
     "unist-util-is": {
@@ -18221,7 +18221,7 @@
       "integrity": "sha512-XxoNOBvq1WXRKXxgnSYbtCF76TJrRoe5++pD4cCBsssSiWSnPEktyFrFLE8LTk3JW5mt9hB0Sk5zn4x/JeWY7Q==",
       "dev": true,
       "requires": {
-        "unist-util-visit": "^1.1.0"
+        "unist-util-visit": "1.4.0"
       }
     },
     "unist-util-stringify-position": {
@@ -18236,7 +18236,7 @@
       "integrity": "sha512-FiGu34ziNsZA3ZUteZxSFaczIjGmksfSgdKqBfOejrrfzyUy5b7YrlzT1Bcvi+djkYDituJDy2XB7tGTeBieKw==",
       "dev": true,
       "requires": {
-        "unist-util-visit-parents": "^2.0.0"
+        "unist-util-visit-parents": "2.0.1"
       }
     },
     "unist-util-visit-parents": {
@@ -18245,7 +18245,7 @@
       "integrity": "sha512-6B0UTiMfdWql4cQ03gDTCSns+64Zkfo2OCbK31Ov0uMizEz+CJeAp0cgZVb5Fhmcd7Bct2iRNywejT0orpbqUA==",
       "dev": true,
       "requires": {
-        "unist-util-is": "^2.1.2"
+        "unist-util-is": "2.1.2"
       }
     },
     "universalify": {
@@ -18265,8 +18265,8 @@
       "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
       "dev": true,
       "requires": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
+        "has-value": "0.3.1",
+        "isobject": "3.0.1"
       },
       "dependencies": {
         "has-value": {
@@ -18275,9 +18275,9 @@
           "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
           "dev": true,
           "requires": {
-            "get-value": "^2.0.3",
-            "has-values": "^0.1.4",
-            "isobject": "^2.0.0"
+            "get-value": "2.0.6",
+            "has-values": "0.1.4",
+            "isobject": "2.1.0"
           },
           "dependencies": {
             "isobject": {
@@ -18311,8 +18311,8 @@
       "integrity": "sha512-NG1h/MdGIX3HzyqMjyj1laBCmlPYhcO4xEy7gEqqzGiSLw7XqDQCnY4nYSn5XSaH8mQ6TFkaujrO8d/PIZN85A==",
       "dev": true,
       "requires": {
-        "binary": "^0.3.0",
-        "mkdirp": "^0.5.1"
+        "binary": "0.3.0",
+        "mkdirp": "0.5.1"
       }
     },
     "upath": {
@@ -18327,16 +18327,16 @@
       "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
       "dev": true,
       "requires": {
-        "boxen": "^1.2.1",
-        "chalk": "^2.0.1",
-        "configstore": "^3.0.0",
-        "import-lazy": "^2.1.0",
-        "is-ci": "^1.0.10",
-        "is-installed-globally": "^0.1.0",
-        "is-npm": "^1.0.0",
-        "latest-version": "^3.0.0",
-        "semver-diff": "^2.0.0",
-        "xdg-basedir": "^3.0.0"
+        "boxen": "1.3.0",
+        "chalk": "2.4.1",
+        "configstore": "3.1.2",
+        "import-lazy": "2.1.0",
+        "is-ci": "1.2.1",
+        "is-installed-globally": "0.1.0",
+        "is-npm": "1.0.0",
+        "latest-version": "3.1.0",
+        "semver-diff": "2.1.0",
+        "xdg-basedir": "3.0.0"
       }
     },
     "upper-case": {
@@ -18350,7 +18350,7 @@
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
       "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
       "requires": {
-        "punycode": "^2.1.0"
+        "punycode": "2.1.1"
       }
     },
     "urix": {
@@ -18389,9 +18389,9 @@
       "integrity": "sha512-dXHkKmw8FhPqu8asTc1puBfe3TehOCo2+RmOOev5suNCIYBcT626kxiWg1NBVkwc4rO8BGa7gP70W7VXuqHrjg==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0",
-        "mime": "^2.0.3",
-        "schema-utils": "^1.0.0"
+        "loader-utils": "1.1.0",
+        "mime": "2.3.1",
+        "schema-utils": "1.0.0"
       },
       "dependencies": {
         "mime": {
@@ -18406,9 +18406,9 @@
           "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
           "dev": true,
           "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
+            "ajv": "6.5.4",
+            "ajv-errors": "1.0.0",
+            "ajv-keywords": "3.2.0"
           }
         }
       }
@@ -18419,8 +18419,8 @@
       "integrity": "sha512-rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw==",
       "dev": true,
       "requires": {
-        "querystringify": "^2.0.0",
-        "requires-port": "^1.0.0"
+        "querystringify": "2.1.0",
+        "requires-port": "1.0.0"
       }
     },
     "url-parse-lax": {
@@ -18429,7 +18429,7 @@
       "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
       "dev": true,
       "requires": {
-        "prepend-http": "^1.0.1"
+        "prepend-http": "1.0.4"
       }
     },
     "use": {
@@ -18444,8 +18444,8 @@
       "integrity": "sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4=",
       "dev": true,
       "requires": {
-        "lru-cache": "2.2.x",
-        "tmp": "0.0.x"
+        "lru-cache": "2.2.4",
+        "tmp": "0.0.30"
       },
       "dependencies": {
         "lru-cache": {
@@ -18476,8 +18476,8 @@
       "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "object.getownpropertydescriptors": "^2.0.3"
+        "define-properties": "1.1.3",
+        "object.getownpropertydescriptors": "2.0.3"
       }
     },
     "utila": {
@@ -18517,7 +18517,7 @@
       "integrity": "sha512-iw/1ViSEaff8NJ3HLyEjawk/8hjJib3E7pvG4pddVXfUg1983s3VGsiClDjhK64MQVDGqc1Q8r18S4VKQZS9EQ==",
       "dev": true,
       "requires": {
-        "homedir-polyfill": "^1.0.1"
+        "homedir-polyfill": "1.0.1"
       }
     },
     "validate-npm-package-license": {
@@ -18525,8 +18525,8 @@
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
       "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
       "requires": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
+        "spdx-correct": "3.0.2",
+        "spdx-expression-parse": "3.0.0"
       }
     },
     "validate-npm-package-name": {
@@ -18535,7 +18535,7 @@
       "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
       "dev": true,
       "requires": {
-        "builtins": "^1.0.3"
+        "builtins": "1.0.3"
       }
     },
     "vary": {
@@ -18550,9 +18550,9 @@
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
       "dev": true,
       "requires": {
-        "assert-plus": "^1.0.0",
+        "assert-plus": "1.0.0",
         "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
+        "extsprintf": "1.3.0"
       }
     },
     "vfile": {
@@ -18561,10 +18561,10 @@
       "integrity": "sha512-ASt4mBUHcTpMKD/l5Q+WJXNtshlWxOogYyGYYrg4lt/vuRjC1EFQtlAofL5VmtVNIZJzWYFJjzGWZ0Gw8pzW1w==",
       "dev": true,
       "requires": {
-        "is-buffer": "^1.1.4",
+        "is-buffer": "1.1.6",
         "replace-ext": "1.0.0",
-        "unist-util-stringify-position": "^1.0.0",
-        "vfile-message": "^1.0.0"
+        "unist-util-stringify-position": "1.1.2",
+        "vfile-message": "1.0.1"
       },
       "dependencies": {
         "replace-ext": {
@@ -18587,7 +18587,7 @@
       "integrity": "sha512-vSGCkhNvJzO6VcWC6AlJW4NtYOVtS+RgCaqFIYUjoGIlHnFL+i0LbtYvonDWOMcB97uTPT4PRsyYY7REWC9vug==",
       "dev": true,
       "requires": {
-        "unist-util-stringify-position": "^1.1.1"
+        "unist-util-stringify-position": "1.1.2"
       }
     },
     "vinyl": {
@@ -18596,8 +18596,8 @@
       "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
       "dev": true,
       "requires": {
-        "clone": "^1.0.0",
-        "clone-stats": "^0.0.1",
+        "clone": "1.0.4",
+        "clone-stats": "0.0.1",
         "replace-ext": "0.0.1"
       },
       "dependencies": {
@@ -18641,9 +18641,9 @@
       "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
       "dev": true,
       "requires": {
-        "chokidar": "^2.0.2",
-        "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0"
+        "chokidar": "2.0.4",
+        "graceful-fs": "4.1.11",
+        "neo-async": "2.6.0"
       }
     },
     "wbuf": {
@@ -18652,7 +18652,7 @@
       "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
       "dev": true,
       "requires": {
-        "minimalistic-assert": "^1.0.0"
+        "minimalistic-assert": "1.0.1"
       }
     },
     "web-animations-js": {
@@ -18666,8 +18666,8 @@
       "integrity": "sha512-lcUKrjbBfCK6MNsh7xaY2UAUmZwe+/ib03AjVOpFobX4O7+83BUveSrLfU0Qsyb1DaKJdQRbuU+kM9aZ6QUhiQ==",
       "dev": true,
       "requires": {
-        "@types/selenium-webdriver": "^3.0.0",
-        "selenium-webdriver": "^3.0.1"
+        "@types/selenium-webdriver": "3.0.12",
+        "selenium-webdriver": "3.6.0"
       }
     },
     "webpack": {
@@ -18680,26 +18680,26 @@
         "@webassemblyjs/helper-module-context": "1.7.8",
         "@webassemblyjs/wasm-edit": "1.7.8",
         "@webassemblyjs/wasm-parser": "1.7.8",
-        "acorn": "^5.6.2",
-        "acorn-dynamic-import": "^3.0.0",
-        "ajv": "^6.1.0",
-        "ajv-keywords": "^3.1.0",
-        "chrome-trace-event": "^1.0.0",
-        "enhanced-resolve": "^4.1.0",
-        "eslint-scope": "^4.0.0",
-        "json-parse-better-errors": "^1.0.2",
-        "loader-runner": "^2.3.0",
-        "loader-utils": "^1.1.0",
-        "memory-fs": "~0.4.1",
-        "micromatch": "^3.1.8",
-        "mkdirp": "~0.5.0",
-        "neo-async": "^2.5.0",
-        "node-libs-browser": "^2.0.0",
-        "schema-utils": "^0.4.4",
-        "tapable": "^1.1.0",
-        "uglifyjs-webpack-plugin": "^1.2.4",
-        "watchpack": "^1.5.0",
-        "webpack-sources": "^1.3.0"
+        "acorn": "5.7.3",
+        "acorn-dynamic-import": "3.0.0",
+        "ajv": "6.5.4",
+        "ajv-keywords": "3.2.0",
+        "chrome-trace-event": "1.0.0",
+        "enhanced-resolve": "4.1.0",
+        "eslint-scope": "4.0.0",
+        "json-parse-better-errors": "1.0.2",
+        "loader-runner": "2.3.1",
+        "loader-utils": "1.1.0",
+        "memory-fs": "0.4.1",
+        "micromatch": "3.1.10",
+        "mkdirp": "0.5.1",
+        "neo-async": "2.6.0",
+        "node-libs-browser": "2.1.0",
+        "schema-utils": "0.4.7",
+        "tapable": "1.1.0",
+        "uglifyjs-webpack-plugin": "1.3.0",
+        "watchpack": "1.6.0",
+        "webpack-sources": "1.3.0"
       }
     },
     "webpack-bundle-analyzer": {
@@ -18708,18 +18708,18 @@
       "integrity": "sha512-rwxyfecTAxoarCC9VlHlIpfQCmmJ/qWD5bpbjkof+7HrNhTNZIwZITxN6CdlYL2axGmwNUQ+tFgcSOiNXMf/sQ==",
       "dev": true,
       "requires": {
-        "acorn": "^5.3.0",
-        "bfj-node4": "^5.2.0",
-        "chalk": "^2.3.0",
-        "commander": "^2.13.0",
-        "ejs": "^2.5.7",
-        "express": "^4.16.2",
-        "filesize": "^3.5.11",
-        "gzip-size": "^4.1.0",
-        "lodash": "^4.17.4",
-        "mkdirp": "^0.5.1",
-        "opener": "^1.4.3",
-        "ws": "^4.0.0"
+        "acorn": "5.7.3",
+        "bfj-node4": "5.3.1",
+        "chalk": "2.4.1",
+        "commander": "2.19.0",
+        "ejs": "2.6.1",
+        "express": "4.16.4",
+        "filesize": "3.6.1",
+        "gzip-size": "4.1.0",
+        "lodash": "4.17.11",
+        "mkdirp": "0.5.1",
+        "opener": "1.5.1",
+        "ws": "4.1.0"
       },
       "dependencies": {
         "ws": {
@@ -18728,8 +18728,8 @@
           "integrity": "sha512-ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA==",
           "dev": true,
           "requires": {
-            "async-limiter": "~1.0.0",
-            "safe-buffer": "~5.1.0"
+            "async-limiter": "1.0.0",
+            "safe-buffer": "5.1.2"
           }
         }
       }
@@ -18740,16 +18740,16 @@
       "integrity": "sha512-Cnqo7CeqeSvC6PTdts+dywNi5CRlIPbLx1AoUPK2T6vC1YAugMG3IOoO9DmEscd+Dghw7uRlnzV1KwOe5IrtgQ==",
       "dev": true,
       "requires": {
-        "chalk": "^2.4.1",
-        "cross-spawn": "^6.0.5",
-        "enhanced-resolve": "^4.1.0",
-        "global-modules-path": "^2.3.0",
-        "import-local": "^2.0.0",
-        "interpret": "^1.1.0",
-        "loader-utils": "^1.1.0",
-        "supports-color": "^5.5.0",
-        "v8-compile-cache": "^2.0.2",
-        "yargs": "^12.0.2"
+        "chalk": "2.4.1",
+        "cross-spawn": "6.0.5",
+        "enhanced-resolve": "4.1.0",
+        "global-modules-path": "2.3.0",
+        "import-local": "2.0.0",
+        "interpret": "1.1.0",
+        "loader-utils": "1.1.0",
+        "supports-color": "5.5.0",
+        "v8-compile-cache": "2.0.2",
+        "yargs": "12.0.2"
       },
       "dependencies": {
         "cross-spawn": {
@@ -18758,11 +18758,11 @@
           "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
           "dev": true,
           "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
+            "nice-try": "1.0.5",
+            "path-key": "2.0.1",
+            "semver": "5.6.0",
+            "shebang-command": "1.2.0",
+            "which": "1.3.1"
           }
         },
         "decamelize": {
@@ -18780,13 +18780,13 @@
           "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
           "dev": true,
           "requires": {
-            "cross-spawn": "^6.0.0",
-            "get-stream": "^3.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
+            "cross-spawn": "6.0.5",
+            "get-stream": "3.0.0",
+            "is-stream": "1.1.0",
+            "npm-run-path": "2.0.2",
+            "p-finally": "1.0.0",
+            "signal-exit": "3.0.2",
+            "strip-eof": "1.0.0"
           }
         },
         "find-up": {
@@ -18795,7 +18795,7 @@
           "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "dev": true,
           "requires": {
-            "locate-path": "^3.0.0"
+            "locate-path": "3.0.0"
           }
         },
         "invert-kv": {
@@ -18810,7 +18810,7 @@
           "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
           "dev": true,
           "requires": {
-            "invert-kv": "^2.0.0"
+            "invert-kv": "2.0.0"
           }
         },
         "locate-path": {
@@ -18819,8 +18819,8 @@
           "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
           "dev": true,
           "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
+            "p-locate": "3.0.0",
+            "path-exists": "3.0.0"
           }
         },
         "mem": {
@@ -18829,9 +18829,9 @@
           "integrity": "sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==",
           "dev": true,
           "requires": {
-            "map-age-cleaner": "^0.1.1",
-            "mimic-fn": "^1.0.0",
-            "p-is-promise": "^1.1.0"
+            "map-age-cleaner": "0.1.2",
+            "mimic-fn": "1.2.0",
+            "p-is-promise": "1.1.0"
           }
         },
         "os-locale": {
@@ -18840,9 +18840,9 @@
           "integrity": "sha512-7g5e7dmXPtzcP4bgsZ8ixDVqA7oWYuEz4lOSujeWyliPai4gfVDiFIcwBg3aGCPnmSGfzOKTK3ccPn0CKv3DBw==",
           "dev": true,
           "requires": {
-            "execa": "^0.10.0",
-            "lcid": "^2.0.0",
-            "mem": "^4.0.0"
+            "execa": "0.10.0",
+            "lcid": "2.0.0",
+            "mem": "4.0.0"
           }
         },
         "p-limit": {
@@ -18851,7 +18851,7 @@
           "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==",
           "dev": true,
           "requires": {
-            "p-try": "^2.0.0"
+            "p-try": "2.0.0"
           }
         },
         "p-locate": {
@@ -18860,7 +18860,7 @@
           "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
           "dev": true,
           "requires": {
-            "p-limit": "^2.0.0"
+            "p-limit": "2.0.0"
           }
         },
         "p-try": {
@@ -18875,18 +18875,18 @@
           "integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==",
           "dev": true,
           "requires": {
-            "cliui": "^4.0.0",
-            "decamelize": "^2.0.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^3.0.0",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^3.2.1 || ^4.0.0",
-            "yargs-parser": "^10.1.0"
+            "cliui": "4.1.0",
+            "decamelize": "2.0.0",
+            "find-up": "3.0.0",
+            "get-caller-file": "1.0.3",
+            "os-locale": "3.0.1",
+            "require-directory": "2.1.1",
+            "require-main-filename": "1.0.1",
+            "set-blocking": "2.0.0",
+            "string-width": "2.1.1",
+            "which-module": "2.0.0",
+            "y18n": "3.2.1",
+            "yargs-parser": "10.1.0"
           }
         },
         "yargs-parser": {
@@ -18895,7 +18895,7 @@
           "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
           "dev": true,
           "requires": {
-            "camelcase": "^4.1.0"
+            "camelcase": "4.1.0"
           }
         }
       }
@@ -18906,10 +18906,10 @@
       "integrity": "sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==",
       "dev": true,
       "requires": {
-        "memory-fs": "~0.4.1",
-        "mime": "^2.3.1",
-        "range-parser": "^1.0.3",
-        "webpack-log": "^2.0.0"
+        "memory-fs": "0.4.1",
+        "mime": "2.3.1",
+        "range-parser": "1.2.0",
+        "webpack-log": "2.0.0"
       },
       "dependencies": {
         "mime": {
@@ -18927,32 +18927,32 @@
       "dev": true,
       "requires": {
         "ansi-html": "0.0.7",
-        "bonjour": "^3.5.0",
-        "chokidar": "^2.0.0",
-        "compression": "^1.5.2",
-        "connect-history-api-fallback": "^1.3.0",
-        "debug": "^3.1.0",
-        "del": "^3.0.0",
-        "express": "^4.16.2",
-        "html-entities": "^1.2.0",
-        "http-proxy-middleware": "~0.18.0",
-        "import-local": "^2.0.0",
-        "internal-ip": "^3.0.1",
-        "ip": "^1.1.5",
-        "killable": "^1.0.0",
-        "loglevel": "^1.4.1",
-        "opn": "^5.1.0",
-        "portfinder": "^1.0.9",
-        "schema-utils": "^1.0.0",
-        "selfsigned": "^1.9.1",
-        "serve-index": "^1.7.2",
+        "bonjour": "3.5.0",
+        "chokidar": "2.0.4",
+        "compression": "1.7.3",
+        "connect-history-api-fallback": "1.5.0",
+        "debug": "3.2.6",
+        "del": "3.0.0",
+        "express": "4.16.4",
+        "html-entities": "1.2.1",
+        "http-proxy-middleware": "0.18.0",
+        "import-local": "2.0.0",
+        "internal-ip": "3.0.1",
+        "ip": "1.1.5",
+        "killable": "1.0.1",
+        "loglevel": "1.6.1",
+        "opn": "5.4.0",
+        "portfinder": "1.0.19",
+        "schema-utils": "1.0.0",
+        "selfsigned": "1.10.4",
+        "serve-index": "1.9.1",
         "sockjs": "0.3.19",
         "sockjs-client": "1.3.0",
-        "spdy": "^3.4.1",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^5.1.0",
+        "spdy": "3.4.7",
+        "strip-ansi": "3.0.1",
+        "supports-color": "5.5.0",
         "webpack-dev-middleware": "3.4.0",
-        "webpack-log": "^2.0.0",
+        "webpack-log": "2.0.0",
         "yargs": "12.0.2"
       },
       "dependencies": {
@@ -18968,11 +18968,11 @@
           "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
           "dev": true,
           "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
+            "nice-try": "1.0.5",
+            "path-key": "2.0.1",
+            "semver": "5.6.0",
+            "shebang-command": "1.2.0",
+            "which": "1.3.1"
           }
         },
         "decamelize": {
@@ -18990,13 +18990,13 @@
           "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
           "dev": true,
           "requires": {
-            "cross-spawn": "^6.0.0",
-            "get-stream": "^3.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
+            "cross-spawn": "6.0.5",
+            "get-stream": "3.0.0",
+            "is-stream": "1.1.0",
+            "npm-run-path": "2.0.2",
+            "p-finally": "1.0.0",
+            "signal-exit": "3.0.2",
+            "strip-eof": "1.0.0"
           }
         },
         "find-up": {
@@ -19005,7 +19005,7 @@
           "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "dev": true,
           "requires": {
-            "locate-path": "^3.0.0"
+            "locate-path": "3.0.0"
           }
         },
         "http-proxy-middleware": {
@@ -19014,10 +19014,10 @@
           "integrity": "sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==",
           "dev": true,
           "requires": {
-            "http-proxy": "^1.16.2",
-            "is-glob": "^4.0.0",
-            "lodash": "^4.17.5",
-            "micromatch": "^3.1.9"
+            "http-proxy": "1.17.0",
+            "is-glob": "4.0.0",
+            "lodash": "4.17.11",
+            "micromatch": "3.1.10"
           }
         },
         "invert-kv": {
@@ -19032,7 +19032,7 @@
           "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
           "dev": true,
           "requires": {
-            "invert-kv": "^2.0.0"
+            "invert-kv": "2.0.0"
           }
         },
         "locate-path": {
@@ -19041,8 +19041,8 @@
           "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
           "dev": true,
           "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
+            "p-locate": "3.0.0",
+            "path-exists": "3.0.0"
           }
         },
         "mem": {
@@ -19051,9 +19051,9 @@
           "integrity": "sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==",
           "dev": true,
           "requires": {
-            "map-age-cleaner": "^0.1.1",
-            "mimic-fn": "^1.0.0",
-            "p-is-promise": "^1.1.0"
+            "map-age-cleaner": "0.1.2",
+            "mimic-fn": "1.2.0",
+            "p-is-promise": "1.1.0"
           }
         },
         "os-locale": {
@@ -19062,9 +19062,9 @@
           "integrity": "sha512-7g5e7dmXPtzcP4bgsZ8ixDVqA7oWYuEz4lOSujeWyliPai4gfVDiFIcwBg3aGCPnmSGfzOKTK3ccPn0CKv3DBw==",
           "dev": true,
           "requires": {
-            "execa": "^0.10.0",
-            "lcid": "^2.0.0",
-            "mem": "^4.0.0"
+            "execa": "0.10.0",
+            "lcid": "2.0.0",
+            "mem": "4.0.0"
           }
         },
         "p-limit": {
@@ -19073,7 +19073,7 @@
           "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==",
           "dev": true,
           "requires": {
-            "p-try": "^2.0.0"
+            "p-try": "2.0.0"
           }
         },
         "p-locate": {
@@ -19082,7 +19082,7 @@
           "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
           "dev": true,
           "requires": {
-            "p-limit": "^2.0.0"
+            "p-limit": "2.0.0"
           }
         },
         "p-try": {
@@ -19097,9 +19097,9 @@
           "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
           "dev": true,
           "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
+            "ajv": "6.5.4",
+            "ajv-errors": "1.0.0",
+            "ajv-keywords": "3.2.0"
           }
         },
         "strip-ansi": {
@@ -19108,7 +19108,7 @@
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "2.1.1"
           }
         },
         "yargs": {
@@ -19117,18 +19117,18 @@
           "integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==",
           "dev": true,
           "requires": {
-            "cliui": "^4.0.0",
-            "decamelize": "^2.0.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^3.0.0",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^3.2.1 || ^4.0.0",
-            "yargs-parser": "^10.1.0"
+            "cliui": "4.1.0",
+            "decamelize": "2.0.0",
+            "find-up": "3.0.0",
+            "get-caller-file": "1.0.3",
+            "os-locale": "3.0.1",
+            "require-directory": "2.1.1",
+            "require-main-filename": "1.0.1",
+            "set-blocking": "2.0.0",
+            "string-width": "2.1.1",
+            "which-module": "2.0.0",
+            "y18n": "3.2.1",
+            "yargs-parser": "10.1.0"
           }
         },
         "yargs-parser": {
@@ -19137,7 +19137,7 @@
           "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
           "dev": true,
           "requires": {
-            "camelcase": "^4.1.0"
+            "camelcase": "4.1.0"
           }
         }
       }
@@ -19148,8 +19148,8 @@
       "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
       "dev": true,
       "requires": {
-        "ansi-colors": "^3.0.0",
-        "uuid": "^3.3.2"
+        "ansi-colors": "3.2.1",
+        "uuid": "3.3.2"
       }
     },
     "webpack-merge": {
@@ -19158,7 +19158,7 @@
       "integrity": "sha1-8dgB0sXTn4P/7J8RkkCz476ZShw=",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.4"
+        "lodash": "4.17.11"
       }
     },
     "webpack-sources": {
@@ -19167,8 +19167,8 @@
       "integrity": "sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==",
       "dev": true,
       "requires": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
+        "source-list-map": "2.0.1",
+        "source-map": "0.6.1"
       },
       "dependencies": {
         "source-map": {
@@ -19185,7 +19185,7 @@
       "integrity": "sha512-bdMR4DRbINUFt+QhNfBFHURnCzT8mtHjXiclQWX/aXBpu2pM4nOb2qViyt84ZSFrVKEXkAbmz7mSoZQH/08xFg==",
       "dev": true,
       "requires": {
-        "webpack-sources": "^1.3.0"
+        "webpack-sources": "1.3.0"
       }
     },
     "websocket-driver": {
@@ -19194,8 +19194,8 @@
       "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
       "dev": true,
       "requires": {
-        "http-parser-js": ">=0.4.0",
-        "websocket-extensions": ">=0.1.1"
+        "http-parser-js": "0.5.0",
+        "websocket-extensions": "0.1.3"
       }
     },
     "websocket-extensions": {
@@ -19214,7 +19214,7 @@
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "requires": {
-        "isexe": "^2.0.0"
+        "isexe": "2.0.0"
       }
     },
     "which-module": {
@@ -19228,7 +19228,7 @@
       "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
       "dev": true,
       "requires": {
-        "string-width": "^1.0.2 || 2"
+        "string-width": "2.1.1"
       }
     },
     "widest-line": {
@@ -19237,7 +19237,7 @@
       "integrity": "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==",
       "dev": true,
       "requires": {
-        "string-width": "^2.1.1"
+        "string-width": "2.1.1"
       }
     },
     "window-size": {
@@ -19265,7 +19265,7 @@
       "integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
       "dev": true,
       "requires": {
-        "errno": "~0.1.7"
+        "errno": "0.1.7"
       }
     },
     "worker-loader": {
@@ -19273,8 +19273,8 @@
       "resolved": "https://registry.npmjs.org/worker-loader/-/worker-loader-1.1.1.tgz",
       "integrity": "sha512-qJZLVS/jMCBITDzPo/RuweYSIG8VJP5P67mP/71alGyTZRe1LYJFdwLjLalY3T5ifx0bMDRD3OB6P2p1escvlg==",
       "requires": {
-        "loader-utils": "^1.0.0",
-        "schema-utils": "^0.4.0"
+        "loader-utils": "1.1.0",
+        "schema-utils": "0.4.7"
       }
     },
     "wrap-ansi": {
@@ -19282,8 +19282,8 @@
       "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
       "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
       "requires": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1"
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1"
       },
       "dependencies": {
         "ansi-regex": {
@@ -19296,7 +19296,7 @@
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "requires": {
-            "number-is-nan": "^1.0.0"
+            "number-is-nan": "1.0.1"
           }
         },
         "string-width": {
@@ -19304,9 +19304,9 @@
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
           }
         },
         "strip-ansi": {
@@ -19314,7 +19314,7 @@
           "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "2.1.1"
           }
         }
       }
@@ -19331,7 +19331,7 @@
       "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
       "dev": true,
       "requires": {
-        "mkdirp": "^0.5.1"
+        "mkdirp": "0.5.1"
       }
     },
     "write-file-atomic": {
@@ -19340,9 +19340,9 @@
       "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.11",
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^3.0.2"
+        "graceful-fs": "4.1.11",
+        "imurmurhash": "0.1.4",
+        "signal-exit": "3.0.2"
       }
     },
     "ws": {
@@ -19351,9 +19351,9 @@
       "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
       "dev": true,
       "requires": {
-        "async-limiter": "~1.0.0",
-        "safe-buffer": "~5.1.0",
-        "ultron": "~1.1.0"
+        "async-limiter": "1.0.0",
+        "safe-buffer": "5.1.2",
+        "ultron": "1.1.1"
       }
     },
     "x-is-string": {
@@ -19373,8 +19373,8 @@
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
       "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
       "requires": {
-        "sax": ">=0.6.0",
-        "xmlbuilder": "~9.0.1"
+        "sax": "1.2.4",
+        "xmlbuilder": "9.0.7"
       }
     },
     "xmlbuilder": {
@@ -19388,7 +19388,7 @@
       "integrity": "sha1-kuQ36QDb/wRFDvrpDTyl8WVl9zg=",
       "dev": true,
       "requires": {
-        "sax": "~1.1.1"
+        "sax": "1.1.6"
       },
       "dependencies": {
         "sax": {
@@ -19429,7 +19429,7 @@
       "integrity": "sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==",
       "dev": true,
       "requires": {
-        "cuint": "^0.2.2"
+        "cuint": "0.2.2"
       }
     },
     "y18n": {
@@ -19447,18 +19447,18 @@
       "resolved": "http://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz",
       "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==",
       "requires": {
-        "cliui": "^4.0.0",
-        "decamelize": "^1.1.1",
-        "find-up": "^2.1.0",
-        "get-caller-file": "^1.0.1",
-        "os-locale": "^2.0.0",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^1.0.1",
-        "set-blocking": "^2.0.0",
-        "string-width": "^2.0.0",
-        "which-module": "^2.0.0",
-        "y18n": "^3.2.1",
-        "yargs-parser": "^9.0.2"
+        "cliui": "4.1.0",
+        "decamelize": "1.2.0",
+        "find-up": "2.1.0",
+        "get-caller-file": "1.0.3",
+        "os-locale": "2.1.0",
+        "require-directory": "2.1.1",
+        "require-main-filename": "1.0.1",
+        "set-blocking": "2.0.0",
+        "string-width": "2.1.1",
+        "which-module": "2.0.0",
+        "y18n": "3.2.1",
+        "yargs-parser": "9.0.2"
       }
     },
     "yargs-parser": {
@@ -19466,7 +19466,7 @@
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz",
       "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
       "requires": {
-        "camelcase": "^4.1.0"
+        "camelcase": "4.1.0"
       }
     },
     "yeast": {
@@ -19487,9 +19487,9 @@
       "integrity": "sha512-c+eUhhkDpaK87G/py74wvWLtz2kzMPNCCkUApkun50ssE0oQliIQzWpTnwjB+MTKVIf2tGzIgHyqW/Y+W77ecQ==",
       "dev": true,
       "requires": {
-        "archiver-utils": "^2.0.0",
-        "compress-commons": "^1.2.0",
-        "readable-stream": "^2.0.0"
+        "archiver-utils": "2.0.0",
+        "compress-commons": "1.2.2",
+        "readable-stream": "2.3.6"
       }
     },
     "zone.js": {
diff --git a/protractor.conf.js b/protractor.conf.js
index 8e082d0b56..56d7f11bf6 100644
--- a/protractor.conf.js
+++ b/protractor.conf.js
@@ -21,6 +21,8 @@ var BROWSER_RUN = process.env.BROWSER_RUN;
 var FOLDER = process.env.FOLDER || '';
 var SELENIUM_SERVER = process.env.SELENIUM_SERVER || '';
 var DIRECT_CONNECCT = SELENIUM_SERVER ? false : true;
+var MAXINSTANCES = process.env.MAXINSTANCES || 1;
+var TIMEOUT = parseInt(process.env.TIMEOUT, 10);
 
 var specsToRun = './**/' + FOLDER + '**/*.e2e.ts';
 
@@ -48,17 +50,19 @@ var buildNumber = () => {
 }
 
 exports.config = {
-    allScriptsTimeout: 60000,
+    allScriptsTimeout: TIMEOUT,
 
     specs: [
         specsToRun
     ],
 
+    useAllAngular2AppRoots: true,
+
     capabilities: {
         browserName: 'chrome',
 
         shardTestFiles: true,
-        maxInstances: 1,
+        maxInstances: MAXINSTANCES,
         chromeOptions: {
             prefs: {
                 'credentials_enable_service': false,
@@ -143,14 +147,14 @@ exports.config = {
     beforeLaunch: function () {
         var reportsFolder = `${projectRoot}/e2e-output/junit-report/`;
 
-        fs.exists(reportsFolder, function(exists, error) {
+        fs.exists(reportsFolder, function (exists, error) {
             if (exists) {
-                rimraf(reportsFolder, function(err) {
+                rimraf(reportsFolder, function (err) {
                     console.log('[ERROR] rimraf: ', err);
                 });
             }
 
-            if(error) {
+            if (error) {
                 console.log('[ERROR] fs', error);
             }
         });
@@ -190,13 +194,15 @@ exports.config = {
                     new htmlReporter().from(filePath, testConfigReport);
                     lastFileName = testConfigReport.outputFilename;
                 }
-            };
+            }
+            ;
 
             var lastHtmlFile = temporaryHtmlPath + lastFileName + '.html';
 
-            if(!(fs.lstatSync(lastHtmlFile).isDirectory())) {
+            if (!(fs.lstatSync(lastHtmlFile).isDirectory())) {
                 output = output + fs.readFileSync(lastHtmlFile);
-            };
+            }
+            ;
 
             var fileName = savePath + 'html/' + filenameReport + '.html';
 
@@ -216,23 +222,21 @@ exports.config = {
 
                     try {
                         folder = await
-                        alfrescoJsApi.nodes.addNode('-my-', {
-                            'name': `retry-${retryCount}`,
-                            'relativePath': `Builds/${buildNumber()}/screenshot`,
-                            'nodeType': 'cm:folder'
-                        }, {}, {
-                            'overwrite': true
-                        });
+                            alfrescoJsApi.nodes.addNode('-my-', {
+                                'name': `retry-${retryCount}`,
+                                'relativePath': `Builds/${buildNumber()}/screenshot`,
+                                'nodeType': 'cm:folder'
+                            }, {}, {
+                                'overwrite': true
+                            });
                     } catch (error) {
-                        console.log('Folder screenshot already present');
-
                         folder = await
-                        alfrescoJsApi.nodes.getNode('-my-', {
-                            'relativePath': `Builds/${buildNumber()}/screenshot/retry-${retryCount}`,
-                            'nodeType': 'cm:folder'
-                        }, {}, {
-                            'overwrite': true
-                        });
+                            alfrescoJsApi.nodes.getNode('-my-', {
+                                'relativePath': `Builds/${buildNumber()}/screenshot/retry-${retryCount}`,
+                                'nodeType': 'cm:folder'
+                            }, {}, {
+                                'overwrite': true
+                            });
                     }
 
                     for (const fileName of files) {
@@ -241,17 +245,17 @@ exports.config = {
                         let file = fs.createReadStream(pathFile);
 
                         await
-                        alfrescoJsApi.upload.uploadFile(
-                            file,
-                            '',
-                            folder.entry.id,
-                            null,
-                            {
-                                'name': file.name,
-                                'nodeType': 'cm:content',
-                                'autoRename': true
-                            }
-                        );
+                            alfrescoJsApi.upload.uploadFile(
+                                file,
+                                '',
+                                folder.entry.id,
+                                null,
+                                {
+                                    'name': file.name,
+                                    'nodeType': 'cm:content',
+                                    'autoRename': true
+                                }
+                            );
                     }
                 }
             }
@@ -263,37 +267,37 @@ exports.config = {
 
             try {
                 reportFolder = await
-                alfrescoJsApi.nodes.addNode('-my-', {
-                    'name': 'report',
-                    'relativePath': `Builds/${buildNumber()}`,
-                    'nodeType': 'cm:folder'
-                }, {}, {
-                    'overwrite': true
-                });
+                    alfrescoJsApi.nodes.addNode('-my-', {
+                        'name': 'report',
+                        'relativePath': `Builds/${buildNumber()}`,
+                        'nodeType': 'cm:folder'
+                    }, {}, {
+                        'overwrite': true
+                    });
             } catch (error) {
                 reportFolder = await
-                alfrescoJsApi.nodes.getNode('-my-', {
-                    'relativePath': `Builds/${buildNumber()}/report`,
-                    'nodeType': 'cm:folder'
-                }, {}, {
-                    'overwrite': true
-                });
+                    alfrescoJsApi.nodes.getNode('-my-', {
+                        'relativePath': `Builds/${buildNumber()}/report`,
+                        'nodeType': 'cm:folder'
+                    }, {}, {
+                        'overwrite': true
+                    });
 
             }
 
             try {
                 await
-                alfrescoJsApi.upload.uploadFile(
-                    reportFile,
-                    '',
-                    reportFolder.entry.id,
-                    null,
-                    {
-                        'name': reportFile.name,
-                        'nodeType': 'cm:content',
-                        'autoRename': true
-                    }
-                );
+                    alfrescoJsApi.upload.uploadFile(
+                        reportFile,
+                        '',
+                        reportFolder.entry.id,
+                        null,
+                        {
+                            'name': reportFile.name,
+                            'nodeType': 'cm:content',
+                            'autoRename': true
+                        }
+                    );
 
             } catch (error) {
                 console.log('error' + error);
diff --git a/scripts/test-e2e-lib.sh b/scripts/test-e2e-lib.sh
index 87c56f8c30..e902715ac1 100755
--- a/scripts/test-e2e-lib.sh
+++ b/scripts/test-e2e-lib.sh
@@ -7,6 +7,7 @@ DEVELOPMENT=false
 EXECLINT=true
 LITESERVER=false
 EXEC_VERSION_JSAPI=false
+TIMEOUT=7000
 
 show_help() {
     echo "Usage: ./scripts/test-e2e-lib.sh -host adf.domain.com -u admin -p admin -e admin"
@@ -25,6 +26,7 @@ show_help() {
     echo "-save  save the error screenshot in the remote env"
     echo "-timeout or --timeout override the timeout foe the wait utils"
     echo "-sl --skip-lint skip lint"
+    echo "-m --maxInstances max instances parallel for tests"
     echo "-vjsapi install different version from npm of JS-API defined in the package.json"
     echo "-h or --help"
 }
@@ -88,6 +90,10 @@ lite_server(){
     LITESERVER=true
 }
 
+max_instances(){
+    MAXINSTANCES=$1
+}
+
 version_js_api() {
     JSAPI_VERSION=$1
 
@@ -118,6 +124,7 @@ while [[ $1 == -* ]]; do
       -host|--host)  set_host $2; shift 2;;
       -host_sso|--host_sso)  set_host_sso $2; shift 2;;
       -sl|--skip-lint)  skip_lint; shift;;
+      -m|--maxInstances)  max_instances $2; shift 2;;
       -vjsapi)  version_js_api $2; shift 2;;
       -*) echo "invalid option: $1" 1>&2; show_help; exit 1;;
     esac
@@ -138,6 +145,7 @@ export TIMEOUT=$TIMEOUT
 export FOLDER=$FOLDER'/'
 export SELENIUM_SERVER=$SELENIUM_SERVER
 export NAME_TEST=$NAME_TEST
+export MAXINSTANCES=$MAXINSTANCES
 
 
 if $EXEC_VERSION_JSAPI == true; then
diff --git a/stylelint-config.json b/stylelint-config.json
index 7871313527..7d00d95a5d 100644
--- a/stylelint-config.json
+++ b/stylelint-config.json
@@ -81,7 +81,7 @@
     "max-line-length": 100,
     "linebreaks": "unix",
     "selector-class-pattern": [
-      "^_?(adf|adf-|cdk-|example-|demo-|mat-|textLayer|canvasWrapper)",
+      "^_?(adf|adf-|cdk-|example-|demo-|mat-|material-|textLayer|canvasWrapper)",
       {
         "resolveNestedSelectors": true
       }