diff --git a/.angular-cli.json b/.angular-cli.json
deleted file mode 100644
index a5f19b9c08..0000000000
--- a/.angular-cli.json
+++ /dev/null
@@ -1,217 +0,0 @@
-{
-  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-  "project": {
-    "name": "myapp"
-  },
-  "apps": [
-    {
-      "name": "dist",
-      "root": "demo-shell/src",
-      "outDir": "demo-shell/dist",
-      "assets": [
-        "assets",
-        "favicon.ico",
-        "app.config.json",
-        "versions.json",
-        {
-          "glob": "**/*",
-          "input": "../resources",
-          "output": "./resources"
-        },
-        {
-          "glob": "**/*",
-          "input": "./app/components/lazy-loading/i18n",
-          "output": "./resources/lazy-loading/i18n"
-        },
-        {
-          "glob": "**/*",
-          "input": "../../node_modules/@alfresco/adf-core/prebuilt-themes",
-          "output": "./assets/prebuilt-themes"
-        },
-        {
-          "glob": "**/*",
-          "input": "../../node_modules/@alfresco/adf-core/bundles/assets",
-          "output": "./assets/"
-        },
-        {
-          "glob": "**/*",
-          "input": "../../node_modules/@alfresco/adf-insights/bundles/assets",
-          "output": "./assets/"
-        },
-        {
-          "glob": "**/*",
-          "input": "../../node_modules/@alfresco/adf-process-services/bundles/assets",
-          "output": "./assets/"
-        },
-        {
-          "glob": "**/*",
-          "input": "../../node_modules/@alfresco/adf-content-services/bundles/assets",
-          "output": "./assets/"
-        },
-        {
-          "glob": "pdf.worker.js",
-          "input": "../../node_modules/pdfjs-dist/build",
-          "output": "./"
-        }
-      ],
-      "index": "index.html",
-      "main": "main.ts",
-      "polyfills": "polyfills.ts",
-      "test": "test.ts",
-      "tsconfig": "tsconfig.app.json",
-      "testTsconfig": "tsconfig.spec.json",
-      "prefix": "app",
-      "styles": [
-        "styles.scss",
-        "custom-style.scss"
-      ],
-      "stylePreprocessorOptions": {
-        "includePaths": [
-          "./node_modules/"
-        ]
-      },
-      "scripts": [
-        "../../node_modules/pdfjs-dist/build/pdf.js",
-        "../../node_modules/pdfjs-dist/web/pdf_viewer.js",
-        "../../node_modules/raphael/raphael.min.js",
-        "../../node_modules/moment/min/moment.min.js"
-      ],
-      "environmentSource": "environments/environment.ts",
-      "environments": {
-        "dev": "environments/environment.ts",
-        "prod": "environments/environment.prod.ts"
-      }
-    },
-    {
-      "name": "dev",
-      "root": "demo-shell/src",
-      "outDir": "demo-shell/dist",
-      "assets": [
-        "assets",
-        "app.config.json",
-        "versions.json",
-        {
-          "glob": "**/*",
-          "input": "./assets",
-          "output": "./assets"
-        },
-        {
-          "glob": "app.config.json",
-          "input": "./",
-          "output": "./"
-        },
-        {
-          "glob": "versions.json",
-          "input": "./",
-          "output": "./"
-        },
-        {
-          "glob": "**/*",
-          "input": "../resources",
-          "output": "./resources"
-        },
-        {
-          "glob": "**/*",
-          "input": "./app/components/lazy-loading/i18n",
-          "output": "./resources/lazy-loading/i18n"
-        },
-        {
-          "glob": "**/*",
-          "input": "../../lib/dist/core/prebuilt-themes",
-          "output": "./assets/prebuilt-themes"
-        },
-        {
-          "glob": "**/*",
-          "input": "../../lib/core/assets",
-          "output": "./assets"
-        },
-        {
-          "glob": "**/*",
-          "input": "../../lib/process-services/assets",
-          "output": "./assets"
-        },
-        {
-          "glob": "**/*",
-          "input": "../../lib/content-services/assets",
-          "output": "./assets"
-        },
-        {
-          "glob": "**/*",
-          "input": "../../lib/core/i18n",
-          "output": "./assets/adf-core/i18n"
-        },
-        {
-          "glob": "**/*",
-          "input": "../../lib/content-services/i18n",
-          "output": "./assets/adf-content-services/i18n"
-        },
-        {
-          "glob": "**/*",
-          "input": "../../lib/process-services/i18n",
-          "output": "./assets/adf-process-services/i18n"
-        },
-        {
-          "glob": "**/*",
-          "input": "../../lib/insights/i18n",
-          "output": "./assets/adf-insights/i18n"
-        },
-        {
-          "glob": "pdf.worker.js",
-          "input": "../../node_modules/pdfjs-dist/build",
-          "output": "./"
-        }
-      ],
-      "index": "index.html",
-      "main": "main.ts",
-      "polyfills": "polyfills.ts",
-      "test": "test.ts",
-      "tsconfig": "tsconfig.dev.json",
-      "testTsconfig": "tsconfig.spec.json",
-      "prefix": "app-dev",
-      "styles": [
-        "styles.scss",
-        "custom-style-dev.scss"
-      ],
-      "stylePreprocessorOptions": {
-        "includePaths": [
-          "../../lib/"
-        ]
-      },
-      "scripts": [
-        "../../node_modules/pdfjs-dist/build/pdf.js",
-        "../../node_modules/pdfjs-dist/web/pdf_viewer.js",
-        "../../node_modules/raphael/raphael.min.js",
-        "../../node_modules/moment/min/moment.min.js"
-      ],
-      "environmentSource": "environments/environment.ts",
-      "environments": {
-        "dev": "environments/environment.ts",
-        "prod": "environments/environment.prod.ts"
-      }
-    }
-  ],
-  "e2e": {
-    "protractor": {
-      "config": "./demo-shell/protractor.conf.js"
-    }
-  },
-  "lint": [
-    {
-      "project": "./demo-shell/src/tsconfig.app.json",
-      "exclude": "**/node_modules/**/*"
-    }
-  ],
-  "test": {
-    "karma": {
-      "config": "./demo-shell/karma.conf.js"
-    }
-  },
-  "defaults": {
-    "styleExt": "scss",
-    "component": {
-    },
-    "serve": {
-      "port": 3000
-    }
-  }
-}
diff --git a/.gitignore b/.gitignore
index 6d6ebc0d2d..325f526df3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,8 @@ bundles
 workspace.xml
 .idea/
 dist/
+e2e-output/
+e2e/downloads/
 ng2-components/coverage/
 !systemjs.config.js
 demo-shell-ng2/app/components/router/
@@ -24,3 +26,5 @@ src/environments/
 /lib/config/exportCheck.js
 /lib/config/export-check/export-new.json
 /lib/config/export-check/exportCheck.js
+/docs/sourceinfo
+/docs/docs.json
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index b49c9edc42..ef31148ae1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,9 @@ language: node_js
 dist: trusty
 sudo: required
 node_js:
-  - "8"
-
+ # Use the explicit NodeJS LTS version 8.9.4 to avoid any automatic upgrade of the version.
+  - '8.9.4'
+  
 addons:
     chrome: stable
 before_script:
@@ -14,6 +15,7 @@ before_install:
     - export CHROME_BIN=chromium-browser
     - export DISPLAY=:99.0
     - sh -e /etc/init.d/xvfb start
+    - sleep 3 # give xvfb some time to start
 
 env:
   matrix:
@@ -64,13 +66,10 @@ script:
 
 jobs:
     include:
-        - stage: Demo shell prod && Demo shell e2e && Check ADF exports
-          script: ./scripts/test-dist.sh -n $TRAVIS_BUILD_NUMBER && (./scripts/pr-publish.sh -n $TRAVIS_BUILD_NUMBER -r $REPO_DOCKER -u $USERNAME_DOCKER -p $PASSWORD_DOCKER || exit 1)
-        - # Test Update version 2.0.0
+        - stage: Test Update version 2.0.0
           script: ./scripts/test-e2e-bc.sh
         - # Test expors
           script: npm run test-export
-        - stage: Update Apps dependencies
         - # Test Update generator-ng2-alfresco-app
           if: tag =~ .*beta.*
           script: ./scripts/update-project.sh -gnu -t $GITHUB_TOKEN -n generator-ng2-alfresco-app
@@ -86,7 +85,17 @@ jobs:
         - # Test Update alfresco-modeler-app
           if: tag =~ .*beta.*
           script: ./scripts/update-project.sh -gnu -t $GITHUB_TOKEN -n alfresco-modeler-app
-        - stage: Deploy PR
+        - stage: e2e Test
+          script: ./scripts/test-e2e-lib.sh -host localhost:4200 -proxy $E2E_HOST -u $E2E_USERNAME -p $E2E_PASSWORD -e $E2E_EMAIL -b -save -dev -timeout 40000 --folder core
+        - # Test process-services
+          script: ./scripts/test-e2e-lib.sh -host localhost:4200 -proxy $E2E_HOST -u $E2E_USERNAME -p $E2E_PASSWORD -e $E2E_EMAIL -b -save -dev -timeout 40000 --folder process-services
+        - # Test content-services
+          script: ./scripts/test-e2e-lib.sh -host localhost:4200 -proxy $E2E_HOST -u $E2E_USERNAME -p $E2E_PASSWORD -e $E2E_EMAIL -b -save -dev -timeout 40000 --folder content-services
+        - # Test insights
+          script: ./scripts/test-e2e-lib.sh -host localhost:4200 -proxy $E2E_HOST -u $E2E_USERNAME -p $E2E_PASSWORD -e $E2E_EMAIL -b -save -dev -timeout 40000 --folder insights
+        - stage: Create Docker PR
+          script: ./scripts/test-dist.sh -n $TRAVIS_BUILD_NUMBER && (./scripts/pr-publish.sh -n $TRAVIS_BUILD_NUMBER -r $REPO_DOCKER -u $USERNAME_DOCKER -p $PASSWORD_DOCKER || exit 1)
+        - stage: Deploy Docker PR
           script: node ./scripts/pr-deploy.js -n $TRAVIS_BUILD_NUMBER -u $RANCHER_TOKEN -p $RANCHER_SECRET -s $REPO_RANCHER --image "docker:$REPO_DOCKER/adf/demo-shell:$TRAVIS_BUILD_NUMBER" --env $ENVIRONMENT_NAME -r $ENVIRONMENT_URL || exit 1
 
 # jobs:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c26878831f..b787b46130 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -73,6 +73,6 @@ In ADF we are encouraging the use of behavior-driven development (BDD)
 
 ### Test Name
 
-Any test should follow the naming convetion:
+Any test should follow the naming convention:
 
 [Should] [ ***Expected Behavior** ] [when/after/before] [ ***State Under Test*** ].
diff --git a/angular.json b/angular.json
new file mode 100644
index 0000000000..3efbd4cb0d
--- /dev/null
+++ b/angular.json
@@ -0,0 +1,698 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "dist": {
+      "root": "demo-shell",
+      "sourceRoot": "demo-shell/src",
+      "projectType": "application",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "demo-shell/dist",
+            "index": "demo-shell/src/index.html",
+            "main": "demo-shell/src/main.ts",
+            "tsConfig": "demo-shell/src/tsconfig.app.json",
+            "polyfills": "demo-shell/src/polyfills.ts",
+            "stylePreprocessorOptions": {
+              "includePaths": [
+                "demo-shell/src/node_modules"
+              ]
+            },
+            "assets": [
+              "demo-shell/src/assets",
+              "demo-shell/src/favicon.ico",
+              "demo-shell/src/app.config.json",
+              "demo-shell/src/versions.json",
+              {
+                "glob": "**/*",
+                "input": "demo-shell/resources",
+                "output": "/resources"
+              },
+              {
+                "glob": "**/*",
+                "input": "demo-shell/src/app/components/lazy-loading/i18n",
+                "output": "/resources/lazy-loading/i18n"
+              },
+              {
+                "glob": "**/*",
+                "input": "node_modules/@alfresco/adf-core/prebuilt-themes",
+                "output": "/assets/prebuilt-themes"
+              },
+              {
+                "glob": "**/*",
+                "input": "node_modules/@alfresco/adf-core/bundles/assets",
+                "output": "/assets"
+              },
+              {
+                "glob": "**/*",
+                "input": "node_modules/@alfresco/adf-insights/bundles/assets",
+                "output": "/assets"
+              },
+              {
+                "glob": "**/*",
+                "input": "node_modules/@alfresco/adf-process-services/bundles/assets",
+                "output": "/assets"
+              },
+              {
+                "glob": "**/*",
+                "input": "node_modules/@alfresco/adf-content-services/bundles/assets",
+                "output": "/assets"
+              },
+              {
+                "glob": "pdf.worker.min.js",
+                "input": "node_modules/pdfjs-dist/build",
+                "output": "/"
+              },
+              {
+                "glob": "**/*",
+                "input": "node_modules/ngx-monaco-editor/assets/monaco",
+                "output": "/assets/monaco/"
+              }
+            ],
+            "styles": [
+              "demo-shell/src/styles.scss",
+              "demo-shell/src/custom-style.scss"
+            ],
+            "scripts": [
+              "node_modules/pdfjs-dist/build/pdf.js",
+              "node_modules/pdfjs-dist/web/pdf_viewer.js",
+              "node_modules/raphael/raphael.min.js",
+              "node_modules/moment/min/moment.min.js"
+            ]
+          },
+          "configurations": {
+            "production": {
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "extractCss": true,
+              "namedChunks": false,
+              "aot": true,
+              "extractLicenses": true,
+              "vendorChunk": true,
+              "buildOptimizer": true,
+              "verbose": true,
+              "fileReplacements": [
+                {
+                  "replace": "demo-shell/src/environments/environment.ts",
+                  "with": "demo-shell/src/environments/environment.prod.ts"
+                }
+              ]
+            }
+          }
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "dist:build",
+            "port": 3000
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "dist:build:production"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "dist:build"
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "demo-shell/src/test.ts",
+            "karmaConfig": "./demo-shell/karma.conf.js",
+            "polyfills": "demo-shell/src/polyfills.ts",
+            "tsConfig": "demo-shell/src/tsconfig.spec.json",
+            "scripts": [
+              "node_modules/pdfjs-dist/build/pdf.js",
+              "node_modules/pdfjs-dist/web/pdf_viewer.js",
+              "node_modules/raphael/raphael.min.js",
+              "node_modules/moment/min/moment.min.js"
+            ],
+            "styles": [
+              "demo-shell/src/styles.scss",
+              "demo-shell/src/custom-style.scss"
+            ],
+            "assets": [
+              "demo-shell/src/assets",
+              "demo-shell/src/favicon.ico",
+              "demo-shell/src/app.config.json",
+              "demo-shell/src/versions.json",
+              {
+                "glob": "**/*",
+                "input": "demo-shell/resources",
+                "output": "/resources"
+              },
+              {
+                "glob": "**/*",
+                "input": "demo-shell/src/app/components/lazy-loading/i18n",
+                "output": "/resources/lazy-loading/i18n"
+              },
+              {
+                "glob": "**/*",
+                "input": "node_modules/@alfresco/adf-core/prebuilt-themes",
+                "output": "/assets/prebuilt-themes"
+              },
+              {
+                "glob": "**/*",
+                "input": "node_modules/@alfresco/adf-core/bundles/assets",
+                "output": "/assets"
+              },
+              {
+                "glob": "**/*",
+                "input": "node_modules/@alfresco/adf-insights/bundles/assets",
+                "output": "/assets"
+              },
+              {
+                "glob": "**/*",
+                "input": "node_modules/@alfresco/adf-process-services/bundles/assets",
+                "output": "/assets"
+              },
+              {
+                "glob": "**/*",
+                "input": "node_modules/@alfresco/adf-content-services/bundles/assets",
+                "output": "/assets"
+              },
+              {
+                "glob": "pdf.worker.min.js",
+                "input": "node_modules/pdfjs-dist/build",
+                "output": "/"
+              },
+              {
+                "glob": "**/*",
+                "input": ".node_modules/ngx-monaco-editor/assets/monaco",
+                "output": "/assets/monaco/"
+              }
+            ]
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "./demo-shell/src/tsconfig.app.json"
+            ],
+            "exclude": [
+              "**/node_modules/**/*"
+            ]
+          }
+        }
+      }
+    },
+    "dev": {
+      "root": "demo-shell",
+      "sourceRoot": "demo-shell/src",
+      "projectType": "application",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "demo-shell/dist",
+            "index": "demo-shell/src/index.html",
+            "main": "demo-shell/src/main.ts",
+            "tsConfig": "demo-shell/src/tsconfig.dev.json",
+            "polyfills": "demo-shell/src/polyfills.ts",
+            "stylePreprocessorOptions": {
+              "includePaths": [
+                "lib"
+              ]
+            },
+            "assets": [
+              "demo-shell/src/assets",
+              "demo-shell/src/app.config.json",
+              "demo-shell/src/versions.json",
+              {
+                "glob": "**/*",
+                "input": "demo-shell/src/assets",
+                "output": "/assets"
+              },
+              {
+                "glob": "app.config.json",
+                "input": "demo-shell/src",
+                "output": "/"
+              },
+              {
+                "glob": "versions.json",
+                "input": "demo-shell/src",
+                "output": "/"
+              },
+              {
+                "glob": "**/*",
+                "input": "demo-shell/resources",
+                "output": "/resources"
+              },
+              {
+                "glob": "**/*",
+                "input": "demo-shell/src/app/components/lazy-loading/i18n",
+                "output": "/resources/lazy-loading/i18n"
+              },
+              {
+                "glob": "**/*",
+                "input": "lib/dist/core/prebuilt-themes",
+                "output": "/assets/prebuilt-themes"
+              },
+              {
+                "glob": "**/*",
+                "input": "lib/core/assets",
+                "output": "/assets"
+              },
+              {
+                "glob": "**/*",
+                "input": "lib/process-services/assets",
+                "output": "/assets"
+              },
+              {
+                "glob": "**/*",
+                "input": "lib/content-services/assets",
+                "output": "/assets"
+              },
+              {
+                "glob": "**/*",
+                "input": "lib/core/i18n",
+                "output": "/assets/adf-core/i18n"
+              },
+              {
+                "glob": "**/*",
+                "input": "lib/content-services/i18n",
+                "output": "/assets/adf-content-services/i18n"
+              },
+              {
+                "glob": "**/*",
+                "input": "lib/process-services/i18n",
+                "output": "/assets/adf-process-services/i18n"
+              },
+              {
+                "glob": "**/*",
+                "input": "lib/insights/i18n",
+                "output": "/assets/adf-insights/i18n"
+              },
+              {
+                "glob": "pdf.worker.min.js",
+                "input": "node_modules/pdfjs-dist/build",
+                "output": "/"
+              },
+              {
+                "glob": "**/*",
+                "input": "node_modules/ngx-monaco-editor/assets/monaco",
+                "output": "/assets/monaco/"
+              }
+            ],
+            "styles": [
+              "demo-shell/src/styles.scss",
+              "demo-shell/src/custom-style-dev.scss"
+            ],
+            "scripts": [
+              "node_modules/pdfjs-dist/build/pdf.js",
+              "node_modules/pdfjs-dist/web/pdf_viewer.js",
+              "node_modules/raphael/raphael.min.js",
+              "node_modules/moment/min/moment.min.js"
+            ]
+          },
+          "configurations": {
+            "production": {
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "extractCss": true,
+              "namedChunks": false,
+              "aot": true,
+              "extractLicenses": true,
+              "vendorChunk": true,
+              "buildOptimizer": true,
+              "verbose": true,
+              "fileReplacements": [
+                {
+                  "replace": "demo-shell/src/environments/environment.ts",
+                  "with": "demo-shell/src/environments/environment.prod.ts"
+                }
+              ]
+            }
+          }
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "dev:build",
+            "port": 3000
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "dev:build:production"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "dev:build"
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "demo-shell/src/test.ts",
+            "karmaConfig": "./demo-shell/karma.conf.js",
+            "polyfills": "demo-shell/src/polyfills.ts",
+            "tsConfig": "demo-shell/src/tsconfig.spec.json",
+            "scripts": [
+              "node_modules/pdfjs-dist/build/pdf.js",
+              "node_modules/pdfjs-dist/web/pdf_viewer.js",
+              "node_modules/raphael/raphael.min.js",
+              "node_modules/moment/min/moment.min.js"
+            ],
+            "styles": [
+              "demo-shell/src/styles.scss",
+              "demo-shell/src/custom-style-dev.scss"
+            ],
+            "assets": [
+              "demo-shell/src/assets",
+              "demo-shell/src/app.config.json",
+              "demo-shell/src/versions.json",
+              {
+                "glob": "**/*",
+                "input": "demo-shell/src/assets",
+                "output": "/assets"
+              },
+              {
+                "glob": "app.config.json",
+                "input": "demo-shell/src",
+                "output": "/"
+              },
+              {
+                "glob": "versions.json",
+                "input": "demo-shell/src",
+                "output": "/"
+              },
+              {
+                "glob": "**/*",
+                "input": "demo-shell/resources",
+                "output": "/resources"
+              },
+              {
+                "glob": "**/*",
+                "input": "demo-shell/src/app/components/lazy-loading/i18n",
+                "output": "/resources/lazy-loading/i18n"
+              },
+              {
+                "glob": "**/*",
+                "input": "lib/dist/core/prebuilt-themes",
+                "output": "/assets/prebuilt-themes"
+              },
+              {
+                "glob": "**/*",
+                "input": "lib/core/assets",
+                "output": "/assets"
+              },
+              {
+                "glob": "**/*",
+                "input": "lib/process-services/assets",
+                "output": "/assets"
+              },
+              {
+                "glob": "**/*",
+                "input": "lib/content-services/assets",
+                "output": "/assets"
+              },
+              {
+                "glob": "**/*",
+                "input": "lib/core/i18n",
+                "output": "/assets/adf-core/i18n"
+              },
+              {
+                "glob": "**/*",
+                "input": "lib/content-services/i18n",
+                "output": "/assets/adf-content-services/i18n"
+              },
+              {
+                "glob": "**/*",
+                "input": "lib/process-services/i18n",
+                "output": "/assets/adf-process-services/i18n"
+              },
+              {
+                "glob": "**/*",
+                "input": "lib/insights/i18n",
+                "output": "/assets/adf-insights/i18n"
+              },
+              {
+                "glob": "pdf.worker.min.js",
+                "input": "node_modules/pdfjs-dist/build",
+                "output": "/"
+              },
+              {
+                "glob": "**/*",
+                "input": "/node_modules/ngx-monaco-editor/assets/monaco",
+                "output": "/assets/monaco/"
+              }
+            ]
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "./demo-shell/src/tsconfig.app.json"
+            ],
+            "exclude": [
+              "**/node_modules/**/*"
+            ]
+          }
+        }
+      }
+    },
+    "demo-shell-e2e": {
+      "root": "demo-shell",
+      "sourceRoot": "demo-shell/e2e",
+      "projectType": "application",
+      "architect": {
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "./protractor.conf.js",
+            "devServerTarget": "dist:serve"
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [],
+            "exclude": [
+              "**/node_modules/**/*"
+            ]
+          }
+        }
+      }
+    },
+    "lib-e2e": {
+      "root": "demo-shell",
+      "sourceRoot": "./demo-shell",
+      "projectType": "application",
+      "architect": {
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "proxyConfig": "./e2e/proxy.conf.js",
+            "browserTarget": "dev:build",
+            "port": 3000
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "dev:build:production"
+            }
+          }
+        },
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "./protractor.conf.js",
+            "devServerTarget": "lib-e2e:serve"
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [],
+            "exclude": [
+              "**/node_modules/**/*"
+            ]
+          }
+        }
+      }
+    },
+    "core": {
+      "root": "lib/core",
+      "sourceRoot": "lib/core/src",
+      "projectType": "library",
+      "prefix": "adf",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-ng-packagr:build",
+          "options": {
+            "tsConfig": "lib/core/tsconfig.json",
+            "project": "lib/core/ng-package.json"
+          },
+          "configurations": {
+            "production": {
+              "project": "lib/core/ng-package.json"
+            }
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "lib/core/test.ts",
+            "tsConfig": "lib/core/tsconfig.json",
+            "karmaConfig": "lib/core/karma.conf.js"
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "lib/core/tsconfig.json",
+              "lib/core/tsconfig.json"
+            ],
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    },
+    "content-services": {
+      "root": "lib/content-services",
+      "sourceRoot": "lib/content-services/src",
+      "projectType": "library",
+      "prefix": "adf",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-ng-packagr:build",
+          "options": {
+            "tsConfig": "lib/content-services/tsconfig.json",
+            "project": "lib/content-services/ng-package.json"
+          },
+          "configurations": {
+            "production": {
+              "project": "lib/content-services/ng-package.json"
+            }
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "lib/content-services/test.ts",
+            "tsConfig": "lib/content-services/tsconfig.json",
+            "karmaConfig": "lib/content-services/karma.conf.js"
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "lib/content-services/tsconfig.json",
+              "lib/content-services/tsconfig.json"
+            ],
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    },
+    "process-services": {
+      "root": "lib/process-services",
+      "sourceRoot": "lib/process-services/src",
+      "projectType": "library",
+      "prefix": "adf",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-ng-packagr:build",
+          "options": {
+            "tsConfig": "lib/process-services/tsconfig.json",
+            "project": "lib/process-services/ng-package.json"
+          },
+          "configurations": {
+            "production": {
+              "project": "lib/process-services/ng-package.json"
+            }
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "lib/process-services/test.ts",
+            "tsConfig": "lib/process-services/tsconfig.json",
+            "karmaConfig": "lib/process-services/karma.conf.js"
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "lib/process-services/tsconfig.json",
+              "lib/process-services/tsconfig.json"
+            ],
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    },
+    "insights": {
+      "root": "lib/insights",
+      "sourceRoot": "lib/insights/src",
+      "projectType": "library",
+      "prefix": "adf",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-ng-packagr:build",
+          "options": {
+            "tsConfig": "lib/insights/tsconfig.json",
+            "project": "lib/insights/ng-package.json"
+          },
+          "configurations": {
+            "production": {
+              "project": "lib/insights/ng-package.json"
+            }
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "lib/insights/test.ts",
+            "tsConfig": "lib/insights/tsconfig.json",
+            "karmaConfig": "lib/insights/karma.conf.js"
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "lib/insights/tsconfig.json",
+              "lib/insights/tsconfig.json"
+            ],
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    }
+  },
+  "defaultProject": "dist",
+  "schematics": {
+    "@schematics/angular:component": {
+      "prefix": "app",
+      "styleext": "scss"
+    },
+    "@schematics/angular:directive": {
+      "prefix": "app"
+    }
+  }
+}
diff --git a/demo-shell/e2e/app.e2e-spec.ts b/demo-shell/e2e/app.e2e-spec.ts
index 5cbdd1f59f..52f4fecef6 100644
--- a/demo-shell/e2e/app.e2e-spec.ts
+++ b/demo-shell/e2e/app.e2e-spec.ts
@@ -1,3 +1,20 @@
+/*!
+ * @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 { MyappPage } from './app.po';
 
 describe('myapp App', () => {
diff --git a/demo-shell/e2e/app.po.ts b/demo-shell/e2e/app.po.ts
index 73e3ccb8a1..8a4cdf2388 100644
--- a/demo-shell/e2e/app.po.ts
+++ b/demo-shell/e2e/app.po.ts
@@ -1,3 +1,20 @@
+/*!
+ * @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, element, by } from 'protractor';
 
 export class MyappPage {
diff --git a/demo-shell/karma.conf.js b/demo-shell/karma.conf.js
index c7e4e6f933..9bc97a7f0a 100644
--- a/demo-shell/karma.conf.js
+++ b/demo-shell/karma.conf.js
@@ -2,43 +2,54 @@
 // https://karma-runner.github.io/0.13/config/configuration-file.html
 
 module.exports = function (config) {
-  config.set({
-    basePath: './',
-    frameworks: ['jasmine', '@angular/cli'],
-    plugins: [
-      require('karma-jasmine'),
-      require('karma-chrome-launcher'),
-      require('karma-jasmine-html-reporter'),
-      require('karma-coverage-istanbul-reporter'),
-      require('@angular/cli/plugins/karma')
-    ],
-    client:{
-      clearContext: false // leave Jasmine Spec Runner output visible in browser
-    },
-    files: [
-      { pattern: './src/test.ts', watched: false }
-    ],
-    preprocessors: {
-      './src/test.ts': ['@angular/cli']
-    },
-    mime: {
-      'text/x-typescript': ['ts','tsx']
-    },
-    coverageIstanbulReporter: {
-      reports: [ 'html', 'lcovonly' ],
-      fixWebpackSourcePaths: true
-    },
-    angularCli: {
-      environment: 'dev'
-    },
-    reporters: config.angularCli && config.angularCli.codeCoverage
-              ? ['progress', 'coverage-istanbul']
-              : ['progress', 'kjhtml'],
-    port: 9876,
-    colors: true,
-    logLevel: config.LOG_INFO,
-    autoWatch: true,
-    browsers: ['Chrome'],
-    singleRun: false
-  });
+    config.set({
+        basePath: './',
+        frameworks: ['jasmine', '@angular-devkit/build-angular'],
+        plugins: [
+            require('karma-jasmine'),
+            require('karma-chrome-launcher'),
+            require('karma-jasmine-html-reporter'),
+            require('karma-coverage-istanbul-reporter'),
+            require('@angular-devkit/build-angular/plugins/karma'),
+            require('karma-mocha-reporter')
+        ],
+        client: {
+            clearContext: false // leave Jasmine Spec Runner output visible in browser
+        },
+        files: [],
+        preprocessors: {},
+        mime: {
+            'text/x-typescript': ['ts', 'tsx']
+        },
+        coverageIstanbulReporter: {
+            dir: require('path').join(__dirname, 'coverage'), reports: ['html', 'lcovonly'],
+            fixWebpackSourcePaths: true
+        },
+
+        customLaunchers: {
+            ChromeHeadless: {
+                base: 'Chrome',
+                flags: [
+                    '--no-sandbox',
+                    '--headless',
+                    '--disable-gpu',
+                    '--remote-debugging-port=9222'
+                ]
+            }
+        },
+
+        captureTimeout: 180000,
+        browserDisconnectTimeout: 180000,
+        browserDisconnectTolerance: 3,
+        browserNoActivityTimeout: 300000,
+
+        reporters: ['mocha', 'kjhtml'],
+
+        port: 9876,
+        colors: true,
+        logLevel: config.LOG_INFO,
+        autoWatch: true,
+        browsers: ['Chrome'],
+        singleRun: false
+    });
 };
diff --git a/demo-shell/package.json b/demo-shell/package.json
index dd76e485f9..33c1cf4ffa 100644
--- a/demo-shell/package.json
+++ b/demo-shell/package.json
@@ -1,7 +1,7 @@
 {
   "name": "Alfresco-ADF-Angular-Demo",
   "description": "Demo shell for Alfresco Angular components",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "author": "Alfresco Software, Ltd.",
   "repository": {
     "type": "git",
diff --git a/demo-shell/protractor.conf.js b/demo-shell/protractor.conf.js
deleted file mode 100644
index 9242cbed82..0000000000
--- a/demo-shell/protractor.conf.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Protractor configuration file, see link for more information
-// https://github.com/angular/protractor/blob/master/lib/config.ts
-
-const { SpecReporter } = require('jasmine-spec-reporter');
-
-exports.config = {
-  allScriptsTimeout: 11000,
-  specs: [
-    './e2e/**/*.e2e-spec.ts'
-  ],
-  capabilities: {
-    'browserName': 'chrome'
-  },
-  directConnect: true,
-  baseUrl: 'http://localhost:4200/',
-  framework: 'jasmine',
-  jasmineNodeOpts: {
-    showColors: true,
-    defaultTimeoutInterval: 30000,
-    print: function() {}
-  },
-  beforeLaunch: function() {
-    require('ts-node').register({
-      project: './demo-shell/e2e/tsconfig.e2e.json'
-    });
-  },
-  onPrepare() {
-    jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
-  }
-};
diff --git a/demo-shell/proxy.conf.js b/demo-shell/proxy.conf.js
index 393c9a1b0b..773c3410c6 100644
--- a/demo-shell/proxy.conf.js
+++ b/demo-shell/proxy.conf.js
@@ -1,25 +1,25 @@
 module.exports = {
-  "/alfresco": {
-    "target": "http://localhost:8080",
-    "secure": false,
-    "pathRewrite": {
-      "^/alfresco/alfresco": ""
+    "/alfresco": {
+        "target": "http://localhost:8080",
+        "secure": false,
+        "pathRewrite": {
+            "^/alfresco/alfresco": ""
+        },
+        "changeOrigin": true,
+        // workaround for REPO-2260
+        onProxyRes: function (proxyRes, req, res) {
+            const header = proxyRes.headers['www-authenticate'];
+            if (header && header.startsWith('Basic')) {
+                proxyRes.headers['www-authenticate'] = 'x' + header;
+            }
+        }
     },
-    "changeOrigin": true,
-    // workaround for REPO-2260
-    onProxyRes: function (proxyRes, req, res) {
-      const header = proxyRes.headers['www-authenticate'];
-      if (header && header.startsWith('Basic')) {
-          proxyRes.headers['www-authenticate'] = 'x' + header;
-      }
+    "/activiti-app": {
+        "target": "http://localhost:9999",
+        "secure": false,
+        "pathRewrite": {
+            "^/activiti-app/activiti-app": ""
+        },
+        "changeOrigin": true
     }
-  },
-  "/activiti-app": {
-    "target": "http://localhost:9999",
-    "secure": false,
-    "pathRewrite": {
-      "^/activiti-app/activiti-app": ""
-    },
-    "changeOrigin": true
-  }
 };
diff --git a/demo-shell/resources/i18n/de.json b/demo-shell/resources/i18n/de.json
index ae40177956..88928a1c3e 100644
--- a/demo-shell/resources/i18n/de.json
+++ b/demo-shell/resources/i18n/de.json
@@ -6,14 +6,27 @@
       "PROPERTIES": "Eigenschaften",
       "VERSIONS": "Versionen"
     },
+    "HOME": {
+      "TITLE": "Angular-Komponenten für Alfresco",
+      "DOCUMENTATION": "Dokumentation"
+    },
+    "LOGOUT": {
+      "TITLE": "Seite 'Abmelden'",
+      "SUB_TITLE": "Sie sind nun abgemeldet.",
+      "LOGIN": "Anmelden",
+      "HOME": "Startseite"
+    },
     "ADF_VERSION_MANAGER": {
       "ALLOW_DELETE": "Löschen zulassen",
       "SHOW_COMMENTS": "Anmerkungen zu Versionen einblenden",
-      "ALLOW_DOWNLOAD": "Versions-Download zulassen",
-      "READ_ONLY": "Schreibgeschützt"
+      "ALLOW_DOWNLOAD": "Download zulassen",
+      "READ_ONLY": "Schreibgeschützt",
+      "COMMENTS": "Kommentare anzeigen"
     },
     "PERSONAL-FILES": "Persönliche Dateien",
     "WARN-MULTIPLE-UPLOADS": "Warnung bei Mehrfach-Uploads anzeigen.",
+    "CUSTOM-PERMISSION-MESSAGE": "Meldung 'Benutzerdefinierte Berechtigung aktivieren'",
+    "MEDIUM-TIME-FORMAT": "Mittleres Zeitformat für Dokumentliste aktivieren",
     "SEARCH": {
       "RADIO": {
         "NONE": "Keine",
@@ -39,11 +52,19 @@
       "TITLE": "Metadaten"
     }
   },
+  "COMMENTS": {
+    "ADD_COMMENT": "Hinzufügen"
+  },
   "APP_LAYOUT": {
     "APP_NAME": "ADF-Demoanwendung",
     "HOME": "Startseite",
+    "NODE-SELECTOR": "Node-Auswahl",
     "CONTENT_SERVICES": "Content Services",
     "BREADCRUMB": "Breadcrumb",
+    "NOTIFICATIONS": "Benachrichtigungen",
+    "TASK_LIST": "Aufgabenliste",
+    "PROCESS_LIST": "Prozessliste",
+    "CARD_VIEW": "CardView",
     "PROCESS_SERVICES": "Process Services",
     "LOGIN": "Anmelden",
     "CUSTOM_SOURCES": "Benutzerdefinierte Quellen",
@@ -58,13 +79,15 @@
     "TRASHCAN": "Papierkorb",
     "SOCIAL": "Soziale Funktionen",
     "SETTINGS": "Einstellungen",
+    "CONFIG-EDITOR": "Konfigurations-Editor",
     "OVERLAY_VIEWER": "Overlay-Viewer",
     "ABOUT": "Info",
     "SEARCH": "Erweiterte Suche",
     "EXTENDED_SEARCH_QUERY_BODY": "Erweiterte Suche mit Abfragetext",
     "WORD_TO_SEARCH": "Suchbegriff",
     "SEARCH_CREATED_BY": "Erstellt von",
-    "SEARCH_SERVICE_APPROACH": "Aktivieren Sie diese Option, um die Eingabeeigenschaft zu deaktivieren und die Nutzung des Services zu konfigurieren"
+    "SEARCH_SERVICE_APPROACH": "Aktivieren Sie diese Option, um die Eingabeeigenschaft zu deaktivieren und die Nutzung des Services zu konfigurieren",
+    "HEADER_DATA": "Headerdaten"
   },
   "TRASHCAN": {
     "ACTIONS": {
@@ -79,6 +102,7 @@
   },
   "DOCUMENT_LIST": {
     "MULTISELECT_CHECKBOXES": "Mehrfachauswahl (mit Kontrollkästchen)",
+    "THUMBNAILS": "Miniaturansichten aktivieren",
     "MULTIPLE_FILE_UPLOAD": "Mehrere Dateien hochladen",
     "FOLDER_UPLOAD": "Ordner hochladen",
     "CUSTOM_FILTER": "Filter für benutzerdefinierte Erweiterungen",
@@ -154,7 +178,8 @@
     "START-TASK": "Aufgabe starten",
     "START-PROCESS": "Prozess starten",
     "PROCESS-AUDIT-LOG": "Prozess-Audit-Protokoll",
-    "TASK-AUDIT-LOG": "Aufgaben-Audit-Protokoll"
+    "TASK-AUDIT-LOG": "Aufgaben-Audit-Protokoll",
+    "TASK-SHOW-HEADER": "Detailsheader anzeigen"
   },
   "FORM-LIST": {
     "STORE": "Speichern",
@@ -170,7 +195,10 @@
   "LOGIN": {
     "CONTENT_SERVICES": "Content Services",
     "PROCESS_SERVICES": "Process Services",
-    "LOGIN_FOOTER": "Login-Fußzeile"
+    "LOGIN_FOOTER": "Login-Fußzeile",
+    "SHOW_REMEMBERME": "'Benutzername und Passwort speichern' anzeigen",
+    "SHOW_SUCCESS_ROUTE": "Erfolgsroute anzeigen",
+    "CUSTOM_LOGO": "Benutzerdefiniertes Logo"
   },
   "SEARCH": {
     "RESULTS": "Ergebnisse durchsuchen",
@@ -188,5 +216,15 @@
   "DEMO_PERMISSION": {
     "INHERIT_PERMISSION_BUTTON": "Berechtigungen erben",
     "INHERITED_PERMISSIONS_BUTTON": "Berechtigungen geerbt"
-  }
+  },
+  "TASK_LIST_DEMO": {
+    "APP_ID_REQUIRED_ERROR": "App-ID einfügen",
+    "APP_ID_TYPE_ERROR": "App-ID muss eine Zahl sein"
+  },
+  "PROCESS_LIST_DEMO": {
+    "APP_ID_REQUIRED_ERROR": "App-ID einfügen",
+    "APP_ID_TYPE_ERROR": "App-ID muss eine Zahl sein"
+  },
+  "GROUP-TITLE1-TRANSLATION-KEY": "Übersetzung benutzerdefinierter Titel 1",
+  "GROUP-TITLE2-TRANSLATION-KEY": "Übersetzung benutzerdefinierter Titel 2"
 }
\ No newline at end of file
diff --git a/demo-shell/resources/i18n/en.json b/demo-shell/resources/i18n/en.json
index a1e7268e20..ad4ec33a2f 100644
--- a/demo-shell/resources/i18n/en.json
+++ b/demo-shell/resources/i18n/en.json
@@ -20,10 +20,14 @@
       "ALLOW_DELETE": "Allow delete",
       "SHOW_COMMENTS": "Show comments on versions",
       "ALLOW_DOWNLOAD": "Enable version download",
-      "READ_ONLY": "Read-only"
+      "READ_ONLY": "Read-only",
+      "ALLOW_DOWNLOAD": "Allow Download",
+      "COMMENTS": "Show comments"
     },
     "PERSONAL-FILES": "Personal Files",
     "WARN-MULTIPLE-UPLOADS": "Display warning for multiple uploads.",
+    "CUSTOM-PERMISSION-MESSAGE": "Enable custom permission message",
+    "MEDIUM-TIME-FORMAT": "Enable medium time format for document list",
     "SEARCH": {
       "RADIO": {
         "NONE": "None",
@@ -52,8 +56,13 @@
   "APP_LAYOUT": {
     "APP_NAME": "ADF Demo Application",
     "HOME": "Home",
+    "NODE-SELECTOR": "Node Selector",
     "CONTENT_SERVICES": "Content Services",
     "BREADCRUMB": "Breadcrumb",
+    "NOTIFICATIONS": "Notifications",
+    "TASK_LIST": "Task List",
+    "PROCESS_LIST": "Process List",
+    "CARD_VIEW": "CardView",
     "PROCESS_SERVICES": "Process Services",
     "LOGIN": "Login",
     "CUSTOM_SOURCES": "Custom Sources",
@@ -68,6 +77,7 @@
     "TRASHCAN": "Trashcan",
     "SOCIAL": "Social",
     "SETTINGS": "Settings",
+    "CONFIG-EDITOR": "Configuration Editor",
     "OVERLAY_VIEWER": "Overlay Viewer",
     "ABOUT": "About",
     "SEARCH": "Extended Search",
@@ -75,7 +85,8 @@
     "EXTENDED_SEARCH_QUERY_BODY": "Extended Search with Query Body",
     "WORD_TO_SEARCH": "Search Word",
     "SEARCH_CREATED_BY": "Created By",
-    "SEARCH_SERVICE_APPROACH": "Check this to disable the input property and configure using the service"
+    "SEARCH_SERVICE_APPROACH": "Check this to disable the input property and configure using the service",
+    "HEADER_DATA": "Header Data"
   },
   "TRASHCAN": {
     "ACTIONS": {
@@ -90,7 +101,7 @@
   },
   "DOCUMENT_LIST": {
     "MULTISELECT_CHECKBOXES": "Multiselect (with checkboxes)",
-    "THUMBNAILS" :"Enable Thumbnails",
+    "THUMBNAILS": "Enable Thumbnails",
     "MULTIPLE_FILE_UPLOAD": "Multiple File Upload",
     "FOLDER_UPLOAD": "Folder upload",
     "CUSTOM_FILTER": "Custom extensions filter",
@@ -166,7 +177,8 @@
     "START-TASK": "Start task",
     "START-PROCESS": "Start process",
     "PROCESS-AUDIT-LOG": "Process Audit log",
-    "TASK-AUDIT-LOG": "Task Audit log"
+    "TASK-AUDIT-LOG": "Task Audit log",
+    "TASK-SHOW-HEADER": "Show details header"
   },
   "FORM-LIST": {
     "STORE": "Store",
@@ -182,7 +194,10 @@
   "LOGIN": {
     "CONTENT_SERVICES": "Content Services",
     "PROCESS_SERVICES": "Process Services",
-    "LOGIN_FOOTER": "Login footer"
+    "LOGIN_FOOTER": "Login footer",
+    "SHOW_REMEMBERME": "Show remember me",
+    "SHOW_SUCCESS_ROUTE": "Show success route",
+    "CUSTOM_LOGO": "Custom Logo"
   },
   "SEARCH": {
     "RESULTS": "Search results",
@@ -200,5 +215,21 @@
   "DEMO_PERMISSION": {
     "INHERIT_PERMISSION_BUTTON": "Inherit Permission",
     "INHERITED_PERMISSIONS_BUTTON": "Permission Inherited"
-  }
+  },
+  "TASK_LIST_DEMO": {
+    "ERROR_MESSAGE": {
+      "APP_ID_REQUIRED_ERROR": "Insert App ID",
+      "APP_ID_TYPE_ERROR": "App ID must be a number",
+      "NUMBER_TYPE_ERROR": "Value must be a number"
+    },
+    "TOOLTIP_MESSAGE": {
+      "START_INPUT": "Starting page"
+    }
+  },
+  "PROCESS_LIST_DEMO": {
+    "APP_ID_REQUIRED_ERROR": "Insert App ID",
+    "APP_ID_TYPE_ERROR": "App ID must be a number"
+  },
+  "GROUP-TITLE1-TRANSLATION-KEY": "CUSTOM TITLE TRANSLATION ONE",
+  "GROUP-TITLE2-TRANSLATION-KEY": "CUSTOM TITLE TRANSLATION TWO"
 }
diff --git a/demo-shell/resources/i18n/es.json b/demo-shell/resources/i18n/es.json
index 932163f48c..441001cc0f 100644
--- a/demo-shell/resources/i18n/es.json
+++ b/demo-shell/resources/i18n/es.json
@@ -6,14 +6,27 @@
       "PROPERTIES": "Propiedades",
       "VERSIONS": "Versiones"
     },
+    "HOME": {
+      "TITLE": "Componentes angulares para Alfresco",
+      "DOCUMENTATION": "Documentación"
+    },
+    "LOGOUT": {
+      "TITLE": "Página de cierre de sesión",
+      "SUB_TITLE": "Se ha cerrado su sesión",
+      "LOGIN": "Iniciar sesión",
+      "HOME": "Inicio"
+    },
     "ADF_VERSION_MANAGER": {
       "ALLOW_DELETE": "Permitir eliminar",
       "SHOW_COMMENTS": "Mostrar comentarios en las versiones",
-      "ALLOW_DOWNLOAD": "Permitir descarga de la versión",
-      "READ_ONLY": "Solo lectura"
+      "ALLOW_DOWNLOAD": "Permitir descarga",
+      "READ_ONLY": "Solo lectura",
+      "COMMENTS": "Mostrar comentarios"
     },
     "PERSONAL-FILES": "Ficheros personales",
     "WARN-MULTIPLE-UPLOADS": "Mostrar advertencia de múltiples cargas.",
+    "CUSTOM-PERMISSION-MESSAGE": "Habilitar mensaje de permiso personalizado",
+    "MEDIUM-TIME-FORMAT": "Habilitar formato de tiempo mediano para lista de documentos",
     "SEARCH": {
       "RADIO": {
         "NONE": "Ninguno",
@@ -42,8 +55,13 @@
   "APP_LAYOUT": {
     "APP_NAME": "Aplicación ADF Demo",
     "HOME": "Inicio",
+    "NODE-SELECTOR": "Selector de nodo",
     "CONTENT_SERVICES": "Content Services",
     "BREADCRUMB": "Ruta de navegación",
+    "NOTIFICATIONS": "Notificaciones",
+    "TASK_LIST": "Lista de tareas",
+    "PROCESS_LIST": "Lista de procesos",
+    "CARD_VIEW": "CardView",
     "PROCESS_SERVICES": "Process Services",
     "LOGIN": "Iniciar sesión",
     "CUSTOM_SOURCES": "Fuentes personalizadas",
@@ -58,13 +76,15 @@
     "TRASHCAN": "Papelera",
     "SOCIAL": "Social",
     "SETTINGS": "Configuración",
+    "CONFIG-EDITOR": "Editor de configuración",
     "OVERLAY_VIEWER": "Visor de superposición",
     "ABOUT": "Acerca de",
     "SEARCH": "Búsqueda ampliada",
     "EXTENDED_SEARCH_QUERY_BODY": "Búsqueda ampliada con cuerpo de consulta",
     "WORD_TO_SEARCH": "Buscar palabra",
     "SEARCH_CREATED_BY": "Creado por",
-    "SEARCH_SERVICE_APPROACH": "Marque esto para desactivar la propiedad de entrada y configurar el uso del servicio"
+    "SEARCH_SERVICE_APPROACH": "Marque esto para desactivar la propiedad de entrada y configurar el uso del servicio",
+    "HEADER_DATA": "Datos de encabezado"
   },
   "TRASHCAN": {
     "ACTIONS": {
@@ -79,6 +99,7 @@
   },
   "DOCUMENT_LIST": {
     "MULTISELECT_CHECKBOXES": "Selección múltiple (con casillas)",
+    "THUMBNAILS": "Habilitar miniaturas",
     "MULTIPLE_FILE_UPLOAD": "Carga de varios ficheros",
     "FOLDER_UPLOAD": "Carga de carpetas",
     "CUSTOM_FILTER": "Filtro de extensiones personalizado",
@@ -154,7 +175,8 @@
     "START-TASK": "Iniciar tarea",
     "START-PROCESS": "Iniciar proceso",
     "PROCESS-AUDIT-LOG": "Registro de auditoría de procesos",
-    "TASK-AUDIT-LOG": "Registro de auditoría de tareas"
+    "TASK-AUDIT-LOG": "Registro de auditoría de tareas",
+    "TASK-SHOW-HEADER": "Mostrar encabezado de detalles"
   },
   "FORM-LIST": {
     "STORE": "Almacenar",
@@ -170,7 +192,10 @@
   "LOGIN": {
     "CONTENT_SERVICES": "Content Services",
     "PROCESS_SERVICES": "Process Services",
-    "LOGIN_FOOTER": "Pie del inicio de sesión"
+    "LOGIN_FOOTER": "Pie del inicio de sesión",
+    "SHOW_REMEMBERME": "Mostrar opción para recordarme",
+    "SHOW_SUCCESS_ROUTE": "Permitir ruta correcta",
+    "CUSTOM_LOGO": "Logotipo personalizado"
   },
   "SEARCH": {
     "RESULTS": "Resultados de la búsqueda",
@@ -188,5 +213,21 @@
   "DEMO_PERMISSION": {
     "INHERIT_PERMISSION_BUTTON": "Heredar permiso",
     "INHERITED_PERMISSIONS_BUTTON": "Permiso heredado"
-  }
-}
\ No newline at end of file
+  },
+  "TASK_LIST_DEMO": {
+    "ERROR_MESSAGE": {
+      "APP_ID_REQUIRED_ERROR": "Insertar ID de aplicación",
+      "APP_ID_TYPE_ERROR": "El ID de aplicación debe ser un número",
+      "NUMBER_TYPE_ERROR": "El valor ingresado debe ser numérico"
+    },
+    "TOOLTIP_MESSAGE": {
+      "START_INPUT": "Página de inicio"
+    }
+  },
+  "PROCESS_LIST_DEMO": {
+    "APP_ID_REQUIRED_ERROR": "Insertar ID de aplicación",
+    "APP_ID_TYPE_ERROR": "El ID de aplicación debe ser un número"
+  },
+  "GROUP-TITLE1-TRANSLATION-KEY": "Traducción de título personalizado 1",
+  "GROUP-TITLE2-TRANSLATION-KEY": "Traducción de título personalizado 2"
+}
diff --git a/demo-shell/resources/i18n/fr.json b/demo-shell/resources/i18n/fr.json
index d5d57a1bc5..ae542d763e 100644
--- a/demo-shell/resources/i18n/fr.json
+++ b/demo-shell/resources/i18n/fr.json
@@ -6,14 +6,27 @@
       "PROPERTIES": "Propriétés",
       "VERSIONS": "Versions"
     },
+    "HOME": {
+      "TITLE": "Composants Angular pour Alfresco",
+      "DOCUMENTATION": "Documentation"
+    },
+    "LOGOUT": {
+      "TITLE": "Page de déconnexion",
+      "SUB_TITLE": "Vous êtes bien déconnecté",
+      "LOGIN": "Connexion",
+      "HOME": "Accueil"
+    },
     "ADF_VERSION_MANAGER": {
       "ALLOW_DELETE": "Autoriser la suppression",
       "SHOW_COMMENTS": "Afficher les commentaires sur les versions",
-      "ALLOW_DOWNLOAD": "Autoriser le téléchargement de la version",
-      "READ_ONLY": "Lecture seule"
+      "ALLOW_DOWNLOAD": "Autoriser le téléchargement",
+      "READ_ONLY": "Lecture seule",
+      "COMMENTS": "Afficher les commentaires"
     },
     "PERSONAL-FILES": "Fichiers personnels",
     "WARN-MULTIPLE-UPLOADS": "Avertir en cas de téléchargements multiples.",
+    "CUSTOM-PERMISSION-MESSAGE": "Activer le message de droits d'accès personnalisés",
+    "MEDIUM-TIME-FORMAT": "Activer le format de date \"medium\" pour la liste de documents",
     "SEARCH": {
       "RADIO": {
         "NONE": "Aucune",
@@ -42,8 +55,13 @@
   "APP_LAYOUT": {
     "APP_NAME": "Application Démo ADF",
     "HOME": "Accueil",
+    "NODE-SELECTOR": "Sélecteur de nœud",
     "CONTENT_SERVICES": "Content Services",
     "BREADCRUMB": "Fil d'Ariane",
+    "NOTIFICATIONS": "Notifications",
+    "TASK_LIST": "Liste des tâches",
+    "PROCESS_LIST": "Liste des processus",
+    "CARD_VIEW": "CardView",
     "PROCESS_SERVICES": "Process Services",
     "LOGIN": "Connexion",
     "CUSTOM_SOURCES": "Sources personnalisées",
@@ -58,13 +76,15 @@
     "TRASHCAN": "Corbeille",
     "SOCIAL": "Réseaux sociaux",
     "SETTINGS": "Paramètres",
+    "CONFIG-EDITOR": "Editeur de configuration",
     "OVERLAY_VIEWER": "Visualisation de la superposition",
     "ABOUT": "À propos de",
     "SEARCH": "Recherche globale",
     "EXTENDED_SEARCH_QUERY_BODY": "Recherche globale sur le corps de la requête",
     "WORD_TO_SEARCH": "Mot recherché",
     "SEARCH_CREATED_BY": "Créé par",
-    "SEARCH_SERVICE_APPROACH": "Cochez cette option pour désactiver la propriété d'entrée et configurer à partir du service"
+    "SEARCH_SERVICE_APPROACH": "Cochez cette option pour désactiver la propriété d'entrée et configurer à partir du service",
+    "HEADER_DATA": "Données d'en-tête"
   },
   "TRASHCAN": {
     "ACTIONS": {
@@ -79,6 +99,7 @@
   },
   "DOCUMENT_LIST": {
     "MULTISELECT_CHECKBOXES": "Sélection multiple (avec cases à cocher)",
+    "THUMBNAILS": "Activer les miniatures",
     "MULTIPLE_FILE_UPLOAD": "Importation de fichiers multiples",
     "FOLDER_UPLOAD": "Importation de dossier",
     "CUSTOM_FILTER": "Filtre d'extensions personnalisées",
@@ -154,7 +175,8 @@
     "START-TASK": "Démarrer la tâche",
     "START-PROCESS": "Démarrer le processus",
     "PROCESS-AUDIT-LOG": "Journal d'audit des processus",
-    "TASK-AUDIT-LOG": "Journal d'audit des tâches"
+    "TASK-AUDIT-LOG": "Journal d'audit des tâches",
+    "TASK-SHOW-HEADER": "Afficher l'en-tête de détail"
   },
   "FORM-LIST": {
     "STORE": "Stocker",
@@ -170,7 +192,10 @@
   "LOGIN": {
     "CONTENT_SERVICES": "Content Services",
     "PROCESS_SERVICES": "Process Services",
-    "LOGIN_FOOTER": "Pied de la page connexion"
+    "LOGIN_FOOTER": "Pied de la page connexion",
+    "SHOW_REMEMBERME": "Afficher Mémoriser mes informations",
+    "SHOW_SUCCESS_ROUTE": "Afficher la success route",
+    "CUSTOM_LOGO": "Logo personnalisé"
   },
   "SEARCH": {
     "RESULTS": "Résultats de la recherche",
@@ -188,5 +213,21 @@
   "DEMO_PERMISSION": {
     "INHERIT_PERMISSION_BUTTON": "Hériter les droits d'accès",
     "INHERITED_PERMISSIONS_BUTTON": "Droits d'accès hérités"
-  }
-}
\ No newline at end of file
+  },
+  "TASK_LIST_DEMO": {
+    "ERROR_MESSAGE": {
+      "APP_ID_REQUIRED_ERROR": "Insérer l'ID d'application",
+      "APP_ID_TYPE_ERROR": "L'ID d'application doit être un numéro",
+      "NUMBER_TYPE_ERROR": "La valeur saisie doit être numérique"
+    },
+    "TOOLTIP_MESSAGE": {
+      "START_INPUT": "Page d'accueil"
+    }
+  },
+  "PROCESS_LIST_DEMO": {
+    "APP_ID_REQUIRED_ERROR": "Insérer l'ID d'application",
+    "APP_ID_TYPE_ERROR": "L'ID d'application doit être un numéro"
+  },
+  "GROUP-TITLE1-TRANSLATION-KEY": "Titre personnalisé traduction un",
+  "GROUP-TITLE2-TRANSLATION-KEY": "Titre personnalisé traduction deux"
+}
diff --git a/demo-shell/resources/i18n/it.json b/demo-shell/resources/i18n/it.json
index ef502c3a01..804b5dfe12 100644
--- a/demo-shell/resources/i18n/it.json
+++ b/demo-shell/resources/i18n/it.json
@@ -6,14 +6,27 @@
       "PROPERTIES": "Proprietà",
       "VERSIONS": "Versione"
     },
+    "HOME": {
+      "TITLE": "Componenti angolari per Alfresco",
+      "DOCUMENTATION": "Documentazione"
+    },
+    "LOGOUT": {
+      "TITLE": "Pagina di uscita",
+      "SUB_TITLE": "Utente disconnesso",
+      "LOGIN": "Login",
+      "HOME": "Home"
+    },
     "ADF_VERSION_MANAGER": {
       "ALLOW_DELETE": "Consenti eliminazione",
       "SHOW_COMMENTS": "Mostra commenti sulle versioni",
-      "ALLOW_DOWNLOAD": "Abilita download versioni",
-      "READ_ONLY": "Sola lettura"
+      "ALLOW_DOWNLOAD": "Abilita download",
+      "READ_ONLY": "Sola lettura",
+      "COMMENTS": "Mostra commenti"
     },
     "PERSONAL-FILES": "File personali",
     "WARN-MULTIPLE-UPLOADS": "Mostra avviso per caricamenti multipli.",
+    "CUSTOM-PERMISSION-MESSAGE": "Abilita messaggio di autorizzazione personalizzato",
+    "MEDIUM-TIME-FORMAT": "Abilita formato tempo medio per elenco documenti",
     "SEARCH": {
       "RADIO": {
         "NONE": "Nessuno",
@@ -42,8 +55,13 @@
   "APP_LAYOUT": {
     "APP_NAME": "Applicazione demo ADF",
     "HOME": "Home",
+    "NODE-SELECTOR": "Selezione nodo",
     "CONTENT_SERVICES": "Content Services",
     "BREADCRUMB": "Breadcrumb",
+    "NOTIFICATIONS": "Notifiche",
+    "TASK_LIST": "Elenco attività",
+    "PROCESS_LIST": "Elenco processi",
+    "CARD_VIEW": "CardView",
     "PROCESS_SERVICES": "Process Services",
     "LOGIN": "Login",
     "CUSTOM_SOURCES": "Fonti personalizzate",
@@ -58,13 +76,15 @@
     "TRASHCAN": "Cestino",
     "SOCIAL": "Social",
     "SETTINGS": "Impostazioni",
+    "CONFIG-EDITOR": "Editor configurazione",
     "OVERLAY_VIEWER": "Visualizzatore overlay",
     "ABOUT": "Informazioni su",
     "SEARCH": "Ricerca estesa",
     "EXTENDED_SEARCH_QUERY_BODY": "Ricerca estesa con corpo query",
     "WORD_TO_SEARCH": "Termine di ricerca",
     "SEARCH_CREATED_BY": "Creato da",
-    "SEARCH_SERVICE_APPROACH": "Selezionare per disattivare la proprietà di input ed eseguire la configurazione utilizzando il servizio"
+    "SEARCH_SERVICE_APPROACH": "Selezionare per disattivare la proprietà di input ed eseguire la configurazione utilizzando il servizio",
+    "HEADER_DATA": "Dati intestazione"
   },
   "TRASHCAN": {
     "ACTIONS": {
@@ -79,6 +99,7 @@
   },
   "DOCUMENT_LIST": {
     "MULTISELECT_CHECKBOXES": "Selezione multipla (con caselle di spunta)",
+    "THUMBNAILS": "Abilita anteprime",
     "MULTIPLE_FILE_UPLOAD": "Caricamento di file multipli",
     "FOLDER_UPLOAD": "Caricamento cartelle",
     "CUSTOM_FILTER": "Filtro estensioni personalizzato",
@@ -154,7 +175,8 @@
     "START-TASK": "Avvia compito",
     "START-PROCESS": "Avvia processo",
     "PROCESS-AUDIT-LOG": "Registro di audit processo",
-    "TASK-AUDIT-LOG": "Registro di audit compito"
+    "TASK-AUDIT-LOG": "Registro di audit compito",
+    "TASK-SHOW-HEADER": "Mostra intestazione dettagli"
   },
   "FORM-LIST": {
     "STORE": "Memorizza",
@@ -170,7 +192,10 @@
   "LOGIN": {
     "CONTENT_SERVICES": "Content Services",
     "PROCESS_SERVICES": "Process Services",
-    "LOGIN_FOOTER": "Piè di pagina login"
+    "LOGIN_FOOTER": "Piè di pagina login",
+    "SHOW_REMEMBERME": "Mostra utente memorizzato",
+    "SHOW_SUCCESS_ROUTE": "Mostra percorso riuscito",
+    "CUSTOM_LOGO": "Logo personalizzato"
   },
   "SEARCH": {
     "RESULTS": "Risultati della ricerca",
@@ -188,5 +213,21 @@
   "DEMO_PERMISSION": {
     "INHERIT_PERMISSION_BUTTON": "Eredita permessi",
     "INHERITED_PERMISSIONS_BUTTON": "Permesso ereditato"
-  }
-}
\ No newline at end of file
+  },
+  "TASK_LIST_DEMO": {
+    "ERROR_MESSAGE": {
+      "APP_ID_REQUIRED_ERROR": "Inserisci ID app",
+      "APP_ID_TYPE_ERROR": "L'ID app deve essere un numero",
+      "NUMBER_TYPE_ERROR": "Il valore inserito deve essere numerico"
+    },
+    "TOOLTIP_MESSAGE": {
+      "START_INPUT": "Pagina iniziale"
+    }
+  },
+  "PROCESS_LIST_DEMO": {
+    "APP_ID_REQUIRED_ERROR": "Inserisci ID app",
+    "APP_ID_TYPE_ERROR": "L'ID app deve essere un numero"
+  },
+  "GROUP-TITLE1-TRANSLATION-KEY": "Custom Title Translation One",
+  "GROUP-TITLE2-TRANSLATION-KEY": "Custom Title Translation Two"
+}
diff --git a/demo-shell/resources/i18n/ja.json b/demo-shell/resources/i18n/ja.json
index efbe54713c..7a8e17bb7b 100644
--- a/demo-shell/resources/i18n/ja.json
+++ b/demo-shell/resources/i18n/ja.json
@@ -6,14 +6,27 @@
       "PROPERTIES": "プロパティ",
       "VERSIONS": "バージョン"
     },
+    "HOME": {
+      "TITLE": "Alfresco の Angular コンポーネント",
+      "DOCUMENTATION": "文書化"
+    },
+    "LOGOUT": {
+      "TITLE": "ログアウトページ",
+      "SUB_TITLE": "ログアウトしました",
+      "LOGIN": "ログイン",
+      "HOME": "ホーム"
+    },
     "ADF_VERSION_MANAGER": {
       "ALLOW_DELETE": "削除を許可する",
       "SHOW_COMMENTS": "バージョンに関するコメントを表示",
-      "ALLOW_DOWNLOAD": "バージョンのダウンロードを許可する",
-      "READ_ONLY": "読取り専用"
+      "ALLOW_DOWNLOAD": "ダウンロードを許可する",
+      "READ_ONLY": "読取り専用",
+      "COMMENTS": "コメントを表示する"
     },
     "PERSONAL-FILES": "個人的なファイル",
     "WARN-MULTIPLE-UPLOADS": "複数のアップロードの警告を表示します。",
+    "CUSTOM-PERMISSION-MESSAGE": "カスタムの権限メッセージを有効にする",
+    "MEDIUM-TIME-FORMAT": "文書リストの medium 時刻形式を有効にする",
     "SEARCH": {
       "RADIO": {
         "NONE": "なし",
@@ -42,8 +55,13 @@
   "APP_LAYOUT": {
     "APP_NAME": "ADF デモアプリケーション",
     "HOME": "ホーム",
+    "NODE-SELECTOR": "ノードセレクター",
     "CONTENT_SERVICES": "Content Services",
     "BREADCRUMB": "階層リンク",
+    "NOTIFICATIONS": "通知",
+    "TASK_LIST": "タスクリスト",
+    "PROCESS_LIST": "プロセスリスト",
+    "CARD_VIEW": "CardView",
     "PROCESS_SERVICES": "Process Services",
     "LOGIN": "ログイン",
     "CUSTOM_SOURCES": "カスタムソース",
@@ -58,13 +76,15 @@
     "TRASHCAN": "ごみ箱",
     "SOCIAL": "ソーシャル",
     "SETTINGS": "設定",
+    "CONFIG-EDITOR": "設定エディター",
     "OVERLAY_VIEWER": "オーバーレイビューア",
     "ABOUT": "バージョン情報",
     "SEARCH": "詳細検索",
     "EXTENDED_SEARCH_QUERY_BODY": "クエリ本体を使った詳細検索",
     "WORD_TO_SEARCH": "語句の検索",
     "SEARCH_CREATED_BY": "作成者",
-    "SEARCH_SERVICE_APPROACH": "入力プロパティを無効にし、サービスを使って設定する場合は、このチェックボックスをオンにします"
+    "SEARCH_SERVICE_APPROACH": "入力プロパティを無効にし、サービスを使って設定する場合は、このチェックボックスをオンにします",
+    "HEADER_DATA": "ヘッダーの日付"
   },
   "TRASHCAN": {
     "ACTIONS": {
@@ -79,6 +99,7 @@
   },
   "DOCUMENT_LIST": {
     "MULTISELECT_CHECKBOXES": "複数選択 (チェックボックスを使用)",
+    "THUMBNAILS": "サムネイルを有効にする",
     "MULTIPLE_FILE_UPLOAD": "複数ファイルのアップロード",
     "FOLDER_UPLOAD": "フォルダのアップロード",
     "CUSTOM_FILTER": "カスタム拡張子フィルタ",
@@ -154,7 +175,8 @@
     "START-TASK": "タスクの開始",
     "START-PROCESS": "プロセスの開始",
     "PROCESS-AUDIT-LOG": "プロセスの監査ログ",
-    "TASK-AUDIT-LOG": "タスクの監査ログ"
+    "TASK-AUDIT-LOG": "タスクの監査ログ",
+    "TASK-SHOW-HEADER": "詳細ヘッダーを表示する"
   },
   "FORM-LIST": {
     "STORE": "保存",
@@ -170,7 +192,10 @@
   "LOGIN": {
     "CONTENT_SERVICES": "Content Services",
     "PROCESS_SERVICES": "Process Services",
-    "LOGIN_FOOTER": "ログインページのフッター"
+    "LOGIN_FOOTER": "ログインページのフッター",
+    "SHOW_REMEMBERME": "ログイン情報の保存オプションを表示する",
+    "SHOW_SUCCESS_ROUTE": "サクセスルートを表示する",
+    "CUSTOM_LOGO": "カスタムのロゴ"
   },
   "SEARCH": {
     "RESULTS": "検索結果",
@@ -188,5 +213,15 @@
   "DEMO_PERMISSION": {
     "INHERIT_PERMISSION_BUTTON": "権限の継承",
     "INHERITED_PERMISSIONS_BUTTON": "継承された権限"
-  }
+  },
+  "TASK_LIST_DEMO": {
+    "APP_ID_REQUIRED_ERROR": "アプリケーション ID を挿入する",
+    "APP_ID_TYPE_ERROR": "アプリケーション ID は番号でなければなりません"
+  },
+  "PROCESS_LIST_DEMO": {
+    "APP_ID_REQUIRED_ERROR": "アプリケーション ID を挿入する",
+    "APP_ID_TYPE_ERROR": "アプリケーション ID は番号でなければなりません"
+  },
+  "GROUP-TITLE1-TRANSLATION-KEY": "カスタムのタイトル翻訳 1",
+  "GROUP-TITLE2-TRANSLATION-KEY": "カスタムのタイトル翻訳 2"
 }
\ No newline at end of file
diff --git a/demo-shell/resources/i18n/nb.json b/demo-shell/resources/i18n/nb.json
index 7fb0d5bbec..b0525b3a16 100644
--- a/demo-shell/resources/i18n/nb.json
+++ b/demo-shell/resources/i18n/nb.json
@@ -6,14 +6,27 @@
       "PROPERTIES": "Egenskaper",
       "VERSIONS": "Versjoner"
     },
+    "HOME": {
+      "TITLE": "Vinkelkomponenter for Alfresco",
+      "DOCUMENTATION": "Dokumentasjon"
+    },
+    "LOGOUT": {
+      "TITLE": "Avloggingsside",
+      "SUB_TITLE": "Du er nå logget av",
+      "LOGIN": "Logg på",
+      "HOME": "Hjem"
+    },
     "ADF_VERSION_MANAGER": {
       "ALLOW_DELETE": "Tillat sletting",
       "SHOW_COMMENTS": "Vis kommentarer om versjoner",
-      "ALLOW_DOWNLOAD": "Tillat versjonsnedlasting",
-      "READ_ONLY": "Skrivebeskyttet"
+      "ALLOW_DOWNLOAD": "Tillat nedlasting",
+      "READ_ONLY": "Skrivebeskyttet",
+      "COMMENTS": "Vis kommentarer"
     },
     "PERSONAL-FILES": "Personlige filer",
     "WARN-MULTIPLE-UPLOADS": "Vis advarsel for flere opplastinger.",
+    "CUSTOM-PERMISSION-MESSAGE": "Aktiver tilpasset tillatelsesmelding",
+    "MEDIUM-TIME-FORMAT": "Aktiver medium tidsformat for dokumentliste",
     "SEARCH": {
       "RADIO": {
         "NONE": "Ingen",
@@ -42,8 +55,13 @@
   "APP_LAYOUT": {
     "APP_NAME": "ADF-demoprogam",
     "HOME": "Hjem",
+    "NODE-SELECTOR": "Nodevelger",
     "CONTENT_SERVICES": "Content Services",
     "BREADCRUMB": "Søkebane",
+    "NOTIFICATIONS": "Varsler",
+    "TASK_LIST": "Oppgaveliste",
+    "PROCESS_LIST": "Prosessliste",
+    "CARD_VIEW": "CardView",
     "PROCESS_SERVICES": "Process Services",
     "LOGIN": "Logg på",
     "CUSTOM_SOURCES": "Tilpassede kilder",
@@ -58,13 +76,15 @@
     "TRASHCAN": "Søppelkurv",
     "SOCIAL": "Sosial",
     "SETTINGS": "Innstillinger",
+    "CONFIG-EDITOR": "Konfigurasjonsredigering",
     "OVERLAY_VIEWER": "Overleggsfremviser",
     "ABOUT": "Om",
     "SEARCH": "Utvidet søk",
     "EXTENDED_SEARCH_QUERY_BODY": "Utvidet søk med spørringsuttrykk",
     "WORD_TO_SEARCH": "Søkeord",
     "SEARCH_CREATED_BY": "Opprettet av",
-    "SEARCH_SERVICE_APPROACH": "Velg dette for å deaktivere inndataegenskapen og konfigurere ved hjelp av tjenesten"
+    "SEARCH_SERVICE_APPROACH": "Velg dette for å deaktivere inndataegenskapen og konfigurere ved hjelp av tjenesten",
+    "HEADER_DATA": "Overskriftsdata"
   },
   "TRASHCAN": {
     "ACTIONS": {
@@ -79,6 +99,7 @@
   },
   "DOCUMENT_LIST": {
     "MULTISELECT_CHECKBOXES": "Multivalg (med avskrysningsbokser)",
+    "THUMBNAILS": "Aktiver miniatyrbilder",
     "MULTIPLE_FILE_UPLOAD": "Opplasting av flere filer",
     "FOLDER_UPLOAD": "Opplasting av mappe",
     "CUSTOM_FILTER": "Tilpasset utvidelsesfilter",
@@ -154,7 +175,8 @@
     "START-TASK": "Start oppgave",
     "START-PROCESS": "Start prosess",
     "PROCESS-AUDIT-LOG": "Prosessrevisjonslogg",
-    "TASK-AUDIT-LOG": "Oppgaverevisjonslogg"
+    "TASK-AUDIT-LOG": "Oppgaverevisjonslogg",
+    "TASK-SHOW-HEADER": "Vis detaljoverskrift"
   },
   "FORM-LIST": {
     "STORE": "Lagre",
@@ -170,7 +192,10 @@
   "LOGIN": {
     "CONTENT_SERVICES": "Content Services",
     "PROCESS_SERVICES": "Process Services",
-    "LOGIN_FOOTER": "Bunntekt pålogging"
+    "LOGIN_FOOTER": "Bunntekt pålogging",
+    "SHOW_REMEMBERME": "Vis husk meg",
+    "SHOW_SUCCESS_ROUTE": "Vis riktig rute",
+    "CUSTOM_LOGO": "Egendefinert logo"
   },
   "SEARCH": {
     "RESULTS": "Søkeresultater",
@@ -188,5 +213,15 @@
   "DEMO_PERMISSION": {
     "INHERIT_PERMISSION_BUTTON": "Arv tillatelse",
     "INHERITED_PERMISSIONS_BUTTON": "Tillatelse arvet"
-  }
+  },
+  "TASK_LIST_DEMO": {
+    "APP_ID_REQUIRED_ERROR": "Sett inn app-ID",
+    "APP_ID_TYPE_ERROR": "App-ID må være et tall"
+  },
+  "PROCESS_LIST_DEMO": {
+    "APP_ID_REQUIRED_ERROR": "Sett inn app-ID",
+    "APP_ID_TYPE_ERROR": "App-ID må være et tall"
+  },
+  "GROUP-TITLE1-TRANSLATION-KEY": "Egendefinert tittel, oversettelse én",
+  "GROUP-TITLE2-TRANSLATION-KEY": "Egendefinert tittel, oversettelse to"
 }
\ No newline at end of file
diff --git a/demo-shell/resources/i18n/nl.json b/demo-shell/resources/i18n/nl.json
index f4097dd473..4744231fc8 100644
--- a/demo-shell/resources/i18n/nl.json
+++ b/demo-shell/resources/i18n/nl.json
@@ -6,14 +6,27 @@
       "PROPERTIES": "Eigenschappen",
       "VERSIONS": "Versies"
     },
+    "HOME": {
+      "TITLE": "Angular-componenten voor Alfresco",
+      "DOCUMENTATION": "Documentatie"
+    },
+    "LOGOUT": {
+      "TITLE": "Afmeldingspagina",
+      "SUB_TITLE": "U bent nu afgemeld",
+      "LOGIN": "Aanmelden",
+      "HOME": "Home"
+    },
     "ADF_VERSION_MANAGER": {
       "ALLOW_DELETE": "Verwijderen toestaan",
       "SHOW_COMMENTS": "Opmerkingen over versies tonen",
-      "ALLOW_DOWNLOAD": "Downloaden van versies toestaan",
-      "READ_ONLY": "Alleen-lezen"
+      "ALLOW_DOWNLOAD": "Downloaden toestaan",
+      "READ_ONLY": "Alleen-lezen",
+      "COMMENTS": "Opmerkingen weergeven"
     },
     "PERSONAL-FILES": "Persoonlijke bestanden",
     "WARN-MULTIPLE-UPLOADS": "Waarschuwing weergeven bij meerdere uploads.",
+    "CUSTOM-PERMISSION-MESSAGE": "Aangepast machtigingsbericht inschakelen",
+    "MEDIUM-TIME-FORMAT": "Middellange tijdnotatie voor lijst met documenten inschakelen",
     "SEARCH": {
       "RADIO": {
         "NONE": "Geen",
@@ -42,8 +55,13 @@
   "APP_LAYOUT": {
     "APP_NAME": "ADF-demotoepassing",
     "HOME": "Home",
+    "NODE-SELECTOR": "Selectiefunctie voor node",
     "CONTENT_SERVICES": "Content Services",
     "BREADCRUMB": "Navigatiepad",
+    "NOTIFICATIONS": "Meldingen",
+    "TASK_LIST": "Lijst met taken",
+    "PROCESS_LIST": "Lijst met processen",
+    "CARD_VIEW": "CardView",
     "PROCESS_SERVICES": "Process Services",
     "LOGIN": "Aanmelden",
     "CUSTOM_SOURCES": "Aangepaste bronnen",
@@ -58,13 +76,15 @@
     "TRASHCAN": "Prullenbak",
     "SOCIAL": "Sociaal",
     "SETTINGS": "Instellingen",
+    "CONFIG-EDITOR": "Configuratie-editor",
     "OVERLAY_VIEWER": "Overlay-viewer",
     "ABOUT": "Info",
     "SEARCH": "Uitgebreid zoeken",
     "EXTENDED_SEARCH_QUERY_BODY": "Uitgebreid zoeken met queryhoofdcode",
     "WORD_TO_SEARCH": "Zoekterm",
     "SEARCH_CREATED_BY": "Gemaakt door",
-    "SEARCH_SERVICE_APPROACH": "Schakel dit in om de invoereigenschap uit te schakelen en om te configureren via de service"
+    "SEARCH_SERVICE_APPROACH": "Schakel dit in om de invoereigenschap uit te schakelen en om te configureren via de service",
+    "HEADER_DATA": "Koptekstgegevens"
   },
   "TRASHCAN": {
     "ACTIONS": {
@@ -79,6 +99,7 @@
   },
   "DOCUMENT_LIST": {
     "MULTISELECT_CHECKBOXES": "Multiselect (met selectievakjes)",
+    "THUMBNAILS": "Miniaturen inschakelen",
     "MULTIPLE_FILE_UPLOAD": "Meerdere bestanden uploaden",
     "FOLDER_UPLOAD": "Map uploaden",
     "CUSTOM_FILTER": "Aangepast extensiefilter",
@@ -154,7 +175,8 @@
     "START-TASK": "Taak starten",
     "START-PROCESS": "Proces starten",
     "PROCESS-AUDIT-LOG": "Auditlog van proces",
-    "TASK-AUDIT-LOG": "Auditlog van taak"
+    "TASK-AUDIT-LOG": "Auditlog van taak",
+    "TASK-SHOW-HEADER": "Detailkoptekst weergeven"
   },
   "FORM-LIST": {
     "STORE": "Opslaan",
@@ -170,7 +192,10 @@
   "LOGIN": {
     "CONTENT_SERVICES": "Content Services",
     "PROCESS_SERVICES": "Process Services",
-    "LOGIN_FOOTER": "Voettekst aanmeldingspagina"
+    "LOGIN_FOOTER": "Voettekst aanmeldingspagina",
+    "SHOW_REMEMBERME": "'Mij onthouden' weergeven",
+    "SHOW_SUCCESS_ROUTE": "Succesroute weergeven",
+    "CUSTOM_LOGO": "Aangepast logo"
   },
   "SEARCH": {
     "RESULTS": "Zoekresultaten",
@@ -188,5 +213,15 @@
   "DEMO_PERMISSION": {
     "INHERIT_PERMISSION_BUTTON": "Machtiging overnemen",
     "INHERITED_PERMISSIONS_BUTTON": "Machtiging overgenomen"
-  }
+  },
+  "TASK_LIST_DEMO": {
+    "APP_ID_REQUIRED_ERROR": "App-id invoegen",
+    "APP_ID_TYPE_ERROR": "App-id moet een getal zijn"
+  },
+  "PROCESS_LIST_DEMO": {
+    "APP_ID_REQUIRED_ERROR": "App-id invoegen",
+    "APP_ID_TYPE_ERROR": "App-id moet een getal zijn"
+  },
+  "GROUP-TITLE1-TRANSLATION-KEY": "Aangepaste titel vertaling één",
+  "GROUP-TITLE2-TRANSLATION-KEY": "Aangepaste titel vertaling twee"
 }
\ No newline at end of file
diff --git a/demo-shell/resources/i18n/pt-BR.json b/demo-shell/resources/i18n/pt-BR.json
index 499001f029..9cbe127384 100644
--- a/demo-shell/resources/i18n/pt-BR.json
+++ b/demo-shell/resources/i18n/pt-BR.json
@@ -6,14 +6,27 @@
       "PROPERTIES": "Propriedades",
       "VERSIONS": "Versões"
     },
+    "HOME": {
+      "TITLE": "Componentes do Angular para Alfresco",
+      "DOCUMENTATION": "Documentação"
+    },
+    "LOGOUT": {
+      "TITLE": "Página de logout",
+      "SUB_TITLE": "Você está desconectado",
+      "LOGIN": "Login",
+      "HOME": "Página Inicial"
+    },
     "ADF_VERSION_MANAGER": {
       "ALLOW_DELETE": "Permitir apagar",
       "SHOW_COMMENTS": "Mostrar comentários em versões",
-      "ALLOW_DOWNLOAD": "Permitir download da versão",
-      "READ_ONLY": "Somente leitura"
+      "ALLOW_DOWNLOAD": "Permitir download",
+      "READ_ONLY": "Somente leitura",
+      "COMMENTS": "Mostrar comentários"
     },
     "PERSONAL-FILES": "Arquivos pessoais",
     "WARN-MULTIPLE-UPLOADS": "Exibir alerta para vários uploads.",
+    "CUSTOM-PERMISSION-MESSAGE": "Ativar mensagem de permissão personalizada",
+    "MEDIUM-TIME-FORMAT": "Ativar formato de tempo regular para lista de documento",
     "SEARCH": {
       "RADIO": {
         "NONE": "Nenhum",
@@ -42,8 +55,13 @@
   "APP_LAYOUT": {
     "APP_NAME": "Aplicativo Demo ADF",
     "HOME": "Página Inicial",
+    "NODE-SELECTOR": "Seletor de nó",
     "CONTENT_SERVICES": "Content Services",
     "BREADCRUMB": "Trilha de navegação",
+    "NOTIFICATIONS": "Notificações",
+    "TASK_LIST": "Lista de tarefas",
+    "PROCESS_LIST": "Lista de processos",
+    "CARD_VIEW": "CardView",
     "PROCESS_SERVICES": "Process Services",
     "LOGIN": "Login",
     "CUSTOM_SOURCES": "Origens Personalizadas",
@@ -58,13 +76,15 @@
     "TRASHCAN": "Lixeira",
     "SOCIAL": "Social",
     "SETTINGS": "Configurações",
+    "CONFIG-EDITOR": "Editor de configuração",
     "OVERLAY_VIEWER": "Visualizador de sobreposição",
     "ABOUT": "Sobre",
     "SEARCH": "Pesquisa estendida",
     "EXTENDED_SEARCH_QUERY_BODY": "Pesquisa estendida com corpo de consulta",
     "WORD_TO_SEARCH": "Pesquisar palavras",
     "SEARCH_CREATED_BY": "Criado por",
-    "SEARCH_SERVICE_APPROACH": "Marque essa opção para desativar a inserção e configurar a utilização do serviço"
+    "SEARCH_SERVICE_APPROACH": "Marque essa opção para desativar a inserção e configurar a utilização do serviço",
+    "HEADER_DATA": "Dados do cabeçalho"
   },
   "TRASHCAN": {
     "ACTIONS": {
@@ -79,6 +99,7 @@
   },
   "DOCUMENT_LIST": {
     "MULTISELECT_CHECKBOXES": "Seleção Múltipla (com caixas de seleção)",
+    "THUMBNAILS": "Ativar miniaturas",
     "MULTIPLE_FILE_UPLOAD": "Carregamento de Vários Arquivos",
     "FOLDER_UPLOAD": "Carregamento de Pasta",
     "CUSTOM_FILTER": "Filtro de extensões personalizado",
@@ -154,7 +175,8 @@
     "START-TASK": "Iniciar tarefa",
     "START-PROCESS": "Iniciar processo",
     "PROCESS-AUDIT-LOG": "Log de auditoria de processo",
-    "TASK-AUDIT-LOG": "Log de auditoria de tarefa"
+    "TASK-AUDIT-LOG": "Log de auditoria de tarefa",
+    "TASK-SHOW-HEADER": "Mostrar cabeçalho de detalhes"
   },
   "FORM-LIST": {
     "STORE": "Armazenar",
@@ -170,7 +192,10 @@
   "LOGIN": {
     "CONTENT_SERVICES": "Content Services",
     "PROCESS_SERVICES": "Process Services",
-    "LOGIN_FOOTER": "Rodapé de login"
+    "LOGIN_FOOTER": "Rodapé de login",
+    "SHOW_REMEMBERME": "Mostrar o recurso Lembrar-me",
+    "SHOW_SUCCESS_ROUTE": "Mostrar rota de sucesso",
+    "CUSTOM_LOGO": "Logo personalizada"
   },
   "SEARCH": {
     "RESULTS": "Resultados da pesquisa",
@@ -188,5 +213,15 @@
   "DEMO_PERMISSION": {
     "INHERIT_PERMISSION_BUTTON": "Herdar permissão",
     "INHERITED_PERMISSIONS_BUTTON": "Permissão herdada"
-  }
+  },
+  "TASK_LIST_DEMO": {
+    "APP_ID_REQUIRED_ERROR": "Inserir ID do Aplicativo",
+    "APP_ID_TYPE_ERROR": "O ID do aplicativo deve ser um número"
+  },
+  "PROCESS_LIST_DEMO": {
+    "APP_ID_REQUIRED_ERROR": "Inserir ID do Aplicativo",
+    "APP_ID_TYPE_ERROR": "O ID do aplicativo deve ser um número"
+  },
+  "GROUP-TITLE1-TRANSLATION-KEY": "Tradução um de título personalizado",
+  "GROUP-TITLE2-TRANSLATION-KEY": "Tradução dois de título personalizado"
 }
\ No newline at end of file
diff --git a/demo-shell/resources/i18n/ru.json b/demo-shell/resources/i18n/ru.json
index 9184db6e22..d784f477a8 100644
--- a/demo-shell/resources/i18n/ru.json
+++ b/demo-shell/resources/i18n/ru.json
@@ -6,14 +6,27 @@
       "PROPERTIES": "Свойства",
       "VERSIONS": "Версии"
     },
+    "HOME": {
+      "TITLE": "Угловые компоненты для Alfresco",
+      "DOCUMENTATION": "Документация"
+    },
+    "LOGOUT": {
+      "TITLE": "Страница выхода из системы",
+      "SUB_TITLE": "Вы не вышли из системы",
+      "LOGIN": "Войти",
+      "HOME": "Домашняя"
+    },
     "ADF_VERSION_MANAGER": {
       "ALLOW_DELETE": "Разрешить удаление",
       "SHOW_COMMENTS": "Показать комментарии к версиям",
-      "ALLOW_DOWNLOAD": "Разрешить загрузку версии",
-      "READ_ONLY": "Только чтение"
+      "ALLOW_DOWNLOAD": "Разрешить загрузку",
+      "READ_ONLY": "Только чтение",
+      "COMMENTS": "Показать комментарии"
     },
     "PERSONAL-FILES": "Личные файлы",
     "WARN-MULTIPLE-UPLOADS": "Показывать предупреждение для нескольких загрузок.",
+    "CUSTOM-PERMISSION-MESSAGE": "Включить сообщение о пользовательском разрешении",
+    "MEDIUM-TIME-FORMAT": "Включить средний формат времени для списка документов",
     "SEARCH": {
       "RADIO": {
         "NONE": "Нет",
@@ -39,11 +52,19 @@
       "TITLE": "Метаданные"
     }
   },
+  "COMMENTS": {
+    "ADD_COMMENT": "Добавить"
+  },
   "APP_LAYOUT": {
     "APP_NAME": "Демонстрационное приложение ADF",
     "HOME": "Домашняя",
+    "NODE-SELECTOR": "Селектор узлов",
     "CONTENT_SERVICES": "Content Services",
     "BREADCRUMB": "Иерархия",
+    "NOTIFICATIONS": "Оповещения",
+    "TASK_LIST": "Список задач",
+    "PROCESS_LIST": "Список процессов",
+    "CARD_VIEW": "CardView",
     "PROCESS_SERVICES": "Process Services",
     "LOGIN": "Войти",
     "CUSTOM_SOURCES": "Пользовательские источники",
@@ -58,13 +79,15 @@
     "TRASHCAN": "Корзина",
     "SOCIAL": "Социальный",
     "SETTINGS": "Параметры",
+    "CONFIG-EDITOR": "Редактор конфигурации",
     "OVERLAY_VIEWER": "Просмотр наложения",
     "ABOUT": "О приложении",
     "SEARCH": "Расширенный поиск",
     "EXTENDED_SEARCH_QUERY_BODY": "Расширенный поиск с использованием тела запроса",
     "WORD_TO_SEARCH": "Искать слово",
     "SEARCH_CREATED_BY": "Создано пользователем",
-    "SEARCH_SERVICE_APPROACH": "Установите флажок, чтобы отключить свойство ввода и настроить, используя службу."
+    "SEARCH_SERVICE_APPROACH": "Установите флажок, чтобы отключить свойство ввода и настроить, используя службу.",
+    "HEADER_DATA": "Данные заголовка"
   },
   "TRASHCAN": {
     "ACTIONS": {
@@ -79,6 +102,7 @@
   },
   "DOCUMENT_LIST": {
     "MULTISELECT_CHECKBOXES": "Выбор нескольких вариантов (с флажками)",
+    "THUMBNAILS": "Включить эскизы",
     "MULTIPLE_FILE_UPLOAD": "Загрузка нескольких файлов",
     "FOLDER_UPLOAD": "Загрузка папки",
     "CUSTOM_FILTER": "Пользовательский фильтр расширений",
@@ -154,7 +178,8 @@
     "START-TASK": "Начать задачу",
     "START-PROCESS": "Начать процесс",
     "PROCESS-AUDIT-LOG": "Журнал проверки процесса",
-    "TASK-AUDIT-LOG": "Журнал проверки задачи"
+    "TASK-AUDIT-LOG": "Журнал проверки задачи",
+    "TASK-SHOW-HEADER": "Показать подробности заголовка"
   },
   "FORM-LIST": {
     "STORE": "Хранилище",
@@ -170,7 +195,10 @@
   "LOGIN": {
     "CONTENT_SERVICES": "Content Services",
     "PROCESS_SERVICES": "Process Services",
-    "LOGIN_FOOTER": "Нижний колонтитул страницы входа в систему"
+    "LOGIN_FOOTER": "Нижний колонтитул страницы входа в систему",
+    "SHOW_REMEMBERME": "Показывать «Запомнить меня»",
+    "SHOW_SUCCESS_ROUTE": "Показать успешный маршрут",
+    "CUSTOM_LOGO": "Пользовательский логотип"
   },
   "SEARCH": {
     "RESULTS": "Результаты поиска",
@@ -188,5 +216,15 @@
   "DEMO_PERMISSION": {
     "INHERIT_PERMISSION_BUTTON": "Наследовать разрешение",
     "INHERITED_PERMISSIONS_BUTTON": "Разрешение унаследовано"
-  }
+  },
+  "TASK_LIST_DEMO": {
+    "APP_ID_REQUIRED_ERROR": "Вставить идентификатор приложения",
+    "APP_ID_TYPE_ERROR": "Идентификатор приложения должен быть числом"
+  },
+  "PROCESS_LIST_DEMO": {
+    "APP_ID_REQUIRED_ERROR": "Вставить идентификатор приложения",
+    "APP_ID_TYPE_ERROR": "Идентификатор приложения должен быть числом"
+  },
+  "GROUP-TITLE1-TRANSLATION-KEY": "Перевод пользовательского заголовка один",
+  "GROUP-TITLE2-TRANSLATION-KEY": "Перевод пользовательского заголовка два"
 }
\ No newline at end of file
diff --git a/demo-shell/resources/i18n/zh-CN.json b/demo-shell/resources/i18n/zh-CN.json
index d0873f2d17..c081ba59c6 100644
--- a/demo-shell/resources/i18n/zh-CN.json
+++ b/demo-shell/resources/i18n/zh-CN.json
@@ -6,14 +6,27 @@
       "PROPERTIES": "属性",
       "VERSIONS": "版本"
     },
+    "HOME": {
+      "TITLE": "Alfresco 的 Angular 组件",
+      "DOCUMENTATION": "文档"
+    },
+    "LOGOUT": {
+      "TITLE": "注销页面",
+      "SUB_TITLE": "您现在已注销",
+      "LOGIN": "登录",
+      "HOME": "主页"
+    },
     "ADF_VERSION_MANAGER": {
       "ALLOW_DELETE": "允许删除",
       "SHOW_COMMENTS": "显示有关版本的注释",
-      "ALLOW_DOWNLOAD": "允许版本下载",
-      "READ_ONLY": "只读"
+      "ALLOW_DOWNLOAD": "允许下载",
+      "READ_ONLY": "只读",
+      "COMMENTS": "显示注释"
     },
     "PERSONAL-FILES": "个人文件",
     "WARN-MULTIPLE-UPLOADS": "针对多个上传显示警告。",
+    "CUSTOM-PERMISSION-MESSAGE": "启用自定义权限消息",
+    "MEDIUM-TIME-FORMAT": "对文档列表启用中时间格式",
     "SEARCH": {
       "RADIO": {
         "NONE": "无",
@@ -39,11 +52,19 @@
       "TITLE": "元数据"
     }
   },
+  "COMMENTS": {
+    "ADD_COMMENT": "添加"
+  },
   "APP_LAYOUT": {
     "APP_NAME": "ADF 演示应用程序",
     "HOME": "主页",
+    "NODE-SELECTOR": "节点选择器",
     "CONTENT_SERVICES": "Content Services",
     "BREADCRUMB": "面包屑",
+    "NOTIFICATIONS": "通知",
+    "TASK_LIST": "任务列表",
+    "PROCESS_LIST": "流程列表",
+    "CARD_VIEW": "CardView",
     "PROCESS_SERVICES": "Process Services",
     "LOGIN": "登录",
     "CUSTOM_SOURCES": "自定义来源",
@@ -58,13 +79,15 @@
     "TRASHCAN": "垃圾桶",
     "SOCIAL": "社交",
     "SETTINGS": "设置",
+    "CONFIG-EDITOR": "配置编辑器",
     "OVERLAY_VIEWER": "重叠查看器",
     "ABOUT": "关于",
     "SEARCH": "扩展搜索",
     "EXTENDED_SEARCH_QUERY_BODY": "包含查询主体的扩展搜索",
     "WORD_TO_SEARCH": "搜索词",
     "SEARCH_CREATED_BY": "创建者",
-    "SEARCH_SERVICE_APPROACH": "选中此项以禁用输入属性并使用服务进行配置"
+    "SEARCH_SERVICE_APPROACH": "选中此项以禁用输入属性并使用服务进行配置",
+    "HEADER_DATA": "标头数据"
   },
   "TRASHCAN": {
     "ACTIONS": {
@@ -79,6 +102,7 @@
   },
   "DOCUMENT_LIST": {
     "MULTISELECT_CHECKBOXES": "多选（含复选框）",
+    "THUMBNAILS": "启用缩略图",
     "MULTIPLE_FILE_UPLOAD": "上传多个文件",
     "FOLDER_UPLOAD": "文件夹上传",
     "CUSTOM_FILTER": "自定义扩展过滤器",
@@ -154,7 +178,8 @@
     "START-TASK": "启动任务",
     "START-PROCESS": "启动流程",
     "PROCESS-AUDIT-LOG": "流程审计日志",
-    "TASK-AUDIT-LOG": "任务审计日志"
+    "TASK-AUDIT-LOG": "任务审计日志",
+    "TASK-SHOW-HEADER": "显示详细信息标头"
   },
   "FORM-LIST": {
     "STORE": "存储",
@@ -170,7 +195,10 @@
   "LOGIN": {
     "CONTENT_SERVICES": "Content Services",
     "PROCESS_SERVICES": "Process Services",
-    "LOGIN_FOOTER": "登录页脚"
+    "LOGIN_FOOTER": "登录页脚",
+    "SHOW_REMEMBERME": "显示记住我",
+    "SHOW_SUCCESS_ROUTE": "显示成功路由",
+    "CUSTOM_LOGO": "自定义徽标"
   },
   "SEARCH": {
     "RESULTS": "搜索结果",
@@ -188,5 +216,15 @@
   "DEMO_PERMISSION": {
     "INHERIT_PERMISSION_BUTTON": "继承权限",
     "INHERITED_PERMISSIONS_BUTTON": "已继承权限"
-  }
+  },
+  "TASK_LIST_DEMO": {
+    "APP_ID_REQUIRED_ERROR": "插入应用程序 ID",
+    "APP_ID_TYPE_ERROR": "应用程序 ID 必须为数字"
+  },
+  "PROCESS_LIST_DEMO": {
+    "APP_ID_REQUIRED_ERROR": "插入应用程序 ID",
+    "APP_ID_TYPE_ERROR": "应用程序 ID 必须为数字"
+  },
+  "GROUP-TITLE1-TRANSLATION-KEY": "自定义标题翻译 1",
+  "GROUP-TITLE2-TRANSLATION-KEY": "自定义标题翻译 2"
 }
\ No newline at end of file
diff --git a/demo-shell/src/app.config.json b/demo-shell/src/app.config.json
index 1483a27c5d..e00e9a7d66 100644
--- a/demo-shell/src/app.config.json
+++ b/demo-shell/src/app.config.json
@@ -72,7 +72,9 @@
         "options": [
           { "key": "name", "label": "Name", "type": "FIELD", "field": "cm:name", "ascending": true },
           { "key": "content.sizeInBytes", "label": "Size", "type": "FIELD", "field": "content.size", "ascending": true },
-          { "key": "description", "label": "Description", "type": "FIELD", "field": "cm:description", "ascending": true }
+          { "key": "description", "label": "Description", "type": "FIELD", "field": "cm:description", "ascending": true },
+          { "key": "createdByUser", "label": "Author", "type": "FIELD", "field": "cm:creator", "ascending": true },
+          { "key": "createdAt", "label": "Created", "type": "FIELD", "field": "cm:created", "ascending": true }
         ],
         "defaults": [
           { "key": "name", "type": "FIELD", "field": "cm:name", "ascending": true }
@@ -82,25 +84,28 @@
         { "query": "TYPE:'cm:folder' OR TYPE:'cm:content'" },
         { "query": "NOT cm:creator:System" }
       ],
-      "facetFields": [
-        { "field": "content.mimetype", "mincount": 1, "label": "Type" },
-        { "field": "content.size", "mincount": 1, "label": "Size" },
-        { "field": "creator", "mincount": 1, "label": "Creator" },
-        { "field": "modifier", "mincount": 1, "label": "Modifier" },
-        { "field": "created", "mincount": 1, "label": "Created" }
-      ],
+      "facetFields": {
+        "expanded": true,
+        "fields": [
+          { "field": "content.mimetype", "mincount": 1, "label": "1:Type" },
+          { "field": "content.size", "mincount": 1, "label": "2:Size" },
+          { "field": "creator", "mincount": 1, "label": "3:Creator" },
+          { "field": "modifier", "mincount": 1, "label": "4:Modifier" },
+          { "field": "created", "mincount": 1, "label": "5:Created" }
+        ]
+      },
       "facetQueries": {
         "label": "My facet queries",
         "pageSize": 5,
         "queries": [
-          { "query": "created:2018", "label": "Created This Year" },
-          { "query": "content.mimetype", "label": "Type" },
-          { "query": "content.size:[0 TO 10240]", "label": "Size: xtra small"},
-          { "query": "content.size:[10240 TO 102400]", "label": "Size: small"},
-          { "query": "content.size:[102400 TO 1048576]", "label": "Size: medium" },
-          { "query": "content.size:[1048576 TO 16777216]", "label": "Size: large" },
-          { "query": "content.size:[16777216 TO 134217728]", "label": "Size: xtra large" },
-          { "query": "content.size:[134217728 TO MAX]", "label": "Size: XX large" }
+          { "query": "created:2018", "label": "1.Created This Year" },
+          { "query": "content.mimetype", "label": "2.Type" },
+          { "query": "content.size:[0 TO 10240]", "label": "3.Size: xtra small"},
+          { "query": "content.size:[10240 TO 102400]", "label": "4.Size: small"},
+          { "query": "content.size:[102400 TO 1048576]", "label": "5.Size: medium" },
+          { "query": "content.size:[1048576 TO 16777216]", "label": "6.Size: large" },
+          { "query": "content.size:[16777216 TO 134217728]", "label": "7.Size: xtra large" },
+          { "query": "content.size:[134217728 TO MAX]", "label": "8.Size: XX large" }
         ]
       },
       "categories": [
@@ -194,11 +199,14 @@
       ]
     },
     "pagination": {
-        "size": 25,
+        "size": 20,
         "supportedPageSizes": [ 5, 10, 15, 20 ]
     },
     "files": {
-        "excluded": [".DS_Store", "desktop.ini", ".git"]
+        "excluded": [".DS_Store", "desktop.ini", ".git"],
+        "match-options": {
+          "nocase": true
+        }
     },
     "logLevel": "trace",
     "activiti": {
@@ -498,10 +506,9 @@
                     "sortable": true
                 },
                 {
-                    "key": "created",
+                    "key": "id",
                     "type": "text",
-                    "title": "ADF_PROCESS_LIST.PROPERTIES.CREATED",
-                    "cssClass": "hidden",
+                    "title": "ADF_PROCESS_LIST.PROPERTIES.ID",
                     "sortable": true
                 }
             ]
diff --git a/demo-shell/src/app/adf.module.ts b/demo-shell/src/app/adf.module.ts
deleted file mode 100644
index 5e2ae8cd1d..0000000000
--- a/demo-shell/src/app/adf.module.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { NgModule } from '@angular/core';
-
-import { ContentModule } from '@alfresco/adf-content-services';
-import { ProcessModule } from '@alfresco/adf-process-services';
-import { CoreModule } from '@alfresco/adf-core';
-import { InsightsModule } from '@alfresco/adf-insights';
-
-export function modules() {
-    return [
-        CoreModule,
-        ContentModule,
-        InsightsModule,
-        ProcessModule
-    ];
-}
-
-@NgModule({
-    imports: modules(),
-    exports: modules()
-})
-export class AdfModule {
-}
diff --git a/demo-shell/src/app/app.component.spec.ts b/demo-shell/src/app/app.component.spec.ts
deleted file mode 100644
index 91a015b61e..0000000000
--- a/demo-shell/src/app/app.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { TestBed, async } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { AdfModule } from './adf.module';
-import { AppComponent } from './app.component';
-
-describe('AppComponent', () => {
-    beforeEach(async(() => {
-        TestBed.configureTestingModule({
-            imports: [
-                RouterTestingModule,
-                AdfModule
-            ],
-            declarations: [
-                AppComponent
-            ]
-        }).compileComponents();
-    }));
-
-    it('should create the app', async(() => {
-        const fixture = TestBed.createComponent(AppComponent);
-        const app = fixture.debugElement.componentInstance;
-        expect(app).toBeTruthy();
-    }));
-});
diff --git a/demo-shell/src/app/app.component.ts b/demo-shell/src/app/app.component.ts
index a1bebfd3c6..eb321d25a8 100644
--- a/demo-shell/src/app/app.component.ts
+++ b/demo-shell/src/app/app.component.ts
@@ -43,7 +43,6 @@ export class AppComponent implements OnInit {
                     this.router.navigate(['/login']);
                 }
             }
-
         });
     }
 }
diff --git a/demo-shell/src/app/app.module.ts b/demo-shell/src/app/app.module.ts
index 4b209fac23..ad4127be32 100644
--- a/demo-shell/src/app/app.module.ts
+++ b/demo-shell/src/app/app.module.ts
@@ -1,3 +1,20 @@
+/*!
+ * @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 { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
@@ -6,9 +23,8 @@ import { ChartsModule } from 'ng2-charts';
 import { HttpClientModule } from '@angular/common/http';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 
-import { AppConfigService, TRANSLATION_PROVIDER, DebugAppConfigService } from '@alfresco/adf-core';
+import { AppConfigService, TRANSLATION_PROVIDER, DebugAppConfigService, CoreModule } from '@alfresco/adf-core';
 import { AppComponent } from './app.component';
-import { AdfModule } from './adf.module';
 import { MaterialModule } from './material.module';
 import { LoginComponent } from './components/login/login.component';
 import { LogoutComponent } from './components/logout/logout.component';
@@ -34,13 +50,11 @@ import { AppsViewComponent } from './components/process-service/apps-view.compon
 import { DataTableComponent } from './components/datatable/datatable.component';
 import { TrashcanComponent } from './components/trashcan/trashcan.component';
 import { FilesComponent } from './components/files/files.component';
-import { FileViewComponent } from './components/file-view/file-view.component';
 import { WebscriptComponent } from './components/webscript/webscript.component';
 import { TagComponent } from './components/tag/tag.component';
 import { SocialComponent } from './components/social/social.component';
 import { VersionManagerDialogAdapterComponent } from './components/files/version-manager-dialog-adapter.component';
 import { MetadataDialogAdapterComponent } from './components/files/metadata-dialog-adapter.component';
-import { BlobPreviewComponent } from './components/blob-preview/blob-preview.component';
 
 import { ThemePickerModule } from './components/theme-picker/theme-picker';
 
@@ -52,7 +66,19 @@ import { SharedLinkViewComponent } from './components/shared-link-view/shared-li
 import { DemoPermissionComponent } from './components/permissions/demo-permissions.component';
 import { PreviewService } from './services/preview.service';
 import { BreadcrumbDemoComponent } from './components/breadcrumb-demo/breadcrumb-demo.component';
+import { TaskListDemoComponent } from './components/task-list-demo/task-list-demo.component';
+import { ProcessListDemoComponent } from './components/process-list-demo/process-list-demo.component';
+import { ContentNodeSelectorComponent } from './components/content-node-selector/content-node-selector.component';
 import { NotificationsComponent } from './components/notifications/notifications.component';
+import { ReportIssueComponent } from './components/report-issue/report-issue.component';
+import { CardViewComponent } from './components/card-view/card-view.component';
+import { HeaderDataComponent } from './components/header-data/header-data.component';
+import { ConfigEditorComponent } from './components/config-editor/config-editor.component';
+import { HeaderDataService } from './components/header-data/header-data.service';
+import { MonacoEditorModule } from 'ngx-monaco-editor';
+import { ContentModule } from '@alfresco/adf-content-services';
+import { InsightsModule } from '@alfresco/adf-insights';
+import { ProcessModule } from '@alfresco/adf-process-services';
 
 @NgModule({
     imports: [
@@ -61,12 +87,16 @@ import { NotificationsComponent } from './components/notifications/notifications
         ReactiveFormsModule,
         routing,
         FormsModule,
-        MaterialModule,
-        ThemePickerModule,
-        FlexLayoutModule,
-        ChartsModule,
         HttpClientModule,
-        AdfModule
+        MaterialModule,
+        FlexLayoutModule,
+        CoreModule.forRoot(),
+        ContentModule.forRoot(),
+        InsightsModule.forRoot(),
+        ProcessModule.forRoot(),
+        ThemePickerModule,
+        ChartsModule,
+        MonacoEditorModule.forRoot(),
     ],
     declarations: [
         AppComponent,
@@ -87,7 +117,6 @@ import { NotificationsComponent } from './components/notifications/notifications
         AppsViewComponent,
         DataTableComponent,
         FilesComponent,
-        FileViewComponent,
         TrashcanComponent,
         FormComponent,
         FormListComponent,
@@ -104,9 +133,15 @@ import { NotificationsComponent } from './components/notifications/notifications
         FormLoadingComponent,
         DemoPermissionComponent,
         FormLoadingComponent,
-        BlobPreviewComponent,
         BreadcrumbDemoComponent,
-        NotificationsComponent
+        NotificationsComponent,
+        CardViewComponent,
+        ContentNodeSelectorComponent,
+        ReportIssueComponent,
+        TaskListDemoComponent,
+        ProcessListDemoComponent,
+        HeaderDataComponent,
+        ConfigEditorComponent
     ],
     providers: [
         { provide: AppConfigService, useClass: DebugAppConfigService }, // not use this service in production
@@ -126,9 +161,13 @@ import { NotificationsComponent } from './components/notifications/notifications
                 source: 'resources/lazy-loading'
             }
         },
-        PreviewService
+        PreviewService,
+        HeaderDataService
+    ],
+    entryComponents: [
+        VersionManagerDialogAdapterComponent,
+        MetadataDialogAdapterComponent
     ],
-    entryComponents: [VersionManagerDialogAdapterComponent, MetadataDialogAdapterComponent],
     bootstrap: [AppComponent]
 })
 export class AppModule {}
diff --git a/demo-shell/src/app/app.routes.ts b/demo-shell/src/app/app.routes.ts
index d9485f9c6a..b5b733a358 100644
--- a/demo-shell/src/app/app.routes.ts
+++ b/demo-shell/src/app/app.routes.ts
@@ -40,23 +40,52 @@ import { SocialComponent } from './components/social/social.component';
 import { FilesComponent } from './components/files/files.component';
 import { FormComponent } from './components/form/form.component';
 
-import { FileViewComponent } from './components/file-view/file-view.component';
 import { CustomSourcesComponent } from './components/files/custom-sources.component';
 import { FormListComponent } from './components/form/form-list.component';
 import { OverlayViewerComponent } from './components/overlay-viewer/overlay-viewer.component';
 import { SharedLinkViewComponent } from './components/shared-link-view/shared-link-view.component';
 import { FormLoadingComponent } from './components/form/form-loading.component';
 import { DemoPermissionComponent } from './components/permissions/demo-permissions.component';
-import { BlobPreviewComponent } from './components/blob-preview/blob-preview.component';
 import { BreadcrumbDemoComponent } from './components/breadcrumb-demo/breadcrumb-demo.component';
+import { TaskListDemoComponent } from './components/task-list-demo/task-list-demo.component';
+import { ProcessListDemoComponent } from './components/process-list-demo/process-list-demo.component';
 import { NotificationsComponent } from './components/notifications/notifications.component';
+import { CardViewComponent } from './components/card-view/card-view.component';
+import { ContentNodeSelectorComponent } from './components/content-node-selector/content-node-selector.component';
+import { ReportIssueComponent } from './components/report-issue/report-issue.component';
+import { HeaderDataComponent } from './components/header-data/header-data.component';
+import { ConfigEditorComponent } from './components/config-editor/config-editor.component';
+import { AppComponent } from './app.component';
 
 export const appRoutes: Routes = [
     { path: 'login', component: LoginComponent },
     { path: 'logout', component: LogoutComponent },
     { path: 'settings', component: SettingsComponent },
-    { path: 'files/:nodeId/view', component: FileViewComponent, canActivate: [ AuthGuardEcm ], outlet: 'overlay' },
-    { path: 'preview/blob', component: BlobPreviewComponent, outlet: 'overlay', pathMatch: 'full' },
+    {
+        path: 'files/:nodeId/view',
+        component: AppComponent,
+        canActivate: [ AuthGuardEcm ],
+        canActivateChild: [ AuthGuardEcm ],
+        outlet: 'overlay',
+        children: [
+            {
+                path: '',
+                loadChildren: 'app/components/file-view/file-view.module#FileViewModule'
+            }
+        ]
+    },
+    {
+        path: 'preview/blob',
+        component: AppComponent,
+        outlet: 'overlay',
+        pathMatch: 'full',
+        children: [
+            {
+                path: '',
+                loadChildren: 'app/components/blob-preview/blob-preview.module#BlobPreviewModule'
+            }
+        ]
+    },
     { path: 'preview/s/:id', component: SharedLinkViewComponent },
     {
         path: 'breadcrumb',
@@ -73,6 +102,36 @@ export const appRoutes: Routes = [
             }
         ]
     },
+    {
+        path: 'config-editor',
+        component: AppLayoutComponent ,
+        children: [
+            {
+                path: '',
+                component: ConfigEditorComponent
+            }
+        ]
+    },
+    {
+        path: 'card-view',
+        component: AppLayoutComponent ,
+        children: [
+            {
+                path: '',
+                component: CardViewComponent
+            }
+        ]
+    },
+    {
+        path: 'header-data',
+        component: AppLayoutComponent,
+        children: [
+            {
+                path: '',
+                component: HeaderDataComponent
+            }
+        ]
+    },
     {
         path: '',
         component: AppLayoutComponent,
@@ -86,6 +145,10 @@ export const appRoutes: Routes = [
                 path: 'home',
                 component: HomeComponent
             },
+            {
+                path: 'node-selector',
+                component: ContentNodeSelectorComponent
+            },
             {
                 path: 'settings-layout',
                 component: SettingsComponent
@@ -216,10 +279,34 @@ export const appRoutes: Routes = [
                 component: OverlayViewerComponent,
                 canActivate: [AuthGuardEcm]
             },
+            {
+                path: 'report-issue',
+                component: ReportIssueComponent
+            },
             {
                 path: 'datatable-lazy',
                 loadChildren: 'app/components/lazy-loading/lazy-loading.module#LazyLoadingModule'
             },
+            {
+                path: 'task-list',
+                component: TaskListDemoComponent,
+                canActivate: [AuthGuardBpm]
+            },
+            {
+                path: 'task-list/:id',
+                component: TaskListDemoComponent,
+                canActivate: [AuthGuardBpm]
+            },
+            {
+                path: 'process-list',
+                component: ProcessListDemoComponent,
+                canActivate: [AuthGuardBpm]
+            },
+            {
+                path: 'process-list/:id',
+                component: ProcessListDemoComponent,
+                canActivate: [AuthGuardBpm]
+            },
             {
                 path: 'error/:id',
                 component: ErrorContentComponent
@@ -228,7 +315,6 @@ export const appRoutes: Routes = [
                 path: '**',
                 redirectTo: 'error/404'
             }
-
         ]
     }
 ];
diff --git a/demo-shell/src/app/components/app-layout/app-layout.component.html b/demo-shell/src/app/components/app-layout/app-layout.component.html
index 5fba1de75c..c4265b5d79 100644
--- a/demo-shell/src/app/components/app-layout/app-layout.component.html
+++ b/demo-shell/src/app/components/app-layout/app-layout.component.html
@@ -1,32 +1,30 @@
-<adf-sidenav-layout [sidenavMin]="70" [sidenavMax]="220" [stepOver]="780" [hideSidenav]="false"[expandedSidenav]= "expandedSidenav" (expanded)="setState($event)">
+<adf-sidenav-layout [sidenavMin]="70" [sidenavMax]="220" [stepOver]="780" [hideSidenav]="hideSidenav" [expandedSidenav]= "expandedSidenav" (expanded)="setState($event)">
 
     <adf-sidenav-layout-header>
         <ng-template let-toggleMenu="toggleMenu">
-            <mat-toolbar color="primary" class="adf-app-layout-toolbar mat-elevation-z6">
-                <button mat-icon-button (click)="toggleMenu()">
-                    <mat-icon>menu</mat-icon>
-                </button>
+            <adf-layout-header  id="adf-header" [title]="title | translate" [redirectUrl]="redirectUrl" [logo]="logo" [tooltip]="tooltip | translate" [showSidenavToggle]="showMenu" [color]="color" (clicked)=toggleMenu($event) >
 
-                <span fxFlex="1 1 auto" fxShow fxHide.lt-sm="true">{{'APP_LAYOUT.APP_NAME' | translate }}</span>
+            <div class="adf-app-layout-menu-spacer"></div>
 
-                <div class="adf-app-layout-menu-spacer"></div>
+            <app-search-bar fxFlex="0 1 auto"></app-search-bar>
 
-                <app-search-bar fxFlex="0 1 auto"></app-search-bar>
+            <div class="adf-header-delimiter"></div>
 
-                <adf-userinfo
-                    class="adf-app-layout-user-profile"
-                    [menuPositionX]="'before'"
-                    [menuPositionY]="'above'">
-                </adf-userinfo>
+            <adf-userinfo
+                class="adf-app-layout-user-profile"
+                [menuPositionX]="'before'"
+                [menuPositionY]="'above'">
+            </adf-userinfo>
 
-                <app-theme-picker></app-theme-picker>
-                <button mat-icon-button [matMenuTriggerFor]="langMenu">
-                    <mat-icon>language</mat-icon>
-                </button>
-                <mat-menu #langMenu="matMenu" class="adf-menu">
-                    <adf-language-menu></adf-language-menu>
-                </mat-menu>
-            </mat-toolbar>
+            <app-theme-picker></app-theme-picker>
+            <button data-automation-id="language-menu-button" mat-icon-button [matMenuTriggerFor]="langMenu">
+                <mat-icon>language</mat-icon>
+            </button>
+            <mat-menu #langMenu="matMenu" class="adf-menu">
+                <adf-language-menu></adf-language-menu>
+            </mat-menu>
+
+            </adf-layout-header>
         </ng-template>
     </adf-sidenav-layout-header>
 
@@ -45,7 +43,7 @@
         </ng-template>
     </adf-sidenav-layout-navigation>
 
-    <adf-sidenav-layout-content>
+    <adf-sidenav-layout-content >
         <ng-template>
             <router-outlet></router-outlet>
         </ng-template>
diff --git a/demo-shell/src/app/components/app-layout/app-layout.component.scss b/demo-shell/src/app/components/app-layout/app-layout.component.scss
index e8a2929d21..5e1b10b03c 100644
--- a/demo-shell/src/app/components/app-layout/app-layout.component.scss
+++ b/demo-shell/src/app/components/app-layout/app-layout.component.scss
@@ -23,10 +23,6 @@
         overflow: visible !important;
     }
 
-    .adf-menu {
-        padding-top: 55px;
-    }
-
     .adf-app-layout {
         display: flex;
         flex: 1;
diff --git a/demo-shell/src/app/components/app-layout/app-layout.component.ts b/demo-shell/src/app/components/app-layout/app-layout.component.ts
index 9cf5138759..2f718ed669 100644
--- a/demo-shell/src/app/components/app-layout/app-layout.component.ts
+++ b/demo-shell/src/app/components/app-layout/app-layout.component.ts
@@ -17,6 +17,8 @@
 
 import { Component, ViewEncapsulation, OnInit } from '@angular/core';
 import { UserPreferencesService, AppConfigService, AlfrescoApiService } from '@alfresco/adf-core';
+import { HeaderDataService } from '../header-data/header-data.service';
+
 
 @Component({
     templateUrl: 'app-layout.component.html',
@@ -34,6 +36,11 @@ export class AppLayoutComponent implements OnInit {
         { href: '/files', icon: 'folder_open', title: 'APP_LAYOUT.CONTENT_SERVICES' },
         { href: '/breadcrumb', icon: 'label', title: 'APP_LAYOUT.BREADCRUMB' },
         { href: '/notifications', icon: 'alarm', title: 'APP_LAYOUT.NOTIFICATIONS'},
+        { href: '/card-view', icon: 'view_headline', title: 'APP_LAYOUT.CARD_VIEW'},
+        { href: '/header-data', icon: 'edit', title: 'APP_LAYOUT.HEADER_DATA'},
+        { href: '/node-selector', icon: 'attachment', title: 'APP_LAYOUT.NODE-SELECTOR' },
+        { href: '/task-list', icon: 'assignment', title: 'APP_LAYOUT.TASK_LIST' },
+        { href: '/process-list', icon: 'assignment', title: 'APP_LAYOUT.PROCESS_LIST' },
         { href: '/activiti', icon: 'device_hub', title: 'APP_LAYOUT.PROCESS_SERVICES' },
         { href: '/login', icon: 'vpn_key', title: 'APP_LAYOUT.LOGIN' },
         { href: '/trashcan', icon: 'delete', title: 'APP_LAYOUT.TRASHCAN' },
@@ -47,6 +54,7 @@ export class AppLayoutComponent implements OnInit {
         { href: '/tag', icon: 'local_offer', title: 'APP_LAYOUT.TAG' },
         { href: '/social', icon: 'thumb_up', title: 'APP_LAYOUT.SOCIAL' },
         { href: '/settings-layout', icon: 'settings', title: 'APP_LAYOUT.SETTINGS' },
+        { href: '/config-editor', icon: 'code', title: 'APP_LAYOUT.CONFIG-EDITOR' },
         { href: '/extendedSearch', icon: 'search', title: 'APP_LAYOUT.SEARCH' },
         { href: '/overlay-viewer', icon: 'pageview', title: 'APP_LAYOUT.OVERLAY_VIEWER' },
         { href: '/about', icon: 'info_outline', title: 'APP_LAYOUT.ABOUT' }
@@ -54,7 +62,15 @@ export class AppLayoutComponent implements OnInit {
 
     expandedSidenav = false;
 
+    hideSidenav = false;
+    showMenu = true;
+
     enabelRedirect = true;
+    color = 'primary';
+    title = 'APP_LAYOUT.APP_NAME';
+    logo: string;
+    redirectUrl: string | any[] = ['/home'];
+    tooltip = 'APP_LAYOUT.APP_NAME';
 
     ngOnInit() {
         const expand = this.config.get<boolean>('sideNav.expandedSidenav');
@@ -65,9 +81,20 @@ export class AppLayoutComponent implements OnInit {
         } else if (expand) {
             this.expandedSidenav = expand;
         }
+
+        this.headerService.hideMenu.subscribe(show => this.showMenu = show);
+        this.headerService.color.subscribe(color => this.color = color);
+        this.headerService.title.subscribe(title => this.title = title);
+        this.headerService.logo.subscribe(path => this.logo = path);
+        this.headerService.redirectUrl.subscribe(redirectUrl => this.redirectUrl = redirectUrl);
+        this.headerService.tooltip.subscribe(tooltip => this.tooltip = tooltip);
     }
 
-    constructor(private userpreference: UserPreferencesService, private config: AppConfigService, private alfrescoApiService: AlfrescoApiService) {
+    constructor(
+        private userpreference: UserPreferencesService,
+        private config: AppConfigService,
+        private alfrescoApiService: AlfrescoApiService,
+        private headerService: HeaderDataService) {
         if (this.alfrescoApiService.getInstance().isOauthConfiguration()) {
             this.enabelRedirect = false;
         }
@@ -78,4 +105,4 @@ export class AppLayoutComponent implements OnInit {
             this.userpreference.set('expandedSidenav', state);
         }
     }
-}
+ }
diff --git a/demo-shell/src/app/components/blob-preview/blob-preview.component.ts b/demo-shell/src/app/components/blob-preview/blob-preview.component.ts
index e68fffc913..a20dc8402e 100644
--- a/demo-shell/src/app/components/blob-preview/blob-preview.component.ts
+++ b/demo-shell/src/app/components/blob-preview/blob-preview.component.ts
@@ -1,3 +1,20 @@
+/*!
+ * @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 { Component } from '@angular/core';
 import { PreviewService } from '../../services/preview.service';
 import { Router } from '@angular/router';
diff --git a/demo-shell/src/app/components/blob-preview/blob-preview.module.ts b/demo-shell/src/app/components/blob-preview/blob-preview.module.ts
new file mode 100644
index 0000000000..23cfe8a28f
--- /dev/null
+++ b/demo-shell/src/app/components/blob-preview/blob-preview.module.ts
@@ -0,0 +1,49 @@
+/*!
+ * @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 { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { CommonModule } from '@angular/common';
+import { CoreModule, InfoDrawerModule } from '@alfresco/adf-core';
+import { ContentDirectiveModule, ContentMetadataModule, VersionManagerModule } from '@alfresco/adf-content-services';
+import { BlobPreviewComponent } from './blob-preview.component';
+
+const routes: Routes = [
+    {
+        path: '',
+        component: BlobPreviewComponent
+    }
+];
+
+@NgModule({
+    imports: [
+        CommonModule,
+        RouterModule.forChild(routes),
+        CoreModule.forChild(),
+        InfoDrawerModule,
+        ContentDirectiveModule,
+        ContentMetadataModule,
+        VersionManagerModule
+    ],
+    declarations: [
+        BlobPreviewComponent
+    ],
+    exports: [
+        BlobPreviewComponent
+    ]
+})
+export class BlobPreviewModule {}
diff --git a/demo-shell/src/app/components/breadcrumb-demo/breadcrumb-demo.component.ts b/demo-shell/src/app/components/breadcrumb-demo/breadcrumb-demo.component.ts
index 242933207a..12df02215e 100644
--- a/demo-shell/src/app/components/breadcrumb-demo/breadcrumb-demo.component.ts
+++ b/demo-shell/src/app/components/breadcrumb-demo/breadcrumb-demo.component.ts
@@ -19,7 +19,7 @@ import { Component } from '@angular/core';
 
 @Component({
     templateUrl: './breadcrumb-demo.component.html',
-    styleUrls: [`./breadcrumb-demo.component.scss`],
+    styleUrls: [`./breadcrumb-demo.component.scss`]
 })
 export class BreadcrumbDemoComponent {
 
diff --git a/demo-shell/src/app/components/card-view/card-view.component.html b/demo-shell/src/app/components/card-view/card-view.component.html
new file mode 100644
index 0000000000..8e88131013
--- /dev/null
+++ b/demo-shell/src/app/components/card-view/card-view.component.html
@@ -0,0 +1,30 @@
+<div class="main-content">
+    <h1>CardView Component</h1>
+
+    <mat-card class="card-view">
+        <adf-card-view
+            [properties]="properties"
+            [editable]="true">
+        </adf-card-view>
+    </mat-card>
+
+    <div class="console" #console>
+        <h3>Changes log:</h3>
+        <p *ngFor="let log of logs">{{ log }}</p>
+    </div>
+
+</div>
+
+<p class="toggle">
+    <mat-slide-toggle
+        id="adf-toogle-editable"
+        [color]="'primary'"
+        (change)="toggleEditable()"
+        [checked]="isEditable">
+        Editable
+    </mat-slide-toggle>
+</p>
+
+<button mat-button id="adf-reset-card-log" (click)="reset()" color="primary">Reset Log</button>
+
+<br>
diff --git a/demo-shell/src/app/components/card-view/card-view.component.scss b/demo-shell/src/app/components/card-view/card-view.component.scss
new file mode 100644
index 0000000000..04be8c427f
--- /dev/null
+++ b/demo-shell/src/app/components/card-view/card-view.component.scss
@@ -0,0 +1,28 @@
+.main-content {
+    padding: 0 15px;
+}
+
+.card-view {
+    width: 30%;
+    display: inline-block;
+}
+
+.console {
+    width: 60%;
+    display: inline-block;
+    vertical-align: top;
+    margin-left: 10px;
+    height: 500px;
+    overflow: scroll;
+    padding-bottom: 30px;
+
+    h3 {
+        margin-top: 0;
+    }
+
+    p {
+        display: block;
+        font-family: monospace, monospace;
+        margin: 0;
+    }
+}
\ No newline at end of file
diff --git a/demo-shell/src/app/components/card-view/card-view.component.ts b/demo-shell/src/app/components/card-view/card-view.component.ts
new file mode 100644
index 0000000000..8b036a4b2b
--- /dev/null
+++ b/demo-shell/src/app/components/card-view/card-view.component.ts
@@ -0,0 +1,146 @@
+/*!
+ * @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 { Component, OnInit, ElementRef, ViewChild } from '@angular/core';
+import {
+    CardViewTextItemModel,
+    CardViewDateItemModel,
+    CardViewDatetimeItemModel,
+    CardViewBoolItemModel,
+    CardViewIntItemModel,
+    CardViewFloatItemModel,
+    CardViewKeyValuePairsItemModel,
+    CardViewSelectItemModel,
+    CardViewUpdateService,
+    CardViewMapItemModel,
+    UpdateNotification
+} from '@alfresco/adf-core';
+import { of } from 'rxjs';
+
+@Component({
+    templateUrl: './card-view.component.html',
+    styleUrls: ['./card-view.component.scss']
+})
+export class CardViewComponent implements OnInit {
+
+    @ViewChild('console') console: ElementRef;
+
+    isEditable = true;
+    properties: any;
+    logs: string[];
+
+    constructor(private cardViewUpdateService: CardViewUpdateService) {
+        this.logs = [];
+        this.createCard();
+    }
+
+    ngOnInit() {
+        this.cardViewUpdateService.itemUpdated$.subscribe(this.onItemChange.bind(this));
+    }
+
+    createCard() {
+        this.properties = [
+            new CardViewTextItemModel({
+                label: 'CardView Text Item',
+                value: 'Spock',
+                key: 'name',
+                default: 'default bar',
+                multiline: false,
+                icon: 'icon',
+                editable: this.isEditable
+            }),
+            new CardViewDateItemModel({
+                label: 'CardView Date Item',
+                value: new Date(1983, 11, 24, 10, 0, 30),
+                key: 'date',
+                default: new Date(1983, 11, 24, 10, 0, 30),
+                format: 'DD.MM.YYYY',
+                editable: this.isEditable
+            }),
+            new CardViewDatetimeItemModel({
+                label: 'CardView Datetime Item',
+                value: new Date(1983, 11, 24, 10, 0, 0),
+                key: 'datetime',
+                default: new Date(1983, 11, 24, 10, 0, 0),
+                format: 'DD.MM.YYYY',
+                editable: this.isEditable
+            }),
+            new CardViewBoolItemModel({
+                label: 'CardView Boolean Item',
+                value: true,
+                key: 'boolean',
+                default: false,
+                editable: this.isEditable
+            }),
+            new CardViewIntItemModel({
+                label: 'CardView Int Item',
+                value: 213,
+                key: 'int',
+                default: 1,
+                editable: this.isEditable
+            }),
+            new CardViewFloatItemModel({
+                label: 'CardView Float Item',
+                value: 9.9,
+                key: 'float',
+                default: 0.0,
+                editable: this.isEditable
+            }),
+            new CardViewKeyValuePairsItemModel({
+                label: 'CardView Key-Value Pairs Item',
+                value: [],
+                key: 'key-value-pairs',
+                editable: this.isEditable
+            }),
+            new CardViewSelectItemModel({
+                label: 'CardView Select Item',
+                value: 'one',
+                options$: of([{ key: 'one', label: 'One' }, { key: 'two', label: 'Two' }]),
+                key: 'select',
+                editable: this.isEditable
+            }),
+            new CardViewMapItemModel({
+                label: 'My map',
+                value: new Map([['999', 'My Value']]),
+                key: 'map',
+                default: 'default map value'
+            })
+        ];
+    }
+
+    onItemChange(notification: UpdateNotification) {
+        let value = notification.changed[notification.target.key];
+
+        if (notification.target.type === 'keyvaluepairs') {
+            value = JSON.stringify(value);
+        }
+
+        this.logs.push(`[${notification.target.label}] - ${value}`);
+        this.console.nativeElement.scrollTop = this.console.nativeElement.scrollHeight;
+    }
+
+    toggleEditable() {
+        this.isEditable = !this.isEditable;
+        this.createCard();
+    }
+
+    reset() {
+        this.isEditable = true;
+        this.createCard();
+        this.logs = [];
+    }
+}
diff --git a/demo-shell/src/app/components/config-editor/config-editor.component.html b/demo-shell/src/app/components/config-editor/config-editor.component.html
new file mode 100644
index 0000000000..fd2ede0d81
--- /dev/null
+++ b/demo-shell/src/app/components/config-editor/config-editor.component.html
@@ -0,0 +1,29 @@
+
+<h2>Metadata App config editor</h2>
+
+<ngx-monaco-editor id="adf-metadata-editor" class="adf-metadata-editor" [options]="editorOptions" [(ngModel)]="metadataConf" (onInit)="onInitMetadata($event)" ></ngx-monaco-editor>
+
+<button  mat-raised-button id="adf-metadata-save"  (click)="onSaveMetadata()" color="primary">Save metadata configuration</button>
+<button  mat-raised-button id="adf-metadata-clear" (click)="onClearMetadata()" color="primary">Clear metadata configuration</button>
+
+<br>
+<br>
+<br>
+
+<h2>Search App config editor</h2>
+
+<ngx-monaco-editor id="adf-search-editor" class="adf-search-editor" [options]="editorOptions" [(ngModel)]="searchConf" (onInit)="onInitSearch($event)" ></ngx-monaco-editor>
+
+<button  mat-raised-button id="adf-search-save"  (click)="onSaveSearch()" color="primary">Save Search configuration</button>
+<button  mat-raised-button id="adf-search-clear" (click)="onClearSearch()" color="primary">Clear Search configuration</button>
+
+<br>
+
+<h2>Excluded File config editor</h2>
+
+<ngx-monaco-editor id="adf-excluded-file" class="adf-excluded-file-editor" [options]="editorOptions" [(ngModel)]="excludedFileConf" (onInit)="onInitExcludedFile($event)" ></ngx-monaco-editor>
+
+<button  mat-raised-button id="adf-excluded-file-save"  (click)="onSaveExcludedFile()" color="primary">Save excluded file configuration</button>
+<button  mat-raised-button id="adf-excluded-file-clear" (click)="onClearExcludedFile()" color="primary">Clear excluded file configuration</button>
+
+<br>
diff --git a/demo-shell/src/app/components/config-editor/config-editor.component.scss b/demo-shell/src/app/components/config-editor/config-editor.component.scss
new file mode 100644
index 0000000000..096ca654cb
--- /dev/null
+++ b/demo-shell/src/app/components/config-editor/config-editor.component.scss
@@ -0,0 +1,3 @@
+.adf-metadata-editor {
+    height: 300px;
+}
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
new file mode 100644
index 0000000000..0de4c59baf
--- /dev/null
+++ b/demo-shell/src/app/components/config-editor/config-editor.component.ts
@@ -0,0 +1,115 @@
+/*!
+ * @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 { Component } from '@angular/core';
+import { AppConfigService, NotificationService } from '@alfresco/adf-core';
+
+@Component({
+    selector: 'app-config-editor',
+    templateUrl: 'config-editor.component.html',
+    styleUrls: ['./config-editor.component.scss']
+})
+export class ConfigEditorComponent {
+
+    editor: any;
+    editorSearch: any;
+    editorExcludedFile: any;
+
+    editorOptions = {
+        theme: 'vs-dark',
+        language: 'json',
+        autoIndent: true,
+        formatOnPaste: true,
+        formatOnType: true
+    };
+
+    metadataConf: string;
+    searchConf: string;
+    excludedFileConf: string;
+
+    onInitMetadata(editor) {
+        this.editor = editor;
+        setTimeout(() => {
+            this.editor.getAction('editor.action.formatDocument').run();
+        }, 1000);
+    }
+
+    onInitSearch(editor) {
+        this.editorSearch = editor;
+        setTimeout(() => {
+            this.editorSearch.getAction('editor.action.formatDocument').run();
+        }, 1000);
+    }
+
+    onInitExcludedFile(excludedFile) {
+        this.editorExcludedFile = excludedFile;
+        setTimeout(() => {
+            this.editorExcludedFile.getAction('editor.action.formatDocument').run();
+        }, 1000);
+    }
+
+    constructor(private appConfig: AppConfigService, private notificationService: NotificationService) {
+        this.metadataConf = JSON.stringify(appConfig.config['content-metadata']);
+        this.searchConf = JSON.stringify(appConfig.config['search']);
+        this.excludedFileConf = JSON.stringify(appConfig.config['files']);
+    }
+
+    onSaveMetadata() {
+        try {
+            this.appConfig.config['content-metadata'] = JSON.parse(this.editor.getValue());
+        } catch (error) {
+            this.notificationService.openSnackMessage(
+                'Wrong metadata configuration',
+                4000
+            );
+        }
+    }
+
+    onSaveSearch() {
+        try {
+            this.appConfig.config['search'] = JSON.parse(this.editorSearch.getValue());
+        } catch (error) {
+            this.notificationService.openSnackMessage(
+                'Wrong search configuration',
+                4000
+            );
+        }
+    }
+
+    onSaveExcludedFile() {
+        try {
+            this.appConfig.config['files'] = JSON.parse(this.editorExcludedFile.getValue());
+        } catch (error) {
+            this.notificationService.openSnackMessage(
+                'Wrong exclude file configuration',
+                4000
+            );
+        }
+    }
+
+    onClearMetadata() {
+        this.metadataConf = '';
+    }
+
+    onClearSearch() {
+        this.searchConf = '';
+    }
+
+    onClearExcludedFile() {
+        this.searchConf = '';
+    }
+}
diff --git a/demo-shell/src/app/components/content-node-selector/content-node-selector.component.html b/demo-shell/src/app/components/content-node-selector/content-node-selector.component.html
new file mode 100644
index 0000000000..4e86c2097d
--- /dev/null
+++ b/demo-shell/src/app/components/content-node-selector/content-node-selector.component.html
@@ -0,0 +1,198 @@
+<main>
+    <h1>Object picker</h1>
+
+    <mat-accordion>
+        <mat-expansion-panel>
+            <mat-expansion-panel-header>
+                <mat-panel-title>
+                    <h2>Plain picker</h2>
+                </mat-panel-title>
+                <mat-panel-description>
+                    <label class="content-node-selector-demo-basic-label">
+                        dropdownHideMyFiles: {{dropdownHideMyFiles}}
+                    </label>
+                </mat-panel-description>
+            </mat-expansion-panel-header>
+
+            <div class="content-node-selector-demo-basic-table">
+                <adf-content-node-selector-panel
+                    [currentFolderId]="'-root-'">
+                </adf-content-node-selector-panel>
+            </div>
+        </mat-expansion-panel>
+        <mat-expansion-panel>
+            <mat-expansion-panel-header>
+                <mat-panel-title>
+                    <h2>Hide My files</h2>
+                </mat-panel-title>
+                <mat-panel-description>
+                    <label class="content-node-selector-demo-basic-label">
+                        My Files site will be hided from dropdown
+                    </label>
+                </mat-panel-description>
+            </mat-expansion-panel-header>
+
+            <div class="content-node-selector-demo-basic-table">
+                <adf-content-node-selector-panel
+                    [currentFolderId]="'-root-'"
+                    [dropdownHideMyFiles]="true">
+                </adf-content-node-selector-panel>
+            </div>
+        </mat-expansion-panel>
+        <mat-expansion-panel>
+            <mat-expansion-panel-header>
+                <mat-panel-title>
+                    <h2>Custom Site List</h2>
+                </mat-panel-title>
+                <mat-panel-description>
+                    <label class="content-node-selector-demo-basic-label">
+                        Adding a custom site list
+                    </label>
+                </mat-panel-description>
+            </mat-expansion-panel-header>
+
+            <div>
+                <mat-list>
+                    <h3 mat-subheader>Add Site</h3>
+                    <form class="content-node-selector-demo-example-form">
+                        <mat-form-field>
+                            <label>Site Guid</label>
+                            <input matInput [(ngModel)]="customSideGuid" [ngModelOptions]="{standalone: true}">
+                        </mat-form-field>
+
+                        <mat-form-field>
+                            <label>Site Title</label>
+                            <input matInput [(ngModel)]="customSideTitle" [ngModelOptions]="{standalone: true}">
+                        </mat-form-field>
+                    </form>
+                    <button mat-button color="primary" (click)="onClickAddSite()">Add</button>
+                    <button mat-button color="primary" (click)="onClickResetSite()">Reset</button>
+
+                    <mat-divider></mat-divider>
+                    <h3 mat-subheader>Custom Sites Added</h3>
+                    <mat-list-item *ngFor="let customSite of customSites.list.entries">
+                        <mat-icon mat-list-icon>shopping_basket</mat-icon>
+                        <h4 mat-line>{{customSite.entry.title}}</h4>
+                        <p mat-line> {{customSite.entry.guid}} </p>
+                    </mat-list-item>
+                </mat-list>
+            </div>
+
+
+            <div class="content-node-selector-demo-basic-table">
+                <adf-content-node-selector-panel
+                    [currentFolderId]="'-root-'"
+                    [dropdownSiteList]="customSites">
+                </adf-content-node-selector-panel>
+            </div>
+        </mat-expansion-panel>
+        <mat-expansion-panel>
+                <mat-expansion-panel-header>
+                    <mat-panel-title>
+                        <h2>Row Filtering</h2>
+                    </mat-panel-title>
+                    <mat-panel-description>
+                        <label class="content-node-selector-demo-basic-label">
+                            Will automatically filter the row on the list
+                        </label>
+                    </mat-panel-description>
+                </mat-expansion-panel-header>
+
+                <mat-slide-toggle color="primary" [(ngModel)]="showFiles" (click)="recreateRowFilterFunction()">
+                    Show Files
+                </mat-slide-toggle>
+                <mat-slide-toggle color="primary" [(ngModel)]="showFolders" (click)="recreateRowFilterFunction()">
+                    Slide Folders
+                </mat-slide-toggle>
+
+                <div class="content-node-selector-demo-basic-table">
+                    <adf-content-node-selector-panel
+                        [rowFilter]="rowFilterFunction"
+                        [currentFolderId]="'-root-'">
+                    </adf-content-node-selector-panel>
+                </div>
+        </mat-expansion-panel>
+        <mat-expansion-panel>
+                <mat-expansion-panel-header>
+                    <mat-panel-title>
+                        <h2>Custom Image Resolving</h2>
+                    </mat-panel-title>
+                    <mat-panel-description>
+                        <label class="content-node-selector-demo-basic-label">
+                            A function to manage the way folder/file icons and thumbnails are resolved
+                        </label>
+                    </mat-panel-description>
+                </mat-expansion-panel-header>
+
+                <mat-slide-toggle color="primary" (click)="recreateImageResolverFunction()">
+                    Add Custom Images Resolver
+                </mat-slide-toggle>
+
+                <div class="content-node-selector-demo-basic-table">
+                    <adf-content-node-selector-panel
+                        [imageResolver]="customImageResolver"
+                        [currentFolderId]="'-root-'">
+                    </adf-content-node-selector-panel>
+                </div>
+        </mat-expansion-panel>
+        <mat-expansion-panel>
+            <mat-expansion-panel-header>
+                <mat-panel-title>
+                    <h2>Set Page Size</h2>
+                </mat-panel-title>
+                <mat-panel-description>
+                    <label class="content-node-selector-demo-basic-label">
+                        Number of items shown per page in the list. actual page {{actualPageSize}}
+                    </label>
+                </mat-panel-description>
+            </mat-expansion-panel-header>
+            <div class="content-node-selector-demo-basic-table">
+                <adf-content-node-selector-panel
+                    [currentFolderId]="'-root-'"
+                    [pageSize]="actualPageSize"
+                    >
+                </adf-content-node-selector-panel>
+            </div>
+        </mat-expansion-panel>
+        <mat-expansion-panel>
+            <mat-expansion-panel-header>
+                <mat-panel-title>
+                    <h2>Is Valid Selection Function </h2>
+                </mat-panel-title>
+                <mat-panel-description>
+                    <label class="content-node-selector-demo-basic-label">
+                        Function used to decide if the selected node has permission to be selected
+                    </label>
+                </mat-panel-description>
+            </mat-expansion-panel-header>
+            <label>Only folder starting with the letter 'a' or 'A' are valid selections</label>
+            <label>Actual Selection is : {{validSelection}}</label>
+            <div class="content-node-selector-demo-basic-table">
+                <adf-content-node-selector-panel
+                    (select)="onNodeSelect($event)"
+                    [isSelectionValid]="customIsValidFunction"
+                    [currentFolderId]="'-root-'">
+                </adf-content-node-selector-panel>
+            </div>
+        </mat-expansion-panel>
+        <mat-expansion-panel>
+            <mat-expansion-panel-header>
+                <mat-panel-title>
+                    <h2>BreadCrumb Transform Function </h2>
+                </mat-panel-title>
+                <mat-panel-description>
+                    <label class="content-node-selector-demo-basic-label">
+                        Transformation to be performed on the chosen/folder node before building the breadcrumb UI
+                    </label>
+                </mat-panel-description>
+            </mat-expansion-panel-header>
+            <label>Folder starting with letter 'd' or 'D' won't be displayed in the breadcrumb dropdown</label>
+            <div class="content-node-selector-demo-basic-table">
+                <adf-content-node-selector-panel
+                    [breadcrumbTransform]="customBreadcrumbFunction"
+                    [currentFolderId]="'-root-'">
+                </adf-content-node-selector-panel>
+            </div>
+        </mat-expansion-panel>
+    </mat-accordion>
+</main>
diff --git a/demo-shell/src/app/components/content-node-selector/content-node-selector.component.scss b/demo-shell/src/app/components/content-node-selector/content-node-selector.component.scss
new file mode 100644
index 0000000000..17c04d8f4d
--- /dev/null
+++ b/demo-shell/src/app/components/content-node-selector/content-node-selector.component.scss
@@ -0,0 +1,27 @@
+.content-node-selector-demo {
+
+    &-main {
+        display: flex;
+        flex-direction: column;
+        justify-content: space-around;
+        align-content: center;
+        align-self: center;
+        align-items: center;
+    }
+
+    &-basic-table {
+        height:400px;
+        width:700px
+    }
+
+    &-basic-label {
+        display: flex;
+        align-self: center;
+    }
+
+    &-example-form {
+        display: flex;
+        flex-direction: column;
+        align-items: flex-start;
+    }
+}
diff --git a/demo-shell/src/app/components/content-node-selector/content-node-selector.component.ts b/demo-shell/src/app/components/content-node-selector/content-node-selector.component.ts
new file mode 100644
index 0000000000..d933b7fa3f
--- /dev/null
+++ b/demo-shell/src/app/components/content-node-selector/content-node-selector.component.ts
@@ -0,0 +1,115 @@
+/*!
+ * @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 { Component, ViewEncapsulation } from '@angular/core';
+import { SitePaging, SiteEntry, MinimalNodeEntryEntity } from 'alfresco-js-api';
+import { ShareDataRow } from '@alfresco/adf-content-services';
+import { DataRow, DataColumn, ThumbnailService } from '@alfresco/adf-core';
+
+@Component({
+    templateUrl: './content-node-selector.component.html',
+    styleUrls: [`./content-node-selector.component.scss`],
+    encapsulation: ViewEncapsulation.None
+})
+export class ContentNodeSelectorComponent {
+
+    constructor(private thumbnailService: ThumbnailService) {
+    }
+
+    dropdownHideMyFiles = false;
+    showFiles = false;
+    showFolders = false;
+    enableImageResolver = false;
+    validSelection = false;
+
+    customSideGuid = '';
+    customSideTitle = '';
+    actualPageSize = 2;
+
+    rowFilterFunction: any = null;
+    customImageResolver: any = null;
+
+    defaultSites: SiteEntry[] = [
+        { entry: { title: 'MINE', guid: '-my-' } },
+        { entry: { title: 'ROOTY', guid: '-root-' } }];
+
+    customSites: SitePaging = {
+        list: {
+            entries: [
+                { entry: { title: 'MINE', guid: '-my-' } },
+                { entry: { title: 'ROOTY', guid: '-root-' } }],
+            pagination: {}
+        }
+    };
+
+    onClickAddSite() {
+        const newSiteEntry: SiteEntry = { entry: { title: this.customSideTitle, guid: this.customSideGuid } };
+        this.customSites.list.entries.push(newSiteEntry);
+        this.customSideGuid = '';
+        this.customSideTitle = '';
+    }
+
+    onClickResetSite() {
+        this.customSites.list.entries = this.defaultSites;
+        this.customSideGuid = '';
+        this.customSideTitle = '';
+    }
+
+    recreateRowFilterFunction() {
+        this.rowFilterFunction = this.rowFilteringExample.bind(this);
+    }
+
+    recreateImageResolverFunction() {
+        this.enableImageResolver = !this.enableImageResolver;
+        if (this.enableImageResolver) {
+            this.customImageResolver = this.customImageResolverExample.bind(this);
+        } else {
+            this.customImageResolver = null;
+        }
+    }
+
+    rowFilteringExample(row: ShareDataRow) {
+        let showNode = true;
+        const node: MinimalNodeEntryEntity = row.node.entry;
+        if (this.showFiles) {
+            showNode = node.isFile;
+        }
+        if (this.showFolders) {
+            showNode = node.isFolder;
+        }
+        return showNode;
+    }
+
+    customImageResolverExample(row: DataRow, col: DataColumn) {
+        return this.thumbnailService.getMimeTypeIcon('video/quicktime');
+    }
+
+    onNodeSelect(node: MinimalNodeEntryEntity) {
+        this.validSelection = !!node;
+    }
+
+    customIsValidFunction(entry: MinimalNodeEntryEntity): boolean {
+        return entry.name.startsWith('a') || entry.name.startsWith('A');
+    }
+
+    customBreadcrumbFunction(node: MinimalNodeEntryEntity) {
+        if (node && node.path && node.path.elements) {
+            node.path.elements = node.path.elements.filter((element) => !element.name.toLocaleLowerCase().startsWith('d') ? element : null );
+        }
+        return node;
+    }
+}
diff --git a/demo-shell/src/app/components/datatable/datatable.component.html b/demo-shell/src/app/components/datatable/datatable.component.html
index efbbcc1a5d..4c74d33a91 100644
--- a/demo-shell/src/app/components/datatable/datatable.component.html
+++ b/demo-shell/src/app/components/datatable/datatable.component.html
@@ -1,5 +1,5 @@
 <mat-form-field>
-    <input matInput placeholder="Name filter" [(ngModel)]="data.filterValue">
+    <input id="adf-datatable-filter-input" matInput placeholder="Name filter" [(ngModel)]="data.filterValue">
 </mat-form-field>
 
 <adf-datatable
diff --git a/demo-shell/src/app/components/file-view/file-view.component.html b/demo-shell/src/app/components/file-view/file-view.component.html
index 1c3feb0e14..6ccc6ef9e1 100644
--- a/demo-shell/src/app/components/file-view/file-view.component.html
+++ b/demo-shell/src/app/components/file-view/file-view.component.html
@@ -2,12 +2,88 @@
 
     <ng-template let-node="node" #sidebarTemplate>
         <adf-info-drawer [title]="'APP.INFO_DRAWER.TITLE' | translate">
+
             <adf-info-drawer-tab [label]="'APP.INFO_DRAWER.COMMENTS' | translate">
                 <adf-comments [nodeId]="nodeId"></adf-comments>
             </adf-info-drawer-tab>
 
             <adf-info-drawer-tab [label]="'APP.INFO_DRAWER.PROPERTIES' | translate">
-                <adf-content-metadata-card [node]="node"></adf-content-metadata-card>
+                <adf-content-metadata-card *ngIf="isPreset" [node]="node"
+                                           [multi]="multi"
+                                           [preset]="customPreset"
+                                           [readOnly]="isReadOnly"
+                                           [displayDefaultProperties]="displayDefaultProperties"
+                                           [displayEmpty]="displayEmptyMetadata"></adf-content-metadata-card>
+
+                <adf-content-metadata-card *ngIf="!isPreset" [node]="node"
+                                           [multi]="multi"
+                                           [readOnly]="isReadOnly"
+                                           [displayDefaultProperties]="displayDefaultProperties"
+                                           [displayEmpty]="displayEmptyMetadata"></adf-content-metadata-card>
+
+                <p class="toggle">
+                    <mat-slide-toggle
+                        id="adf-metadata-default-properties"
+                        [color]="'primary'"
+                        (change)="toggleDisplayProperties()"
+                        [checked]="displayDefaultProperties">
+                        Display Default Properties
+                    </mat-slide-toggle>
+                </p>
+
+                <p class="toggle">
+                    <mat-slide-toggle
+                        id="adf-metadata-empty"
+                        [color]="'primary'"
+                        (change)="toggleEmptyMetadata()"
+                        [checked]="displayEmptyMetadata">
+                        Display Empty Metadata
+                    </mat-slide-toggle>
+                </p>
+
+                <p class="toggle">
+                    <mat-slide-toggle
+                        id="adf-metadata-multi"
+                        [color]="'primary'"
+                        (change)="toggleMulti()"
+                        [checked]="multi">
+                        multi accordion
+                    </mat-slide-toggle>
+                </p>
+
+                <p class="toggle">
+                    <mat-slide-toggle
+                        id="adf-metadata-readonly"
+                        [color]="'primary'"
+                        (change)="toggleReadOnly()"
+                        [checked]="isReadOnly">
+                        Editable
+                    </mat-slide-toggle>
+                </p>
+
+                <p class="toggle">
+                    <mat-slide-toggle
+                        id="adf-toggle-custom-preset"
+                        [color]="'primary'"
+                        (change)="togglePreset()"
+                        [checked]="isPreset">
+                        Custom preset
+                    </mat-slide-toggle>
+                </p>
+                <p class="toggle">
+                    <ng-container *ngIf="isPreset">
+                        <mat-form-field floatPlaceholder="float">
+                            <input matInput
+                                   placeholder="Custom Preset"
+                                   [(ngModel)]="customPreset"
+                                   data-automation-id="adf-text-custom-preset">
+                        </mat-form-field>
+
+                        <button  mat-raised-button  id="adf-metadata-aplly" (click)="applyCustomPreset()" color="primary">Apply</button>
+
+                    </ng-container>
+                </p>
+
             </adf-info-drawer-tab>
 
             <adf-info-drawer-tab [label]="'APP.INFO_DRAWER.VERSIONS' | translate">
diff --git a/demo-shell/src/app/components/file-view/file-view.component.ts b/demo-shell/src/app/components/file-view/file-view.component.ts
index 1d31827592..0d9f2a1ff5 100644
--- a/demo-shell/src/app/components/file-view/file-view.component.ts
+++ b/demo-shell/src/app/components/file-view/file-view.component.ts
@@ -29,6 +29,13 @@ import { MatSnackBar } from '@angular/material';
 export class FileViewComponent implements OnInit {
 
     nodeId: string = null;
+    displayEmptyMetadata = false;
+    expanded: boolean;
+    multi = false;
+    isReadOnly = false;
+    isPreset = false;
+    customPreset: string = null;
+    displayDefaultProperties = true;
 
     constructor(private router: Router,
                 private route: ActivatedRoute,
@@ -58,4 +65,34 @@ export class FileViewComponent implements OnInit {
     onUploadError(errorMessage: string) {
         this.snackBar.open(errorMessage, '', { duration: 4000 });
     }
+
+    toggleEmptyMetadata() {
+        this.displayEmptyMetadata = !this.displayEmptyMetadata;
+    }
+
+    toggleMulti() {
+        this.multi = !this.multi;
+    }
+
+    toggleReadOnly() {
+        this.isReadOnly = !this.isReadOnly;
+    }
+
+    toggleDisplayProperties() {
+        this.displayDefaultProperties = !this.displayDefaultProperties;
+    }
+
+    togglePreset() {
+        this.isPreset = !this.isPreset;
+        if (!this.isPreset) {
+            this.customPreset = null;
+        }
+    }
+
+    applyCustomPreset() {
+        this.isPreset = false;
+        setTimeout(() => {
+            this.isPreset = true;
+        }, 100);
+    }
 }
diff --git a/demo-shell/src/app/components/file-view/file-view.module.ts b/demo-shell/src/app/components/file-view/file-view.module.ts
new file mode 100644
index 0000000000..324da89eb7
--- /dev/null
+++ b/demo-shell/src/app/components/file-view/file-view.module.ts
@@ -0,0 +1,47 @@
+/*!
+ * @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 { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { Routes, RouterModule } from '@angular/router';
+import { CoreModule, InfoDrawerModule } from '@alfresco/adf-core';
+import { ContentDirectiveModule, VersionManagerModule, ContentMetadataModule } from '@alfresco/adf-content-services';
+import { FileViewComponent } from './file-view.component';
+
+const routes: Routes = [
+    {
+        path: '',
+        component: FileViewComponent
+    }
+];
+
+@NgModule({
+    imports: [
+        CommonModule,
+        RouterModule.forChild(routes),
+        CoreModule.forChild(),
+        InfoDrawerModule,
+        ContentDirectiveModule,
+        ContentMetadataModule,
+        VersionManagerModule
+    ],
+    declarations: [FileViewComponent],
+    exports: [FileViewComponent]
+})
+export class FileViewModule {
+
+}
diff --git a/demo-shell/src/app/components/files/files.component.html b/demo-shell/src/app/components/files/files.component.html
index f78c771ba2..621b04f049 100644
--- a/demo-shell/src/app/components/files/files.component.html
+++ b/demo-shell/src/app/components/files/files.component.html
@@ -33,7 +33,7 @@
         </adf-sites-dropdown>
     </div>
 
-    <div class="document-list-container" fxLayout="row" fxLayoutAlign="start stretch" fxLayoutGap="16px">
+    <div id="document-list-container" class="document-list-container" fxLayout="row" fxLayoutAlign="start stretch" fxLayoutGap="16px">
         <adf-upload-drag-area fxFlex="1 1 auto"
                               [disabled]="disableDragArea"
                               [acceptedFilesType]="getFileFiltering()"
@@ -68,6 +68,7 @@
                 <div fxFlex="0 0 auto" class="adf-document-action-buttons" fxShow fxHide.lt-sm="true">
                     <button
                         mat-icon-button
+                        data-automation-id="document-list-grid-view"
                         title="{{ 'DOCUMENT_LIST.TOOLBAR.CARDVIEW' | translate }}"
                         (click)="toogleGalleryView()">
                         <mat-icon *ngIf="displayMode === 'list'" matTooltip="{{ 'DOCUMENT_LIST.TOOLBAR.CARDVIEW' | translate }}">view_comfy</mat-icon>
@@ -78,6 +79,7 @@
                         [disabled]="!canCreateContent(documentList.folderNode)"
                         title="{{ 'DOCUMENT_LIST.TOOLBAR.NEW_FOLDER' | translate }}"
                         (error)="openSnackMessage($event)"
+                        (success)="documentList.reload()"
                         [adf-create-folder]="getDocumentListCurrentFolderId()"
                         matTooltip="{{ 'DOCUMENT_LIST.TOOLBAR.NEW_FOLDER' | translate }}">
                         <mat-icon>create_new_folder</mat-icon>
@@ -87,6 +89,7 @@
                             title="{{ 'DOCUMENT_LIST.TOOLBAR.EDIT_FOLDER' | translate }}"
                             (error)="openSnackMessage($event)"
                             [adf-edit-folder]="documentList.selection[0]?.entry"
+                            (success)="documentList.reload()"
                             matTooltip="{{ 'DOCUMENT_LIST.TOOLBAR.EDIT_FOLDER' | translate }}">
                         <mat-icon>create</mat-icon>
                     </button>
@@ -116,7 +119,7 @@
                         </mat-icon>
                     </button>
                     <button mat-icon-button
-                            [disabled]="!documentList.selection.length"
+                            disabled
                             [baseShareUrl]="baseShareUrl"
                             [adf-share]="documentList.selection[0]"
                             matTooltip="{{ 'DOCUMENT_LIST.TOOLBAR.SHARE' | translate }}">
@@ -207,6 +210,11 @@
                 (preview)="showFile($event)"
                 (folderChange)="onFolderChange($event)"
                 (permissionError)="handlePermissionError($event)">
+                <no-permission-content *ngIf="enableCustomPermissionMessage">
+                    <ng-template>
+                    <h1>Cris you don't have permissions</h1>
+                    </ng-template>
+                </no-permission-content>
                 <empty-folder-content *ngIf="disableDragArea">
                     <ng-template>
                         <div class="adf-empty_template">
@@ -273,7 +281,7 @@
                         title="{{'DOCUMENT_LIST.COLUMNS.CREATED' | translate}}"
                         key="createdAt"
                         type="date"
-                        format="timeAgo"
+                        [format]="enableMediumTimeFormat ? 'medium' : 'timeAgo'"
                         class="desktop-only">
                     </data-column>
 
@@ -337,6 +345,13 @@
                         title="DOCUMENT_LIST.ACTIONS.METADATA"
                         (execute)="onManageMetadata($event)">
                     </content-action>
+                    <content-action
+                        icon="settings_input_component"
+                        title="DOCUMENT_LIST.ACTIONS.PERMISSION"
+                        permission="copy"
+                        (error)="onContentActionError($event)"
+                        (execute)="onPermissionRequested($event)">
+                    </content-action>
                     <!-- document actions -->
                     <content-action
                         icon="storage"
@@ -345,6 +360,7 @@
                         (execute)="onManageVersions($event)">
                     </content-action>
                     <content-action
+                        target="document" 
                         *ngIf="authenticationService.isBpmLoggedIn()"
                         icon="play_arrow"
                         target="document" 
@@ -352,13 +368,7 @@
                         (execute)="startProcesAction($event)">
                     </content-action>
                     <content-action
-                        icon="settings_input_component"
-                        title="DOCUMENT_LIST.ACTIONS.PERMISSION"
-                        permission="copy"
-                        (error)="onContentActionError($event)"
-                        (execute)="onPermissionRequested($event)">
-                    </content-action>
-                    <content-action
+                        target="document" 
                         icon="lock"
                         permission="lock"
                         handler="lock"
@@ -371,7 +381,6 @@
                 *ngIf="!infiniteScrolling"
                 class="adf-documentlist-pagination"
                 [target]="documentList"
-                [supportedPageSizes]="supportedPages"
                 (changePageSize)="onChangePageSize($event)"
                 (changePageNumber)="onChangePageNumber($event)"
                 (nextPage)="onNextPage($event)"
@@ -388,7 +397,7 @@
         <adf-info-drawer-layout *ngIf="showVersions" class="adf-manage-versions-sidebar" fxFlex="0 0 auto">
             <div info-drawer-content>
 
-                <adf-info-drawer [title]="'Details'">
+                <adf-info-drawer [title]="'Details'"  *ngIf="documentList.selection[0]" >
                     <adf-info-drawer-tab [label]="'Properties'">
                         <adf-content-metadata-card
                             [node]="documentList.selection[0].entry">
@@ -428,7 +437,9 @@
 <div *ngIf="processId">
     <adf-start-process
         [values]="formValues"
-        [appId]="processId">
+        [appId]="processId"
+        (start)="closeStartProcess()"
+        (cancel)="closeStartProcess()">
     </adf-start-process>
 </div>
 
@@ -483,7 +494,7 @@
         </section>
 
         <section>
-            <mat-slide-toggle [color]="'primary'" (click)="toggleThumbnails()" >{{'DOCUMENT_LIST.THUMBNAILS' |
+            <mat-slide-toggle [color]="'primary'" (click)="toggleThumbnails()" id="enableThumbnails">{{'DOCUMENT_LIST.THUMBNAILS' |
                 translate}}
             </mat-slide-toggle>
         </section>
@@ -518,6 +529,18 @@
             </mat-slide-toggle>
         </section>
 
+        <section>
+            <mat-slide-toggle color="primary" [(ngModel)]="enableCustomPermissionMessage">
+                {{'APP.CUSTOM-PERMISSION-MESSAGE' | translate}}
+            </mat-slide-toggle>
+        </section>
+
+        <section>
+            <mat-slide-toggle color="primary" [(ngModel)]="enableMediumTimeFormat" id="enableMediumTimeFormat">
+                {{'APP.MEDIUM-TIME-FORMAT' | translate}}
+            </mat-slide-toggle>
+        </section>
+
         <h5>Upload</h5>
         <section *ngIf="acceptedFilesTypeShow">
             <mat-form-field floatPlaceholder="float">
@@ -569,7 +592,7 @@
             </adf-upload-button>
         </div>
         <section>
-            <mat-checkbox [(ngModel)]="enableUpload">
+            <mat-checkbox id="adf-disable-upload" [(ngModel)]="enableUpload">
                 {{'DOCUMENT_LIST.DESCRIPTION_UPLOAD' | translate}}
             </mat-checkbox>
         </section>
diff --git a/demo-shell/src/app/components/files/files.component.ts b/demo-shell/src/app/components/files/files.component.ts
index 98aa999462..27d4177fc7 100644
--- a/demo-shell/src/app/components/files/files.component.ts
+++ b/demo-shell/src/app/components/files/files.component.ts
@@ -25,20 +25,26 @@ import { MatDialog } from '@angular/material';
 import { ActivatedRoute, Params, Router } from '@angular/router';
 import { MinimalNodeEntity, NodePaging, Pagination, MinimalNodeEntryEntity, SiteEntry } from 'alfresco-js-api';
 import {
-    AuthenticationService, AppConfigService, AppConfigValues, ContentService, TranslationService,
+    AlfrescoApiService, AuthenticationService, AppConfigService, AppConfigValues, ContentService, TranslationService,
     FileUploadEvent, FolderCreatedEvent, LogService, NotificationService,
     UploadService, DataColumn, DataRow, UserPreferencesService,
-    PaginationComponent, FormValues, DisplayMode, UserPreferenceValues, InfinitePaginationComponent
+    PaginationComponent, FormValues, DisplayMode, InfinitePaginationComponent
 } from '@alfresco/adf-core';
 
-import { DocumentListComponent, PermissionStyleModel, UploadFilesEvent, ConfirmDialogComponent } from '@alfresco/adf-content-services';
+import {
+    DocumentListComponent,
+    PermissionStyleModel,
+    UploadFilesEvent,
+    ConfirmDialogComponent
+} from '@alfresco/adf-content-services';
 
 import { SelectAppsDialogComponent } from '@alfresco/adf-process-services';
 
 import { VersionManagerDialogAdapterComponent } from './version-manager-dialog-adapter.component';
 import { MetadataDialogAdapterComponent } from './metadata-dialog-adapter.component';
-import { Subscription } from 'rxjs/Subscription';
+import { Subscription } from 'rxjs';
 import { PreviewService } from '../../services/preview.service';
+import { debounceTime } from 'rxjs/operators';
 
 const DEFAULT_FOLDER_TO_SHOW = '-my-';
 
@@ -172,10 +178,11 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
 
     permissionsStyle: PermissionStyleModel[] = [];
     infiniteScrolling: boolean;
-    supportedPages: number[];
     currentSiteid = '';
     warnOnMultipleUploads = false;
     thumbnails = false;
+    enableCustomPermissionMessage = false;
+    enableMediumTimeFormat = false;
 
     private onCreateFolder: Subscription;
     private onEditFolder: Subscription;
@@ -192,11 +199,12 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
                 private preference: UserPreferencesService,
                 private preview: PreviewService,
                 @Optional() private route: ActivatedRoute,
-                public authenticationService: AuthenticationService) {
-        this.preference.select(UserPreferenceValues.SupportedPageSizes)
-            .subscribe((pages) => {
-                this.supportedPages = pages;
-            });
+                public authenticationService: AuthenticationService,
+                public alfrescoApiService: AlfrescoApiService) {
+
+        this.alfrescoApiService.nodeUpdated.subscribe(() => {
+            this.documentList.reload();
+        });
     }
 
     showFile(event) {
@@ -238,12 +246,13 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
         }
 
         // this.disableDragArea = false;
-        this.uploadService.fileUploadComplete.asObservable().debounceTime(300).subscribe(value => this.onFileUploadEvent(value));
+        this.uploadService.fileUploadComplete.asObservable()
+            .pipe(debounceTime(300))
+            .subscribe(value => this.onFileUploadEvent(value));
         this.uploadService.fileUploadDeleted.subscribe((value) => this.onFileUploadEvent(value));
         this.contentService.folderCreated.subscribe(value => this.onFolderCreated(value));
         this.onCreateFolder = this.contentService.folderCreate.subscribe(value => this.onFolderAction(value));
         this.onEditFolder = this.contentService.folderEdit.subscribe(value => this.onFolderAction(value));
-        this.supportedPages = this.supportedPages ? this.supportedPages : this.preference.getDefaultPageSizes();
 
         // this.permissionsStyle.push(new PermissionStyleModel('document-list__create', PermissionsEnum.CREATE));
         // this.permissionsStyle.push(new PermissionStyleModel('document-list__disable', PermissionsEnum.NOT_CREATE, false, true));
@@ -362,13 +371,13 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
     onContentActionSuccess(message) {
         const translatedMessage: any = this.translateService.get(message);
         this.openSnackMessage(translatedMessage.value);
-        this.reloadForInfiniteScrolling();
+        this.documentList.reload();
     }
 
     onDeleteActionSuccess(message) {
         this.uploadService.fileDeleted.next(message);
         this.deleteElementSuccess.emit();
-        this.reloadForInfiniteScrolling();
+        this.documentList.reload();
         this.openSnackMessage(message);
     }
 
@@ -376,10 +385,6 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
         this.router.navigate(['/permissions', node.value.entry.id]);
     }
 
-    private reloadForInfiniteScrolling() {
-        this.documentList.reload();
-    }
-
     onManageVersions(event) {
         const contentEntry = event.value.entry;
         const showComments = this.showVersionComments;
@@ -474,6 +479,10 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
 
     }
 
+    closeStartProcess() {
+        this.processId = null;
+    }
+
     onChangePageSize(event: Pagination): void {
         this.preference.paginationSize = event.maxItems;
         this.changedPageSize.emit(event);
@@ -508,7 +517,7 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
     onInfiniteScrolling(): void {
         this.infiniteScrolling = !this.infiniteScrolling;
         this.infinitePaginationComponent.reset();
-        this.reloadForInfiniteScrolling();
+        this.documentList.reload();
     }
 
     canDownloadNode = (node: MinimalNodeEntity): boolean => {
diff --git a/demo-shell/src/app/components/files/version-manager-dialog-adapter.component.html b/demo-shell/src/app/components/files/version-manager-dialog-adapter.component.html
index 910205d1c6..5284e4f212 100644
--- a/demo-shell/src/app/components/files/version-manager-dialog-adapter.component.html
+++ b/demo-shell/src/app/components/files/version-manager-dialog-adapter.component.html
@@ -1,11 +1,23 @@
 <header mat-dialog-title>{{'VERSION.DIALOG.TITLE' | translate}}</header>
 
 <section>
-    <mat-slide-toggle color="primary" [(ngModel)]="readOnly">
+    <mat-slide-toggle id="adf-version-manager-switch-readonly" color="primary" [(ngModel)]="readOnly">
         {{'APP.ADF_VERSION_MANAGER.READ_ONLY' | translate}}
     </mat-slide-toggle>
 </section>
 
+<section>
+    <mat-slide-toggle id="adf-version-manager-switch-download"color="primary" [(ngModel)]="allowDownload">
+        {{'APP.ADF_VERSION_MANAGER.ALLOW_DOWNLOAD' | translate}}
+    </mat-slide-toggle>
+</section>
+
+<section>
+    <mat-slide-toggle id="adf-version-manager-switch-comments" color="primary" [(ngModel)]="showComments">
+        {{'APP.ADF_VERSION_MANAGER.COMMENTS' | translate}}
+    </mat-slide-toggle>
+</section>
+
 <section mat-dialog-content *ngIf="!readOnly">
     <adf-version-manager [node]="contentEntry" [allowDownload]="allowDownload" [showComments]="showComments" (uploadError)="uploadError($event)"></adf-version-manager>
 </section>
diff --git a/demo-shell/src/app/components/form/demo-form.ts b/demo-shell/src/app/components/form/demo-form.ts
index 5349303a93..b024bcc3ca 100644
--- a/demo-shell/src/app/components/form/demo-form.ts
+++ b/demo-shell/src/app/components/form/demo-form.ts
@@ -1,3 +1,20 @@
+/*!
+ * @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.
+ */
+
 /*!
  * @license
  * Copyright 2016 Alfresco Software, Ltd.
@@ -1214,7 +1231,7 @@ export class DemoForm {
                                 'readOnly': false,
                                 'overrideId': false,
                                 'colspan': 1,
-                                'placeholder': null,
+                                'placeholder': '10',
                                 'minLength': 0,
                                 'maxLength': 0,
                                 'minValue': null,
diff --git a/demo-shell/src/app/components/form/fake-form.service.ts b/demo-shell/src/app/components/form/fake-form.service.ts
index 5825b5981e..9afa3fbd8e 100644
--- a/demo-shell/src/app/components/form/fake-form.service.ts
+++ b/demo-shell/src/app/components/form/fake-form.service.ts
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-import { Observable } from 'rxjs/Observable';
+import { Observable, of } from 'rxjs';
 import { Injectable } from '@angular/core';
 import {
     AppConfigService, AlfrescoApiService, EcmModelService, LogService, FormService, FormOutcomeEvent
 } from '@alfresco/adf-core';
-import { Subject } from 'rxjs/Subject';
+import { Subject } from 'rxjs';
 
 @Injectable()
 export class FakeFormService extends FormService {
@@ -36,7 +36,7 @@ export class FakeFormService extends FormService {
 
     public getRestFieldValues(taskId: string, fieldId: string): Observable<any> {
         if (fieldId === 'typeahedField') {
-            return Observable.of([
+            return of([
                 { 'id': '1', 'name': 'Leanne Graham' },
                 { 'id': '2', 'name': 'Ervin Howell' },
                 { 'id': '3', 'name': 'Clementine Bauch' },
diff --git a/demo-shell/src/app/components/form/form.component.ts b/demo-shell/src/app/components/form/form.component.ts
index 25a0233e68..d24e29dddf 100644
--- a/demo-shell/src/app/components/form/form.component.ts
+++ b/demo-shell/src/app/components/form/form.component.ts
@@ -1,3 +1,20 @@
+/*!
+ * @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.
+ */
+
 /*!
 * @license
 * Copyright 2016 Alfresco Software, Ltd.
@@ -15,7 +32,7 @@
 * limitations under the License.
 */
 
-import { Component, Inject, OnInit } from '@angular/core';
+import { Component, Inject, OnInit, ViewEncapsulation } from '@angular/core';
 import { FormModel, FormService, FormOutcomeEvent } from '@alfresco/adf-core';
 import { InMemoryFormService } from '../../services/in-memory-form.service';
 import { DemoForm } from './demo-form';
@@ -26,7 +43,8 @@ import { DemoForm } from './demo-form';
     styleUrls: ['form.component.css'],
     providers: [
         { provide: FormService, useClass: InMemoryFormService }
-    ]
+    ],
+    encapsulation: ViewEncapsulation.None
 })
 export class FormComponent implements OnInit {
 
diff --git a/demo-shell/src/app/components/header-data/header-data.component.html b/demo-shell/src/app/components/header-data/header-data.component.html
new file mode 100644
index 0000000000..e6978a4fe1
--- /dev/null
+++ b/demo-shell/src/app/components/header-data/header-data.component.html
@@ -0,0 +1,46 @@
+<div class="content header-data">
+    <h1>Header data</h1>
+    <mat-card>
+        <div>
+            <mat-checkbox [(ngModel)]="checkbox" (change)="hideButton()">Show menu button</mat-checkbox>
+        </div>
+
+        <div>
+            <label>Choose header color</label>
+            <select (change)="changeColor($event.target.value)">
+                <option value="primary">Primary</option>
+                <option value="accent">Accent</option>
+                <option value="warn">Warn</option>
+            </select>
+            OR
+            <input type="text" name="color" (keyup.enter)="changeColor($event.target.value)" placeholder="hex color code">
+            <p>*Choose only one value at a time: either hex code or theme color.</p>
+            <p>*press enter for submitting new hex color</p>
+        </div>
+
+        <div>
+            <label>Change title</label>
+            <input type="text" name="title" (keyup.enter)="submitTitle($event.target.value)" placeholder ="{{ 'APP_LAYOUT.APP_NAME' | translate}}">
+            <p>*press enter for submitting new title</p>
+        </div>
+
+        <div>
+            <label>Change logo</label>
+            <input type="text" placeholder="URL path" (keyup.enter)="submitLogo($event.target.value)" >
+            <p>*press enter for submitting new logo</p>
+        </div>
+
+        <div>
+            <label>Change logo link</label>
+            <input type="url" placeholder="Redirect URL" (keyup.enter)="submitRedirectUrl($event.target.value)" >
+            <p>*Input JSON friendly array or explicit string. E.g. ["/test", 33, "user", 11] or "/test"</p>
+            <p>*press enter for submitting new link on logo</p>
+        </div>
+
+        <div>
+            <label>Change logo tooltip</label>
+            <input type="text" placeholder="Tooltip text" (keyup.enter)="submitTooltip($event.target.value)" >
+            <p>*press enter for submitting new tooltip</p>
+        </div>
+    </mat-card>
+</div>
diff --git a/demo-shell/src/app/components/header-data/header-data.component.scss b/demo-shell/src/app/components/header-data/header-data.component.scss
new file mode 100644
index 0000000000..e01a19d89b
--- /dev/null
+++ b/demo-shell/src/app/components/header-data/header-data.component.scss
@@ -0,0 +1,28 @@
+.content {
+    padding: 10px;
+    .mat-card {
+        padding: 16px 24px;
+        max-width: 100% !important;
+        max-height: 100% !important;
+
+        div {
+            padding: 0;
+            margin-bottom: 30px;
+
+            label {
+                font-weight: bold;
+            }
+
+            .mat-form-field, input, select {
+                display: block;
+                width: 100%;
+                height: 30px;
+                margin-bottom: 5px;
+            }
+
+            p {
+                margin: 0 0 5px 0;
+            }
+        }
+    }
+}
diff --git a/demo-shell/src/app/components/header-data/header-data.component.ts b/demo-shell/src/app/components/header-data/header-data.component.ts
new file mode 100644
index 0000000000..51feb7ea62
--- /dev/null
+++ b/demo-shell/src/app/components/header-data/header-data.component.ts
@@ -0,0 +1,62 @@
+/*!
+ * @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 { Component } from '@angular/core';
+import { HeaderDataService } from './header-data.service';
+
+@Component({
+    templateUrl: './header-data.component.html',
+    styleUrls: ['./header-data.component.scss']
+})
+export class HeaderDataComponent {
+    checkbox = true;
+
+    constructor(private headerService: HeaderDataService) {}
+
+    hideButton() {
+        this.headerService.hideMenuButton();
+    }
+
+    changeColor(color: string) {
+        this.headerService.changeColor(color);
+    }
+
+    submitTitle(title: string) {
+        if (title) {
+            this.headerService.changeTitle(title);
+        }
+    }
+
+    submitLogo(logoPath: string) {
+        if (logoPath) {
+            this.headerService.changeLogo(logoPath);
+        }
+    }
+
+    submitRedirectUrl(value: string) {
+        const redirectUrl = JSON.parse(value);
+        if (redirectUrl) {
+            this.headerService.changeRedirectUrl(redirectUrl);
+        }
+    }
+
+    submitTooltip(tooltip: string) {
+        if (tooltip) {
+            this.headerService.changeTooltip(tooltip);
+        }
+    }
+}
diff --git a/demo-shell/src/app/components/header-data/header-data.service.ts b/demo-shell/src/app/components/header-data/header-data.service.ts
new file mode 100644
index 0000000000..dd22005510
--- /dev/null
+++ b/demo-shell/src/app/components/header-data/header-data.service.ts
@@ -0,0 +1,58 @@
+/*!
+ * @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 { Injectable, Output, EventEmitter } from '@angular/core';
+
+
+@Injectable()
+export class HeaderDataService {
+
+  show = true;
+
+  @Output() hideMenu: EventEmitter<boolean> = new EventEmitter();
+  @Output() color: EventEmitter<string> = new EventEmitter();
+  @Output() title: EventEmitter<string> = new EventEmitter();
+  @Output() logo: EventEmitter<string> = new EventEmitter();
+  @Output() redirectUrl: EventEmitter<string|any[]> = new EventEmitter();
+  @Output() tooltip: EventEmitter<string> = new EventEmitter();
+
+  hideMenuButton() {
+    this.show = !this.show;
+    this.hideMenu.emit(this.show);
+  }
+
+  changeColor(color: string) {
+    this.color.emit(color);
+  }
+
+  changeTitle(title: string) {
+    this.title.emit(title);
+
+  }
+
+  changeLogo(logoPath: string) {
+    this.logo.emit(logoPath);
+  }
+
+  changeRedirectUrl(redirectUrl: string | any[]) {
+    this.redirectUrl.emit(redirectUrl);
+  }
+
+  changeTooltip(tooltip: string) {
+    this.tooltip.emit(tooltip);
+  }
+}
diff --git a/demo-shell/src/app/components/lazy-loading/lazy-loading.component.ts b/demo-shell/src/app/components/lazy-loading/lazy-loading.component.ts
index a045b12ae5..0cbb6f185e 100644
--- a/demo-shell/src/app/components/lazy-loading/lazy-loading.component.ts
+++ b/demo-shell/src/app/components/lazy-loading/lazy-loading.component.ts
@@ -1,3 +1,20 @@
+/*!
+ * @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 { Component } from '@angular/core';
 import { ObjectDataTableAdapter, AuthenticationService } from '@alfresco/adf-core';
 
diff --git a/demo-shell/src/app/components/lazy-loading/lazy-loading.module.ts b/demo-shell/src/app/components/lazy-loading/lazy-loading.module.ts
index f35c0f5f3e..b73995fcf1 100644
--- a/demo-shell/src/app/components/lazy-loading/lazy-loading.module.ts
+++ b/demo-shell/src/app/components/lazy-loading/lazy-loading.module.ts
@@ -1,3 +1,20 @@
+/*!
+ * @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 { NgModule } from '@angular/core';
 import { CoreModule, TranslationService } from '@alfresco/adf-core';
 
diff --git a/demo-shell/src/app/components/lazy-loading/lazy-loading.routes.ts b/demo-shell/src/app/components/lazy-loading/lazy-loading.routes.ts
index 824a649b71..9ac14f2e31 100644
--- a/demo-shell/src/app/components/lazy-loading/lazy-loading.routes.ts
+++ b/demo-shell/src/app/components/lazy-loading/lazy-loading.routes.ts
@@ -1,3 +1,20 @@
+/*!
+ * @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 { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { LazyLoadingComponent } from './lazy-loading.component';
diff --git a/demo-shell/src/app/components/login/login.component.html b/demo-shell/src/app/components/login/login.component.html
index c35993cc39..721ad9cd9a 100644
--- a/demo-shell/src/app/components/login/login.component.html
+++ b/demo-shell/src/app/components/login/login.component.html
@@ -19,6 +19,55 @@
             {{ 'LOGIN.LOGIN_FOOTER'| translate }}
         </mat-slide-toggle>
     </p>
+    <p class="toggle">
+        <mat-slide-toggle
+            id="adf-toogle-show-rememberme"
+            [color]="'primary'"
+            (change)="toggleRemamberme()"
+            [checked]="showRememberMe">
+            {{ 'LOGIN.SHOW_REMEMBERME'| translate }}
+        </mat-slide-toggle>
+    </p>
+    <p class="toggle">
+        <mat-slide-toggle
+            id="adf-toogle-show-successRoute"
+            [color]="'primary'"
+            (change)="toggleSuccessRoute()"
+            [checked]="customSuccessRoute">
+            {{ 'LOGIN.SHOW_SUCCESS_ROUTE'| translate }}
+        </mat-slide-toggle>
+    </p>
+    <p class="toggle">
+        <ng-container *ngIf="customSuccessRoute">
+            <mat-form-field floatPlaceholder="float">
+                <input matInput
+                       placeholder="Custom success route"
+                       [(ngModel)]="customSuccessRouteURI"
+                       data-automation-id="adf-success-route">
+            </mat-form-field>
+        </ng-container>
+    </p>
+
+    <p class="toggle">
+        <mat-slide-toggle
+            id="adf-toogle-logo"
+            [color]="'primary'"
+            (change)="toggleLogo()"
+            [checked]="customLogoImage">
+            {{ 'LOGIN.CUSTOM_LOGO'| translate }}
+        </mat-slide-toggle>
+    </p>
+    <p class="toggle">
+        <ng-container *ngIf="customLogoImage">
+            <mat-form-field floatPlaceholder="float">
+                <input matInput
+                       placeholder="Custom success Logo URL"
+                       [(ngModel)]="customLogoImageURL"
+                       data-automation-id="adf-url-logo">
+            </mat-form-field>
+        </ng-container>
+    </p>
+
 </div>
 
 <!--SETTING BUTTON-->
@@ -29,10 +78,12 @@
 
 <adf-login
     #alfrescologin
+    [successRoute]="customSuccessRouteURI"
+    [logoImageUrl]="customLogoImageURL"
     [fieldsValidation]="customValidation"
     [disableCsrf]="disableCsrf"
     [showLoginActions]="showFooter"
-    [showRememberMe]="showFooter"
+    [showRememberMe]="showFooter && showRememberMe"
     (executeSubmit)="checkForm($event)"
     copyrightText="{{ 'application.copyright' | adfAppConfig }}"
     (success)="onLogin($event)"
@@ -56,7 +107,9 @@
                 {{ 'LOGIN.LOGIN_FOOTER'| translate }}
             </mat-slide-toggle>
         </p>
-        <button type="button" mat-raised-button color="accent" class="mobile-setting-button" routerLink="/settings" data-automation-id="settings">{{ 'APP_LAYOUT.SETTINGS'| translate }}</button>
+        <button type="button" mat-raised-button color="accent" class="mobile-setting-button" routerLink="/settings"
+                data-automation-id="settings">{{ 'APP_LAYOUT.SETTINGS'| translate }}
+        </button>
 
     </div>
 </adf-login>
diff --git a/demo-shell/src/app/components/login/login.component.ts b/demo-shell/src/app/components/login/login.component.ts
index 909cacdc99..c8cbbbd0a1 100644
--- a/demo-shell/src/app/components/login/login.component.ts
+++ b/demo-shell/src/app/components/login/login.component.ts
@@ -31,9 +31,14 @@ export class LoginComponent implements OnInit {
     alfrescologin: any;
 
     customValidation: any;
+    customSuccessRouteURI = '';
+    customLogoImageURL = './assets/images/alfresco-logo.svg';
 
     disableCsrf = false;
     showFooter = true;
+    showRememberMe = true;
+    customSuccessRoute = false;
+    customLogoImage = false;
     customMinLength = 2;
 
     constructor(private router: Router,
@@ -46,7 +51,7 @@ export class LoginComponent implements OnInit {
 
     ngOnInit() {
         this.alfrescologin.addCustomValidationError('username', 'required', 'LOGIN.MESSAGES.USERNAME-REQUIRED');
-        this.alfrescologin.addCustomValidationError('username', 'minlength', 'LOGIN.MESSAGES.USERNAME-MIN', {minLength: this.customMinLength});
+        this.alfrescologin.addCustomValidationError('username', 'minlength', 'LOGIN.MESSAGES.USERNAME-MIN', { minLength: this.customMinLength });
         this.alfrescologin.addCustomValidationError('password', 'required', 'LOGIN.MESSAGES.PASSWORD-REQUIRED');
     }
 
@@ -66,6 +71,24 @@ export class LoginComponent implements OnInit {
         this.showFooter = !this.showFooter;
     }
 
+    toggleRemamberme() {
+        this.showRememberMe = !this.showRememberMe;
+    }
+
+    toggleSuccessRoute() {
+        this.customSuccessRoute = !this.customSuccessRoute;
+        if (!this.customSuccessRoute) {
+            this.customSuccessRouteURI = null;
+        }
+    }
+
+    toggleLogo() {
+        this.customLogoImage = !this.customLogoImage;
+        if (!this.customLogoImage) {
+            this.customLogoImageURL = null;
+        }
+    }
+
     checkForm(event: any) {
         const values = event.values;
         this.logService.log(values);
diff --git a/demo-shell/src/app/components/notifications/notifications.component.html b/demo-shell/src/app/components/notifications/notifications.component.html
index f643ce970a..2e41aff60d 100644
--- a/demo-shell/src/app/components/notifications/notifications.component.html
+++ b/demo-shell/src/app/components/notifications/notifications.component.html
@@ -16,7 +16,7 @@
             data-automation-id="notification-message">
     </mat-form-field>
 
-    <button mat-icon-button (click)="send()">
+    <button mat-icon-button (click)="send()" data-automation-id="notification-default-button">
         <mat-icon>send</mat-icon>
     </button>
 
@@ -28,8 +28,43 @@
         </mat-slide-toggle>
     </div>
 
-    <div data-automation-id="notification-action-output">
+    <div data-automation-id="notification-action-output" *ngIf="actionOutput">
         {{ actionOutput }}
     </div>
 
+    <h2>Custom Configuration</h2>
+
+    <form [formGroup]="configForm">
+        <mat-form-field>
+            <mat-select class="form-control" formControlName="direction" placeholder="Direction" data-automation-id="notification-direction">
+                    <mat-option *ngFor="let direction of directions" [value]="direction.value">
+                        {{ direction.title }}
+                    </mat-option>
+            </mat-select>
+        </mat-form-field>
+        <mat-form-field>
+            <input matInput type="number" class="form-control" formControlName="duration"  [value]="defaultDuration" placeholder="Duration" data-automation-id="notification-duration">
+        </mat-form-field>
+        <mat-form-field>
+            <mat-select class="form-control" formControlName="horizontalPosition" placeholder="Horizontal Position" data-automation-id="notification-horizontal-position">
+                <mat-option *ngFor="let horizontalPosition of horizontalPositions" [value]="horizontalPosition.value">
+                    {{ horizontalPosition.title }}
+                </mat-option>
+            </mat-select>
+        </mat-form-field>
+        <mat-form-field>
+            <mat-select class="form-control" formControlName="verticalPosition" placeholder="Vertical Position" data-automation-id="notification-vertical-position">
+                <mat-option *ngFor="let verticalPosition of verticalPositions" [value]="verticalPosition.value">{{ verticalPosition.title }}</mat-option>
+            </mat-select>
+        </mat-form-field>
+        <button mat-icon-button (click)="sendCustomConfig()" data-automation-id="notification-custom-config-button">
+            <mat-icon>send</mat-icon>
+        </button>
+    </form>
+    <div>
+        <h3>SnackBar Config</h3>
+        <p *ngIf="snackBarConfigObject" data-automation-id="notification-custom-object">
+            {{snackBarConfigObject}}
+        </p>
+    </div>
 </div>
diff --git a/demo-shell/src/app/components/notifications/notifications.component.ts b/demo-shell/src/app/components/notifications/notifications.component.ts
index d476fbc652..1b68f60b9b 100644
--- a/demo-shell/src/app/components/notifications/notifications.component.ts
+++ b/demo-shell/src/app/components/notifications/notifications.component.ts
@@ -15,32 +15,115 @@
  * limitations under the License.
  */
 
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { NotificationService } from '@alfresco/adf-core';
+import { MatSnackBarConfig } from '@angular/material';
+import { FormBuilder, FormGroup, FormControl } from '@angular/forms';
 
 @Component({
     templateUrl: './notifications.component.html',
     styleUrls: ['./notifications.component.scss']
 })
-export class NotificationsComponent {
+export class NotificationsComponent implements OnInit {
 
     message = 'I ♥️ ADF';
     withAction = false;
     actionOutput = '';
+    snackBarConfigObject = '';
 
-    constructor(private notificationService: NotificationService) {}
+    configForm: FormGroup;
+
+    snackBarConfig: MatSnackBarConfig = new MatSnackBarConfig();
+
+    directions = [
+        { value: 'ltr', title: 'Left to right' },
+        { value: 'rtl', title: 'Right to left' }
+    ];
+
+    horizontalPositions = [
+        { value: 'start', title: 'Start' },
+        { value: 'center', title: 'Center' },
+        { value: 'end', title: 'End' },
+        { value: 'left', title: 'Left' },
+        { value: 'right', title: 'Right' }
+    ];
+
+    verticalPositions = [
+        { value: 'top', title: 'Top' },
+        { value: 'bottom', title: 'Bottom' }
+    ];
+
+    defaultDuration = 20000;
+
+    constructor(private notificationService: NotificationService,
+                private formBuilder: FormBuilder) {
+        this.snackBarConfig.duration = this.defaultDuration;
+    }
+
+    ngOnInit() {
+        this.configForm = this.formBuilder.group({
+            direction: new FormControl(''),
+            horizontalPosition: new FormControl(''),
+            verticalPosition: new FormControl(''),
+            duration: new FormControl('')
+        });
+
+        this.configForm.valueChanges
+            .subscribe(configFormValues =>
+                this.setSnackBarConfig(configFormValues)
+            );
+
+    }
+
+    setSnackBarConfig(configFormValues: any) {
+
+        if (configFormValues.announcementMessage) {
+            this.snackBarConfig.announcementMessage = configFormValues.announcementMessage;
+        }
+        if (configFormValues.direction) {
+            this.snackBarConfig.direction = configFormValues.direction;
+
+        }
+        if (configFormValues.duration) {
+            this.snackBarConfig.duration = configFormValues.duration;
+
+        }
+        if (configFormValues.horizontalPosition) {
+            this.snackBarConfig.horizontalPosition = configFormValues.horizontalPosition;
+        }
+        if (configFormValues.verticalPosition) {
+            this.snackBarConfig.verticalPosition = configFormValues.verticalPosition;
+        }
+    }
 
     send() {
         this.actionOutput = '';
 
         if (this.message) {
             if (this.withAction) {
-                this.notificationService
-                    .openSnackMessageAction(this.message, 'Some action')
+                this.notificationService.openSnackMessageAction(this.message, 'Some action', this.snackBarConfig.duration)
                     .onAction()
                     .subscribe(() => this.actionOutput = 'Action clicked');
             } else {
-                this.notificationService.openSnackMessage(this.message);
+                this.notificationService.openSnackMessage(this.message, this.snackBarConfig.duration);
+            }
+        }
+    }
+
+    sendCustomConfig() {
+        this.actionOutput = '';
+        this.snackBarConfigObject = `{"direction": "${this.snackBarConfig.direction}",
+                                    "duration": "${this.snackBarConfig.duration}",
+                                    "horizontalPosition": "${ this.snackBarConfig.horizontalPosition}",
+                                    "verticalPosition": "${ this.snackBarConfig.verticalPosition}"}`;
+        if (this.message) {
+            if (this.withAction) {
+                this.notificationService
+                    .openSnackMessageAction(this.message, 'Some action', this.snackBarConfig)
+                    .onAction()
+                    .subscribe(() => this.actionOutput = 'Action clicked');
+            } else {
+                this.notificationService.openSnackMessage(this.message, this.snackBarConfig);
             }
         }
     }
diff --git a/demo-shell/src/app/components/overlay-viewer/overlay-viewer.component.html b/demo-shell/src/app/components/overlay-viewer/overlay-viewer.component.html
index 75acdca195..a1378f7d86 100644
--- a/demo-shell/src/app/components/overlay-viewer/overlay-viewer.component.html
+++ b/demo-shell/src/app/components/overlay-viewer/overlay-viewer.component.html
@@ -1,5 +1,15 @@
 <h1>Overlay Viewer</h1>
 
+<p class="toggle">
+    <mat-slide-toggle
+        id="adf-viewer-overlay"
+        [color]="'primary'"
+        (change)="toggleOverlay()"
+        [checked]="isOverlay">
+        Overlay
+    </mat-slide-toggle>
+</p>
+
 <adf-document-list
     currentFolderId="-my-"
     (preview)="showPreview($event)">
@@ -7,6 +17,6 @@
 
 <adf-viewer
     [(showViewer)]="showViewer"
-    [overlayMode]="true"
+    [overlayMode]="isOverlay"
     [fileNodeId]="nodeId">
 </adf-viewer>
diff --git a/demo-shell/src/app/components/overlay-viewer/overlay-viewer.component.ts b/demo-shell/src/app/components/overlay-viewer/overlay-viewer.component.ts
index e7498177e5..39abfb7eb1 100644
--- a/demo-shell/src/app/components/overlay-viewer/overlay-viewer.component.ts
+++ b/demo-shell/src/app/components/overlay-viewer/overlay-viewer.component.ts
@@ -26,6 +26,11 @@ export class OverlayViewerComponent {
     showViewer = false;
 
     nodeId: string;
+    isOverlay = true;
+
+    toggleOverlay() {
+        this.isOverlay = !this.isOverlay;
+    }
 
     showPreview(event) {
         if (event.value.entry.isFile) {
diff --git a/demo-shell/src/app/components/process-list-demo/process-list-demo.component.html b/demo-shell/src/app/components/process-list-demo/process-list-demo.component.html
new file mode 100644
index 0000000000..c6b1bf52a5
--- /dev/null
+++ b/demo-shell/src/app/components/process-list-demo/process-list-demo.component.html
@@ -0,0 +1,81 @@
+<div class="process-list-inputs">
+
+    <form [formGroup]="processListForm">
+        <mat-form-field>
+            <mat-label>App Id</mat-label>
+            <input
+                matInput
+                class="form-control"
+                [formControl]="processAppId">
+            <mat-error *ngIf="processAppId.hasError('required')">
+                {{ 'PROCESS_LIST_DEMO.APP_ID_REQUIRED_ERROR' | translate }}
+            </mat-error>
+            <mat-error *ngIf="processAppId.hasError('pattern')">
+                {{ 'PROCESS_LIST_DEMO.APP_ID_TYPE_ERROR' | translate }}
+            </mat-error>
+        </mat-form-field>
+
+        <mat-form-field>
+            <mat-label>ProcessDefinitionId</mat-label>
+            <input
+                matInput
+                class="form-control"
+                [formControl]="processDefinitionId">
+            <mat-hint>SimpleProcess:1:2</mat-hint>
+        </mat-form-field>
+
+        <mat-form-field>
+            <mat-label>ProcessInstanceId</mat-label>
+            <input
+                matInput
+                class="form-control"
+                [formControl]="processInstanceId">
+        </mat-form-field>
+
+        <mat-form-field>
+            <mat-label>Status</mat-label>
+            <mat-select
+                class="form-control"
+                [formControl]="processState">
+                <mat-option *ngFor="let stateOption of stateOptions" [value]="stateOption.value">{{ stateOption.title }}</mat-option>
+            </mat-select>
+        </mat-form-field>
+
+        <mat-form-field>
+            <mat-label>Sort</mat-label>
+            <mat-select
+                class="form-control"
+                [formControl]="processSort">
+                <mat-option *ngFor="let sortOption of sortOptions" [value]="sortOption.value">{{ sortOption.title }}</mat-option>
+            </mat-select>
+        </mat-form-field>
+
+        <div class="adf-reset-button">
+            <button mat-raised-button (click)="resetProcessForm()">Reset</button>
+        </div>
+    </form>
+</div>
+
+<div>
+    <adf-process-instance-list
+        #processList
+        [appId]="appId"
+        [processDefinitionId]="processDefId"
+        [processInstanceId]="instanceId"
+        [state]="state"
+        [sort]="sort"
+        [presetColumn]="presetColumn">
+        <data-columns>
+            <data-column key="ended" title="ADF_PROCESS_LIST.PROPERTIES.STATUS">
+                <ng-template let-entry="$implicit">
+                    <div title="{{getStatus(entry.row.obj.ended)}}">{{getStatus(entry.row.obj.ended)}}</div>
+                </ng-template>
+            </data-column>
+        </data-columns>
+    </adf-process-instance-list>
+
+    <adf-pagination
+        [target]="processList">
+    </adf-pagination>
+</div>
+
diff --git a/demo-shell/src/app/components/process-list-demo/process-list-demo.component.scss b/demo-shell/src/app/components/process-list-demo/process-list-demo.component.scss
new file mode 100644
index 0000000000..8ce7a126c9
--- /dev/null
+++ b/demo-shell/src/app/components/process-list-demo/process-list-demo.component.scss
@@ -0,0 +1,17 @@
+.process-list-inputs {
+    margin-top: 100px;
+    margin-bottom: 50px;
+    display: flex;
+    justify-content: space-evenly;
+}
+
+.adf-reset-button {
+    margin-top: 50px;
+    display: flex;
+    justify-content: center;
+}
+
+.process-list-error-message {
+    color: red;
+    text-align: center;
+}
diff --git a/demo-shell/src/app/components/process-list-demo/process-list-demo.component.ts b/demo-shell/src/app/components/process-list-demo/process-list-demo.component.ts
new file mode 100644
index 0000000000..e7cc7958d3
--- /dev/null
+++ b/demo-shell/src/app/components/process-list-demo/process-list-demo.component.ts
@@ -0,0 +1,134 @@
+/*!
+ * @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 { Component, OnInit } from '@angular/core';
+import { FormGroup, FormBuilder, Validators, FormControl, AbstractControl } from '@angular/forms';
+import { ActivatedRoute, Params } from '@angular/router';
+import { debounceTime } from 'rxjs/operators';
+
+@Component({
+    templateUrl: './process-list-demo.component.html',
+    styleUrls: [`./process-list-demo.component.scss`],
+})
+
+export class ProcessListDemoComponent implements OnInit {
+
+    processListForm: FormGroup;
+
+    defaultAppId: number;
+
+    appId: number;
+
+    name: string;
+
+    processDefId: string;
+
+    instanceId: number|string;
+
+    state: string;
+
+    sort: string;
+
+    presetColumn = 'default';
+
+    stateOptions = [
+        { value: 'all', title: 'All' },
+        { value: 'active', title: 'Active' },
+        { value: 'completed', title: 'Completed' }
+    ];
+
+    sortOptions = [
+        {value: 'created-asc', title: 'Created (asc)'},
+        {value: 'created-desc', title: 'Created (desc)'}
+    ];
+
+    constructor(private route: ActivatedRoute,
+                private formBuilder: FormBuilder) {
+    }
+
+    ngOnInit() {
+        if (this.route) {
+            this.route.params.forEach((params: Params) => {
+                this.defaultAppId = params['id'] ? +params['id'] : 0;
+            });
+        }
+        this.appId = this.defaultAppId;
+        this.buildForm();
+    }
+
+    buildForm() {
+        this.processListForm = this.formBuilder.group({
+            processAppId: new FormControl(this.defaultAppId, [Validators.required, Validators.pattern('^[0-9]*$')]),
+            processDefinitionId: new FormControl(''),
+            processInstanceId: new FormControl(''),
+            processState: new FormControl(''),
+            processSort: new FormControl('')
+        });
+
+        this.processListForm.valueChanges
+            .pipe(
+                debounceTime(500)
+            )
+            .subscribe(processFilter => {
+                if (this.isFormValid()) {
+                    this.filterProcesses(processFilter);
+                }
+            });
+
+    }
+
+    filterProcesses(processFilter: any) {
+        this.appId = processFilter.processAppId;
+        this.name = processFilter.processName;
+        this.processDefId = processFilter.processDefinitionId;
+        this.instanceId = processFilter.processInstanceId;
+        this.state = processFilter.processState;
+        this.sort = processFilter.processSort;
+    }
+
+    isFormValid() {
+        return this.processListForm && this.processListForm.dirty && this.processListForm.valid;
+    }
+
+    resetProcessForm() {
+        this.processListForm.reset();
+    }
+
+    getStatus(ended: Date) {
+        return ended ? 'Completed' : 'Active';
+    }
+
+    get processAppId(): AbstractControl {
+        return this.processListForm.get('processAppId');
+    }
+
+    get processDefinitionId(): AbstractControl {
+        return this.processListForm.get('processDefinitionId');
+    }
+
+    get processInstanceId(): AbstractControl {
+        return this.processListForm.get('processInstanceId');
+    }
+
+    get processState(): AbstractControl {
+        return this.processListForm.get('processState');
+    }
+
+    get processSort(): AbstractControl {
+        return this.processListForm.get('processSort');
+    }
+}
diff --git a/demo-shell/src/app/components/process-service/form-node-viewer.component.ts b/demo-shell/src/app/components/process-service/form-node-viewer.component.ts
index 7ed7af87fa..701fcd89ff 100644
--- a/demo-shell/src/app/components/process-service/form-node-viewer.component.ts
+++ b/demo-shell/src/app/components/process-service/form-node-viewer.component.ts
@@ -17,7 +17,7 @@
 
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Subscription } from 'rxjs/Subscription';
+import { Subscription } from 'rxjs';
 
 @Component({
     selector: 'app-form-node-viewer',
diff --git a/demo-shell/src/app/components/process-service/form-viewer.component.ts b/demo-shell/src/app/components/process-service/form-viewer.component.ts
index 5327761628..15d9fe1471 100644
--- a/demo-shell/src/app/components/process-service/form-viewer.component.ts
+++ b/demo-shell/src/app/components/process-service/form-viewer.component.ts
@@ -17,7 +17,7 @@
 
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Subscription } from 'rxjs/Subscription';
+import { Subscription } from 'rxjs';
 
 @Component({
     selector: 'app-form-viewer',
diff --git a/demo-shell/src/app/components/process-service/process-attachments.component.ts b/demo-shell/src/app/components/process-service/process-attachments.component.ts
index 2e2823a4df..2ecc4306f2 100644
--- a/demo-shell/src/app/components/process-service/process-attachments.component.ts
+++ b/demo-shell/src/app/components/process-service/process-attachments.component.ts
@@ -22,7 +22,7 @@ import { UploadService } from '@alfresco/adf-core';
 import { AlfrescoApiService } from '@alfresco/adf-core';
 import { AppConfigService } from '@alfresco/adf-core';
 import { PreviewService } from '../../services/preview.service';
-import { Subscription } from 'rxjs/Subscription';
+import { Subscription } from 'rxjs';
 
 export function processUploadServiceFactory(api: AlfrescoApiService, config: AppConfigService) {
     return new ProcessUploadService(api, config);
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 cf5574ac17..da2460cedc 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
@@ -32,7 +32,7 @@
                      *ngIf="taskFilter && !isStartTaskMode()">
                     <adf-tasklist
                         [appId]="taskFilter?.appId"
-                        [presetColumn]="presetColoum"
+                        [presetColumn]="presetColumn"
                         [page]="taskPage"
                         [size]="paginationPageSize"
                         [processDefinitionKey]="taskFilter?.filter?.processDefinitionKey"
@@ -59,11 +59,10 @@
                         *ngIf="taskList"
                         [target]="taskList"
                         (changePageSize)="onChangePageSize($event)"
-                        [supportedPageSizes]="supportedPages"
                         #taskListPagination>
                     </adf-pagination>
                 </div>
-                <div class="adf-grid-item adf-tasks-details" *ngIf="!isStartTaskMode()" fxFlex.gt-md="1 1 auto">
+                <div class="adf-grid-item adf-tasks-details" *ngIf="!isStartTaskMode()" fxFlex.gt-md="1 1 auto" data-automation-id="adf-tasks-details">
                     <adf-task-details #activitidetails
                                            [debugMode]="true"
                                            [taskId]="currentTaskId"
@@ -123,7 +122,7 @@
                                              [headingIcon]="'assessment'">
                             <adf-process-instance-filters
                                 #activitiprocessfilter
-                                [filterParam]="{index: 0}"
+                                [filterParam]="filterSelected"
                                 [appId]="appId"
                                 (filterClick)="onProcessFilterClick($event)"
                                 (success)="onSuccessProcessFilterList($event)">
@@ -137,8 +136,7 @@
                         #processList
                         *ngIf="processFilter?.filter" [appId]="processFilter?.appId"
                         [processDefinitionKey]="processFilter?.filter?.processDefinitionKey"
-                        [name]="processFilter?.filter?.name"
-                        [presetColumn]="presetColoum"
+                        [presetColumn]="presetColumn"
                         [state]="processFilter?.filter?.state"
                         [page]="processPage"
                         [size]="paginationPageSize"
@@ -158,7 +156,6 @@
                         *ngIf="processList"
                         [target]="processList"
                         (changePageSize)="onChangePageSize($event)"
-                        [supportedPageSizes]="supportedPages"
                         #processListPagination>
                     </adf-pagination>
                 </div>
diff --git a/demo-shell/src/app/components/process-service/process-service.component.ts b/demo-shell/src/app/components/process-service/process-service.component.ts
index e1be2c175f..e745f9ae28 100644
--- a/demo-shell/src/app/components/process-service/process-service.component.ts
+++ b/demo-shell/src/app/components/process-service/process-service.component.ts
@@ -54,7 +54,7 @@ import {
 } from '@alfresco/adf-process-services';
 import { LogService } from '@alfresco/adf-core';
 import { AlfrescoApiService, UserPreferencesService } from '@alfresco/adf-core';
-import { Subscription } from 'rxjs/Subscription';
+import { Subscription } from 'rxjs';
 import { /*CustomEditorComponent*/ CustomStencil01 } from './custom-editor/custom-editor.component';
 import { DemoFieldValidator } from './demo-field-validator';
 import { PreviewService } from '../../services/preview.service';
@@ -127,8 +127,6 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit
     paginationPageSize = 0;
     processSchemaColumns: any[] = [];
 
-    supportedPages: number[];
-
     defaultProcessDefinitionName: string;
     defaultProcessName: string;
 
@@ -140,7 +138,7 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit
     blobFile: any;
     flag = true;
 
-    presetColoum = 'default';
+    presetColumn = 'default';
 
     showTaskTab: boolean;
     showProcessTab: boolean;
@@ -192,7 +190,11 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit
                         validateDynamicTableRowEvent.preventDefault();
                     }
                 }
-            )
+            ),
+
+            formService.formContentClicked.subscribe(content => {
+                this.showContentPreview(content);
+            })
         );
 
         // Uncomment this block to see form event handling in action
@@ -225,7 +227,6 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit
             this.currentProcessInstanceId = null;
         });
         this.layoutType = AppsListComponent.LAYOUT_GRID;
-        this.supportedPages = this.preferenceService.getDefaultPageSizes();
     }
 
     ngOnDestroy() {
@@ -399,6 +400,10 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit
     }
 
     onContentClick(content: any): void {
+        this.showContentPreview(content);
+    }
+
+    private showContentPreview(content: any) {
         if (content.contentBlob) {
             this.preview.showBlob(content.name, content.contentBlob);
         } else {
diff --git a/demo-shell/src/app/components/process-service/task-attachments.component.ts b/demo-shell/src/app/components/process-service/task-attachments.component.ts
index 0f0e15c9fa..588a9b5498 100644
--- a/demo-shell/src/app/components/process-service/task-attachments.component.ts
+++ b/demo-shell/src/app/components/process-service/task-attachments.component.ts
@@ -19,7 +19,7 @@ import { Component, Input, OnChanges, OnInit, ViewChild, OnDestroy } from '@angu
 import { TaskListService, TaskAttachmentListComponent, TaskDetailsModel, TaskUploadService } from '@alfresco/adf-process-services';
 import { UploadService, AlfrescoApiService, AppConfigService } from '@alfresco/adf-core';
 import { PreviewService } from '../../services/preview.service';
-import { Subscription } from 'rxjs/Subscription';
+import { Subscription } from 'rxjs';
 
 export function taskUploadServiceFactory(api: AlfrescoApiService, config: AppConfigService) {
     return new TaskUploadService(api, config);
@@ -65,7 +65,7 @@ export class TaskAttachmentsComponent implements OnInit, OnChanges, OnDestroy {
 
     ngOnChanges() {
         if (this.taskId) {
-            this.activitiTaskList.getTaskDetails(this.taskId).map((res) => res)
+            this.activitiTaskList.getTaskDetails(this.taskId)
                 .subscribe((taskDetails: TaskDetailsModel) => {
                     this.taskDetails = taskDetails;
                 });
diff --git a/demo-shell/src/app/components/report-issue/report-issue.component.html b/demo-shell/src/app/components/report-issue/report-issue.component.html
new file mode 100644
index 0000000000..244ab876f7
--- /dev/null
+++ b/demo-shell/src/app/components/report-issue/report-issue.component.html
@@ -0,0 +1,9 @@
+<div class="adf-report-issue">
+    <h1>Report Issue</h1>
+    <form class="adf-report-issue-form">
+        <mat-form-field>
+            <textarea matInput placeholder="Leave a comment" class="adf-report-issue-form-textarea"></textarea>
+        </mat-form-field>
+    </form>
+    <button mat-raised-button>Submit</button>
+</div>
\ No newline at end of file
diff --git a/demo-shell/src/app/components/report-issue/report-issue.component.scss b/demo-shell/src/app/components/report-issue/report-issue.component.scss
new file mode 100644
index 0000000000..c411604a6a
--- /dev/null
+++ b/demo-shell/src/app/components/report-issue/report-issue.component.scss
@@ -0,0 +1,24 @@
+.adf-report-issue {
+    margin: 50px 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+
+    &-form {
+
+        width: 50%;
+        min-width: 250px;
+        margin-bottom: 50px;
+
+        & mat-form-field {
+            width: 100%;
+        }
+
+        &-textarea {
+            background-color: white;
+            width: 100%;
+            height: 250px;
+        }
+    }
+}
\ No newline at end of file
diff --git a/demo-shell/src/app/components/report-issue/report-issue.component.ts b/demo-shell/src/app/components/report-issue/report-issue.component.ts
new file mode 100644
index 0000000000..5ed1436682
--- /dev/null
+++ b/demo-shell/src/app/components/report-issue/report-issue.component.ts
@@ -0,0 +1,26 @@
+/*!
+ * @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 { Component } from '@angular/core';
+
+@Component({
+    templateUrl: './report-issue.component.html',
+    styleUrls: [`./report-issue.component.scss`],
+})
+export class ReportIssueComponent {
+
+}
diff --git a/demo-shell/src/app/components/search/search-result.component.ts b/demo-shell/src/app/components/search/search-result.component.ts
index 52f4ee8d8e..9d965b15ce 100644
--- a/demo-shell/src/app/components/search/search-result.component.ts
+++ b/demo-shell/src/app/components/search/search-result.component.ts
@@ -20,7 +20,7 @@ import { Router, ActivatedRoute, Params } from '@angular/router';
 import { NodePaging, Pagination } from 'alfresco-js-api';
 import { SearchComponent, SearchQueryBuilderService } from '@alfresco/adf-content-services';
 import { UserPreferencesService, SearchService, SearchConfigurationService } from '@alfresco/adf-core';
-import { Subscription } from 'rxjs/Subscription';
+import { Subscription } from 'rxjs';
 
 @Component({
     selector: 'app-search-result-component',
diff --git a/demo-shell/src/app/components/shared-link-view/shared-link-view.component.ts b/demo-shell/src/app/components/shared-link-view/shared-link-view.component.ts
index 056301dca9..cd198873df 100644
--- a/demo-shell/src/app/components/shared-link-view/shared-link-view.component.ts
+++ b/demo-shell/src/app/components/shared-link-view/shared-link-view.component.ts
@@ -1,3 +1,20 @@
+/*!
+ * @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 { Component, ViewEncapsulation, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 
diff --git a/demo-shell/src/app/components/task-list-demo/task-list-demo.component.html b/demo-shell/src/app/components/task-list-demo/task-list-demo.component.html
new file mode 100644
index 0000000000..f8e9153fa9
--- /dev/null
+++ b/demo-shell/src/app/components/task-list-demo/task-list-demo.component.html
@@ -0,0 +1,148 @@
+<div class="task-list-demo-inputs">
+
+     <form [formGroup]="taskListForm">
+        <mat-form-field>
+            <mat-label>App Id</mat-label>
+                <input 
+                matInput
+                class="form-control"
+                [formControl]="taskAppId">
+                <mat-error *ngIf="taskAppId.hasError('pattern')">
+                    {{ 'TASK_LIST_DEMO.ERROR_MESSAGE.APP_ID_TYPE_ERROR' | translate }}
+                </mat-error>
+        </mat-form-field>
+        
+        <mat-form-field>
+            <mat-label>Task Name</mat-label>
+            <input 
+            matInput
+            class="form-control"
+            [formControl]="taskName">
+        </mat-form-field>
+
+        <mat-form-field>
+            <mat-label>Task Id</mat-label>
+            <input 
+            matInput 
+            class="form-control"
+            [formControl]="taskId">
+        </mat-form-field>
+
+        <mat-form-field>
+            <mat-label>Start</mat-label>
+            <input 
+            matInput 
+            class="form-control"
+            matTooltip="{{ 'TASK_LIST_DEMO.TOOLTIP_MESSAGE.START_INPUT' | translate }}"
+            [formControl]="taskStart">
+            <mat-error *ngIf="taskStart.hasError('pattern')">
+                {{ 'TASK_LIST_DEMO.ERROR_MESSAGE.NUMBER_TYPE_ERROR' | translate }}
+            </mat-error>
+        </mat-form-field>
+
+        <mat-form-field>
+            <mat-label>ProcessDefinitionId</mat-label>
+            <input 
+            matInput
+            class="form-control"
+            [formControl]="taskProcessDefinitionId">
+            <mat-hint>E.g. SimpleProcess:1:2</mat-hint>
+        </mat-form-field>
+
+        <mat-form-field>
+            <mat-label>ProcessInstanceId</mat-label>
+            <input 
+            matInput 
+            class="form-control"
+            [formControl]="taskProcessInstanceId">
+            <mat-hint>E.g. 12345</mat-hint>
+        </mat-form-field>
+
+        <mat-form-field>
+            <mat-label>Items per page</mat-label>
+            <input
+            matInput
+            class="form-control"
+            [formControl]="taskSize">
+        </mat-form-field>
+
+        <mat-form-field>
+            <mat-label>Page</mat-label>
+            <input 
+            matInput 
+            class="form-control"
+            [formControl]="taskPage">
+        </mat-form-field>
+
+        <mat-form-field>
+                <mat-label>Process Instance</mat-label>
+                <mat-select 
+                class="form-control"
+                [formControl]="taskIncludeProcessInstance">
+                 <mat-option *ngFor="let includeProcessInstanceOption of includeProcessInstanceOptions" [value]="includeProcessInstanceOption.value">{{ includeProcessInstanceOption.title }}</mat-option>
+                </mat-select>
+        </mat-form-field>
+
+        <mat-form-field>
+                <mat-label>Assignment</mat-label>
+                <mat-select 
+                class="form-control"
+                [formControl]="taskAssignment">
+                 <mat-option *ngFor="let assignmentOption of assignmentOptions" [value]="assignmentOption.value">{{ assignmentOption.title }}</mat-option>
+                </mat-select>
+        </mat-form-field>
+
+        <mat-form-field>
+                <mat-label>State</mat-label>
+                <mat-select 
+                class="form-control"
+                [formControl]="taskState">
+                    <mat-option *ngFor="let stateOption of stateOptions" [value]="stateOption.value">{{ stateOption.title }}</mat-option>
+                </mat-select>
+        </mat-form-field>
+
+        <mat-form-field>
+                <mat-label>Sort</mat-label>
+                <mat-select 
+                class="form-control"
+                [formControl]="taskSort">
+                    <mat-option *ngFor="let sortOption of sortOptions" [value]="sortOption.value">{{ sortOption.title }}</mat-option>
+                </mat-select>
+        </mat-form-field>
+    </form>
+</div>
+<div class="adf-reset-button">
+    <button mat-raised-button (click)="resetTaskForm()">Reset</button>
+</div>
+
+<div>
+    <adf-tasklist
+        [appId]="appId"
+        [taskId]="id"
+        [name]="name"
+        [processDefinitionId]="processDefinitionId"
+        [processInstanceId]="processInstanceId"
+        [assignment]="assignment"
+        [state]="state"
+        [sort]="sort"
+        [start]="start"
+        [page]="page"
+        [size]="size"
+        [includeProcessInstance]="includeProcessInstance"
+        #taskList>
+        <data-columns>
+                <data-column key="id" title="Id"></data-column>
+                <data-column key="name" title="Name"></data-column>
+                <data-column key="description" title="Description"></data-column>
+                <data-column key="created" title="Created"></data-column>
+                <data-column key="dueDate" title="Due Date"></data-column>
+                <data-column key="processInstanceId" title="Process Instance Id"></data-column>
+                <data-column key="processDefinitionId" title="Process Definition Id"></data-column>
+            </data-columns>
+    </adf-tasklist>
+    
+    <adf-pagination
+        [target]="taskList">
+    </adf-pagination>
+</div>
+
diff --git a/demo-shell/src/app/components/task-list-demo/task-list-demo.component.scss b/demo-shell/src/app/components/task-list-demo/task-list-demo.component.scss
new file mode 100644
index 0000000000..c20060c198
--- /dev/null
+++ b/demo-shell/src/app/components/task-list-demo/task-list-demo.component.scss
@@ -0,0 +1,23 @@
+.task-list-demo-inputs {
+    margin: 100px auto 0 auto;
+    width: 80%;
+    display: flex;
+    flex: wrap;
+    justify-content: space-evenly;
+
+    & mat-form-field {
+        margin: 20px 0;
+        width: calc(100% * (1/4) - 10px);
+    }
+}
+
+.adf-reset-button {
+    margin-bottom: 50px;
+    display: flex;
+    justify-content: center;
+}
+
+.task-list-demo-error-message {
+    color: red;
+    text-align: center;
+}
\ No newline at end of file
diff --git a/demo-shell/src/app/components/task-list-demo/task-list-demo.component.ts b/demo-shell/src/app/components/task-list-demo/task-list-demo.component.ts
new file mode 100644
index 0000000000..2b76ecb000
--- /dev/null
+++ b/demo-shell/src/app/components/task-list-demo/task-list-demo.component.ts
@@ -0,0 +1,215 @@
+/*!
+ * @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 { Component, OnInit } from '@angular/core';
+import { FormGroup, FormBuilder, Validators, FormControl, AbstractControl } from '@angular/forms';
+import { ActivatedRoute, Params } from '@angular/router';
+import { debounceTime } from 'rxjs/operators';
+
+@Component({
+    templateUrl: './task-list-demo.component.html',
+    styleUrls: [`./task-list-demo.component.scss`],
+})
+
+export class TaskListDemoComponent implements OnInit {
+
+    defaultAppId: number;
+
+    taskListForm: FormGroup;
+
+    errorMessage: string;
+
+    appId: number;
+
+    id: string;
+
+    processDefinitionId: string;
+
+    processInstanceId: string;
+
+    state: string;
+
+    assignment: string;
+
+    name: string;
+
+    sort: string;
+
+    start: number;
+
+    size: number;
+
+    page: number;
+
+    includeProcessInstance: boolean;
+
+    assignmentOptions = [
+        {value: 'assignee', title: 'Assignee'},
+        {value: 'candidate', title: 'Candidate'}
+    ];
+
+    includeProcessInstanceOptions = [
+        {value: 'include', title: 'Include'},
+        {value: 'exclude', title: 'Exclude'}
+    ];
+
+    stateOptions = [
+        {value: 'all', title: 'All'},
+        {value: 'active', title: 'Active'},
+        {value: 'completed', title: 'Completed'}
+    ];
+
+    sortOptions = [
+        {value: 'created-asc', title: 'Created (asc)'},
+        {value: 'created-desc', title: 'Created (desc)'},
+        {value: 'due-asc', title: 'Due (asc)'},
+        {value: 'due-desc', title: 'Due (desc)'}
+    ];
+
+    constructor(private route: ActivatedRoute,
+                private formBuilder: FormBuilder) {
+    }
+
+    ngOnInit() {
+        if (this.route) {
+            this.route.params.forEach((params: Params) => {
+                if (params['id']) {
+                    this.defaultAppId = +params['id'];
+                }
+            });
+        }
+
+        this.appId = this.defaultAppId;
+        this.errorMessage = 'Insert App Id';
+
+        this.buildForm();
+    }
+
+    buildForm() {
+        this.taskListForm = this.formBuilder.group({
+            taskAppId: new FormControl(this.defaultAppId, [Validators.pattern('^[0-9]*$')]),
+            taskName: new FormControl(''),
+            taskId: new FormControl(''),
+            taskProcessDefinitionId: new FormControl(''),
+            taskProcessInstanceId: new FormControl(''),
+            taskAssignment: new FormControl(''),
+            taskState: new FormControl(''),
+            taskSort: new FormControl(''),
+            taskSize: new FormControl(''),
+            taskPage: new FormControl(''),
+            taskStart: new FormControl('', [Validators.pattern('^[0-9]*$')]),
+            taskIncludeProcessInstance: new FormControl('')
+        });
+
+        this.taskListForm.valueChanges
+            .pipe(
+                debounceTime(500)
+            )
+            .subscribe(taskFilter => {
+                if (this.isFormValid()) {
+                    this.filterTasks(taskFilter);
+                }
+        });
+    }
+
+    filterTasks(taskFilter: any) {
+        this.appId = taskFilter.taskAppId;
+        this.id = taskFilter.taskId;
+        this.processDefinitionId = taskFilter.taskProcessDefinitionId;
+        this.processInstanceId = taskFilter.taskProcessInstanceId;
+        this.name = taskFilter.taskName;
+        this.assignment = taskFilter.taskAssignment;
+        this.state = taskFilter.taskState;
+        this.sort = taskFilter.taskSort;
+        this.start = taskFilter.taskStart;
+        this.size = taskFilter.taskSize;
+        this.page = taskFilter.taskPage;
+
+        this.includeProcessInstance = taskFilter.taskIncludeProcessInstance === 'include';
+    }
+
+    resetTaskForm() {
+        this.taskListForm.reset();
+        this.resetQueryParameters();
+    }
+
+    resetQueryParameters() {
+        this.appId = null;
+        this.id = null;
+        this.processDefinitionId = null;
+        this.processInstanceId = null;
+        this.name = null;
+        this.assignment = null;
+        this.state = null;
+        this.sort = null;
+        this.start = null;
+        this.size = null;
+        this.page = null;
+    }
+
+    isFormValid() {
+        return this.taskListForm && this.taskListForm.dirty && this.taskListForm.valid;
+    }
+
+    get taskAppId(): AbstractControl {
+        return this.taskListForm.get('taskAppId');
+    }
+
+    get taskId(): AbstractControl {
+        return this.taskListForm.get('taskId');
+    }
+
+    get taskProcessDefinitionId(): AbstractControl {
+        return this.taskListForm.get('taskProcessDefinitionId');
+    }
+
+    get taskProcessInstanceId(): AbstractControl {
+        return this.taskListForm.get('taskProcessInstanceId');
+    }
+
+    get taskName(): AbstractControl {
+        return this.taskListForm.get('taskName');
+    }
+
+    get taskAssignment(): AbstractControl {
+        return this.taskListForm.get('taskAssignment');
+    }
+
+    get taskState(): AbstractControl {
+        return this.taskListForm.get('taskState');
+    }
+
+    get taskSort(): AbstractControl {
+        return this.taskListForm.get('taskSort');
+    }
+
+    get taskIncludeProcessInstance(): AbstractControl {
+        return this.taskListForm.get('taskIncludeProcessInstance');
+    }
+
+    get taskStart(): AbstractControl {
+        return this.taskListForm.get('taskStart');
+    }
+
+    get taskSize(): AbstractControl {
+        return this.taskListForm.get('taskSize');
+    }
+
+    get taskPage(): AbstractControl {
+        return this.taskListForm.get('taskPage');
+    }
+}
diff --git a/demo-shell/src/app/components/theme-picker/style-manager/style-manager.ts b/demo-shell/src/app/components/theme-picker/style-manager/style-manager.ts
index 062220b4f9..5996dc21b2 100644
--- a/demo-shell/src/app/components/theme-picker/style-manager/style-manager.ts
+++ b/demo-shell/src/app/components/theme-picker/style-manager/style-manager.ts
@@ -1,3 +1,20 @@
+/*!
+ * @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 { Injectable } from '@angular/core';
 
 /**
diff --git a/demo-shell/src/app/components/theme-picker/theme-picker.ts b/demo-shell/src/app/components/theme-picker/theme-picker.ts
index 6ff344599c..cee532ac2e 100644
--- a/demo-shell/src/app/components/theme-picker/theme-picker.ts
+++ b/demo-shell/src/app/components/theme-picker/theme-picker.ts
@@ -1,3 +1,20 @@
+/*!
+ * @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 { CommonModule } from '@angular/common';
 import { ChangeDetectionStrategy, Component, NgModule } from '@angular/core';
 import {
diff --git a/demo-shell/src/app/components/theme-picker/theme-storage/theme-storage.ts b/demo-shell/src/app/components/theme-picker/theme-storage/theme-storage.ts
index 2aa3df6df8..cf45c858b1 100644
--- a/demo-shell/src/app/components/theme-picker/theme-storage/theme-storage.ts
+++ b/demo-shell/src/app/components/theme-picker/theme-storage/theme-storage.ts
@@ -1,3 +1,20 @@
+/*!
+ * @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 { EventEmitter, Injectable } from '@angular/core';
 
 export interface DocsSiteTheme {
diff --git a/demo-shell/src/app/components/trashcan/trashcan.component.html b/demo-shell/src/app/components/trashcan/trashcan.component.html
index 2cf59097f4..c9535bdb80 100644
--- a/demo-shell/src/app/components/trashcan/trashcan.component.html
+++ b/demo-shell/src/app/components/trashcan/trashcan.component.html
@@ -91,7 +91,6 @@
 
         </adf-document-list>
         <adf-pagination [ngClass]="{ 'no-border' : documentList.isEmpty()}"
-                        [supportedPageSizes]="supportedPages"
                         [target]="documentList">
         </adf-pagination>
     </div>
diff --git a/demo-shell/src/app/components/trashcan/trashcan.component.ts b/demo-shell/src/app/components/trashcan/trashcan.component.ts
index 4a7e587dd5..7575031f40 100644
--- a/demo-shell/src/app/components/trashcan/trashcan.component.ts
+++ b/demo-shell/src/app/components/trashcan/trashcan.component.ts
@@ -1,26 +1,18 @@
 /*!
  * @license
- * Alfresco Example Content Application
+ * Copyright 2016 Alfresco Software, Ltd.
  *
- * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * 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
  *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * 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 { Component, ViewChild } from '@angular/core';
@@ -37,7 +29,6 @@ export class TrashcanComponent {
     @ViewChild('documentList')
     documentList: DocumentListComponent;
 
-    supportedPages = [];
     currentLocale;
 
     constructor(
@@ -45,12 +36,6 @@ export class TrashcanComponent {
         private router: Router,
         private notificationService: NotificationService
     ) {
-        this.preference
-            .select(UserPreferenceValues.SupportedPageSizes)
-            .subscribe(pages => {
-                this.supportedPages = pages;
-            });
-
         this.preference
             .select(UserPreferenceValues.Locale)
             .subscribe(locale => {
diff --git a/demo-shell/src/app/services/in-memory-form.service.ts b/demo-shell/src/app/services/in-memory-form.service.ts
index 86940978af..6dca0b3158 100644
--- a/demo-shell/src/app/services/in-memory-form.service.ts
+++ b/demo-shell/src/app/services/in-memory-form.service.ts
@@ -19,8 +19,7 @@ import { Injectable } from '@angular/core';
 import { AppConfigService, AlfrescoApiService, EcmModelService, LogService,
          FormFieldOption, FormService, FormValues, FormModel,
          FormOutcomeModel, FormOutcomeEvent } from '@alfresco/adf-core';
-import { Observable } from 'rxjs/Observable';
-import { Subject } from 'rxjs/Subject';
+import { Observable, Subject } from 'rxjs';
 
 interface ProcessServiceData {
     rest: {
diff --git a/demo-shell/src/assets/logo.png b/demo-shell/src/assets/logo.png
new file mode 100644
index 0000000000..d342b10ee0
Binary files /dev/null and b/demo-shell/src/assets/logo.png differ
diff --git a/demo-shell/src/environments/environment.prod.ts b/demo-shell/src/environments/environment.prod.ts
index 3612073bc3..369628568c 100644
--- a/demo-shell/src/environments/environment.prod.ts
+++ b/demo-shell/src/environments/environment.prod.ts
@@ -1,3 +1,20 @@
+/*!
+ * @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.
+ */
+
 export const environment = {
   production: true
 };
diff --git a/demo-shell/src/environments/environment.ts b/demo-shell/src/environments/environment.ts
index b7f639aeca..0752c5ce86 100644
--- a/demo-shell/src/environments/environment.ts
+++ b/demo-shell/src/environments/environment.ts
@@ -1,3 +1,20 @@
+/*!
+ * @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.
+ */
+
 // The file contents for the current environment will overwrite these during build.
 // The build system defaults to the dev environment which uses `environment.ts`, but if you do
 // `ng build --env=prod` then `environment.prod.ts` will be used instead.
diff --git a/demo-shell/src/main.ts b/demo-shell/src/main.ts
index 8e14b4a6b5..04f3b3f925 100644
--- a/demo-shell/src/main.ts
+++ b/demo-shell/src/main.ts
@@ -1,17 +1,32 @@
+/*!
+ * @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 { enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
 import { AppModule } from './app/app.module';
 import { environment } from './environments/environment';
+
 import 'hammerjs';
 import 'chart.js';
 import 'ng2-charts';
 
-import * as pdfjsLib from 'pdfjs-dist';
-pdfjsLib.PDFJS.workerSrc = 'pdf.worker.js';
-
 if (environment.production) {
-  enableProdMode();
+    enableProdMode();
 }
 
 platformBrowserDynamic().bootstrapModule(AppModule);
diff --git a/demo-shell/src/polyfills.ts b/demo-shell/src/polyfills.ts
index 7f41978600..6ec409f285 100644
--- a/demo-shell/src/polyfills.ts
+++ b/demo-shell/src/polyfills.ts
@@ -1,3 +1,20 @@
+/*!
+ * @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.
+ */
+
 /**
  * This file includes polyfills needed by Angular and is loaded before the app.
  * You can add your own extra polyfills to this file.
diff --git a/demo-shell/src/test.ts b/demo-shell/src/test.ts
index 1c2f3fced5..ae91a000d9 100644
--- a/demo-shell/src/test.ts
+++ b/demo-shell/src/test.ts
@@ -1,3 +1,20 @@
+/*!
+ * @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.
+ */
+
 // This file is required by karma.conf.js and loads recursively all the .spec and framework files
 
 import 'zone.js/dist/zone-testing';
diff --git a/demo-shell/tsconfig.json b/demo-shell/tsconfig.json
index 0d53df51b8..1ca54c2643 100644
--- a/demo-shell/tsconfig.json
+++ b/demo-shell/tsconfig.json
@@ -1,5 +1,4 @@
 {
-  "extends": "../tsconfig.json",
   "compileOnSave": false,
   "compilerOptions": {
     "outDir": "./dist/out-tsc",
@@ -23,5 +22,8 @@
   },
   "exclude": [
     "node_modules"
-  ]
+  ],
+  "angularCompilerOptions": {
+    "preserveWhitespaces": false
+  }
 }
diff --git a/demo-shell/tslint.json b/demo-shell/tslint.json
index a74d024a14..3d218ba58a 100644
--- a/demo-shell/tslint.json
+++ b/demo-shell/tslint.json
@@ -4,6 +4,10 @@
     "../tools/tslint-rules/"
   ],
   "rules": {
+    "adf-license-banner": [
+      true,
+      "**/*.ts"
+    ],
     "arrow-return-shorthand": true,
     "callable-types": true,
     "class-name": true,
@@ -14,11 +18,6 @@
     "curly": true,
     "eofline": true,
     "forin": true,
-    "import-blacklist": [
-      true,
-      "rxjs",
-      "rxjs/Rx"
-    ],
     "import-spacing": true,
     "indent": [
       true,
diff --git a/docs/README.md b/docs/README.md
index bdf4e85ddc..c8b97a254e 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -58,7 +58,7 @@ for more information about installing and using the source code.
 | Name | Description | Source link |
 | ---- | ----------- | ----------- |
 | [About component](core/about.component.md) ![Experimental](docassets/images/ExperimentalIcon.png) | This component allow you to have a general overview of the version of ADF installed and the status of the Content service and Process service. | [Source](../lib/core/about/about.component.ts) |
-| [Buttons menu component](core/buttons-menu.component.md) | Displays buttons on a responsive menu.  | [Source](../lib/core/buttons-menu/buttons-menu.component.ts) |
+| [Buttons menu component](core/buttons-menu.component.md) | Displays buttons on a responsive menu. | [Source](../lib/core/buttons-menu/buttons-menu.component.ts) |
 | [Card view component](core/card-view.component.md) | Displays a configurable property list renderer. | [Source](../lib/core/card-view/components/card-view/card-view.component.ts) |
 | [Accordion group component](core/accordion-group.component.md) | Adds a collapsible panel to an accordion menu. | [Source](../lib/core/collapsable/accordion-group.component.ts) |
 | [Accordion component](core/accordion.component.md) | Creates a collapsible accordion menu. | [Source](../lib/core/collapsable/accordion.component.ts) |
@@ -78,8 +78,8 @@ for more information about installing and using the source code.
 | [Infinite pagination component](core/infinite-pagination.component.md) | Adds "infinite" pagination to the component it is used with. | [Source](../lib/core/pagination/infinite-pagination.component.ts) |
 | [Pagination component](core/pagination.component.md) | Adds pagination to the component it is used with. | [Source](../lib/core/pagination/pagination.component.ts) |
 | [Host settings component](core/host-settings.component.md) ![Internal](docassets/images/InternalIcon.png) | Validates the URLs for ACS and APS and saves them in the user's local storage | [Source](../lib/core/settings/host-settings.component.ts) |
-| [Sidebar action menu component](core/sidebar-action-menu.component.md) | Displays a sidebar-action menu information panel. | [Source](../lib/core/sidenav-layout/components/sidebar-action/sidebar-action-menu.component.ts) |
-| [Sidenav layout component](core/sidenav-layout.component.md) | Displays the standard three-region ADF application layout. | [Source](../lib/core/sidenav-layout/components/sidenav-layout/sidenav-layout.component.ts) |
+| [Sidebar action menu component](core/sidebar-action-menu.component.md) | Displays a sidebar-action menu information panel. | [Source](../lib/core/layout/components/sidebar-action/sidebar-action-menu.component.ts) |
+| [Sidenav layout component](core/sidenav-layout.component.md) | Displays the standard three-region ADF application layout. | [Source](../lib/core/layout/components/sidenav-layout/sidenav-layout.component.ts) |
 | [Sorting picker component](core/sorting-picker.component.md) | Selects from a set of predefined sorting definitions and directions. | [Source](../lib/core/sorting-picker/sorting-picker.component.ts) |
 | [Empty content component](core/empty-content.component.md) | Provides a generic "Empty Content" placeholder for components. | [Source](../lib/core/templates/empty-content/empty-content.component.ts) |
 | [Error content component](core/error-content.component.md) | Displays info about a specific error. | [Source](../lib/core/templates/error-content/error-content.component.ts) |
@@ -122,7 +122,7 @@ for more information about installing and using the source code.
 | [Node name tooltip pipe](core/node-name-tooltip.pipe.md) | Formats the tooltip for a Node. | [Source](../lib/core/pipes/node-name-tooltip.pipe.ts) |
 | [Text highlight pipe](core/text-highlight.pipe.md) | Adds highlighting to words or sections of text that match a search string. | [Source](../lib/core/pipes/text-highlight.pipe.ts) |
 | [Time ago pipe](core/time-ago.pipe.md) | Converts a recent past date into a number of days ago. | [Source](../lib/core/pipes/time-ago.pipe.ts) |
-| [User initial pipe](core/user-initial.pipe.md) | Takes the name fields of a UserProcessModel object and extracts and formats the initials. | [Source](../lib/core/pipes/user-initial.pipe.ts) |
+| [User initial pipe](core/user-initial.pipe.md) | Takes the name fields of a `UserProcessModel` object and extracts and formats the initials. | [Source](../lib/core/pipes/user-initial.pipe.ts) |
 
 ## Services
 
@@ -133,7 +133,7 @@ for more information about installing and using the source code.
 | [Activiti alfresco service](core/activiti-alfresco.service.md) | Gets Alfresco Repository folder content based on a Repository account configured in Alfresco Process Services (APS). | [Source](../lib/core/form/services/activiti-alfresco.service.ts) |
 | [Form rendering service](core/form-rendering.service.md) | Maps an APS form field type string onto the corresponding form widget component type. | [Source](../lib/core/form/services/form-rendering.service.ts) |
 | [Form service](core/form.service.md) | Implements Process Services form methods | [Source](../lib/core/form/services/form.service.ts) |
-| [Node service](core/node.service.md) | Gets Alfresco Repository node metadata and creates nodes with metadata.  | [Source](../lib/core/form/services/node.service.ts) |
+| [Node service](core/node.service.md) | Gets Alfresco Repository node metadata and creates nodes with metadata. | [Source](../lib/core/form/services/node.service.ts) |
 | [Process content service](core/process-content.service.md) | Manipulates content related to a Process Instance or Task Instance in APS. | [Source](../lib/core/form/services/process-content.service.ts) |
 | [Alfresco api service](core/alfresco-api.service.md) | Provides access to an initialized **AlfrescoJSApi** instance. | [Source](../lib/core/services/alfresco-api.service.ts) |
 | [Apps process service](core/apps-process.service.md) | Gets details of the Process Services apps that are deployed for the user. | [Source](../lib/core/services/apps-process.service.ts) |
@@ -153,7 +153,7 @@ for more information about installing and using the source code.
 | [Nodes api service](core/nodes-api.service.md) | Accesses and manipulates ACS document nodes using their node IDs. | [Source](../lib/core/services/nodes-api.service.ts) |
 | [Notification service](core/notification.service.md) | Shows a notification message with optional feedback. | [Source](../lib/core/services/notification.service.ts) |
 | [Page title service](core/page-title.service.md) | Sets the page title. | [Source](../lib/core/services/page-title.service.ts) |
-| [People content service](core/people-content.service.md) | Gets information about a Content Services user.   | [Source](../lib/core/services/people-content.service.ts) |
+| [People content service](core/people-content.service.md) | Gets information about a Content Services user. | [Source](../lib/core/services/people-content.service.ts) |
 | [People process service](core/people-process.service.md) | Gets information about Process Services users. | [Source](../lib/core/services/people-process.service.ts) |
 | [Renditions service](core/renditions.service.md) ![Deprecated](docassets/images/DeprecatedIcon.png) | Manages prearranged conversions of content to different formats. | [Source](../lib/core/services/renditions.service.ts) |
 | [Search configuration service](core/search-configuration.service.md) | Provides fine control of parameters to a search. | [Source](../lib/core/services/search-configuration.service.ts) |
@@ -219,7 +219,7 @@ for more information about installing and using the source code.
 | [Search slider component](content-services/search-slider.component.md) | Implements a numeric slider widget for the Search Filter component. | [Source](../lib/content-services/search/components/search-slider/search-slider.component.ts) |
 | [Search sorting picker component](content-services/search-sorting-picker.component.md) | Provides an ability to select one of the predefined sorting definitions for search results: | [Source](../lib/content-services/search/components/search-sorting-picker/search-sorting-picker.component.ts) |
 | [Search text component](content-services/search-text.component.md) | Implements a text input widget for the Search Filter component. | [Source](../lib/content-services/search/components/search-text/search-text.component.ts) |
-| [Search component](content-services/search.component.md) | Searches items for supplied search terms.  | [Source](../lib/content-services/search/components/search.component.ts) |
+| [Search component](content-services/search.component.md) | Searches items for supplied search terms. | [Source](../lib/content-services/search/components/search.component.ts) |
 | [Sites dropdown component](content-services/sites-dropdown.component.md) | Displays a dropdown menu to show and interact with the sites of the current user. | [Source](../lib/content-services/site-dropdown/sites-dropdown.component.ts) |
 | [Like component](content-services/like.component.md) | Allows a user to add "likes" to an item. | [Source](../lib/content-services/social/like.component.ts) |
 | [Rating component](content-services/rating.component.md) | Allows a user to add ratings to an item. | [Source](../lib/content-services/social/rating.component.ts) |
@@ -333,9 +333,9 @@ for more information about installing and using the source code.
 
 | Name | Description | Source link |
 | ---- | ----------- | ----------- |
-| [Process filter service](process-services/process-filter.service.md) | Manage Process Filters, which are pre-configured Process Instance queries.  | [Source](../lib/process-services/process-list/services/process-filter.service.ts) |
-| [Process service](process-services/process.service.md) | Manages Process Instances, Process Variables, and Process Audit Log.  | [Source](../lib/process-services/process-list/services/process.service.ts) |
-| [Task filter service](process-services/task-filter.service.md) | Manage Task Filters, which are pre-configured Task Instance queries.  | [Source](../lib/process-services/task-list/services/task-filter.service.ts) |
+| [Process filter service](process-services/process-filter.service.md) | Manage Process Filters, which are pre-configured Process Instance queries. | [Source](../lib/process-services/process-list/services/process-filter.service.ts) |
+| [Process service](process-services/process.service.md) | Manages Process Instances, Process Variables, and Process Audit Log. | [Source](../lib/process-services/process-list/services/process.service.ts) |
+| [Task filter service](process-services/task-filter.service.md) | Manage Task Filters, which are pre-configured Task Instance queries. | [Source](../lib/process-services/task-list/services/task-filter.service.ts) |
 | [Tasklist service](process-services/tasklist.service.md) | Manages Task Instances. | [Source](../lib/process-services/task-list/services/tasklist.service.ts) |
 
 <!--process-services end-->
diff --git a/docs/content-services/README.md b/docs/content-services/README.md
index 47be042b94..29e22e1b8e 100644
--- a/docs/content-services/README.md
+++ b/docs/content-services/README.md
@@ -22,17 +22,17 @@ for more information about installing and using the source code.
 | [Add permission panel component](add-permission-panel.component.md) | Searches for people or groups to add to the current node permissions. | [Source](../../lib/content-services/permission-manager/components/add-permission/add-permission-panel.component.ts) |
 | [Add permission component](add-permission.component.md) | Searches for people or groups to add to the current node permissions. | [Source](../../lib/content-services/permission-manager/components/add-permission/add-permission.component.ts) |
 | [Permission list component](permission-list.component.md) | Shows node permissions as a table. | [Source](../../lib/content-services/permission-manager/components/permission-list/permission-list.component.ts) |
-| [Search check list component](search-check-list.component.md) | Implements a checklist widget for the Search Filter component. | [Source](../../lib/content-services/search/components/search-check-list/search-check-list.component.ts) |
+| [Search check list component](search-check-list.component.md) | Implements a checklist widget for the [Search Filter component](../content-services/search-filter.component.md). | [Source](../../lib/content-services/search/components/search-check-list/search-check-list.component.ts) |
 | [Search chip list component](search-chip-list.component.md) | Displays search criteria as a set of "chips". | [Source](../../lib/content-services/search/components/search-chip-list/search-chip-list.component.ts) |
 | [Search control component](search-control.component.md) | Displays a input text which shows find-as-you-type suggestions. | [Source](../../lib/content-services/search/components/search-control.component.ts) |
-| [Search date range component](search-date-range.component.md) | Implements a date range widget for the Search Filter component. | [Source](../../lib/content-services/search/components/search-date-range/search-date-range.component.ts) |
+| [Search date range component](search-date-range.component.md) | Implements a date range widget for the [Search Filter component](../content-services/search-filter.component.md). | [Source](../../lib/content-services/search/components/search-date-range/search-date-range.component.ts) |
 | [Search filter component](search-filter.component.md) | Represents a main container component for custom search and faceted search settings. | [Source](../../lib/content-services/search/components/search-filter/search-filter.component.ts) |
-| [Search number range component](search-number-range.component.md) | Implements a number range widget for the Search Filter component. | [Source](../../lib/content-services/search/components/search-number-range/search-number-range.component.ts) |
-| [Search radio component](search-radio.component.md) | Implements a radio button list widget for the Search Filter component. | [Source](../../lib/content-services/search/components/search-radio/search-radio.component.ts) |
-| [Search slider component](search-slider.component.md) | Implements a numeric slider widget for the Search Filter component. | [Source](../../lib/content-services/search/components/search-slider/search-slider.component.ts) |
+| [Search number range component](search-number-range.component.md) | Implements a number range widget for the [Search Filter component](../content-services/search-filter.component.md). | [Source](../../lib/content-services/search/components/search-number-range/search-number-range.component.ts) |
+| [Search radio component](search-radio.component.md) | Implements a radio button list widget for the [Search Filter component](../content-services/search-filter.component.md). | [Source](../../lib/content-services/search/components/search-radio/search-radio.component.ts) |
+| [Search slider component](search-slider.component.md) | Implements a numeric slider widget for the [Search Filter component](../content-services/search-filter.component.md). | [Source](../../lib/content-services/search/components/search-slider/search-slider.component.ts) |
 | [Search sorting picker component](search-sorting-picker.component.md) | Provides an ability to select one of the predefined sorting definitions for search results: | [Source](../../lib/content-services/search/components/search-sorting-picker/search-sorting-picker.component.ts) |
-| [Search text component](search-text.component.md) | Implements a text input widget for the Search Filter component. | [Source](../../lib/content-services/search/components/search-text/search-text.component.ts) |
-| [Search component](search.component.md) | Searches items for supplied search terms.  | [Source](../../lib/content-services/search/components/search.component.ts) |
+| [Search text component](search-text.component.md) | Implements a text input widget for the [Search Filter component](../content-services/search-filter.component.md). | [Source](../../lib/content-services/search/components/search-text/search-text.component.ts) |
+| [Search component](search.component.md) | Searches items for supplied search terms. | [Source](../../lib/content-services/search/components/search.component.ts) |
 | [Sites dropdown component](sites-dropdown.component.md) | Displays a dropdown menu to show and interact with the sites of the current user. | [Source](../../lib/content-services/site-dropdown/sites-dropdown.component.ts) |
 | [Like component](like.component.md) | Allows a user to add "likes" to an item. | [Source](../../lib/content-services/social/like.component.ts) |
 | [Rating component](rating.component.md) | Allows a user to add ratings to an item. | [Source](../../lib/content-services/social/rating.component.ts) |
@@ -43,7 +43,7 @@ for more information about installing and using the source code.
 | [Upload button component](upload-button.component.md) | Activates a file upload. | [Source](../../lib/content-services/upload/components/upload-button.component.ts) |
 | [Upload drag area component](upload-drag-area.component.md) | Adds a drag and drop area to upload files to ACS. | [Source](../../lib/content-services/upload/components/upload-drag-area.component.ts) |
 | [Upload version button component](upload-version-button.component.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Activates a file version upload. | [Source](../../lib/content-services/upload/components/upload-version-button.component.ts) |
-| [Version list component](version-list.component.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Displays the version history of a node in a Version Manager component. | [Source](../../lib/content-services/version-manager/version-list.component.ts) |
+| [Version list component](version-list.component.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Displays the version history of a node in a [Version Manager component](../content-services/version-manager.component.md). | [Source](../../lib/content-services/version-manager/version-list.component.ts) |
 | [Version manager component](version-manager.component.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Displays the version history of a node with the ability to upload a new version. | [Source](../../lib/content-services/version-manager/version-manager.component.ts) |
 | [Webscript component](webscript.component.md) | Provides access to Webscript features. | [Source](../../lib/content-services/webscript/webscript.component.ts) |
 
@@ -72,12 +72,12 @@ for more information about installing and using the source code.
 | ---- | ----------- | ----------- |
 | [Content node dialog service](content-node-dialog.service.md) | Displays and manages dialogs for selecting content to open, copy or upload. | [Source](../../lib/content-services/content-node-selector/content-node-dialog.service.ts) |
 | [Custom resources service](custom-resources.service.md) | Manages Document List information that is specific to a user. | [Source](../../lib/content-services/document-list/services/custom-resources.service.ts) |
-| [Document actions service](document-actions.service.md) | Implements the document menu actions for the Document List component. | [Source](../../lib/content-services/document-list/services/document-actions.service.ts) |
-| [Document list service](document-list.service.md) | Implements node operations used by the Document List component. | [Source](../../lib/content-services/document-list/services/document-list.service.ts) |
-| [Folder actions service](folder-actions.service.md) | Implements the folder menu actions for the Document List component. | [Source](../../lib/content-services/document-list/services/folder-actions.service.ts) |
+| [Document actions service](document-actions.service.md) | Implements the document menu actions for the [Document List component](../content-services/document-list.component.md). | [Source](../../lib/content-services/document-list/services/document-actions.service.ts) |
+| [Document list service](document-list.service.md) | Implements node operations used by the [Document List component](../content-services/document-list.component.md). | [Source](../../lib/content-services/document-list/services/document-list.service.ts) |
+| [Folder actions service](folder-actions.service.md) | Implements the folder menu actions for the [Document List component](../content-services/document-list.component.md). | [Source](../../lib/content-services/document-list/services/folder-actions.service.ts) |
 | [Node permission dialog service](node-permission-dialog.service.md) | Displays dialogs to let the user set node permissions. | [Source](../../lib/content-services/permission-manager/services/node-permission-dialog.service.ts) |
 | [Node permission service](node-permission.service.md) | Manages role permissions for content nodes. | [Source](../../lib/content-services/permission-manager/services/node-permission.service.ts) |
-| [Search filter service](search-filter.service.md) | Registers widgets for use with the Search Filter component. | [Source](../../lib/content-services/search/components/search-filter/search-filter.service.ts) |
+| [Search filter service](search-filter.service.md) | Registers widgets for use with the [Search Filter component](../content-services/search-filter.component.md). | [Source](../../lib/content-services/search/components/search-filter/search-filter.service.ts) |
 | [Search query builder service](search-query-builder.service.md) | Stores information from all the custom search and faceted search widgets, compiles and runs the final search query. | [Source](../../lib/content-services/search/search-query-builder.service.ts) |
 | [Rating service](rating.service.md) | Manages ratings for items in Content Services. | [Source](../../lib/content-services/social/services/rating.service.ts) |
 | [Tag service](tag.service.md) | Manages tags in Content Services. | [Source](../../lib/content-services/tag/services/tag.service.ts) |
@@ -88,4 +88,4 @@ for more information about installing and using the source code.
 
 | Name | Description | Source link |
 | ---- | ----------- | ----------- |
-| [Search Widget interface](search-widget.interface.md) | Specifies required properties for Search filter component widgets. | [Source](../../lib/content-services/search/search-widget.interface.ts) |
+| [Search Widget interface](search-widget.interface.md) | Specifies required properties for [Search filter component](../content-services/search-filter.component.md) widgets. | [Source](../../lib/content-services/search/search-widget.interface.ts) |
diff --git a/docs/content-services/add-permission-panel.component.md b/docs/content-services/add-permission-panel.component.md
index 4277ab124e..529c844a37 100644
--- a/docs/content-services/add-permission-panel.component.md
+++ b/docs/content-services/add-permission-panel.component.md
@@ -25,7 +25,7 @@ Searches for people or groups to add to the current node permissions.
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | select | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when a permission list item is selected. |
 
 ## Details
diff --git a/docs/content-services/add-permission.component.md b/docs/content-services/add-permission.component.md
index 3492682017..00c055a28f 100644
--- a/docs/content-services/add-permission.component.md
+++ b/docs/content-services/add-permission.component.md
@@ -25,13 +25,13 @@ Searches for people or groups to add to the current node permissions.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | nodeId | `string` |  | ID of the target node. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when an error occurs during the update. |
 | success | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>` | Emitted when the node is updated successfully. |
 
diff --git a/docs/content-services/breadcrumb.component.md b/docs/content-services/breadcrumb.component.md
index e833fa35d0..a292c495f7 100644
--- a/docs/content-services/breadcrumb.component.md
+++ b/docs/content-services/breadcrumb.component.md
@@ -24,18 +24,18 @@ Indicates the current position within a navigation hierarchy.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
-| folderNode | [`MinimalNodeEntryEntity`](../content-services/document-library.model.md) |  null | Active node, builds UI based on folderNode.path.elements collection. |
+| ---- | ---- | ------------- | ----------- |
+| folderNode | [`MinimalNodeEntryEntity`](../content-services/document-library.model.md) | null | Active node, builds UI based on folderNode.path.elements collection. |
 | maxItems | `number` |  | Maximum number of nodes to display before wrapping them with a dropdown element. |
-| root | `string` |  null | (optional) Name of the root element of the breadcrumb. You can use this property to rename "Company Home" to "Personal Files" for example. You can use an i18n resource key for the property value. |
-| rootId | `string` |  null | (optional) The id of the root element. You can use this property to set a custom element the breadcrumb should start with. |
+| root | `string` | null | (optional) Name of the root element of the breadcrumb. You can use this property to rename "Company Home" to "Personal Files" for example. You can use an i18n resource key for the property value. |
+| rootId | `string` | null | (optional) The id of the root element. You can use this property to set a custom element the breadcrumb should start with. |
 | target | [`DocumentListComponent`](../content-services/document-list.component.md) |  | (optional) [Document List component](../content-services/document-list.component.md) to operate with. The list will update when the breadcrumb is clicked. |
-| transform | `function` |  | Transformation to be performed on the chosen/folder node before building the breadcrumb UI. Can be useful when custom formatting is needed for the breadcrumb. You can change the path elements from the node that are used to build the breadcrumb using this function. |
+| transform | `Function` |  | Transformation to be performed on the chosen/folder node before building the breadcrumb UI. Can be useful when custom formatting is needed for the breadcrumb. You can change the path elements from the node that are used to build the breadcrumb using this function. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | navigate | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`PathElementEntity`](../../lib/content-services/document-list/models/document-library.model.ts)`>` | Emitted when the user clicks on a breadcrumb. |
 
 ## Details
diff --git a/docs/content-services/content-action.component.md b/docs/content-services/content-action.component.md
index 1776a46c78..79067631f9 100644
--- a/docs/content-services/content-action.component.md
+++ b/docs/content-services/content-action.component.md
@@ -13,19 +13,15 @@ Adds options to a Document List actions menu for a particular content type.
 ## Contents
 
 -   [Basic Usage](#basic-usage)
-
 -   [Class members](#class-members)
-
     -   [Properties](#properties)
     -   [Events](#events)
-
 -   [Details](#details)
-
     -   [Examples](#examples)
     -   [Conditional visibility](#conditional-visibility)
+    -   [Conditional disabled state](#conditional-disabled-state)
     -   [Customizing built-in actions](#customizing-built-in-actions)
     -   [Error, Permission and Success callbacks](#error-permission-and-success-callbacks)
-
 -   [See also](#see-also)
 
 ## Basic Usage
@@ -86,24 +82,24 @@ export class MyView {
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | disableWithNoPermission | `boolean` |  | Should this action be disabled in the menu if the user doesn't have permission for it? |
-| disabled | `boolean \|Function` | false | Is the menu item disabled? |
+| disabled | `boolean \| Function` | false | Is the menu item disabled? |
 | handler | `string` |  | System actions. Can be "delete", "download", "copy" or "move". |
 | icon | `string` |  | The name of the icon to display next to the menu command (can be left blank). |
 | permission | `string` |  | The permission type. |
-| target | `string` |  [`ContentActionTarget`](../../lib/content-services/document-list/models/content-action.model.ts).All | Type of item that the action applies to. Can be "document" or "folder" |
+| target | `string` |  | Type of item that the action applies to. Can be "document" or "folder" |
 | title | `string` | "Action" | The title of the action as shown in the menu. |
 | visible | `boolean \| Function` | true | Visibility state (see examples). |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` | Emitted when an error occurs during the action. Applies to copy and move actions. |
 | execute | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` | Emitted when the user selects the action from the menu. |
 | permissionEvent | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` | Emitted when a permission error occurs |
-| success | `EventEmitter<Object>` | Emitted when the action succeeds with the success string message. Applies to copy, move and delete actions. |
+| success | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` | Emitted when the action succeeds with the success string message. Applies to copy, move and delete actions. |
 
 ## Details
 
@@ -383,8 +379,8 @@ funcName = (parameters): boolean => {
 
 Similar to `visible` property, it is possible to control the `disabled` state with the following scenarios:
 
-- direct value of `boolean` type
-- binding to a property of the `Function` type that evaluates condition and returns `boolean` value
+-   direct value of `boolean` type
+-   binding to a property of the `Function` type that evaluates condition and returns `boolean` value
 
 #### Using direct value of boolean type
 
diff --git a/docs/content-services/content-metadata.component.md b/docs/content-services/content-metadata.component.md
index b649d1d50e..a1889611dc 100644
--- a/docs/content-services/content-metadata.component.md
+++ b/docs/content-services/content-metadata.component.md
@@ -1,7 +1,7 @@
 ---
 Added: v2.1.0
 Status: Active
-Last reviewed: 2018-04-16
+Last reviewed: 2018-08-07
 ---
 
 # Content Metadata Card component
@@ -15,6 +15,7 @@ Displays and edits metadata related to a node.
 ```html
 <adf-content-metadata-card
     [displayEmpty]="false"
+    [toggleDisplayProperties]="displayDefaultProperties"
     [preset]="'*'"
     [node]="node">
 </adf-content-metadata-card>
@@ -25,11 +26,12 @@ Displays and edits metadata related to a node.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | displayEmpty | `boolean` | false | Toggles whether to display empty values in the card view |
+| displayDefaultProperties | `boolean` | true | Toggles whether to display metadata fields values in the card view |
 | editable | `boolean` | false | Toggles whether the edit button should be shown |
 | expanded | `boolean` | false | Toggles between expanded (ie, full information) and collapsed (ie, reduced information) in the display |
-| multi | `boolean` | false | The multi parameter of the underlying material expansion panel |
+| multi | `boolean` | false | The multi parameter of the underlying material expansion panel, set to true to allow multi accordion to be expanded at the same time |
 | node | [`MinimalNodeEntryEntity`](../content-services/document-library.model.md) |  | (required) The node entity to fetch metadata about |
 | preset | `string` |  | Name of the metadata preset, which defines aspects and their properties |
 
@@ -124,7 +126,7 @@ A final example shows the same process applied to a custom preset called "kitten
 ### Layout oriented config
 
 You can also go beyond the aspect oriented configuration if you need to configure the groups and properties in a more detailed way. With this type of configuration any property of any aspect/type
-can be "cherry picked" and grouped into an accordion drawer, along wwith a translatable title
+can be "cherry picked" and grouped into an accordion drawer, along with a translatable title
 defined in the preset configuration.
 
 #### Basic elements
diff --git a/docs/content-services/content-node-dialog.service.md b/docs/content-services/content-node-dialog.service.md
index e89ec34c3f..d4521c76bb 100644
--- a/docs/content-services/content-node-dialog.service.md
+++ b/docs/content-services/content-node-dialog.service.md
@@ -14,41 +14,41 @@ Displays and manages dialogs for selecting content to open, copy or upload.
 
 -   **close**()<br/>
     Closes the currently open dialog.
--   **getTitleTranslation**(action: `string` = `null`, name: `string` = `null`): `string`<br/>
+-   **getTitleTranslation**(action: `string`, name: `string`): `string`<br/>
     Gets the translation of the dialog title.
     -   _action:_ `string`  - Name of the action to display in the dialog title
     -   _name:_ `string`  - Name of the item on which the action is being performed
     -   **Returns** `string` - Translated version of the title
--   **openCopyMoveDialog**(action: `string` = `null`, contentEntry: [`MinimalNodeEntryEntity`](../content-services/document-library.model.md) = `null`, permission?: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`[]>`<br/>
+-   **openCopyMoveDialog**(action: `string`, contentEntry: [`MinimalNodeEntryEntity`](../content-services/document-library.model.md), permission?: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`[]>`<br/>
     Opens a dialog to copy or move an item to a new location.
     -   _action:_ `string`  - Name of the action (eg, "Copy" or "Move") to show in the title
     -   _contentEntry:_ [`MinimalNodeEntryEntity`](../content-services/document-library.model.md)  - Item to be copied or moved
     -   _permission:_ `string`  - (Optional) Permission for the operation
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`[]>` - Information about files that were copied/moved
--   **openFileBrowseDialogByFolderId**(folderNodeId: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`[]>`<br/>
+-   **openFileBrowseDialogByFolderId**(folderNodeId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`[]>`<br/>
     Opens a file browser at a chosen folder location.
     -   _folderNodeId:_ `string`  - ID of the folder to use
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`[]>` - Information about the selected file(s)
 -   **openFileBrowseDialogBySite**(): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`[]>`<br/>
     Opens a file browser at a chosen site location.
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`[]>` - Information about the selected file(s)
--   **openFolderBrowseDialogByFolderId**(folderNodeId: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`[]>`<br/>
+-   **openFolderBrowseDialogByFolderId**(folderNodeId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`[]>`<br/>
     Opens a folder browser at a chosen folder location.
     -   _folderNodeId:_ `string`  - ID of the folder to use
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`[]>` - Information about the selected folder(s)
 -   **openFolderBrowseDialogBySite**(): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`[]>`<br/>
     Opens a folder browser at a chosen site location.
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`[]>` - Information about the selected folder(s)
--   **openLockNodeDialog**(contentEntry: [`MinimalNodeEntryEntity`](../content-services/document-library.model.md) = `null`): [`Subject`](http://reactivex.io/documentation/subject.html)`<string>`<br/>
+-   **openLockNodeDialog**(contentEntry: [`MinimalNodeEntryEntity`](../content-services/document-library.model.md)): [`Subject`](http://reactivex.io/documentation/subject.html)`<string>`<br/>
     Opens a lock node dialog.
     -   _contentEntry:_ [`MinimalNodeEntryEntity`](../content-services/document-library.model.md)  - Node to lock
     -   **Returns** [`Subject`](http://reactivex.io/documentation/subject.html)`<string>` - Error/status message (if any)
--   **openUploadFileDialog**(action: `string` = `null`, contentEntry: [`MinimalNodeEntryEntity`](../content-services/document-library.model.md) = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`[]>`<br/>
+-   **openUploadFileDialog**(action: `string`, contentEntry: [`MinimalNodeEntryEntity`](../content-services/document-library.model.md)): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`[]>`<br/>
     Opens a dialog to choose a file to upload.
     -   _action:_ `string`  - Name of the action to show in the title
     -   _contentEntry:_ [`MinimalNodeEntryEntity`](../content-services/document-library.model.md)  - Item to upload
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`[]>` - Information about the chosen file(s)
--   **openUploadFolderDialog**(action: `string` = `null`, contentEntry: [`MinimalNodeEntryEntity`](../content-services/document-library.model.md) = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`[]>`<br/>
+-   **openUploadFolderDialog**(action: `string`, contentEntry: [`MinimalNodeEntryEntity`](../content-services/document-library.model.md)): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`[]>`<br/>
     Opens a dialog to choose folders to upload.
     -   _action:_ `string`  - Name of the action to show in the title
     -   _contentEntry:_ [`MinimalNodeEntryEntity`](../content-services/document-library.model.md)  - Item to upload
diff --git a/docs/content-services/content-node-selector-panel.component.md b/docs/content-services/content-node-selector-panel.component.md
index a9bc5d4187..85e9319fa0 100644
--- a/docs/content-services/content-node-selector-panel.component.md
+++ b/docs/content-services/content-node-selector-panel.component.md
@@ -28,20 +28,20 @@ Opens a Content Node Selector in its own dialog window.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
-| breadcrumbTransform | `function` |  | Transformation to be performed on the chosen/folder node before building the breadcrumb UI. Can be useful when custom formatting is needed for the breadcrumb. You can change the path elements from the node that are used to build the breadcrumb using this function. |
-| currentFolderId | `string` |  null | Node ID of the folder currently listed. |
+| ---- | ---- | ------------- | ----------- |
+| breadcrumbTransform | `Function` |  | Transformation to be performed on the chosen/folder node before building the breadcrumb UI. Can be useful when custom formatting is needed for the breadcrumb. You can change the path elements from the node that are used to build the breadcrumb using this function. |
+| currentFolderId | `string` | null | Node ID of the folder currently listed. |
 | dropdownHideMyFiles | `boolean` | false | Hide the "My Files" option added to the site list by default. See the [Sites Dropdown component](sites-dropdown.component.md) for more information. |
-| dropdownSiteList | [`SitePaging`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-core-rest-api/docs/SitePaging.md) |  null | Custom site for site dropdown same as siteList. See the [Sites Dropdown component](sites-dropdown.component.md) for more information. |
-| imageResolver | [`ImageResolver`](../../lib/content-services/document-list/data/image-resolver.model.ts) |  null | Custom image resolver function. See the [Document List component](document-list.component.md#custom-row-filter) for more information. |
-| isSelectionValid | [`ValidationFunction`](../../lib/content-services/content-node-selector/content-node-selector-panel.component.ts) |  defaultValidation | Function used to decide if the selected node has permission to be selected. Default value is a function that always returns true. |
+| dropdownSiteList | [`SitePaging`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-core-rest-api/docs/SitePaging.md) | null | Custom site for site dropdown same as siteList. See the [Sites Dropdown component](sites-dropdown.component.md) for more information. |
+| imageResolver | `ImageResolver` | null | Custom image resolver function. See the [Document List component](document-list.component.md#custom-row-filter) for more information. |
+| isSelectionValid | `ValidationFunction` | defaultValidation | Function used to decide if the selected node has permission to be selected. Default value is a function that always returns true. |
 | pageSize | `number` |  | Number of items shown per page in the list. |
-| rowFilter | [`RowFilter`](../../lib/content-services/document-list/data/row-filter.model.ts) |  null | Custom row filter function. See the [Document List component](document-list.component.md#custom-row-filter) for more information. |
+| rowFilter | `RowFilter` | null | Custom row filter function. See the [Document List component](document-list.component.md#custom-row-filter) for more information. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | select | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`[]>` | Emitted when the user has chosen an item. |
 
 ## Details
diff --git a/docs/content-services/content-node-selector.component.md b/docs/content-services/content-node-selector.component.md
index cd9092540a..1043a87b8d 100644
--- a/docs/content-services/content-node-selector.component.md
+++ b/docs/content-services/content-node-selector.component.md
@@ -13,16 +13,12 @@ Allows a user to select items from a Content Services repository.
 ## Contents
 
 -   [Class members](#class-members)
-
     -   [Properties](#properties)
-
 -   [Details](#details)
-
     -   [Showing the dialog](#showing-the-dialog)
     -   [Usage example](#usage-example)
     -   [RowFilter and ImageResolver](#rowfilter-and-imageresolver)
     -   [Using the breadcrumbTransform function](#using-the-breadcrumbtransform-function)
-
 -   [See also](#see-also)
 
 ## Class members
@@ -30,14 +26,14 @@ Allows a user to select items from a Content Services repository.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
-| currentFolderId | `string` |  null | (**Deprecated:** in 2.1.0)  |
-| dropdownHideMyFiles | `boolean` | false | (**Deprecated:** in 2.1.0)  |
-| dropdownSiteList | [`SitePaging`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-core-rest-api/docs/SitePaging.md) |  null | (**Deprecated:** in 2.1.0)  |
-| imageResolver | [`ImageResolver`](../../lib/content-services/document-list/data/image-resolver.model.ts) |  null | (**Deprecated:** in 2.1.0)  |
-| pageSize | `number` |  | (**Deprecated:** in 2.1.0)  |
-| rowFilter | [`RowFilter`](../../lib/content-services/document-list/data/row-filter.model.ts) |  null | (**Deprecated:** in 2.1.0)  |
-| title | `string` |  null | (**Deprecated:** in 2.1.0)  |
+| ---- | ---- | ------------- | ----------- |
+| currentFolderId | `string` | null | (**Deprecated:** in 2.1.0) |
+| dropdownHideMyFiles | `boolean` | false | (**Deprecated:** in 2.1.0) |
+| dropdownSiteList | [`SitePaging`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-core-rest-api/docs/SitePaging.md) | null | (**Deprecated:** in 2.1.0) |
+| imageResolver | `ImageResolver` | null | (**Deprecated:** in 2.1.0) |
+| pageSize | `number` |  | (**Deprecated:** in 2.1.0) |
+| rowFilter | `RowFilter` | null | (**Deprecated:** in 2.1.0) |
+| title | `string` | null | (**Deprecated:** in 2.1.0) |
 
 ## Details
 
diff --git a/docs/content-services/custom-resources.service.md b/docs/content-services/custom-resources.service.md
index 3955f78f6c..2ef69224be 100644
--- a/docs/content-services/custom-resources.service.md
+++ b/docs/content-services/custom-resources.service.md
@@ -12,45 +12,45 @@ Manages Document List information that is specific to a user.
 
 ### Methods
 
--   **getCorrespondingNodeIds**(nodeId: `string` = `null`, pagination: [`PaginationModel`](../../lib/core/models/pagination.model.ts) = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<string[]>`<br/>
+-   **getCorrespondingNodeIds**(nodeId: `string`, pagination: [`PaginationModel`](../../lib/core/models/pagination.model.ts)): [`Observable`](http://reactivex.io/documentation/observable.html)`<string[]>`<br/>
     Gets the contents of one of the well-known aliases in the form of node ID strings.
     -   _nodeId:_ `string`  - ID of the target folder node
     -   _pagination:_ [`PaginationModel`](../../lib/core/models/pagination.model.ts)  - Specifies how to paginate the results
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<string[]>` - List of node IDs
--   **getRecentFiles**(personId: `string` = `null`, pagination: [`PaginationModel`](../../lib/core/models/pagination.model.ts) = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>`<br/>
+-   **getRecentFiles**(personId: `string`, pagination: [`PaginationModel`](../../lib/core/models/pagination.model.ts)): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>`<br/>
     Gets files recently accessed by a user.
     -   _personId:_ `string`  - ID of the user
     -   _pagination:_ [`PaginationModel`](../../lib/core/models/pagination.model.ts)  - Specifies how to paginate the results
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>` - List of nodes for the recently used files
--   **isCustomSource**(folderId: `string` = `null`): `boolean`<br/>
+-   **isCustomSource**(folderId: `string`): `boolean`<br/>
     Is the folder ID one of the well-known aliases?
     -   _folderId:_ `string`  - Folder ID name to check
     -   **Returns** `boolean` - True if the ID is a well-known name, false otherwise
--   **loadFavorites**(pagination: [`PaginationModel`](../../lib/core/models/pagination.model.ts) = `null`, includeFields: `string[]` = `[]`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>`<br/>
+-   **loadFavorites**(pagination: [`PaginationModel`](../../lib/core/models/pagination.model.ts), includeFields: `string[]` = `[]`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>`<br/>
     Gets favorite files for the current user.
     -   _pagination:_ [`PaginationModel`](../../lib/core/models/pagination.model.ts)  - Specifies how to paginate the results
     -   _includeFields:_ `string[]`  - List of data field names to include in the results
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>` - List of favorite files
--   **loadFolderByNodeId**(nodeId: `string` = `null`, pagination: [`PaginationModel`](../../lib/core/models/pagination.model.ts) = `null`, includeFields: `string[]` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>`<br/>
+-   **loadFolderByNodeId**(nodeId: `string`, pagination: [`PaginationModel`](../../lib/core/models/pagination.model.ts), includeFields: `string[]`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>`<br/>
     Gets a folder's contents.
     -   _nodeId:_ `string`  - ID of the target folder node
     -   _pagination:_ [`PaginationModel`](../../lib/core/models/pagination.model.ts)  - Specifies how to paginate the results
     -   _includeFields:_ `string[]`  - List of data field names to include in the results
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>` - List of items contained in the folder
--   **loadMemberSites**(pagination: [`PaginationModel`](../../lib/core/models/pagination.model.ts) = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>`<br/>
+-   **loadMemberSites**(pagination: [`PaginationModel`](../../lib/core/models/pagination.model.ts)): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>`<br/>
     Gets sites that the current user is a member of.
     -   _pagination:_ [`PaginationModel`](../../lib/core/models/pagination.model.ts)  - Specifies how to paginate the results
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>` - List of sites
--   **loadSharedLinks**(pagination: [`PaginationModel`](../../lib/core/models/pagination.model.ts) = `null`, includeFields: `string[]` = `[]`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>`<br/>
+-   **loadSharedLinks**(pagination: [`PaginationModel`](../../lib/core/models/pagination.model.ts), includeFields: `string[]` = `[]`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>`<br/>
     Gets shared links for the current user.
     -   _pagination:_ [`PaginationModel`](../../lib/core/models/pagination.model.ts)  - Specifies how to paginate the results
     -   _includeFields:_ `string[]`  - List of data field names to include in the results
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>` - List of shared links
--   **loadSites**(pagination: [`PaginationModel`](../../lib/core/models/pagination.model.ts) = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>`<br/>
+-   **loadSites**(pagination: [`PaginationModel`](../../lib/core/models/pagination.model.ts)): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>`<br/>
     Gets all sites in the respository.
     -   _pagination:_ [`PaginationModel`](../../lib/core/models/pagination.model.ts)  - Specifies how to paginate the results
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>` - List of sites
--   **loadTrashcan**(pagination: [`PaginationModel`](../../lib/core/models/pagination.model.ts) = `null`, includeFields: `string[]` = `[]`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`DeletedNodesPaging`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-core-rest-api/docs/DeletedNodesPaging.md)`>`<br/>
+-   **loadTrashcan**(pagination: [`PaginationModel`](../../lib/core/models/pagination.model.ts), includeFields: `string[]` = `[]`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`DeletedNodesPaging`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-core-rest-api/docs/DeletedNodesPaging.md)`>`<br/>
     Gets all items currently in the trash.
     -   _pagination:_ [`PaginationModel`](../../lib/core/models/pagination.model.ts)  - Specifies how to paginate the results
     -   _includeFields:_ `string[]`  - List of data field names to include in the results
diff --git a/docs/content-services/document-actions.service.md b/docs/content-services/document-actions.service.md
index 8093412d14..b98b64d9fe 100644
--- a/docs/content-services/document-actions.service.md
+++ b/docs/content-services/document-actions.service.md
@@ -12,18 +12,18 @@ Implements the document menu actions for the [Document List component](../conten
 
 ### Methods
 
--   **canExecuteAction**(obj: `any` = `null`): `boolean`<br/>
+-   **canExecuteAction**(obj: `any`): `boolean`<br/>
     Checks if actions can be executed for an item.
     -   _obj:_ `any`  - Item to receive an action
     -   **Returns** `boolean` - True if the action can be executed on this item, false otherwise
--   **getHandler**(key: `string` = `null`): [`ContentActionHandler`](../../lib/content-services/document-list/models/content-action.model.ts)<br/>
+-   **getHandler**(key: `string`): `ContentActionHandler`<br/>
     Gets the handler for an action.
     -   _key:_ `string`  - Identifier of the action
-    -   **Returns** [`ContentActionHandler`](../../lib/content-services/document-list/models/content-action.model.ts) - The handler for the action
--   **setHandler**(key: `string` = `null`, handler: [`ContentActionHandler`](../../lib/content-services/document-list/models/content-action.model.ts) = `null`): `boolean`<br/>
+    -   **Returns** `ContentActionHandler` - The handler for the action
+-   **setHandler**(key: `string`, handler: `ContentActionHandler`): `boolean`<br/>
     Sets a new handler for an action.
     -   _key:_ `string`  - Identifier of the action
-    -   _handler:_ [`ContentActionHandler`](../../lib/content-services/document-list/models/content-action.model.ts)  - Handler for the action
+    -   _handler:_ `ContentActionHandler`  - Handler for the action
     -   **Returns** `boolean` - False if the key was an empty/null string, true otherwise
 
 ## Details
diff --git a/docs/content-services/document-list.component.md b/docs/content-services/document-list.component.md
index 8ee4dd07e1..d6f15c0002 100644
--- a/docs/content-services/document-list.component.md
+++ b/docs/content-services/document-list.component.md
@@ -13,14 +13,10 @@ Displays the documents from a repository.
 ## Contents
 
 -   [Basic Usage](#basic-usage)
-
 -   [Class members](#class-members)
-
     -   [Properties](#properties)
     -   [Events](#events)
-
 -   [Details](#details)
-
     -   [DOM Events](#dom-events)
     -   [Conditional visibility](#conditional-visibility)
     -   [Card view](#card-view)
@@ -34,14 +30,11 @@ Displays the documents from a repository.
     -   [Location Column](#location-column)
     -   [Actions](#actions)
     -   [Navigation mode](#navigation-mode)
-
 -   [Advanced usage and customization](#advanced-usage-and-customization)
-
     -   [Custom row filter](#custom-row-filter)
     -   [Custom image resolver](#custom-image-resolver)
     -   [Custom 'empty folder' template](#custom-empty-folder-template)
     -   [Custom 'permission denied' template](#custom-permission-denied-template)
-
 -   [See also](#see-also)
 
 ## Basic Usage
@@ -60,46 +53,46 @@ Displays the documents from a repository.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | allowDropFiles | `boolean` | false | Toggle file drop support for rows (see [Upload Directive](../core/upload.directive.md) for further details |
 | contentActions | `boolean` | false | Toggles content actions for each row |
 | contentActionsPosition | `string` | "right" | Position of the content actions dropdown menu. Can be set to "left" or "right". |
 | contextMenuActions | `boolean` | false | Toggles context menus for each row |
-| currentFolderId | `string` |  null | The ID of the folder node to display or a reserved string alias for special sources |
-| display | `string` |  [`DisplayMode`](../../lib/core/datatable/components/datatable/datatable.component.ts).List | Change the display mode of the table. Can be "list" or "gallery". |
-| emptyFolderImageUrl | `string` | "./assets/images/empty_doc_lib.svg" | Custom image for empty folder. Default value: './assets/images/empty_doc_lib.svg' |
+| currentFolderId | `string` | null | The ID of the folder node to display or a reserved string alias for special sources |
+| display | `string` | DisplayMode.List | Change the display mode of the table. Can be "list" or "gallery". |
+| emptyFolderImageUrl | `string` |  | Custom image for empty folder. Default value: './assets/images/empty_doc_lib.svg' |
 | enableInfiniteScrolling | `boolean` | false | Set document list to work in infinite scrolling mode |
-| folderNode | [`MinimalNodeEntryEntity`](../content-services/document-library.model.md) |  null | Currently displayed folder node |
-| imageResolver | `any \| null` |  null | Custom image resolver |
+| folderNode | [`MinimalNodeEntryEntity`](../content-services/document-library.model.md) | null | Currently displayed folder node |
+| imageResolver | `any \| null` | null | Custom image resolver |
 | includeFields | `string[]` |  | Include additional information about the node in the server request.for example: association, isLink, isLocked and others. |
 | loading | `boolean` | false | Toggles the loading state and animated spinners for the component. Used in combination with `navigate=false` to perform custom navigation and loading state indication. |
 | locationFormat | `string` | "/" | The default route for all the location-based columns (if declared). |
 | maxItems | `number` |  | Default value is stored into user preference settings use it only if you are not using the pagination |
 | multiselect | `boolean` | false | Toggles multiselect mode |
 | navigate | `boolean` | true | Toggles navigation to folder content or file preview |
-| navigationMode | `string` |  [`DocumentListComponent`](../content-services/document-list.component.md).DOUBLE_CLICK_NAVIGATION | User interaction for folder navigation or file preview. Valid values are "click" and "dblclick". Default value: "dblclick" |
-| node | [`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts) |  null | The Document list will show all the nodes contained in the [`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts) entity |
-| permissionsStyle | [`PermissionStyleModel`](../../lib/content-services/document-list/models/permissions-style.model.ts)`[]` |  \[] | Define a set of CSS styles styles to apply depending on the permission of the user on that node. See the [Permission Style model](../../lib/content-services/document-list/models/permissions-style.model.ts) page for further details and examples. |
-| rowFilter | `any \| null` |  null | Custom row filter |
+| navigationMode | `string` |  | User interaction for folder navigation or file preview. Valid values are "click" and "dblclick". Default value: "dblclick" |
+| node | [`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts) | null | The Document list will show all the nodes contained in the [NodePaging](../../lib/content-services/document-list/models/document-library.model.ts) entity |
+| permissionsStyle | [`PermissionStyleModel`](../../lib/content-services/document-list/models/permissions-style.model.ts)`[]` | \[] | Define a set of CSS styles styles to apply depending on the permission of the user on that node. See the [Permission Style model](../../lib/content-services/document-list/models/permissions-style.model.ts) page for further details and examples. |
+| rowFilter | `any \| null` | null | Custom row filter |
 | rowStyle | `string` |  | The inline style to apply to every row. See the Angular NgStyle docs for more details and usage examples. |
 | rowStyleClass | `string` |  | The CSS class to apply to every row |
 | selectionMode | `string` | "single" | Row selection mode. Can be null, `single` or `multiple`. For `multiple` mode, you can use Cmd (macOS) or Ctrl (Win) modifier key to toggle selection for multiple rows. |
 | showHeader | `boolean` | true | Toggles the header |
 | skipCount | `number` | 0 | Number of elements to skip over for pagination purposes |
-| sorting | `string[]` |  ['name', 'asc'] | Defines default sorting. The format is an array of 2 strings `[key, direction]` i.e. `['name', 'desc']` or `['name', 'asc']`. Set this value only if you want to override the default sorting detected by the component based on columns. |
+| sorting | `string[]` | ['name', 'asc'] | Defines default sorting. The format is an array of 2 strings `[key, direction]` i.e. `['name', 'desc']` or `['name', 'asc']`. Set this value only if you want to override the default sorting detected by the component based on columns. |
 | sortingMode | `string` | "client" | Defines sorting mode. Can be either `client` or `server`. |
 | thumbnails | `boolean` | false | Show document thumbnails rather than icons |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when the API fails to get the Document List data |
 | folderChange | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`NodeEntryEvent`](../../lib/content-services/document-list/components/node.event.ts)`>` | Emitted when the current display folder changes |
 | nodeClick | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`NodeEntityEvent`](../../lib/content-services/document-list/components/node.event.ts)`>` | Emitted when the user clicks a list node |
 | nodeDblClick | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`NodeEntityEvent`](../../lib/content-services/document-list/components/node.event.ts)`>` | Emitted when the user double-clicks a list node |
-| preview | `EventEmitter<NodeEntityEvent>` | Emitted when the user acts upon files with either single or double click (depends on `navigation-mode`). Useful for integration with the Viewer component. |
-| ready | `EventEmitter<NodePaging>` | Emitted when the Document List has loaded all items and is ready for use |
+| preview | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`NodeEntityEvent`](../../lib/content-services/document-list/components/node.event.ts)`>` | Emitted when the user acts upon files with either single or double click (depends on `navigation-mode`). Useful for integration with the [Viewer component](../core/viewer.component.md). |
+| ready | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>` | Emitted when the Document List has loaded all items and is ready for use |
 
 ## Details
 
diff --git a/docs/content-services/document-list.service.md b/docs/content-services/document-list.service.md
index 2308e8222b..a28314365a 100644
--- a/docs/content-services/document-list.service.md
+++ b/docs/content-services/document-list.service.md
@@ -12,55 +12,53 @@ Implements node operations used by the [Document List component](../content-serv
 
 ### Methods
 
--   **copyNode**(nodeId: `string` = `null`, targetParentId: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
+-   **copyNode**(nodeId: `string`, targetParentId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
     Copy a node to destination node
     -   _nodeId:_ `string`  - The id of the node to be copied
     -   _targetParentId:_ `string`  - The id of the folder where the node will be copied
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<any>` - NodeEntry for the copied node
--   **createFolder**(name: `string` = `null`, parentId: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntity`](../content-services/document-library.model.md)`>`<br/>
+-   **createFolder**(name: `string`, parentId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntity`](../content-services/document-library.model.md)`>`<br/>
     Creates a new folder in the path.
     -   _name:_ `string`  - Folder name
     -   _parentId:_ `string`  - Parent folder ID
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntity`](../content-services/document-library.model.md)`>` - Details of the created folder node
--   **deleteNode**(nodeId: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
+-   **deleteNode**(nodeId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
     Deletes a node.
     -   _nodeId:_ `string`  - ID of the node to delete
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<any>` - Empty response when the operation is complete
 -   **getDefaultMimeTypeIcon**(): `string`<br/>
     Gets a default icon for MIME types with no specific icon.
     -   **Returns** `string` - Path to the icon file
--   **getDocumentThumbnailUrl**(node: [`MinimalNodeEntity`](../content-services/document-library.model.md) = `null`): `string`<br/>
+-   **getDocumentThumbnailUrl**(node: [`MinimalNodeEntity`](../content-services/document-library.model.md)): `string`<br/>
     Get thumbnail URL for the given document node.
     -   _node:_ [`MinimalNodeEntity`](../content-services/document-library.model.md)  - Node to get URL for.
     -   **Returns** `string` - Thumbnail URL string
--   **getFolder**(folder: `string` = `null`, opts?: `any` = `null`, includeFields: `string[]` = `[]`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>`<br/>
+-   **getFolder**(folder: `string`, opts?: `any`, includeFields: `string[]` = `[]`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>`<br/>
     Gets the folder node with the specified relative name path below the root node.
     -   _folder:_ `string`  - Path to folder.
     -   _opts:_ `any`  - (Optional) Options.
     -   _includeFields:_ `string[]`  - Extra information to include (available options are "aspectNames", "isLink" and "association")
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>` - Details of the folder
--   **getFolderNode**(nodeId: `string` = `null`, includeFields: `string[]` = `[]`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>`<br/>
-
+-   **getFolderNode**(nodeId: `string`, includeFields: `string[]` = `[]`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>`<br/>
+    (**Deprecated:** 2.3.0 Gets a folder node via its node ID.) 
     -   _nodeId:_ `string`  - ID of the folder node
     -   _includeFields:_ `string[]`  - Extra information to include (available options are "aspectNames", "isLink" and "association")
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>` - Details of the folder
-
--   **getMimeTypeIcon**(mimeType: `string` = `null`): `string`<br/>
+-   **getMimeTypeIcon**(mimeType: `string`): `string`<br/>
     Gets the icon that represents a MIME type.
     -   _mimeType:_ `string`  - MIME type to get the icon for
     -   **Returns** `string` - Path to the icon file
--   **getNode**(nodeId: `string` = `null`, includeFields: `string[]` = `[]`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodeEntry`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-core-rest-api/docs/NodeEntry.md)`>`<br/>
+-   **getNode**(nodeId: `string`, includeFields: `string[]` = `[]`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodeEntry`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-core-rest-api/docs/NodeEntry.md)`>`<br/>
     Gets a node via its node ID.
     -   _nodeId:_ `string`  - ID of the target node
     -   _includeFields:_ `string[]`  - Extra information to include (available options are "aspectNames", "isLink" and "association")
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodeEntry`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-core-rest-api/docs/NodeEntry.md)`>` - Details of the folder
--   **hasPermission**(node: `any` = `null`, permission: [`PermissionsEnum`](../../lib/core/models/permissions.enum.ts)` | string` = `null`): `boolean`<br/>
-
+-   **hasPermission**(node: `any`, permission: [`PermissionsEnum`](../../lib/core/models/permissions.enum.ts)`|string`): `boolean`<br/>
+    (**Deprecated:** 2.3.0 use the one in the content service Checks if a node has the specified permission.) 
     -   _node:_ `any`  - Target node
-    -   _permission:_ [`PermissionsEnum`](../../lib/core/models/permissions.enum.ts)` | string`  - Permission level to query
+    -   _permission:_ [`PermissionsEnum`](../../lib/core/models/permissions.enum.ts)`|string`  - Permission level to query
     -   **Returns** `boolean` - True if the node has the permission, false otherwise
-
--   **moveNode**(nodeId: `string` = `null`, targetParentId: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
+-   **moveNode**(nodeId: `string`, targetParentId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
     Moves a node to destination node.
     -   _nodeId:_ `string`  - The id of the node to be moved
     -   _targetParentId:_ `string`  - The id of the folder where the node will be moved
diff --git a/docs/content-services/dropdown-breadcrumb.component.md b/docs/content-services/dropdown-breadcrumb.component.md
index 59ec019bf8..a12a132bcb 100644
--- a/docs/content-services/dropdown-breadcrumb.component.md
+++ b/docs/content-services/dropdown-breadcrumb.component.md
@@ -24,24 +24,24 @@ Indicates the current position within a navigation hierarchy using a dropdown me
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
-| folderNode | [`MinimalNodeEntryEntity`](../content-services/document-library.model.md) |  null | Active node, builds UI based on folderNode.path.elements collection. |
+| ---- | ---- | ------------- | ----------- |
+| folderNode | [`MinimalNodeEntryEntity`](../content-services/document-library.model.md) | null | Active node, builds UI based on folderNode.path.elements collection. |
 | maxItems | `number` |  | Maximum number of nodes to display before wrapping them with a dropdown element. |
-| root | `string` |  null | (optional) Name of the root element of the breadcrumb. You can use this property to rename "Company Home" to "Personal Files" for example. You can use an i18n resource key for the property value. |
-| rootId | `string` |  null | (optional) The id of the root element. You can use this property to set a custom element the breadcrumb should start with. |
+| root | `string` | null | (optional) Name of the root element of the breadcrumb. You can use this property to rename "Company Home" to "Personal Files" for example. You can use an i18n resource key for the property value. |
+| rootId | `string` | null | (optional) The id of the root element. You can use this property to set a custom element the breadcrumb should start with. |
 | target | [`DocumentListComponent`](../content-services/document-list.component.md) |  | (optional) [Document List component](../content-services/document-list.component.md) to operate with. The list will update when the breadcrumb is clicked. |
-| transform | `function` |  | Transformation to be performed on the chosen/folder node before building the breadcrumb UI. Can be useful when custom formatting is needed for the breadcrumb. You can change the path elements from the node that are used to build the breadcrumb using this function. |
+| transform | `Function` |  | Transformation to be performed on the chosen/folder node before building the breadcrumb UI. Can be useful when custom formatting is needed for the breadcrumb. You can change the path elements from the node that are used to build the breadcrumb using this function. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | navigate | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`PathElementEntity`](../../lib/content-services/document-list/models/document-library.model.ts)`>` | Emitted when the user clicks on a breadcrumb. |
 
 ## Details
 
 Although this component inherits the `maxItems` property from the [Breadcrumb component,](../content-services/breadcrumb.component.md) the
-"crumbs" are _always_ shown on a menu. By contrast, the Breadcrumb component only falls back
+"crumbs" are _always_ shown on a menu. By contrast, the [Breadcrumb component](../content-services/breadcrumb.component.md) only falls back
 to a menu when its maximum number of nodes is exceeded. 
 
 ## See also
diff --git a/docs/content-services/file-draggable.directive.md b/docs/content-services/file-draggable.directive.md
index 848fcbab31..d544fd059e 100644
--- a/docs/content-services/file-draggable.directive.md
+++ b/docs/content-services/file-draggable.directive.md
@@ -38,16 +38,16 @@ Some sample CSS to show the drag and drop area:
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
-| file-draggable | `boolean` | true | Enables/disables drag-and-drop functionality. |
+| ---- | ---- | ------------- | ----------- |
+| enabled | `boolean` | true | Enables/disables drag-and-drop functionality. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | filesDropped | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<File[]>` | Emitted when one or more files are dragged and dropped onto the draggable element. |
-| filesEntityDropped | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | (**Deprecated:** in 2.4.0: use `filesDropped` instead. Emitted when one or more files are dragged and dropped onto the draggable element.)  |
-| folderEntityDropped | `EventEmitter<any>` | Emitted when a directory is dragged and dropped onto the draggable element. |
+| filesEntityDropped | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | (**Deprecated:** in 2.4.0: use `filesDropped` instead. Emitted when one or more files are dragged and dropped onto the draggable element.) |
+| folderEntityDropped | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when a directory is dragged and dropped onto the draggable element. |
 
 ## Details
 
diff --git a/docs/content-services/file-uploading-dialog.component.md b/docs/content-services/file-uploading-dialog.component.md
index 55d1af318c..46e3377592 100644
--- a/docs/content-services/file-uploading-dialog.component.md
+++ b/docs/content-services/file-uploading-dialog.component.md
@@ -19,13 +19,13 @@ Shows a dialog listing all the files uploaded with the Upload Button or Drag Are
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | position | `string` | "right" | Dialog position. Can be 'left' or 'right'. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when a file in the list has an error. |
 
 ## Details
diff --git a/docs/content-services/folder-actions.service.md b/docs/content-services/folder-actions.service.md
index 536e805ef0..57a6904e4d 100644
--- a/docs/content-services/folder-actions.service.md
+++ b/docs/content-services/folder-actions.service.md
@@ -12,18 +12,18 @@ Implements the folder menu actions for the [Document List component](../content-
 
 ### Methods
 
--   **canExecuteAction**(obj: `any` = `null`): `boolean`<br/>
+-   **canExecuteAction**(obj: `any`): `boolean`<br/>
     Checks if an action is available for a particular item.
     -   _obj:_ `any`  - Item to check
     -   **Returns** `boolean` - True if the action is available, false otherwise
--   **getHandler**(key: `string` = `null`): [`ContentActionHandler`](../../lib/content-services/document-list/models/content-action.model.ts)<br/>
+-   **getHandler**(key: `string`): `ContentActionHandler`<br/>
     Gets the handler function for an action.
     -   _key:_ `string`  - Identifier for the action
-    -   **Returns** [`ContentActionHandler`](../../lib/content-services/document-list/models/content-action.model.ts) - The handler function
--   **setHandler**(key: `string` = `null`, handler: [`ContentActionHandler`](../../lib/content-services/document-list/models/content-action.model.ts) = `null`): `boolean`<br/>
+    -   **Returns** `ContentActionHandler` - The handler function
+-   **setHandler**(key: `string`, handler: `ContentActionHandler`): `boolean`<br/>
     Sets a new handler function for an action.
     -   _key:_ `string`  - Identifier for the action
-    -   _handler:_ [`ContentActionHandler`](../../lib/content-services/document-list/models/content-action.model.ts)  - The new handler function
+    -   _handler:_ `ContentActionHandler`  - The new handler function
     -   **Returns** `boolean` - True if the key was a valid action identifier, false otherwise
 
 ## Details
diff --git a/docs/content-services/folder-create.directive.md b/docs/content-services/folder-create.directive.md
index 7afd7c9741..cf2b686c95 100644
--- a/docs/content-services/folder-create.directive.md
+++ b/docs/content-services/folder-create.directive.md
@@ -30,15 +30,15 @@ Creates folders.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | nodeType | `string` | "cm:folder" | Type of node to create. |
-| adf-create-folder | `string` |  DEFAULT_FOLDER_PARENT_ID | Parent folder where the new folder will be located after creation. |
-| title | `string` |  null | Title of folder creation dialog. |
+| parentNodeId | `string` |  | Parent folder where the new folder will be located after creation. |
+| title | `string` | null | Title of folder creation dialog. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when an error occurs (eg, a folder with same name already exists). |
 | success | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>` | Emitted when the folder is created successfully. |
 
diff --git a/docs/content-services/folder-edit.directive.md b/docs/content-services/folder-edit.directive.md
index 985ec3fcd3..0bacbce36e 100644
--- a/docs/content-services/folder-edit.directive.md
+++ b/docs/content-services/folder-edit.directive.md
@@ -30,14 +30,14 @@ Allows folders to be edited.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
-| adf-edit-folder | [`MinimalNodeEntryEntity`](../content-services/document-library.model.md) |  | Folder node to edit. |
-| title | `string` |  null | Title of folder edit dialog. |
+| ---- | ---- | ------------- | ----------- |
+| folder | [`MinimalNodeEntryEntity`](../content-services/document-library.model.md) |  | Folder node to edit. |
+| title | `string` | null | Title of folder edit dialog. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when an error occurs (eg, a folder with same name already exists). |
 | success | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>` | Emitted when the folder has been edited successfully. |
 
diff --git a/docs/content-services/inherited-button.directive.md b/docs/content-services/inherited-button.directive.md
index da966887d0..be9c0e7830 100644
--- a/docs/content-services/inherited-button.directive.md
+++ b/docs/content-services/inherited-button.directive.md
@@ -29,7 +29,8 @@ Update the current node by adding/removing the inherited permissions.
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
-| updated | [`EventEmitter<MinimalNodeEntryEntity>`](../content-services/document-library.model.md) | Emitted when the node is updated |
+| error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` |  |
+| updated | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>` | Emitted when the node is updated |
 
 ## Details
 
diff --git a/docs/content-services/like.component.md b/docs/content-services/like.component.md
index ace1807869..54a535a907 100644
--- a/docs/content-services/like.component.md
+++ b/docs/content-services/like.component.md
@@ -20,13 +20,13 @@ Allows a user to add "likes" to an item.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | nodeId | `string` |  | Identifier of a node to apply likes to. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | changeVote | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` | Emitted when the "vote" gets changed. |
 
 ## See also
diff --git a/docs/content-services/node-download.directive.md b/docs/content-services/node-download.directive.md
index 9003775441..ece7a3e39b 100644
--- a/docs/content-services/node-download.directive.md
+++ b/docs/content-services/node-download.directive.md
@@ -28,5 +28,5 @@ Allows folders and/or files to be downloaded, with multiple nodes packed as a '.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
-| adfNodeDownload | [`MinimalNodeEntity`](../content-services/document-library.model.md)`[]` |  | Nodes to download. |
+| ---- | ---- | ------------- | ----------- |
+| nodes | [`MinimalNodeEntity`](../content-services/document-library.model.md)`[]` |  | Nodes to download. |
diff --git a/docs/content-services/node-lock.directive.md b/docs/content-services/node-lock.directive.md
index 988ef8c447..0dac91d482 100644
--- a/docs/content-services/node-lock.directive.md
+++ b/docs/content-services/node-lock.directive.md
@@ -21,8 +21,8 @@ Locks a node.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
-| adf-node-lock | [`MinimalNodeEntryEntity`](../content-services/document-library.model.md) |  | Node to lock/unlock. |
+| ---- | ---- | ------------- | ----------- |
+| node | [`MinimalNodeEntryEntity`](../content-services/document-library.model.md) |  | Node to lock/unlock. |
 
 ## Details
 
diff --git a/docs/content-services/node-permission-dialog.service.md b/docs/content-services/node-permission-dialog.service.md
index 42a55188cf..c097bc3ff7 100644
--- a/docs/content-services/node-permission-dialog.service.md
+++ b/docs/content-services/node-permission-dialog.service.md
@@ -14,12 +14,12 @@ Displays dialogs to let the user set node permissions.
 
 -   **close**()<br/>
     Closes the currently-open dialog.
--   **openAddPermissionDialog**(nodeId: `string` = `null`, title?: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntity`](../content-services/document-library.model.md)`[]>`<br/>
+-   **openAddPermissionDialog**(node: `Node`, title?: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntity`](../content-services/document-library.model.md)`[]>`<br/>
     Opens a dialog to add permissions to a node.
-    -   _nodeId:_ `string`  - ID of the target node
+    -   _node:_ `Node`  - 
     -   _title:_ `string`  - (Optional) Dialog title
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntity`](../content-services/document-library.model.md)`[]>` - Node with updated permissions
--   **updateNodePermissionByDialog**(nodeId?: `string` = `null`, title?: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>`<br/>
+-   **updateNodePermissionByDialog**(nodeId?: `string`, title?: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>`<br/>
     Opens a dialog to update permissions for a node.
     -   _nodeId:_ `string`  - (Optional) ID of the target node
     -   _title:_ `string`  - (Optional) Dialog title
diff --git a/docs/content-services/node-permission.service.md b/docs/content-services/node-permission.service.md
index d6e2197822..f734b670f8 100644
--- a/docs/content-services/node-permission.service.md
+++ b/docs/content-services/node-permission.service.md
@@ -12,35 +12,35 @@ Manages role permissions for content nodes.
 
 ### Methods
 
--   **getGroupMemeberByGroupName**(groupName: `string` = `null`, opts?: `any` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<GroupMemberPaging>`<br/>
+-   **getGroupMemeberByGroupName**(groupName: `string`, opts?: `any`): [`Observable`](http://reactivex.io/documentation/observable.html)`<GroupMemberPaging>`<br/>
     Gets all members related to a group name.
     -   _groupName:_ `string`  - Name of group to look for members
     -   _opts:_ `any`  - (Optional) Extra options supported by JSAPI
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<GroupMemberPaging>` - List of members
--   **getNodeRoles**(node: [`MinimalNodeEntryEntity`](../content-services/document-library.model.md) = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<string[]>`<br/>
+-   **getNodeRoles**(node: [`MinimalNodeEntryEntity`](../content-services/document-library.model.md)): [`Observable`](http://reactivex.io/documentation/observable.html)`<string[]>`<br/>
     Gets a list of roles for the current node.
     -   _node:_ [`MinimalNodeEntryEntity`](../content-services/document-library.model.md)  - The target node
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<string[]>` - Array of strings representing the roles
--   **removePermission**(node: [`MinimalNodeEntryEntity`](../content-services/document-library.model.md) = `null`, permissionToRemove: `PermissionElement` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>`<br/>
+-   **removePermission**(node: [`MinimalNodeEntryEntity`](../content-services/document-library.model.md), permissionToRemove: `PermissionElement`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>`<br/>
 
     -   _node:_ [`MinimalNodeEntryEntity`](../content-services/document-library.model.md)  - 
     -   _permissionToRemove:_ `PermissionElement`  - 
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>` - 
 
--   **updateLocallySetPermissions**(node: [`MinimalNodeEntryEntity`](../content-services/document-library.model.md) = `null`, nodes: [`MinimalNodeEntity`](../content-services/document-library.model.md)`[]` = `null`, nodeRole: `string[]` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>`<br/>
+-   **updateLocallySetPermissions**(node: [`MinimalNodeEntryEntity`](../content-services/document-library.model.md), nodes: [`MinimalNodeEntity`](../content-services/document-library.model.md)`[]`, nodeRole: `string[]`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>`<br/>
 
     -   _node:_ [`MinimalNodeEntryEntity`](../content-services/document-library.model.md)  - 
     -   _nodes:_ [`MinimalNodeEntity`](../content-services/document-library.model.md)`[]`  - 
     -   _nodeRole:_ `string[]`  - 
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>` - 
 
--   **updateNodePermissions**(nodeId: `string` = `null`, permissionList: [`MinimalNodeEntity`](../content-services/document-library.model.md)`[]` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>`<br/>
+-   **updateNodePermissions**(nodeId: `string`, permissionList: [`MinimalNodeEntity`](../content-services/document-library.model.md)`[]`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>`<br/>
 
     -   _nodeId:_ `string`  - 
     -   _permissionList:_ [`MinimalNodeEntity`](../content-services/document-library.model.md)`[]`  - 
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>` - 
 
--   **updatePermissionRole**(node: [`MinimalNodeEntryEntity`](../content-services/document-library.model.md) = `null`, updatedPermissionRole: `PermissionElement` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>`<br/>
+-   **updatePermissionRole**(node: [`MinimalNodeEntryEntity`](../content-services/document-library.model.md), updatedPermissionRole: `PermissionElement`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>`<br/>
     Updates the permission for a node.
     -   _node:_ [`MinimalNodeEntryEntity`](../content-services/document-library.model.md)  - Target node
     -   _updatedPermissionRole:_ `PermissionElement`  - Permission role to update or add
diff --git a/docs/content-services/node-share.directive.md b/docs/content-services/node-share.directive.md
index e3ef1af54c..e3588641e2 100644
--- a/docs/content-services/node-share.directive.md
+++ b/docs/content-services/node-share.directive.md
@@ -32,8 +32,8 @@ Creates and manages public shared links for files.
 
 | Name | Type | Default value | Description |
 | ---- | ---- | ------------- | ----------- |
-| node | [`MinimalNodeEntity`](../content-services/document-library.model.md) |  | Nodes to share. |
 | baseShareUrl | `string` |  | baseShareUrl to add as prefix to the generated link |
+| node | [`MinimalNodeEntity`](../content-services/document-library.model.md) |  | Node to share. |
 
 ## Details
 
diff --git a/docs/content-services/permission-list.component.md b/docs/content-services/permission-list.component.md
index f9b42569a3..8f9201ba13 100644
--- a/docs/content-services/permission-list.component.md
+++ b/docs/content-services/permission-list.component.md
@@ -33,13 +33,13 @@ or custom template can be added:
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | nodeId | `string` | "" | ID of the node whose permissions you want to show. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` |  |
 | update | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<PermissionElement>` | Emitted when the permission is updated. |
 
diff --git a/docs/content-services/rating.component.md b/docs/content-services/rating.component.md
index 03b20200b2..ab03447069 100644
--- a/docs/content-services/rating.component.md
+++ b/docs/content-services/rating.component.md
@@ -22,13 +22,13 @@ Allows a user to add ratings to an item.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | nodeId | `string` |  | Identifier of the node to apply the rating to. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | changeVote | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` | Emitted when the "vote" gets changed. |
 
 ## See also
diff --git a/docs/content-services/rating.service.md b/docs/content-services/rating.service.md
index 58eefe9670..28cbb6e88c 100644
--- a/docs/content-services/rating.service.md
+++ b/docs/content-services/rating.service.md
@@ -12,17 +12,17 @@ Manages ratings for items in Content Services.
 
 ### Methods
 
--   **deleteRating**(nodeId: `string` = `null`, ratingType: `any` = `null`): `any`<br/>
+-   **deleteRating**(nodeId: `string`, ratingType: `any`): `any`<br/>
     Removes the current user's rating for a node.
     -   _nodeId:_ `string`  - Target node
     -   _ratingType:_ `any`  - Type of rating to remove (can be "likes" or "fiveStar")
     -   **Returns** `any` - Null response indicating that the operation is complete
--   **getRating**(nodeId: `string` = `null`, ratingType: `any` = `null`): `any`<br/>
+-   **getRating**(nodeId: `string`, ratingType: `any`): `any`<br/>
     Gets the current user's rating for a node.
     -   _nodeId:_ `string`  - Node to get the rating from
     -   _ratingType:_ `any`  - Type of rating (can be "likes" or "fiveStar")
     -   **Returns** `any` - The rating value
--   **postRating**(nodeId: `string` = `null`, ratingType: `any` = `null`, vote: `any` = `null`): `any`<br/>
+-   **postRating**(nodeId: `string`, ratingType: `any`, vote: `any`): `any`<br/>
     Adds the current user's rating for a node.
     -   _nodeId:_ `string`  - Target node for the rating
     -   _ratingType:_ `any`  - Type of rating (can be "likes" or "fiveStar")
diff --git a/docs/content-services/search-control.component.md b/docs/content-services/search-control.component.md
index e2dafa6eaf..16b571b1d6 100644
--- a/docs/content-services/search-control.component.md
+++ b/docs/content-services/search-control.component.md
@@ -25,9 +25,9 @@ Displays a input text which shows find-as-you-type suggestions.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | autocomplete | `boolean` | false | Toggles auto-completion of the search input field. |
-| customQueryBody | `QueryBody` |  | (**Deprecated:** in 2.1.0)  |
+| customQueryBody | `QueryBody` |  | (**Deprecated:** in 2.1.0) |
 | expandable | `boolean` | true | Toggles whether to use an expanding search control. If false then a regular input is used. |
 | highlight | `boolean` | false | Toggles highlighting of the search term in the results. |
 | inputType | `string` | "text" | Type of the input field to render, e.g. "search" or "text" (default). |
@@ -37,10 +37,10 @@ Displays a input text which shows find-as-you-type suggestions.
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | optionClicked | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when a file item from the list of "find-as-you-type" results is selected. |
 | searchChange | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<string>` | Emitted when the search term is changed. The search term is provided in the 'value' property of the returned object.  If the term is less than three characters in length then the term is truncated to an empty string. |
-| submit | `EventEmitter<any>` | Emitted when the search is submitted pressing ENTER button. The search term is provided as value of the event. |
+| submit | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when the search is submitted pressing ENTER button. The search term is provided as value of the event. |
 
 ## Details
 
diff --git a/docs/content-services/search-filter.component.md b/docs/content-services/search-filter.component.md
index 3a6d8c99ae..8e3b1eece2 100644
--- a/docs/content-services/search-filter.component.md
+++ b/docs/content-services/search-filter.component.md
@@ -11,16 +11,13 @@ Represents a main container component for custom search and faceted search setti
 ## Contents
 
 -   [Basic usage](#basic-usage)
-
 -   [Details](#details)
-
     -   [Configuration](#configuration)
     -   [Extra fields and filter queries](#extra-fields-and-filter-queries)
     -   [Sorting](#sorting)
     -   [Categories and widgets](#categories-and-widgets)
     -   [Facet Fields](#facet-fields)
     -   [Facet Queries](#facet-queries)
-
 -   [See also](#see-also)
 
 ## Basic usage
@@ -64,12 +61,15 @@ A typical configuration is shown below:
             { "query": "TYPE:'cm:folder' OR TYPE:'cm:content'" },
             { "query": "NOT cm:creator:System" }
         ],
-        "facetFields": [
+        "facetFields": {
+          "expanded": true,
+          "fields": [
             { "field": "content.mimetype", "mincount": 1, "label": "Type" },
             { "field": "content.size", "mincount": 1, "label": "Size" },
             { "field": "creator", "mincount": 1, "label": "Creator" },
             { "field": "modifier", "mincount": 1, "label": "Modifier" }
-        ],
+          ]
+        },
         "facetQueries": {
             "label": "My facet queries",
             "pageSize": 4,
@@ -178,7 +178,7 @@ for further details.
 
 ### Categories and widgets
 
-The Search Settings component and Query Builder require a `categories` section in the
+The Search [Settings component](../../demo-shell/src/app/components/settings/settings.component.ts) and Query Builder require a `categories` section in the
 configuration.
 
 Categories are used to configure the UI widgets that let the user edit the search query
diff --git a/docs/content-services/search-query-builder.service.md b/docs/content-services/search-query-builder.service.md
index 80a82d44d8..ece68abfe4 100644
--- a/docs/content-services/search-query-builder.service.md
+++ b/docs/content-services/search-query-builder.service.md
@@ -12,40 +12,59 @@ Stores information from all the custom search and faceted search widgets, compil
 
 ### Methods
 
--   **addFilterQuery**(query: `string` = `null`)<br/>
-    Adds a new filter query.
-    -   _query:_ `string`  - Text of the query to add
+-   **addFilterQuery**(query: `string`)<br/>
+
+    -   _query:_ `string`  - 
+
+-   **addUserFacetBucket**(field: `FacetField`, bucket: `FacetFieldBucket`)<br/>
+
+    -   _field:_ `FacetField`  - 
+    -   _bucket:_ `FacetFieldBucket`  - 
+
+-   **addUserFacetQuery**(query: `FacetQuery`)<br/>
+
+    -   _query:_ `FacetQuery`  - 
 
 -   **buildQuery**(): `QueryBody`<br/>
-    Builds a new query using the added elements.
-    -   **Returns** `QueryBody` - The resulting query
+
+    -   **Returns** `QueryBody` - 
 
 -   **execute**(): [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises)`<void>`<br/>
-    Executes the query.
-    -   **Returns** [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises)`<void>` - Notification of query completion
 
--   **getFacetField**(label: `string` = `null`): [`FacetField`](../../lib/content-services/search/facet-field.interface.ts)<br/>
-    Gets the details of a facet field.
-    -   _label:_ `string`  - Identifying label of the facet field
-    -   **Returns** [`FacetField`](../../lib/content-services/search/facet-field.interface.ts) - Facet field details
+    -   **Returns** [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises)`<void>` - 
 
--   **getFacetQuery**(label: `string` = `null`): [`FacetQuery`](../../lib/content-services/search/facet-query.interface.ts)<br/>
-    Gets the details of a facet query
-    -   _label:_ `string`  - Identifying label of the facet query
-    -   **Returns** [`FacetQuery`](../../lib/content-services/search/facet-query.interface.ts) - Details of the facet query
+-   **getFacetField**(label: `string`): `FacetField`<br/>
 
--   **getPrimarySorting**(): [`SearchSortingDefinition`](../../lib/content-services/search/search-sorting-definition.interface.ts)<br/>
+    -   _label:_ `string`  - 
+    -   **Returns** `FacetField` - 
+
+-   **getFacetQuery**(label: `string`): `FacetQuery`<br/>
+
+    -   _label:_ `string`  - 
+    -   **Returns** `FacetQuery` - 
+
+-   **getPrimarySorting**(): `SearchSortingDefinition`<br/>
     Returns primary sorting definition.
-    -   **Returns** [`SearchSortingDefinition`](../../lib/content-services/search/search-sorting-definition.interface.ts) - Sorting definition
--   **getSortingOptions**(): [`SearchSortingDefinition`](../../lib/content-services/search/search-sorting-definition.interface.ts)`[]`<br/>
+    -   **Returns** `SearchSortingDefinition` - 
+-   **getSortingOptions**(): `SearchSortingDefinition[]`<br/>
     Returns all pre-configured sorting options that users can choose from.
-    -   **Returns** [`SearchSortingDefinition`](../../lib/content-services/search/search-sorting-definition.interface.ts)`[]` - List of available sorting options
--   **removeFilterQuery**(query: `string` = `null`)<br/>
-    Removes a previously added filter query.
-    -   _query:_ `string`  - The query to remove
+    -   **Returns** `SearchSortingDefinition[]` - 
+-   **removeFilterQuery**(query: `string`)<br/>
+
+    -   _query:_ `string`  - 
+
+-   **removeUserFacetBucket**(field: `FacetField`, bucket: `FacetFieldBucket`)<br/>
+
+    -   _field:_ `FacetField`  - 
+    -   _bucket:_ `FacetFieldBucket`  - 
+
+-   **removeUserFacetQuery**(query: `FacetQuery`)<br/>
+
+    -   _query:_ `FacetQuery`  - 
+
+-   **resetToDefaults**()<br/>
 
 -   **update**()<br/>
-    Builds the query and notifies subscribers when complete.
 
 ## Details
 
@@ -81,5 +100,5 @@ constructor(queryBuilder: SearchQueryBuilderService) {
 
 ## See also
 
-- [Search filter component](search-filter.component.md)
-- [Search Widget interface](search-widget.interface.md)
\ No newline at end of file
+-   [Search filter component](search-filter.component.md)
+-   [Search Widget interface](search-widget.interface.md)
diff --git a/docs/content-services/search-radio.component.md b/docs/content-services/search-radio.component.md
index aa0c966a73..863b41cd1b 100644
--- a/docs/content-services/search-radio.component.md
+++ b/docs/content-services/search-radio.component.md
@@ -1,7 +1,7 @@
 ---
 Added: v2.4.0
 Status: Active
-Last reviewed: 2018-06-11
+Last reviewed: 2018-08-10
 ---
 
 # Search radio component
@@ -26,7 +26,7 @@ Implements a radio button list widget for the [Search Filter component](../conte
                         "field": null,
                         "pageSize": 5,
                         "options": [
-                            { "name": "None", "value": "", "default": true },
+                            { "name": "None", "value": "" },
                             { "name": "All", "value": "TYPE:'cm:folder' OR TYPE:'cm:content'" },
                             { "name": "Folder", "value": "TYPE:'cm:folder'" },
                             { "name": "Document", "value": "TYPE:'cm:content'" }
@@ -43,7 +43,7 @@ Implements a radio button list widget for the [Search Filter component](../conte
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
-| options | `array` | Array of objects with `name` and `value` properties. Each object defines a radio button, labelled with `name`, that adds the query fragment in `value` to the query when enabled. Set the `default` property to `true` for one item to have it selected initially when the widget is displayed. |
+| options | `array` | Array of objects with `name` and `value` properties. Each object defines a radio button, labelled with `name`, that adds the query fragment in `value` to the query when enabled. |
 
 ## Details
 
diff --git a/docs/content-services/search-widget.interface.md b/docs/content-services/search-widget.interface.md
index 88de30d40e..387f2e6a53 100644
--- a/docs/content-services/search-widget.interface.md
+++ b/docs/content-services/search-widget.interface.md
@@ -11,16 +11,12 @@ Specifies required properties for [Search filter component](../content-services/
 ## Contents
 
 -   [Basic usage](#basic-usage)
-
     -   [Properties](#properties)
-
 -   [Details](#details)
-
     -   [Implementing a custom widget](#implementing-a-custom-widget)
     -   [Reading external settings](#reading-external-settings)
     -   [Updating the final query](#updating-the-final-query)
     -   [Registering a custom widget](#registering-a-custom-widget)
-
 -   [See also](#see-also)
 
 ## Basic usage
@@ -39,14 +35,14 @@ export interface SearchWidget {
 | ---- | ---- | ------------- | ----------- |
 | id | `string` |  | Unique identifying value for the widget |
 | settings | [`SearchWidgetSettings`](../../lib/content-services/search/search-widget-settings.interface.ts) |  | Settings for component properties |
-| context | [`SearchQueryBuilderService`](../content-services/search-query-builder.service.md) |  | Instance of the Search Query Builder service to process the query |
+| context | [`SearchQueryBuilderService`](../content-services/search-query-builder.service.md) |  | Instance of the [Search Query Builder service](../content-services/search-query-builder.service.md) to process the query |
 
 ## Details
 
 The [Search Filter component](../content-services/search-filter.component.md) uses widgets to provide the UI that lets the user customize the
 search. ADF provides a number of widgets out of the box (see the [See Also](#see-also) section
 for a full list) but you can also implement your own. Both built-in and custom widgets must
-implement the Search Widget interface to operate with the Search Filter component.
+implement the Search Widget interface to operate with the [Search Filter component](../content-services/search-filter.component.md).
 
 ### Implementing a custom widget
 
diff --git a/docs/content-services/search.component.md b/docs/content-services/search.component.md
index 1c6f0b000a..1f745c5490 100644
--- a/docs/content-services/search.component.md
+++ b/docs/content-services/search.component.md
@@ -11,18 +11,13 @@ Searches items for supplied search terms.
 ## Contents
 
 -   [Basic usage](#basic-usage)
-
 -   [Class members](#class-members)
-
     -   [Properties](#properties)
     -   [Events](#events)
-
 -   [Details](#details)
-
     -   [Customise Search Results](#customise-search-results)
     -   [Attach an input field to the search](#attach-an-input-field-to-the-search)
     -   [Custom search configuration](#custom-search-configuration)
-
 -   [See Also](#see-also)
 
 ## Basic usage
@@ -39,18 +34,17 @@ Searches items for supplied search terms.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
-| displayWith | `function \| null` |  null | Function that maps an option's value to its display value in the trigger. |
+| ---- | ---- | ------------- | ----------- |
+| displayWith | `Function \| null` | null | Function that maps an option's value to its display value in the trigger. |
 | maxResults | `number` | 20 | Maximum number of results to show in the search. |
-| queryBody | `QueryBody` |  | (**Deprecated:** in 2.1.0)  |
+| queryBody | `QueryBody` |  | (**Deprecated:** in 2.1.0) |
 | searchTerm | `string` | "" | Search term to use when executing the search. Updating this value will run a new search and update the results. |
 | skipResults | `number` | 0 | Number of results to skip from the results pagination. |
-| class |  |  | CSS class for display. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when an error occurs. |
 | resultLoaded | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>` | Emitted when search results have fully loaded. |
 
diff --git a/docs/content-services/sites-dropdown.component.md b/docs/content-services/sites-dropdown.component.md
index dceffbd1f8..e0cb1a1e57 100644
--- a/docs/content-services/sites-dropdown.component.md
+++ b/docs/content-services/sites-dropdown.component.md
@@ -22,16 +22,16 @@ Displays a dropdown menu to show and interact with the sites of the current user
 
 ### Properties
 
-| Attribute | Type | Default | Description |
-| --------- | ---- | ------- | ----------- |
-| hideMyFiles | boolean | false | Hide the "My Files" option added to the list by default |
+| Name | Type | Default value | Description |
+| ---- | ---- | ------------- | ----------- |
+| hideMyFiles | `boolean` | false | Hide the "My Files" option. |
+| placeholder | `string` |  | Text or a translation key to act as a placeholder. Default value is the key "DROPDOWN.PLACEHOLDER_LABEL". |
+| relations | `string` |  | Filter for the results of the sites query. Possible values are "members" and "containers". When "members" is used, the site list will be restricted to the sites that the user is a member of. |
 | siteList | [`SitePaging`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-core-rest-api/docs/SitePaging.md) | null | A custom list of sites to be displayed by the dropdown. If no value is given, the sites of the current user are displayed by default. A list of objects only with properties 'title' and 'guid' is enough to be able to display the dropdown. |
-| placeholder | string | 'DROPDOWN.PLACEHOLDER_LABEL' | The placeholder text/the key from translation files for the placeholder text to be shown by default |
-| value | string | null | Id of the select site |
-| relations | string | null | A custom list of sites to be displayed by the dropdown. If no value is given, the sites of the current user are displayed by default. A list of objects only with properties 'title' and 'guid' is enough to be able to display the dropdown. |
+| value | `string` | null | Id of the selected site |
 
 ### Events
 
-| Name | Returned Type | Description |
-| ---- | ------------- | ----------- |
-| change | [SiteModel](../core/site.model.md) | Emitted when user selects a site. When default option is selected an empty model is emitted |
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| change | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`SiteEntry`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-core-rest-api/docs/SiteEntry.md)`>` | Emitted when the user selects a site. When the default option is selected, an empty model is emitted. |
diff --git a/docs/content-services/tag-actions.component.md b/docs/content-services/tag-actions.component.md
index d3653a66d1..28406ce535 100644
--- a/docs/content-services/tag-actions.component.md
+++ b/docs/content-services/tag-actions.component.md
@@ -22,13 +22,13 @@ Shows available actions for tags.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | nodeId | `string` |  | The identifier of a node. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when an error occurs. |
 | result | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` | Emitted when an action is chosen. |
-| successAdd | `EventEmitter<any>` | Emitted when a tag is added successfully. |
+| successAdd | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when a tag is added successfully. |
diff --git a/docs/content-services/tag-list.component.md b/docs/content-services/tag-list.component.md
index f31e8e9d36..190b85f9bc 100644
--- a/docs/content-services/tag-list.component.md
+++ b/docs/content-services/tag-list.component.md
@@ -14,7 +14,7 @@ Shows tags for an item.
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | result | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` | Emitted when a tag is selected. |
 
 ## See Also
diff --git a/docs/content-services/tag-node-list.component.md b/docs/content-services/tag-node-list.component.md
index 69b87560e6..29fbab3b65 100644
--- a/docs/content-services/tag-node-list.component.md
+++ b/docs/content-services/tag-node-list.component.md
@@ -22,11 +22,11 @@ Shows tags for a node.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | nodeId | `string` |  | The identifier of a node. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | results | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` | Emitted when a tag is selected. |
diff --git a/docs/content-services/tag.service.md b/docs/content-services/tag.service.md
index b33fc3c321..ea51688254 100644
--- a/docs/content-services/tag.service.md
+++ b/docs/content-services/tag.service.md
@@ -12,7 +12,7 @@ Manages tags in Content Services.
 
 ### Methods
 
--   **addTag**(nodeId: `string` = `null`, tagName: `string` = `null`): `any`<br/>
+-   **addTag**(nodeId: `string`, tagName: `string`): `any`<br/>
     Adds a tag to a node.
     -   _nodeId:_ `string`  - ID of the target node
     -   _tagName:_ `string`  - Name of the tag to add
@@ -20,11 +20,11 @@ Manages tags in Content Services.
 -   **getAllTheTags**(): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
     Gets a list of all the tags already defined in the repository.
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<any>` - TagPaging object (defined in JSAPI) containing the tags
--   **getTagsByNodeId**(nodeId: `string` = `null`): `any`<br/>
+-   **getTagsByNodeId**(nodeId: `string`): `any`<br/>
     Gets a list of tags added to a node.
     -   _nodeId:_ `string`  - ID of the target node
     -   **Returns** `any` - TagPaging object (defined in JSAPI) containing the tags
--   **removeTag**(nodeId: `string` = `null`, tag: `string` = `null`): `any`<br/>
+-   **removeTag**(nodeId: `string`, tag: `string`): `any`<br/>
     Removes a tag from a node.
     -   _nodeId:_ `string`  - ID of the target node
     -   _tag:_ `string`  - Name of the tag to remove
diff --git a/docs/content-services/upload-button.component.md b/docs/content-services/upload-button.component.md
index 53f3308569..d9b100c23f 100644
--- a/docs/content-services/upload-button.component.md
+++ b/docs/content-services/upload-button.component.md
@@ -27,7 +27,7 @@ Activates a file upload.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | acceptedFilesType | `string` | "\*" | Filter for accepted file types. |
 | comment | `string` |  | When you overwrite existing content, you can use the comment field to add a version comment that appears in the version history |
 | disabled | `boolean` | false | Toggles component disabled state (if there is no node permission checking). |
@@ -37,19 +37,19 @@ Activates a file upload.
 | nodeType | `string` | "cm:content" | Custom node type for uploaded file |
 | rootFolderId | `string` | "-root-" | The ID of the root. Use the nodeId for Content Services or the taskId/processId for Process Services. |
 | staticTitle | `string` |  | Defines the text of the upload button. |
-| tooltip | `string` |  null | Custom tooltip text. |
+| tooltip | `string` | null | Custom tooltip text. |
 | uploadFolders | `boolean` | false | Allows/disallows upload folders (only for Chrome). |
 | versioning | `boolean` | false | Toggles versioning. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | beginUpload | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`UploadFilesEvent`](../../lib/content-services/upload/components/upload-files.event.ts)`>` |  |
 | createFolder | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` | Emitted when a folder is created. |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` | Emitted when an error occurs. |
-| permissionEvent | `EventEmitter<PermissionModel>` | Emitted when create permission is missing. |
-| success | `EventEmitter<Object>` | Emitted when the file is uploaded successfully. |
+| permissionEvent | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`PermissionModel`](../../lib/content-services/document-list/models/permissions.model.ts)`>` | Emitted when create permission is missing. |
+| success | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` | Emitted when the file is uploaded successfully. |
 
 ## Details
 
diff --git a/docs/content-services/upload-drag-area.component.md b/docs/content-services/upload-drag-area.component.md
index 2d3e72766d..159ba5db91 100644
--- a/docs/content-services/upload-drag-area.component.md
+++ b/docs/content-services/upload-drag-area.component.md
@@ -1,7 +1,7 @@
 ---
 Added: v2.0.0
 Status: Active
-Last reviewed: 2018-05-04
+Last reviewed: 2018-08-07
 ---
 
 # Upload Drag Area Component
@@ -34,7 +34,7 @@ export class AppComponent {
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | acceptedFilesType | `string` | "\*" | Filter for accepted file types. |
 | comment | `string` |  | When you overwrite existing content, you can use the comment field to add a version comment that appears in the version history |
 | disabled | `boolean` | false | Toggles component disabled state (if there is no node permission checking). |
@@ -43,30 +43,31 @@ export class AppComponent {
 | nodeType | `string` | "cm:content" | Custom node type for uploaded file |
 | rootFolderId | `string` | "-root-" | The ID of the root. Use the nodeId for Content Services or the taskId/processId for Process Services. |
 | versioning | `boolean` | false | Toggles versioning. |
-| parentId |  |  | **Deprecated:** 2.4.0  use rootFolderId ID of parent folder node. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | beginUpload | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`UploadFilesEvent`](../../lib/content-services/upload/components/upload-files.event.ts)`>` | Raised after files or folders dropped and before the upload process starts. |
 | createFolder | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` | Emitted when a folder is created. |
-| error | `EventEmitter<Object>` | Emitted when an error occurs. |
-| success | `EventEmitter<Object>` | Emitted when the file is uploaded successfully. |
+| error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` | Emitted when an error occurs. |
+| success | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` | Emitted when the file is uploaded successfully. |
 
-## Intercepting uploads
+## Details
 
-You can intercept the upload process by utilizing the `beginUpload` event. 
+### Intercepting uploads
+
+You can intercept the upload process using the `beginUpload` event. 
 
 The event has a type of [`UploadFilesEvent`](../../lib/content-services/upload/components/upload-files.event.ts) and provides the following APIs:
 
--   **files**: get access to the [`FileInfo`](../../lib/core/utils/file-utils.ts) objects that are prepared for the upload
--   **pauseUpload**: pause the upload and perform additional tasks, like showing the confirmation dialog
--   **resumeUpload**: resume the upload process
+-   **files**: accesses the [`FileInfo`](../../lib/core/utils/file-utils.ts) objects that are prepared for the upload
+-   **pauseUpload**: pauses the upload and performs additional tasks, like showing the confirmation dialog
+-   **resumeUpload**: resumes the upload process
 
-## Example
+### Example
 
-Wire the `beginUpload` event at the template level
+Wire the `beginUpload` event at the template level:
 
 ```html
 <adf-upload-drag-area (beginUpload)="onBeginUpload($event)" ...>
@@ -74,7 +75,7 @@ Wire the `beginUpload` event at the template level
 </adf-upload-drag-area>
 ```
 
-Create the `onBeginUpload` handler that invokes a confirmation dialog
+Create the `onBeginUpload` handler that invokes a confirmation dialog:
 
 ```ts
 import { UploadFilesEvent, ConfirmDialogComponent } from '@alfresco/adf-content-services';
@@ -107,5 +108,5 @@ export class MyComponent {
 }
 ```
 
-The example above is going to raise confirmation dialog every time a user uploads more than 1 file.
-That can be either 2 or more files, or a folder with multiple entries.
+The example above shows a confirmation dialog every time a user uploads more than 1 file.
+This could be either a selection of 2 or more files, or a folder with multiple entries.
diff --git a/docs/content-services/upload-version-button.component.md b/docs/content-services/upload-version-button.component.md
index bed05dd4ae..50cbf55f6e 100644
--- a/docs/content-services/upload-version-button.component.md
+++ b/docs/content-services/upload-version-button.component.md
@@ -24,17 +24,12 @@ to enrich the features and decrease the restrictions currently applied to node v
 </adf-upload-version-button>
 ```
 
-This component extends the [Upload Button component](upload-button.component.md). The
-properties and events are the same except for the `node` property that specifies the node
-to be versioned (this is a _required_ input parameter). However, some properties don't make
-sense when applied to the [Upload Version Button component,](../content-services/upload-version-button.component.md) so they are simply ignored.
-
 ## Class members
 
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | acceptedFilesType | `string` | "\*" | Filter for accepted file types. |
 | comment | `string` |  | When you overwrite existing content, you can use the comment field to add a version comment that appears in the version history |
 | disabled | `boolean` | false | Toggles component disabled state (if there is no node permission checking). |
@@ -45,35 +40,26 @@ sense when applied to the [Upload Version Button component,](../content-services
 | nodeType | `string` | "cm:content" | Custom node type for uploaded file |
 | rootFolderId | `string` | "-root-" | The ID of the root. Use the nodeId for Content Services or the taskId/processId for Process Services. |
 | staticTitle | `string` |  | Defines the text of the upload button. |
-| tooltip | `string` |  null | Custom tooltip text. |
+| tooltip | `string` | null | Custom tooltip text. |
 | uploadFolders | `boolean` | false | Allows/disallows upload folders (only for Chrome). |
 | versioning | `boolean` | false | Toggles versioning. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | beginUpload | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`UploadFilesEvent`](../../lib/content-services/upload/components/upload-files.event.ts)`>` |  |
 | createFolder | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` | Emitted when a folder is created. |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` | Emitted when an error occurs. |
-| permissionEvent | `EventEmitter<PermissionModel>` | Emitted when create permission is missing. |
-| success | `EventEmitter<Object>` | Emitted when the file is uploaded successfully. |
+| permissionEvent | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`PermissionModel`](../../lib/content-services/document-list/models/permissions.model.ts)`>` | Emitted when create permission is missing. |
+| success | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` | Emitted when the file is uploaded successfully. |
 
 ## Details
 
-### Restrictions
-
-Currently, the API only allows new version uploads for a node where the name
-(and most importantly the _extension_) of the new version
-is exactly the same as the old version. As a result, this workaround component uploads the
-chosen file with the same name that the original file had. This is the reason why the `node`
-is a mandatory dependency for this component.
-
-So, to sum up, this component:
-
--   **Can** upload a new version from the same file extension regardless of the file name.
--   **Cannot** upload a new version that has a different file extension, to the file that was
-    originally uploaded (an error message will be emitted by the `error` [`EventEmitter`](https://angular.io/api/core/EventEmitter) of the component.
+This component extends the [Upload Button component](upload-button.component.md). The
+properties and events are the same except for the `node` property that specifies the node
+to be versioned (this is a _required_ input parameter). However, some properties don't make
+sense when applied to the [Upload Version Button component,](../content-services/upload-version-button.component.md) so they are simply ignored.
 
 ## See also
 
diff --git a/docs/content-services/version-list.component.md b/docs/content-services/version-list.component.md
index f0f4c22e48..3c0c2947c7 100644
--- a/docs/content-services/version-list.component.md
+++ b/docs/content-services/version-list.component.md
@@ -19,13 +19,20 @@ Displays the version history of a node in a [Version Manager component](../conte
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | allowDownload | `boolean` | true | Enable/disable downloading a version of the current node. |
-| id | `string` |  | (**Deprecated:** in 2.3.0)  |
+| id | `string` |  | (**Deprecated:** in 2.3.0) |
 | node | [`MinimalNodeEntryEntity`](../content-services/document-library.model.md) |  | The target node. |
 | showActions | `boolean` | true | Toggles showing/hiding of version actions |
 | showComments | `boolean` | true | Toggles showing/hiding of comments |
 
+### Events
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| deleted | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>` | Emitted when a version is deleted |
+| restored | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>` | Emitted when a version is restored |
+
 ## Details
 
 This component is used by the [Version Manager component](../content-services/version-manager.component.md) to
diff --git a/docs/content-services/version-manager.component.md b/docs/content-services/version-manager.component.md
index c74421c6a8..20e4bdb709 100644
--- a/docs/content-services/version-manager.component.md
+++ b/docs/content-services/version-manager.component.md
@@ -27,7 +27,7 @@ Displays the version history of a node with the ability to upload a new version.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | allowDownload | `boolean` | true | Enable/disable downloading a version of the current node. |
 | node | [`MinimalNodeEntryEntity`](../content-services/document-library.model.md) |  | Target node to manage version history. |
 | showComments | `boolean` | true | Toggles showing/hiding of comments. |
@@ -35,9 +35,9 @@ Displays the version history of a node with the ability to upload a new version.
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
-| uploadError | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` | Emitted when an error occurs during upload. |
-| uploadSuccess | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` | Emitted when a file is uploaded successfully. |
+| ---- | ---- | ----------- |
+| uploadError | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>` | Emitted when an error occurs during upload. |
+| uploadSuccess | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>` | Emitted when a file is uploaded successfully. |
 
 ## Details
 
diff --git a/docs/content-services/webscript.component.md b/docs/content-services/webscript.component.md
index 604861b364..d2c5317db2 100644
--- a/docs/content-services/webscript.component.md
+++ b/docs/content-services/webscript.component.md
@@ -10,14 +10,10 @@ Provides access to Webscript features.
 ## Contents
 
 -   [Basic usage](#basic-usage)
-
 -   [Class members](#class-members)
-
     -   [Properties](#properties)
     -   [Events](#events)
-
 -   [Details](#details)
-
     -   [Webscript View HTML example](#webscript-view-html-example)
     -   [Webscript View DATATABLE example](#webscript-view-datatable-example)
     -   [Webscript View JSON example](#webscript-view-json-example)
@@ -38,7 +34,7 @@ Provides access to Webscript features.
 
 Another example:
 
-**app.component.html**
+**[app.component](../../demo-shell/src/app/app.component.ts).html**
 
 ```html
 <adf-webscript-get 
@@ -50,7 +46,7 @@ Another example:
 </adf-webscript-get>
 ```
 
-**app.component.ts**
+**[app.component](../../demo-shell/src/app/app.component.ts).ts**
 
 ```ts
 export class AppComponent {
@@ -65,7 +61,7 @@ export class AppComponent {
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | contentType | `string` | "TEXT" | Content type to interpret the data received from the webscript. Can be "JSON" , "HTML" , "DATATABLE" or "TEXT" |
 | contextRoot | `string` | "alfresco" | Path where the application is deployed |
 | scriptArgs | `any` |  | Arguments to pass to the webscript. |
@@ -76,7 +72,7 @@ export class AppComponent {
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | success | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` | Emitted when the operation succeeds. You can get the plain data from the webscript through the **success** event parameter and use it as you need in your application. |
 
 ## Details
diff --git a/docs/core/README.md b/docs/core/README.md
index 4940b7e835..8a5a37f9ab 100644
--- a/docs/core/README.md
+++ b/docs/core/README.md
@@ -11,8 +11,8 @@ for more information about installing and using the source code.
 
 | Name | Description | Source link |
 | ---- | ----------- | ----------- |
-| [About component](about.component.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | This component allow you to have a general overview of the version of ADF installed and the status of the Content service and Process service. | [Source](../../lib/core/about/about.component.ts) |
-| [Buttons menu component](buttons-menu.component.md) | Displays buttons on a responsive menu.  | [Source](../../lib/core/buttons-menu/buttons-menu.component.ts) |
+| [About component](about.component.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | This component allow you to have a general overview of the version of ADF installed and the status of the [Content service](../core/content.service.md) and [Process service](../process-services/process.service.md). | [Source](../../lib/core/about/about.component.ts) |
+| [Buttons menu component](buttons-menu.component.md) | Displays buttons on a responsive menu. | [Source](../../lib/core/buttons-menu/buttons-menu.component.ts) |
 | [Card view component](card-view.component.md) | Displays a configurable property list renderer. | [Source](../../lib/core/card-view/components/card-view/card-view.component.ts) |
 | [Accordion group component](accordion-group.component.md) | Adds a collapsible panel to an accordion menu. | [Source](../../lib/core/collapsable/accordion-group.component.ts) |
 | [Accordion component](accordion.component.md) | Creates a collapsible accordion menu. | [Source](../../lib/core/collapsable/accordion.component.ts) |
@@ -22,8 +22,8 @@ for more information about installing and using the source code.
 | [Datatable component](datatable.component.md) | Displays data as a table with customizable columns and presentation. | [Source](../../lib/core/datatable/components/datatable/datatable.component.ts) |
 | [Form field component](form-field.component.md) | A form field in an APS form. | [Source](../../lib/core/form/components/form-field/form-field.component.ts) |
 | [Form list component](form-list.component.md) | Shows APS forms as a list. | [Source](../../lib/core/form/components/form-list.component.ts) |
-| [Form component](form.component.md) | Shows a Form from APS | [Source](../../lib/core/form/components/form.component.ts) |
-| [Start form component](start-form.component.md) | Displays the Start Form for a process. | [Source](../../lib/core/form/components/start-form.component.ts) |
+| [Form component](form.component.md) | Shows a [`Form`](../../lib/process-services/task-list/models/form.model.ts) from APS | [Source](../../lib/core/form/components/form.component.ts) |
+| [Start form component](start-form.component.md) | Displays the Start [`Form`](../../lib/process-services/task-list/models/form.model.ts) for a process. | [Source](../../lib/core/form/components/start-form.component.ts) |
 | [Text mask component](text-mask.component.md) | Implements text field input masks. | [Source](../../lib/core/form/components/widgets/text/text-mask.component.ts) |
 | [Info drawer layout component](info-drawer-layout.component.md) | Displays a sidebar-style information panel. | [Source](../../lib/core/info-drawer/info-drawer-layout.component.ts) |
 | [Info drawer component](info-drawer.component.md) | Displays a sidebar-style information panel with tabs. | [Source](../../lib/core/info-drawer/info-drawer.component.ts) |
@@ -32,13 +32,13 @@ for more information about installing and using the source code.
 | [Infinite pagination component](infinite-pagination.component.md) | Adds "infinite" pagination to the component it is used with. | [Source](../../lib/core/pagination/infinite-pagination.component.ts) |
 | [Pagination component](pagination.component.md) | Adds pagination to the component it is used with. | [Source](../../lib/core/pagination/pagination.component.ts) |
 | [Host settings component](host-settings.component.md) ![Internal](../docassets/images/InternalIcon.png) | Validates the URLs for ACS and APS and saves them in the user's local storage | [Source](../../lib/core/settings/host-settings.component.ts) |
-| [Sidebar action menu component](sidebar-action-menu.component.md) | Displays a sidebar-action menu information panel. | [Source](../../lib/core/sidenav-layout/components/sidebar-action/sidebar-action-menu.component.ts) |
-| [Sidenav layout component](sidenav-layout.component.md) | Displays the standard three-region ADF application layout. | [Source](../../lib/core/sidenav-layout/components/sidenav-layout/sidenav-layout.component.ts) |
+| [Sidebar action menu component](sidebar-action-menu.component.md) | Displays a sidebar-action menu information panel. | [Source](../../lib/core/layout/components/sidebar-action/sidebar-action-menu.component.ts) |
+| [Sidenav layout component](sidenav-layout.component.md) | Displays the standard three-region ADF application layout. | [Source](../../lib/core/layout/components/sidenav-layout/sidenav-layout.component.ts) |
 | [Sorting picker component](sorting-picker.component.md) | Selects from a set of predefined sorting definitions and directions. | [Source](../../lib/core/sorting-picker/sorting-picker.component.ts) |
 | [Empty content component](empty-content.component.md) | Provides a generic "Empty Content" placeholder for components. | [Source](../../lib/core/templates/empty-content/empty-content.component.ts) |
 | [Error content component](error-content.component.md) | Displays info about a specific error. | [Source](../../lib/core/templates/error-content/error-content.component.ts) |
 | [Toolbar divider component](toolbar-divider.component.md) | Divides groups of elements in a Toolbar with a visual separator. | [Source](../../lib/core/toolbar/toolbar-divider.component.ts) |
-| [Toolbar title component](toolbar-title.component.md) | Supplies custom HTML to be included in a Toolbar component title. | [Source](../../lib/core/toolbar/toolbar-title.component.ts) |
+| [Toolbar title component](toolbar-title.component.md) | Supplies custom HTML to be included in a [Toolbar component](../core/toolbar.component.md) title. | [Source](../../lib/core/toolbar/toolbar-title.component.ts) |
 | [Toolbar component](toolbar.component.md) | Simple container for headers, titles, actions and breadcrumbs. | [Source](../../lib/core/toolbar/toolbar.component.ts) |
 | [User info component](user-info.component.md) | Shows user information. | [Source](../../lib/core/userinfo/components/user-info.component.ts) |
 | [Viewer component](viewer.component.md) | Displays content from an ACS repository. | [Source](../../lib/core/viewer/components/viewer.component.ts) |
@@ -60,7 +60,7 @@ for more information about installing and using the source code.
 
 | Name | Description | Source link |
 | ---- | ----------- | ----------- |
-| [Form field model](form-field.model.md) | Contains the value and metadata for a field of a Form component. | [Source](../../lib/core/form/components/widgets/core/form-field.model.ts) |
+| [Form field model](form-field.model.md) | Contains the value and metadata for a field of a [`Form`](../../lib/process-services/task-list/models/form.model.ts) component. | [Source](../../lib/core/form/components/widgets/core/form-field.model.ts) |
 | [Comment process model](comment-process.model.md) | Represents a comment added to a Process Services task or process instance. | [Source](../../lib/core/models/comment-process.model.ts) |
 | [Product version model](product-version.model.md) | Contains version and license information classes for Alfresco products. | [Source](../../lib/core/models/product-version.model.ts) |
 | [User process model](user-process.model.md) | Represents a Process Services user. | [Source](../../lib/core/models/user-process.model.ts) |
@@ -76,18 +76,18 @@ for more information about installing and using the source code.
 | [Node name tooltip pipe](node-name-tooltip.pipe.md) | Formats the tooltip for a Node. | [Source](../../lib/core/pipes/node-name-tooltip.pipe.ts) |
 | [Text highlight pipe](text-highlight.pipe.md) | Adds highlighting to words or sections of text that match a search string. | [Source](../../lib/core/pipes/text-highlight.pipe.ts) |
 | [Time ago pipe](time-ago.pipe.md) | Converts a recent past date into a number of days ago. | [Source](../../lib/core/pipes/time-ago.pipe.ts) |
-| [User initial pipe](user-initial.pipe.md) | Takes the name fields of a UserProcessModel object and extracts and formats the initials. | [Source](../../lib/core/pipes/user-initial.pipe.ts) |
+| [User initial pipe](user-initial.pipe.md) | Takes the name fields of a [`UserProcessModel`](../core/user-process.model.md) object and extracts and formats the initials. | [Source](../../lib/core/pipes/user-initial.pipe.ts) |
 
 ## Services
 
 | Name | Description | Source link |
 | ---- | ----------- | ----------- |
-| [Card item types service](card-item-types.service.md) | Maps type names to field component types for the Card View component. | [Source](../../lib/core/card-view/services/card-item-types.service.ts) |
-| [Card view update service](card-view-update.service.md) | Reports edits and clicks within fields of a Card View component. | [Source](../../lib/core/card-view/services/card-view-update.service.ts) |
+| [Card item types service](card-item-types.service.md) | Maps type names to field component types for the [Card View component](../core/card-view.component.md). | [Source](../../lib/core/card-view/services/card-item-types.service.ts) |
+| [Card view update service](card-view-update.service.md) | Reports edits and clicks within fields of a [Card View component](../core/card-view.component.md). | [Source](../../lib/core/card-view/services/card-view-update.service.ts) |
 | [Activiti alfresco service](activiti-alfresco.service.md) | Gets Alfresco Repository folder content based on a Repository account configured in Alfresco Process Services (APS). | [Source](../../lib/core/form/services/activiti-alfresco.service.ts) |
-| [Form rendering service](form-rendering.service.md) | Maps an APS form field type string onto the corresponding form widget component type. | [Source](../../lib/core/form/services/form-rendering.service.ts) |
+| [Form rendering service](form-rendering.service.md) | Maps an APS form field type string onto the corresponding form [widget component](../insights/widget.component.md) type. | [Source](../../lib/core/form/services/form-rendering.service.ts) |
 | [Form service](form.service.md) | Implements Process Services form methods | [Source](../../lib/core/form/services/form.service.ts) |
-| [Node service](node.service.md) | Gets Alfresco Repository node metadata and creates nodes with metadata.  | [Source](../../lib/core/form/services/node.service.ts) |
+| [Node service](node.service.md) | Gets Alfresco Repository node metadata and creates nodes with metadata. | [Source](../../lib/core/form/services/node.service.ts) |
 | [Process content service](process-content.service.md) | Manipulates content related to a Process Instance or Task Instance in APS. | [Source](../../lib/core/form/services/process-content.service.ts) |
 | [Alfresco api service](alfresco-api.service.md) | Provides access to an initialized **AlfrescoJSApi** instance. | [Source](../../lib/core/services/alfresco-api.service.ts) |
 | [Apps process service](apps-process.service.md) | Gets details of the Process Services apps that are deployed for the user. | [Source](../../lib/core/services/apps-process.service.ts) |
@@ -107,7 +107,7 @@ for more information about installing and using the source code.
 | [Nodes api service](nodes-api.service.md) | Accesses and manipulates ACS document nodes using their node IDs. | [Source](../../lib/core/services/nodes-api.service.ts) |
 | [Notification service](notification.service.md) | Shows a notification message with optional feedback. | [Source](../../lib/core/services/notification.service.ts) |
 | [Page title service](page-title.service.md) | Sets the page title. | [Source](../../lib/core/services/page-title.service.ts) |
-| [People content service](people-content.service.md) | Gets information about a Content Services user.   | [Source](../../lib/core/services/people-content.service.ts) |
+| [People content service](people-content.service.md) | Gets information about a Content Services user. | [Source](../../lib/core/services/people-content.service.ts) |
 | [People process service](people-process.service.md) | Gets information about Process Services users. | [Source](../../lib/core/services/people-process.service.ts) |
 | [Renditions service](renditions.service.md) ![Deprecated](../docassets/images/DeprecatedIcon.png) | Manages prearranged conversions of content to different formats. | [Source](../../lib/core/services/renditions.service.ts) |
 | [Search configuration service](search-configuration.service.md) | Provides fine control of parameters to a search. | [Source](../../lib/core/services/search-configuration.service.ts) |
@@ -134,5 +134,5 @@ for more information about installing and using the source code.
 | Name | Description | Source link |
 | ---- | ----------- | ----------- |
 | [Data Table Adapter interface](datatable-adapter.interface.md) | Defines how table data is supplied to DataTable and Tasklist components. | [Source](../../lib/core/datatable/data/datatable-adapter.ts) |
-| [Form Field Validator interface](form-field-validator.interface.md) | Defines how the input fields of Form and Task Details components are validated. | [Source](../../lib/core/form/components/widgets/core/form-field-validator.ts) |
+| [Form Field Validator interface](form-field-validator.interface.md) | Defines how the input fields of [`Form`](../../lib/process-services/task-list/models/form.model.ts) and Task Details components are validated. | [Source](../../lib/core/form/components/widgets/core/form-field-validator.ts) |
 | [Search Configuration interface](search-configuration.interface.md) | Provides fine control of parameters to a search. | [Source](../../lib/core/services/search-configuration.service.ts) |
diff --git a/docs/core/accordion-group.component.md b/docs/core/accordion-group.component.md
index 8565f9de52..101df471da 100644
--- a/docs/core/accordion-group.component.md
+++ b/docs/core/accordion-group.component.md
@@ -40,18 +40,16 @@ export class MyComponent implements OnInit {
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | hasAccordionIcon | `boolean` | true | Should the (expanded) accordion icon be shown? |
 | heading | `string` |  | Title heading for the group. |
 | headingIcon | `string` |  | The material design icon. |
 | headingIconTooltip | `string` |  | Tooltip message to be shown for headingIcon |
-| isOpen |  |  | Is this group currently open? |
-| isSelected |  |  | Is this group currently selected? |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | headingClick | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when the heading is clicked. |
 
 ## Details
diff --git a/docs/core/alfresco-api.service.md b/docs/core/alfresco-api.service.md
index 169b552548..4c01652b8d 100644
--- a/docs/core/alfresco-api.service.md
+++ b/docs/core/alfresco-api.service.md
@@ -46,7 +46,7 @@ export class MyComponent implements OnInit {
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
-| nodeUpdated | `Subject<MinimalNodeEntryEntity>` | Emitted when a node updates. |
+| nodeUpdated | [`Subject`](http://reactivex.io/documentation/subject.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>` | Emitted when a node updates. |
 
 ## Details
 
diff --git a/docs/core/app-config.service.md b/docs/core/app-config.service.md
index 5d504de5ec..ad83ddf173 100644
--- a/docs/core/app-config.service.md
+++ b/docs/core/app-config.service.md
@@ -11,11 +11,10 @@ Supports app configuration settings, stored server side.
 
 ### Methods
 
--   **get**(key: `string` = `null`, defaultValue?: `T` = `null`): `T`<br/>
+-   **get**(key: `string`, defaultValue?: )<br/>
     Gets the value of a named property.
     -   _key:_ `string`  - Name of the property
-    -   _defaultValue:_ `T`  - (Optional) Value to return if the key is not found
-    -   **Returns** `T` - Value of the property
+    -   _defaultValue:_   - (Optional) Value to return if the key is not found
 -   **getLocationHostname**(): `string`<br/>
     Gets the location.hostname property.
     -   **Returns** `string` - Value of the property
@@ -26,10 +25,10 @@ Supports app configuration settings, stored server side.
 -   **getLocationProtocol**(): `string`<br/>
     Gets the location.protocol value.
     -   **Returns** `string` - 
--   **load**(): `Promise<any>`<br/>
+-   **load**(): [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises)`<any>`<br/>
     Loads the config file.
-    -   **Returns** `Promise<any>` - Notification when loading is complete
--   **select**(property: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
+    -   **Returns** [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises)`<any>` - Notification when loading is complete
+-   **select**(property: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
     Requests notification of a property value when it is loaded.
     -   _property:_ `string`  - The desired property value
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<any>` - Property value, when loaded
@@ -83,7 +82,7 @@ export class AppModule { }
 
 Below is a simple example of using the [`AppConfigService`](../core/app-config.service.md) in practice. 
 
-**app.component.ts**
+**[app.component](../../demo-shell/src/app/app.component.ts).ts**
 
 ```ts
 import { AppConfigService } from '@alfresco/adf-core';
diff --git a/docs/core/apps-process.service.md b/docs/core/apps-process.service.md
index efabc5e515..cab6212d62 100644
--- a/docs/core/apps-process.service.md
+++ b/docs/core/apps-process.service.md
@@ -12,14 +12,14 @@ Gets details of the Process Services apps that are deployed for the user.
 
 ### Methods
 
--   **getApplicationDetailsById**(appId: `number` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`AppDefinitionRepresentation`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-activiti-rest-api/docs/AppDefinitionRepresentation.md)`>`<br/>
+-   **getApplicationDetailsById**(appId: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`AppDefinitionRepresentation`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-activiti-rest-api/docs/AppDefinitionRepresentation.md)`>`<br/>
     Gets the details for a specific app ID number.
     -   _appId:_ `number`  - ID of the target app
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`AppDefinitionRepresentation`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-activiti-rest-api/docs/AppDefinitionRepresentation.md)`>` - Details of the app
 -   **getDeployedApplications**(): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`AppDefinitionRepresentation`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-activiti-rest-api/docs/AppDefinitionRepresentation.md)`[]>`<br/>
     Gets a list of deployed apps for this user.
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`AppDefinitionRepresentation`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-activiti-rest-api/docs/AppDefinitionRepresentation.md)`[]>` - The list of deployed apps
--   **getDeployedApplicationsByName**(name: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`AppDefinitionRepresentation`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-activiti-rest-api/docs/AppDefinitionRepresentation.md)`>`<br/>
+-   **getDeployedApplicationsByName**(name: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`AppDefinitionRepresentation`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-activiti-rest-api/docs/AppDefinitionRepresentation.md)`>`<br/>
     Gets a list of deployed apps for this user, where the app name is `name`.
     -   _name:_ `string`  - Name of the app
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`AppDefinitionRepresentation`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-activiti-rest-api/docs/AppDefinitionRepresentation.md)`>` - The list of deployed apps
diff --git a/docs/core/authentication.service.md b/docs/core/authentication.service.md
index 1d2edd0984..1c1a1c7806 100644
--- a/docs/core/authentication.service.md
+++ b/docs/core/authentication.service.md
@@ -12,63 +12,75 @@ Provides authentication to ACS and APS.
 
 ### Methods
 
+-   **getBpmLoggedUser**(): [`Observable`](http://reactivex.io/documentation/observable.html)`<UserRepresentation>`<br/>
+
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<UserRepresentation>` - 
+
 -   **getBpmUsername**(): `string`<br/>
     Gets the BPM username
     -   **Returns** `string` - The BPM username
 -   **getEcmUsername**(): `string`<br/>
     Gets the ECM username.
     -   **Returns** `string` - The ECM username
--   **getRedirect**(provider: `string` = `null`): `any[]`<br/>
+-   **getRedirect**(provider: `string`): `string`<br/>
     Gets the URL to redirect to after login.
     -   _provider:_ `string`  - Service provider. Can be "ECM", "BPM" or "ALL".
-    -   **Returns** `any[]` - The redirect URL
--   **getTicketBpm**(): `string | null`<br/>
+    -   **Returns** `string` - The redirect URL
+-   **getTicketBpm**(): `string|null`<br/>
     Gets the BPM ticket stored in the Storage.
-    -   **Returns** `string | null` - The ticket or `null` if none was found
--   **getTicketEcm**(): `string | null`<br/>
+    -   **Returns** `string|null` - The ticket or `null` if none was found
+-   **getTicketEcm**(): `string|null`<br/>
     Gets the ECM ticket stored in the Storage.
-    -   **Returns** `string | null` - The ticket or `null` if none was found
--   **getTicketEcmBase64**(): `string | null`<br/>
+    -   **Returns** `string|null` - The ticket or `null` if none was found
+-   **getTicketEcmBase64**(): `string|null`<br/>
     Gets the BPM ticket from the Storage in Base 64 format.
-    -   **Returns** `string | null` - The ticket or `null` if none was found
--   **handleError**(error: `any` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
+    -   **Returns** `string|null` - The ticket or `null` if none was found
+-   **handleError**(error: `any`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
     Prints an error message in the console browser
     -   _error:_ `any`  - Error message
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<any>` - Object representing the error message
+-   **isALLProvider**(): `boolean`<br/>
+
+    -   **Returns** `boolean` - 
+
+-   **isBPMProvider**(): `boolean`<br/>
+
+    -   **Returns** `boolean` - 
+
 -   **isBpmLoggedIn**(): `boolean`<br/>
     Checks if the user is logged in on a BPM provider.
     -   **Returns** `boolean` - True if logged in, false otherwise
+-   **isECMProvider**(): `boolean`<br/>
+
+    -   **Returns** `boolean` - 
+
 -   **isEcmLoggedIn**(): `boolean`<br/>
     Checks if the user is logged in on an ECM provider.
     -   **Returns** `boolean` - True if logged in, false otherwise
 -   **isLoggedIn**(): `boolean`<br/>
     Checks if the user logged in.
     -   **Returns** `boolean` - True if logged in, false otherwise
+-   **isOauth**(): `boolean`<br/>
+
+    -   **Returns** `boolean` - 
+
 -   **isRememberMeSet**(): `boolean`<br/>
     Checks whether the "remember me" cookie was set or not.
     -   **Returns** `boolean` - True if set, false otherwise
--   **login**(username: `string` = `null`, password: `string` = `null`, rememberMe: `boolean` = `false`): [`Observable`](http://reactivex.io/documentation/observable.html)`<object>`<br/>
+-   **login**(username: `string`, password: `string`, rememberMe: `boolean` = `false`): [`Observable`](http://reactivex.io/documentation/observable.html)`<Function>`<br/>
     Logs the user in.
     -   _username:_ `string`  - Username for the login
     -   _password:_ `string`  - Password for the login
     -   _rememberMe:_ `boolean`  - Stores the user's login details if true
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<object>` - Object with auth type ("ECM", "BPM" or "ALL") and auth ticket
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<Function>` - Object with auth type ("ECM", "BPM" or "ALL") and auth ticket
 -   **logout**(): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
     Logs the user out.
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<any>` - Response event called when logout is complete
--   **removeTicket**()<br/>
-    Removes the login ticket from Storage.
--   **saveTicketAuth**()<br/>
-    Saves the AUTH ticket in the Storage.
--   **saveTicketBpm**()<br/>
-    Saves the BPM ticket in the Storage.
--   **saveTicketEcm**()<br/>
-    Saves the ECM ticket in the Storage.
--   **saveTickets**()<br/>
-    Saves the ECM and BPM ticket in the Storage.
--   **setRedirect**(url: [`RedirectionModel`](../../lib/core/models/redirection.model.ts) = `null`)<br/>
+-   **setRedirect**(url: [`RedirectionModel`](../../lib/core/models/redirection.model.ts))<br/>
     Sets the URL to redirect to after login.
     -   _url:_ [`RedirectionModel`](../../lib/core/models/redirection.model.ts)  - URL to redirect to
+-   **ssoImplicitLogin**()<br/>
+    Logs the user in with SSO
 
 ## Details
 
diff --git a/docs/core/card-item-types.service.md b/docs/core/card-item-types.service.md
index 739e5ec314..63b71b8787 100644
--- a/docs/core/card-item-types.service.md
+++ b/docs/core/card-item-types.service.md
@@ -12,20 +12,20 @@ Maps type names to field component types for the [Card View component](../core/c
 
 ### Methods
 
--   **getComponentTypeResolver**(type: `string` = `null`, defaultValue: `Type<__type>` = `this.defaultValue`): [`DynamicComponentResolveFunction`](../../lib/core/services/dynamic-component-mapper.service.ts)<br/>
+-   **getComponentTypeResolver**(type: `string`, defaultValue: `Type<__type>` = `this.defaultValue`): `DynamicComponentResolveFunction`<br/>
     Gets the currently active ComponentTypeResolver function for a field type.
     -   _type:_ `string`  - The type whose resolver you want
     -   _defaultValue:_ `Type<__type>`  - Default type returned for types that are not yet mapped
-    -   **Returns** [`DynamicComponentResolveFunction`](../../lib/core/services/dynamic-component-mapper.service.ts) - Resolver function
--   **resolveComponentType**(model: [`DynamicComponentModel`](../../lib/core/services/dynamic-component-mapper.service.ts) = `null`, defaultValue: `Type<__type>` = `this.defaultValue`): `Type<__type>`<br/>
+    -   **Returns** `DynamicComponentResolveFunction` - Resolver function
+-   **resolveComponentType**(model: `DynamicComponentModel`, defaultValue: `Type<__type>` = `this.defaultValue`): `Type<__type>`<br/>
     Finds the component type that is needed to render a form field.
-    -   _model:_ [`DynamicComponentModel`](../../lib/core/services/dynamic-component-mapper.service.ts)  - [Form](../../lib/process-services/task-list/models/form.model.ts) field model for the field to render
+    -   _model:_ `DynamicComponentModel`  - [Form](../../lib/process-services/task-list/models/form.model.ts) field model for the field to render
     -   _defaultValue:_ `Type<__type>`  - Default type returned for field types that are not yet mapped.
     -   **Returns** `Type<__type>` - Component type
--   **setComponentTypeResolver**(type: `string` = `null`, resolver: [`DynamicComponentResolveFunction`](../../lib/core/services/dynamic-component-mapper.service.ts) = `null`, override: `boolean` = `true`)<br/>
+-   **setComponentTypeResolver**(type: `string`, resolver: `DynamicComponentResolveFunction`, override: `boolean` = `true`)<br/>
     Sets or optionally replaces a ComponentTypeResolver function for a field type.
     -   _type:_ `string`  - The type whose resolver you want to set
-    -   _resolver:_ [`DynamicComponentResolveFunction`](../../lib/core/services/dynamic-component-mapper.service.ts)  - The new resolver function
+    -   _resolver:_ `DynamicComponentResolveFunction`  - The new resolver function
     -   _override:_ `boolean`  - The new resolver will only replace an existing one if this parameter is true
 
 ## Details
@@ -39,13 +39,13 @@ The default mapping is shown below:
 
 | Type string | Component |
 | ----------- | --------- |
-| 'text' | CardViewTextItemComponent |
-| 'int' | CardViewTextItemComponent |
-| 'float' | CardViewTextItemComponent |
-| 'date' | CardViewDateItemComponent |
-| 'datetime' | CardViewDateItemComponent |
-| 'bool' | CardViewBoolItemComponent |
-| 'map' | CardViewMapItemComponent |
+| 'text' | [`CardViewTextItemComponent`](../../lib/core/card-view/components/card-view-textitem/card-view-textitem.component.ts) |
+| 'int' | [`CardViewTextItemComponent`](../../lib/core/card-view/components/card-view-textitem/card-view-textitem.component.ts) |
+| 'float' | [`CardViewTextItemComponent`](../../lib/core/card-view/components/card-view-textitem/card-view-textitem.component.ts) |
+| 'date' | [`CardViewDateItemComponent`](../../lib/core/card-view/components/card-view-dateitem/card-view-dateitem.component.ts) |
+| 'datetime' | [`CardViewDateItemComponent`](../../lib/core/card-view/components/card-view-dateitem/card-view-dateitem.component.ts) |
+| 'bool' | [`CardViewBoolItemComponent`](../../lib/core/card-view/components/card-view-boolitem/card-view-boolitem.component.ts) |
+| 'map' | [`CardViewMapItemComponent`](../../lib/core/card-view/components/card-view-mapitem/card-view-mapitem.component.ts) |
 
 ### Adding new type mappings
 
diff --git a/docs/core/card-view.component.md b/docs/core/card-view.component.md
index b31eeeec57..192efbf15b 100644
--- a/docs/core/card-view.component.md
+++ b/docs/core/card-view.component.md
@@ -74,6 +74,17 @@ Defining properties from Typescript:
         key: 'mental-stability',
         default: 0.0
     }),
+    new CardViewKeyValuePairsItemModel({
+        label: 'Variables',
+        value: [],
+        key: 'key-value-pairs'
+    }),
+    new CardViewSelectItemModel({
+        label: 'Select box',
+        value: 'one',
+        options$: of([{ key: 'one', label: 'One' }, { key: 'two', label: 'Two' }]),
+        key: 'select'
+    }),
     ...
 ]
 ```
@@ -83,10 +94,10 @@ Defining properties from Typescript:
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | displayEmpty | `boolean` | true | Toggles whether or not to show empty items in non-editable mode. |
 | editable | `boolean` |  | Toggles whether or not the items can be edited. |
-| properties | [`CardViewItem`](../../lib/core/card-view/interfaces/card-view-item.interface.ts)`[]` |  | (**required**) Items to show in the card view. |
+| properties | `CardViewItem[]` |  | (**required**) Items to show in the card view. |
 
 ## Details
 
@@ -99,6 +110,8 @@ You define the property list, the [`CardViewComponent`](../core/card-view.compon
 -   [**CardViewBoolItemModel**](#card-bool-item) - _for bool items (checkbox)_
 -   [**CardViewIntItemModel**](#card-int-item) - _for integer items_
 -   [**CardViewFloatItemModel**](#card-float-item) - _for float items_
+-   [**CardViewKeyValuePairsItemModel**](#card-key-value-pairs-item) - _for key-value-pairs items_
+-   [**CardViewSelectItemModel**](#card-select-item) - _for select items_
 
 Each of these types implements the [Card View Item interface](card-view-item.interface.md):
 
@@ -287,6 +300,37 @@ const floatItemProperty = new CardViewFloatItemModel(options);
 | displayValue\* | float |  | The value to display |
 | editable | boolean | false | Toggles whether the item is editable |
 
+#### Card Key Value Pairs Item
+
+[`CardViewKeyValuePairsItemModel`](../../lib/core/card-view/models/card-view-keyvaluepairs.model.ts) is a property type for key-value properties.
+
+```ts
+const keyValuePairsItemProperty = new CardViewKeyValuePairsItemModel(options);
+```
+
+| Name | Type | Default | Description |
+| ---- | ---- | ------- | ----------- |
+| label\* | string |  | Item label |
+| key\* | string |  | Identifying key (important when editing the item) |
+| editable | boolean | false | Toggles whether the item is editable |
+| value\* | `[{ name: '', value: '' }, ...]` |  | The original data value for the item |
+
+#### Card Select Item
+
+[`CardViewSelectItemModel`](../../lib/core/card-view/models/card-view-selectitem.model.ts) is a property type for select properties.
+
+```ts
+const selectItemProperty = new CardViewSelectItemModel(options);
+```
+
+| Name | Type | Default | Description |
+| ---- | ---- | ------- | ----------- |
+| label\* | string |  | Item label |
+| key\* | string |  | Identifying key (important when editing the item) |
+| editable | boolean | false | Toggles whether the item is editable |
+| value | string |  | The original data value for the item |
+| options$\* | [`Observable`](http://reactivex.io/documentation/observable.html)&lt;CardViewSelectItemOption\[]> |  | The original data value for the item |
+
 ## See also
 
 -   [Card View Update service](card-view-update.service.md)
diff --git a/docs/core/comment-content.service.md b/docs/core/comment-content.service.md
index df05cb9191..415d1214ad 100644
--- a/docs/core/comment-content.service.md
+++ b/docs/core/comment-content.service.md
@@ -12,12 +12,12 @@ Adds and retrieves comments for nodes in Content Services.
 
 ### Methods
 
--   **addNodeComment**(nodeId: `string` = `null`, message: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`CommentModel`](../../lib/core/models/comment.model.ts)`>`<br/>
+-   **addNodeComment**(nodeId: `string`, message: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`CommentModel`](../../lib/core/models/comment.model.ts)`>`<br/>
     Adds a comment to a node.
     -   _nodeId:_ `string`  - ID of the target node
     -   _message:_ `string`  - Text for the comment
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`CommentModel`](../../lib/core/models/comment.model.ts)`>` - Details of the comment added
--   **getNodeComments**(nodeId: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`CommentModel`](../../lib/core/models/comment.model.ts)`[]>`<br/>
+-   **getNodeComments**(nodeId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`CommentModel`](../../lib/core/models/comment.model.ts)`[]>`<br/>
     Gets all comments that have been added to a node.
     -   _nodeId:_ `string`  - ID of the target node
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`CommentModel`](../../lib/core/models/comment.model.ts)`[]>` - Details for each comment
diff --git a/docs/core/comment-list.component.md b/docs/core/comment-list.component.md
index c64fddf4d0..d725068bb2 100644
--- a/docs/core/comment-list.component.md
+++ b/docs/core/comment-list.component.md
@@ -62,11 +62,11 @@ In the component template use the [comment list component](../core/comment-list.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | comments | [`CommentModel`](../../lib/core/models/comment.model.ts)`[]` |  | The comments data used to populate the list. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | clickRow | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`CommentModel`](../../lib/core/models/comment.model.ts)`>` | Emitted when the user clicks on one of the comment rows. |
diff --git a/docs/core/comment-process.service.md b/docs/core/comment-process.service.md
index 34fde0c45e..694ea58890 100644
--- a/docs/core/comment-process.service.md
+++ b/docs/core/comment-process.service.md
@@ -12,21 +12,21 @@ Adds and retrieves comments for task and process instances in Process Services.
 
 ### Methods
 
--   **addProcessInstanceComment**(processInstanceId: `string` = `null`, message: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`CommentModel`](../../lib/core/models/comment.model.ts)`>`<br/>
+-   **addProcessInstanceComment**(processInstanceId: `string`, message: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`CommentModel`](../../lib/core/models/comment.model.ts)`>`<br/>
     Adds a comment to a process instance.
     -   _processInstanceId:_ `string`  - ID of the target process instance
     -   _message:_ `string`  - Text for the comment
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`CommentModel`](../../lib/core/models/comment.model.ts)`>` - Details of the comment added
--   **addTaskComment**(taskId: `string` = `null`, message: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`CommentModel`](../../lib/core/models/comment.model.ts)`>`<br/>
+-   **addTaskComment**(taskId: `string`, message: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`CommentModel`](../../lib/core/models/comment.model.ts)`>`<br/>
     Adds a comment to a task.
     -   _taskId:_ `string`  - ID of the target task
     -   _message:_ `string`  - Text for the comment
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`CommentModel`](../../lib/core/models/comment.model.ts)`>` - Details about the comment
--   **getProcessInstanceComments**(processInstanceId: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`CommentModel`](../../lib/core/models/comment.model.ts)`[]>`<br/>
+-   **getProcessInstanceComments**(processInstanceId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`CommentModel`](../../lib/core/models/comment.model.ts)`[]>`<br/>
     Gets all comments that have been added to a process instance.
     -   _processInstanceId:_ `string`  - ID of the target process instance
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`CommentModel`](../../lib/core/models/comment.model.ts)`[]>` - Details for each comment
--   **getTaskComments**(taskId: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`CommentModel`](../../lib/core/models/comment.model.ts)`[]>`<br/>
+-   **getTaskComments**(taskId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`CommentModel`](../../lib/core/models/comment.model.ts)`[]>`<br/>
     Gets all comments that have been added to a task.
     -   _taskId:_ `string`  - ID of the target task
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`CommentModel`](../../lib/core/models/comment.model.ts)`[]>` - Details for each comment
diff --git a/docs/core/comments.component.md b/docs/core/comments.component.md
index 102fd14615..197a91797e 100644
--- a/docs/core/comments.component.md
+++ b/docs/core/comments.component.md
@@ -32,7 +32,7 @@ Displays comments from users involved in a specified task or content and allows
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | nodeId | `string` |  | The numeric ID of the node. |
 | readOnly | `boolean` | false | Are the comments read only? |
 | taskId | `string` |  | The numeric ID of the task. |
@@ -40,5 +40,5 @@ Displays comments from users involved in a specified task or content and allows
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when an error occurs while displaying/adding a comment. |
diff --git a/docs/core/content.service.md b/docs/core/content.service.md
index 47ab85c6cd..8a061a0d21 100644
--- a/docs/core/content.service.md
+++ b/docs/core/content.service.md
@@ -12,57 +12,57 @@ Accesses app-generated data objects via URLs and file downloads.
 
 ### Methods
 
--   **createFolder**(relativePath: `string` = `null`, name: `string` = `null`, parentId?: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FolderCreatedEvent`](../../lib/core/events/folder-created.event.ts)`>`<br/>
+-   **createFolder**(relativePath: `string`, name: `string`, parentId?: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<FolderCreatedEvent>`<br/>
     Creates a folder.
     -   _relativePath:_ `string`  - Location to create the folder
     -   _name:_ `string`  - Folder name
     -   _parentId:_ `string`  - (Optional) Node ID of parent folder
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FolderCreatedEvent`](../../lib/core/events/folder-created.event.ts)`>` - Information about the new folder
--   **createTrustedUrl**(blob: [`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob) = `null`): `string`<br/>
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<FolderCreatedEvent>` - Information about the new folder
+-   **createTrustedUrl**(blob: [`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob)): `string`<br/>
     Creates a trusted object URL from the [Blob](https://developer.mozilla.org/en-US/docs/Web/API/Blob). WARNING: calling this method with untrusted user data exposes your application to XSS security risks!
     -   _blob:_ [`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob)  - Data to wrap into object URL
     -   **Returns** `string` - URL string
--   **downloadBlob**(blob: [`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob) = `null`, fileName: `string` = `null`)<br/>
+-   **downloadBlob**(blob: [`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob), fileName: `string`)<br/>
     Invokes content download for a [Blob](https://developer.mozilla.org/en-US/docs/Web/API/Blob) with a file name.
     -   _blob:_ [`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob)  - Content to download.
     -   _fileName:_ `string`  - Name of the resulting file.
--   **downloadData**(data: `any` = `null`, fileName: `string` = `null`)<br/>
+-   **downloadData**(data: `any`, fileName: `string`)<br/>
     Invokes content download for a data array with a file name.
     -   _data:_ `any`  - Data to download.
     -   _fileName:_ `string`  - Name of the resulting file.
--   **downloadJSON**(json: `any` = `null`, fileName: `string` = `null`)<br/>
+-   **downloadJSON**(json: `any`, fileName: `string`)<br/>
     Invokes content download for a JSON object with a file name.
     -   _json:_ `any`  - JSON object to download.
     -   _fileName:_ `string`  - Name of the resulting file.
--   **getContentUrl**(node: `any` = `null`, attachment?: `boolean` = `null`, ticket?: `string` = `null`): `string`<br/>
+-   **getContentUrl**(node: `any`, attachment?: `boolean`, ticket?: `string`): `string`<br/>
     Gets a content URL for the given node.
     -   _node:_ `any`  - Node to get URL for.
     -   _attachment:_ `boolean`  - (Optional) Toggles whether to retrieve content as an attachment for download
     -   _ticket:_ `string`  - (Optional) Custom ticket to use for authentication
     -   **Returns** `string` - URL string
--   **getDocumentThumbnailUrl**(node: `any` = `null`, attachment?: `boolean` = `null`, ticket?: `string` = `null`): `string`<br/>
+-   **getDocumentThumbnailUrl**(node: `any`, attachment?: `boolean`, ticket?: `string`): `string`<br/>
     Gets a thumbnail URL for the given document node.
     -   _node:_ `any`  - Node to get URL for.
     -   _attachment:_ `boolean`  - (Optional) Toggles whether to retrieve content as an attachment for download
     -   _ticket:_ `string`  - (Optional) Custom ticket to use for authentication
     -   **Returns** `string` - URL string
--   **getNode**(nodeId: `string` = `null`, opts?: `any` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodeEntry`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-core-rest-api/docs/NodeEntry.md)`>`<br/>
+-   **getNode**(nodeId: `string`, opts?: `any`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodeEntry`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-core-rest-api/docs/NodeEntry.md)`>`<br/>
     Gets a Node via its node ID.
     -   _nodeId:_ `string`  - ID of the target node
     -   _opts:_ `any`  - (Optional) Options supported by JSAPI
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodeEntry`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-core-rest-api/docs/NodeEntry.md)`>` - Details of the folder
--   **getNodeContent**(nodeId: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
+-   **getNodeContent**(nodeId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
     Gets content for the given node.
     -   _nodeId:_ `string`  - ID of the target node
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<any>` - Content data
--   **hasAllowableOperations**(node: `any` = `null`): `boolean`<br/>
+-   **hasAllowableOperations**(node: `any`): `boolean`<br/>
     Checks if the node has the properties allowableOperations
     -   _node:_ `any`  - Node to check allowableOperations
     -   **Returns** `boolean` - True if the node has the property, false otherwise
--   **hasPermission**(node: `Node` = `null`, permission: [`PermissionsEnum`](../../lib/core/models/permissions.enum.ts)` | string` = `null`): `boolean`<br/>
+-   **hasPermission**(node: `Node`, permission: [`PermissionsEnum`](../../lib/core/models/permissions.enum.ts)`|string`): `boolean`<br/>
     Checks if the user has permissions on that node
     -   _node:_ `Node`  - Node to check allowableOperations
-    -   _permission:_ [`PermissionsEnum`](../../lib/core/models/permissions.enum.ts)` | string`  - Create, delete, update, updatePermissions, !create, !delete, !update, !updatePermissions
+    -   _permission:_ [`PermissionsEnum`](../../lib/core/models/permissions.enum.ts)`|string`  - Create, delete, update, updatePermissions, !create, !delete, !update, !updatePermissions
     -   **Returns** `boolean` - True if the user has the required permissions, false otherwise
 
 ## Details
diff --git a/docs/core/context-menu.directive.md b/docs/core/context-menu.directive.md
index 4df63fef93..6559d64361 100644
--- a/docs/core/context-menu.directive.md
+++ b/docs/core/context-menu.directive.md
@@ -47,9 +47,9 @@ export class MyComponent implements OnInit {
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
-| context-menu-enabled | `boolean` | false | Is the menu enabled? |
-| context-menu | `any[]` |  | Items for the menu. |
+| ---- | ---- | ------------- | ----------- |
+| enabled | `boolean` | false | Is the menu enabled? |
+| links | `any[]` |  | Items for the menu. |
 
 ## Details
 
diff --git a/docs/core/cookie.service.md b/docs/core/cookie.service.md
index dacf9e34b0..2ad9511047 100644
--- a/docs/core/cookie.service.md
+++ b/docs/core/cookie.service.md
@@ -14,19 +14,19 @@ Stores key-value data items as browser cookies.
 
 -   **clear**()<br/>
 
--   **getItem**(key: `string` = `null`): `string | null`<br/>
+-   **getItem**(key: `string`): `string|null`<br/>
     Retrieves a cookie by its key.
     -   _key:_ `string`  - Key to identify the cookie
-    -   **Returns** `string | null` - The cookie data or null if it is not found
+    -   **Returns** `string|null` - The cookie data or null if it is not found
 -   **isEnabled**(): `boolean`<br/>
     Checks if cookies are enabled.
     -   **Returns** `boolean` - True if enabled, false otherwise
--   **setItem**(key: `string` = `null`, data: `string` = `null`, expiration: `Date | null` = `null`, path: `string | null` = `null`)<br/>
+-   **setItem**(key: `string`, data: `string`, expiration: `Date|null`, path: `string|null`)<br/>
     Sets a cookie.
     -   _key:_ `string`  - Key to identify the cookie
     -   _data:_ `string`  - Data value to set for the cookie
-    -   _expiration:_ `Date | null`  - Expiration date of the data
-    -   _path:_ `string | null`  - "Pathname" to store the cookie
+    -   _expiration:_ `Date|null`  - Expiration date of the data
+    -   _path:_ `string|null`  - "Pathname" to store the cookie
 
 ## Details
 
diff --git a/docs/core/data-column.component.md b/docs/core/data-column.component.md
index 7b29b96e1a..ecdba3bd38 100644
--- a/docs/core/data-column.component.md
+++ b/docs/core/data-column.component.md
@@ -10,19 +10,14 @@ Defines column properties for DataTable, Tasklist, Document List and other compo
 ## Contents
 
 -   [Basic Usage](#basic-usage)
-
 -   [Class members](#class-members)
-
     -   [Properties](#properties)
-
 -   [Details](#details)
-
     -   [Conditional visibility](#conditional-visibility)
     -   [Automatic column header translation](#automatic-column-header-translation)
     -   [Custom tooltips](#custom-tooltips)
     -   [Column Template](#column-template)
     -   [Styling Techniques](#styling-techniques)
-
 -   [See also](#see-also)
 
 ## Basic Usage
@@ -44,13 +39,13 @@ Defines column properties for DataTable, Tasklist, Document List and other compo
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
-| class | `string` |  | Additional CSS class to be applied to column (header and cells). |
+| ---- | ---- | ------------- | ----------- |
+| cssClass | `string` |  | Additional CSS class to be applied to column (header and cells). |
 | format | `string` |  | Value format (if supported by the parent component), for example format of the date. |
 | formatTooltip | `Function` |  | Custom tooltip formatter function. |
 | key | `string` |  | Data source key. Can be either a column/property key like `title`  or a property path like `createdBy.name`. |
 | sortable | `boolean` | true | Toggles ability to sort by this column, for example by clicking the column header. |
-| sr-title | `string` |  | Title to be used for screen readers. |
+| srTitle | `string` |  | Title to be used for screen readers. |
 | title | `string` | "" | Display title of the column, typically used for column headers. You can use the i18n resource key to get it translated automatically. |
 | type | `string` | "text" | Value type for the column. Possible settings are 'text', 'image', 'date', 'fileSize' and 'location'. |
 
diff --git a/docs/core/datatable.component.md b/docs/core/datatable.component.md
index d11baa5037..89ddd04bdd 100644
--- a/docs/core/datatable.component.md
+++ b/docs/core/datatable.component.md
@@ -15,16 +15,11 @@ See it live: [DataTable Quickstart](https://embed.plnkr.co/80qr4YFBeHjLMdAV0F6l/
 ## Contents
 
 -   [Basic usage](#basic-usage)
-
     -   [Setting the rows and column schema](#setting-the-rows-and-column-schema)
-
 -   [Class members](#class-members)
-
     -   [Properties](#properties)
     -   [Events](#events)
-
 -   [Details](#details)
-
     -   [Supplying data for the table](#supplying-data-for-the-table)
     -   [Customizing columns](#customizing-columns)
     -   [DataTable DOM Events](#datatable-dom-events)
@@ -32,12 +27,11 @@ See it live: [DataTable Quickstart](https://embed.plnkr.co/80qr4YFBeHjLMdAV0F6l/
     -   [Custom Empty content template](#custom-empty-content-template)
     -   [Loading content template](#loading-content-template)
     -   [Using events](#using-events)
-
 -   [See also](#see-also)
 
 ## Basic usage
 
-**app.component.html**
+**[app.component](../../demo-shell/src/app/app.component.ts).html**
 
 ```html
 <adf-datatable 
@@ -45,7 +39,7 @@ See it live: [DataTable Quickstart](https://embed.plnkr.co/80qr4YFBeHjLMdAV0F6l/
 </adf-datatable>
 ```
 
-**app.component.ts**
+**[app.component](../../demo-shell/src/app/app.component.ts).ts**
 
 ```ts
 import { ObjectDataTableAdapter }  from '@alfresco/adf-core';
@@ -84,7 +78,7 @@ export class DataTableDemo {
 
 ### Setting the rows and column schema
 
-You can set rows and columns to the [ObjectDataTableAdapter](../../lib/core/datatable/data/object-datatable-adapter.ts) like shown below:
+You can set rows and columns to the [`ObjectDataTableAdapter`](../../lib/core/datatable/data/object-datatable-adapter.ts) like shown below:
 
 ```ts
 import { ObjectDataTableAdapter }  from '@alfresco/adf-core';
@@ -161,7 +155,7 @@ export class DataTableDemo {
 </adf-datatable>
 ```
 
-You can also set rows to the [ObjectDataTableAdapter](../../lib/core/datatable/data/object-datatable-adapter.ts) and set columns as an input like shown below :
+You can also set rows to the [`ObjectDataTableAdapter`](../../lib/core/datatable/data/object-datatable-adapter.ts) and set columns as an input like shown below :
 
 ```ts
 import { ObjectDataTableAdapter }  from '@alfresco/adf-core';
@@ -256,34 +250,35 @@ export class DataTableDemo {
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | actions | `boolean` | false | Toggles the data actions column. |
 | actionsPosition | `string` | "right" | Position of the actions dropdown menu. Can be "left" or "right". |
 | allowDropFiles | `boolean` | false | Toggles file drop support for rows (see [Upload directive](upload.directive.md) for further details). |
-| columns | `any[]` |  \[] | The columns that the datatable will show. |
+| columns | `any[]` | \[] | The columns that the datatable will show. |
 | contextMenu | `boolean` | false | Toggles custom context menu for the component. |
-| data | [`DataTableAdapter`](../../lib/core/datatable/data/datatable-adapter.ts) |  | Data source for the table |
-| display | `string` |  [`DisplayMode`](../../lib/core/datatable/components/datatable/datatable.component.ts).List | Selects the display mode of the table. Can be "list" or "gallery". |
+| data | `DataTableAdapter` |  | Data source for the table |
+| display | `string` | DisplayMode.List | Selects the display mode of the table. Can be "list" or "gallery". |
 | fallbackThumbnail | `string` |  | Fallback image for rows where the thumbnail is missing. |
 | loading | `boolean` | false | Flag that indicates if the datatable is in loading state and needs to show the loading template (see the docs to learn how to configure a loading template). |
 | multiselect | `boolean` | false | Toggles multiple row selection, which renders checkboxes at the beginning of each row. |
 | noPermission | `boolean` | false | Flag that indicates if the datatable should show the "no permission" template. |
+| rowMenuCacheEnabled | `boolean` | true |  |
 | rowStyle | `string` |  | The inline style to apply to every row. See [NgStyle](https://angular.io/docs/ts/latest/api/common/index/NgStyle-directive.html) docs for more details and usage examples. |
 | rowStyleClass | `string` | "" | The CSS class to apply to every row. |
-| rows | `any[]` |  \[] | The rows that the datatable will show. |
+| rows | `any[]` | \[] | The rows that the datatable will show. |
 | selectionMode | `string` | "single" | Row selection mode. Can be none, `single` or `multiple`. For `multiple` mode, you can use Cmd (macOS) or Ctrl (Win) modifier key to toggle selection for multiple rows. |
 | showHeader | `boolean` | true | Toggles the header. |
-| sorting | `any[]` |  \[] | Define the sort order of the datatable. Possible values are : [`created`, `desc`], [`created`, `asc`], [`due`, `desc`], [`due`, `asc`] |
+| sorting | `any[]` | \[] | Define the sort order of the datatable. Possible values are : [`created`, `desc`], [`created`, `asc`], [`due`, `desc`], [`due`, `asc`] |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | executeRowAction | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`DataRowActionEvent`](../../lib/core/datatable/components/datatable/data-row-action.event.ts)`>` | Emitted when the user executes a row action. |
 | rowClick | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`DataRowEvent`](../../lib/core/datatable/data/data-row-event.model.ts)`>` | Emitted when the user clicks a row. |
-| rowDblClick | `EventEmitter<DataRowEvent>` | Emitted when the user double-clicks a row. |
-| showRowActionsMenu | `EventEmitter<DataCellEvent>` | Emitted before the actions menu is displayed for a row. |
-| showRowContextMenu | `EventEmitter<DataCellEvent>` | Emitted before the context menu is displayed for a row. |
+| rowDblClick | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`DataRowEvent`](../../lib/core/datatable/data/data-row-event.model.ts)`>` | Emitted when the user double-clicks a row. |
+| showRowActionsMenu | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`DataCellEvent`](../../lib/core/datatable/components/datatable/data-cell.event.ts)`>` | Emitted before the actions menu is displayed for a row. |
+| showRowContextMenu | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`DataCellEvent`](../../lib/core/datatable/components/datatable/data-cell.event.ts)`>` | Emitted before the context menu is displayed for a row. |
 
 ## Details
 
diff --git a/docs/core/deleted-nodes-api.service.md b/docs/core/deleted-nodes-api.service.md
index 1b5b6edce1..a9b4f16a00 100644
--- a/docs/core/deleted-nodes-api.service.md
+++ b/docs/core/deleted-nodes-api.service.md
@@ -12,7 +12,7 @@ Gets a list of Content Services nodes currently in the trash.
 
 ### Methods
 
--   **getDeletedNodes**(options?: `Object` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>`<br/>
+-   **getDeletedNodes**(options?: `Object`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>`<br/>
     Gets a list of nodes in the trash.
     -   _options:_ `Object`  - (Optional) Options for JSAPI call
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>` - List of nodes in the trash
diff --git a/docs/core/ecm-user.service.md b/docs/core/ecm-user.service.md
index 812ee19c17..233815b81a 100644
--- a/docs/core/ecm-user.service.md
+++ b/docs/core/ecm-user.service.md
@@ -15,11 +15,11 @@ Gets information about a Content Services user.
 -   **getCurrentUserInfo**(): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`EcmUserModel`](../core/ecm-user.model.md)`>`<br/>
     Gets information about the user who is currently logged-in.
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`EcmUserModel`](../core/ecm-user.model.md)`>` - User information as for getUserInfo
--   **getUserInfo**(userName: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`EcmUserModel`](../core/ecm-user.model.md)`>`<br/>
+-   **getUserInfo**(userName: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`EcmUserModel`](../core/ecm-user.model.md)`>`<br/>
     Gets information about a user identified by their username.
     -   _userName:_ `string`  - Target username
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`EcmUserModel`](../core/ecm-user.model.md)`>` - User information
--   **getUserProfileImage**(avatarId: `string` = `null`): `string`<br/>
+-   **getUserProfileImage**(avatarId: `string`): `string`<br/>
     Returns a profile image as a URL.
     -   _avatarId:_ `string`  - Target avatar
     -   **Returns** `string` - Image URL
diff --git a/docs/core/empty-content.component.md b/docs/core/empty-content.component.md
index c9b85a8cb8..eef8d8561f 100644
--- a/docs/core/empty-content.component.md
+++ b/docs/core/empty-content.component.md
@@ -20,7 +20,7 @@ Provides a generic "Empty Content" placeholder for components.
                 icon="star_rate"
                 title="APP.BROWSE.FAVORITES.EMPTY_STATE.TITLE"
                 subtitle="APP.BROWSE.FAVORITES.EMPTY_STATE.TEXT">
-            </adf-empty-folder>
+            </adf-empty-content>
         </ng-template>
     </empty-folder-content>
 </adf-document-list>
@@ -31,7 +31,7 @@ Provides a generic "Empty Content" placeholder for components.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | icon | `string` | "cake" | Material Icon to use |
 | subtitle | `string` | "" | String or Resource Key for the title |
 | title | `string` | "" | String or Resource Key for the subtitle |
@@ -48,7 +48,7 @@ Provides a generic "Empty Content" placeholder for components.
                 icon="star_rate"
                 title="APP.BROWSE.FAVORITES.EMPTY_STATE.TITLE"
                 subtitle="APP.BROWSE.FAVORITES.EMPTY_STATE.TEXT">
-            </adf-empty-folder>
+            </adf-empty-content>
         </ng-template>
     </empty-folder-content>
 </adf-document-list>
diff --git a/docs/core/error-content.component.md b/docs/core/error-content.component.md
index db6d8742c2..aef145e4e7 100644
--- a/docs/core/error-content.component.md
+++ b/docs/core/error-content.component.md
@@ -16,41 +16,15 @@ Once you have caught the error in your server you will need to redirect to `/err
 this.router.navigate(['/error', errorCode]);
 ```
 
-```html
-<div class="adf-error-content">
-    <p class="adf-error-content-code">
-        {{ errorCode }}
-    </p>
-    <div class="adf-error-content-shadow"></div>
-    <p class="adf-error-content-title">
-        {{ 'ERROR_CONTENT.' + errorCode + '.TITLE' | translate }}
-    </p>
-    <p class="adf-error-content-description">
-        {{ 'ERROR_CONTENT.' + errorCode + '.DESCRIPTION' | translate }}
-    </p>
-    <div class="adf-error-content-buttons">
-        <a href="/" mat-raised-button color="primary" 
-            *ngIf="secondaryButtonText" (click)="onSecondButton()"
-            class="adf-error-content-description-link"> 
-            {{ 'ERROR_CONTENT.' + errorCode + '.SECONDARY_BUTTON.TEXT' | translate | uppercase }}
-        </a>
-        <a href="/" mat-raised-button color="primary" (click)="onReturnButton()">
-            {{ 'ERROR_CONTENT.' + this.errorCode + '.RETURN_BUTTON.TEXT' | translate | uppercase }}
-        </a>
-    </div>
-</div>
-```
-
 ## Properties
 
 ### Error Content Component
 
-| Name | Type | Description |
-| ---- | ---- | ----------- |
-| errorCode | string | Error code |
-| returnButtonUrl | string | URL for the return button |
-| secondaryButtonText | string | (Optional) Text that will be displayed inside the secondary button |
-| secondaryButtonUrl | string | (Optional) URL for the secondary button |
+| Name | Type | Default | Description |
+| ---- | ---- |---- | ----------- |
+| errorCode | string |  |Error code |
+| returnButtonUrl | string | "/"  |URL for the return button |
+| secondaryButtonUrl | string | "report-issue" |(Optional) URL for the secondary button |
 
 Note that you will also have to provide values for the variables used in the view template.
 
@@ -65,12 +39,10 @@ You can customize your error messages by adding them to the translate files insi
       "TITLE": "An error occurred.",
       "DESCRIPTION": "We couldn’t find the page you were looking for.",
       "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
       },
       "RETURN_BUTTON": { 
-        "TEXT": "Back to home",
-        "ROUTE": "home"
+        "TEXT": "Back to home"
       }
     }
   }
@@ -78,4 +50,4 @@ You can customize your error messages by adding them to the translate files insi
 
 ## See also
 
-- [Empty Content component](empty-content.component.md)
\ No newline at end of file
+- [Empty Content component](empty-content.component.md)
diff --git a/docs/core/favorites-api.service.md b/docs/core/favorites-api.service.md
index b3f269fab9..dda7002344 100644
--- a/docs/core/favorites-api.service.md
+++ b/docs/core/favorites-api.service.md
@@ -12,12 +12,12 @@ Gets a list of items a user has marked as their favorites.
 
 ### Methods
 
--   **getFavorites**(personId: `string` = `null`, options?: `any` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>`<br/>
+-   **getFavorites**(personId: `string`, options?: `any`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>`<br/>
     Gets the favorites for a user.
     -   _personId:_ `string`  - ID of the user
     -   _options:_ `any`  - (Optional) Options supported by JSAPI
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>` - List of favorites
--   **remapFavoriteEntries**(entries: `any[]` = `null`): `any[]`<br/>
+-   **remapFavoriteEntries**(entries: `any[]`): `any[]`<br/>
 
     -   _entries:_ `any[]`  - 
     -   **Returns** `any[]` - 
@@ -27,9 +27,9 @@ Gets a list of items a user has marked as their favorites.
     -   _data:_ `any`  - 
     -   **Returns** [`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts) - 
 
--   **remapEntry**(\_\_namedParameters: `object` = `null`): `any`<br/>
+-   **remapEntry**(\_\_namedParameters: `Function`): `any`<br/>
 
-    -   _\_\_namedParameters:_ `object`  - 
+    -   _\_\_namedParameters:_ `Function`  - 
     -   **Returns** `any` -
 
 ## Details
diff --git a/docs/core/form-field.component.md b/docs/core/form-field.component.md
index f4e46ced6c..0c7380c00a 100644
--- a/docs/core/form-field.component.md
+++ b/docs/core/form-field.component.md
@@ -25,8 +25,8 @@ based on the field type or the metadata information.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
-| field | [`FormFieldModel`](../core/form-field.model.md) |  null | Contains all the necessary data needed to determine what UI Widget to use when rendering the field in the form. You would typically not create this data manually but instead create the form in APS and export it to get to all the [`FormFieldModel`](../core/form-field.model.md) definitions. |
+| ---- | ---- | ------------- | ----------- |
+| field | [`FormFieldModel`](../core/form-field.model.md) | null | Contains all the necessary data needed to determine what UI Widget to use when rendering the field in the form. You would typically not create this data manually but instead create the form in APS and export it to get to all the [`FormFieldModel`](../core/form-field.model.md) definitions. |
 
 ## Details
 
@@ -37,24 +37,24 @@ uses `<adf-form-field>` components to render the form fields.
 
 Forms defined in APS have the following default mappings for the form fields:
 
-| APS Form Designer Widget | Field Type | Component Type |
-| ------------------------ | ---------- | -------------- |
-| Text | text | TextWidgetComponent |
-| Multi-line text | multi-line-text | MultilineTextWidgetComponentComponent |
-| Number | integer | NumberWidgetComponent |
-| Checkbox | boolean | CheckboxWidgetComponent |
-| Date | date | DateWidgetComponent |
-| Dropdown | dropdown | DropdownWidgetComponent |
-| Typeahead | typeahead | TypeaheadWidgetComponent |
-| Amount | amount | AmountWidgetComponent |
-| Radio buttons | radio-buttons | RadioButtonsWidgetComponent |
-| People | people | PeopleWidgetComponent |
-| Group of people | functional-group | FunctionalGroupWidgetComponent |
-| Dynamic table | dynamic-table | DynamicTableWidgetComponent |
-| Hyperlink | hyperlink | HyperlinkWidgetComponent |
-| Header | group | ContainerWidgetComponent |
-| Attach File | upload | AttachWidgetComponent or UploadWidgetComponent (based on metadata) |
+| APS [`Form`](../../lib/process-services/task-list/models/form.model.ts) Designer Widget | Field Type | Component Type |
+| --------------------------------------------------------------------------------------- | ---------- | -------------- |
+| Text | text | [`TextWidgetComponent`](../../lib/core/form/components/widgets/text/text.widget.ts) |
+| Multi-line text | multi-line-text | [`MultilineTextWidgetComponentComponent`](../../lib/core/form/components/widgets/multiline-text/multiline-text.widget.ts) |
+| Number | integer | [`NumberWidgetComponent`](../../lib/core/form/components/widgets/number/number.widget.ts) |
+| Checkbox | boolean | [`CheckboxWidgetComponent`](../../lib/core/form/components/widgets/checkbox/checkbox.widget.ts) |
+| Date | date | [`DateWidgetComponent`](../../lib/core/form/components/widgets/date/date.widget.ts) |
+| Dropdown | dropdown | [`DropdownWidgetComponent`](../../lib/core/form/components/widgets/dropdown/dropdown.widget.ts) |
+| Typeahead | typeahead | [`TypeaheadWidgetComponent`](../../lib/core/form/components/widgets/typeahead/typeahead.widget.ts) |
+| Amount | amount | [`AmountWidgetComponent`](../../lib/core/form/components/widgets/amount/amount.widget.ts) |
+| Radio buttons | radio-buttons | [`RadioButtonsWidgetComponent`](../../lib/core/form/components/widgets/radio-buttons/radio-buttons.widget.ts) |
+| People | people | [`PeopleWidgetComponent`](../../lib/core/form/components/widgets/people/people.widget.ts) |
+| Group of people | functional-group | [`FunctionalGroupWidgetComponent`](../../lib/core/form/components/widgets/functional-group/functional-group.widget.ts) |
+| Dynamic table | dynamic-table | [`DynamicTableWidgetComponent`](../../lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.ts) |
+| Hyperlink | hyperlink | [`HyperlinkWidgetComponent`](../../lib/core/form/components/widgets/hyperlink/hyperlink.widget.ts) |
+| Header | group | [`ContainerWidgetComponent`](../../lib/core/form/components/widgets/container/container.widget.ts) |
+| Attach File | upload | AttachWidgetComponent or [`UploadWidgetComponent`](../../lib/core/form/components/widgets/upload/upload.widget.ts) (based on metadata) |
 | Display value | readonly | DisplayValueWidgetComponent |
-| Display text | readonly-text | DisplayTextWidgetComponentComponent |
-| N/A | container | ContainerWidgetComponent (layout component) |
-| N/A | N/A | UnknownWidgetComponent |
+| Display text | readonly-text | [`DisplayTextWidgetComponentComponent`](../../lib/core/form/components/widgets/display-text/display-text.widget.ts) |
+| N/A | container | [`ContainerWidgetComponent`](../../lib/core/form/components/widgets/container/container.widget.ts) (layout component) |
+| N/A | N/A | [`UnknownWidgetComponent`](../../lib/core/form/components/widgets/unknown/unknown.widget.ts) |
diff --git a/docs/core/form-field.model.md b/docs/core/form-field.model.md
index fdc98bd592..1838604abe 100644
--- a/docs/core/form-field.model.md
+++ b/docs/core/form-field.model.md
@@ -41,13 +41,13 @@ Contains the value and metadata for a field of a [`Form`](../../lib/process-serv
 | hyperlinkUrl | string |  | URL for Hyperlink widgets |
 | displayText | string |  | Displayed text for Hyperlink widgets |
 | isVisible | boolean | true | Is the field shown on the form? |
-| visibilityCondition | WidgetVisibilityModel | null | Defines a expression that determines whether the field is visible or not, based on its logical relation to values in other fields |
+| visibilityCondition | [`WidgetVisibilityModel`](../../lib/core/form/models/widget-visibility.model.ts) | null | Defines a expression that determines whether the field is visible or not, based on its logical relation to values in other fields |
 | enableFractions | boolean | false | Are numeric values allowed to contain a decimal point? |
 | currency | string | null | Currency symbol for Amount widgets |
 | dateDisplayFormat | string |  | Date/time display format template |
 | numberOfColumns | number | 1 | Number of columns defined by a container field |
-| fields | FormFieldModel\[] | \[] | Fields contained within a container field |
-| columns | ContainerColumnModel\[] | \[] | Column definitions for a container field |
+| fields | [`FormFieldModel`](../core/form-field.model.md)\[] | \[] | Fields contained within a container field |
+| columns | [`ContainerColumnModel`](../../lib/core/form/components/widgets/core/container-column.model.ts)\[] | \[] | Column definitions for a container field |
 | emptyOption | FormFieldOption |  | Dropdown menu item to use when no option is chosen |
 | validationSummary | string |  | Error/information message added during field validation (see [`FormFieldValidator`](../../lib/core/form/components/widgets/core/form-field-validator.ts) interface) |
 
diff --git a/docs/core/form-list.component.md b/docs/core/form-list.component.md
index 3c0afdb980..79c9d56526 100644
--- a/docs/core/form-list.component.md
+++ b/docs/core/form-list.component.md
@@ -20,5 +20,5 @@ Shows APS forms as a list.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
-| forms | `any[]` |  \[] | The array that contains the information to show inside the list. |
+| ---- | ---- | ------------- | ----------- |
+| forms | `any[]` | \[] | The array that contains the information to show inside the list. |
diff --git a/docs/core/form-rendering.service.md b/docs/core/form-rendering.service.md
index 09e564367b..04ae77e32a 100644
--- a/docs/core/form-rendering.service.md
+++ b/docs/core/form-rendering.service.md
@@ -12,20 +12,20 @@ Maps an APS form field type string onto the corresponding form [widget component
 
 ### Methods
 
--   **getComponentTypeResolver**(type: `string` = `null`, defaultValue: `Type<__type>` = `this.defaultValue`): [`DynamicComponentResolveFunction`](../../lib/core/services/dynamic-component-mapper.service.ts)<br/>
+-   **getComponentTypeResolver**(type: `string`, defaultValue: `Type<__type>` = `this.defaultValue`): `DynamicComponentResolveFunction`<br/>
     Gets the currently active ComponentTypeResolver function for a field type.
     -   _type:_ `string`  - The type whose resolver you want
     -   _defaultValue:_ `Type<__type>`  - Default type returned for types that are not yet mapped
-    -   **Returns** [`DynamicComponentResolveFunction`](../../lib/core/services/dynamic-component-mapper.service.ts) - Resolver function
--   **resolveComponentType**(model: [`DynamicComponentModel`](../../lib/core/services/dynamic-component-mapper.service.ts) = `null`, defaultValue: `Type<__type>` = `this.defaultValue`): `Type<__type>`<br/>
+    -   **Returns** `DynamicComponentResolveFunction` - Resolver function
+-   **resolveComponentType**(model: `DynamicComponentModel`, defaultValue: `Type<__type>` = `this.defaultValue`): `Type<__type>`<br/>
     Finds the component type that is needed to render a form field.
-    -   _model:_ [`DynamicComponentModel`](../../lib/core/services/dynamic-component-mapper.service.ts)  - [Form](../../lib/process-services/task-list/models/form.model.ts) field model for the field to render
+    -   _model:_ `DynamicComponentModel`  - [Form](../../lib/process-services/task-list/models/form.model.ts) field model for the field to render
     -   _defaultValue:_ `Type<__type>`  - Default type returned for field types that are not yet mapped.
     -   **Returns** `Type<__type>` - Component type
--   **setComponentTypeResolver**(type: `string` = `null`, resolver: [`DynamicComponentResolveFunction`](../../lib/core/services/dynamic-component-mapper.service.ts) = `null`, override: `boolean` = `true`)<br/>
+-   **setComponentTypeResolver**(type: `string`, resolver: `DynamicComponentResolveFunction`, override: `boolean` = `true`)<br/>
     Sets or optionally replaces a ComponentTypeResolver function for a field type.
     -   _type:_ `string`  - The type whose resolver you want to set
-    -   _resolver:_ [`DynamicComponentResolveFunction`](../../lib/core/services/dynamic-component-mapper.service.ts)  - The new resolver function
+    -   _resolver:_ `DynamicComponentResolveFunction`  - The new resolver function
     -   _override:_ `boolean`  - The new resolver will only replace an existing one if this parameter is true
 
 ## Details
@@ -63,23 +63,23 @@ The [`Form`](../../lib/process-services/task-list/models/form.model.ts) Renderin
 
 | Stencil name | Field type string | Component type |
 | ------------ | ----------------- | -------------- |
-| Amount | "amount" | AmountWidgetComponent |
-| Attach | "upload" | AttachWidgetComponent or UploadWidgetComponent (based on metadata) |
-| Checkbox | "boolean" | CheckboxWidgetComponent |
-| Date | "date" | DateWidgetComponent |
-| Display text | "readonly-text" | DisplayTextWidgetComponentComponent |
+| Amount | "amount" | [`AmountWidgetComponent`](../../lib/core/form/components/widgets/amount/amount.widget.ts) |
+| Attach | "upload" | AttachWidgetComponent or [`UploadWidgetComponent`](../../lib/core/form/components/widgets/upload/upload.widget.ts) (based on metadata) |
+| Checkbox | "boolean" | [`CheckboxWidgetComponent`](../../lib/core/form/components/widgets/checkbox/checkbox.widget.ts) |
+| Date | "date" | [`DateWidgetComponent`](../../lib/core/form/components/widgets/date/date.widget.ts) |
+| Display text | "readonly-text" | [`DisplayTextWidgetComponentComponent`](../../lib/core/form/components/widgets/display-text/display-text.widget.ts) |
 | Display value | "readonly" | DisplayValueWidgetComponent |
-| Dropdown | "dropdown" | DropdownWidgetComponent |
-| Dynamic table | "dynamic-table" | DynamicTableWidgetComponent |
-| Group of people | "functional-group" | FunctionalGroupWidgetComponent |
-| Header | "group" | ContainerWidgetComponent |
-| Hyperlink | "hyperlink" | HyperlinkWidgetComponent |
-| Multi-line text | "multi-line-text" | MultilineTextWidgetComponentComponent |
-| Number | "integer" | NumberWidgetComponent |
-| People | "people" | PeopleWidgetComponent |
-| Radio buttons | "radio-buttons" | RadioButtonsWidgetComponent |
-| Text | "text" | TextWidgetComponent |
-| Typeahead | "typeahead" | TypeaheadWidgetComponent |
+| Dropdown | "dropdown" | [`DropdownWidgetComponent`](../../lib/core/form/components/widgets/dropdown/dropdown.widget.ts) |
+| Dynamic table | "dynamic-table" | [`DynamicTableWidgetComponent`](../../lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.ts) |
+| Group of people | "functional-group" | [`FunctionalGroupWidgetComponent`](../../lib/core/form/components/widgets/functional-group/functional-group.widget.ts) |
+| Header | "group" | [`ContainerWidgetComponent`](../../lib/core/form/components/widgets/container/container.widget.ts) |
+| Hyperlink | "hyperlink" | [`HyperlinkWidgetComponent`](../../lib/core/form/components/widgets/hyperlink/hyperlink.widget.ts) |
+| Multi-line text | "multi-line-text" | [`MultilineTextWidgetComponentComponent`](../../lib/core/form/components/widgets/multiline-text/multiline-text.widget.ts) |
+| Number | "integer" | [`NumberWidgetComponent`](../../lib/core/form/components/widgets/number/number.widget.ts) |
+| People | "people" | [`PeopleWidgetComponent`](../../lib/core/form/components/widgets/people/people.widget.ts) |
+| Radio buttons | "radio-buttons" | [`RadioButtonsWidgetComponent`](../../lib/core/form/components/widgets/radio-buttons/radio-buttons.widget.ts) |
+| Text | "text" | [`TextWidgetComponent`](../../lib/core/form/components/widgets/text/text.widget.ts) |
+| Typeahead | "typeahead" | [`TypeaheadWidgetComponent`](../../lib/core/form/components/widgets/typeahead/typeahead.widget.ts) |
 
 You can add new items to the mapping or replace existing items in order to customize the way
 fields are rendered.
diff --git a/docs/core/form.component.md b/docs/core/form.component.md
index da40a41d59..7b55853f13 100644
--- a/docs/core/form.component.md
+++ b/docs/core/form.component.md
@@ -13,20 +13,15 @@ Shows a [`Form`](../../lib/process-services/task-list/models/form.model.ts) from
 ## Contents
 
 -   [Basic Usage](#basic-usage)
-
 -   [Class members](#class-members)
-
     -   [Properties](#properties)
     -   [Events](#events)
-
 -   [Details](#details)
-
     -   [Displaying a form](#displaying-a-form)
     -   [Custom empty form template](#custom-empty-form-template)
     -   [Controlling outcome execution behaviour](#controlling-outcome-execution-behaviour)
     -   [Field Validators](#field-validators)
     -   [Common scenarios](#common-scenarios)
-
 -   [See also](#see-also)
 
 ## Basic Usage
@@ -42,11 +37,11 @@ Shows a [`Form`](../../lib/process-services/task-list/models/form.model.ts) from
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
-| data | [`FormValues`](../../lib/core/form/components/widgets/core/form-values.ts) |  | Custom form values map to be used with the rendered form. |
+| ---- | ---- | ------------- | ----------- |
+| data | `FormValues` |  | Custom form values map to be used with the rendered form. |
 | disableCompleteButton | `boolean` | false | If true then the `Complete` outcome button is shown but it will be disabled. |
 | disableStartProcessButton | `boolean` | false | If true then the `Start Process` outcome button is shown but it will be disabled. |
-| fieldValidators | [`FormFieldValidator`](../../lib/core/form/components/widgets/core/form-field-validator.ts)`[]` |  \[] | Contains a list of form field validator instances. |
+| fieldValidators | `FormFieldValidator[]` | \[] | Contains a list of form field validator instances. |
 | form | [`FormModel`](../../lib/core/form/components/widgets/core/form.model.ts) |  | Underlying [form model](../../lib/core/form/components/widgets/core/form.model.ts) instance. |
 | formId | `string` |  | The id of the form definition to load and display with custom values. |
 | formName | `string` |  | Name of the form definition to load and display with custom values. |
@@ -66,14 +61,14 @@ Shows a [`Form`](../../lib/process-services/task-list/models/form.model.ts) from
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | executeOutcome | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`FormOutcomeEvent`](../../lib/core/form/components/widgets/core/form-outcome-event.model.ts)`>` | Emitted when any outcome is executed. Default behaviour can be prevented via `event.preventDefault()`. |
 | formCompleted | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`FormModel`](../../lib/core/form/components/widgets/core/form.model.ts)`>` | Emitted when the form is submitted with the `Complete` outcome. |
 | formContentClicked | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`ContentLinkModel`](../../lib/core/form/components/widgets/core/content-link.model.ts)`>` | Emitted when form content is clicked. |
 | formDataRefreshed | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`FormModel`](../../lib/core/form/components/widgets/core/form.model.ts)`>` | Emitted when form values are refreshed due to a data property change. |
-| formLoaded | `EventEmitter<FormModel>` | Emitted when the form is loaded or reloaded. |
-| formSaved | `EventEmitter<FormModel>` | Emitted when the form is submitted with the `Save` or custom outcomes. |
-| onError | `EventEmitter<any>` | Emitted when any error occurs. |
+| formLoaded | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`FormModel`](../../lib/core/form/components/widgets/core/form.model.ts)`>` | Emitted when the form is loaded or reloaded. |
+| formSaved | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`FormModel`](../../lib/core/form/components/widgets/core/form.model.ts)`>` | Emitted when the form is submitted with the `Save` or custom outcomes. |
+| onError | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when any error occurs. |
 
 ## Details
 
diff --git a/docs/core/form.service.md b/docs/core/form.service.md
index 9471dabe4f..e6227a7626 100644
--- a/docs/core/form.service.md
+++ b/docs/core/form.service.md
@@ -38,96 +38,96 @@ class MyComponent {
 
 | Name | Args Type | Description |
 | ---- | --------- | ----------- |
-| formLoaded | FormEvent | Raised when form has been loaded or reloaded |
-| formFieldValueChanged | FormFieldEvent | Raised when input values change |
-| taskCompleted | FormEvent | Raised when a task is completed successfully |
-| taskCompletedError | FormErrorEvent | Raised when a task is completed unsuccessfully |
-| taskSaved | FormEvent | Raised when a task is saved successfully |
-| taskSavedError | FormErrorEvent | Raised when a task is saved unsuccessfully |
-| executeOutcome | FormOutcomeEvent | Raised when a form outcome is executed |
+| formLoaded | [`FormEvent`](../../lib/core/form/events/form.event.ts) | Raised when form has been loaded or reloaded |
+| formFieldValueChanged | [`FormFieldEvent`](../../lib/core/form/events/form-field.event.ts) | Raised when input values change |
+| taskCompleted | [`FormEvent`](../../lib/core/form/events/form.event.ts) | Raised when a task is completed successfully |
+| taskCompletedError | [`FormErrorEvent`](../../lib/core/form/events/form-error.event.ts) | Raised when a task is completed unsuccessfully |
+| taskSaved | [`FormEvent`](../../lib/core/form/events/form.event.ts) | Raised when a task is saved successfully |
+| taskSavedError | [`FormErrorEvent`](../../lib/core/form/events/form-error.event.ts) | Raised when a task is saved unsuccessfully |
+| executeOutcome | [`FormOutcomeEvent`](../../lib/core/form/components/widgets/core/form-outcome-event.model.ts) | Raised when a form outcome is executed |
 | formEvents | Event | You can subscribe to this event to listen : ( click, blur, change, focus, focusin, focusout, input, invalid, select) of any elements in the form , see doc below |
-| validateForm | ValidateFormEvent | Raised each time a form is validated. You can use it to provide custom validation or prevent default behaviour. |
-| validateFormField | ValidateFormFieldEvent | Raised each time a form field is validated. You can use it to provide custom validation or prevent default behaviour. |
+| validateForm | [`ValidateFormEvent`](../../lib/core/form/events/validate-form.event.ts) | Raised each time a form is validated. You can use it to provide custom validation or prevent default behaviour. |
+| validateFormField | [`ValidateFormFieldEvent`](../../lib/core/form/events/validate-form-field.event.ts) | Raised each time a form field is validated. You can use it to provide custom validation or prevent default behaviour. |
 
 ### Methods
 
--   `parseForm(json: any, data?: `[`FormValues,`](../../lib/core/form/components/widgets/core/form-values.ts)` readOnly: boolean = false): `[`FormModel`](../../lib/core/form/components/widgets/core/form.model.ts)  
+-   `parseForm(json: any, data?:`[`FormValues,`](../../lib/core/form/components/widgets/core/form-values.ts)`readOnly: boolean = false):`[`FormModel`](../../lib/core/form/components/widgets/core/form.model.ts)  
     Parses JSON data to create a corresponding [`Form`](../../lib/process-services/task-list/models/form.model.ts) model.  
     -   `json` - JSON to create the form
     -   `data` - (Optional) Values for the form fields
     -   `readOnly` - Should the form fields be read-only?
--   `createFormFromANode(formName: string): `[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
+-   `createFormFromANode(formName: string):`[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
     Create a [`Form`](../../lib/process-services/task-list/models/form.model.ts) with a field for each metadata property.  
     -   `formName` - Name of the new form
--   `createForm(formName: string): `[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
+-   `createForm(formName: string):`[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
     Create a [`Form`](../../lib/process-services/task-list/models/form.model.ts).  
     -   `formName` - Name of the new form
--   `saveForm(formId: string, formModel: FormDefinitionModel): `[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
+-   `saveForm(formId: string, formModel: FormDefinitionModel):`[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
     Saves a form.  
     -   `formId` - ID of the form to save 
     -   `formModel` - Model data for the form
--   `addFieldsToAForm(formId: string, formModel: FormDefinitionModel): `[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
+-   `addFieldsToAForm(formId: string, formModel: FormDefinitionModel):`[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
     -   `formId` - ID of the form
     -   `formModel` - [`Form`](../../lib/process-services/task-list/models/form.model.ts) definition
--   `searchFrom(name: string): `[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
+-   `searchFrom(name: string):`[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
     Search for a form by name.  
     -   `name` - The form name to search for
--   `getForms(): `[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
+-   `getForms():`[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
     Gets all the forms.  
 
--   `getProcessDefinitions(): `[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
+-   `getProcessDefinitions():`[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
     Get Process Definitions  
 
--   `getProcessVarablesById(processInstanceId: string): `[`Observable`](http://reactivex.io/documentation/observable.html)`<any[]>`  
+-   `getProcessVarablesById(processInstanceId: string):`[`Observable`](http://reactivex.io/documentation/observable.html)`<any[]>`  
     Get instance variables for a process.  
     -   `processInstanceId` - ID of the target process
--   `getTasks(): `[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
+-   `getTasks():`[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
     Gets all the tasks.  
 
--   `getTask(taskId: string): `[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
+-   `getTask(taskId: string):`[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
     Gets a task.  
     -   `taskId` - Task Id
--   `saveTaskForm(taskId: string, formValues: FormValues): `[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
+-   `saveTaskForm(taskId: string, formValues: FormValues):`[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
     Save Task [`Form`](../../lib/process-services/task-list/models/form.model.ts).  
     -   `taskId` - Task Id
     -   `formValues` - [`Form`](../../lib/process-services/task-list/models/form.model.ts) Values
--   `completeTaskForm(taskId: string, formValues: `[`FormValues,`](../../lib/core/form/components/widgets/core/form-values.ts)` outcome?: string): `[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
+-   `completeTaskForm(taskId: string, formValues:`[`FormValues,`](../../lib/core/form/components/widgets/core/form-values.ts)`outcome?: string):`[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
     Complete Task [`Form`](../../lib/process-services/task-list/models/form.model.ts)  
     -   `taskId` - Task Id
     -   `formValues` - [`Form`](../../lib/process-services/task-list/models/form.model.ts) Values
     -   `outcome` - (Optional) [`Form`](../../lib/process-services/task-list/models/form.model.ts) Outcome
--   `getTaskForm(taskId: string): `[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
+-   `getTaskForm(taskId: string):`[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
     Get [`Form`](../../lib/process-services/task-list/models/form.model.ts) related to a taskId  
     -   `taskId` - Task Id
--   `getFormDefinitionById(formId: string): `[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
+-   `getFormDefinitionById(formId: string):`[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
     Get [`Form`](../../lib/process-services/task-list/models/form.model.ts) Definition  
     -   `formId` - [`Form`](../../lib/process-services/task-list/models/form.model.ts) Id
--   `getFormDefinitionByName(name: string): `[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
+-   `getFormDefinitionByName(name: string):`[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
     Returns form definition with a given name.  
     -   `name` - The form name
--   `getStartFormInstance(processId: string): `[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
+-   `getStartFormInstance(processId: string):`[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
     Get start form instance for a given processId  
     -   `processId` - Process definition ID
--   `getProcessIntance(processId: string): `[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
+-   `getProcessIntance(processId: string):`[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
     Gets a process instance.  
     -   `processId` - ID of the process to get
--   `getStartFormDefinition(processId: string): `[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
+-   `getStartFormDefinition(processId: string):`[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
     Get start form definition for a given process  
     -   `processId` - Process definition ID
--   `getRestFieldValues(taskId: string, field: string): `[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
+-   `getRestFieldValues(taskId: string, field: string):`[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
     Gets values of fields populated by a REST backend.  
     -   `taskId` - Task identifier
     -   `field` - Field identifier
--   `getRestFieldValuesByProcessId(processDefinitionId: string, field: string): `[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
+-   `getRestFieldValuesByProcessId(processDefinitionId: string, field: string):`[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
     Gets values of fields populated by a REST backend using a process ID.  
     -   `processDefinitionId` - Process identifier
     -   `field` - Field identifier
--   `getRestFieldValuesColumnByProcessId(processDefinitionId: string, field: string, column?: string): `[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
+-   `getRestFieldValuesColumnByProcessId(processDefinitionId: string, field: string, column?: string):`[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
     Gets column values of fields populated by a REST backend using a process ID.  
     -   `processDefinitionId` - Process identifier
     -   `field` - Field identifier
     -   `column` - (Optional) Column identifier
--   `getRestFieldValuesColumn(taskId: string, field: string, column?: string): `[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
+-   `getRestFieldValuesColumn(taskId: string, field: string, column?: string):`[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
     Gets column values of fields populated by a REST backend.  
     -   `taskId` - Task identifier
     -   `field` - Field identifier
@@ -152,6 +152,6 @@ class MyComponent {
 -   `toJsonArray(res: any): any`  
     Creates a JSON array representation of form data.  
     -   `res` - Object representing form data
--   `handleError(error: any): `[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
+-   `handleError(error: any):`[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
     Reports an error message.  
     -   `error` - Data object with optional \`message\` and \`status\` fields for the error
diff --git a/docs/core/header.component.md b/docs/core/header.component.md
new file mode 100644
index 0000000000..0c69f345cf
--- /dev/null
+++ b/docs/core/header.component.md
@@ -0,0 +1,49 @@
+---
+Added: v2.4.0
+Status: Experimental
+Last reviewed: 2018-08-07
+---
+
+# Header component 
+
+Reusable header for Alfresco applications
+
+## Basic usage
+
+```html
+<adf-layout-header 
+    title="title" 
+    logo="logo.png" 
+    [redirectUrl]="'/home'"
+    color="primary"
+    (toggled)=toggleMenu($event)>
+    .......
+
+</adf-layout-header>
+```
+
+## Class members
+
+### Properties
+
+| Name | Type | Description |
+| -- | -- | -- |
+| title | `string` |  Title of the application
+| logo | `string` | Path to an image file for the application logo.
+| redirectUrl | `string` \| `any[]` | The router link for the application logo.
+| tooltip | `string` | The tooltip text for the application logo.
+| color | `string` | Background color for the header. It can be any hex color code or the Material theme colors: 'primary', 'accent' or 'warn'.
+| showSidenavToggle | `boolean` | Signals if the sidenav button will be displayed in the header or not. By default is true.
+
+### Events
+
+| Name | Type | Description |
+| -- | -- | -- |
+| clicked | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<boolean>` | Emitted when click on sidenav button
+
+## Details
+
+This component displays a customizable header that can be reused. Use the input properties to
+configure the left side (title, button) and the primary color of the header. 
+
+The right part of the header can contain other components which are transcluded in the header component. 
diff --git a/docs/core/highlight-transform.service.md b/docs/core/highlight-transform.service.md
index 73dde5642d..6bf0af0e48 100644
--- a/docs/core/highlight-transform.service.md
+++ b/docs/core/highlight-transform.service.md
@@ -11,12 +11,12 @@ Adds HTML to a string to highlight chosen sections.
 
 ### Methods
 
--   **highlight**(text: `string` = `null`, search: `string` = `null`, wrapperClass: `string` = `"highlight"`): [`HightlightTransformResult`](../../lib/core/services/highlight-transform.service.ts)<br/>
+-   **highlight**(text: `string`, search: `string`, wrapperClass: `string` = `"highlight"`): `HightlightTransformResult`<br/>
     Searches for `search` string(s) within `text` and highlights all occurrences.
     -   _text:_ `string`  - Text to search within
     -   _search:_ `string`  - Text pattern to search for
     -   _wrapperClass:_ `string`  - CSS class used to provide highlighting style
-    -   **Returns** [`HightlightTransformResult`](../../lib/core/services/highlight-transform.service.ts) - New text along with boolean value to indicate whether anything was highlighted
+    -   **Returns** `HightlightTransformResult` - New text along with boolean value to indicate whether anything was highlighted
 
 ## Details
 
diff --git a/docs/core/highlight.directive.md b/docs/core/highlight.directive.md
index 546e221f48..2714c470c8 100644
--- a/docs/core/highlight.directive.md
+++ b/docs/core/highlight.directive.md
@@ -25,10 +25,10 @@ Adds highlighting to selected sections of an HTML element's content.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
-| adf-highlight-class | `string` | "adf-highlight" | CSS class used to apply highlighting. |
-| adf-highlight | `string` | "" | Text to highlight. |
-| adf-highlight-selector | `string` | "" | Class selector for highlightable elements. |
+| ---- | ---- | ------------- | ----------- |
+| classToApply | `string` | "adf-highlight" | CSS class used to apply highlighting. |
+| search | `string` | "" | Text to highlight. |
+| selector | `string` | "" | Class selector for highlightable elements. |
 
 ## Details
 
diff --git a/docs/core/host-settings.component.md b/docs/core/host-settings.component.md
index 8fdd9e146d..d8a01dcbc7 100644
--- a/docs/core/host-settings.component.md
+++ b/docs/core/host-settings.component.md
@@ -32,15 +32,15 @@ Validates the URLs for ACS and APS and saves them in the user's local storage
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
-| providers | `string[]` |  ['BPM', 'ECM', 'ALL'] | Tells the component which provider option are available. Possible valid values are "ECM" (Content), "BPM" (Process) , "ALL" (Content and Process), 'OAUTH2' SSO . |
+| ---- | ---- | ------------- | ----------- |
+| providers | `string[]` |  | Tells the component which provider option are available. Possible valid values are "ECM" (Content), "BPM" (Process) , "ALL" (Content and Process), 'OAUTH2' SSO . |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | bpmHostChange | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<string>` | (**Deprecated:** in 2.4.0) Emitted when the bpm host URL is changed. |
 | cancel | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<boolean>` |  |
 | ecmHostChange | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<string>` | (**Deprecated:** in 2.4.0) Emitted when the ecm host URL is changed. |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<string>` | Emitted when the URL is invalid. |
-| success | `EventEmitter<boolean>` |  |
+| success | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<boolean>` |  |
diff --git a/docs/core/infinite-pagination.component.md b/docs/core/infinite-pagination.component.md
index f1e9a4d992..18e645e30e 100644
--- a/docs/core/infinite-pagination.component.md
+++ b/docs/core/infinite-pagination.component.md
@@ -36,16 +36,16 @@ Adds "infinite" pagination to the component it is used with.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
-| loading | `boolean` | false | Is a new page loading? |
-| pageSize | `number` |  [`InfinitePaginationComponent`](../core/infinite-pagination.component.md).DEFAULT_PAGE_SIZE | Number of items that are added with each "load more" event. |
-| pagination | [`PaginationModel`](../../lib/core/models/pagination.model.ts) |  | (**Deprecated:** 2.3.0  [Pagination](../../lib/content-services/document-list/models/document-library.model.ts) object.)  |
+| ---- | ---- | ------------- | ----------- |
+| isLoading | `boolean` | false | Is a new page loading? |
+| pageSize | `number` |  | Number of items that are added with each "load more" event. |
+| pagination | [`PaginationModel`](../../lib/core/models/pagination.model.ts) |  | (**Deprecated:** 2.3.0  [Pagination](../../lib/content-services/document-list/models/document-library.model.ts) object.) |
 | target | `PaginatedComponent` |  | Component that provides custom pagination support. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | loadMore | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`Pagination`](../../lib/content-services/document-list/models/document-library.model.ts)`>` | Emitted when the "Load More" button is clicked. |
 
 ## Details
diff --git a/docs/core/info-drawer-tab.component.md b/docs/core/info-drawer-tab.component.md
index 35498dedb8..73c253e258 100644
--- a/docs/core/info-drawer-tab.component.md
+++ b/docs/core/info-drawer-tab.component.md
@@ -51,8 +51,8 @@ Render tab with icon instead of labels:
 
 | Name | Type | Default value | Description |
 | ---- | ---- | ------------- | ----------- |
-| label | `string` | '' | Tab label. |
-| icon | `string` | null | The material design icon. |
+| icon | `string` | null | Icon to render for the tab. |
+| label | `string` | "Main tab" | The title of the tab. |
 
 ## Details
 
diff --git a/docs/core/info-drawer.component.md b/docs/core/info-drawer.component.md
index 10035b5ccc..eafeb6ad3b 100644
--- a/docs/core/info-drawer.component.md
+++ b/docs/core/info-drawer.component.md
@@ -35,14 +35,14 @@ Displays a sidebar-style information panel with tabs.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | selectedIndex | `number` | 0 | The selected index tab. |
-| title | `string \| null` |  null | The title of the info drawer. |
+| title | `string \| null` | null | The title of the info drawer. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | currentTab | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<number>` | Emitted when the currently active tab changes. |
 
 ## Details
diff --git a/docs/core/log.service.md b/docs/core/log.service.md
index fc9a5be1e3..2b7fc36d94 100644
--- a/docs/core/log.service.md
+++ b/docs/core/log.service.md
@@ -10,7 +10,7 @@ Provides log functionality.
 
 ## Basic Usage
 
-**app.component.ts**
+**[app.component](../../demo-shell/src/app/app.component.ts).ts**
 
 ```ts
 import { LogService } from '@alfresco/adf-core';
@@ -50,46 +50,46 @@ export class AppComponent {
 
 ### Methods
 
--   **assert**(test?: `boolean` = `null`, message?: `string` = `null`, optionalParams: `any[]` = `null`)<br/>
+-   **assert**(test?: `boolean`, message?: `string`, optionalParams: `any[]`)<br/>
     Logs a message if a boolean test fails.
     -   _test:_ `boolean`  - (Optional) Test value (typically a boolean expression)
     -   _message:_ `string`  - (Optional) Message to show if test is false
     -   _optionalParams:_ `any[]`  - Interpolation values for the message in "printf" format
--   **debug**(message?: `any` = `null`, optionalParams: `any[]` = `null`)<br/>
+-   **debug**(message?: `any`, optionalParams: `any[]`)<br/>
     Logs a message at the "DEBUG" level.
     -   _message:_ `any`  - (Optional) Message to log
     -   _optionalParams:_ `any[]`  - Interpolation values for the message in "printf" format
--   **error**(message?: `any` = `null`, optionalParams: `any[]` = `null`)<br/>
+-   **error**(message?: `any`, optionalParams: `any[]`)<br/>
     Logs a message at the "ERROR" level.
     -   _message:_ `any`  - (Optional) Message to log
     -   _optionalParams:_ `any[]`  - Interpolation values for the message in "printf" format
--   **getLogLevel**(level: `string` = `null`): [`LogLevelsEnum`](../../lib/core/models/log-levels.model.ts)<br/>
+-   **getLogLevel**(level: `string`): [`LogLevelsEnum`](../../lib/core/models/log-levels.model.ts)<br/>
     Converts a log level name string into its numeric equivalent.
     -   _level:_ `string`  - Level name
     -   **Returns** [`LogLevelsEnum`](../../lib/core/models/log-levels.model.ts) - Numeric log level
--   **group**(groupTitle?: `string` = `null`, optionalParams: `any[]` = `null`)<br/>
+-   **group**(groupTitle?: `string`, optionalParams: `any[]`)<br/>
     Starts an indented group of log messages.
     -   _groupTitle:_ `string`  - (Optional) Title shown at the start of the group
     -   _optionalParams:_ `any[]`  - Interpolation values for the title in "printf" format
 -   **groupEnd**()<br/>
     Ends a indented group of log messages.
--   **info**(message?: `any` = `null`, optionalParams: `any[]` = `null`)<br/>
+-   **info**(message?: `any`, optionalParams: `any[]`)<br/>
     Logs a message at the "INFO" level.
     -   _message:_ `any`  - (Optional) Message to log
     -   _optionalParams:_ `any[]`  - Interpolation values for the message in "printf" format
--   **log**(message?: `any` = `null`, optionalParams: `any[]` = `null`)<br/>
+-   **log**(message?: `any`, optionalParams: `any[]`)<br/>
     Logs a message at any level from "TRACE" upwards.
     -   _message:_ `any`  - (Optional) Message to log
     -   _optionalParams:_ `any[]`  - Interpolation values for the message in "printf" format
--   **messageBus**(text: `string` = `null`, logLevel: `string` = `null`)<br/>
+-   **messageBus**(text: `string`, logLevel: `string`)<br/>
     Triggers notification callback for log messages.
     -   _text:_ `string`  - Message text
     -   _logLevel:_ `string`  - Log level for the message
--   **trace**(message?: `any` = `null`, optionalParams: `any[]` = `null`)<br/>
+-   **trace**(message?: `any`, optionalParams: `any[]`)<br/>
     Logs a message at the "TRACE" level.
     -   _message:_ `any`  - (Optional) Message to log
     -   _optionalParams:_ `any[]`  - Interpolation values for the message in "printf" format
--   **warn**(message?: `any` = `null`, optionalParams: `any[]` = `null`)<br/>
+-   **warn**(message?: `any`, optionalParams: `any[]`)<br/>
     Logs a message at the "WARN" level.
     -   _message:_ `any`  - (Optional) Message to log
     -   _optionalParams:_ `any[]`  - Interpolation values for the message in "printf" format
diff --git a/docs/core/login.component.md b/docs/core/login.component.md
index 10deb3208f..fae51dc97e 100644
--- a/docs/core/login.component.md
+++ b/docs/core/login.component.md
@@ -1,7 +1,7 @@
 ---
 Added: v2.0.0
 Status: Active
-Last reviewed: 2018-03-19
+Last reviewed: 2018-08-07
 ---
 
 # Login component
@@ -13,14 +13,10 @@ Authenticates to Alfresco Content Services and or Alfresco Process Services.
 ## Contents
 
 -   [Basic usage](#basic-usage)
-
 -   [Class members](#class-members)
-
     -   [Properties](#properties)
     -   [Events](#events)
-
 -   [Details](#details)
-
     -   [Handling events](#handling-events)
     -   [Changing content](#changing-content)
     -   [Custom logo and background](#custom-logo-and-background)
@@ -28,8 +24,6 @@ Authenticates to Alfresco Content Services and or Alfresco Process Services.
     -   [Call an external identity provider to fetch the auth token](#call-an-external-identity-provider-to-fetch-the-auth-token)
     -   [Controlling form submit execution behaviour](#controlling-form-submit-execution-behaviour)
     -   [SSO login](#sso-login)
-    -   [Implicit Flow](#implicit-flow)
-
 -   [See Also](#see-also)
 
 ## Basic usage
@@ -45,32 +39,32 @@ Authenticates to Alfresco Content Services and or Alfresco Process Services.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
-| backgroundImageUrl | `string` | "./assets/images/background.svg" | Path to a custom background image. |
-| copyrightText | `string` | "© 2016 Alfresco Software, Inc. All Rights Reserved." | The copyright text below the login box. |
+| ---- | ---- | ------------- | ----------- |
+| backgroundImageUrl | `string` |  | Path to a custom background image. |
+| copyrightText | `string` |  | The copyright text below the login box. |
 | disableCsrf | `boolean` |  | Prevents the CSRF Token from being submitted. Only valid for Alfresco Process Services. |
 | fieldsValidation | `any` |  | Custom validation rules for the login form. |
-| logoImageUrl | `string` | "./assets/images/alfresco-logo.svg" | Path to a custom logo image. |
+| logoImageUrl | `string` |  | Path to a custom logo image. |
 | needHelpLink | `string` | "" | Sets the URL of the NEED HELP link in the footer. |
-| providers | `string` |  | **Deprecated:** 3.0.0 |
+| providers | `string` |  | (**Deprecated:** 3.0.0 Possible valid values are ECM, BPM or ALL. deprecated in 3.0.0 use the providers property in the the app.config.json) |
 | registerLink | `string` | "" | Sets the URL of the REGISTER link in the footer. |
 | showLoginActions | `boolean` | true | Should the extra actions (`Need Help`, `Register`, etc) be shown? |
 | showRememberMe | `boolean` | true | Should the `Remember me` checkbox be shown? When selected, this option will remember the logged-in user after the browser is closed to avoid logging in repeatedly. |
-| successRoute | `string` |  null | Route to redirect to on successful login. |
+| successRoute | `string` | null | Route to redirect to on successful login. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`LoginErrorEvent`](../../lib/core/login/models/login-error.event.ts)`>` | Emitted when the login fails. |
 | executeSubmit | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`LoginSubmitEvent`](../../lib/core/login/models/login-submit.event.ts)`>` | Emitted when the login form is submitted. |
-| success | `EventEmitter<LoginSuccessEvent>` | Emitted when the login is successful. |
+| success | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`LoginSuccessEvent`](../../lib/core/login/models/login-success.event.ts)`>` | Emitted when the login is successful. |
 
 ## Details
 
 ### Handling events
 
-**app.component.html**
+**[app.component](../../demo-shell/src/app/app.component.ts).html**
 
 ```html
 <adf-login 
@@ -79,7 +73,7 @@ Authenticates to Alfresco Content Services and or Alfresco Process Services.
 </adf-login>
 ```
 
-**app.component.ts**
+**[app.component](../../demo-shell/src/app/app.component.ts).ts**
 
 ```ts
 export class AppComponent {
@@ -273,11 +267,15 @@ export class MyCustomLogin {
 }
 ```
 
+Note that if you do not call `event.preventDefault()` then the default behaviour 
+will execute _after_ your custom code has completed.
+
 ### SSO login
 
-### Implicit Flow
+#### Implicit Flow
 
-If the 'app.config.json' or you used the host-setting component to use the SSO Oauth the [login component](../core/login.component.md) will show only a button to login:
+If you used the host-setting component to enable SSO Oauth (or if you
+enabled the setting in `app.config.json`) then the [login component](../core/login.component.md) will show only a button to login:
 
 ```JSON
     "authType" :"OAUTH",
@@ -295,11 +293,9 @@ If the 'app.config.json' or you used the host-setting component to use the SSO O
 
 ![Login component](../docassets/images/sso-login.png)
 
-Note if the silentLogin property in the oauth2 configuration is true will not be possible to show the login page. with silentLogin true the application is automatically redirect to the 
-authorization server when is not logged-in
-
-Note that if you do not call `event.preventDefault()` then the default behaviour 
-will execute _after_ your custom code has completed.
+Note that if the `silentLogin property` in the `oauth2` configuration is set to true
+then the login page will not be shown. Instead, the application will redirect
+automatically to the authorization server when the user is not logged-in
 
 ## See Also
 
diff --git a/docs/core/node-delete.directive.md b/docs/core/node-delete.directive.md
index ed39e8fdbf..fb0e8bda87 100644
--- a/docs/core/node-delete.directive.md
+++ b/docs/core/node-delete.directive.md
@@ -28,14 +28,14 @@ Deletes multiple files and folders.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | permanent | `boolean` | false | If true then the nodes are deleted immediately rather than being put in the trash |
-| adf-delete | `MinimalNodeEntity[] \| DeletedNodeEntity[]` |  | Array of nodes to delete. |
+| selection | [`MinimalNodeEntity`](../content-services/document-library.model.md)`[] \| DeletedNodeEntity[]` |  | Array of nodes to delete. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | delete | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when the nodes have been deleted. |
 
 ## Details
diff --git a/docs/core/node-favorite.directive.md b/docs/core/node-favorite.directive.md
index 186d5e009f..ffe1d579d1 100644
--- a/docs/core/node-favorite.directive.md
+++ b/docs/core/node-favorite.directive.md
@@ -41,13 +41,13 @@ export class MyComponent {
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
-| adf-node-favorite | `MinimalNodeEntity[]` |  \[] | Array of nodes to toggle as favorites. |
+| ---- | ---- | ------------- | ----------- |
+| selection | [`MinimalNodeEntity`](../content-services/document-library.model.md)`[]` | \[] | Array of nodes to toggle as favorites. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when the favorite setting has fail. |
 | toggle | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when the favorite setting is complete. |
 
diff --git a/docs/core/node-permission.directive.md b/docs/core/node-permission.directive.md
index 7f13cf2c79..a6883a57b3 100644
--- a/docs/core/node-permission.directive.md
+++ b/docs/core/node-permission.directive.md
@@ -11,13 +11,9 @@ Selectively disables an HTML element or Angular component
 ## Contents
 
 -   [Basic Usage](#basic-usage)
-
 -   [Class members](#class-members)
-
     -   [Properties](#properties)
-
 -   [Details](#details)
-
     -   [HTML element example](#html-element-example)
     -   [Angular component example](#angular-component-example)
     -   [Implementing the NodePermissionSubject interface](#implementing-the-nodepermissionsubject-interface)
@@ -44,14 +40,14 @@ Selectively disables an HTML element or Angular component
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
-| adf-nodes | `MinimalNodeEntity[]` |  \[] | Nodes to check permission for. |
-| adf-node-permission | `string` |  null | Node permission to check (create, delete, update, updatePermissions, !create, !delete, !update, !updatePermissions). |
+| ---- | ---- | ------------- | ----------- |
+| nodes | [`MinimalNodeEntity`](../content-services/document-library.model.md)`[]` | \[] | Nodes to check permission for. |
+| permission | `string` | null | Node permission to check (create, delete, update, updatePermissions, !create, !delete, !update, !updatePermissions). |
 
 ## Details
 
 The [Node Permission directive](../core/node-permission.directive.md) lets you disable an HTML element or Angular component
-by taking a collection of `MinimalNodeEntity` instances and checking their permissions.
+by taking a collection of [`MinimalNodeEntity`](../content-services/document-library.model.md) instances and checking their permissions.
 
 The decorated element will be disabled if:
 
diff --git a/docs/core/node-restore.directive.md b/docs/core/node-restore.directive.md
index 15757af376..a118e4fa65 100644
--- a/docs/core/node-restore.directive.md
+++ b/docs/core/node-restore.directive.md
@@ -49,14 +49,14 @@ Restores deleted nodes to their original location.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
-| location | `string` | "" | (**Deprecated:** 2.4.0 Path to restored node.)  |
-| adf-restore | `DeletedNodeEntry[]` |  | Array of deleted nodes to restore. |
+| ---- | ---- | ------------- | ----------- |
+| location | `string` | "" | (**Deprecated:** 2.4.0 Path to restored node.) |
+| selection | `DeletedNodeEntry[]` |  | Array of deleted nodes to restore. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | restore | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`RestoreMessageModel`](../../lib/core/directives/node-restore.directive.ts)`>` | Emitted when restoration is complete. |
 
 ## Details
diff --git a/docs/core/nodes-api.service.md b/docs/core/nodes-api.service.md
index 9e50c4fd51..386761f584 100644
--- a/docs/core/nodes-api.service.md
+++ b/docs/core/nodes-api.service.md
@@ -11,63 +11,59 @@ Accesses and manipulates ACS document nodes using their node IDs.
 ## Contents
 
 -   [Class members](#class-members)
-
     -   [Methods](#methods)
-
 -   [Details](#details)
-
     -   [Getting node information](#getting-node-information)
     -   [Getting folder node contents](#getting-folder-node-contents)
     -   [Creating and updating nodes](#creating-and-updating-nodes)
     -   [Deleting and restoring nodes](#deleting-and-restoring-nodes)
-
 -   [See also](#see-also)
 
 ## Class members
 
 ### Methods
 
--   **createFolder**(parentNodeId: `string` = `null`, nodeBody: `any` = `null`, options: `any` = `{}`): [`Observable`](http://reactivex.io/documentation/observable.html)`<MinimalNodeEntryEntity>`<br/>
+-   **createFolder**(parentNodeId: `string`, nodeBody: `any`, options: `any` = `{}`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>`<br/>
     Creates a new folder node inside a parent folder.
     -   _parentNodeId:_ `string`  - ID of the parent folder node
     -   _nodeBody:_ `any`  - Data for the new folder
     -   _options:_ `any`  - Optional parameters supported by JSAPI
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<MinimalNodeEntryEntity>` - Details of the new folder
--   **createNode**(parentNodeId: `string` = `null`, nodeBody: `any` = `null`, options: `any` = `{}`): [`Observable`](http://reactivex.io/documentation/observable.html)`<MinimalNodeEntryEntity>`<br/>
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>` - Details of the new folder
+-   **createNode**(parentNodeId: `string`, nodeBody: `any`, options: `any` = `{}`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>`<br/>
     Creates a new document node inside a folder.
     -   _parentNodeId:_ `string`  - ID of the parent folder node
     -   _nodeBody:_ `any`  - Data for the new node
     -   _options:_ `any`  - Optional parameters supported by JSAPI
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<MinimalNodeEntryEntity>` - Details of the new node
--   **deleteNode**(nodeId: `string` = `null`, options: `any` = `{}`): [`Observable`](http://reactivex.io/documentation/observable.html)`<void>`<br/>
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>` - Details of the new node
+-   **deleteNode**(nodeId: `string`, options: `any` = `{}`): [`Observable`](http://reactivex.io/documentation/observable.html)`<void>`<br/>
     Moves a node to the trashcan.
     -   _nodeId:_ `string`  - ID of the target node
     -   _options:_ `any`  - Optional parameters supported by JSAPI
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<void>` - Empty result that notifies when the deletion is complete
--   **getNode**(nodeId: `string` = `null`, options: `any` = `{}`): [`Observable`](http://reactivex.io/documentation/observable.html)`<MinimalNodeEntryEntity>`<br/>
+-   **getNode**(nodeId: `string`, options: `any` = `{}`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>`<br/>
     Gets the stored information about a node.
     -   _nodeId:_ `string`  - ID of the target node
     -   _options:_ `any`  - Optional parameters supported by JSAPI
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<MinimalNodeEntryEntity>` - Node information
--   **getNodeChildren**(nodeId: `string` = `null`, options: `any` = `{}`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>`<br/>
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>` - Node information
+-   **getNodeChildren**(nodeId: `string`, options: `any` = `{}`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>`<br/>
     Gets the items contained in a folder node.
     -   _nodeId:_ `string`  - ID of the target node
     -   _options:_ `any`  - Optional parameters supported by JSAPI
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)`>` - List of child items from the folder
--   **handleError**(error: `any` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
+-   **handleError**(error: `any`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
     Reports an error.
     -   _error:_ `any`  - Object representing the error
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<any>` - Error information
--   **restoreNode**(nodeId: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<MinimalNodeEntryEntity>`<br/>
+-   **restoreNode**(nodeId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>`<br/>
     Restores a node previously moved to the trashcan.
     -   _nodeId:_ `string`  - ID of the node to restore
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<MinimalNodeEntryEntity>` - Details of the restored node
--   **updateNode**(nodeId: `string` = `null`, nodeBody: `any` = `null`, options: `any` = `{}`): [`Observable`](http://reactivex.io/documentation/observable.html)`<MinimalNodeEntryEntity>`<br/>
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>` - Details of the restored node
+-   **updateNode**(nodeId: `string`, nodeBody: `any`, options: `any` = `{}`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>`<br/>
     Updates the information about a node.
     -   _nodeId:_ `string`  - ID of the target node
     -   _nodeBody:_ `any`  - New data for the node
     -   _options:_ `any`  - Optional parameters supported by JSAPI
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<MinimalNodeEntryEntity>` - Updated node information
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNodeEntryEntity`](../content-services/document-library.model.md)`>` - Updated node information
 
 ## Details
 
@@ -124,7 +120,7 @@ of a [Document List component](../content-services/document-list.component.md) o
 [Document List row](../content-services/document-list.component.md#underlying-node-object). In these cases,
 you might pass the `id` or `parentId` as a [route parameter](https://angular.io/guide/router)
 to a page describing the node in full detail. The component receiving the node ID can
-use the [Nodes Api service](../core/nodes-api.service.md) to "decode" the ID string into a MinimalNodeEntryEntity:
+use the [Nodes Api service](../core/nodes-api.service.md) to "decode" the ID string into a [`MinimalNodeEntryEntity`](../content-services/document-library.model.md):
 
 ```ts
 import { ActivatedRoute, Router } from '@angular/router';
diff --git a/docs/core/notification.service.md b/docs/core/notification.service.md
index 68bf2ab6f4..c2d0a701c4 100644
--- a/docs/core/notification.service.md
+++ b/docs/core/notification.service.md
@@ -14,16 +14,16 @@ Shows a notification message with optional feedback.
 
 ### Methods
 
--   **openSnackMessage**(message: `string` = `null`, millisecondsDuration?: `number` = `null`): [`MatSnackBarRef`](https://material.angular.io/components/snack-bar/overview)`<any>`<br/>
+-   **openSnackMessage**(message: `string`, config: `number|MatSnackBarConfig` = [`NotificationService`](../core/notification.service.md)`.DEFAULT_DURATION_MESSAGE`): [`MatSnackBarRef`](https://material.angular.io/components/snack-bar/overview)`<any>`<br/>
     Opens a SnackBar notification to show a message.
     -   _message:_ `string`  - The message (or resource key) to show.
-    -   _millisecondsDuration:_ `number`  - (Optional) Time before notification disappears after being shown
+    -   _config:_ `number|MatSnackBarConfig`  - Time before notification disappears after being shown or MatSnackBarConfig object
     -   **Returns** [`MatSnackBarRef`](https://material.angular.io/components/snack-bar/overview)`<any>` - Information/control object for the SnackBar
--   **openSnackMessageAction**(message: `string` = `null`, action: `string` = `null`, millisecondsDuration?: `number` = `null`): [`MatSnackBarRef`](https://material.angular.io/components/snack-bar/overview)`<any>`<br/>
+-   **openSnackMessageAction**(message: `string`, action: `string`, config: `number|MatSnackBarConfig` = [`NotificationService`](../core/notification.service.md)`.DEFAULT_DURATION_MESSAGE`): [`MatSnackBarRef`](https://material.angular.io/components/snack-bar/overview)`<any>`<br/>
     Opens a SnackBar notification with a message and a response button.
     -   _message:_ `string`  - The message (or resource key) to show.
     -   _action:_ `string`  - Caption for the response button
-    -   _millisecondsDuration:_ `number`  - (Optional) Time before the notification disappears (unless the button is clicked)
+    -   _config:_ `number|MatSnackBarConfig`  - Time before notification disappears after being shown or MatSnackBarConfig object
     -   **Returns** [`MatSnackBarRef`](https://material.angular.io/components/snack-bar/overview)`<any>` - Information/control object for the SnackBar
 
 ## Details
@@ -68,3 +68,25 @@ export class MyComponent implements OnInit {
     }
 }
 ```
+
+```ts
+import { NotificationService } from '@alfresco/adf-core';
+import { MatSnackBarConfig } from '@angular/material';
+
+export class MyComponent implements OnInit {
+
+    snackBarConfig: MatSnackBarConfig = new MatSnackBarConfig();
+
+    constructor(private notificationService: NotificationService) {
+    }
+
+    ngOnInit() {
+        this.notificationService
+            .openSnackMessageAction('Do you want to report this issue?', 'send', snackBarConfig)
+            .afterDismissed()
+            .subscribe(() => {
+                console.log('The snack-bar was dismissed');
+            });
+    }
+}
+```
diff --git a/docs/core/pagination.component.md b/docs/core/pagination.component.md
index f41bb36862..f0ce74792b 100644
--- a/docs/core/pagination.component.md
+++ b/docs/core/pagination.component.md
@@ -13,17 +13,12 @@ Adds pagination to the component it is used with.
 ## Contents
 
 -   [Basic Usage](#basic-usage)
-
 -   [Class members](#class-members)
-
     -   [Properties](#properties)
     -   [Events](#events)
-
 -   [Details](#details)
-
     -   [Integrating with the Document List component](#integrating-with-the-document-list-component)
     -   [Custom pagination](#custom-pagination)
-
 -   [See also](#see-also)
 
 ## Basic Usage
@@ -45,20 +40,20 @@ Adds pagination to the component it is used with.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
-| pagination | [`PaginationModel`](../../lib/core/models/pagination.model.ts) |  [`PaginationComponent`](../core/pagination.component.md).DEFAULT_PAGINATION | [`Pagination`](../../lib/content-services/document-list/models/document-library.model.ts) object. |
-| supportedPageSizes | `number[]` |  [5, 25, 50, 100] | An array of page sizes. |
+| ---- | ---- | ------------- | ----------- |
+| pagination | [`PaginationModel`](../../lib/core/models/pagination.model.ts) |  | [Pagination](../../lib/content-services/document-list/models/document-library.model.ts) object. |
+| supportedPageSizes | `number[]` |  | An array of page sizes. |
 | target | `PaginatedComponent` |  | Component that provides custom pagination support. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | change | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`PaginationModel`](../../lib/core/models/pagination.model.ts)`>` | Emitted when pagination changes in any way. |
 | changePageNumber | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`PaginationModel`](../../lib/core/models/pagination.model.ts)`>` | Emitted when the page number changes. |
-| changePageSize | `EventEmitter<PaginationModel>` | Emitted when the page size changes. |
-| nextPage | `EventEmitter<PaginationModel>` | Emitted when the next page is requested. |
-| prevPage | `EventEmitter<PaginationModel>` | Emitted when the previous page is requested. |
+| changePageSize | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`PaginationModel`](../../lib/core/models/pagination.model.ts)`>` | Emitted when the page size changes. |
+| nextPage | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`PaginationModel`](../../lib/core/models/pagination.model.ts)`>` | Emitted when the next page is requested. |
+| prevPage | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`PaginationModel`](../../lib/core/models/pagination.model.ts)`>` | Emitted when the previous page is requested. |
 
 ## Details
 
@@ -70,7 +65,7 @@ and then subscribe to one of the page change events. This will return updated pa
 can pass to a subsequent API call.
 
 Each event corresponds to a particular action from the user. For the `change` event, a
-[PaginationQueryParams](https://github.com/Alfresco/alfresco-ng2-components/blob/development/ng2-components/ng2-alfresco-core/src/components/pagination/pagination-query-params.interface.ts) object is returned. This contains the query
+PaginationQueryParams object is returned. This contains the query
 parameters supported by the REST API, `skipCount` and `maxItems`. 
 
 For all events other than `change`, a new [`Pagination`](../../lib/content-services/document-list/models/document-library.model.ts) object is returned as in the following example. The
diff --git a/docs/core/people-content.service.md b/docs/core/people-content.service.md
index 82137bdb2e..b7a601e4a9 100644
--- a/docs/core/people-content.service.md
+++ b/docs/core/people-content.service.md
@@ -15,7 +15,7 @@ Gets information about a Content Services user.
 -   **getCurrentPerson**(): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
     Gets information about the user who is currently logged in.
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<any>` - User information
--   **getPerson**(personId: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
+-   **getPerson**(personId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
     Gets information about a user identified by their username.
     -   _personId:_ `string`  - ID of the target user
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<any>` - User information
diff --git a/docs/core/people-process.service.md b/docs/core/people-process.service.md
index 3193290b09..8e56769e7f 100644
--- a/docs/core/people-process.service.md
+++ b/docs/core/people-process.service.md
@@ -12,21 +12,21 @@ Gets information about Process Services users.
 
 ### Methods
 
--   **getUserImage**(user: [`UserProcessModel`](../core/user-process.model.md) = `null`): `string`<br/>
+-   **getUserImage**(user: [`UserProcessModel`](../core/user-process.model.md)): `string`<br/>
     Gets the profile picture URL for the specified user.
     -   _user:_ [`UserProcessModel`](../core/user-process.model.md)  - The target user
     -   **Returns** `string` - Profile picture URL
--   **getWorkflowUsers**(taskId?: `string` = `null`, searchWord?: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`UserProcessModel`](../core/user-process.model.md)`[]>`<br/>
+-   **getWorkflowUsers**(taskId?: `string`, searchWord?: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`UserProcessModel`](../core/user-process.model.md)`[]>`<br/>
     Gets information about users across all tasks.
     -   _taskId:_ `string`  - (Optional) ID of the task
     -   _searchWord:_ `string`  - (Optional) Filter text to search for
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`UserProcessModel`](../core/user-process.model.md)`[]>` - Array of user information objects
--   **involveUserWithTask**(taskId: `string` = `null`, idToInvolve: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`UserProcessModel`](../core/user-process.model.md)`[]>`<br/>
+-   **involveUserWithTask**(taskId: `string`, idToInvolve: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`UserProcessModel`](../core/user-process.model.md)`[]>`<br/>
     Sets a user to be involved with a task.
     -   _taskId:_ `string`  - ID of the target task
     -   _idToInvolve:_ `string`  - ID of the user to involve
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`UserProcessModel`](../core/user-process.model.md)`[]>` - Empty response when the update completes
--   **removeInvolvedUser**(taskId: `string` = `null`, idToRemove: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`UserProcessModel`](../core/user-process.model.md)`[]>`<br/>
+-   **removeInvolvedUser**(taskId: `string`, idToRemove: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`UserProcessModel`](../core/user-process.model.md)`[]>`<br/>
     Removes a user who is currently involved with a task.
     -   _taskId:_ `string`  - ID of the target task
     -   _idToRemove:_ `string`  - ID of the user to remove
diff --git a/docs/core/process-content.service.md b/docs/core/process-content.service.md
index 8ca37cb8c5..eee9e4fd1a 100644
--- a/docs/core/process-content.service.md
+++ b/docs/core/process-content.service.md
@@ -11,63 +11,63 @@ Manipulates content related to a Process Instance or Task Instance in APS.
 
 ### Methods
 
--   **createProcessRelatedContent**(processInstanceId: `string` = `null`, content: `any` = `null`, opts?: `any` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
+-   **createProcessRelatedContent**(processInstanceId: `string`, content: `any`, opts?: `any`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
     Associates an uploaded file with a process instance.
     -   _processInstanceId:_ `string`  - ID of the target process instance
     -   _content:_ `any`  - File to associate
     -   _opts:_ `any`  - (Optional) Options supported by JSAPI
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<any>` - Details of created content
--   **createTaskRelatedContent**(taskId: `string` = `null`, file: `any` = `null`, opts?: `any` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
+-   **createTaskRelatedContent**(taskId: `string`, file: `any`, opts?: `any`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
     Associates an uploaded file with a task instance.
     -   _taskId:_ `string`  - ID of the target task
     -   _file:_ `any`  - File to associate
     -   _opts:_ `any`  - (Optional) Options supported by JSAPI
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<any>` - Details of created content
--   **createTemporaryRawRelatedContent**(file: `any` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`RelatedContentRepresentation`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-activiti-rest-api/docs/RelatedContentRepresentation.md)`>`<br/>
+-   **createTemporaryRawRelatedContent**(file: `any`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`RelatedContentRepresentation`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-activiti-rest-api/docs/RelatedContentRepresentation.md)`>`<br/>
     Create temporary related content from an uploaded file.
     -   _file:_ `any`  - File to use for content
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`RelatedContentRepresentation`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-activiti-rest-api/docs/RelatedContentRepresentation.md)`>` - The created content data
--   **deleteRelatedContent**(contentId: `number` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
+-   **deleteRelatedContent**(contentId: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
     Deletes related content.
     -   _contentId:_ `number`  - Identifier of the content to delete
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<any>` - Null response that notifies when the deletion is complete
--   **getContentPreview**(contentId: `number` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob)`>`<br/>
+-   **getContentPreview**(contentId: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob)`>`<br/>
     Gets the preview for a related content file.
     -   _contentId:_ `number`  - ID of the related content
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob)`>` - Binary data of the content preview
--   **getContentThumbnail**(contentId: `number` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob)`>`<br/>
+-   **getContentThumbnail**(contentId: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob)`>`<br/>
     Gets the thumbnail for a related content file.
     -   _contentId:_ `number`  - ID of the related content
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob)`>` - Binary data of the thumbnail image
--   **getFileContent**(contentId: `number` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`RelatedContentRepresentation`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-activiti-rest-api/docs/RelatedContentRepresentation.md)`>`<br/>
+-   **getFileContent**(contentId: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`RelatedContentRepresentation`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-activiti-rest-api/docs/RelatedContentRepresentation.md)`>`<br/>
     Gets the metadata for a related content item.
     -   _contentId:_ `number`  - ID of the content item
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`RelatedContentRepresentation`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-activiti-rest-api/docs/RelatedContentRepresentation.md)`>` - Metadata for the content
--   **getFileRawContent**(contentId: `number` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob)`>`<br/>
+-   **getFileRawContent**(contentId: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob)`>`<br/>
     Gets raw binary content data for a related content file.
     -   _contentId:_ `number`  - ID of the related content
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob)`>` - Binary data of the related content
--   **getFileRawContentUrl**(contentId: `number` = `null`): `string`<br/>
+-   **getFileRawContentUrl**(contentId: `number`): `string`<br/>
     Gets a URL for direct access to a related content file.
     -   _contentId:_ `number`  - ID of the related content
     -   **Returns** `string` - URL to access the content
--   **getProcessRelatedContent**(processId: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
+-   **getProcessRelatedContent**(processId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
     Gets related content items for a process instance.
     -   _processId:_ `string`  - ID of the target process
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<any>` - Metadata for the content
--   **getTaskRelatedContent**(taskId: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
+-   **getTaskRelatedContent**(taskId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
     Gets related content items for a task instance.
     -   _taskId:_ `string`  - ID of the target task
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<any>` - Metadata for the content
--   **handleError**(error: `any` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
+-   **handleError**(error: `any`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
     Reports an error message.
     -   _error:_ `any`  - Data object with optional `message` and `status` fields for the error
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<any>` - Callback when an error occurs
--   **toJson**(res: `any` = `null`): `any`<br/>
+-   **toJson**(res: `any`): `any`<br/>
     Creates a JSON representation of data.
     -   _res:_ `any`  - Object representing data
     -   **Returns** `any` - JSON object
--   **toJsonArray**(res: `any` = `null`): `any`<br/>
+-   **toJsonArray**(res: `any`): `any`<br/>
     Creates a JSON array representation of data.
     -   _res:_ `any`  - Object representing data
     -   **Returns** `any` - JSON array object
diff --git a/docs/core/search-configuration.service.md b/docs/core/search-configuration.service.md
index 715e638145..0bd93482bc 100644
--- a/docs/core/search-configuration.service.md
+++ b/docs/core/search-configuration.service.md
@@ -11,7 +11,7 @@ Provides fine control of parameters to a search.
 
 ### Methods
 
--   **generateQueryBody**(searchTerm: `string` = `null`, maxResults: `number` = `null`, skipCount: `number` = `null`): `QueryBody`<br/>
+-   **generateQueryBody**(searchTerm: `string`, maxResults: `number`, skipCount: `number`): `QueryBody`<br/>
 
     -   _searchTerm:_ `string`  - 
     -   _maxResults:_ `number`  - 
diff --git a/docs/core/shared-links-api.service.md b/docs/core/shared-links-api.service.md
index b99ef4b7ae..e080ecffc8 100644
--- a/docs/core/shared-links-api.service.md
+++ b/docs/core/shared-links-api.service.md
@@ -12,12 +12,12 @@ Finds shared links to Content Services items.
 
 ### Methods
 
--   **createSharedLinks**(nodeId: `string` = `null`, options: `any` = `{}`): [`Observable`](http://reactivex.io/documentation/observable.html)`<SharedLinkEntry>`<br/>
+-   **createSharedLinks**(nodeId: `string`, options: `any` = `{}`): [`Observable`](http://reactivex.io/documentation/observable.html)`<SharedLinkEntry>`<br/>
     Creates a shared link available to the current user.
     -   _nodeId:_ `string`  - ID of the node to link to
     -   _options:_ `any`  - Options supported by JSAPI
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<SharedLinkEntry>` - The shared link just created
--   **deleteSharedLink**(sharedId: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<SharedLinkEntry>`<br/>
+-   **deleteSharedLink**(sharedId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<SharedLinkEntry>`<br/>
     Deletes a shared link.
     -   _sharedId:_ `string`  - ID of the link to delete
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<SharedLinkEntry>` - Null response notifying when the operation is complete
diff --git a/docs/core/sidebar-action-menu.component.md b/docs/core/sidebar-action-menu.component.md
index 5e3d3c2b48..9d142319bb 100644
--- a/docs/core/sidebar-action-menu.component.md
+++ b/docs/core/sidebar-action-menu.component.md
@@ -32,7 +32,7 @@ Displays a sidebar-action menu information panel.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | expanded | `boolean` |  | Toggle the sidebar action menu on expand. |
 | title | `string` |  | The title of the sidebar action. |
 | width | `number` | 272 | Width in pixels for sidebar action menu options |
diff --git a/docs/core/sidenav-layout.component.md b/docs/core/sidenav-layout.component.md
index 248ff8ca6c..e5a0a6c6b2 100644
--- a/docs/core/sidenav-layout.component.md
+++ b/docs/core/sidenav-layout.component.md
@@ -13,14 +13,10 @@ Displays the standard three-region ADF application layout.
 ## Contents
 
 -   [Basic Usage](#basic-usage)
-
 -   [Class members](#class-members)
-
     -   [Properties](#properties)
     -   [Events](#events)
-
 -   [Details](#details)
-
     -   [Template context](#template-context)
     -   [menuOpenState$](#menuopenstate)
     -   [Preserving the menu state](#preserving-the-menu-state)
@@ -65,7 +61,7 @@ Displays the standard three-region ADF application layout.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | expandedSidenav | `boolean` | true | Should the navigation region be expanded initially? |
 | hideSidenav | `boolean` | false | Toggles showing/hiding the navigation region |
 | sidenavMax | `number` |  | Maximum size of the navigation region |
@@ -75,7 +71,7 @@ Displays the standard three-region ADF application layout.
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | expanded | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<boolean>` | Emitted when the menu toggle and the collapsed/expanded state of the sideNav changes |
 
 ## Details
@@ -120,7 +116,7 @@ Beside the template context's **isMenuMinimized** variable, another way to liste
 
 | Name | Type | Default | Description |
 | ---- | ---- | ------- | ----------- |
-| menuOpenState$ | Observable&lt;boolean> | true | Another way to listen to menu open/closed state |
+| menuOpenState$ | [`Observable`](http://reactivex.io/documentation/observable.html)&lt;boolean> | true | Another way to listen to menu open/closed state |
 
 Every time the menu state is changed, the following values are emitted:
 
diff --git a/docs/core/sites.service.md b/docs/core/sites.service.md
index c52d07f2d8..5c3685aa77 100644
--- a/docs/core/sites.service.md
+++ b/docs/core/sites.service.md
@@ -12,7 +12,7 @@ Accesses and manipulates sites from a Content Services repository.
 
 ### Methods
 
--   **deleteSite**(siteId: `string` = `null`, permanentFlag: `boolean` = `true`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
+-   **deleteSite**(siteId: `string`, permanentFlag: `boolean` = `true`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
     Deletes a site.
     -   _siteId:_ `string`  - Site to delete
     -   _permanentFlag:_ `boolean`  - True: deletion is permanent; False: site is moved to the trash
@@ -20,16 +20,16 @@ Accesses and manipulates sites from a Content Services repository.
 -   **getEcmCurrentLoggedUserName**(): `string`<br/>
     Gets the username of the user currently logged into ACS.
     -   **Returns** `string` - Username string
--   **getSite**(siteId: `string` = `null`, opts?: `any` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`SiteEntry`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-core-rest-api/docs/SiteEntry.md)`>`<br/>
+-   **getSite**(siteId: `string`, opts?: `any`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`SiteEntry`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-core-rest-api/docs/SiteEntry.md)`>`<br/>
     Gets the details for a site.
     -   _siteId:_ `string`  - ID of the target site
     -   _opts:_ `any`  - (Optional) Options supported by JSAPI
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`SiteEntry`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-core-rest-api/docs/SiteEntry.md)`>` - Information about the site
--   **getSiteContent**(siteId: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`SiteEntry`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-core-rest-api/docs/SiteEntry.md)`>`<br/>
+-   **getSiteContent**(siteId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`SiteEntry`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-core-rest-api/docs/SiteEntry.md)`>`<br/>
     Gets a site's content.
     -   _siteId:_ `string`  - ID of the target site
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`SiteEntry`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-core-rest-api/docs/SiteEntry.md)`>` - Site content
--   **getSiteMembers**(siteId: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`SiteEntry`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-core-rest-api/docs/SiteEntry.md)`>`<br/>
+-   **getSiteMembers**(siteId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`SiteEntry`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-core-rest-api/docs/SiteEntry.md)`>`<br/>
     Gets a list of all a site's members.
     -   _siteId:_ `string`  - ID of the target site
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`SiteEntry`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-core-rest-api/docs/SiteEntry.md)`>` - Site members
diff --git a/docs/core/sorting-picker.component.md b/docs/core/sorting-picker.component.md
index 5602a515a9..dd9b866303 100644
--- a/docs/core/sorting-picker.component.md
+++ b/docs/core/sorting-picker.component.md
@@ -26,16 +26,16 @@ Selects from a set of predefined sorting definitions and directions.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | ascending | `boolean` | true | Current sorting direction |
-| options | `Array<object>` |  \[] | Available sorting options |
+| options | `Array<Function>` | \[] | Available sorting options |
 | selected | `string` |  | Currently selected option key |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
-| change | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<object>` | Raised each time sorting key or direction gets changed. |
+| ---- | ---- | ----------- |
+| change | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Function>` | Raised each time sorting key or direction gets changed. |
 
 ## Details
 
diff --git a/docs/core/start-form.component.md b/docs/core/start-form.component.md
index 252b08b687..81922a47dd 100644
--- a/docs/core/start-form.component.md
+++ b/docs/core/start-form.component.md
@@ -24,11 +24,11 @@ Displays the Start [`Form`](../../lib/process-services/task-list/models/form.mod
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
-| data | [`FormValues`](../../lib/core/form/components/widgets/core/form-values.ts) |  | Custom form values map to be used with the rendered form. |
+| ---- | ---- | ------------- | ----------- |
+| data | `FormValues` |  | Custom form values map to be used with the rendered form. |
 | disableCompleteButton | `boolean` | false | If true then the `Complete` outcome button is shown but it will be disabled. |
 | disableStartProcessButton | `boolean` | false | If true then the `Start Process` outcome button is shown but it will be disabled. |
-| fieldValidators | [`FormFieldValidator`](../../lib/core/form/components/widgets/core/form-field-validator.ts)`[]` |  \[] | Contains a list of form field validator instances. |
+| fieldValidators | `FormFieldValidator[]` | \[] | Contains a list of form field validator instances. |
 | form | [`FormModel`](../../lib/core/form/components/widgets/core/form.model.ts) |  | Underlying [form model](../../lib/core/form/components/widgets/core/form.model.ts) instance. |
 | formId | `string` |  | The id of the form definition to load and display with custom values. |
 | formName | `string` |  | Name of the form definition to load and display with custom values. |
@@ -52,15 +52,15 @@ Displays the Start [`Form`](../../lib/process-services/task-list/models/form.mod
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | executeOutcome | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`FormOutcomeEvent`](../../lib/core/form/components/widgets/core/form-outcome-event.model.ts)`>` | Emitted when any outcome is executed. Default behaviour can be prevented via `event.preventDefault()`. |
 | formCompleted | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`FormModel`](../../lib/core/form/components/widgets/core/form.model.ts)`>` | Emitted when the form is submitted with the `Complete` outcome. |
 | formContentClicked | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`ContentLinkModel`](../../lib/core/form/components/widgets/core/content-link.model.ts)`>` | Emitted when a field of the form is clicked. |
 | formDataRefreshed | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`FormModel`](../../lib/core/form/components/widgets/core/form.model.ts)`>` | Emitted when form values are refreshed due to a data property change. |
-| formLoaded | `EventEmitter<FormModel>` | Emitted when the form is loaded or reloaded. |
-| formSaved | `EventEmitter<FormModel>` | Emitted when the form is submitted with the `Save` or custom outcomes. |
-| onError | `EventEmitter<any>` | Emitted when any error occurs. |
-| outcomeClick | `EventEmitter<any>` | Emitted when the user clicks one of the outcome buttons that completes the form. |
+| formLoaded | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`FormModel`](../../lib/core/form/components/widgets/core/form.model.ts)`>` | Emitted when the form is loaded or reloaded. |
+| formSaved | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`FormModel`](../../lib/core/form/components/widgets/core/form.model.ts)`>` | Emitted when the form is submitted with the `Save` or custom outcomes. |
+| onError | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when any error occurs. |
+| outcomeClick | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when the user clicks one of the outcome buttons that completes the form. |
 
 ## Details
 
diff --git a/docs/core/storage.service.md b/docs/core/storage.service.md
index 842259ca3b..55d2fd303e 100644
--- a/docs/core/storage.service.md
+++ b/docs/core/storage.service.md
@@ -13,18 +13,18 @@ Stores items in the form of key-value pairs.
 
 -   **clear**()<br/>
     Removes all currently stored items.
--   **getItem**(key: `string` = `null`): `string | null`<br/>
+-   **getItem**(key: `string`): `string|null`<br/>
     Gets an item.
     -   _key:_ `string`  - Key to identify the item
-    -   **Returns** `string | null` - The item (if any) retrieved by the key
--   **hasItem**(key: `string` = `null`): `boolean`<br/>
+    -   **Returns** `string|null` - The item (if any) retrieved by the key
+-   **hasItem**(key: `string`): `boolean`<br/>
     Is any item currently stored under `key`?
     -   _key:_ `string`  - Key identifying item to check
     -   **Returns** `boolean` - True if key retrieves an item, false otherwise
--   **removeItem**(key: `string` = `null`)<br/>
+-   **removeItem**(key: `string`)<br/>
     Removes a single item.
     -   _key:_ `string`  - Key to identify the item
--   **setItem**(key: `string` = `null`, data: `string` = `null`)<br/>
+-   **setItem**(key: `string`, data: `string`)<br/>
     Stores an item
     -   _key:_ `string`  - Key to identify the item
     -   _data:_ `string`  - Data to store
diff --git a/docs/core/text-mask.component.md b/docs/core/text-mask.component.md
index 5844bc44cd..994aa015c5 100644
--- a/docs/core/text-mask.component.md
+++ b/docs/core/text-mask.component.md
@@ -19,8 +19,8 @@ Implements text field input masks.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
-| textMask | `object` |  | Object defining mask and "reversed" status. |
+| ---- | ---- | ------------- | ----------- |
+| inputMask | `Function` |  | Object defining mask and "reversed" status. |
 
 ## Details
 
diff --git a/docs/core/thumbnail.service.md b/docs/core/thumbnail.service.md
index e14230558e..2a03aa27ef 100644
--- a/docs/core/thumbnail.service.md
+++ b/docs/core/thumbnail.service.md
@@ -15,11 +15,11 @@ Retrieves an SVG thumbnail image to represent a document type.
 -   **getDefaultMimeTypeIcon**(): `string`<br/>
     Gets a "miscellaneous" thumbnail URL for types with no other icon defined.
     -   **Returns** `string` - URL string
--   **getDocumentThumbnailUrl**(node: `any` = `null`): `string`<br/>
+-   **getDocumentThumbnailUrl**(node: `any`): `string`<br/>
     Gets a thumbnail URL for the given document node.
     -   _node:_ `any`  - Node to get URL for.
     -   **Returns** `string` - URL string
--   **getMimeTypeIcon**(mimeType: `string` = `null`): `string`<br/>
+-   **getMimeTypeIcon**(mimeType: `string`): `string`<br/>
     Gets a thumbnail URL for a MIME type.
     -   _mimeType:_ `string`  - MIME type for the thumbnail
     -   **Returns** `string` - URL string
diff --git a/docs/core/toolbar.component.md b/docs/core/toolbar.component.md
index b40ed6ba22..42148cf1aa 100644
--- a/docs/core/toolbar.component.md
+++ b/docs/core/toolbar.component.md
@@ -13,19 +13,14 @@ Simple container for headers, titles, actions and breadcrumbs.
 ## Contents
 
 -   [Basic Usage](#basic-usage)
-
 -   [Class members](#class-members)
-
     -   [Properties](#properties)
-
 -   [Details](#details)
-
     -   [Custom title](#custom-title)
     -   [Divider](#divider)
     -   [Spacer](#spacer)
     -   [Dropdown menu](#dropdown-menu)
     -   [Custom color](#custom-color)
-
 -   [See also](#see-also)
 
 ## Basic Usage
@@ -46,7 +41,7 @@ Simple container for headers, titles, actions and breadcrumbs.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | color | `string` |  | Toolbar color. Can be changed to empty value (default), `primary`, `accent` or `warn`. |
 | title | `string` | "" | Toolbar title. |
 
diff --git a/docs/core/translation.service.md b/docs/core/translation.service.md
index 7d0aa515f1..de25628d00 100644
--- a/docs/core/translation.service.md
+++ b/docs/core/translation.service.md
@@ -16,20 +16,20 @@ Supports localisation.
     Adds a new folder of translation source files.
     -   _name:_ `string`  - Name for the translation provider
     -   _path:_ `string`  - Path to the folder
--   **get**(key: `string | Array<string>` = `null`, interpolateParams?: `Object` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<string | any>`<br/>
+-   **get**(key: `string|Array<string>`, interpolateParams?: `Object`): [`Observable`](http://reactivex.io/documentation/observable.html)`<string|any>`<br/>
     Gets the translation for the supplied key.
-    -   _key:_ `string | Array<string>`  - Key to translate
+    -   _key:_ `string|Array<string>`  - Key to translate
     -   _interpolateParams:_ `Object`  - (Optional) String(s) to be interpolated into the main message
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<string | any>` - Translated text
--   **instant**(key: `string | Array<string>` = `null`, interpolateParams?: `Object` = `null`): `string | any`<br/>
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<string|any>` - Translated text
+-   **instant**(key: `string|Array<string>`, interpolateParams?: `Object`): `string|any`<br/>
     Directly returns the translation for the supplied key.
-    -   _key:_ `string | Array<string>`  - Key to translate
+    -   _key:_ `string|Array<string>`  - Key to translate
     -   _interpolateParams:_ `Object`  - (Optional) String(s) to be interpolated into the main message
-    -   **Returns** `string | any` - Translated text
--   **onTranslationChanged**(lang: `string` = `null`)<br/>
+    -   **Returns** `string|any` - Translated text
+-   **onTranslationChanged**(lang: `string`)<br/>
     Triggers a notification callback when the translation language changes.
     -   _lang:_ `string`  - The new language code
--   **use**(lang: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
+-   **use**(lang: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
     Sets the target language for translations.
     -   _lang:_ `string`  - Code name for the language
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<any>` - Translations available for the language
diff --git a/docs/core/upload.directive.md b/docs/core/upload.directive.md
index d82f70ffad..251851a090 100644
--- a/docs/core/upload.directive.md
+++ b/docs/core/upload.directive.md
@@ -21,12 +21,12 @@ Uploads content in response to file drag and drop.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | accept | `string` |  | (Click mode only) MIME type filter for files to accept. |
-| adf-upload-data | `any` |  | Data to upload. |
+| data | `any` |  | Data to upload. |
 | directory | `boolean` |  | (Click mode only) Toggles uploading of directories. |
-| adf-upload | `boolean` | true | Enables/disables uploading. |
-| mode | `string[]` |  ['drop'] | Upload mode. Can be "drop" (receives dropped files) or "click" (clicking opens a file dialog). Both modes can be active at once. |
+| enabled | `boolean` | true | Enables/disables uploading. |
+| mode | `string[]` | ['drop'] | Upload mode. Can be "drop" (receives dropped files) or "click" (clicking opens a file dialog). Both modes can be active at once. |
 | multiple | `boolean` |  | Toggles multiple file uploads. |
 
 ## Details
diff --git a/docs/core/upload.service.md b/docs/core/upload.service.md
index 64645e2458..24edcd7627 100644
--- a/docs/core/upload.service.md
+++ b/docs/core/upload.service.md
@@ -12,11 +12,11 @@ Provides access to various APIs related to file upload features.
 
 ### Methods
 
--   **addToQueue**(files: [`FileModel`](../../lib/core/models/file.model.ts)`[]` = `null`): [`FileModel`](../../lib/core/models/file.model.ts)`[]`<br/>
+-   **addToQueue**(files: [`FileModel`](../../lib/core/models/file.model.ts)`[]`): [`FileModel`](../../lib/core/models/file.model.ts)`[]`<br/>
     Adds files to the uploading queue to be uploaded
     -   _files:_ [`FileModel`](../../lib/core/models/file.model.ts)`[]`  - One or more separate parameters or an array of files to queue
     -   **Returns** [`FileModel`](../../lib/core/models/file.model.ts)`[]` - Array of files that were not blocked from upload by the ignore list
--   **cancelUpload**(files: [`FileModel`](../../lib/core/models/file.model.ts)`[]` = `null`)<br/>
+-   **cancelUpload**(files: [`FileModel`](../../lib/core/models/file.model.ts)`[]`)<br/>
     Cancels uploading of files.
     -   _files:_ [`FileModel`](../../lib/core/models/file.model.ts)`[]`  - One or more separate parameters or an array of files specifying uploads to cancel
 -   **clearQueue**()<br/>
@@ -24,14 +24,14 @@ Provides access to various APIs related to file upload features.
 -   **getQueue**(): [`FileModel`](../../lib/core/models/file.model.ts)`[]`<br/>
     Gets the file Queue
     -   **Returns** [`FileModel`](../../lib/core/models/file.model.ts)`[]` - Array of files that form the queue
--   **getUploadPromise**(file: [`FileModel`](../../lib/core/models/file.model.ts) = `null`): `any`<br/>
+-   **getUploadPromise**(file: [`FileModel`](../../lib/core/models/file.model.ts)): `any`<br/>
     Gets an upload promise for a file.
     -   _file:_ [`FileModel`](../../lib/core/models/file.model.ts)  - The target file
-    -   **Returns** `any` - Promise that is resolved if the upload is successful or error otherwise
+    -   **Returns** `any` - [Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises) that is resolved if the upload is successful or error otherwise
 -   **isUploading**(): `boolean`<br/>
     Checks whether the service is uploading a file.
     -   **Returns** `boolean` - True if a file is uploading, false otherwise
--   **uploadFilesInTheQueue**(emitter?: [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` = `null`)<br/>
+-   **uploadFilesInTheQueue**(emitter?: [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>`)<br/>
     Finds all the files in the queue that are not yet uploaded and uploads them into the directory folder.
     -   _emitter:_ [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>`  - (Optional) (Deprecated) Emitter to invoke on file status change
 
@@ -39,15 +39,15 @@ Provides access to various APIs related to file upload features.
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
-| queueChanged | FileModel\[] | Emitted when the file queue changes. |
-| fileUpload | FileUploadEvent | Emitted when a File model changes its state. |
-| fileUploadStarting | FileUploadEvent | Emitted when an upload starts. |
-| fileUploadCancelled | FileUploadEvent | Emitted when an upload gets cancelled by the user. |
-| fileUploadProgress | FileUploadEvent | Emitted during the file upload process and contains the current progress for a particular File model. |
-| fileUploadAborted | FileUploadEvent | Emitted when a file upload gets aborted by the server. |
-| fileUploadError | FileUploadEvent | Emitted when an error occurs during a file upload. |
-| fileUploadComplete | FileUploadCompleteEvent | Emitted when a file upload is complete. |
-| fileUploadDelete | FileUploadDeleteEvent | Emitted when an uploaded file is removed from server. |
+| queueChanged | [`FileModel`](../../lib/core/models/file.model.ts)\[] | Emitted when the file queue changes. |
+| fileUpload | [`FileUploadEvent`](../../lib/core/events/file.event.ts) | Emitted when a [File model](../../lib/core/models/file.model.ts) changes its state. |
+| fileUploadStarting | [`FileUploadEvent`](../../lib/core/events/file.event.ts) | Emitted when an upload starts. |
+| fileUploadCancelled | [`FileUploadEvent`](../../lib/core/events/file.event.ts) | Emitted when an upload gets cancelled by the user. |
+| fileUploadProgress | [`FileUploadEvent`](../../lib/core/events/file.event.ts) | Emitted during the file upload process and contains the current progress for a particular [File model](../../lib/core/models/file.model.ts). |
+| fileUploadAborted | [`FileUploadEvent`](../../lib/core/events/file.event.ts) | Emitted when a file upload gets aborted by the server. |
+| fileUploadError | [`FileUploadEvent`](../../lib/core/events/file.event.ts) | Emitted when an error occurs during a file upload. |
+| fileUploadComplete | [`FileUploadCompleteEvent`](../../lib/core/events/file.event.ts) | Emitted when a file upload is complete. |
+| fileUploadDelete | [`FileUploadDeleteEvent`](../../lib/core/events/file.event.ts) | Emitted when an uploaded file is removed from server. |
 | fileDeleted | string | This can be invoked when a file is deleted from an external source to upload the file dialog status. |
 
 ## Details
@@ -61,6 +61,9 @@ The configuration of this service is saved in the `app.config.json` file
 The example below shows how to filter out the : '.git', '.DS_Store' and 'desktop.ini' files.
 Each element of the ignore list is a glob pattern string, so you could exclude all the `.txt`
 files, for example, by adding a `*.txt` pattern to the list.
+There is also the possibility to add some more option to how perform the check via the `match-options` parameter.
+For example in this case we have added the ignore case so `*.TXT` will match all the txt files ignoring the case for the extension.
+For more information about the options available please check [minimatch](https://www.npmjs.com/package/minimatch#options) documentation.
 
 **app.config.json**
 
@@ -72,7 +75,10 @@ files, for example, by adding a `*.txt` pattern to the list.
         "name": "Alfresco"
     },
     "files": {
-          "excluded": [".DS_Store", "desktop.ini", ".git", "*.txt"]
+          "excluded": [".DS_Store", "desktop.ini", ".git", "*.txt"],
+          "match-options": {
+            "nocase": true
+          }
     }
 }
 ```
diff --git a/docs/core/user-info.component.md b/docs/core/user-info.component.md
index 67c680e28e..7319a5dd2a 100644
--- a/docs/core/user-info.component.md
+++ b/docs/core/user-info.component.md
@@ -18,9 +18,9 @@ Shows user information.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
-| bpmBackgroundImage | `string` | "./assets/images/bpm-background.png" | Custom path for the background banner image for APS users. |
-| ecmBackgroundImage | `string` | "./assets/images/ecm-background.png" | Custom path for the background banner image for ACS users. |
+| ---- | ---- | ------------- | ----------- |
+| bpmBackgroundImage | `string` |  | Custom path for the background banner image for APS users. |
+| ecmBackgroundImage | `string` |  | Custom path for the background banner image for ACS users. |
 | menuPositionX | `string` | "after" | Custom choice for opening the menu at the bottom. Can be `before` or `after`. |
 | menuPositionY | `string` | "below" | Custom choice for opening the menu at the bottom. Can be `above` or `below`. |
 | namePosition | `string` | "right" | When the username is shown, this defines its position relative to the user info button. Can be `right` or `left`. |
diff --git a/docs/core/user-preferences.service.md b/docs/core/user-preferences.service.md
index 0bd3beae86..562d9ffa59 100644
--- a/docs/core/user-preferences.service.md
+++ b/docs/core/user-preferences.service.md
@@ -12,7 +12,7 @@ Stores preferences for components.
 
 ### Methods
 
--   **get**(property: `string` = `null`, defaultValue?: `string` = `null`): `string`<br/>
+-   **get**(property: `string`, defaultValue?: `string`): `string`<br/>
     Gets a preference property.
     -   _property:_ `string`  - Name of the property
     -   _defaultValue:_ `string`  - (Optional) Default to return if the property is not found
@@ -23,22 +23,26 @@ Stores preferences for components.
 -   **getDefaultPageSizes**(): `number[]`<br/>
     Gets an array containing the available page sizes.
     -   **Returns** `number[]` - Array of page size values
--   **getPropertyKey**(property: `string` = `null`): `string`<br/>
+-   **getPropertyKey**(property: `string`): `string`<br/>
     Gets the full property key with prefix.
     -   _property:_ `string`  - The property name
-    -   **Returns** `string` - [Property](../../lib/content-services/content-metadata/interfaces/property.interface.ts) key
+    -   **Returns** `string` - Property key
 -   **getStoragePrefix**(): `string`<br/>
     Gets the active storage prefix for preferences.
     -   **Returns** `string` - Storage prefix
--   **select**(property: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
+-   **hasItem**(property: `string`): `boolean`<br/>
+    Check if an item is present in the storage
+    -   _property:_ `string`  - Name of the property
+    -   **Returns** `boolean` - 
+-   **select**(property: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
     Sets up a callback to notify when a property has changed.
     -   _property:_ `string`  - The property to watch
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<any>` - Notification callback
--   **set**(property: `string` = `null`, value: `any` = `null`)<br/>
+-   **set**(property: `string`, value: `any`)<br/>
     Sets a preference property.
     -   _property:_ `string`  - Name of the property
     -   _value:_ `any`  - New value for the property
--   **setStoragePrefix**(value: `string` = `null`)<br/>
+-   **setStoragePrefix**(value: `string`)<br/>
     Sets the active storage prefix for preferences.
     -   _value:_ `string`  - Name of the prefix
 
@@ -90,7 +94,7 @@ The service also provides quick access to a set of the "known" properties used a
 | ---- | ---- | ----------- |
 | authType | `string` | Authorization type (can be "ECM", "BPM" or "ALL"). |
 | disableCSRF | `boolean` | Prevents the CSRF Token from being submitted if true. Only valid for Process Services. |
-| paginationSize | `number` | Pagination size. |
+| paginationSize | `number` | [`Pagination`](../../lib/content-services/document-list/models/document-library.model.ts) size. |
 | locale | `string` | Current locale setting. |
 
 ## User Preference onChange Stream
diff --git a/docs/core/viewer.component.md b/docs/core/viewer.component.md
index 653118f724..cb571ccafd 100644
--- a/docs/core/viewer.component.md
+++ b/docs/core/viewer.component.md
@@ -13,16 +13,11 @@ See it live: [Viewer Quickstart](https://embed.plnkr.co/iTuG1lFIXfsP95l6bDW6/)
 ## Contents
 
 -   [Basic usage](#basic-usage)
-
 -   [Class members](#class-members)
-
     -   [Properties](#properties)
     -   [Events](#events)
-
 -   [Keyboard shortcuts](#keyboard-shortcuts)
-
 -   [Details](#details)
-
     -   [Integrating with the Document List component](#integrating-with-the-document-list-component)
     -   [Custom file parameters](#custom-file-parameters)
     -   [Supported file formats](#supported-file-formats)
@@ -35,7 +30,6 @@ See it live: [Viewer Quickstart](https://embed.plnkr.co/iTuG1lFIXfsP95l6bDW6/)
     -   [Custom "Open With" menu](#custom-open-with-menu)
     -   [Custom "More actions" menu](#custom-more-actions-menu)
     -   [Extending the Viewer](#extending-the-viewer)
-
 -   [See also](#see-also)
 
 ## Basic usage
@@ -77,7 +71,7 @@ URL with `urlFile`.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | allowDownload | `boolean` | true | Toggles downloading. |
 | allowFullScreen | `boolean` | true | Toggles the 'Full Screen' feature. |
 | allowGoBack | `boolean` | true | Allows `back` navigation |
@@ -86,39 +80,38 @@ URL with `urlFile`.
 | allowShare | `boolean` | false | Toggles sharing. |
 | allowSidebar | `boolean` | false | Toggles the sidebar. |
 | allowThumbnails | `boolean` | true | Toggles PDF thumbnails. |
-| blobFile | [`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob) |  | Loads a [`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob) File |
+| blobFile | [`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob) |  | Loads a [Blob](https://developer.mozilla.org/en-US/docs/Web/API/Blob) File |
 | canNavigateBefore | `boolean` | true | Toggles the "before" ("&lt;") button. Requires `allowNavigate` to be enabled. |
 | canNavigateNext | `boolean` | true | Toggles the next (">") button. Requires `allowNavigate` to be enabled. |
 | displayName | `string` |  | Specifies the name of the file when it is not available from the URL. |
-| downloadUrl | `string` |  null | URL to download. |
+| downloadUrl | `string` | null | URL to download. |
 | fileName | `string` |  | Content filename. |
-| maxRetries | `number` | 5 | Number of times the Viewer will retry fetching content Rendition. There is a delay of at least one second between attempts. |
+| maxRetries | `number` | 10 | Number of times the Viewer will retry fetching content Rendition. There is a delay of at least one second between attempts. |
 | mimeType | `string` |  | MIME type of the file content (when not determined by the filename extension). |
-| nodeId | `string` |  null | Node Id of the file to load. |
+| nodeId | `string` | null | Node Id of the file to load. |
 | overlayMode | `boolean` | false | If `true` then show the Viewer as a full page over the current content. Otherwise fit inside the parent div. |
-| sharedLinkId | `string` |  null | Shared link id (to display shared file). |
+| sharedLinkId | `string` | null | Shared link id (to display shared file). |
 | showSidebar | `boolean` | false | Toggles sidebar visibility. Requires `allowSidebar` to be set to `true`. |
 | showToolbar | `boolean` | true | Hide or show the toolbar |
 | showViewer | `boolean` | true | Hide or show the viewer |
 | sidebarPosition | `string` | "right" | The position of the sidebar. Can be `left` or `right`. |
-| sidebarTemplate | [`TemplateRef`](https://angular.io/api/core/TemplateRef)`<any>` |  null | The template for the sidebar. The template context contains the loaded node data. |
-| thumbnailsTemplate | [`TemplateRef`](https://angular.io/api/core/TemplateRef)`<any>` |  null | The template for the pdf thumbnails. |
+| sidebarTemplate | [`TemplateRef`](https://angular.io/api/core/TemplateRef)`<any>` | null | The template for the sidebar. The template context contains the loaded node data. |
+| thumbnailsTemplate | [`TemplateRef`](https://angular.io/api/core/TemplateRef)`<any>` | null | The template for the pdf thumbnails. |
 | urlFile | `string` | "" | If you want to load an external file that does not come from ACS you can use this URL to specify where to load the file from. |
-| urlFileViewer | `string` |  null | Viewer to use with the `urlFile` address (`pdf`, `image`, `media`, `text`). Used when `urlFile` has no filename and extension. |
-| fileNodeId |  |  | Node Id of the file to load. |
+| urlFileViewer | `string` | null | Viewer to use with the `urlFile` address (`pdf`, `image`, `media`, `text`). Used when `urlFile` has no filename and extension. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | download | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`BaseEvent`](../../lib/core/events/base.event.ts)`<any>>` | Emitted when user clicks the 'Download' button. |
 | extensionChange | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<string>` | Emitted when the filename extension changes. |
 | goBack | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`BaseEvent`](../../lib/core/events/base.event.ts)`<any>>` | Emitted when user clicks the 'Back' button. |
 | navigateBefore | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` | Emitted when user clicks 'Navigate Before' ("&lt;") button. |
-| navigateNext | `EventEmitter<Object>` | Emitted when user clicks 'Navigate Next' (">") button. |
-| print | `EventEmitter<BaseEvent<any>>` | Emitted when user clicks the 'Print' button. |
-| share | `EventEmitter<BaseEvent<any>>` | Emitted when user clicks the 'Share' button. |
-| showViewerChange | `EventEmitter<boolean>` | Emitted when the viewer is shown or hidden. |
+| navigateNext | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` | Emitted when user clicks 'Navigate Next' (">") button. |
+| print | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`BaseEvent`](../../lib/core/events/base.event.ts)`<any>>` | Emitted when user clicks the 'Print' button. |
+| share | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`BaseEvent`](../../lib/core/events/base.event.ts)`<any>>` | Emitted when user clicks the 'Share' button. |
+| showViewerChange | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<boolean>` | Emitted when the viewer is shown or hidden. |
 
 ## Keyboard shortcuts
 
diff --git a/docs/insights/analytics-generator.component.md b/docs/insights/analytics-generator.component.md
index 655bff8bd8..441e6ddceb 100644
--- a/docs/insights/analytics-generator.component.md
+++ b/docs/insights/analytics-generator.component.md
@@ -2,6 +2,7 @@
 Added: v2.0.0
 Status: Active
 ---
+
 # Analytics Generator Component
 
 Generates and shows charts
@@ -22,11 +23,11 @@ Generates and shows charts
 | Name | Type | Default value | Description |
 | ---- | ---- | ------------- | ----------- |
 | reportId | `number` |  |  |
-| reportParamQuery | `ReportQuery` | `undefined` |  |
+| reportParamQuery | [`ReportQuery`](../../lib/insights/diagram/models/report/reportQuery.model.ts) | undefined |  |
 
 ### Events
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
-| success | `EventEmitter<{}>` |  |
-| error | `EventEmitter<{}>` |  |
+| error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` |  |
+| success | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` |  |
diff --git a/docs/insights/analytics-report-list.component.md b/docs/insights/analytics-report-list.component.md
index 9f01f9d3c2..11764152c6 100644
--- a/docs/insights/analytics-report-list.component.md
+++ b/docs/insights/analytics-report-list.component.md
@@ -2,6 +2,7 @@
 Added: v2.0.0
 Status: Active
 ---
+
 # Activiti Analytics List Component
 
 Shows a list of all available reports
@@ -20,14 +21,14 @@ Shows a list of all available reports
 
 | Name | Type | Default value | Description |
 | ---- | ---- | ------------- | ----------- |
-| layoutType | `string` | `AnalyticsReportListComponent.LAYOUT_LIST` |  |
 | appId | `number` |  |  |
-| selectFirst | `boolean` | `false` |  |
+| layoutType | `string` |  |  |
+| selectFirst | `boolean` | false |  |
 
 ### Events
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
-| reportClick | `EventEmitter<ReportParametersModel>` |  |
-| success | `EventEmitter<{}>` |  |
-| error | `EventEmitter<{}>` |  |
+| error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` |  |
+| reportClick | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`ReportParametersModel`](../../lib/insights/diagram/models/report/reportParameters.model.ts)`>` |  |
+| success | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` |  |
diff --git a/docs/insights/analytics.component.md b/docs/insights/analytics.component.md
index 2a07229ebc..932cf031e9 100644
--- a/docs/insights/analytics.component.md
+++ b/docs/insights/analytics.component.md
@@ -2,6 +2,7 @@
 Added: v2.0.0
 Status: Active
 ---
+
 # Activiti Analytics Component
 
 Shows the charts related to the reportId passed as input
@@ -24,13 +25,13 @@ Shows the charts related to the reportId passed as input
 | Name | Type | Default value | Description |
 | ---- | ---- | ------------- | ----------- |
 | appId | `number` |  |  |
+| hideParameters | `boolean` | false |  |
 | reportId | `number` |  |  |
-| hideParameters | `boolean` | `false` |  |
 
 ### Events
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
-| editReport | `EventEmitter<{}>` |  |
-| reportSaved | `EventEmitter<{}>` |  |
-| reportDeleted | `EventEmitter<{}>` |  |
+| editReport | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` |  |
+| reportDeleted | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` |  |
+| reportSaved | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` |  |
diff --git a/docs/insights/diagram.component.md b/docs/insights/diagram.component.md
index c683e1f08b..1e9e986f4d 100644
--- a/docs/insights/diagram.component.md
+++ b/docs/insights/diagram.component.md
@@ -2,6 +2,7 @@
 Added: v2.0.0
 Status: Active
 ---
+
 # Diagram Component
 
 Displays process diagrams.
@@ -28,18 +29,19 @@ The below component shows the diagram of a running process instance with the act
 
 ### Properties
 
-| Name | Type | Description |
-| --- | --- | -- |
-| metricPercentages | any | The array that contains the percentage of time for each element |
-| processInstanceId | any | |
-| metricColor | any | The array that contains the color for each element |
-| metricType | any | The string that specifies the metric type |
-| width | number | |
-| height | number | |
+| Name | Type | Default value | Description |
+| ---- | ---- | ------------- | ----------- |
+| height | `number` | 500 |  |
+| metricColor | `any` |  |  |
+| metricPercentages | `any` |  |  |
+| metricType | `string` | "" |  |
+| processDefinitionId | `any` |  |  |
+| processInstanceId | `any` |  |  |
+| width | `number` | 1000 |  |
 
 ### Events
 
-| Name | Description |
-| --- | --- |
-| success | Raised when the diagrams elements are loaded |
-| error | Raised when an error occurs during loading |
\ No newline at end of file
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` |  |
+| success | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` |  |
diff --git a/docs/insights/widget.component.md b/docs/insights/widget.component.md
index 7ed5467de7..f4caad76f1 100644
--- a/docs/insights/widget.component.md
+++ b/docs/insights/widget.component.md
@@ -28,15 +28,14 @@ export class CustomEditorComponent extends WidgetComponent {}
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
-| field | [`FormFieldModel`](../core/form-field.model.md) |  | Data to be displayed in the field |
-| readOnly | `boolean` | false | Does the widget show a read-only value? (ie, can't be edited) |
+| ---- | ---- | ------------- | ----------- |
+| field | `any` |  | Data to be displayed in the field |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
-| fieldChanged | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`FormFieldModel`](../core/form-field.model.md)`>` | (**Deprecated:** Used only to trigger visibility engine; components should do that internally if needed)  |
+| ---- | ---- | ----------- |
+| fieldChanged | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | ( |
 
 ## Details
 
diff --git a/docs/process-services/README.md b/docs/process-services/README.md
index 5cd0bf82a7..484c106066 100644
--- a/docs/process-services/README.md
+++ b/docs/process-services/README.md
@@ -26,6 +26,7 @@ for more information about installing and using the source code.
 | [Process instance tasks component](process-instance-tasks.component.md) | Lists both the active and completed tasks associated with a particular process instance | [Source](../../lib/process-services/process-list/components/process-instance-tasks.component.ts) |
 | [Process list component](process-list.component.md) | Renders a list containing all the process instances matched by the parameters specified. | [Source](../../lib/process-services/process-list/components/process-list.component.ts) |
 | [Start process component](start-process.component.md) | Starts a process. | [Source](../../lib/process-services/process-list/components/start-process.component.ts) |
+| [Attach form component](attach-form.component.md) | This component can be used when there is no form attached to a task and we want to add one. | [Source](../../lib/process-services/task-list/components/attach-form.component.ts) |
 | [Checklist component](checklist.component.md) | Shows the checklist task functionality. | [Source](../../lib/process-services/task-list/components/checklist.component.ts) |
 | [Start task component](start-task.component.md) | Creates/Starts new task for the specified app | [Source](../../lib/process-services/task-list/components/start-task.component.ts) |
 | [Task details component](task-details.component.md) | Shows the details of the task ID passed in as input. | [Source](../../lib/process-services/task-list/components/task-details.component.ts) |
diff --git a/docs/process-services/apps-list.component.md b/docs/process-services/apps-list.component.md
index 2be1146e13..7d33ddf0d4 100644
--- a/docs/process-services/apps-list.component.md
+++ b/docs/process-services/apps-list.component.md
@@ -34,16 +34,16 @@ You can also show a custom template if there are no apps present:
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | filtersAppId | `any[]` |  | Provides a way to filter the apps to show. |
-| layoutType | `string` |  [`AppsListComponent`](../process-services/apps-list.component.md).LAYOUT_GRID | (**required**) Defines the layout of the apps. There are two possible values, "GRID" and "LIST". |
+| layoutType | `string` |  | (**required**) Defines the layout of the apps. There are two possible values, "GRID" and "LIST". |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | appClick | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`AppDefinitionRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)`>` | Emitted when an app entry is clicked. |
-| error | `EventEmitter<any>` | Emitted when an error occurs. |
+| error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when an error occurs. |
 
 ## Details
 
diff --git a/docs/process-services/attach-form.component.md b/docs/process-services/attach-form.component.md
new file mode 100644
index 0000000000..5ab0e1853c
--- /dev/null
+++ b/docs/process-services/attach-form.component.md
@@ -0,0 +1,33 @@
+---
+Added: v2.0.0
+Status: Active
+---
+
+# Attach Form component
+
+This component can be used when there is no form attached to a task and we want to add one.
+
+## Basic Usage
+
+```html
+<adf-attach-form
+    [taskId]="taskid">
+</adf-attach-form>
+```
+
+## Class members
+
+### Properties
+
+| Name | Type | Default value | Description |
+| ---- | ---- | ------------- | ----------- |
+| formKey | `any` |  |  |
+| taskId | `any` |  | Id of the task. |
+
+### Events
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| cancelAttachForm | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<void>` | Emitted when the "Cancel" button is clicked. |
+| error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` |  |
+| success | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<void>` |  |
diff --git a/docs/process-services/checklist.component.md b/docs/process-services/checklist.component.md
index db4a2a9bf0..ef4593a17d 100644
--- a/docs/process-services/checklist.component.md
+++ b/docs/process-services/checklist.component.md
@@ -22,7 +22,7 @@ Shows the checklist task functionality.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | assignee | `string` |  | (required) The assignee id that the subtasks are assigned to. |
 | readOnly | `boolean` | false | Toggle readonly state of the form. All form widgets will render as readonly if enabled. |
 | taskId | `string` |  | (required) The id of the parent task to which subtasks are attached. |
@@ -30,7 +30,7 @@ Shows the checklist task functionality.
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | checklistTaskCreated | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`>` | Emitted when a new checklist task is created. |
 | checklistTaskDeleted | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<string>` | Emitted when a checklitst task is deleted. |
-| error | `EventEmitter<any>` | Emitted when an error occurs. |
+| error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when an error occurs. |
diff --git a/docs/process-services/create-process-attachment.component.md b/docs/process-services/create-process-attachment.component.md
index 0989091b9b..c3b68bd994 100644
--- a/docs/process-services/create-process-attachment.component.md
+++ b/docs/process-services/create-process-attachment.component.md
@@ -24,12 +24,12 @@ Displays Upload Component (Drag and Click) to upload the attachment to a specifi
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | processInstanceId | `string` |  | (required) The ID of the process instance to display. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when an error occurs while creating or uploading an attachment from the user within the component. |
 | success | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when an attachment is successfully created or uploaded from within the component. |
diff --git a/docs/process-services/create-task-attachment.component.md b/docs/process-services/create-task-attachment.component.md
index f849d6887a..bb346ef5bf 100644
--- a/docs/process-services/create-task-attachment.component.md
+++ b/docs/process-services/create-task-attachment.component.md
@@ -24,12 +24,12 @@ Displays Upload Component (Drag and Click) to upload the attachment to a specifi
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | taskId | `string` |  | (required) The numeric ID of the task to display. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when an error occurs while creating or uploading an  attachment from the user within the component. |
 | success | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when an attachment is created or uploaded successfully from within the component. |
diff --git a/docs/process-services/people-list.component.md b/docs/process-services/people-list.component.md
index 6f22a54e56..fa6324e6c7 100644
--- a/docs/process-services/people-list.component.md
+++ b/docs/process-services/people-list.component.md
@@ -77,13 +77,13 @@ Note that the [people list component](../process-services/people-list.component.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | actions | `boolean` | false | Toggles whether or not actions should be visible, i.e. the 'Three-Dots' menu. |
 | users | [`UserProcessModel`](../core/user-process.model.md)`[]` |  | The array of user data used to populate the people list. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | clickAction | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`UserEventModel`](../../lib/process-services/task-list/models/user-event.model.ts)`>` | Emitted when the user clicks in the 'Three Dots' drop down menu for a row. |
-| clickRow | `EventEmitter<UserProcessModel>` | Emitted when the user clicks a row in the people list. |
+| clickRow | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`UserProcessModel`](../core/user-process.model.md)`>` | Emitted when the user clicks a row in the people list. |
diff --git a/docs/process-services/people-search.component.md b/docs/process-services/people-search.component.md
index bced56f42d..dc2e5b0e36 100644
--- a/docs/process-services/people-search.component.md
+++ b/docs/process-services/people-search.component.md
@@ -18,16 +18,16 @@ Searches users/people.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | results | [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`UserProcessModel`](../core/user-process.model.md)`[]>` |  | Parameters for displaying the list. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | closeSearch | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` | Emitted when the "close" button is clicked. |
 | searchPeople | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when a search is performed with a new keyword. |
-| success | `EventEmitter<UserProcessModel>` | Emitted when a user is selected and the action button is clicked. |
+| success | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`UserProcessModel`](../core/user-process.model.md)`>` | Emitted when a user is selected and the action button is clicked. |
 
 ## Details
 
diff --git a/docs/process-services/people.component.md b/docs/process-services/people.component.md
index 957acd0826..6028d15a37 100644
--- a/docs/process-services/people.component.md
+++ b/docs/process-services/people.component.md
@@ -12,13 +12,9 @@ Displays users involved with a specified task
 ## Contents
 
 -   [Basic Usage](#basic-usage)
-
 -   [Class members](#class-members)
-
     -   [Properties](#properties)
-
 -   [Details](#details)
-
     -   [How to customize the people component behavior](#how-to-customize-the-people-component-behavior)
     -   [Involve People single click and close search](#involve-people-single-click-and-close-search)
     -   [Involve People single click without close search](#involve-people-single-click-without-close-search)
@@ -40,8 +36,8 @@ Displays users involved with a specified task
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
-| people | [`UserProcessModel`](../core/user-process.model.md)`[]` |  \[] | The array of User objects to display. |
+| ---- | ---- | ------------- | ----------- |
+| people | [`UserProcessModel`](../core/user-process.model.md)`[]` | \[] | The array of User objects to display. |
 | readOnly | `boolean` | false | Should the data be read-only? |
 | taskId | `string` | "" | The numeric ID of the task. |
 
diff --git a/docs/process-services/process-attachment-list.component.md b/docs/process-services/process-attachment-list.component.md
index de7b6d4c9b..76599a0bb3 100644
--- a/docs/process-services/process-attachment-list.component.md
+++ b/docs/process-services/process-attachment-list.component.md
@@ -41,17 +41,17 @@ export class MyCustomProcessAttachmentComponent {
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | disabled | `boolean` | false | Disable/Enable read-only mode for attachment list. |
 | processInstanceId | `string` |  | (**required**) The ID of the process instance to display. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
-| attachmentClick | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` | Emitted when the attachment is double-clicked or the view option is selected from the context menu by the user from within the component. Returns a [`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob) representing the object that was clicked. |
+| ---- | ---- | ----------- |
+| attachmentClick | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` | Emitted when the attachment is double-clicked or the view option is selected from the context menu by the user from within the component. Returns a [Blob](https://developer.mozilla.org/en-US/docs/Web/API/Blob) representing the object that was clicked. |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when the attachment list is not able to fetch the attachments (eg, following a network error). |
-| success | `EventEmitter<Object>` | Emitted when the attachment list has fetched all the attachments. Returns a list of attachments. |
+| success | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` | Emitted when the attachment list has fetched all the attachments. Returns a list of attachments. |
 
 ## Details
 
diff --git a/docs/process-services/process-audit.directive.md b/docs/process-services/process-audit.directive.md
index 51ede51907..77938b21dd 100644
--- a/docs/process-services/process-audit.directive.md
+++ b/docs/process-services/process-audit.directive.md
@@ -27,15 +27,15 @@ Fetches the Process Audit information the PDF or JSON format.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | download | `boolean` | true | Enables downloading of the audit file on clicking. |
 | fileName | `string` | "Audit" | Name of the file to download (for PDF downloads). |
 | format | `string` | "pdf" | Format for the audit information (can be "pdf" or "json"). |
-| process-id | `string` |  | ID of the process. |
+| processId | `string` |  | ID of the process. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | clicked | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when the decorated element is clicked. |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when an error occurs. |
diff --git a/docs/process-services/process-comments.component.md b/docs/process-services/process-comments.component.md
index 231b763a0b..b7fc37b0bf 100644
--- a/docs/process-services/process-comments.component.md
+++ b/docs/process-services/process-comments.component.md
@@ -20,12 +20,12 @@ Displays comments associated with a particular process instance and allows the u
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | processInstanceId | `string` |  | (**required**) The numeric ID of the process instance to display comments for. |
 | readOnly | `boolean` | true | Should the comments be read-only? |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when an error occurs. |
diff --git a/docs/process-services/process-filter.service.md b/docs/process-services/process-filter.service.md
index ab52e3f6fb..c7946926f5 100644
--- a/docs/process-services/process-filter.service.md
+++ b/docs/process-services/process-filter.service.md
@@ -12,33 +12,33 @@ Manage Process Filters, which are pre-configured Process Instance queries.
 
 ### Methods
 
--   **addProcessFilter**(filter: [`FilterProcessRepresentationModel`](../../lib/process-services/process-list/models/filter-process.model.ts) = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../lib/process-services/process-list/models/filter-process.model.ts)`>`<br/>
+-   **addProcessFilter**(filter: [`FilterProcessRepresentationModel`](../../lib/process-services/process-list/models/filter-process.model.ts)): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../lib/process-services/process-list/models/filter-process.model.ts)`>`<br/>
     Adds a filter.
     -   _filter:_ [`FilterProcessRepresentationModel`](../../lib/process-services/process-list/models/filter-process.model.ts)  - The filter to add
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../lib/process-services/process-list/models/filter-process.model.ts)`>` - The filter just added
--   **callApiProcessFilters**(appId?: `number` = `null`): `Promise<any>`<br/>
+-   **callApiProcessFilters**(appId?: `number`): [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises)`<any>`<br/>
     Calls `getUserProcessInstanceFilters` from the Alfresco JS API.
     -   _appId:_ `number`  - (Optional) ID of the target app
-    -   **Returns** `Promise<any>` - List of filter details
--   **createDefaultFilters**(appId: `number` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../lib/process-services/process-list/models/filter-process.model.ts)`[]>`<br/>
+    -   **Returns** [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises)`<any>` - List of filter details
+-   **createDefaultFilters**(appId: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../lib/process-services/process-list/models/filter-process.model.ts)`[]>`<br/>
     Creates and returns the default filters for an app.
     -   _appId:_ `number`  - ID of the target app
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../lib/process-services/process-list/models/filter-process.model.ts)`[]>` - Default filters just created
--   **getProcessFilterById**(filterId: `number` = `null`, appId?: `number` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../lib/process-services/process-list/models/filter-process.model.ts)`>`<br/>
+-   **getProcessFilterById**(filterId: `number`, appId?: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../lib/process-services/process-list/models/filter-process.model.ts)`>`<br/>
     Retrieves the process filter by ID.
     -   _filterId:_ `number`  - ID of the filter
     -   _appId:_ `number`  - (Optional) ID of the target app
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../lib/process-services/process-list/models/filter-process.model.ts)`>` - Details of the filter
--   **getProcessFilterByName**(filterName: `string` = `null`, appId?: `number` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../lib/process-services/process-list/models/filter-process.model.ts)`>`<br/>
+-   **getProcessFilterByName**(filterName: `string`, appId?: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../lib/process-services/process-list/models/filter-process.model.ts)`>`<br/>
     Retrieves the process filter by name.
     -   _filterName:_ `string`  - Name of the filter
     -   _appId:_ `number`  - (Optional) ID of the target app
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../lib/process-services/process-list/models/filter-process.model.ts)`>` - Details of the filter
--   **getProcessFilters**(appId: `number` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../lib/process-services/process-list/models/filter-process.model.ts)`[]>`<br/>
+-   **getProcessFilters**(appId: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../lib/process-services/process-list/models/filter-process.model.ts)`[]>`<br/>
     Gets all filters defined for a Process App.
     -   _appId:_ `number`  - ID of the target app
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../lib/process-services/process-list/models/filter-process.model.ts)`[]>` - Array of filter details
--   **getRunningFilterInstance**(appId: `number` = `null`): [`FilterProcessRepresentationModel`](../../lib/process-services/process-list/models/filter-process.model.ts)<br/>
+-   **getRunningFilterInstance**(appId: `number`): [`FilterProcessRepresentationModel`](../../lib/process-services/process-list/models/filter-process.model.ts)<br/>
     Creates and returns a filter that matches "running" process instances.
     -   _appId:_ `number`  - ID of the target app
     -   **Returns** [`FilterProcessRepresentationModel`](../../lib/process-services/process-list/models/filter-process.model.ts) - Filter just created
diff --git a/docs/process-services/process-filters.component.md b/docs/process-services/process-filters.component.md
index 14b2b83a14..6c61341173 100644
--- a/docs/process-services/process-filters.component.md
+++ b/docs/process-services/process-filters.component.md
@@ -10,18 +10,13 @@ Collection of criteria used to filter process instances, which may be customized
 ## Contents
 
 -   [Basic Usage](#basic-usage)
-
 -   [Class members](#class-members)
-
     -   [Properties](#properties)
     -   [Events](#events)
-
 -   [Details](#details)
-
     -   [How filter the activiti process filters](#how-filter-the-activiti-process-filters)
     -   [FilterParamsModel](#filterparamsmodel)
     -   [How to create an accordion menu with the processes filter](#how-to-create-an-accordion-menu-with-the-processes-filter)
-
 -   [See also](#see-also)
 
 ## Basic Usage
@@ -37,7 +32,7 @@ Collection of criteria used to filter process instances, which may be customized
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | appId | `number` |  | Display filters available to the current user for the application with the specified ID. |
 | appName | `string` |  | Display filters available to the current user for the application with the specified name. |
 | filterParam | [`FilterProcessRepresentationModel`](../../lib/process-services/process-list/models/filter-process.model.ts) |  | The parameters to filter the task filter. If there is no match then the default one (ie, the first filter in the list) is selected. |
@@ -46,10 +41,10 @@ Collection of criteria used to filter process instances, which may be customized
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when an error occurs. |
-| filterClick | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`ProcessInstanceFilterRepresentation`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-activiti-rest-api/docs/ProcessInstanceFilterRepresentation.md)`>` | Emitted when the user selects a filter from the list. |
-| success | `EventEmitter<ProcessInstanceFilterRepresentation[]>` | Emitted when the list of filters has been successfully loaded from the server. |
+| filterClick | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<ProcessInstanceFilterRepresentation>` | Emitted when the user selects a filter from the list. |
+| success | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<ProcessInstanceFilterRepresentation[]>` | Emitted when the list of filters has been successfully loaded from the server. |
 
 ## Details
 
diff --git a/docs/process-services/process-instance-details.component.md b/docs/process-services/process-instance-details.component.md
index 3eb0c160f4..e8cb5dbbb5 100644
--- a/docs/process-services/process-instance-details.component.md
+++ b/docs/process-services/process-instance-details.component.md
@@ -20,7 +20,7 @@ Displays detailed information on a specified process instance
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | processInstanceId | `string` |  | (required) The numeric ID of the process instance to display. |
 | showRefreshButton | `boolean` | true | Toggles whether to show or hide the refresh button. |
 | showTitle | `boolean` | true | Toggles whether to show or hide the title. |
@@ -28,8 +28,8 @@ Displays detailed information on a specified process instance
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when an error occurs. |
 | processCancelled | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when the current process is cancelled by the user from within the component. |
 | showProcessDiagram | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when the "show diagram" button is clicked. |
-| taskClick | `EventEmitter<TaskDetailsEvent>` | Emitted when a task is clicked. |
+| taskClick | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`TaskDetailsEvent`](../../lib/process-services/task-list/models/task-details.event.ts)`>` | Emitted when a task is clicked. |
diff --git a/docs/process-services/process-instance-header.component.md b/docs/process-services/process-instance-header.component.md
index bf6bf6ce8d..3fee21cdc3 100644
--- a/docs/process-services/process-instance-header.component.md
+++ b/docs/process-services/process-instance-header.component.md
@@ -23,7 +23,7 @@ Sub-component of the process details component, which renders some general infor
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | processInstance | [`ProcessInstance`](../../lib/process-services/process-list/models/process-instance.model.ts) |  | (**required**) Full details of the process instance to display information about. |
 
 ## Details
@@ -44,4 +44,4 @@ The configuration looks like the following sample:
     }
 ```
 
-Only the items in the `properties` array will be displayed.
\ No newline at end of file
+Only the items in the `properties` array will be displayed.
diff --git a/docs/process-services/process-instance-tasks.component.md b/docs/process-services/process-instance-tasks.component.md
index 9f9e49c208..0be85ec716 100644
--- a/docs/process-services/process-instance-tasks.component.md
+++ b/docs/process-services/process-instance-tasks.component.md
@@ -21,13 +21,13 @@ Lists both the active and completed tasks associated with a particular process i
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | processInstanceDetails | [`ProcessInstance`](../../lib/process-services/process-list/models/process-instance.model.ts) |  | (**required**) The ID of the process instance to display tasks for. |
 | showRefreshButton | `boolean` | true | Toggles whether to show a refresh button next to the list of tasks to allow it to be updated from the server. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when an error occurs. |
 | taskClick | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`TaskDetailsEvent`](../../lib/process-services/task-list/models/task-details.event.ts)`>` | Emitted when a task is clicked. |
diff --git a/docs/process-services/process-list.component.md b/docs/process-services/process-list.component.md
index a7b42b8a60..a2913414e2 100644
--- a/docs/process-services/process-list.component.md
+++ b/docs/process-services/process-list.component.md
@@ -11,23 +11,18 @@ Renders a list containing all the process instances matched by the parameters sp
 ## Contents
 
 -   [Basic Usage](#basic-usage)
-
 -   [Class members](#class-members)
-
     -   [Properties](#properties)
     -   [Events](#events)
-
 -   [Details](#details)
-
     -   [Setting Sorting Order for the list](#setting-sorting-order-for-the-list)
     -   [Pagination strategy](#pagination-strategy)
     -   [Show custom template when processList is empty](#show-custom-template-when-processlist-is-empty)
-
 -   [See also](#see-also)
 
 ## Basic Usage
 
-**app.component.html**
+**[app.component](../../demo-shell/src/app/app.component.ts).html**
 
 ```html
 <adf-process-instance-list
@@ -41,27 +36,27 @@ Renders a list containing all the process instances matched by the parameters sp
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | appId | `number` |  | The id of the app. |
-| data | [`DataTableAdapter`](../../lib/core/datatable/data/datatable-adapter.ts) |  | Data source to define the datatable. |
+| data | `DataTableAdapter` |  | Data source to define the datatable. |
 | multiselect | `boolean` | false | Toggles multiple row selection, which renders checkboxes at the beginning of each row |
-| name | `string` |  | The name of the list. |
 | page | `number` | 0 | The page number of the processes to fetch. |
-| presetColumn | `string` |  | Name of a custom schema to fetch from `app.config.json`. |
-| processDefinitionKey | `string` |  | The processDefinitionKey of the process. |
+| processDefinitionId | `string` |  | The Definition Id of the process. |
+| processDefinitionKey | `string` |  | (**Deprecated:** 2.4.0) The Definition Key of the process. |
+| processInstanceId | `number \| string` |  | The id of the process instance. |
 | selectFirstRow | `boolean` | true | Toggles default selection of the first row |
 | selectionMode | `string` | "single" | Row selection mode. Can be none, `single` or `multiple`. For `multiple` mode, you can use Cmd (macOS) or Ctrl (Win) modifier key to toggle selection for multiple rows. |
-| size | `number` |  [`PaginationComponent`](../core/pagination.component.md).DEFAULT_PAGINATION.maxItems | The number of processes to fetch in each page. |
+| size | `number` |  | The number of processes to fetch in each page. |
 | sort | `string` |  | Defines the sort ordering of the list. Possible values are `created-desc`, `created-asc`, `ended-desc`, `ended-asc`. |
 | state | `string` |  | Defines the state of the processes. Possible values are `running`, `completed` and `all` |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when an error occurs while loading the list of process instances from the server. |
 | rowClick | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<string>` | Emitted when a row in the process list is clicked. |
-| success | `EventEmitter<ProcessListModel>` | Emitted when the list of process instances has been loaded successfully from the server. |
+| success | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<ProcessListModel>` | Emitted when the list of process instances has been loaded successfully from the server. |
 
 ## Details
 
diff --git a/docs/process-services/process.service.md b/docs/process-services/process.service.md
index dd65a3439d..525f909f0f 100644
--- a/docs/process-services/process.service.md
+++ b/docs/process-services/process.service.md
@@ -12,56 +12,56 @@ Manages Process Instances, Process Variables, and Process Audit Log.
 
 ### Methods
 
--   **cancelProcess**(processInstanceId: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<void>`<br/>
+-   **cancelProcess**(processInstanceId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<void>`<br/>
     Cancels a process instance.
     -   _processInstanceId:_ `string`  - ID of process to cancel
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<void>` - Null response notifying when the operation is complete
--   **createOrUpdateProcessInstanceVariables**(processInstanceId: `string` = `null`, variables: [`ProcessInstanceVariable`](../../lib/process-services/process-list/models/process-instance-variable.model.ts)`[]` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessInstanceVariable`](../../lib/process-services/process-list/models/process-instance-variable.model.ts)`[]>`<br/>
+-   **createOrUpdateProcessInstanceVariables**(processInstanceId: `string`, variables: [`ProcessInstanceVariable`](../../lib/process-services/process-list/models/process-instance-variable.model.ts)`[]`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessInstanceVariable`](../../lib/process-services/process-list/models/process-instance-variable.model.ts)`[]>`<br/>
     Creates or updates variables for a process instance.
     -   _processInstanceId:_ `string`  - ID of the target process
     -   _variables:_ [`ProcessInstanceVariable`](../../lib/process-services/process-list/models/process-instance-variable.model.ts)`[]`  - Variables to update
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessInstanceVariable`](../../lib/process-services/process-list/models/process-instance-variable.model.ts)`[]>` - Array of instance variable info
--   **deleteProcessInstanceVariable**(processInstanceId: `string` = `null`, variableName: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<void>`<br/>
+-   **deleteProcessInstanceVariable**(processInstanceId: `string`, variableName: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<void>`<br/>
     Deletes a variable for a process instance.
     -   _processInstanceId:_ `string`  - ID of the target process
     -   _variableName:_ `string`  - Name of the variable to delete
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<void>` - Null response notifying when the operation is complete
--   **fetchProcessAuditJsonById**(processId: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
+-   **fetchProcessAuditJsonById**(processId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
     Fetches the Process Audit information in a JSON format.
     -   _processId:_ `string`  - ID of the target process
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<any>` - JSON data
--   **fetchProcessAuditPdfById**(processId: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob)`>`<br/>
+-   **fetchProcessAuditPdfById**(processId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob)`>`<br/>
     Fetches the Process Audit information as a PDF.
     -   _processId:_ `string`  - ID of the target process
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob)`>` - Binary PDF data
--   **getProcess**(processInstanceId: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessInstance`](../../lib/process-services/process-list/models/process-instance.model.ts)`>`<br/>
+-   **getProcess**(processInstanceId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessInstance`](../../lib/process-services/process-list/models/process-instance.model.ts)`>`<br/>
     Gets Process Instance metadata.
     -   _processInstanceId:_ `string`  - ID of the target process
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessInstance`](../../lib/process-services/process-list/models/process-instance.model.ts)`>` - Metadata for the instance
--   **getProcessDefinitions**(appId?: `number` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessDefinitionRepresentation`](../../lib/process-services/process-list/models/process-definition.model.ts)`[]>`<br/>
+-   **getProcessDefinitions**(appId?: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessDefinitionRepresentation`](../../lib/process-services/process-list/models/process-definition.model.ts)`[]>`<br/>
     Gets process definitions associated with an app.
     -   _appId:_ `number`  - (Optional) ID of a target app
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessDefinitionRepresentation`](../../lib/process-services/process-list/models/process-definition.model.ts)`[]>` - Array of process definitions
--   **getProcessInstanceVariables**(processInstanceId: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessInstanceVariable`](../../lib/process-services/process-list/models/process-instance-variable.model.ts)`[]>`<br/>
+-   **getProcessInstanceVariables**(processInstanceId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessInstanceVariable`](../../lib/process-services/process-list/models/process-instance-variable.model.ts)`[]>`<br/>
     Gets the variables for a process instance.
     -   _processInstanceId:_ `string`  - ID of the target process
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessInstanceVariable`](../../lib/process-services/process-list/models/process-instance-variable.model.ts)`[]>` - Array of instance variable info
--   **getProcessInstances**(requestNode: [`ProcessFilterParamRepresentationModel`](../../lib/process-services/process-list/models/filter-process.model.ts) = `null`, processDefinitionKey?: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessListModel`](../../lib/process-services/process-list/models/process-list.model.ts)`>`<br/>
+-   **getProcessInstances**(requestNode: [`ProcessFilterParamRepresentationModel`](../../lib/process-services/process-list/models/filter-process.model.ts), processDefinitionKey?: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<ProcessListModel>`<br/>
     Gets process instances for a filter and optionally a process definition.
     -   _requestNode:_ [`ProcessFilterParamRepresentationModel`](../../lib/process-services/process-list/models/filter-process.model.ts)  - Filter for instances
     -   _processDefinitionKey:_ `string`  - (Optional) Limits returned instances to a process definition
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessListModel`](../../lib/process-services/process-list/models/process-list.model.ts)`>` - List of process instances
--   **getProcessTasks**(processInstanceId: `string` = `null`, state?: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`[]>`<br/>
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<ProcessListModel>` - List of process instances
+-   **getProcessTasks**(processInstanceId: `string`, state?: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`[]>`<br/>
     Gets task instances for a process instance.
     -   _processInstanceId:_ `string`  - ID of the process instance
     -   _state:_ `string`  - (Optional) Task state filter (can be "active" or "completed")
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`[]>` - Array of task instance details
--   **startProcess**(processDefinitionId: `string` = `null`, name: `string` = `null`, outcome?: `string` = `null`, startFormValues?: [`FormValues`](../../lib/core/form/components/widgets/core/form-values.ts) = `null`, variables?: [`ProcessInstanceVariable`](../../lib/process-services/process-list/models/process-instance-variable.model.ts)`[]` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessInstance`](../../lib/process-services/process-list/models/process-instance.model.ts)`>`<br/>
+-   **startProcess**(processDefinitionId: `string`, name: `string`, outcome?: `string`, startFormValues?: `FormValues`, variables?: [`ProcessInstanceVariable`](../../lib/process-services/process-list/models/process-instance-variable.model.ts)`[]`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessInstance`](../../lib/process-services/process-list/models/process-instance.model.ts)`>`<br/>
     Starts a process based on a process definition, name, form values or variables.
     -   _processDefinitionId:_ `string`  - Process definition ID
     -   _name:_ `string`  - Process name
     -   _outcome:_ `string`  - (Optional) Process outcome
-    -   _startFormValues:_ [`FormValues`](../../lib/core/form/components/widgets/core/form-values.ts)  - (Optional) Values for the start form
+    -   _startFormValues:_ `FormValues`  - (Optional) Values for the start form
     -   _variables:_ [`ProcessInstanceVariable`](../../lib/process-services/process-list/models/process-instance-variable.model.ts)`[]`  - (Optional) Array of process instance variables
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessInstance`](../../lib/process-services/process-list/models/process-instance.model.ts)`>` - Details of the process instance just started
 
diff --git a/docs/process-services/start-process.component.md b/docs/process-services/start-process.component.md
index b6a9e37643..8840f6bcb8 100644
--- a/docs/process-services/start-process.component.md
+++ b/docs/process-services/start-process.component.md
@@ -13,19 +13,14 @@ Starts a process.
 ## Contents
 
 -   [Basic Usage](#basic-usage)
-
 -   [Class members](#class-members)
-
     -   [Properties](#properties)
     -   [Events](#events)
-
 -   [Details](#details)
-
     -   [Starting a process with a default name and pre-selected process definition name](#starting-a-process-with-a-default-name-and-pre-selected-process-definition-name)
     -   [Starting a process not included in an app](#starting-a-process-not-included-in-an-app)
     -   [Custom data example](#custom-data-example)
     -   [Attaching a File to the start form of the process](#attaching-a-file-to-the-start-form-of-the-process)
-
 -   [See also](#see-also)
 
 ## Basic Usage
diff --git a/docs/process-services/start-task.component.md b/docs/process-services/start-task.component.md
index b8d78b2291..f37b154000 100644
--- a/docs/process-services/start-task.component.md
+++ b/docs/process-services/start-task.component.md
@@ -22,13 +22,13 @@ Creates/Starts new task for the specified app
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | appId | `number` |  | (required) The id of the app. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | cancel | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<void>` | Emitted when the cancel button is clicked by the user. |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when an error occurs. |
-| success | `EventEmitter<any>` | Emitted when the task is successfully created. |
+| success | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when the task is successfully created. |
diff --git a/docs/process-services/task-attachment-list.component.md b/docs/process-services/task-attachment-list.component.md
index b1821017df..1072b0a10a 100644
--- a/docs/process-services/task-attachment-list.component.md
+++ b/docs/process-services/task-attachment-list.component.md
@@ -24,17 +24,17 @@ Displays attached documents on a specified task.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | disabled | `boolean` | false | Disable/Enable read only mode for attachement list. |
 | taskId | `string` |  | (**required**) The ID of the task to display. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
-| attachmentClick | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` | Emitted when the attachment is double-clicked or a view option is selected from the context menu by the user from within the component. Returns a [`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob) representing the clicked object. |
+| ---- | ---- | ----------- |
+| attachmentClick | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` | Emitted when the attachment is double-clicked or a view option is selected from the context menu by the user from within the component. Returns a [Blob](https://developer.mozilla.org/en-US/docs/Web/API/Blob) representing the clicked object. |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when an error occurs while fetching the attachments. |
-| success | `EventEmitter<Object>` | Emitted when the attachment list has fetched all the attachments. Returns a list of attachments. |
+| success | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<Object>` | Emitted when the attachment list has fetched all the attachments. Returns a list of attachments. |
 
 ## Details
 
diff --git a/docs/process-services/task-audit.directive.md b/docs/process-services/task-audit.directive.md
index e97d549cae..f6b60bedde 100644
--- a/docs/process-services/task-audit.directive.md
+++ b/docs/process-services/task-audit.directive.md
@@ -26,15 +26,15 @@ Fetches the Task Audit information in PDF or JSON format.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | download | `boolean` | true | Enables downloading of the audit when the decorated element is clicked. |
 | fileName | `string` | "Audit" | Name of the downloaded file (for PDF downloads). |
 | format | `string` | "pdf" | Format of the audit information. Can be "pdf" or "json". |
-| task-id | `string` |  | (**required**) The id of the task. |
+| taskId | `string` |  | (**required**) The id of the task. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | clicked | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when the decorated element is clicked. |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when an error occurs. |
diff --git a/docs/process-services/task-details.component.md b/docs/process-services/task-details.component.md
index 72fd58c8a3..4b9c1e6849 100644
--- a/docs/process-services/task-details.component.md
+++ b/docs/process-services/task-details.component.md
@@ -21,16 +21,16 @@ Shows the details of the task ID passed in as input.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | debugMode | `boolean` | false | Toggles debug mode. |
-| fieldValidators | [`FormFieldValidator`](../../lib/core/form/components/widgets/core/form-field-validator.ts)`[]` |  \[] | Field validators for use with the form. |
+| fieldValidators | `FormFieldValidator[]` | \[] | Field validators for use with the form. |
 | readOnlyForm | `boolean` | false | Toggles read-only state of the form. All form widgets render as read-only if enabled. |
 | showChecklist | `boolean` | true | Toggles `Checklist` feature for the Header component. |
 | showComments | `boolean` | true | Toggles `Comments` feature for the Header component. |
 | showFormCompleteButton | `boolean` | true | Toggles rendering of the `Complete` outcome button. |
 | showFormRefreshButton | `boolean` | true | Toggles rendering of the `Refresh` button. |
 | showFormSaveButton | `boolean` | true | Toggles rendering of the `Save` outcome button. |
-| showFormTitle | `boolean` | true | Toggles rendering of the form title. |
+| showFormTitle | `boolean` | false | Toggles rendering of the form title. |
 | showHeader | `boolean` | true | Toggles task details Header component. |
 | showHeaderContent | `boolean` | true | Toggles collapsed/expanded state of the Header component. |
 | showInvolvePeople | `boolean` | true | Toggles `Involve People` feature for the Header component. |
@@ -40,18 +40,18 @@ Shows the details of the task ID passed in as input.
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | assignTask | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<void>` | Emitted when a task is assigned. |
 | claimedTask | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<string>` | Emitted when a task is claimed. |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when an error occurs. |
 | executeOutcome | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`FormOutcomeEvent`](../../lib/core/form/components/widgets/core/form-outcome-event.model.ts)`>` | Emitted when any outcome is executed. Default behaviour can be prevented via `event.preventDefault()`. |
 | formCompleted | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`FormModel`](../../lib/core/form/components/widgets/core/form.model.ts)`>` | Emitted when the form is submitted with the `Complete` outcome. |
 | formContentClicked | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`ContentLinkModel`](../../lib/core/form/components/widgets/core/content-link.model.ts)`>` | Emitted when the form field content is clicked. |
-| formLoaded | `EventEmitter<FormModel>` | Emitted when the form is loaded or reloaded. |
-| formSaved | `EventEmitter<FormModel>` | Emitted when the form is submitted with the `Save` or custom outcomes. |
-| taskCreated | `EventEmitter<TaskDetailsModel>` | Emitted when a checklist task is created. |
-| taskDeleted | `EventEmitter<string>` | Emitted when a checklist task is deleted. |
-| unClaimedTask | `EventEmitter<string>` | Emitted when a task is unclaimed. |
+| formLoaded | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`FormModel`](../../lib/core/form/components/widgets/core/form.model.ts)`>` | Emitted when the form is loaded or reloaded. |
+| formSaved | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`FormModel`](../../lib/core/form/components/widgets/core/form.model.ts)`>` | Emitted when the form is submitted with the `Save` or custom outcomes. |
+| taskCreated | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`>` | Emitted when a checklist task is created. |
+| taskDeleted | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<string>` | Emitted when a checklist task is deleted. |
+| unClaimedTask | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<string>` | Emitted when a task is unclaimed. |
 
 ## Details
 
diff --git a/docs/process-services/task-filter.service.md b/docs/process-services/task-filter.service.md
index da876451b2..9e2e02abf3 100644
--- a/docs/process-services/task-filter.service.md
+++ b/docs/process-services/task-filter.service.md
@@ -12,45 +12,45 @@ Manage Task Filters, which are pre-configured Task Instance queries.
 
 ### Methods
 
--   **addFilter**(filter: [`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts) = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)`>`<br/>
+-   **addFilter**(filter: [`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)`>`<br/>
     Adds a new task filter
     -   _filter:_ [`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)  - The new filter to add
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)`>` - Details of task filter just added
--   **callApiTaskFilters**(appId?: `number` = `null`): `Promise<any>`<br/>
+-   **callApiTaskFilters**(appId?: `number`): [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises)`<any>`<br/>
     Calls `getUserTaskFilters` from the Alfresco JS API.
     -   _appId:_ `number`  - (Optional) ID of the target app
-    -   **Returns** `Promise<any>` - List of task filters
--   **createDefaultFilters**(appId: `number` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)`[]>`<br/>
+    -   **Returns** [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises)`<any>` - List of task filters
+-   **createDefaultFilters**(appId: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)`[]>`<br/>
     Creates and returns the default filters for a process app.
     -   _appId:_ `number`  - ID of the target app
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)`[]>` - Array of default filters just created
--   **getCompletedTasksFilterInstance**(appId: `number` = `null`): [`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)<br/>
+-   **getCompletedTasksFilterInstance**(appId: `number`): [`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)<br/>
     Creates and returns a filter for "Completed" task instances.
     -   _appId:_ `number`  - ID of the target app
     -   **Returns** [`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts) - The newly created filter
--   **getInvolvedTasksFilterInstance**(appId: `number` = `null`): [`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)<br/>
+-   **getInvolvedTasksFilterInstance**(appId: `number`): [`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)<br/>
     Creates and returns a filter for "Involved" task instances.
     -   _appId:_ `number`  - ID of the target app
     -   **Returns** [`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts) - The newly created filter
--   **getMyTasksFilterInstance**(appId: `number` = `null`): [`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)<br/>
+-   **getMyTasksFilterInstance**(appId: `number`): [`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)<br/>
     Creates and returns a filter for "My Tasks" task instances.
     -   _appId:_ `number`  - ID of the target app
     -   **Returns** [`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts) - The newly created filter
--   **getQueuedTasksFilterInstance**(appId: `number` = `null`): [`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)<br/>
+-   **getQueuedTasksFilterInstance**(appId: `number`): [`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)<br/>
     Creates and returns a filter for "Queued Tasks" task instances.
     -   _appId:_ `number`  - ID of the target app
     -   **Returns** [`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts) - The newly created filter
--   **getTaskFilterById**(filterId: `number` = `null`, appId?: `number` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)`>`<br/>
+-   **getTaskFilterById**(filterId: `number`, appId?: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)`>`<br/>
     Gets a task filter by ID.
     -   _filterId:_ `number`  - ID of the filter
     -   _appId:_ `number`  - (Optional) ID of the app for the filter
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)`>` - Details of task filter
--   **getTaskFilterByName**(taskName: `string` = `null`, appId?: `number` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)`>`<br/>
+-   **getTaskFilterByName**(taskName: `string`, appId?: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)`>`<br/>
     Gets a task filter by name.
     -   _taskName:_ `string`  - Name of the filter
     -   _appId:_ `number`  - (Optional) ID of the app for the filter
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)`>` - Details of task filter
--   **getTaskListFilters**(appId?: `number` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)`[]>`<br/>
+-   **getTaskListFilters**(appId?: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)`[]>`<br/>
     Gets all task filters for a process app.
     -   _appId:_ `number`  - (Optional) Optional ID for a specific app
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)`[]>` - Array of task filter details
diff --git a/docs/process-services/task-filters.component.md b/docs/process-services/task-filters.component.md
index d89e387c90..67bb4ba9fd 100644
--- a/docs/process-services/task-filters.component.md
+++ b/docs/process-services/task-filters.component.md
@@ -8,6 +8,17 @@ Last reviewed: 2018-06-07
 
 Shows all available filters.
 
+## Contents
+
+-   [Basic Usage](#basic-usage)
+-   [Class members](#class-members)
+    -   [Properties](#properties)
+    -   [Events](#events)
+-   [Details](#details)
+    -   [Filtering APS task filters](#filtering-aps-task-filters)
+    -   [How to create an accordion menu with the task filter](#how-to-create-an-accordion-menu-with-the-task-filter)
+-   [See also](#see-also)
+
 ## Basic Usage
 
 ```html
@@ -19,7 +30,7 @@ Shows all available filters.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | appId | `number` |  | Display filters available to the current user for the application with the specified ID. |
 | appName | `string` |  | Display filters available to the current user for the application with the specified name. |
 | filterParam | [`FilterParamsModel`](../../lib/process-services/task-list/models/filter.model.ts) |  | Parameters to use for the task filter. If there is no match then the default filter (the first one the list) is selected. |
@@ -28,10 +39,10 @@ Shows all available filters.
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when an error occurs during loading. |
 | filterClick | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)`>` | Emitted when a filter in the list is clicked. |
-| success | `EventEmitter<any>` | Emitted when the list is loaded. |
+| success | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when the list is loaded. |
 
 ## Details
 
@@ -48,7 +59,6 @@ Use the `filterParam` property to restrict the range of filters that are shown:
 You can use properties from [`FilterParamsModel`](../../lib/process-services/task-list/models/filter.model.ts)
 as the value of `filterParam` as shown in the table below:
 
-
 | Name | Type | Description |
 | ---- | ---- | ----------- |
 | id | string | The id of the task filter |
diff --git a/docs/process-services/task-header.component.md b/docs/process-services/task-header.component.md
index 4fb2d6e1fd..b01237e32c 100644
--- a/docs/process-services/task-header.component.md
+++ b/docs/process-services/task-header.component.md
@@ -23,14 +23,14 @@ Shows all the information related to a task.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
-| formName | `string` |  null | The name of the form. |
+| ---- | ---- | ------------- | ----------- |
+| formName | `string` | null | The name of the form. |
 | taskDetails | [`TaskDetailsModel`](../process-services/task-details.model.md) |  | (required) Details related to the task. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | claim | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when the task is claimed. |
 | unclaim | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when the task is unclaimed (ie, requeued). |
 
diff --git a/docs/process-services/task-list.component.md b/docs/process-services/task-list.component.md
index f60d3add2d..2f6d9d5844 100644
--- a/docs/process-services/task-list.component.md
+++ b/docs/process-services/task-list.component.md
@@ -11,21 +11,16 @@ Renders a list containing all the tasks matched by the parameters specified.
 ## Contents
 
 -   [Basic Usage](#basic-usage)
-
 -   [Class members](#class-members)
-
     -   [Properties](#properties)
     -   [Events](#events)
-
 -   [Details](#details)
-
     -   [Setting the column schema](#setting-the-column-schema)
     -   [Setting Sorting Order for the list](#setting-sorting-order-for-the-list)
     -   [Pagination strategy](#pagination-strategy)
     -   [DataTableAdapter example](#datatableadapter-example)
     -   [DataColumn Features](#datacolumn-features)
     -   [Show custom template when tasklist is empty](#show-custom-template-when-tasklist-is-empty)
-
 -   [See also](#see-also)
 
 ## Basic Usage
@@ -43,30 +38,37 @@ Renders a list containing all the tasks matched by the parameters specified.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | appId | `number` |  | The id of the app. |
 | assignment | `string` |  | The assignment of the process. Possible values are: "assignee" (the current user is the assignee), candidate (the current user is a task candidate", "group_x" (the task is assigned to a group where the current user is a member, no value(the current user is involved). |
-| data | [`DataTableAdapter`](../../lib/core/datatable/data/datatable-adapter.ts) |  | (**Deprecated:** 2.4.0) Data source object that represents the number and the type of the columns that you want to show. |
+| data | `DataTableAdapter` |  | (**Deprecated:** 2.4.0) Data source object that represents the number and the type of the columns that you want to show. |
+| includeProcessInstance | `boolean` |  | Toggles inclusion of Process Instances |
 | landingTaskId | `string` |  | Define which task id should be selected after reloading. If the task id doesn't exist or nothing is passed then the first task will be selected. |
 | multiselect | `boolean` | false | Toggles multiple row selection, renders checkboxes at the beginning of each row |
 | name | `string` |  | Name of the tasklist. |
 | page | `number` | 0 | The page number of the tasks to fetch. |
+| start | `number` | 0 | Another approach to specify which page you want load.  |
+| processDefinitionId | `string` |  | The Definition Id of the process. |
 | processDefinitionKey | `string` |  | (**Deprecated:** 2.4.0) The Definition Key of the process. |
 | processInstanceId | `string` |  | The Instance Id of the process. |
+| taskId | `string` |  | The taskId you want to be fetched. |
 | selectFirstRow | `boolean` | true | Toggles default selection of the first row |
+| includeProcessInstance | `boolean` | false | Include the process instance info |
 | selectionMode | `string` | "single" | Row selection mode. Can be none, `single` or `multiple`. For `multiple` mode, you can use Cmd (macOS) or Ctrl (Win) modifier key to toggle selection for multiple rows. |
-| size | `number` |  [`PaginationComponent`](../core/pagination.component.md).DEFAULT_PAGINATION.maxItems | The number of tasks to fetch. Default value: 25. |
+| size | `number` |  | The number of tasks to fetch. Default value: 25. |
 | sort | `string` |  | Define the sort order of the tasks. Possible values are : `created-desc`, `created-asc`, `due-desc`, `due-asc` |
+| start | `number` | 0 | Starting point of the |
 | state | `string` |  | Current state of the process. Possible values are: `completed`, `active`. |
+| taskId | `string` |  | The id of a task |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when an error occurs. |
 | rowClick | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<string>` | Emitted when a task in the list is clicked |
 | rowsSelected | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any[]>` | Emitted when rows are selected/unselected |
-| success | `EventEmitter<any>` | Emitted when the task list is loaded |
+| success | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when the task list is loaded |
 
 ## Details
 
diff --git a/docs/process-services/task-standalone.component.md b/docs/process-services/task-standalone.component.md
index b471db701e..9713fef68f 100644
--- a/docs/process-services/task-standalone.component.md
+++ b/docs/process-services/task-standalone.component.md
@@ -5,7 +5,7 @@ Status: Active
 
 # Task Standalone component
 
-This component can be used when there is no form attached to a task.
+This component can be used when the task doesn't belong to any processes.
 
 ## Basic Usage
 
@@ -20,15 +20,17 @@ This component can be used when there is no form attached to a task.
 ### Properties
 
 | Name | Type | Default value | Description |
-| -- | -- | -- | -- |
+| ---- | ---- | ------------- | ----------- |
 | hasCompletePermission | `boolean` | true | Toggles rendering of the `Complete` button. |
 | hideCancelButton | `boolean` | true | Toggles rendering of the `Cancel` button. |
 | isCompleted | `boolean` | false | If true then Task completed message is shown and `Complete` and `Cancel` buttons are hidden. |
-| taskName | `string` |  | Name of the task. |
+| taskId | `any` |  | Id of the task. |
+| taskName | `any` |  | Name of the task. |
 
 ### Events
 
 | Name | Type | Description |
-| -- | -- | -- |
+| ---- | ---- | ----------- |
 | cancel | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<void>` | Emitted when the "Cancel" button is clicked. |
 | complete | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<void>` | Emitted when the form associated with the task is completed. |
+| showAttachForm | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<void>` | Emitted when the form associated with the form task is attached. |
diff --git a/docs/process-services/tasklist.service.md b/docs/process-services/tasklist.service.md
index 7bfb6eac2d..e07046d5ab 100644
--- a/docs/process-services/tasklist.service.md
+++ b/docs/process-services/tasklist.service.md
@@ -12,64 +12,68 @@ Manages Task Instances.
 
 ### Methods
 
--   **addTask**(task: [`TaskDetailsModel`](../process-services/task-details.model.md) = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`>`<br/>
+-   **addTask**(task: [`TaskDetailsModel`](../process-services/task-details.model.md)): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`>`<br/>
     Adds a subtask (ie, a checklist task) to a parent task.
     -   _task:_ [`TaskDetailsModel`](../process-services/task-details.model.md)  - The task to add
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`>` - The subtask that was added
--   **assignTask**(taskId: `string` = `null`, requestNode: `any` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`>`<br/>
+-   **assignTask**(taskId: `string`, requestNode: `any`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`>`<br/>
     Assigns a task to a user or group.
     -   _taskId:_ `string`  - The task to assign
     -   _requestNode:_ `any`  - User or group to assign the task to
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`>` - Details of the assigned task
--   **assignTaskByUserId**(taskId: `string` = `null`, userId: `number` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`>`<br/>
+-   **assignTaskByUserId**(taskId: `string`, userId: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`>`<br/>
     Assigns a task to a user.
     -   _taskId:_ `string`  - ID of the task to assign
     -   _userId:_ `number`  - ID of the user to assign the task to
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`>` - Details of the assigned task
--   **attachFormToATask**(taskId: `string` = `null`, formId: `number` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
+-   **attachFormToATask**(taskId: `string`, formId: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
     Attaches a form to a task.
     -   _taskId:_ `string`  - ID of the target task
     -   _formId:_ `number`  - ID of the form to add
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<any>` - Null response notifying when the operation is complete
--   **claimTask**(taskId: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`>`<br/>
+-   **claimTask**(taskId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`>`<br/>
     Claims a task for the current user.
     -   _taskId:_ `string`  - ID of the task to claim
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`>` - Details of the claimed task
--   **completeTask**(taskId: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
+-   **completeTask**(taskId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
     Gives completed status to a task.
     -   _taskId:_ `string`  - ID of the target task
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<any>` - Null response notifying when the operation is complete
--   **createNewTask**(task: [`TaskDetailsModel`](../process-services/task-details.model.md) = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`>`<br/>
+-   **createNewTask**(task: [`TaskDetailsModel`](../process-services/task-details.model.md)): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`>`<br/>
     Creates a new standalone task.
     -   _task:_ [`TaskDetailsModel`](../process-services/task-details.model.md)  - Details of the new task
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`>` - Details of the newly created task
--   **deleteTask**(taskId: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`>`<br/>
+-   **deleteForm**(taskId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`>`<br/>
+    Deletes a form from a task.
+    -   _taskId:_ `string`  - Task id related to form
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`>` - Null response notifying when the operation is complete
+-   **deleteTask**(taskId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`>`<br/>
     Deletes a subtask (ie, a checklist task) from a parent task.
     -   _taskId:_ `string`  - The task to delete
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`>` - Null response notifying when the operation is complete
--   **fetchTaskAuditJsonById**(taskId: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
+-   **fetchTaskAuditJsonById**(taskId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
     Fetch the Task Audit information in JSON format
     -   _taskId:_ `string`  - ID of the target task
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<any>` - JSON data
--   **fetchTaskAuditPdfById**(taskId: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob)`>`<br/>
+-   **fetchTaskAuditPdfById**(taskId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob)`>`<br/>
     Fetches the Task Audit information in PDF format.
     -   _taskId:_ `string`  - ID of the target task
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob)`>` - Binary PDF data
--   **findAllTaskByState**(requestNode: [`TaskQueryRequestRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts) = `null`, state?: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskListModel`](../../lib/process-services/task-list/models/task-list.model.ts)`>`<br/>
+-   **findAllTaskByState**(requestNode: [`TaskQueryRequestRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts), state?: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<TaskListModel>`<br/>
     Gets all tasks matching a query and state value.
     -   _requestNode:_ [`TaskQueryRequestRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)  - Query to search for tasks.
     -   _state:_ `string`  - (Optional) Task state. Can be "open" or "completed".
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskListModel`](../../lib/process-services/task-list/models/task-list.model.ts)`>` - List of tasks
--   **findAllTasksWithoutState**(requestNode: [`TaskQueryRequestRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts) = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskListModel`](../../lib/process-services/task-list/models/task-list.model.ts)`>`<br/>
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<TaskListModel>` - List of tasks
+-   **findAllTasksWithoutState**(requestNode: [`TaskQueryRequestRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)): [`Observable`](http://reactivex.io/documentation/observable.html)`<TaskListModel>`<br/>
     Gets all tasks matching the supplied query but ignoring the task state.
     -   _requestNode:_ [`TaskQueryRequestRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)  - Query to search for tasks
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskListModel`](../../lib/process-services/task-list/models/task-list.model.ts)`>` - List of tasks
--   **findTasksByState**(requestNode: [`TaskQueryRequestRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts) = `null`, state?: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskListModel`](../../lib/process-services/task-list/models/task-list.model.ts)`>`<br/>
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<TaskListModel>` - List of tasks
+-   **findTasksByState**(requestNode: [`TaskQueryRequestRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts), state?: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<TaskListModel>`<br/>
     Gets tasks matching a query and state value.
     -   _requestNode:_ [`TaskQueryRequestRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)  - Query to search for tasks
     -   _state:_ `string`  - (Optional) Task state. Can be "open" or "completed".
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskListModel`](../../lib/process-services/task-list/models/task-list.model.ts)`>` - List of tasks
--   **getFilterForTaskById**(taskId: `string` = `null`, filterList: [`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)`[]` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)`>`<br/>
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<TaskListModel>` - List of tasks
+-   **getFilterForTaskById**(taskId: `string`, filterList: [`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)`[]`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)`>`<br/>
     Gets all the filters in the list that belong to a task.
     -   _taskId:_ `string`  - ID of the target task
     -   _filterList:_ [`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)`[]`  - List of filters to search through
@@ -77,32 +81,32 @@ Manages Task Instances.
 -   **getFormList**(): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`Form`](../../lib/process-services/task-list/models/form.model.ts)`[]>`<br/>
     Gets all available reusable forms.
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`Form`](../../lib/process-services/task-list/models/form.model.ts)`[]>` - Array of form details
--   **getTaskChecklist**(id: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`[]>`<br/>
+-   **getTaskChecklist**(id: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`[]>`<br/>
     Gets the checklist for a task.
     -   _id:_ `string`  - ID of the target task
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`[]>` - Array of checklist task details
--   **getTaskDetails**(taskId: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`>`<br/>
+-   **getTaskDetails**(taskId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`>`<br/>
     Gets details for a task.
     -   _taskId:_ `string`  - ID of the target task.
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`>` - Task details
--   **getTasks**(requestNode: [`TaskQueryRequestRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts) = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskListModel`](../../lib/process-services/task-list/models/task-list.model.ts)`>`<br/>
+-   **getTasks**(requestNode: [`TaskQueryRequestRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)): [`Observable`](http://reactivex.io/documentation/observable.html)`<TaskListModel>`<br/>
     Gets all the tasks matching the supplied query.
     -   _requestNode:_ [`TaskQueryRequestRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)  - Query to search for tasks
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskListModel`](../../lib/process-services/task-list/models/task-list.model.ts)`>` - List of tasks
--   **getTotalTasks**(requestNode: [`TaskQueryRequestRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts) = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<TaskListModel>` - List of tasks
+-   **getTotalTasks**(requestNode: [`TaskQueryRequestRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
     Gets the total number of the tasks found by a query.
     -   _requestNode:_ [`TaskQueryRequestRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)  - Query to search for tasks
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<any>` - Number of tasks
--   **isTaskRelatedToFilter**(taskId: `string` = `null`, filter: [`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts) = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)`>`<br/>
+-   **isTaskRelatedToFilter**(taskId: `string`, filter: [`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)`>`<br/>
     Checks if a taskId is filtered with the given filter.
     -   _taskId:_ `string`  - ID of the target task
     -   _filter:_ [`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)  - The filter you want to check
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../lib/process-services/task-list/models/filter.model.ts)`>` - The filter if it is related or null otherwise
--   **unclaimTask**(taskId: `string` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`>`<br/>
+-   **unclaimTask**(taskId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`>`<br/>
     Unclaims a task for the current user.
     -   _taskId:_ `string`  - ID of the task to unclaim
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`>` - Null response notifying when the operation is complete
--   **updateTask**(taskId: `any` = `null`, updated: `any` = `null`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`>`<br/>
+-   **updateTask**(taskId: `any`, updated: `any`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../process-services/task-details.model.md)`>`<br/>
     Updates the details (name, description, due date) for a task.
     -   _taskId:_ `any`  - ID of the task to update
     -   _updated:_ `any`  - Data to update the task (as a `TaskUpdateRepresentation` instance).
diff --git a/docs/tutorials/README.md b/docs/tutorials/README.md
index 6676601d0e..2b8985496e 100644
--- a/docs/tutorials/README.md
+++ b/docs/tutorials/README.md
@@ -19,10 +19,10 @@ The tutorials are graded as follows:
 | [**Creating your Alfresco JavaScript application**](creating-javascript-app-using-alfresco-js-api.md) | Basic | In this tutorial you will learn how to create an application in JavaScript from scratch to interact with Alfresco. This is a "getting started" task that should enable you to start developing your own JavaScript application on top of Alfresco Content Services or Alfresco Process Services. |
 | [**Adding a new component**](new-component.md) | Basic | By definition, a _component_ controls a patch of screen called a _view_. For example, individual components define and control menus, tabs, forms, buttons and every simple or complex portion ofan application's layout. In this tutorial, you will learn how to create a component using [Angular CLI](https://cli.angular.io/) within an existing application. |
 | [**Adding a new view**](new-view.md) | Beginner | Every application developed in Angular is a single page application where the concepts of _view_ and _routing_ play a key role in the user experience. Being a single page application, the navigation between the different layouts (called _views_) is enabled through the _routing_. In this tutorial you will learn how to create a new view in your application and how to access it using a defined endpoint. |
-| [**Using components**](using-components.md) | Beginner | There are three different ways to use, extend and configure an ADF component: configuration properties, event listeners, and content projection / HTML extensions. In this tutorial you will see a practical example of each approach using the Login component. |
+| [**Using components**](using-components.md) | Beginner | There are three different ways to use, extend and configure an ADF component: configuration properties, event listeners, and content projection / HTML extensions. In this tutorial you will see a practical example of each approach using the [Login component](../core/login.component.md). |
 | [**Basic theming**](basic-theming.md) | Beginner | As detailed in the [user guide page about theming](../user-guide/theming.md), you can easily customize the [Cascading Style Sheets](https://en.wikipedia.org/wiki/Cascading_Style_Sheets) used by an ADF application. In this tutorial you will see how to modify the CSS, using a step-by-step approach. The focus of this tutorial is [ADF apps built using Yeoman](./creating-the-app-using-yeoman.md), but you can use the same principles to customize the themes in any ADF application. |
 | [**Customizing the Login component**](customising-login.md) | Intermediate | In this tutorial you will learn how to customize the [`Login` component](https://alfresco.github.io/adf-component-catalog/components/LoginComponent.html) following the [technical documentation](https://alfresco.github.io/adf-component-catalog/components/LoginComponent.html). The task will be very simple. See the documentation for further details about customizing this component, along with examples. |
 | [**Working with a Data Table**](working-with-data-table.md) | Intermediate | In this tutorial you will learn how to populate a [`DataTable` component](https://alfresco.github.io/adf-component-catalog/components/DataTableComponent.html) with custom data from a generic back-end service or third party API. As an example we are going to use data from one of the available services on Alfresco Content Services. However, the procedure is much the same if want to use an Alfresco Process Services endpoint or a third party API. |
-| [**Working with the Nodes API Service**](working-with-nodes-api-service.md) |  | In this tutorial you will learn how to use the [`NodesApiService`](https://github.com/Alfresco/alfresco-ng2-components/blob/master/lib/core/services/nodes-api.service.ts). We have developed some practical examples to show you how to interact with an instance of Alfresco Content Services without using the REST endpoints directly. With this approach the `NodesApiService` is used as an abstraction layer, defined by one of the services in the ADF Core library. |
+| [**Working with the Nodes API Service**](working-with-nodes-api-service.md) |  | In this tutorial you will learn how to use the [`NodesApiService`](../core/nodes-api.service.md). We have developed some practical examples to show you how to interact with an instance of Alfresco Content Services without using the REST endpoints directly. With this approach the [`NodesApiService`](../core/nodes-api.service.md) is used as an abstraction layer, defined by one of the services in the ADF Core library. |
 | [**Working with Nodes using the JS API**](working-with-nodes-js-api.md) |  | In this tutorial you will learn how to use the [`AlfrescoCoreRestApi`](https://github.com/Alfresco/alfresco-js-api/tree/master/src/alfresco-core-rest-api). We have developed some practical examples to show you how to interact with an instance of Alfresco Content Services without using the REST endpoints directly. With this approach the `AlfrescoCoreRestApi` is used as an abstraction layer, defining one of the core services of the [`alfresco-api-js`](https://github.com/Alfresco/alfresco-js-api) library. |
-| [**Content metadata component**](content-metadata-component.md) | Advanced | In this tutorial you will learn how to work with the [`ContentMetadataComponent`](https://alfresco.github.io/adf-component-catalog/components/ContentMetadataComponent.html). This component is used to render the standard and custom metadata of generic content item (called a _node_) stored in Alfresco Content Services. With the usual approach "learning by doing", you will see here some practical examples you might find useful in your own applicatioin. As a starting point, we will use and customize the [Alfresco Content App](https://github.com/Alfresco/alfresco-content-app). |
+| [**Content metadata component**](content-metadata-component.md) | Advanced | In this tutorial you will learn how to work with the [`ContentMetadataComponent`](../content-services/content-metadata.component.md). This component is used to render the standard and custom metadata of generic content item (called a _node_) stored in Alfresco Content Services. With the usual approach "learning by doing", you will see here some practical examples you might find useful in your own applicatioin. As a starting point, we will use and customize the [Alfresco Content App](https://github.com/Alfresco/alfresco-content-app). |
diff --git a/docs/tutorials/content-metadata-component.md b/docs/tutorials/content-metadata-component.md
index 5a97ca7e89..967107de68 100644
--- a/docs/tutorials/content-metadata-component.md
+++ b/docs/tutorials/content-metadata-component.md
@@ -4,11 +4,11 @@ Level: Advanced
 
 # Content metadata component
 
-In this tutorial you will learn how to work with the [`ContentMetadataComponent`](https://alfresco.github.io/adf-component-catalog/components/ContentMetadataComponent.html). This component is used to render the standard and custom metadata of generic content item (called a *node*) stored in Alfresco Content Services. With the usual approach "learning by doing", you will see here some practical examples you might find useful in your own applicatioin. As a starting point, we will use and customize the [Alfresco Content App](https://github.com/Alfresco/alfresco-content-app).
+In this tutorial you will learn how to work with the [`ContentMetadataComponent`](../content-services/content-metadata.component.md). This component is used to render the standard and custom metadata of generic content item (called a _node_) stored in Alfresco Content Services. With the usual approach "learning by doing", you will see here some practical examples you might find useful in your own applicatioin. As a starting point, we will use and customize the [Alfresco Content App](https://github.com/Alfresco/alfresco-content-app).
 
 ## About the `ContentMetadataComponent`
 
-As described in the [`ContentMetadataComponent`](https://alfresco.github.io/adf-component-catalog/components/ContentMetadataComponent.html) documentation, the `adf-content-metadata-card` tag has some useful attributes, included the `preset` attribute, which is used to point to a collection of aspects/properties to render.
+As described in the [`ContentMetadataComponent`](../content-services/content-metadata.component.md) documentation, the `adf-content-metadata-card` tag has some useful attributes, included the `preset` attribute, which is used to point to a collection of aspects/properties to render.
 
 Below, you can see the `preset` value requesting to render all the available aspects/properties:
 
@@ -86,7 +86,7 @@ To add a new `preset` configuration, edit the `src/app.config.json` file and loc
 
 ### Using the `my-preset` configuration
 
-Now that the `my-preset` configuration is defined, let's use it in a view of the ADF application. As an example, let's edit the files view, stored in the `src/app/files` folder. Specifically, let's change the `files.component.html` file as follows:
+Now that the `my-preset` configuration is defined, let's use it in a view of the ADF application. As an example, let's edit the files view, stored in the `src/app/files` folder. Specifically, let's change the [`files.component`](../../demo-shell/src/app/components/files/files.component.ts)`.html` file as follows:
 
 ```html
 <adf-content-metadata-card
diff --git a/docs/tutorials/creating-the-app-using-yeoman.md b/docs/tutorials/creating-the-app-using-yeoman.md
index 1f04b272ac..5e6e2a3abe 100644
--- a/docs/tutorials/creating-the-app-using-yeoman.md
+++ b/docs/tutorials/creating-the-app-using-yeoman.md
@@ -1,14 +1,17 @@
 ---
 Level: Basic
 ---
+
 # Creating your ADF application using Yeoman
 
 In this tutorial you are going to see how to create an ADF application from scratch, using the [Yeoman scaffolding tool](http://yeoman.io/). This is a "getting started" task that should enable you to start developing your own ADF application.
 
 ## Prerequisites
+
 Before any further task, be sure you executed the optional section described in [the preparation of the development environment](./preparing-environment.md), dedicated to the installation of the ADF Yeoman generator. This is a requested prerequisite to complete this tutorial with success.
 
 ## Creating the ADF application
+
 The creation of a brand new application is straightforward using the [Yeoman generator](http://yeoman.io/). Open a terminal and execute the following command.
 
     yo alfresco-adf-app
@@ -21,7 +24,7 @@ You can select one of the three following blueprints.
 
 **Process Services**
 
-This will generate an application for Alfresco Process Services. It mainly contains the following components: Login, App List, Task List, Form and Start Process.
+This will generate an application for Alfresco Process Services. It mainly contains the following components: Login, App List, Task List, [`Form`](../../lib/process-services/task-list/models/form.model.ts) and Start Process.
 
 **Content Services**
 
diff --git a/docs/tutorials/customising-login.md b/docs/tutorials/customising-login.md
index 45931f1a98..861a32471b 100644
--- a/docs/tutorials/customising-login.md
+++ b/docs/tutorials/customising-login.md
@@ -23,7 +23,7 @@ you can customize the `Login` component can be customised via CSS, HTML and Type
 example, we will customize the header (as described also in the
 [technical documentation](https://alfresco.github.io/adf-component-catalog/components/LoginComponent.html)).
 
-Open the `login.component.html` file and change the content to match the following source code:
+Open the [`login.component`](../core/login.component.md)`.html` file and change the content to match the following source code:
 
 ```html
 <adf-login ...>
@@ -41,4 +41,3 @@ As mentioned earlier, this is a very basic example and the `Login` component can
 much more extensively than this. For a complete and detailed description, full of examples, check the
 [technical documentation about the component](https://alfresco.github.io/adf-component-catalog/components/LoginComponent.html).
 This describes every customization available for the `Login` component.
-
diff --git a/docs/tutorials/new-component.md b/docs/tutorials/new-component.md
index 7a1f5bb375..a747c9bd4b 100644
--- a/docs/tutorials/new-component.md
+++ b/docs/tutorials/new-component.md
@@ -4,7 +4,7 @@ Level: Basic
 
 # Adding a new component
 
-By definition, a *component* controls a patch of screen called a *view*. For example, individual components define and control menus, tabs, forms, buttons and every simple or complex portion ofan application's layout. In this tutorial, you will learn how to create a component using [Angular CLI](https://cli.angular.io/) within an existing application.
+By definition, a _component_ controls a patch of screen called a _view_. For example, individual components define and control menus, tabs, forms, buttons and every simple or complex portion ofan application's layout. In this tutorial, you will learn how to create a component using [Angular CLI](https://cli.angular.io/) within an existing application.
 
 ## Creating a component
 
@@ -25,7 +25,7 @@ Once the component is created, you can use the element
 anywhere within the HTML file of another component to render the content of `my-first-component`.
 
 As an example, add `<app-my-first-component></app-my-first-component>` at the top of the
-`app.component.html` file in the `src` folder, and run the application again. In the browser you will
+[`app.component`](../../demo-shell/src/app/app.component.ts)`.html` file in the `src` folder, and run the application again. In the browser you will
 shortly see the text "my-first-component works!", as a placeholder to show where the component is
 rendered in the layout.
 
@@ -35,12 +35,12 @@ By default the new component is created in the `src/app` path and everything is
 same name as the component itself. Here, you should find a folder named `my-first-component` has been added
 to `src/app`, with the following contents:
 
- - `my-first-component.component.scss` containing the CSS used by the component, initially empty.
- - `my-first-component.component.html` containing the HTML used to render the component. This file is
-created with a very basic placeholder message that displays the name of the component within a `p` tag.
- - `my-first-component.component.spec.ts` containing the unit tests for the component.
- - `my-first-component.component.ts` containing the `MyFirstComponentComponent` class that implements the
-business logic in typescript.
+-   `my-first-component.component.scss` containing the CSS used by the component, initially empty.
+-   `my-first-component.component.html` containing the HTML used to render the component. This file is
+    created with a very basic placeholder message that displays the name of the component within a `p` tag.
+-   `my-first-component.component.spec.ts` containing the unit tests for the component.
+-   `my-first-component.component.ts` containing the `MyFirstComponentComponent` class that implements the
+    business logic in typescript.
 
 You must declare or import the component in one or more modules in order to use it. In this example the
 `app.module.ts` file stored in `src/app` contains the following code:
diff --git a/docs/tutorials/using-components.md b/docs/tutorials/using-components.md
index 5792f78010..281de29d8d 100644
--- a/docs/tutorials/using-components.md
+++ b/docs/tutorials/using-components.md
@@ -4,22 +4,22 @@ Level: Beginner
 
 # Using components
 
-There are three different ways to use, extend and configure an ADF component: configuration properties, event listeners, and content projection / HTML extensions. In this tutorial you will see a practical example of each approach using the Login component.
+There are three different ways to use, extend and configure an ADF component: configuration properties, event listeners, and content projection / HTML extensions. In this tutorial you will see a practical example of each approach using the [Login component](../core/login.component.md).
 
 The ADF documentation is always a good starting point when you plan to use a component. In general,
 there are three different ways to use, extend and configure an ADF component:
 
-1. Configuration properties.
-2. Event listeners.
-3. Content projection / HTML extensions.
+1.  Configuration properties.
+2.  Event listeners.
+3.  Content projection / HTML extensions.
 
 ## Configuration properties
 
 Angular components can easily be configured via properties in the HTML template. In this example we will
-work with the "Remember me" checkbox and "Need Help?" and "Register" links in the footer of the Login component.
+work with the "Remember me" checkbox and "Need Help?" and "Register" links in the footer of the [Login component](../core/login.component.md).
 
 To prepare for the task, make sure you have your ADF application up and running by executing `npm start`
-in a terminal from the root folder of the project. Access the login page using your browser and edit the `login.component.html` file stored in the `src/app/.../login` folder. The content of the `login.component.html` file should look like the following:
+in a terminal from the root folder of the project. Access the login page using your browser and edit the [`login.component`](../core/login.component.md)`.html` file stored in the `src/app/.../login` folder. The content of the [`login.component`](../core/login.component.md)`.html` file should look like the following:
 
 ```html
 <adf-login
@@ -54,10 +54,10 @@ new property values.
 **Note:** The two new properties are specified with `[]` around them. There are three ways to configure a
 property:
 
-1. `[property]=""` This sets the property using an expression or another property from the Typescript
-controller. Use this syntax for boolean expressions or variables.
-2. `property=""` This value will be passed as raw text.
-3. `[(property)]` This is called *banana in a box* and is used for two way binding.
+1.  `[property]=""` This sets the property using an expression or another property from the Typescript
+    controller. Use this syntax for boolean expressions or variables.
+2.  `property=""` This value will be passed as raw text.
+3.  `[(property)]` This is called _banana in a box_ and is used for two way binding.
 
 ## Event listeners
 
@@ -70,7 +70,7 @@ we can see that it emits three events: `success`, `error` and `executeSubmit`.
 We can subscribe to these events and have our custom code executed when they are emitted. We will
 hook into the `executeSubmit` event and show a simple `alert()` when the form is submitted.
 
-Back in the `login.component.html` file,  add `(success)="mySuccessMethod($event)"` to the `<adf-login/>` component (the position is not relevant).
+Back in the [`login.component`](../core/login.component.md)`.html` file,  add `(success)="mySuccessMethod($event)"` to the `<adf-login/>` component (the position is not relevant).
 
 ```html
 <adf-login
@@ -81,7 +81,7 @@ Back in the `login.component.html` file,  add `(success)="mySuccessMethod($event
 ```
 
 Next, implement `myExecuteSubmitMethod` in the Typescript class that defines the component. Edit
-the `login.component.ts` file stored in the same `src/app/.../login` folder and add the implementation
+the [`login.component`](../core/login.component.md)`.ts` file stored in the same `src/app/.../login` folder and add the implementation
 of `myExecuteSubmitMethod` as follows:
 
 ```ts
@@ -100,7 +100,7 @@ export class LoginComponent {
 }
 ```
 
-After saving both files, the login component will be refreshed in your browser. Enter random values for
+After saving both files, the [login component](../core/login.component.md) will be refreshed in your browser. Enter random values for
 the username and password and you should see the alert after pressing the submit button. Looking in the
 console of the browser, you'll see the `event` data containing all the details of the form. 
 
@@ -109,7 +109,7 @@ described in the documentation.
 
 ## Content projection / HTML extensions
 
-The final way to configure or extend a component is through an approach called *Content projection*. This
+The final way to configure or extend a component is through an approach called _Content projection_. This
 involves adding placeholders to a component template, allowing developers to "project" their own code or
 components into pre-defined locations within the component.
 
@@ -126,7 +126,7 @@ In regular HTML, elements can be nested. For example:
 We can use the same approach with ADF components to inject custom code or entire components into another
 component. The documentation shows which targets are available. For example, the `<adf-login/>` component
 supports two targets: `login-header` and `login-footer`. Let's add a simple "Hello World" message in the
-footer. Edit the template `login.component.html` and add a new tag *inside* the `<adf-login/>` tag:
+footer. Edit the template [`login.component`](../core/login.component.md)`.html` and add a new tag _inside_ the `<adf-login/>` tag:
 
 ```html
 <adf-login
@@ -140,7 +140,7 @@ footer. Edit the template `login.component.html` and add a new tag *inside* the
 </adf-login>
 ```
 
-Make sure that you place the `<login-footer/>` tag *inside* the `<adf-login/>` tag. Inside the
+Make sure that you place the `<login-footer/>` tag _inside_ the `<adf-login/>` tag. Inside the
 `<login-footer/>` or `<login-header/>` tags you can put anything you want, as long as you wrap it inside
 an `<ng-template/>` tag. You can also add custom or 3rd party components.
 
diff --git a/docs/tutorials/working-with-data-table.md b/docs/tutorials/working-with-data-table.md
index d0bd502cd4..534d094e1c 100644
--- a/docs/tutorials/working-with-data-table.md
+++ b/docs/tutorials/working-with-data-table.md
@@ -21,7 +21,7 @@ is well documented [here](https://alfresco.github.io/alfresco-content-app/#/), a
 However, if you prefer to create a brand new ADF application from scratch then you should still be able
 to follow the tutorial without difficulty.
 
-For this tutorial, the endpoint used to populate the Data Table component is the
+For this tutorial, the endpoint used to populate the [Data Table component](../../lib/core/datatable/components/datatable/datatable.component.ts) is the
 [`/people` service](https://api-explorer.alfresco.com/api-explorer/#!/people/listPeople) which lists
 all users available in an Alfresco Content Services instance. The `/people` service is suitable for the
 purpose of this tutorial because it is available by default in the Alfresco Content Services REST API.
@@ -101,7 +101,7 @@ the `src/app/mydatatable/mydatatable.component.ts` file and add the following im
 import { ObjectDataTableAdapter } from '@alfresco/adf-core';
 ```
 
-A DataTable needs an instance of `ObjectDataTableAdapter` to be configured as the data source. Add
+A DataTable needs an instance of [`ObjectDataTableAdapter`](../../lib/core/datatable/data/object-datatable-adapter.ts) to be configured as the data source. Add
 the source code below to the `mydatatable` component, just before the constructor:
 
 ```ts
@@ -174,7 +174,7 @@ context menus, actions and keyboard navigation.
 
 As a simple example, we'll add a `click` event to display an alert when a row is clicked. Open
 `src/app/mydatatable/mydatatable.component.html` and add the following:
- 
+
 ```html
 <adf-datatable 
   (rowClick)="onRowClick($event)"
@@ -201,19 +201,19 @@ Let's dig a bit deeper into the different options for rendering columns within t
 [Data Column component](https://alfresco.github.io/adf-component-catalog/components/DataColumnComponent.html)
 is quite in-depth and has lots of examples. We highly recommend checking it out.
 
-From the documentation we can see that the Data Column component has quite a few properties but the
+From the documentation we can see that the [Data Column component](../core/data-column.component.md) has quite a few properties but the
 most important ones are `key`, `type`, `sortable`, `title` and  `class`. 
 
-- `key` is the name of the corresponding property in the `ObjectDataTableAdapter` object. 
-- `type` indicates how to render. By default it will take the `text` from the matching key in the data,
-but other modes are also available:
-	 - `image` will take a URI for a Material Icon or a URL for any image and display it.
-	 - `date` will format a date/datetime string. Use the `format` property to override it and define a custom time format.
-	 - `fileSize` will convert into kb/mb/gb as needed.
-	 - `location` assumes the value is a nodeId for ACS and will display the path.
-- `sortable` toggles whether or not the column can be sorted.
-- `title` sets the column title in the table header.
-- `class` allows you to set CSS classes for the column. Use `full-width` for the column to take as much width as it can while still leaving room for the remaining columns.
+-   `key` is the name of the corresponding property in the [`ObjectDataTableAdapter`](../../lib/core/datatable/data/object-datatable-adapter.ts) object. 
+-   `type` indicates how to render. By default it will take the `text` from the matching key in the data,
+    but other modes are also available:
+    	 \- `image` will take a URI for a Material Icon or a URL for any image and display it.
+    	 \- `date` will format a date/datetime string. Use the `format` property to override it and define a custom time format.
+    	 \- `fileSize` will convert into kb/mb/gb as needed.
+    	 \- `location` assumes the value is a nodeId for ACS and will display the path.
+-   `sortable` toggles whether or not the column can be sorted.
+-   `title` sets the column title in the table header.
+-   `class` allows you to set CSS classes for the column. Use `full-width` for the column to take as much width as it can while still leaving room for the remaining columns.
 
 ## Content projection
 
@@ -277,7 +277,7 @@ to integrate an external API (in this example the
 [`/people` service](https://api-explorer.alfresco.com/api-explorer/#!/people/listPeople)
 that lists all the users available in an Alfresco Content Services instance).
 
-As explained above, you can do this by populating the `ObjectDataTableAdapter` object that acts as
+As explained above, you can do this by populating the [`ObjectDataTableAdapter`](../../lib/core/datatable/data/object-datatable-adapter.ts) object that acts as
 the data source of the `DataTable` component. Open the `src/app/mydatatable/mydatatable.component.ts`
 file and replace the content with the following:
 
@@ -334,7 +334,7 @@ As you can see, the major changes are in the constructor where the external API
 be in JSON but it could be in any format).
 
 After saving the file, you should see something like the following in the browser:
- 
+
 ![data_table_dataSource](../docassets/images/data_table_dataSource.png)
 
 ## Adding an action
@@ -414,4 +414,3 @@ After saving this, the application will be updated automatically and your browse
 like the following when the `Greetings` action is selected for a row:
 
 ![data_table_dataSource](../docassets/images/data_table_action2.png)
-
diff --git a/docs/tutorials/working-with-nodes-api-service.md b/docs/tutorials/working-with-nodes-api-service.md
index 618270227e..95cc722510 100644
--- a/docs/tutorials/working-with-nodes-api-service.md
+++ b/docs/tutorials/working-with-nodes-api-service.md
@@ -1,13 +1,27 @@
 # Working with the Nodes API Service
 
-In this tutorial you will learn how to use the [`NodesApiService`](https://github.com/Alfresco/alfresco-ng2-components/blob/master/lib/core/services/nodes-api.service.ts). We have developed some practical examples to show you how to interact with an instance of Alfresco Content Services without using the REST endpoints directly. With this approach the `NodesApiService` is used as an abstraction layer, defined by one of the services in the ADF Core library.
+In this tutorial you will learn how to use the [`NodesApiService`](../core/nodes-api.service.md). We have developed some practical examples to show you how to interact with an instance of Alfresco Content Services without using the REST endpoints directly. With this approach the [`NodesApiService`](../core/nodes-api.service.md) is used as an abstraction layer, defined by one of the services in the ADF Core library.
+
+## Contents
+
+-   [Preparing the development environment](#preparing-the-development-environment)
+-   [Basic examples of usage](#basic-examples-of-usage)
+-   [About the ](#about-the-nodesapiservice)
+    -   [Observables](#observables)
+    -   [MinimalNodeEntryEntity](#minimalnodeentryentity)
+    -   [NodePaging](#nodepaging)
+-   [Retrieving info and metadata from a node](#retrieving-info-and-metadata-from-a-node)
+-   [Retrieving the node's children](#retrieving-the-nodes-children)
+-   [Creating and deleting a subfolder](#creating-and-deleting-a-subfolder)
+    -   [Creating a subfolder](#creating-a-subfolder)
+    -   [Deleting a folder](#deleting-a-folder)
 
 ## Preparing the development environment
 
-To focus the description on the `NodesApiService`, we will develop on top of the
+To focus the description on the [`NodesApiService`](../core/nodes-api.service.md), we will develop on top of the
 [Alfresco Example Content Application](https://github.com/Alfresco/alfresco-content-app).
 If you don't have it already installed in your development environment then see the
-*how-to* description in
+_how-to_ description in
 [preparation of the development environment](./preparing-environment.md).
 
 When you have the Alfresco Example Content Application up and running, edit the `FileComponent`
@@ -35,24 +49,24 @@ myOnNodeDoubleClick(nodeId) {
 }
 ```
 
-This will change the user experience when you click on a content node (but *not* a folder):
+This will change the user experience when you click on a content node (but _not_ a folder):
 in the browser's console you will see something like the following screenshot, instead of
 the preview of the content:
 
 ![nodesapiservices_myonnodedoubleclick](../docassets/images/nodesapiservices_myonnodedoubleclick.png)
 
-The Alfresco Example Content app is now set up to demonstrate the usage of the `NodesApiService`.
+The Alfresco Example Content app is now set up to demonstrate the usage of the [`NodesApiService`](../core/nodes-api.service.md).
 
-## Basic examples of usage 
+## Basic examples of usage
 
-For a first look at the `NodesApiService`, let's check the `FileComponent` component stored in
+For a first look at the [`NodesApiService`](../core/nodes-api.service.md), let's check the `FileComponent` component stored in
 `src/app/components/files/files.component.ts`. In the source code, you can see the `nodesApi`
-property that represents the `NodesApiService` in the `FilesComponent`. See the `fetchNode` and
+property that represents the [`NodesApiService`](../core/nodes-api.service.md) in the [`FilesComponent`](../../demo-shell/src/app/components/files/files.component.ts). See the `fetchNode` and
 `fetchNodes` methods for some very basic examples.
 
-## About the `NodesApiService`
+## About the NodesApiService
 
-Before going further, let's introduce the `NodesApiService` class. For further details about the
+Before going further, let's introduce the [`NodesApiService`](../core/nodes-api.service.md) class. For further details about the
 implementation, see the
 [component catalog page](https://alfresco.github.io/adf-component-catalog/injectables/NodesApiService.html).
 As you can see, the available methods are easy to understand and they should be all you need to
@@ -60,12 +74,12 @@ manage the nodes of your content repository.
 
 ### Observables
 
-Almost all the methods return an [Observable](https://angular.io/guide/observables).
+Almost all the methods return an [`Observable`](http://reactivex.io/documentation/observable.html).
 Observables provide support for passing messages between publishers and subscribers in Angular
 applications. Observables offer significant benefits over other techniques for event handling,
 asynchronous programming, and handling multiple values.
 
-The return values of the `NodesApiService` methods are managed in the usual way for Observables.
+The return values of the [`NodesApiService`](../core/nodes-api.service.md) methods are managed in the usual way for Observables.
 You "subscribe" to the asynchronous messaging using the following syntax:
 
 ```ts
@@ -77,20 +91,20 @@ this.nodesApi.getNode(nodeId).subscribe(
 
 ### MinimalNodeEntryEntity
 
-All the methods that manage content nodes return an `Observable` of the `MinimalNodeEntryEntity`
-class. `MinimalNodeEntryEntity` is used to represent the node's content. See the
+All the methods that manage content nodes return an [`Observable`](http://reactivex.io/documentation/observable.html) of the [`MinimalNodeEntryEntity`](../content-services/document-library.model.md)
+class. [`MinimalNodeEntryEntity`](../content-services/document-library.model.md) is used to represent the node's content. See the
 [official documentation](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-core-rest-api/docs/NodeMinimalEntry.md)
 for further details.
 
 ### NodePaging
 
-When a method returns a list of nodes rather than a single node, it usually returns an `Observable` of the `NodePaging` class. See the
-[NodePaging](https://alfresco.github.io/adf-component-catalog/classes/NodePaging.html)
+When a method returns a list of nodes rather than a single node, it usually returns an [`Observable`](http://reactivex.io/documentation/observable.html) of the [`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts) class. See the
+[`NodePaging`](../../lib/content-services/document-list/models/document-library.model.ts)
 docs for further details.
 
 ## Retrieving info and metadata from a node
 
-As a first example of the usage of the `NodesApiService`, let's retrieve the properties of a content node using its identifier. Edit the `myOnNodeDoubleClick` method in `src/app/components/files/files.component.ts`, as shown below:
+As a first example of the usage of the [`NodesApiService`](../core/nodes-api.service.md), let's retrieve the properties of a content node using its identifier. Edit the `myOnNodeDoubleClick` method in `src/app/components/files/files.component.ts`, as shown below:
 
 ```ts
 myOnNodeDoubleClick(nodeId) {
@@ -114,7 +128,7 @@ other visual component) then the principle is the same.
 
 ## Retrieving the node's children
 
-Another common use of the `NodesApiService` is to retrieve a list of the children of a folder node.
+Another common use of the [`NodesApiService`](../core/nodes-api.service.md) is to retrieve a list of the children of a folder node.
 Edit `src/app/components/files/files.component.ts` again, changing the `onNodeDoubleClick` method
 to match the source code below:
 
@@ -151,7 +165,7 @@ in the browser's console you will see something like the following screenshot:
 
 ## Creating and deleting a subfolder
 
-The `NodesApiService` class is not just for retrieving data. You can also use it to manage a
+The [`NodesApiService`](../core/nodes-api.service.md) class is not just for retrieving data. You can also use it to manage a
 real CRUD of nodes (content and folders). In the following examples, you will see how to create
 a subfolder of the double clicked folder and also how to delete it.
 
diff --git a/docs/user-guide/extensibility.md b/docs/user-guide/extensibility.md
index 097d4b4fd6..c52020e8e2 100644
--- a/docs/user-guide/extensibility.md
+++ b/docs/user-guide/extensibility.md
@@ -1,29 +1,41 @@
 ---
 Added: v2.0.0
 ---
+
 # Form Extensibility and Customisation
 
 _Note: it is assumed you are familiar with Alfresco Process Services (powered by Activiti) form definition structure._
 
--   How components and widgets are rendered on a Form
+-   How components and widgets are rendered on a [`Form`](../../lib/process-services/task-list/models/form.model.ts)
 -   Replacing default form widgets with custom components
 -   Replacing custom stencils with custom components
 
+## Contents
+
+-   [How components and widgets are rendered on a Form](#how-components-and-widgets-are-rendered-on-a-form)
+    -   [Component type resolvers](#component-type-resolvers)
+    -   [Default component mappings](#default-component-mappings)
+-   [Replacing default form widgets with custom components](#replacing-default-form-widgets-with-custom-components)
+-   [Replacing custom stencils with custom components](#replacing-custom-stencils-with-custom-components)
+    -   [Creating custom stencil](#creating-custom-stencil)
+    -   [Creating custom widget](#creating-custom-widget)
+-   [See Also](#see-also)
+
 ## How components and widgets are rendered on a Form
 
-All form field editors (aka widgets) on a Form are rendered by means of `FormFieldComponent`
-that takes an instance of a `FormFieldModel`:
+All form field editors (aka widgets) on a [`Form`](../../lib/process-services/task-list/models/form.model.ts) are rendered by means of [`FormFieldComponent`](../core/form-field.component.md)
+that takes an instance of a [`FormFieldModel`](../core/form-field.model.md):
 
 ```html
 <form-field [field]="field"></form-field>
 ```
 
-This component depends on `FormRenderingService` service to map `FormFieldModel` to UI component
+This component depends on [`FormRenderingService`](../core/form-rendering.service.md) service to map [`FormFieldModel`](../core/form-field.model.md) to UI component
 based on field type or metadata information.
 
 ### Component type resolvers
 
-`FormRenderingService` maps field types to corresponding instances exposing `ComponentTypeResolver` interface:
+[`FormRenderingService`](../core/form-rendering.service.md) maps field types to corresponding instances exposing `ComponentTypeResolver` interface:
 
 ```ts
 export interface ComponentTypeResolver {
@@ -31,7 +43,7 @@ export interface ComponentTypeResolver {
 }
 ```
 
-Typically a `ComponentTypeResolver` is a function that takes `FormFieldModel` and returns corresponding component type.
+Typically a `ComponentTypeResolver` is a function that takes [`FormFieldModel`](../core/form-field.model.md) and returns corresponding component type.
 It can be either a predefined component type or a dynamically evaluated based on field properties and metadata.
 
 #### Static component mapping
@@ -51,7 +63,7 @@ formRenderingService.setComponentTypeResolver('text', () => CustomWidgetComponen
 
 #### Dynamic component mapping
 
-Alternatively your resolver may return different component types based on `FormFieldModel` state and condition:
+Alternatively your resolver may return different component types based on [`FormFieldModel`](../core/form-field.model.md) state and condition:
 
 ```ts
 let customResolver: ComponentTypeResolver = (field: FormFieldModel): Type<{}> => {
@@ -67,25 +79,25 @@ formRenderingService.setComponentTypeResolver('text', customResolver, true);
 
 | Stencil Name | Field Type | Component Type |
 | ------------ | ---------- | -------------- |
-| Text | text | TextWidgetComponent |
-| Number | integer | NumberWidgetComponent |
-| Multi-line text | multi-line-text | MultilineTextWidgetComponentComponent |
-| Checkbox | boolean | CheckboxWidgetComponent |
-| Dropdown | dropdown | DropdownWidgetComponent |
-| Date | date | DateWidgetComponent |
-| Amount | amount | AmountWidgetComponent |
-| Radio buttons | radio-buttons | RadioButtonsWidgetComponent |
-| Hyperlink | hyperlink | HyperlinkWidgetComponent |
+| Text | text | [`TextWidgetComponent`](../../lib/core/form/components/widgets/text/text.widget.ts) |
+| Number | integer | [`NumberWidgetComponent`](../../lib/core/form/components/widgets/number/number.widget.ts) |
+| Multi-line text | multi-line-text | [`MultilineTextWidgetComponentComponent`](../../lib/core/form/components/widgets/multiline-text/multiline-text.widget.ts) |
+| Checkbox | boolean | [`CheckboxWidgetComponent`](../../lib/core/form/components/widgets/checkbox/checkbox.widget.ts) |
+| Dropdown | dropdown | [`DropdownWidgetComponent`](../../lib/core/form/components/widgets/dropdown/dropdown.widget.ts) |
+| Date | date | [`DateWidgetComponent`](../../lib/core/form/components/widgets/date/date.widget.ts) |
+| Amount | amount | [`AmountWidgetComponent`](../../lib/core/form/components/widgets/amount/amount.widget.ts) |
+| Radio buttons | radio-buttons | [`RadioButtonsWidgetComponent`](../../lib/core/form/components/widgets/radio-buttons/radio-buttons.widget.ts) |
+| Hyperlink | hyperlink | [`HyperlinkWidgetComponent`](../../lib/core/form/components/widgets/hyperlink/hyperlink.widget.ts) |
 | Display value | readonly | DisplayValueWidgetComponent |
-| Display text | readonly-text | DisplayTextWidgetComponentComponent |
-| Typeahead | typeahead | TypeaheadWidgetComponent |
-| People | people | PeopleWidgetComponent |
-| Group of people | functional-group | FunctionalGroupWidgetComponent |
-| Dynamic table | dynamic-table | DynamicTableWidgetComponent |
-| N/A | container | ContainerWidgetComponent (layout component) |
-| Header | group | ContainerWidgetComponent |
-| Attach | upload | AttachWidgetComponent or UploadWidgetComponent (based on metadata) |
-| N/A | N/A | UnknownWidgetComponent |
+| Display text | readonly-text | [`DisplayTextWidgetComponentComponent`](../../lib/core/form/components/widgets/display-text/display-text.widget.ts) |
+| Typeahead | typeahead | [`TypeaheadWidgetComponent`](../../lib/core/form/components/widgets/typeahead/typeahead.widget.ts) |
+| People | people | [`PeopleWidgetComponent`](../../lib/core/form/components/widgets/people/people.widget.ts) |
+| Group of people | functional-group | [`FunctionalGroupWidgetComponent`](../../lib/core/form/components/widgets/functional-group/functional-group.widget.ts) |
+| Dynamic table | dynamic-table | [`DynamicTableWidgetComponent`](../../lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.ts) |
+| N/A | container | [`ContainerWidgetComponent`](../../lib/core/form/components/widgets/container/container.widget.ts) (layout component) |
+| Header | group | [`ContainerWidgetComponent`](../../lib/core/form/components/widgets/container/container.widget.ts) |
+| Attach | upload | AttachWidgetComponent or [`UploadWidgetComponent`](../../lib/core/form/components/widgets/upload/upload.widget.ts) (based on metadata) |
+| N/A | N/A | [`UnknownWidgetComponent`](../../lib/core/form/components/widgets/unknown/unknown.widget.ts) |
 
 ## Replacing default form widgets with custom components
 
@@ -96,7 +108,7 @@ First let's create a simple APS form with `Text` widgets:
 
 ![default text widget](../docassets/images/text-default-widget.png)
 
-Every custom widget must inherit `WidgetComponent` class in order to function properly:
+Every custom widget must inherit [`WidgetComponent`](../insights/widget.component.md) class in order to function properly:
 
 ```ts
 import { Component } from '@angular/core';
@@ -143,7 +155,7 @@ don't forget to import it into your main application one:
 export class AppModule {}
 ```
 
-Now you can import `FormRenderingService` in any of your Views and override default mapping similar to the following:
+Now you can import [`FormRenderingService`](../core/form-rendering.service.md) in any of your Views and override default mapping similar to the following:
 
 ```ts
 import { Component } from '@angular/core';
@@ -175,7 +187,7 @@ First let's create a basic stencil and call it `Custom Stencil 01`:
 
 _Note the `internal identifier` value as it will become a `field type` value when corresponding form is rendered._
 
-Next put some simple html layout for `Form runtime template` and `Form editor template` fields:
+Next put some simple html layout for [`Form`](../../lib/process-services/task-list/models/form.model.ts)`runtime template` and [`Form`](../../lib/process-services/task-list/models/form.model.ts)`editor template` fields:
 
 ```html
 <div style="color: blue">Custom activiti stencil</div>
@@ -237,7 +249,7 @@ And import into your Application Module
 export class AppModule {}
 ```
 
-Now you can import `FormRenderingService` in any of your Views and provide new mapping:
+Now you can import [`FormRenderingService`](../core/form-rendering.service.md) in any of your Views and provide new mapping:
 
 ```ts
 import { Component } from '@angular/core';
diff --git a/docs/user-guide/internationalization.md b/docs/user-guide/internationalization.md
index cab65865ff..6f3c48c5f4 100644
--- a/docs/user-guide/internationalization.md
+++ b/docs/user-guide/internationalization.md
@@ -1,6 +1,7 @@
 ---
 Added: v2.2.0
 ---
+
 # Internationalization in ADF
 
 Internationalization (abbreviated to i18n) is the process of providing UI messages
@@ -67,7 +68,7 @@ below:
 ```
 
 The hierarchical structure is referred to in the UI using the familiar "dot"
-notation (so `FORM.START_FORM.TITLE` would be the key for the "Start Form"
+notation (so `FORM.START_FORM.TITLE` would be the key for the "Start [Form"](../../lib/process-services/task-list/models/form.model.ts)
 string here). This is useful for grouping related messages and providing
 singular and plural versions, among other things.
 
@@ -136,11 +137,11 @@ should check you are using the key correctly.
 
 ## Using the translate pipe
 
-Using `TranslationService.get` is straightforward but it is often more
+Using [`TranslationService`](../core/translation.service.md)`.get` is straightforward but it is often more
 convenient to add translation keys directly into your page's HTML.
 Use the `translate` pipe to convert a key in the page directly to the
 corresponding text. For example, the following will display the
-"Start Form" text as above but without any code or variables in the
+"Start [Form"](../../lib/process-services/task-list/models/form.model.ts) text as above but without any code or variables in the
 component's `.ts` file:
 
 <!-- {% raw %} -->
@@ -203,7 +204,7 @@ messages whose content can change at runtime. For example, in the built-in
 
 The sections in curly braces are _interpolation variables_ that you supply
 at runtime. You can specify them by passing an extra parameter to
-`TranslationService.get`; this is an object whose properties have the same
+[`TranslationService`](../core/translation.service.md)`.get`; this is an object whose properties have the same
 names as the interpolation variables in the string:
 
 ```ts
@@ -236,7 +237,7 @@ Note that when the user selects an item from the menu, it simply changes the "lo
 preference (which you can get via the [User Preferences service](../core/user-preferences.service.md)).
 The `translate` pipe reacts automatically to this and changes the page text
 immediately to the new language. However, text added via a variable set using
-`TranslationService.get`, as in the example above, will not be updated like this;
+[`TranslationService`](../core/translation.service.md)`.get`, as in the example above, will not be updated like this;
 you will need to get a new translation and set the variable's value again explicitly
 from the code.
 
diff --git a/docs/user-guide/stencils.md b/docs/user-guide/stencils.md
index 60e9d044f2..8574df7608 100644
--- a/docs/user-guide/stencils.md
+++ b/docs/user-guide/stencils.md
@@ -1,6 +1,19 @@
 # Form Stencils
 
-Form component provides basic support for custom stencils created with Activiti stencil editor.
+[`Form`](../../lib/process-services/task-list/models/form.model.ts) component provides basic support for custom stencils created with Activiti stencil editor.
+
+## Contents
+
+-   [Installing](#installing)
+-   [Creating new stencil](#creating-new-stencil)
+-   [Form runtime template](#form-runtime-template)
+-   [Form editor template](#form-editor-template)
+-   [Custom component controller](#custom-component-controller)
+    -   [JavaScript code](#javascript-code)
+    -   [TypeScript code](#typescript-code)
+    -   [Mapping template with component class](#mapping-template-with-component-class)
+    -   [Final result](#final-result)
+-   [Runtime result](#runtime-result)
 
 ## Installing
 
@@ -18,16 +31,17 @@ Where `<activiti-app-root>` should be replaced with a valid url pointing to your
 ```html
 <script src="http://localhost:9999/activiti-app/app/rest/script-files/controllers"></script>
 ```
-- `/app/rest/script-files/controllers`
-    provides all stencil controllers stored within Activiti
 
-- `runtime.ng1.js`
-    provides a compatibility layer for controllers created with AngularJS (aka Angular 1x)
-    (this is to avoid runtime errors when loading AngularJS code into `<activiti-form>` component)
+-   `/app/rest/script-files/controllers`
+      provides all stencil controllers stored within Activiti
 
-- `runtime.adf.js`
-    provides API for stencil management and registration,
-    i.e. mapping html templates with corresponding controller classes
+-   `runtime.ng1.js`
+      provides a compatibility layer for controllers created with AngularJS (aka Angular 1x)
+      (this is to avoid runtime errors when loading AngularJS code into `<activiti-form>` component)
+
+-   `runtime.adf.js`
+      provides API for stencil management and registration,
+      i.e. mapping html templates with corresponding controller classes
 
 ## Creating new stencil
 
@@ -53,7 +67,7 @@ This should be a valid Angular component template that you want to render in `<a
 
 ## Form editor template
 
-This can be any html layout to be rendered as a component placeholder in Activiti Form Designer.
+This can be any html layout to be rendered as a component placeholder in Activiti [`Form`](../../lib/process-services/task-list/models/form.model.ts) Designer.
 
 ```html
 <div>
@@ -145,4 +159,4 @@ Angular Component
 Created by: Denys
 ```
 
-ADF Form component will automatically assemble and compile a valid Angular component on the fly.
\ No newline at end of file
+ADF [`Form`](../../lib/process-services/task-list/models/form.model.ts) component will automatically assemble and compile a valid Angular component on the fly.
diff --git a/docs/versionIndex.md b/docs/versionIndex.md
index 7f69e14b21..849d1920a7 100644
--- a/docs/versionIndex.md
+++ b/docs/versionIndex.md
@@ -30,6 +30,7 @@ of components organized by ADF libraries.
 -   [Buttons menu component](core/buttons-menu.component.md)
 -   [Empty content component](core/empty-content.component.md)
 -   [Error content component](core/error-content.component.md)
+-   [Header component](core/header.component.md)
 -   [Info drawer tab component](core/info-drawer-tab.component.md)
 -   [Node permission dialog service](content-services/node-permission-dialog.service.md)
 -   [Search check list component](content-services/search-check-list.component.md)
@@ -129,6 +130,7 @@ of components organized by ADF libraries.
 -   [App config service](core/app-config.service.md)
 -   [Apps list component](process-services/apps-list.component.md)
 -   [Apps process service](core/apps-process.service.md)
+-   [Attach form component](process-services/attach-form.component.md)
 -   [Auth guard bpm service](core/auth-guard-bpm.service.md)
 -   [Auth guard ecm service](core/auth-guard-ecm.service.md)
 -   [Auth guard service](core/auth-guard.service.md)
diff --git a/e2e/actions/ACS/node.actions.ts b/e2e/actions/ACS/node.actions.ts
new file mode 100644
index 0000000000..29510cc8f6
--- /dev/null
+++ b/e2e/actions/ACS/node.actions.ts
@@ -0,0 +1,28 @@
+/*!
+ * @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.
+ */
+
+export class NodeActions {
+
+    lockNode(alfrescoJsApi, nodeId: string, allowOwner?: string) {
+
+        return alfrescoJsApi.nodes.lockNode(nodeId, {
+            'type': allowOwner ? 'ALLOW_OWNER_CHANGES' : 'FULL',
+            'lifetime': 'PERSISTENT'
+        });
+    }
+
+}
diff --git a/e2e/actions/ACS/upload.actions.ts b/e2e/actions/ACS/upload.actions.ts
new file mode 100644
index 0000000000..429381baba
--- /dev/null
+++ b/e2e/actions/ACS/upload.actions.ts
@@ -0,0 +1,74 @@
+/*!
+ * @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 path = require('path');
+import fs = require('fs');
+import TestConfig = require('../../test.config');
+import remote = require('selenium-webdriver/remote');
+
+export class UploadActions {
+
+    async uploadFile(alfrescoJsApi, fileLocation, fileName, parentFolderId) {
+        browser.setFileDetector(new remote.FileDetector());
+
+        let pathFile = path.join(TestConfig.main.rootPath + fileLocation);
+        let file = fs.createReadStream(pathFile);
+
+        return alfrescoJsApi.upload.uploadFile(
+            file,
+            '',
+            parentFolderId,
+            null,
+            {
+                'name': fileName,
+                'nodeType': 'cm:content',
+                'renditions': 'doclib'
+            }
+        );
+    }
+
+    async createEmptyFiles(alfrescoJsApi, emptyFileNames: string[], parentFolderId) {
+        browser.setFileDetector(new remote.FileDetector());
+
+        let filesRequest = [];
+
+        for (let i = 0; i < emptyFileNames.length; i++) {
+            let jsonItem = {};
+            jsonItem['name'] = emptyFileNames[i];
+            jsonItem['nodeType'] = 'cm:content';
+            filesRequest.push(jsonItem);
+        }
+
+        return alfrescoJsApi.nodes.addNode(parentFolderId, filesRequest, {}, {
+            filedata: ''
+        });
+    }
+
+    async uploadFolder(alfrescoJsApi, folderName, parentFolderId) {
+        browser.setFileDetector(new remote.FileDetector());
+
+        return alfrescoJsApi.nodes.addNode(parentFolderId, {
+            'name': folderName,
+            'nodeType': 'cm:folder'
+        }, {}, {});
+    }
+
+    async deleteFilesOrFolder(alfrescoJsApi, folderId) {
+        return alfrescoJsApi.nodes.deleteNode(folderId, { permanent: true } );
+    }
+
+}
diff --git a/e2e/actions/APS/apps.actions.ts b/e2e/actions/APS/apps.actions.ts
new file mode 100644
index 0000000000..d08921460f
--- /dev/null
+++ b/e2e/actions/APS/apps.actions.ts
@@ -0,0 +1,87 @@
+/*!
+ * @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 path = require('path');
+import fs = require('fs');
+import TestConfig = require('../../test.config');
+import AppPublish = require('../../models/APS/AppPublish');
+import remote = require('selenium-webdriver/remote');
+
+export class AppsActions {
+
+    async importPublishDeployApp(alfrescoJsApi, appFileLocation) {
+        browser.setFileDetector(new remote.FileDetector());
+
+        let pathFile = path.join(TestConfig.main.rootPath + appFileLocation);
+        let file = fs.createReadStream(pathFile);
+
+        let appCreated = await alfrescoJsApi.activiti.appsApi.importAppDefinition(file);
+
+        let publishApp = await alfrescoJsApi.activiti.appsApi.publishAppDefinition(appCreated.id, new AppPublish());
+
+        await alfrescoJsApi.activiti.appsApi.deployAppDefinitions({ appDefinitions: [{ id: publishApp.appDefinition.id }] });
+
+        return appCreated;
+    }
+
+    async publishDeployApp(alfrescoJsApi, appId) {
+        browser.setFileDetector(new remote.FileDetector());
+
+        let publishApp = await alfrescoJsApi.activiti.appsApi.publishAppDefinition(appId, new AppPublish());
+
+        await alfrescoJsApi.activiti.appsApi.deployAppDefinitions({ appDefinitions: [{ id: publishApp.appDefinition.id }] });
+
+        return publishApp;
+    }
+
+    async importNewVersionAppDefinitionPublishDeployApp(alfrescoJsApi, appFileLocation, modelId) {
+        browser.setFileDetector(new remote.FileDetector());
+
+        let pathFile = path.join(TestConfig.main.rootPath + appFileLocation);
+        let file = fs.createReadStream(pathFile);
+
+        let appCreated = await alfrescoJsApi.activiti.appsApi.importNewAppDefinition(modelId, file);
+
+        let publishApp = await alfrescoJsApi.activiti.appsApi.publishAppDefinition(appCreated.id, new AppPublish());
+
+        await alfrescoJsApi.activiti.appsApi.deployAppDefinitions({ appDefinitions: [{ id: publishApp.appDefinition.id }] });
+
+        return appCreated;
+    }
+
+    async startProcess(alfrescoJsApi, app, processName?: string) {
+        browser.setFileDetector(new remote.FileDetector());
+
+        let appDefinitionsList = await alfrescoJsApi.activiti.appsApi.getAppDefinitions();
+
+        let appDefinition = appDefinitionsList.data.filter((currentApp) => {
+            return currentApp.name === app.name;
+        });
+
+        let processDefinitionList = await alfrescoJsApi.activiti.processApi.getProcessDefinitions({ deploymentId: appDefinition.deploymentId });
+
+        let startProcessOptions: any = { processDefinitionId: processDefinitionList.data[0].id };
+
+        if (typeof processName !== 'undefined') {
+            startProcessOptions.name = processName;
+        }
+
+        return await alfrescoJsApi.activiti.processApi.startNewProcessInstance(startProcessOptions);
+
+    }
+
+}
diff --git a/lib/core/viewer/services/rendering-queue.services.spec.ts b/e2e/actions/APS/models.actions.ts
similarity index 54%
rename from lib/core/viewer/services/rendering-queue.services.spec.ts
rename to e2e/actions/APS/models.actions.ts
index 173aa5d5b1..f4b764ae7e 100644
--- a/lib/core/viewer/services/rendering-queue.services.spec.ts
+++ b/e2e/actions/APS/models.actions.ts
@@ -15,24 +15,16 @@
  * limitations under the License.
  */
 
-import { ReflectiveInjector } from '@angular/core';
-import { RenderingQueueServices } from './rendering-queue.services';
+export class ModelsActions {
 
-describe('RenderingQueueServices', () => {
+    async deleteVersionModel(alfrescoJsApi, modelId) {
 
-    let service, injector;
+       return await alfrescoJsApi.activiti.modelsApi.deleteModel(modelId, { cascade: false, deleteRuntimeApp : true });
+    }
 
-    beforeEach(() => {
-        injector = ReflectiveInjector.resolveAndCreate([
-            RenderingQueueServices
-        ]);
-    });
+    async deleteEntireModel(alfrescoJsApi, modelId) {
 
-    beforeEach(() => {
-        service = injector.get(RenderingQueueServices);
-    });
+        return await alfrescoJsApi.activiti.modelsApi.deleteModel(modelId, { cascade: true, deleteRuntimeApp : true });
+    }
 
-    it('Simple import example', () => {
-        expect(service.CLEANUP_TIMEOUT).toEqual(30000);
-    });
-});
+}
diff --git a/e2e/actions/drop.actions.ts b/e2e/actions/drop.actions.ts
new file mode 100644
index 0000000000..6034e7997f
--- /dev/null
+++ b/e2e/actions/drop.actions.ts
@@ -0,0 +1,109 @@
+/*!
+ * @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.
+ */
+
+/* tslint:disable */
+import { browser } from 'protractor';
+
+import fs = require('fs');
+import path = require('path');
+import TestConfig = require('../test.config');
+import remote = require('selenium-webdriver/remote');
+
+let JS_BIND_INPUT = function (target) {
+    let input = document.createElement('input');
+    input.type = 'file';
+    input.style.display = 'none';
+    input.addEventListener('change', function (event) {
+        target.scrollIntoView(true);
+
+        let rect = target.getBoundingClientRect();
+        let x = rect.left + (rect.width >> 1);
+        let y = rect.top + (rect.height >> 1);
+        let data = { files: input.files };
+
+        ['dragenter', 'dragover', 'drop'].forEach(function (name) {
+            let mouseEvent: any = document.createEvent('MouseEvent');
+            mouseEvent.initMouseEvent(name, !0, !0, window, 0, 0, 0, x, y, !1, !1, !1, !1, 0, null);
+            mouseEvent.dataTransfer = data;
+            target.dispatchEvent(mouseEvent);
+        });
+
+        document.body.removeChild(input);
+    }, false);
+
+    document.body.appendChild(input);
+    return input;
+};
+
+let JS_BIND_INPUT_FOLDER = function (target) {
+    let input = document.createElement('input');
+    input.type = 'file';
+    input.style.display = 'none';
+    input.multiple = true;
+    input.webkitdirectory = true;
+    input.addEventListener('change', function (event) {
+        target.scrollIntoView(true);
+
+        let rect = target.getBoundingClientRect();
+        let x = rect.left + (rect.width >> 1);
+        let y = rect.top + (rect.height >> 1);
+        let data = { files: input.files };
+
+        ['dragenter', 'dragover', 'drop'].forEach(function (name) {
+            let mouseEvent: any = document.createEvent('MouseEvent');
+            mouseEvent.initMouseEvent(name, !0, !0, window, 0, 0, 0, x, y, !1, !1, !1, !1, 0, null);
+            mouseEvent.dataTransfer = data;
+            target.dispatchEvent(mouseEvent);
+        });
+
+        document.body.removeChild(input);
+    }, false);
+
+    document.body.appendChild(input);
+    return input;
+};
+
+export class DropActions {
+
+    dropFile(dropArea, filePath) {
+        browser.setFileDetector(new remote.FileDetector());
+
+        let absolutePath = path.resolve(path.join(TestConfig.main.rootPath, filePath));
+
+        fs.accessSync(absolutePath, fs.constants.F_OK);
+        return dropArea.getWebElement().then((element) => {
+            browser.executeScript(JS_BIND_INPUT, element).then((input: any) => {
+                input.sendKeys(absolutePath);
+
+            });
+        });
+    }
+
+    dropFolder(dropArea, folderPath) {
+        browser.setFileDetector(new remote.FileDetector());
+
+        let absolutePath = path.resolve(path.join(TestConfig.main.rootPath, folderPath));
+        fs.accessSync(absolutePath, fs.constants.F_OK);
+
+        return dropArea.getWebElement().then((element) => {
+            browser.executeScript(JS_BIND_INPUT_FOLDER, element).then((input: any) => {
+                input.sendKeys(absolutePath);
+
+            });
+        });
+    }
+}
diff --git a/e2e/actions/users.actions.ts b/e2e/actions/users.actions.ts
new file mode 100644
index 0000000000..744e510e50
--- /dev/null
+++ b/e2e/actions/users.actions.ts
@@ -0,0 +1,59 @@
+/*!
+ * @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 Tenant = require('../models/APS/Tenant');
+import User = require('../models/APS/User');
+import TestConfig = require('../test.config');
+import path = require('path');
+import fs = require('fs');
+import remote = require('selenium-webdriver/remote');
+import { browser } from 'protractor';
+
+export class UsersActions {
+
+    async createTenantAndUser(alfrescoJsApi) {
+        let newTenant = await alfrescoJsApi.activiti.adminTenantsApi.createTenant(new Tenant());
+
+        let user = new User({ tenantId: newTenant.id });
+
+        await alfrescoJsApi.activiti.adminUsersApi.createNewUser(user);
+
+        return user;
+    }
+
+    async createApsUser(alfrescoJsApi, tenantId) {
+        let user = new User({ tenantId: tenantId });
+
+        await alfrescoJsApi.activiti.adminUsersApi.createNewUser(user);
+
+        return user;
+    }
+
+    async cleanupTenant(alfrescoJsApi, tenantId) {
+        return alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId);
+    }
+
+    async changeProfilePictureAps(alfrescoJsApi, fileLocation) {
+        browser.setFileDetector(new remote.FileDetector());
+
+        let pathFile = path.join(TestConfig.main.rootPath + fileLocation);
+        let file = fs.createReadStream(pathFile);
+
+        return alfrescoJsApi.activiti.profileApi.uploadProfilePicture(file);
+    }
+
+}
diff --git a/e2e/content-services/comments/comment_component.e2e.ts b/e2e/content-services/comments/comment_component.e2e.ts
new file mode 100644
index 0000000000..46ba1e0e6b
--- /dev/null
+++ b/e2e/content-services/comments/comment_component.e2e.ts
@@ -0,0 +1,151 @@
+/*!
+ * @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 LoginPage = require('../../pages/adf/loginPage');
+import ContentServicesPage = require('../../pages/adf/contentServicesPage');
+import ViewerPage = require('../../pages/adf/viewerPage');
+import { CommentsPage } from '../../pages/adf/commentsPage';
+
+import AcsUserModel = require('../../models/ACS/acsUserModel');
+import FileModel = require('../../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';
+
+describe('Comment Component', () => {
+
+    let loginPage = new LoginPage();
+    let contentServicesPage = new ContentServicesPage();
+    let viewerPage = new ViewerPage();
+    let commentsPage = new CommentsPage();
+
+    let acsUser = new AcsUserModel();
+
+    let pngFileModel = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.PNG.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.PNG.file_location
+    });
+    let uploadActions = new UploadActions();
+    let nodeId, userFullName;
+
+    let comments = {
+        first: 'This is a comment',
+        multiline: 'This is a comment\n' + 'with a new line',
+        second: 'This is another comment',
+        codeType: `<form action="/action_page.php">
+        First name: <input type="text" name="fname"><br>
+            Last name: <input type="text" name="lname"><br>
+        <input type="submit" value="Submit">
+        </form>`
+    };
+
+    beforeAll(async (done) => {
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+        done();
+    });
+
+    beforeEach(async (done) => {
+
+        await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+
+        let pngUploadedFile = await uploadActions.uploadFile(this.alfrescoJsApi, pngFileModel.location, pngFileModel.name, '-my-');
+
+        nodeId = pngUploadedFile.entry.id;
+
+        userFullName = pngUploadedFile.entry.createdByUser.displayName;
+
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+
+        contentServicesPage.navigateToDocumentList();
+
+        done();
+    });
+
+    afterEach(async (done) => {
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, nodeId);
+
+        done();
+    });
+
+    it('[C276948] Should be able to add a comment on a file', () => {
+        viewerPage.viewFile(pngFileModel.name);
+        viewerPage.clickInfoButton();
+        viewerPage.checkInfoSideBarIsDisplayed();
+        viewerPage.clickOnCommentsTab();
+
+        commentsPage.addComment(comments.first);
+        commentsPage.checkUserIconIsDisplayed(0);
+
+        expect(commentsPage.getTotalNumberOfComments()).toEqual('Comments (1)');
+        expect(commentsPage.getMessage(0)).toEqual(comments.first);
+        expect(commentsPage.getUserName(0)).toEqual(userFullName);
+        expect(commentsPage.getTime(0)).toContain('ago');
+    });
+
+    it('[C280021] Should be able to add a multiline comment on a file', () => {
+        viewerPage.viewFile(pngFileModel.name);
+        viewerPage.clickInfoButton();
+        viewerPage.checkInfoSideBarIsDisplayed();
+        viewerPage.clickOnCommentsTab();
+
+        commentsPage.addComment(comments.multiline);
+        commentsPage.checkUserIconIsDisplayed(0);
+
+        expect(commentsPage.getTotalNumberOfComments()).toEqual('Comments (1)');
+        expect(commentsPage.getMessage(0)).toEqual(comments.multiline);
+        expect(commentsPage.getUserName(0)).toEqual(userFullName);
+        expect(commentsPage.getTime(0)).toContain('ago');
+
+        commentsPage.addComment(comments.second);
+        commentsPage.checkUserIconIsDisplayed(0);
+
+        expect(commentsPage.getTotalNumberOfComments()).toEqual('Comments (2)');
+        expect(commentsPage.getMessage(0)).toEqual(comments.second);
+        expect(commentsPage.getUserName(0)).toEqual(userFullName);
+        expect(commentsPage.getTime(0)).toContain('ago');
+    });
+
+    it('[C280022] Should not be able to add an HTML or other code input into the comment input filed', () => {
+        viewerPage.viewFile(pngFileModel.name);
+        viewerPage.clickInfoButton();
+        viewerPage.checkInfoSideBarIsDisplayed();
+        viewerPage.clickOnCommentsTab();
+
+        commentsPage.addComment(comments.codeType);
+        commentsPage.checkUserIconIsDisplayed(0);
+
+        expect(commentsPage.getTotalNumberOfComments()).toEqual('Comments (1)');
+        expect(commentsPage.getMessage(0)).toEqual('First name: Last name:');
+        expect(commentsPage.getUserName(0)).toEqual(userFullName);
+        expect(commentsPage.getTime(0)).toContain('ago');
+    });
+});
diff --git a/e2e/content-services/directives/create_folder_directive.e2e.ts b/e2e/content-services/directives/create_folder_directive.e2e.ts
new file mode 100644
index 0000000000..b1cb493b8c
--- /dev/null
+++ b/e2e/content-services/directives/create_folder_directive.e2e.ts
@@ -0,0 +1,140 @@
+/*!
+ * @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 LoginPage = require('../../pages/adf/loginPage');
+import ContentServicesPage = require('../../pages/adf/contentServicesPage');
+import CreateFolderDialog = require('../../pages/adf/dialog/createFolderDialog');
+import NotificationPage = require('../../pages/adf/notificationPage');
+import MetadataViewPage = require('../../pages/adf/metadataViewPage');
+import ContentListPage = require('../../pages/adf/dialog/contentList');
+
+import AcsUserModel = require('../../models/ACS/acsUserModel');
+
+import TestConfig = require('../../test.config');
+
+import AlfrescoApi = require('alfresco-js-api-node');
+import CONSTANTS = require('../../util/constants');
+
+import { browser, protractor } from 'protractor';
+
+describe('Document List - Pagination', function () {
+
+    let loginPage = new LoginPage();
+    let contentServicesPage = new ContentServicesPage();
+    let createFolderDialog = new CreateFolderDialog();
+    let notificationPage = new NotificationPage();
+    let metadataViewPage = new MetadataViewPage();
+    let contentListPage = new ContentListPage();
+
+    let acsUser = new AcsUserModel();
+    let consumerUser = new AcsUserModel();
+    let site;
+
+    beforeAll(async (done) => {
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+
+        contentServicesPage.goToDocumentList();
+
+        done();
+    });
+
+    afterEach(() => {
+        browser.actions().sendKeys(protractor.Key.ESCAPE).perform();
+    });
+
+    it('[C260154] Should not create the folder if cancel button is clicked', () => {
+        let folderName = 'cancelFolder';
+        contentServicesPage.clickOnCreateNewFolder();
+
+        createFolderDialog.addFolderName(folderName);
+        createFolderDialog.clickOnCancelButton();
+
+        contentServicesPage.checkContentIsNotDisplayed(folderName);
+    });
+
+    it('[C260155] Should enable the Create button only when a folder name is present', () => {
+        let folderName = 'NotEnableFolder';
+        contentServicesPage.clickOnCreateNewFolder();
+
+        createFolderDialog.checkCreateBtnIsDisabled();
+
+        createFolderDialog.addFolderName(folderName);
+
+        createFolderDialog.checkCreateBtnIsEnabled();
+    });
+
+    it('[C260156] Should not be possible create two folder with the same name', () => {
+        let folderName = 'duplicate';
+        contentServicesPage.createNewFolder(folderName);
+
+        contentServicesPage.checkContentIsDisplayed(folderName);
+
+        contentServicesPage.createNewFolder(folderName);
+
+        notificationPage.checkNotifyContains('There\'s already a folder with this name. Try a different name.');
+    });
+
+    it('[C260157] Should be possible create a folder under a folder with the same name', () => {
+        let folderName = 'sameSubFolder';
+
+        contentServicesPage.createNewFolder(folderName);
+        contentServicesPage.checkContentIsDisplayed(folderName);
+
+        contentServicesPage.navigateToFolder(folderName);
+
+        contentServicesPage.createNewFolder(folderName);
+        contentServicesPage.checkContentIsDisplayed(folderName);
+    });
+
+    it('[C260158] Should be possible add a folder description when create a new folder', () => {
+        let folderName = 'folderDescription';
+        let description = 'this is the description';
+
+        contentServicesPage.clickOnCreateNewFolder();
+
+        createFolderDialog.addFolderName(folderName);
+        createFolderDialog.addFolderDescription(description);
+
+        createFolderDialog.clickOnCreateButton();
+
+        contentServicesPage.checkContentIsDisplayed(folderName);
+
+        contentListPage.metadataContent(folderName);
+
+        expect(metadataViewPage.getPropertyText('properties.cm:description')).toEqual('this is the description');
+    });
+
+    it('[C260159] Should not be possible create a folder with banned carachter', () => {
+        let bannedChar = ['* ', '<', '>', '\\', '/', '?', ':', '|'];
+
+        contentServicesPage.clickOnCreateNewFolder();
+
+        bannedChar.forEach((currentChar) => {
+            createFolderDialog.addFolderName(currentChar);
+            createFolderDialog.checkCreateBtnIsDisabled();
+        });
+    });
+});
diff --git a/e2e/content-services/document_list_actions.e2e.ts b/e2e/content-services/document_list_actions.e2e.ts
new file mode 100644
index 0000000000..5bc28234b7
--- /dev/null
+++ b/e2e/content-services/document_list_actions.e2e.ts
@@ -0,0 +1,207 @@
+/*!
+ * @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 } from 'protractor';
+import LoginPage = require('../pages/adf/loginPage');
+import ContentServicesPage = require('../pages/adf/contentServicesPage');
+import ContentListPage = require('../pages/adf/dialog/contentList');
+import AcsUserModel = require('../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');
+
+describe('Document List Component - Actions', () => {
+
+    let loginPage = new LoginPage();
+    let contentServicesPage = new ContentServicesPage();
+    let contentListPage = new ContentListPage();
+    let uploadedFolder, secondUploadedFolder;
+    let uploadActions = new UploadActions();
+    let acsUser = null;
+    let testFileNode;
+
+    let pdfFileModel = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.PDF.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.PDF.file_location
+    });
+    let testFileModel = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.TEST.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.TEST.file_location
+    });
+
+    beforeAll(() => {
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+    });
+
+    afterEach(async (done) => {
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+        if (uploadedFolder) {
+            await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, uploadedFolder.entry.id);
+            uploadedFolder = null;
+        }
+        if (testFileNode) {
+            await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, testFileNode.entry.id);
+            testFileNode = null;
+        }
+        done();
+    });
+
+    describe('File Actions', () => {
+
+        let pdfUploadedNode;
+        let folderName;
+
+        beforeEach(async (done) => {
+            acsUser = new AcsUserModel();
+            folderName = `TATSUMAKY_${Util.generateRandomString(5)}_SENPOUKYAKU`;
+            await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+            await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+            await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+            pdfUploadedNode = await uploadActions.uploadFile(this.alfrescoJsApi, pdfFileModel.location, pdfFileModel.name, '-my-');
+            testFileNode = await uploadActions.uploadFile(this.alfrescoJsApi, testFileModel.location, testFileModel.name, '-my-');
+            uploadedFolder = await uploadActions.uploadFolder(this.alfrescoJsApi, folderName, '-my-');
+            done();
+        });
+
+        it('[C213257] - Copy File', () => {
+            loginPage.loginToContentServicesUsingUserModel(acsUser);
+            contentServicesPage.goToDocumentList();
+            contentListPage.rightClickOnRowNamed(pdfUploadedNode.entry.name);
+            contentListPage.pressContextMenuActionNamed('Copy');
+            contentServicesPage.typeIntoNodeSelectorSearchField(folderName);
+            contentServicesPage.clickContentNodeSelectorResult(folderName);
+            contentServicesPage.clickCopyButton();
+            contentServicesPage.checkAcsContainer();
+            contentServicesPage.checkContentIsDisplayed(pdfFileModel.name);
+            browser.get(TestConfig.adf.url + '/files/' + uploadedFolder.entry.id);
+            contentServicesPage.checkAcsContainer();
+            contentServicesPage.checkContentIsDisplayed(pdfFileModel.name);
+        });
+
+        it('[C280561] - Delete File', () => {
+            loginPage.loginToContentServicesUsingUserModel(acsUser);
+            contentServicesPage.goToDocumentList();
+            contentListPage.deleteContent(pdfFileModel.name);
+            contentListPage.checkContentIsNotDisplayed(pdfFileModel.name);
+            pdfUploadedNode = null;
+        });
+
+        it('[C280562] - Multiple Files Delete - Dropdown Menu', () => {
+            loginPage.loginToContentServicesUsingUserModel(acsUser);
+            contentServicesPage.goToDocumentList();
+            contentListPage.clickRowToSelect(pdfFileModel.name);
+            contentListPage.clickRowToSelect(testFileModel.name);
+            contentListPage.deleteContent(pdfFileModel.name);
+            contentListPage.checkContentIsNotDisplayed(pdfFileModel.name);
+            contentListPage.checkContentIsDisplayed(testFileModel.name);
+        });
+
+        it('[C280565] - Delete - Right Click', () => {
+            loginPage.loginToContentServicesUsingUserModel(acsUser);
+            contentServicesPage.goToDocumentList();
+            contentListPage.rightClickOnRowNamed(pdfFileModel.name);
+            contentListPage.pressContextMenuActionNamed('Delete');
+            contentListPage.checkContentIsNotDisplayed(pdfFileModel.name);
+            pdfUploadedNode = null;
+        });
+
+        it('[C280566] - Context Menu - Actions for file', () => {
+            loginPage.loginToContentServicesUsingUserModel(acsUser);
+            contentServicesPage.goToDocumentList();
+            contentListPage.rightClickOnRowNamed(pdfFileModel.name);
+            contentListPage.checkContextActionIsVisible('Download');
+            contentListPage.checkContextActionIsVisible('Copy');
+            contentListPage.checkContextActionIsVisible('Move');
+            contentListPage.checkContextActionIsVisible('Delete');
+            contentListPage.checkContextActionIsVisible('Info');
+            contentListPage.checkContextActionIsVisible('Manage versions');
+            contentListPage.checkContextActionIsVisible('Permission');
+            contentListPage.checkContextActionIsVisible('Lock');
+        });
+
+        it('[C280567] - Delete - Right click after multiselection of files', () => {
+            loginPage.loginToContentServicesUsingUserModel(acsUser);
+            contentServicesPage.goToDocumentList();
+            contentListPage.clickRowToSelect(pdfFileModel.name);
+            contentListPage.clickRowToSelect(testFileModel.name);
+            contentListPage.rightClickOnRowNamed(pdfFileModel.name);
+            contentListPage.pressContextMenuActionNamed('Delete');
+            contentListPage.checkContentIsNotDisplayed(pdfFileModel.name);
+            contentListPage.checkContentIsDisplayed(testFileModel.name);
+        });
+
+    });
+
+    describe('Folder Actions', () => {
+
+        let folderName, secondfolderName;
+
+        beforeEach(async (done) => {
+            acsUser = new AcsUserModel();
+            folderName = `TATSUMAKY_${Util.generateRandomString(5)}_SENPOUKYAKU`;
+            secondfolderName = `TATSUMAKY_${Util.generateRandomString(5)}_SENPOUKYAKU`;
+            await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+            await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+            await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+            uploadedFolder = await uploadActions.uploadFolder(this.alfrescoJsApi, folderName, '-my-');
+            secondUploadedFolder = await uploadActions.uploadFolder(this.alfrescoJsApi, secondfolderName, '-my-');
+            done();
+        });
+
+        it('[C260123] - Delete - Dropdown Menu', () => {
+            loginPage.loginToContentServicesUsingUserModel(acsUser);
+            contentServicesPage.goToDocumentList();
+            contentListPage.deleteContent(folderName);
+            contentListPage.checkContentIsNotDisplayed(folderName);
+            uploadedFolder = null;
+        });
+
+        it('[C280566] - Context Menu - Actions for folder', () => {
+            loginPage.loginToContentServicesUsingUserModel(acsUser);
+            contentServicesPage.goToDocumentList();
+            contentListPage.rightClickOnRowNamed(folderName);
+            contentListPage.checkContextActionIsVisible('Download');
+            contentListPage.checkContextActionIsVisible('Copy');
+            contentListPage.checkContextActionIsVisible('Move');
+            contentListPage.checkContextActionIsVisible('Delete');
+            contentListPage.checkContextActionIsVisible('Info');
+            contentListPage.checkContextActionIsVisible('Permission');
+        });
+
+        it('[C260138] - Copy - folder', () => {
+            loginPage.loginToContentServicesUsingUserModel(acsUser);
+            contentServicesPage.goToDocumentList();
+            contentListPage.copyContent(folderName);
+            contentServicesPage.typeIntoNodeSelectorSearchField(secondfolderName);
+            contentServicesPage.clickContentNodeSelectorResult(secondfolderName);
+            contentServicesPage.clickCopyButton();
+            contentServicesPage.checkAcsContainer();
+            contentServicesPage.checkContentIsDisplayed(folderName);
+            browser.get(TestConfig.adf.url + '/files/' + secondUploadedFolder.entry.id);
+            contentServicesPage.checkAcsContainer();
+            contentServicesPage.checkContentIsDisplayed(folderName);
+        });
+
+    });
+
+});
diff --git a/e2e/content-services/document_list_component.e2e.ts b/e2e/content-services/document_list_component.e2e.ts
new file mode 100644
index 0000000000..7a604fdce4
--- /dev/null
+++ b/e2e/content-services/document_list_component.e2e.ts
@@ -0,0 +1,705 @@
+/*!
+ * @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 } from 'protractor';
+import LoginPage = require('../pages/adf/loginPage');
+import ContentServicesPage = require('../pages/adf/contentServicesPage');
+import NavigationBarPage = require('../pages/adf/navigationBarPage');
+import AcsUserModel = require('../models/ACS/acsUserModel');
+import TestConfig = require('../test.config');
+import resources = require('../util/resources');
+import Util = require('../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 moment from 'moment-es6';
+
+describe('Document List Component', () => {
+
+    let loginPage = new LoginPage();
+    let contentServicesPage = new ContentServicesPage();
+    let navBar = new NavigationBarPage();
+    let errorPage = new ErrorPage();
+    let privateSite;
+    let uploadedFolder, uploadedFolderExtra;
+    let uploadActions = new UploadActions();
+    let acsUser = null;
+    let testFileNode, pdfBFileNode;
+
+    beforeAll(() => {
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+    });
+
+    afterEach(async (done) => {
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+        if (uploadedFolder) {
+            await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, uploadedFolder.entry.id);
+            uploadedFolder = null;
+        }
+        if (uploadedFolderExtra) {
+            await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, uploadedFolderExtra.entry.id);
+            uploadedFolderExtra = null;
+        }
+        if (testFileNode) {
+            await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, testFileNode.entry.id);
+            testFileNode = null;
+        }
+        if (pdfBFileNode) {
+            await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, pdfBFileNode.entry.id);
+            pdfBFileNode = null;
+        }
+        done();
+    });
+
+    describe('Permission Message', async () => {
+
+        beforeAll(async (done) => {
+            acsUser = new AcsUserModel();
+            let siteName = `PRIVATE_TEST_SITE_${Util.generateRandomString(5)}`;
+            let folderName = `MEESEEKS_${Util.generateRandomString(5)}`;
+            let privateSiteBody = { visibility: 'PRIVATE' , title: siteName};
+
+            await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+            await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+            privateSite = await this.alfrescoJsApi.core.sitesApi.createSite(privateSiteBody);
+
+            uploadedFolder = await uploadActions.uploadFolder(this.alfrescoJsApi, folderName, privateSite.entry.guid);
+
+            done();
+        });
+
+        afterAll(async(done) => {
+            await this.alfrescoJsApi.core.sitesApi.deleteSite(privateSite.entry.id);
+            done();
+        });
+
+        it('[C217334] - Error message displayed without permissions', () => {
+            loginPage.loginToContentServicesUsingUserModel(acsUser);
+            browser.get(TestConfig.adf.url + '/files/' + privateSite.entry.guid);
+            expect(errorPage.getErrorCode()).toBe('403');
+            expect(errorPage.getErrorDescription()).toBe('You\'re not allowed access to this resource on the server.');
+        });
+
+        it('[C279924] - Custom error message is displayed', () => {
+            loginPage.loginToContentServicesUsingUserModel(acsUser);
+            contentServicesPage.goToDocumentList();
+            contentServicesPage.enableCustomPermissionMessage();
+            browser.get(TestConfig.adf.url + '/files/' + privateSite.entry.guid);
+            expect(errorPage.getErrorCode()).toBe('403');
+        });
+
+        it('[C279925] - Message is translated', () => {
+            loginPage.loginToContentServicesUsingUserModel(acsUser);
+            navBar.openLanguageMenu();
+            navBar.chooseLanguage('Italian');
+            browser.sleep(2000);
+            browser.get(TestConfig.adf.url + '/files/' + privateSite.entry.guid);
+            expect(errorPage.getErrorDescription()).toBe('Accesso alla risorsa sul server non consentito.');
+        });
+
+    });
+
+    describe('Custom Column', () => {
+
+        let folderName;
+        let pdfFileModel = new FileModel({
+            'name': resources.Files.ADF_DOCUMENTS.PDF.file_name,
+            'location': resources.Files.ADF_DOCUMENTS.PDF.file_location
+        });
+        let docxFileModel = new FileModel({
+            'name': resources.Files.ADF_DOCUMENTS.DOCX.file_name,
+            'location': resources.Files.ADF_DOCUMENTS.DOCX.file_location
+        });
+        let timeAgoFileModel = new FileModel({
+            'name': resources.Files.ADF_DOCUMENTS.TEST.file_name,
+            'location': resources.Files.ADF_DOCUMENTS.TEST.file_location
+        });
+        let mediumFileModel = new FileModel({
+            'name': resources.Files.ADF_DOCUMENTS.PDF_B.file_name,
+            'location': resources.Files.ADF_DOCUMENTS.PDF_B.file_location
+        });
+
+        let pdfUploadedNode, docxUploadedNode, timeAgoUploadedNode, mediumDateUploadedNode;
+
+        beforeAll(async (done) => {
+
+            acsUser = new AcsUserModel();
+
+            folderName = `MEESEEKS_${Util.generateRandomString(5)}_LOOK_AT_ME`;
+
+            await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+            await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+            await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+            uploadedFolder = await uploadActions.uploadFolder(this.alfrescoJsApi, folderName, '-my-');
+            pdfUploadedNode = await uploadActions.uploadFile(this.alfrescoJsApi, pdfFileModel.location, pdfFileModel.name, '-my-');
+            docxUploadedNode = await uploadActions.uploadFile(this.alfrescoJsApi, docxFileModel.location, docxFileModel.name, '-my-');
+            done();
+        });
+
+        afterAll(async (done) => {
+            await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+            if (pdfUploadedNode) {
+                await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, pdfUploadedNode.entry.id);
+            }
+            if (docxUploadedNode) {
+                await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, docxUploadedNode.entry.id);
+            }
+            if (timeAgoUploadedNode) {
+                await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, timeAgoUploadedNode.entry.id);
+            }
+            if (mediumDateUploadedNode) {
+                await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, mediumDateUploadedNode.entry.id);
+            }
+            done();
+        });
+
+        it('[C279926] - Checks that only the files and folders of the users are showed', () => {
+            loginPage.loginToContentServicesUsingUserModel(acsUser);
+            contentServicesPage.goToDocumentList();
+            contentServicesPage.checkContentIsDisplayed(folderName);
+            contentServicesPage.checkContentIsDisplayed(pdfFileModel.name);
+            contentServicesPage.checkContentIsDisplayed(docxFileModel.name);
+            expect(contentServicesPage.getDocumentListRowNumber()).toBe(4);
+        });
+
+        it('[C279927] - All columns are showed', () => {
+            loginPage.loginToContentServicesUsingUserModel(acsUser);
+            contentServicesPage.goToDocumentList();
+            contentServicesPage.checkColumnNameHeader();
+            contentServicesPage.checkColumnSizeHeader();
+            contentServicesPage.checkColumnCreatedByHeader();
+            contentServicesPage.checkColumnCreatedHeader();
+        });
+
+        it('[C279928] - The date is showed with timeAgo', async (done) => {
+            await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+            timeAgoUploadedNode = await uploadActions.uploadFile(this.alfrescoJsApi, timeAgoFileModel.location, timeAgoFileModel.name, '-my-');
+            loginPage.loginToContentServicesUsingUserModel(acsUser);
+            contentServicesPage.goToDocumentList();
+            let dateValue = contentServicesPage.getColumnValueForRow(timeAgoFileModel.name, 'Created');
+            expect(dateValue).toContain('ago');
+            done();
+        });
+
+        it('[C279929] - The date is showed with date type', async (done) => {
+            await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+            mediumDateUploadedNode = await uploadActions.uploadFile(this.alfrescoJsApi, mediumFileModel.location, mediumFileModel.name, '-my-');
+            let createdDate = moment(mediumDateUploadedNode.createdAt).format('ll');
+            loginPage.loginToContentServicesUsingUserModel(acsUser);
+            contentServicesPage.goToDocumentList();
+            contentServicesPage.enableMediumTimeFormat();
+            let dateValue = contentServicesPage.getColumnValueForRow(mediumFileModel.name, 'Created');
+            expect(dateValue).toContain(createdDate);
+            done();
+        });
+    });
+
+    describe('Column Sorting', () => {
+
+        let fakeFileA = new FileModel({
+            'name': 'A',
+            'location': resources.Files.ADF_DOCUMENTS.TEST.file_location
+        });
+
+        let fakeFileB = new FileModel({
+            'name': 'B',
+            'location': resources.Files.ADF_DOCUMENTS.TEST.file_location
+        });
+
+        let fakeFileC = new FileModel({
+            'name': 'C',
+            'location': resources.Files.ADF_DOCUMENTS.TEST.file_location
+        });
+
+        let fileANode, fileBNode, fileCNode;
+
+        beforeAll(async (done) => {
+
+            acsUser = new AcsUserModel();
+
+            await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+            await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+            await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+            fileANode = await uploadActions.uploadFile(this.alfrescoJsApi, fakeFileA.location, fakeFileA.name, '-my-');
+            fileBNode = await uploadActions.uploadFile(this.alfrescoJsApi, fakeFileB.location, fakeFileB.name, '-my-');
+            fileCNode = await uploadActions.uploadFile(this.alfrescoJsApi, fakeFileC.location, fakeFileC.name, '-my-');
+            done();
+        });
+
+        afterAll(async (done) => {
+            await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+            if (fileANode) {
+                await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, fileANode.entry.id);
+            }
+            if (fileBNode) {
+                await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, fileBNode.entry.id);
+            }
+            if (fileCNode) {
+                await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, fileCNode.entry.id);
+            }
+            done();
+        });
+
+        it('[C260112] - Sorting ascending by name', () => {
+            loginPage.loginToContentServicesUsingUserModel(acsUser);
+            contentServicesPage.goToDocumentList();
+            contentServicesPage.sortAndCheckListIsOrderedByName('asc');
+        });
+
+        it('[C272770] - Sorting descending by name', () => {
+            loginPage.loginToContentServicesUsingUserModel(acsUser);
+            contentServicesPage.goToDocumentList();
+            contentServicesPage.sortAndCheckListIsOrderedByName('desc');
+        });
+
+        it('[C272771] - Sorting ascending by author', () => {
+            loginPage.loginToContentServicesUsingUserModel(acsUser);
+            contentServicesPage.goToDocumentList();
+            contentServicesPage.sortAndCheckListIsOrderedByAuthor('asc');
+        });
+
+        it('[C272772] - Sorting descending by author', () => {
+            loginPage.loginToContentServicesUsingUserModel(acsUser);
+            contentServicesPage.goToDocumentList();
+            contentServicesPage.sortAndCheckListIsOrderedByAuthor('desc');
+        });
+
+        it('[C272773] - Sorting ascending by created date', () => {
+            loginPage.loginToContentServicesUsingUserModel(acsUser);
+            contentServicesPage.goToDocumentList();
+            contentServicesPage.sortAndCheckListIsOrderedByCreated('asc');
+        });
+
+        it('[C272774] - Sorting descending by created date', () => {
+            loginPage.loginToContentServicesUsingUserModel(acsUser);
+            contentServicesPage.goToDocumentList();
+            contentServicesPage.sortAndCheckListIsOrderedByCreated('desc');
+        });
+    });
+
+    it('[C260121] - should show the spinner on loading', async (done) => {
+        acsUser = new AcsUserModel();
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+        contentServicesPage.clickOnContentServices();
+        contentServicesPage.checkSpinnerIsShowed();
+        done();
+    });
+
+    it('[C279959] - Empty Folder state is displayed for new folders', async (done) => {
+        acsUser = new AcsUserModel();
+
+        let folderName = 'BANANA';
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+        contentServicesPage.goToDocumentList();
+        contentServicesPage.createNewFolder(folderName);
+        contentServicesPage.navigateToFolder(folderName);
+        contentServicesPage.checkEmptyFolderTextToBe('This folder is empty');
+        contentServicesPage.checkEmptyFolderImageUrlToContain('/assets/images/empty_doc_lib.svg');
+        done();
+    });
+
+    it('[C272775] - File can be uploaded in a new created folder', async (done) => {
+        let testFile = new FileModel({
+            'name': resources.Files.ADF_DOCUMENTS.TEST.file_name,
+            'location': resources.Files.ADF_DOCUMENTS.TEST.file_location
+        });
+        acsUser = new AcsUserModel();
+        let folderName = `MEESEEKS_${Util.generateRandomString(5)}_LOOK_AT_ME`;
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+        await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+        uploadedFolder = await uploadActions.uploadFolder(this.alfrescoJsApi, folderName, '-my-');
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+        contentServicesPage.goToDocumentList();
+        contentServicesPage.checkContentIsDisplayed(uploadedFolder.entry.name);
+        contentServicesPage.navigateToFolder(uploadedFolder.entry.name);
+        contentServicesPage.uploadFile(testFile.location);
+        contentServicesPage.checkContentIsDisplayed(testFile.name);
+        done();
+    });
+
+    it('[C261997] - Recent Files empty', async (done) => {
+        acsUser = new AcsUserModel();
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+        contentServicesPage.clickOnContentServices();
+        contentServicesPage.checkRecentFileToBeShowed();
+        let icon = await contentServicesPage.getRecentFileIcon();
+        expect(icon).toBe('history');
+        contentServicesPage.expandRecentFiles();
+        contentServicesPage.checkEmptyRecentFileIsDisplayed();
+        contentServicesPage.closeRecentFiles();
+        done();
+    });
+
+    it('[C268119] - "ygj" letters rendering in document list', async (done) => {
+        acsUser = new AcsUserModel();
+        let folderName = 'ggggggjjjjjjjjjjjjyyyyyy';
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+        await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+        uploadedFolder = await uploadActions.uploadFolder(this.alfrescoJsApi, folderName, '-my-');
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+        contentServicesPage.clickOnContentServices();
+        let lineHeight = await contentServicesPage.getStyleValueForRowText(folderName, 'line-height');
+        let fontSize = await contentServicesPage.getStyleValueForRowText(folderName, 'font-size');
+        let actualFontValue = (parseInt(fontSize, 10) * 1.12).toFixed(2);
+        expect(lineHeight).toBe(actualFontValue + 'px');
+        done();
+    });
+
+    it('[C279970] - Custom column - isLocked field is showed for folders', async (done) => {
+        acsUser = new AcsUserModel();
+        let folderNameA = `MEESEEKS_${Util.generateRandomString(5)}_LOOK_AT_ME`;
+        let folderNameB = `MEESEEKS_${Util.generateRandomString(5)}_LOOK_AT_ME`;
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+        await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+        uploadedFolder = await uploadActions.uploadFolder(this.alfrescoJsApi, folderNameA, '-my-');
+        uploadedFolderExtra = await uploadActions.uploadFolder(this.alfrescoJsApi, folderNameB, '-my-');
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+        contentServicesPage.goToDocumentList();
+        contentServicesPage.checkContentIsDisplayed(folderNameA);
+        contentServicesPage.checkContentIsDisplayed(folderNameB);
+        contentServicesPage.checkLockIsDislpayedForElement(folderNameA);
+        contentServicesPage.checkLockIsDislpayedForElement(folderNameB);
+        done();
+    });
+
+    it('[C269086] - Custom column - IsLocked field is showed for files', async (done) => {
+        let testFileA = new FileModel({
+            'name': resources.Files.ADF_DOCUMENTS.TEST.file_name,
+            'location': resources.Files.ADF_DOCUMENTS.TEST.file_location
+        });
+        let testFileB = new FileModel({
+            'name': resources.Files.ADF_DOCUMENTS.PDF_B.file_name,
+            'location': resources.Files.ADF_DOCUMENTS.PDF_B.file_location
+        });
+        acsUser = new AcsUserModel();
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+        await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+        testFileNode = await uploadActions.uploadFile(this.alfrescoJsApi, testFileA.location, testFileA.name, '-my-');
+        pdfBFileNode = await uploadActions.uploadFile(this.alfrescoJsApi, testFileB.location, testFileB.name, '-my-');
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+        contentServicesPage.goToDocumentList();
+        contentServicesPage.checkContentIsDisplayed(testFileA.name);
+        contentServicesPage.checkContentIsDisplayed(testFileB.name);
+        contentServicesPage.checkLockIsDislpayedForElement(testFileA.name);
+        contentServicesPage.checkLockIsDislpayedForElement(testFileB.name);
+        done();
+    });
+
+    describe('Once uploaded 20 folders', () => {
+
+        let folderCreated;
+
+        beforeAll(async (done) => {
+            acsUser = new AcsUserModel();
+            folderCreated = [];
+            await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+            await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+            await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+            let folderName = '';
+            let folder = null;
+            for (let i = 0; i < 20; i++) {
+                folderName = `MEESEEKS_000${i}`;
+                folder = await uploadActions.uploadFolder(this.alfrescoJsApi, folderName, '-my-');
+                folderCreated.push(folder);
+            }
+            done();
+        });
+
+        afterAll(async (done) => {
+            Promise.all(folderCreated.map((folder) =>
+                uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, folder.entry.id)
+            )).then(
+                done()
+            );
+        });
+
+        it('[C277093] - Sorting files with Items per page set to default', async (done) => {
+            loginPage.loginToContentServicesUsingUserModel(acsUser);
+            contentServicesPage.goToDocumentList();
+            contentServicesPage.checkListIsSortedByNameColumn('asc');
+            done();
+        });
+
+    });
+
+    describe('Thumbnails and tooltips', () => {
+
+        let pdfFile = new FileModel({
+            'name': resources.Files.ADF_DOCUMENTS.PDF.file_name,
+            'location': resources.Files.ADF_DOCUMENTS.PDF.file_location
+        });
+
+        let testFile = new FileModel({
+            'name': resources.Files.ADF_DOCUMENTS.TEST.file_name,
+            'location': resources.Files.ADF_DOCUMENTS.TEST.file_location
+        });
+
+        let docxFile = new FileModel({
+            'name': resources.Files.ADF_DOCUMENTS.DOCX.file_name,
+            'location': resources.Files.ADF_DOCUMENTS.DOCX.file_location
+        });
+        let folderName = `MEESEEKS_${Util.generateRandomString(5)}_LOOK_AT_ME`;
+        let filePdfNode, fileTestNode, fileDocxNode, folderNode;
+
+        beforeAll(async (done) => {
+            acsUser = new AcsUserModel();
+            await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+            await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+            await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+            filePdfNode = await uploadActions.uploadFile(this.alfrescoJsApi, pdfFile.location, pdfFile.name, '-my-');
+            fileTestNode = await uploadActions.uploadFile(this.alfrescoJsApi, testFile.location, testFile.name, '-my-');
+            fileDocxNode = await uploadActions.uploadFile(this.alfrescoJsApi, docxFile.location, docxFile.name, '-my-');
+            folderNode = await uploadActions.uploadFolder(this.alfrescoJsApi, folderName, '-my-');
+
+            done();
+        });
+
+        afterAll(async (done) => {
+            await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+            if (filePdfNode) {
+                await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, filePdfNode.entry.id);
+            }
+            if (fileTestNode) {
+                await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, fileTestNode.entry.id);
+            }
+            if (fileDocxNode) {
+                await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, fileDocxNode.entry.id);
+            }
+            if (folderNode) {
+                await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, folderNode.entry.id);
+            }
+            done();
+        });
+
+        beforeEach( () => {
+            loginPage.loginToContentServicesUsingUserModel(acsUser);
+            contentServicesPage.goToDocumentList();
+        });
+
+        it('[C260108] - File tooltip', () => {
+            expect(contentServicesPage.getTooltip(pdfFile.name)).toEqual(pdfFile.name);
+        });
+
+        it('[C260109] - Folder tooltip', () => {
+            expect(contentServicesPage.getTooltip(folderName)).toEqual(folderName);
+        });
+
+        it('[C260119] - Thumbnail - Disabled - folder', async (done) => {
+            let folderIconUrl = await contentServicesPage.getRowIconImageUrl(folderName);
+            expect(folderIconUrl).toContain('/assets/images/ft_ic_folder.svg');
+            done();
+        });
+
+        it('[C280066] - Thumbnail - Disabled - pdf file', async (done) => {
+            let fileIconUrl = await contentServicesPage.getRowIconImageUrl(pdfFile.name);
+            expect(fileIconUrl).toContain('/assets/images/ft_ic_pdf.svg');
+            done();
+        });
+
+        it('[C280067] - Thumbnail - Disabled - docx file', async (done) => {
+            let fileIconUrl = await contentServicesPage.getRowIconImageUrl(docxFile.name);
+            expect(fileIconUrl).toContain('/assets/images/ft_ic_ms_word.svg');
+            done();
+        });
+
+        it('[C280068] - Thumbnail - Disabled - test file', async (done) => {
+            let fileIconUrl = await contentServicesPage.getRowIconImageUrl(testFile.name);
+            expect(fileIconUrl).toContain('/assets/images/ft_ic_document.svg');
+            done();
+        });
+
+        it('[C274701] - Thumbnails - Enabled', async (done) => {
+            contentServicesPage.enableThumbnails();
+            contentServicesPage.checkAcsContainer();
+            let fileIconUrl = await contentServicesPage.getRowIconImageUrl(pdfFile.name);
+            expect(fileIconUrl).toContain(`/versions/1/nodes/${filePdfNode.entry.id}/renditions`);
+            done();
+        });
+    });
+
+    describe('Gallery View', () => {
+
+        let cardProperties = {
+            DISPLAY_NAME : 'Display name',
+            SIZE: 'Size',
+            LOCK: 'Lock',
+            CREATED_BY: 'Created by',
+            CREATED: 'Created'
+        };
+
+        let funnyUser = {};
+
+        let pdfFile = new FileModel({
+            'name': resources.Files.ADF_DOCUMENTS.PDF.file_name,
+            'location': resources.Files.ADF_DOCUMENTS.PDF.file_location
+        });
+
+        let testFile = new FileModel({
+            'name': resources.Files.ADF_DOCUMENTS.TEST.file_name,
+            'location': resources.Files.ADF_DOCUMENTS.TEST.file_location
+        });
+
+        let docxFile = new FileModel({
+            'name': resources.Files.ADF_DOCUMENTS.DOCX.file_name,
+            'location': resources.Files.ADF_DOCUMENTS.DOCX.file_location
+        });
+        let folderName = `MEESEEKS_${Util.generateRandomString(5)}_LOOK_AT_ME`;
+        let filePdfNode, fileTestNode, fileDocxNode, folderNode, filePDFSubNode;
+
+        beforeAll(async (done) => {
+            acsUser = new AcsUserModel();
+            await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+            funnyUser = await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+            await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+            filePdfNode = await uploadActions.uploadFile(this.alfrescoJsApi, pdfFile.location, pdfFile.name, '-my-');
+            fileTestNode = await uploadActions.uploadFile(this.alfrescoJsApi, testFile.location, testFile.name, '-my-');
+            fileDocxNode = await uploadActions.uploadFile(this.alfrescoJsApi, docxFile.location, docxFile.name, '-my-');
+            folderNode = await uploadActions.uploadFolder(this.alfrescoJsApi, folderName, '-my-');
+            filePDFSubNode = await uploadActions.uploadFile(this.alfrescoJsApi, pdfFile.location, pdfFile.name, folderNode.entry.id);
+
+            done();
+        });
+
+        beforeEach( () => {
+            loginPage.loginToContentServicesUsingUserModel(acsUser);
+            contentServicesPage.goToDocumentList();
+            contentServicesPage.clickGridViewButton();
+            contentServicesPage.checkCardViewContainerIsDisplayed();
+        });
+
+        it('[C280016] - Gallery view is showed', () => {
+            expect(contentServicesPage.getCardElementShowedInPage()).toBe(4);
+        });
+
+        it('[C280023] - Gallery Card show details', () => {
+            expect(contentServicesPage.getDocumentCardIconForElement(folderName)).toContain('/assets/images/ft_ic_folder.svg');
+            expect(contentServicesPage.getDocumentCardIconForElement(pdfFile.name)).toContain('/assets/images/ft_ic_pdf.svg');
+            expect(contentServicesPage.getDocumentCardIconForElement(docxFile.name)).toContain('/assets/images/ft_ic_ms_word.svg');
+            expect(contentServicesPage.getDocumentCardIconForElement(testFile.name)).toContain('/assets/images/ft_ic_document.svg');
+            contentServicesPage.checkMenuIsShowedForElementIndex(0);
+            contentServicesPage.checkMenuIsShowedForElementIndex(1);
+            contentServicesPage.checkMenuIsShowedForElementIndex(2);
+            contentServicesPage.checkMenuIsShowedForElementIndex(3);
+        });
+
+        it('[C280069] - Gallery Card show details - attributes', () => {
+            contentServicesPage.checkDocumentCardPropertyIsShowed(folderName, cardProperties.DISPLAY_NAME);
+            contentServicesPage.checkDocumentCardPropertyIsShowed(folderName, cardProperties.SIZE);
+            contentServicesPage.checkDocumentCardPropertyIsShowed(folderName, cardProperties.CREATED_BY);
+            contentServicesPage.checkDocumentCardPropertyIsShowed(folderName, cardProperties.CREATED);
+
+            expect(contentServicesPage.getAttributeValueForElement(folderName, cardProperties.DISPLAY_NAME)).toBe(folderName);
+            expect(contentServicesPage.getAttributeValueForElement(folderName, cardProperties.CREATED_BY)).toBe(`${funnyUser.entry.firstName} ${funnyUser.entry.lastName}`);
+
+            expect(contentServicesPage.getAttributeValueForElement(folderName, cardProperties.CREATED)).toContain('ago');
+
+            expect(contentServicesPage.getAttributeValueForElement(pdfFile.name, cardProperties.DISPLAY_NAME)).toBe(pdfFile.name);
+            expect(contentServicesPage.getAttributeValueForElement(pdfFile.name, cardProperties.SIZE)).toBe(`702.76 KB`);
+            expect(contentServicesPage.getAttributeValueForElement(pdfFile.name, cardProperties.CREATED_BY)).toBe(`${funnyUser.entry.firstName} ${funnyUser.entry.lastName}`);
+
+            expect(contentServicesPage.getAttributeValueForElement(pdfFile.name, cardProperties.CREATED)).toContain('ago');
+
+            expect(contentServicesPage.getAttributeValueForElement(docxFile.name, cardProperties.DISPLAY_NAME)).toBe(docxFile.name);
+            expect(contentServicesPage.getAttributeValueForElement(docxFile.name, cardProperties.SIZE)).toBe(`770.35 KB`);
+            expect(contentServicesPage.getAttributeValueForElement(docxFile.name, cardProperties.CREATED_BY)).toBe(`${funnyUser.entry.firstName} ${funnyUser.entry.lastName}`);
+
+            expect(contentServicesPage.getAttributeValueForElement(docxFile.name, cardProperties.CREATED)).toContain('ago');
+
+            expect(contentServicesPage.getAttributeValueForElement(testFile.name, cardProperties.DISPLAY_NAME)).toBe(testFile.name);
+            expect(contentServicesPage.getAttributeValueForElement(testFile.name, cardProperties.SIZE)).toBe(`14 Bytes`);
+            expect(contentServicesPage.getAttributeValueForElement(testFile.name, cardProperties.CREATED_BY)).toBe(`${funnyUser.entry.firstName} ${funnyUser.entry.lastName}`);
+
+            expect(contentServicesPage.getAttributeValueForElement(testFile.name, cardProperties.CREATED)).toContain('ago');
+        });
+
+        it('[C280129] - Gallery Card show details - subfolder gallery displayed', () => {
+            contentServicesPage.navigateToCardFolder(folderName);
+            expect(contentServicesPage.getCardElementShowedInPage()).toBe(1);
+            expect(contentServicesPage.getDocumentCardIconForElement(pdfFile.name)).toContain('/assets/images/ft_ic_pdf.svg');
+        });
+
+        it('[C280130] - Gallery Card show details - back to list view', () => {
+            contentServicesPage.clickGridViewButton();
+            contentServicesPage.checkAcsContainer();
+            contentServicesPage.navigateToFolder(folderName);
+            contentServicesPage.checkRowIsDisplayed(pdfFile.name);
+        });
+
+        it('[C261993] - Sort by Display name', () => {
+            contentServicesPage.selectGridSortingFromDropdown(cardProperties.DISPLAY_NAME);
+            contentServicesPage.checkListIsSortedByNameColumn('asc');
+        });
+
+        it('[C261994] - Sort by Size', () => {
+            contentServicesPage.selectGridSortingFromDropdown(cardProperties.SIZE);
+            contentServicesPage.checkListIsSortedBySizeColumn('asc');
+        });
+
+        it('[C261995] - Sort by Author', () => {
+            contentServicesPage.selectGridSortingFromDropdown(cardProperties.CREATED_BY);
+            contentServicesPage.checkListIsSortedByAuthorColumn('asc');
+        });
+
+        it('[C261996] - Sort by Created', () => {
+            contentServicesPage.selectGridSortingFromDropdown(cardProperties.CREATED);
+            contentServicesPage.checkListIsSortedByCreatedColumn('asc');
+        });
+
+        afterAll(async (done) => {
+            await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+            if (filePdfNode) {
+                await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, filePdfNode.entry.id);
+            }
+            if (fileTestNode) {
+                await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, fileTestNode.entry.id);
+            }
+            if (fileDocxNode) {
+                await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, fileDocxNode.entry.id);
+            }
+            if (filePDFSubNode) {
+                await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, filePDFSubNode.entry.id);
+            }
+            if (folderNode) {
+                await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, folderNode.entry.id);
+            }
+            done();
+        });
+    });
+});
diff --git a/e2e/content-services/document_list_pagination.e2e.ts b/e2e/content-services/document_list_pagination.e2e.ts
new file mode 100644
index 0000000000..07d875f4a8
--- /dev/null
+++ b/e2e/content-services/document_list_pagination.e2e.ts
@@ -0,0 +1,365 @@
+/*!
+ * @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 LoginPage = require('../pages/adf/loginPage');
+import ContentServicesPage = require('../pages/adf/contentServicesPage');
+import PaginationPage = require('../pages/adf/paginationPage');
+import NavigationBarPage = require('../pages/adf/navigationBarPage');
+
+import AcsUserModel = require('../models/ACS/acsUserModel');
+import FolderModel = require('../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';
+
+describe('Document List - Pagination', function () {
+    let pagination = {
+        base: 'newFile',
+        secondSetBase: 'secondSet',
+        extension: '.txt'
+    };
+
+    let itemsPerPage = {
+        five: '5',
+        fiveValue: 5,
+        ten: '10',
+        tenValue: 10,
+        fifteen: '15',
+        fifteenValue: 15,
+        twenty: '20',
+        twentyValue: 20,
+        default: '25'
+    };
+
+    let loginPage = new LoginPage();
+    let contentServicesPage = new ContentServicesPage();
+    let paginationPage = new PaginationPage();
+    let navigationBarPage = new NavigationBarPage();
+
+    let acsUser = new AcsUserModel();
+    let newFolderModel = new FolderModel({ 'name': 'newFolder' });
+    let fileNames = [], nrOfFiles = 20, currentPage = 1, secondSetOfFiles, secondSetNumber = 20;
+    let folderTwoModel = new FolderModel({ 'name': 'folderTwo' });
+    let folderThreeModel = new FolderModel({ 'name': 'folderThree' });
+
+    beforeAll(async (done) => {
+        let uploadActions = new UploadActions();
+
+        fileNames = Util.generateSeqeunceFiles(10, nrOfFiles + 9, pagination.base, pagination.extension);
+        secondSetOfFiles = Util.generateSeqeunceFiles(10, secondSetNumber + 9, pagination.secondSetBase, pagination.extension);
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+        await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+
+        let folderThreeUploadedModel = await uploadActions.uploadFolder(this.alfrescoJsApi, folderThreeModel.name, '-my-');
+        let newFolderUploadeModel = await uploadActions.uploadFolder(this.alfrescoJsApi, newFolderModel.name, '-my-');
+
+        await uploadActions.createEmptyFiles(this.alfrescoJsApi, fileNames, newFolderUploadeModel.entry.id);
+
+        await uploadActions.createEmptyFiles(this.alfrescoJsApi, fileNames, folderThreeUploadedModel.entry.id);
+
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+
+        done();
+    });
+
+    it('[C260062] Default pagination settings', function () {
+        contentServicesPage.goToDocumentList();
+        contentServicesPage.navigateToFolder(newFolderModel.name);
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.twenty);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + nrOfFiles + ' of ' + nrOfFiles);
+        expect(contentServicesPage.numberOfResultsDisplayed()).toBe(nrOfFiles);
+        contentServicesPage.getAllRowsNameColumn().then(function (list) {
+            expect(Util.arrayContainsArray(list, fileNames)).toEqual(true);
+        });
+        paginationPage.checkNextPageButtonIsDisabled();
+        paginationPage.checkPreviousPageButtonIsDisabled();
+    });
+
+    it('[C274713] 20 Items per page', function () {
+        contentServicesPage.goToDocumentList();
+        contentServicesPage.navigateToFolder(newFolderModel.name);
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+        paginationPage.selectItemsPerPage(itemsPerPage.twenty);
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.twenty);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + nrOfFiles + ' of ' + nrOfFiles);
+        expect(contentServicesPage.numberOfResultsDisplayed()).toBe(nrOfFiles);
+        contentServicesPage.getAllRowsNameColumn().then(function (list) {
+            expect(Util.arrayContainsArray(list, fileNames)).toEqual(true);
+        });
+        paginationPage.checkNextPageButtonIsDisabled();
+        paginationPage.checkPreviousPageButtonIsDisabled();
+
+        navigationBarPage.clickLogoutButton();
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+        contentServicesPage.goToDocumentList();
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.twenty);
+        navigationBarPage.clickLogoutButton();
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+    });
+
+    it('[C260069] 5 Items per page', function () {
+        contentServicesPage.goToDocumentList();
+        contentServicesPage.navigateToFolder(newFolderModel.name);
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+        paginationPage.selectItemsPerPage(itemsPerPage.five);
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.five);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + itemsPerPage.fiveValue * currentPage + ' of ' + nrOfFiles);
+        expect(contentServicesPage.numberOfResultsDisplayed()).toBe(itemsPerPage.fiveValue);
+        contentServicesPage.getAllRowsNameColumn().then(function (list) {
+            expect(Util.arrayContainsArray(list, fileNames.slice(0, 5))).toEqual(true);
+        });
+        paginationPage.clickOnNextPage();
+        currentPage++;
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.five);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 6-' + itemsPerPage.fiveValue * currentPage + ' of ' + nrOfFiles);
+        expect(contentServicesPage.numberOfResultsDisplayed()).toBe(itemsPerPage.fiveValue);
+        contentServicesPage.getAllRowsNameColumn().then(function (list) {
+            expect(Util.arrayContainsArray(list, fileNames.slice(5, 10))).toEqual(true);
+        });
+        paginationPage.clickOnNextPage();
+        currentPage++;
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.five);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 11-' + itemsPerPage.fiveValue * currentPage + ' of ' + nrOfFiles);
+        expect(contentServicesPage.numberOfResultsDisplayed()).toBe(itemsPerPage.fiveValue);
+        contentServicesPage.getAllRowsNameColumn().then(function (list) {
+            expect(Util.arrayContainsArray(list, fileNames.slice(10, 15))).toEqual(true);
+        });
+        paginationPage.clickOnNextPage();
+        currentPage++;
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.five);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 16-' + itemsPerPage.fiveValue * currentPage + ' of ' + nrOfFiles);
+        expect(contentServicesPage.numberOfResultsDisplayed()).toBe(itemsPerPage.fiveValue);
+        contentServicesPage.getAllRowsNameColumn().then(function (list) {
+            expect(Util.arrayContainsArray(list, fileNames.slice(15, 20))).toEqual(true);
+        });
+
+        navigationBarPage.clickLogoutButton();
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+        contentServicesPage.goToDocumentList();
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.five);
+        navigationBarPage.clickLogoutButton();
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+    });
+
+    it('[C260067] 10 Items per page', function () {
+        currentPage = 1;
+        contentServicesPage.goToDocumentList();
+        contentServicesPage.navigateToFolder(newFolderModel.name);
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+        paginationPage.selectItemsPerPage(itemsPerPage.ten);
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.ten);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + itemsPerPage.tenValue * currentPage + ' of ' + nrOfFiles);
+        expect(contentServicesPage.numberOfResultsDisplayed()).toBe(itemsPerPage.tenValue);
+        contentServicesPage.getAllRowsNameColumn().then(function (list) {
+            expect(Util.arrayContainsArray(list, fileNames.slice(0, 10))).toEqual(true);
+        });
+        paginationPage.clickOnNextPage();
+        currentPage++;
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.ten);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 11-' + itemsPerPage.tenValue * currentPage + ' of ' + nrOfFiles);
+        expect(contentServicesPage.numberOfResultsDisplayed()).toBe(itemsPerPage.tenValue);
+        contentServicesPage.getAllRowsNameColumn().then(function (list) {
+            expect(Util.arrayContainsArray(list, fileNames.slice(10, 20))).toEqual(true);
+        });
+
+        navigationBarPage.clickLogoutButton();
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+        contentServicesPage.goToDocumentList();
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.ten);
+        navigationBarPage.clickLogoutButton();
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+        currentPage = 1;
+    });
+
+    it('[C260065] 15 Items per page', function () {
+        currentPage = 1;
+        contentServicesPage.goToDocumentList();
+        contentServicesPage.navigateToFolder(newFolderModel.name);
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+        expect(contentServicesPage.getActiveBreadcrumb()).toEqual(newFolderModel.name);
+        paginationPage.selectItemsPerPage(itemsPerPage.fifteen);
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.fifteen);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + itemsPerPage.fifteenValue * currentPage + ' of ' + nrOfFiles);
+        expect(contentServicesPage.numberOfResultsDisplayed()).toBe(itemsPerPage.fifteenValue);
+        contentServicesPage.getAllRowsNameColumn().then(function (list) {
+            expect(Util.arrayContainsArray(list, fileNames.slice(0, 15))).toEqual(true);
+        });
+        currentPage++;
+        paginationPage.clickOnNextPage();
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.fifteen);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 16-' + nrOfFiles + ' of ' + nrOfFiles);
+        expect(contentServicesPage.numberOfResultsDisplayed()).toBe(nrOfFiles - itemsPerPage.fifteenValue);
+        contentServicesPage.getAllRowsNameColumn().then(function (list) {
+            expect(Util.arrayContainsArray(list, fileNames.slice(15, 20))).toEqual(true);
+        });
+
+        navigationBarPage.clickLogoutButton();
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+        contentServicesPage.goToDocumentList();
+        contentServicesPage.checkAcsContainer();
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.fifteen);
+    });
+
+    xit('[C91320] Pagination when the content is sorted', function () {
+        contentServicesPage.goToDocumentList();
+        contentServicesPage.navigateToFolder(newFolderModel.name);
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+        expect(contentServicesPage.getActiveBreadcrumb()).toEqual(newFolderModel.name);
+        paginationPage.selectItemsPerPage(itemsPerPage.twenty);
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+        contentServicesPage.getAllRowsNameColumn().then(function (list) {
+            expect(JSON.stringify(list) === JSON.stringify(fileNames)).toEqual(true);
+        });
+        contentServicesPage.sortByName(false);
+        contentServicesPage.getAllRowsNameColumn().then(function (list) {
+            fileNames.reverse();
+            expect(JSON.stringify(list) === JSON.stringify(fileNames)).toEqual(true);
+        });
+
+        paginationPage.selectItemsPerPage(itemsPerPage.five);
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+        contentServicesPage.getAllRowsNameColumn().then(function (list) {
+            expect(JSON.stringify(list) === JSON.stringify(fileNames.slice(15, 20))).toEqual(true);
+        });
+
+        paginationPage.clickOnNextPage();
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+        contentServicesPage.getAllRowsNameColumn().then(function (list) {
+            expect(JSON.stringify(list) === JSON.stringify(fileNames.slice(10, 15))).toEqual(true);
+        });
+
+        paginationPage.selectItemsPerPage(itemsPerPage.ten);
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+        contentServicesPage.getAllRowsNameColumn().then(function (list) {
+            expect(JSON.stringify(list) === JSON.stringify(fileNames.slice(10, 20))).toEqual(true);
+        });
+    });
+
+    it('[C260107] Pagination in an empty folder', function () {
+        contentServicesPage.goToDocumentList();
+        paginationPage.selectItemsPerPage(itemsPerPage.five);
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.five);
+        contentServicesPage.navigateToFolder(newFolderModel.name);
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+        expect(contentServicesPage.getActiveBreadcrumb()).toEqual(newFolderModel.name);
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.five);
+        contentServicesPage.createNewFolder(folderTwoModel.name).checkContentIsDisplayed(folderTwoModel.name);
+        contentServicesPage.navigateToFolder(folderTwoModel.name);
+        contentServicesPage.checkPaginationIsNotDisplayed();
+    });
+
+    xit('[C260071] Items per page when having 25 files', function () {
+        currentPage = 1;
+        contentServicesPage.goToDocumentList();
+        contentServicesPage.navigateToFolder(folderThreeModel.name);
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+        expect(contentServicesPage.getActiveBreadcrumb()).toEqual(folderThreeModel.name);
+        paginationPage.selectItemsPerPage(itemsPerPage.fifteen);
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.fifteen);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + itemsPerPage.fifteenValue * currentPage + ' of ' + secondSetNumber);
+        expect(contentServicesPage.numberOfResultsDisplayed()).toBe(itemsPerPage.fifteenValue);
+        contentServicesPage.getAllRowsNameColumn().then(function (list) {
+            expect(Util.arrayContainsArray(list, secondSetOfFiles.slice(0, 15))).toEqual(true);
+        });
+
+        currentPage++;
+        paginationPage.clickOnNextPage();
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.fifteen);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 16-' + secondSetNumber + ' of ' + secondSetNumber);
+        expect(contentServicesPage.numberOfResultsDisplayed()).toBe(secondSetNumber - itemsPerPage.fifteenValue);
+        contentServicesPage.getAllRowsNameColumn().then(function (list) {
+            expect(Util.arrayContainsArray(list, secondSetOfFiles.slice(15, 25))).toEqual(true);
+        });
+
+        currentPage = 1;
+        paginationPage.selectItemsPerPage(itemsPerPage.twenty);
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.twenty);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + itemsPerPage.twentyValue * currentPage + ' of ' + secondSetNumber);
+        expect(contentServicesPage.numberOfResultsDisplayed()).toBe(itemsPerPage.twentyValue);
+        contentServicesPage.getAllRowsNameColumn().then(function (list) {
+            expect(Util.arrayContainsArray(list, secondSetOfFiles.slice(0, 20))).toEqual(true);
+        });
+
+        currentPage++;
+        paginationPage.clickOnNextPage();
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.twenty);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 21-' + secondSetNumber + ' of ' + secondSetNumber);
+        expect(contentServicesPage.numberOfResultsDisplayed()).toBe(secondSetNumber - itemsPerPage.twentyValue);
+        contentServicesPage.getAllRowsNameColumn().then(function (list) {
+            expect(Util.arrayContainsArray(list, secondSetOfFiles.slice(20, 25))).toEqual(true);
+        });
+    });
+});
diff --git a/e2e/content-services/notifications_component.e2e.ts b/e2e/content-services/notifications_component.e2e.ts
new file mode 100644
index 0000000000..a4f6acbc1f
--- /dev/null
+++ b/e2e/content-services/notifications_component.e2e.ts
@@ -0,0 +1,111 @@
+/*!
+ * @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 LoginPage = require('../pages/adf/loginPage');
+
+import AcsUserModel = require('../models/ACS/acsUserModel');
+
+import TestConfig = require('../test.config');
+
+import AlfrescoApi = require('alfresco-js-api-node');
+
+import NotificationPage = require('../pages/adf/notificationPage');
+
+describe('Notifications Component', () => {
+
+    let loginPage = new LoginPage();
+    let notificationPage = new NotificationPage();
+
+    let acsUser = new AcsUserModel();
+
+    beforeAll(async (done) => {
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+        await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+
+        notificationPage.goToNotificationsPage();
+
+        done();
+    });
+
+    it('[C279977] Should show notification when the message is not empty and button is clicked', () => {
+        notificationPage.enterMessageField('Notification test');
+        notificationPage.clickDefaultNotificationButton();
+        notificationPage.checkNotificationSnackBarIsDisplayedWithMessage('Notification test');
+    });
+
+    it('[C279979] Should not show notification when the message is empty and button is clicked', () => {
+        notificationPage.enterMessageField('');
+        notificationPage.clickDefaultNotificationButton();
+        notificationPage.checkNotificationSnackBarIsNotDisplayed();
+    });
+
+    it('[C279978] Should show notification with action when the message is not empty and button is clicked', () => {
+        notificationPage.enterMessageField('Notification test');
+        notificationPage.clickActionToggle();
+        notificationPage.clickDefaultNotificationButton();
+        notificationPage.checkNotificationSnackBarIsDisplayedWithMessage('Notification test');
+        notificationPage.clickActionButton();
+        notificationPage.checkActionEvent();
+        notificationPage.clickActionToggle();
+    });
+
+    it('[C279981] Should show notification with action when the message is not empty and custom configuration button is clicked', () => {
+        notificationPage.enterMessageField('Notification test');
+        notificationPage.clickCustomNotificationButton();
+        notificationPage.checkNotificationSnackBarIsDisplayed();
+    });
+
+    it('[C279987] Should show custom notification during a limited time when a duration is added', () => {
+        notificationPage.enterMessageField('Notification test');
+        notificationPage.enterDurationField(1000);
+        notificationPage.clickCustomNotificationButton();
+        notificationPage.checkNotificationSnackBarIsDisplayed();
+        browser.sleep(1000);
+        notificationPage.checkNotificationSnackBarIsNotDisplayed();
+    });
+
+    it('[C280000] Should show notification with action when the message is not empty and custom button is clicked', () => {
+        notificationPage.enterMessageField('Notification test');
+        notificationPage.clickActionToggle();
+        notificationPage.clickCustomNotificationButton();
+        notificationPage.checkNotificationSnackBarIsDisplayedWithMessage('Notification test');
+        notificationPage.clickActionButton();
+        notificationPage.checkActionEvent();
+        notificationPage.clickActionToggle();
+    });
+
+    it('[C280001] Should meet configuration when a custom notification is set', () => {
+        notificationPage.enterMessageField('Notification test');
+        notificationPage.enterDurationField(1000);
+        notificationPage.selectHorizontalPosition('Right');
+        notificationPage.selectVerticalPosition('Top');
+        notificationPage.selectDirection('Left to right');
+        notificationPage.clickCustomNotificationButton();
+        expect(notificationPage.getConfigObject()).toBe('{"direction": "ltr", "duration": "1000", "horizontalPosition": "right", "verticalPosition": "top"}');
+    });
+});
diff --git a/e2e/content-services/search_component.e2e.ts b/e2e/content-services/search_component.e2e.ts
new file mode 100644
index 0000000000..21404e9348
--- /dev/null
+++ b/e2e/content-services/search_component.e2e.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 { browser } from 'protractor';
+
+import LoginPage = require('../pages/adf/loginPage');
+import SearchDialog = require('../pages/adf/dialog/searchDialog');
+import ContentServicesPage = require('../pages/adf/contentServicesPage');
+import filePreviewPage = require('../pages/adf/filePreviewPage');
+import SearchResultPage = require('../pages/adf/searchResultsPage');
+
+import AcsUserModel = require('../models/ACS/acsUserModel');
+import FileModel = require('../models/ACS/fileModel');
+import FolderModel = require('../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';
+
+describe('Search component - Search Bar', () => {
+
+    let search = {
+        inactive: {
+            firstChar: 'x',
+            secondChar: 'y',
+            thirdChar: 'z',
+            name: 'impossible-name-folder' + Util.generateRandomString(8)
+        }
+    };
+
+    let loginPage = new LoginPage();
+    let contentServicesPage = new ContentServicesPage();
+    let searchDialog = new SearchDialog();
+    let searchResultPage = new SearchResultPage();
+
+    let acsUser = new AcsUserModel();
+
+    let filename = Util.generateRandomString(16);
+    let firstFolderName = Util.generateRandomString(16);
+    let secondFolderName = Util.generateRandomString(16);
+    let thirdFolderName = Util.generateRandomString(16);
+
+    let firstFileModel = new FileModel({
+        'name': filename, 'shortName': filename.substring(0, 8)
+    });
+
+    let firstFolderModel = new FolderModel({
+        'name': firstFolderName, 'shortName': firstFolderName.substring(0, 8)
+    });
+    let secondFolder = new FolderModel({
+        'name': secondFolderName, 'shortName': secondFolderName.substring(0, 8)
+    });
+    let thirdFolder = new FolderModel({
+        'name': thirdFolderName, 'shortName': thirdFolderName.substring(0, 8)
+    });
+
+    beforeAll(async (done) => {
+        let uploadActions = new UploadActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+        await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+
+        let firstFileUploaded = await uploadActions.uploadFile(this.alfrescoJsApi, firstFileModel.location, firstFileModel.name, '-my-');
+        Object.assign(firstFileModel, firstFileUploaded.entry);
+
+        await uploadActions.uploadFolder(this.alfrescoJsApi, firstFolderModel.name, '-my-');
+        await uploadActions.uploadFolder(this.alfrescoJsApi, secondFolder.name, '-my-');
+        await uploadActions.uploadFolder(this.alfrescoJsApi, thirdFolder.name, '-my-');
+
+        await browser.driver.sleep(5000); // wait search index previous file/folder uploaded
+
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+
+        contentServicesPage.goToDocumentList();
+
+        done();
+    });
+
+    // afterAll((done) => {
+    //     NodesAPI.deleteContent(acsUser, firstFileModel.id, () => {
+    //         NodesAPI.deleteContent(acsUser, firstFolderModel.id, () => {
+    //             done();
+    //         });
+    //     });
+    // });
+
+    it('[C272798] Search bar is visible', () => {
+        searchDialog.checkSearchBarIsNotVisible().checkSearchIconIsVisible();
+        searchDialog.clickOnSearchIcon().checkSearchBarIsVisible().checkSearchIconIsVisible();
+        searchDialog.clickOnSearchIcon().checkSearchBarIsNotVisible().checkSearchIconIsVisible();
+    });
+
+    it('[C272799] Add input and close', () => {
+        searchDialog.checkSearchIconIsVisible().clickOnSearchIcon().enterText(firstFolderModel.shortName);
+        searchDialog.clickOnSearchIcon().checkSearchBarIsNotVisible().checkSearchIconIsVisible();
+        contentServicesPage.checkAcsContainer();
+    });
+
+    it('[C260255] Search for content that does not exist', () => {
+        searchDialog.checkSearchBarIsNotVisible().clickOnSearchIcon().checkNoResultMessageIsNotDisplayed()
+            .enterText(search.inactive.name).checkNoResultMessageIsDisplayed();
+        searchDialog.clearText();
+        searchDialog.checkSearchBarIsNotVisible();
+    });
+
+    it('[C260256] Existing folder and file are displayed in search suggestion when typing the first 4 letters', () => {
+        contentServicesPage.goToDocumentList();
+        searchDialog.clickOnSearchIcon().checkSearchBarIsVisible().enterText(firstFolderModel.shortName);
+
+        searchDialog.resultTableContainsRow(firstFolderModel.name);
+
+        expect(searchDialog.getSpecificRowsHighlightName(firstFolderModel.name)).toEqual(firstFolderModel.shortName);
+        expect(searchDialog.getSpecificRowsAuthor(firstFolderModel.name)).toEqual(acsUser.firstName + ' ' + acsUser.lastName);
+        expect(searchDialog.getSpecificRowsCompleteName(firstFolderModel.name)).toEqual(firstFolderModel.name);
+
+        searchDialog.clearText();
+        searchDialog.checkSearchBarIsNotVisible();
+
+        searchDialog.clickOnSearchIcon().enterText(firstFileModel.shortName);
+        searchDialog.resultTableContainsRow(firstFileModel.name);
+
+        expect(searchDialog.getSpecificRowsHighlightName(firstFileModel.name)).toEqual(firstFileModel.shortName);
+        expect(searchDialog.getSpecificRowsAuthor(firstFileModel.name)).toEqual(acsUser.firstName + ' ' + acsUser.lastName);
+
+        expect(searchDialog.getSpecificRowsCompleteName(firstFileModel.name)).toEqual(firstFileModel.name);
+
+        searchDialog.clearText();
+        searchDialog.checkSearchBarIsNotVisible();
+    });
+
+    it('[C272800] Existing folder and file are displayed in search suggestion', () => {
+        contentServicesPage.goToDocumentList();
+        searchDialog.clickOnSearchIcon().checkSearchBarIsVisible().enterText(firstFolderModel.name);
+        searchDialog.resultTableContainsRow(firstFolderModel.name);
+
+        expect(searchDialog.getSpecificRowsHighlightName(firstFolderModel.name)).toEqual(firstFolderModel.name);
+        expect(searchDialog.getSpecificRowsAuthor(firstFolderModel.name)).toEqual(acsUser.firstName + ' ' + acsUser.lastName);
+        expect(searchDialog.getSpecificRowsCompleteName(firstFolderModel.name)).toEqual(firstFolderModel.name);
+
+        searchDialog.clearText();
+        searchDialog.checkSearchBarIsNotVisible();
+
+        searchDialog.clickOnSearchIcon().enterText(firstFileModel.name);
+        searchDialog.resultTableContainsRow(firstFileModel.name);
+
+        expect(searchDialog.getSpecificRowsHighlightName(firstFileModel.name)).toEqual(firstFileModel.name);
+        expect(searchDialog.getSpecificRowsAuthor(firstFileModel.name)).toEqual(acsUser.firstName + ' ' + acsUser.lastName);
+        expect(searchDialog.getSpecificRowsCompleteName(firstFileModel.name)).toEqual(firstFileModel.name);
+
+        searchDialog.clearText();
+        searchDialog.checkSearchBarIsNotVisible();
+    });
+
+    it('[C260257] Folder content is displayed when clicking on existing folder', () => {
+        searchDialog.clickOnSearchIcon().enterText(firstFolderModel.shortName);
+        searchDialog.resultTableContainsRow(firstFolderModel.name);
+        searchDialog.clickOnSpecificRow(firstFolderModel.name);
+        contentServicesPage.checkAcsContainer().waitForTableBody();
+
+        expect(contentServicesPage.currentFolderName()).toEqual(firstFolderModel.name);
+
+        contentServicesPage.goToDocumentList();
+
+        searchDialog.checkSearchIconIsVisible().clickOnSearchIcon().checkSearchBarIsVisible();
+        searchDialog.enterText(firstFileModel.name).resultTableContainsRow(firstFileModel.name);
+        searchDialog.clickOnSpecificRow(firstFileModel.name);
+        expect(filePreviewPage.getPDFTitleFromSearch()).toEqual(firstFileModel.name);
+
+        filePreviewPage.closePreviewWithButton();
+    });
+
+    it('[C272801] Non-existent folder is not displayed in search page', () => {
+        searchDialog.checkSearchIconIsVisible().clickOnSearchIcon();
+        searchDialog.enterTextAndPressEnter(search.inactive.name);
+        searchResultPage.checkNoResultMessageIsDisplayed();
+        contentServicesPage.goToDocumentList();
+    });
+
+    it('[C272802] Existing folder is displayed in search page', () => {
+        searchDialog.clickOnSearchIcon();
+        browser.driver.sleep(1000);
+        searchDialog.enterTextAndPressEnter(firstFolderModel.name);
+        searchResultPage.checkContentIsDisplayed(firstFolderModel.name);
+    });
+
+    it('[C260258] Existing file is displayed in search page', () => {
+        contentServicesPage.goToDocumentList();
+        searchDialog.clickOnSearchIcon();
+        searchDialog.enterTextAndPressEnter(firstFileModel.name);
+        searchResultPage.checkContentIsDisplayed(firstFileModel.name);
+    });
+
+    it('[C91321] Should be able to use down arrow key when navigating throw suggestions', () => {
+        contentServicesPage.goToDocumentList();
+
+        searchDialog
+            .clickOnSearchIcon()
+            .enterText(secondFolder.shortName)
+            .pressDownArrowAndEnter();
+
+        contentServicesPage.checkAcsContainer();
+        expect(contentServicesPage.currentFolderName()).toEqual(secondFolder.name);
+    });
+
+    it('[C260254] The search bar gets closed when clicking on another browser tab', () => {
+        contentServicesPage.goToDocumentList();
+
+        searchDialog
+            .clickOnSearchIcon()
+            .enterText(secondFolder.shortName);
+
+        searchDialog.resultTableContainsRow(secondFolder.name);
+
+        Util.openNewTabInBrowser();
+        Util.switchToWindowHandler(0);
+
+        searchDialog.checkSearchBarIsNotVisible().checkSearchIconIsVisible();
+    });
+});
diff --git a/e2e/content-services/search_multiselect.e2e.ts b/e2e/content-services/search_multiselect.e2e.ts
new file mode 100644
index 0000000000..bd73c83407
--- /dev/null
+++ b/e2e/content-services/search_multiselect.e2e.ts
@@ -0,0 +1,260 @@
+/*!
+ * @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 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 LoginPage = require('../pages/adf/loginPage');
+import SearchDialog = require('../pages/adf/dialog/searchDialog');
+import SearchResultPage = require('../pages/adf/searchResultsPage');
+import SearchFiltersPage = require('../pages/adf/searchFiltersPage');
+
+import AcsUserModel = require('../models/ACS/acsUserModel');
+import FileModel = require('../models/ACS/fileModel');
+
+describe('Search Component - Multi-Select Facet', () => {
+    let loginPage = new LoginPage();
+    let searchDialog = new SearchDialog();
+    let searchResultsPage = new SearchResultPage();
+    let uploadActions = new UploadActions();
+    let searchFiltersPage = new SearchFiltersPage();
+    let site;
+
+    beforeAll(() => {
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+    });
+
+    describe('', () => {
+        let jpgFile, jpgFileSite, txtFile, txtFileSite;
+        let acsUser = new AcsUserModel();
+
+        let jpgFileInfo = new FileModel({
+            'location': resources.Files.ADF_DOCUMENTS.JPG.file_location,
+            'name': resources.Files.ADF_DOCUMENTS.JPG.file_name
+        });
+        let txtFileInfo = new FileModel({
+            'location': resources.Files.ADF_DOCUMENTS.TXT_0B.file_location,
+            'name': resources.Files.ADF_DOCUMENTS.TXT_0B.file_name
+        });
+
+        beforeAll(async (done) => {
+            await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+            await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+            await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+
+            site = await this.alfrescoJsApi.core.sitesApi.createSite({
+                title: Util.generateRandomString(8),
+                visibility: 'PUBLIC'
+            });
+
+            jpgFile = await uploadActions.uploadFile(this.alfrescoJsApi, jpgFileInfo.location, jpgFileInfo.name, '-my-');
+            await browser.driver.sleep(5000);
+
+            jpgFileSite = await uploadActions.uploadFile(this.alfrescoJsApi, jpgFileInfo.location, jpgFileInfo.name, site.entry.guid);
+            await browser.driver.sleep(5000);
+
+            txtFile = await uploadActions.uploadFile(this.alfrescoJsApi, txtFileInfo.location, txtFileInfo.name, '-my-');
+            await browser.driver.sleep(5000);
+
+            txtFileSite = await uploadActions.uploadFile(this.alfrescoJsApi, txtFileInfo.location, txtFileInfo.name, site.entry.guid);
+            await browser.driver.sleep(5000);
+
+            loginPage.loginToContentServicesUsingUserModel(acsUser);
+
+            searchDialog.checkSearchIconIsVisible();
+            searchDialog.clickOnSearchIcon();
+            searchDialog.enterTextAndPressEnter('file');
+
+            searchFiltersPage.checkSearchFiltersIsDisplayed();
+            searchFiltersPage.filterByCreator(acsUser.firstName, acsUser.lastName);
+
+            done();
+        });
+
+        afterAll(async (done) => {
+            Promise.all([
+                uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, jpgFile.entry.id),
+                uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, jpgFileSite.entry.id),
+                uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, txtFile.entry.id),
+                uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, txtFileSite.entry.id)
+            ]);
+
+            await this.alfrescoJsApi.core.sitesApi.deleteSite(site.entry.id);
+
+            done();
+        });
+
+        it('[C280054] Multiple items can be selected from a search facet filter', () => {
+            searchFiltersPage.filterByFileType('Plain Text');
+
+            expect(searchResultsPage.numberOfResultsDisplayed()).toBe(2);
+            searchResultsPage.checkContentIsDisplayed(txtFile.entry.name);
+            searchResultsPage.checkContentIsDisplayed(txtFileSite.entry.name);
+
+            searchFiltersPage.filterByFileType('JPEG Image');
+
+            expect(searchResultsPage.numberOfResultsDisplayed()).toBe(4);
+            searchResultsPage.checkContentIsDisplayed(txtFile.entry.name);
+            searchResultsPage.checkContentIsDisplayed(txtFileSite.entry.name);
+            searchResultsPage.checkContentIsDisplayed(jpgFile.entry.name);
+            searchResultsPage.checkContentIsDisplayed(jpgFileSite.entry.name);
+        });
+    });
+
+    describe('', () => {
+        let jpgFile, txtFile;
+        let userUploadingTxt = new AcsUserModel();
+        let userUploadingImg = new AcsUserModel();
+
+        let jpgFileInfo = new FileModel({
+            'location': resources.Files.ADF_DOCUMENTS.JPG.file_location,
+            'name': resources.Files.ADF_DOCUMENTS.JPG.file_name
+        });
+        let txtFileInfo = new FileModel({
+            'location': resources.Files.ADF_DOCUMENTS.TXT_0B.file_location,
+            'name': resources.Files.ADF_DOCUMENTS.TXT_0B.file_name
+        });
+
+        beforeAll(async (done) => {
+            await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+            await this.alfrescoJsApi.core.peopleApi.addPerson(userUploadingTxt);
+            await this.alfrescoJsApi.core.peopleApi.addPerson(userUploadingImg);
+
+            await this.alfrescoJsApi.login(userUploadingTxt.id, userUploadingTxt.password);
+
+            site = await this.alfrescoJsApi.core.sitesApi.createSite({
+                title: Util.generateRandomString(8),
+                visibility: 'PUBLIC'
+            });
+
+            await this.alfrescoJsApi.core.sitesApi.addSiteMember(site.entry.id, {
+                id: userUploadingImg.id,
+                role: CONSTANTS.CS_USER_ROLES.MANAGER
+            });
+
+            txtFile = await uploadActions.uploadFile(this.alfrescoJsApi, txtFileInfo.location, txtFileInfo.name, site.entry.guid);
+
+            await browser.driver.sleep(10000);
+
+            await this.alfrescoJsApi.login(userUploadingImg.id, userUploadingImg.password);
+
+            jpgFile = await uploadActions.uploadFile(this.alfrescoJsApi, jpgFileInfo.location, jpgFileInfo.name, site.entry.guid);
+
+            await browser.driver.sleep(10000);
+
+            loginPage.loginToContentServicesUsingUserModel(userUploadingImg);
+
+            searchDialog.checkSearchIconIsVisible();
+            searchDialog.clickOnSearchIcon();
+            searchDialog.enterTextAndPressEnter('file');
+
+            done();
+        });
+
+        afterAll(async (done) => {
+            await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+            Promise.all([
+                uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, jpgFile.entry.id),
+                uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, txtFile.entry.id)
+            ]);
+
+            await this.alfrescoJsApi.core.sitesApi.deleteSite(site.entry.id);
+
+            done();
+        });
+
+        it('[C280056] Multiple items can be selected from multiple search facets', () => {
+            searchFiltersPage.checkSearchFiltersIsDisplayed();
+
+            searchFiltersPage.filterByCreator(userUploadingTxt.firstName, userUploadingTxt.lastName);
+            searchFiltersPage.filterByCreator(userUploadingImg.firstName, userUploadingImg.lastName);
+
+            searchResultsPage.checkContentIsDisplayed(txtFile.entry.name);
+            searchResultsPage.checkContentIsDisplayed(jpgFile.entry.name);
+
+            searchFiltersPage.filterByFileType('Plain Text');
+            searchFiltersPage.filterByFileType('JPEG Image');
+
+            expect(searchResultsPage.numberOfResultsDisplayed()).toBe(2);
+            searchResultsPage.checkContentIsDisplayed(txtFile.entry.name);
+            searchResultsPage.checkContentIsDisplayed(jpgFile.entry.name);
+        });
+    });
+
+    describe('', () => {
+        let txtFile;
+        let acsUser = new AcsUserModel();
+
+        let txtFileInfo = new FileModel({
+            'location': resources.Files.ADF_DOCUMENTS.TXT_0B.file_location,
+            'name': resources.Files.ADF_DOCUMENTS.TXT_0B.file_name
+        });
+
+        beforeAll(async (done) => {
+            await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+            await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+            await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+
+            site = await this.alfrescoJsApi.core.sitesApi.createSite({
+                title: Util.generateRandomString(8),
+                visibility: 'PUBLIC'
+            });
+
+            txtFile = await uploadActions.uploadFile(this.alfrescoJsApi, txtFileInfo.location, txtFileInfo.name, '-my-');
+            await browser.driver.sleep(10000);
+
+            loginPage.loginToContentServicesUsingUserModel(acsUser);
+
+            searchDialog.checkSearchIconIsVisible();
+            searchDialog.clickOnSearchIcon();
+            searchDialog.enterTextAndPressEnter('file');
+
+            searchFiltersPage.checkSearchFiltersIsDisplayed();
+
+            done();
+        });
+
+        afterAll(async (done) => {
+            await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, txtFile.entry.id);
+            await this.alfrescoJsApi.core.sitesApi;
+            done();
+        });
+
+        it('[C280058] The filter facets items number is updated when another filter facet item is selected', () => {
+            searchFiltersPage.filterByFileType('Plain Text');
+
+            searchFiltersPage.filterByCreator(acsUser.firstName, acsUser.lastName);
+
+            expect(searchResultsPage.numberOfResultsDisplayed()).toBe(1);
+            searchResultsPage.checkContentIsDisplayed(txtFile.entry.name);
+        });
+    });
+});
diff --git a/e2e/content-services/search_page_component.e2e.ts b/e2e/content-services/search_page_component.e2e.ts
new file mode 100644
index 0000000000..012d1dcc9b
--- /dev/null
+++ b/e2e/content-services/search_page_component.e2e.ts
@@ -0,0 +1,299 @@
+/*!
+ * @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 } from 'protractor';
+
+import LoginPage = require('../pages/adf/loginPage');
+import SearchDialog = require('../pages/adf/dialog/searchDialog');
+import ContentServicesPage = require('../pages/adf/contentServicesPage');
+import SearchResultPage = require('../pages/adf/searchResultsPage');
+import filePreviewPage = require('../pages/adf/filePreviewPage');
+
+import AcsUserModel = require('../models/ACS/acsUserModel');
+import FolderModel = require('../models/ACS/folderModel');
+import FileModel = require('../models/ACS/fileModel');
+
+import TestConfig = require('../test.config');
+import Util = require('../util/util');
+import resources = require('../util/resources');
+
+import AlfrescoApi = require('alfresco-js-api-node');
+import { UploadActions } from '../actions/ACS/upload.actions';
+
+describe('Search component - Search Page', () => {
+    let search = {
+        active: {
+            firstFile: null,
+            secondFile: null,
+            base: Util.generateRandomString(3),
+            extension: '.txt'
+        },
+        no_permission: {
+            noPermFile: 'Meetings',
+            noPermFolder: 'Meeting Notes'
+        }
+    };
+
+    let loginPage = new LoginPage();
+    let contentServicesPage = new ContentServicesPage();
+    let searchDialog = new SearchDialog();
+    let searchResultPage = new SearchResultPage();
+
+    let acsUser = new AcsUserModel();
+    let emptyFolderModel = new FolderModel({ 'name': Util.generateRandomString() });
+    let firstFileModel;
+    let newFolderModel = new FolderModel({ 'name': 'newFolder' });
+    let fileNames = [], adminFileNames = [], nrOfFiles = 15, adminNrOfFiles = 5;
+
+    beforeAll(async (done) => {
+        fileNames = Util.generateSeqeunceFiles(1, nrOfFiles, search.active.base, search.active.extension);
+        adminFileNames = Util.generateSeqeunceFiles(nrOfFiles + 1, nrOfFiles + adminNrOfFiles, search.active.base, search.active.extension);
+        search.active.firstFile = fileNames[0];
+        search.active.secondFile = fileNames[1];
+        fileNames.splice(0, 1);
+
+        firstFileModel = new FileModel({
+            'name': search.active.firstFile,
+            'location': resources.Files.ADF_DOCUMENTS.TXT.file_location
+        });
+
+        let uploadActions = new UploadActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+        await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+
+        await uploadActions.uploadFolder(this.alfrescoJsApi, emptyFolderModel.name, '-my-');
+        let newFolderModelUploaded = await uploadActions.uploadFolder(this.alfrescoJsApi, newFolderModel.name, '-my-');
+
+        await uploadActions.createEmptyFiles(this.alfrescoJsApi, fileNames, newFolderModelUploaded.entry.id);
+
+        await uploadActions.uploadFile(this.alfrescoJsApi, firstFileModel.location, firstFileModel.name, '-my-');
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await uploadActions.createEmptyFiles(this.alfrescoJsApi, adminFileNames, newFolderModelUploaded.entry.id);
+
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+
+        contentServicesPage.goToDocumentList();
+
+        done();
+    });
+
+    it('[C260264] \'No results found searching for\' message is displayed on Search Page', () => {
+        let notExistentFileName = Util.generateRandomString();
+        contentServicesPage.goToDocumentList();
+        searchDialog.checkSearchBarIsNotVisible().checkSearchIconIsVisible().clickOnSearchIcon()
+            .enterTextAndPressEnter(notExistentFileName);
+        searchResultPage.checkNoResultMessageIsDisplayed();
+    });
+
+    it('[C260265] File previewer is displayed', () => {
+        contentServicesPage.goToDocumentList();
+
+        searchDialog
+            .checkSearchBarIsNotVisible()
+            .checkSearchIconIsVisible()
+            .clickOnSearchIcon()
+            .enterTextAndPressEnter(firstFileModel.name);
+
+        searchResultPage.checkContentIsDisplayed(firstFileModel.name);
+        searchResultPage.navigateToFolder(firstFileModel.name);
+
+        browser.driver.sleep(200);
+
+        filePreviewPage.closePreviewWithButton();
+    });
+
+    it('[C272810] Only the searched file is displayed', () => {
+        contentServicesPage.goToDocumentList();
+
+        searchDialog
+            .checkSearchBarIsNotVisible()
+            .checkSearchIconIsVisible()
+            .clickOnSearchIcon()
+            .enterTextAndPressEnter(search.active.firstFile);
+
+        searchResultPage.checkContentIsDisplayed(search.active.firstFile);
+        expect(searchResultPage.numberOfResultsDisplayed()).toBe(1);
+    });
+
+    it('[C260267] Folder content is displayed', () => {
+        contentServicesPage.goToDocumentList();
+
+        searchDialog.checkSearchBarIsNotVisible()
+            .checkSearchIconIsVisible()
+            .clickOnSearchIcon()
+            .enterTextAndPressEnter(emptyFolderModel.name);
+
+        searchResultPage.checkNoResultMessageIsNotDisplayed();
+        searchResultPage.checkContentIsDisplayed(emptyFolderModel.name);
+        searchResultPage.navigateToFolder(emptyFolderModel.name);
+        contentServicesPage.currentFolderName().then((result) => {
+            expect(result).toEqual(emptyFolderModel.name);
+        });
+    });
+
+    it('[C260261] Delete a file from the Search Results Page', () => {
+        contentServicesPage.goToDocumentList();
+
+        searchDialog
+            .checkSearchBarIsNotVisible()
+            .checkSearchIconIsVisible()
+            .clickOnSearchIcon()
+            .enterTextAndPressEnter(search.active.firstFile);
+
+        searchResultPage.checkContentIsDisplayed(search.active.firstFile);
+
+        searchResultPage.deleteContent(search.active.firstFile);
+
+        searchResultPage.checkNoResultMessageIsDisplayed();
+        searchResultPage.checkContentIsNotDisplayed(search.active.firstFile);
+
+        contentServicesPage.goToDocumentList();
+        searchDialog.checkSearchBarIsNotVisible().checkSearchIconIsVisible().clickOnSearchIcon()
+            .enterTextAndPressEnter(search.active.firstFile);
+        searchResultPage.checkNoResultMessageIsDisplayed();
+    });
+
+    it('[C272809] Delete a folder from the Search Results Page', () => {
+        searchDialog.checkSearchBarIsNotVisible()
+            .checkSearchIconIsVisible()
+            .clickOnSearchIcon()
+            .enterTextAndPressEnter(emptyFolderModel.name);
+
+        searchResultPage.checkContentIsDisplayed(emptyFolderModel.name);
+        searchResultPage.checkNoResultMessageIsNotDisplayed();
+        searchResultPage.checkContentIsDisplayed(emptyFolderModel.name);
+        searchResultPage.deleteContent(emptyFolderModel.name);
+        searchResultPage.checkNoResultMessageIsDisplayed();
+
+        searchDialog.checkSearchBarIsNotVisible().checkSearchIconIsVisible().clickOnSearchIcon()
+            .enterTextAndPressEnter(emptyFolderModel.name);
+        searchResultPage.checkNoResultMessageIsDisplayed();
+    });
+
+    xit('[C272803] Sort content ascending by name.', () => {
+        contentServicesPage.goToDocumentList();
+
+        searchDialog
+            .checkSearchBarIsNotVisible()
+            .checkSearchIconIsVisible()
+            .clickOnSearchIcon()
+            .enterTextAndPressEnter(search.active.base);
+        searchResultPage.checkContentIsDisplayed(search.active.secondFile);
+        searchResultPage.sortAndCheckListIsOrderedByName(true).then((result) => {
+            expect(result).toEqual(true);
+        });
+    });
+
+    xit('[C272804] Sort content descending by name.', () => {
+        contentServicesPage.goToDocumentList();
+
+        searchDialog.checkSearchBarIsNotVisible()
+            .checkSearchIconIsVisible()
+            .clickOnSearchIcon()
+            .enterTextAndPressEnter(search.active.base);
+
+        searchResultPage.checkContentIsDisplayed(search.active.secondFile);
+        searchResultPage.sortAndCheckListIsOrderedByName(false).then((result) => {
+            expect(result).toEqual(true);
+        });
+    });
+
+    xit('[C272805] Sort content ascending by author.', () => {
+        contentServicesPage.goToDocumentList();
+        searchDialog.checkSearchBarIsNotVisible().checkSearchIconIsVisible().clickOnSearchIcon()
+            .enterTextAndPressEnter(search.active.base);
+        searchResultPage.checkContentIsDisplayed(search.active.secondFile);
+        searchResultPage.sortAndCheckListIsOrderedByAuthor(true).then((result) => {
+            expect(result).toEqual(true);
+        });
+    });
+
+    xit('[C272806] Sort content descending by author.', () => {
+        contentServicesPage.goToDocumentList();
+        searchDialog.checkSearchBarIsNotVisible().checkSearchIconIsVisible().clickOnSearchIcon()
+            .enterTextAndPressEnter(search.active.base);
+        searchResultPage.checkContentIsDisplayed(search.active.secondFile);
+        searchResultPage.sortAndCheckListIsOrderedByAuthor(false).then((result) => {
+            expect(result).toEqual(true);
+        });
+    });
+
+    xit('[C272807] Sort content ascending by created date.', () => {
+        contentServicesPage.goToDocumentList();
+        searchDialog.checkSearchBarIsNotVisible().checkSearchIconIsVisible().clickOnSearchIcon()
+            .enterTextAndPressEnter(search.active.base);
+        searchResultPage.checkContentIsDisplayed(search.active.secondFile);
+        searchResultPage.sortAndCheckListIsOrderedByCreated(true).then((result) => {
+            expect(result).toEqual(true);
+        });
+    });
+
+    xit('[C260260] Sort content descending by created date.', () => {
+        contentServicesPage.goToDocumentList();
+        searchDialog.checkSearchBarIsNotVisible().checkSearchIconIsVisible().clickOnSearchIcon()
+            .enterTextAndPressEnter(search.active.base);
+        searchResultPage.checkContentIsDisplayed(search.active.secondFile);
+        searchResultPage.sortAndCheckListIsOrderedByCreated(false).then((result) => {
+            expect(result).toEqual(true);
+        });
+    });
+
+    xit('[C260262] Try to delete a file without rights from the Search Results Page', () => {
+        contentServicesPage.goToDocumentList();
+        searchDialog.checkSearchBarIsNotVisible().checkSearchIconIsVisible().clickOnSearchIcon()
+            .enterTextAndPressEnter(search.no_permission.noPermFile);
+        searchResultPage.checkContentIsDisplayed(search.no_permission.noPermFile);
+        searchResultPage.deleteContent(search.no_permission.noPermFile);
+        searchResultPage.checkContentIsDisplayed(search.no_permission.noPermFile);
+        searchDialog.checkSearchBarIsNotVisible().checkSearchIconIsVisible().clickOnSearchIcon()
+            .enterTextAndPressEnter(search.no_permission.noPermFile);
+        searchResultPage.checkNoResultMessageIsNotDisplayed();
+        searchResultPage.checkContentIsDisplayed(search.no_permission.noPermFile);
+    });
+
+    it('[C272808] Try to delete a folder without rights from the Search Results Page', () => {
+        contentServicesPage.goToDocumentList();
+        searchDialog.checkSearchBarIsNotVisible();
+        searchDialog.checkSearchIconIsVisible();
+        searchDialog.clickOnSearchIcon();
+        searchDialog.enterTextAndPressEnter(search.no_permission.noPermFolder);
+
+        searchResultPage.checkContentIsDisplayed(search.no_permission.noPermFolder);
+        searchResultPage.deleteContent(search.no_permission.noPermFolder);
+        searchResultPage.checkContentIsDisplayed(search.no_permission.noPermFolder);
+        searchResultPage.closeActionButton();
+
+        searchDialog.checkSearchBarIsNotVisible()
+            .checkSearchIconIsVisible()
+            .clickOnSearchIcon()
+            .enterTextAndPressEnter(search.no_permission.noPermFolder);
+
+        searchResultPage.checkNoResultMessageIsNotDisplayed();
+        searchResultPage.checkContentIsDisplayed(search.no_permission.noPermFolder);
+    });
+});
diff --git a/e2e/content-services/tag_component.e2e.ts b/e2e/content-services/tag_component.e2e.ts
new file mode 100644
index 0000000000..d65818db2c
--- /dev/null
+++ b/e2e/content-services/tag_component.e2e.ts
@@ -0,0 +1,158 @@
+/*!
+ * @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 AcsUserModel = require('../models/ACS/acsUserModel');
+import FileModel = require('../models/ACS/fileModel');
+
+import LoginPage = require('../pages/adf/loginPage');
+import TagPage = require('../pages/adf/tagPage');
+
+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');
+
+describe('Tag component', () => {
+
+    let loginPage = new LoginPage();
+    let tagPage = new TagPage();
+
+    let acsUser = new AcsUserModel();
+    let pdfFileModel = new FileModel({ 'name': resources.Files.ADF_DOCUMENTS.PDF.file_name });
+    let deleteFile = new FileModel({ 'name': Util.generateRandomString() });
+    let sameTag = Util.generateRandomStringToLowerCase();
+    let tagList = [Util.generateRandomStringToLowerCase(), Util.generateRandomStringToLowerCase()];
+    let uppercaseTag = Util.generateRandomStringToUpperCase();
+    let digitsTag = Util.generateRandomStringDigits();
+    let nonLatinTag = Util.generateRandomStringNonLatin();
+
+    beforeAll(async (done) => {
+        let uploadActions = new UploadActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+        await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+
+        let pdfUploadedFile = await uploadActions.uploadFile(this.alfrescoJsApi, pdfFileModel.location, pdfFileModel.name, '-my-');
+
+        let uploadedDeleteFile = await uploadActions.uploadFile(this.alfrescoJsApi, deleteFile.location, deleteFile.name, '-my-');
+
+        Object.assign(pdfFileModel, pdfUploadedFile.entry);
+
+        Object.assign(deleteFile, uploadedDeleteFile.entry);
+
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+
+        tagPage.goToTagPage();
+
+        done();
+    });
+
+    it('[C260374] Tag node ID', () => {
+        expect(tagPage.getNodeId()).toEqual('');
+        expect(tagPage.getNewTagPlaceholder()).toEqual('New Tag');
+        expect(tagPage.addTagButtonIsEnabled()).toEqual(false);
+        tagPage.checkTagListIsEmpty();
+        tagPage.checkTagListByNodeIdIsEmpty();
+        expect(tagPage.addNewTagInput('a').addTagButtonIsEnabled()).toEqual(false);
+        expect(tagPage.getNewTagInput()).toEqual('a');
+    });
+
+    it('[C268151] New tag for specific Node ID', () => {
+        tagPage.insertNodeId(pdfFileModel.id);
+        tagPage.addTag(tagList[0]);
+
+        tagPage.checkTagIsDisplayedInTagList(tagList[0]);
+        tagPage.checkTagIsDisplayedInTagListByNodeId(tagList[0]);
+    });
+
+    it('[C260377] Tag name already exists', () => {
+        tagPage.insertNodeId(pdfFileModel.id);
+        tagPage.addTag(sameTag);
+        tagPage.checkTagIsDisplayedInTagList(sameTag);
+        tagPage.addTag(sameTag);
+        expect(tagPage.getErrorMessage()).toEqual('Tag already exists');
+    });
+
+    it('[C260378] Multiple tags', () => {
+        tagPage.insertNodeId(pdfFileModel.id);
+        tagPage.checkTagListIsOrderedAscending();
+        tagPage.checkTagListByNodeIdIsOrderedAscending();
+        tagPage.checkTagListContentServicesIsOrderedAscending();
+    });
+
+    it('[C91326] Tag text field', () => {
+        tagPage.insertNodeId(pdfFileModel.id);
+
+        tagPage.addTag(uppercaseTag);
+
+        tagPage.checkTagIsDisplayedInTagList(uppercaseTag.toLowerCase());
+        tagPage.checkTagIsDisplayedInTagListByNodeId(uppercaseTag.toLowerCase());
+
+        tagPage.checkTagIsNotDisplayedInTagList(uppercaseTag);
+
+        tagPage.insertNodeId(pdfFileModel.id);
+        tagPage.addTag(digitsTag);
+
+        tagPage.checkTagIsDisplayedInTagList(digitsTag);
+        tagPage.checkTagIsDisplayedInTagListByNodeId(digitsTag);
+
+        tagPage.insertNodeId(pdfFileModel.id);
+        tagPage.addTag(nonLatinTag);
+
+        tagPage.checkTagIsDisplayedInTagList(nonLatinTag);
+        tagPage.checkTagIsDisplayedInTagListByNodeId(nonLatinTag);
+    });
+
+    it('[C260375] Delete tag', () => {
+        let deleteTag = Util.generateRandomStringToUpperCase();
+
+        tagPage.insertNodeId(deleteFile.id);
+
+        tagPage.addTag(deleteTag);
+
+        tagPage.checkTagIsDisplayedInTagList(deleteTag.toLowerCase());
+        tagPage.checkTagIsDisplayedInTagListByNodeId(deleteTag.toLowerCase());
+
+        tagPage.deleteTagFromTagListByNodeId(deleteTag.toLowerCase());
+
+        tagPage.checkTagIsNotDisplayedInTagList(deleteTag.toLowerCase());
+        tagPage.checkTagIsNotDisplayedInTagListByNodeId(deleteTag.toLowerCase());
+
+        tagPage.insertNodeId(deleteFile.id);
+
+        tagPage.addTag(deleteTag);
+
+        tagPage.checkTagIsDisplayedInTagList(deleteTag.toLowerCase());
+        tagPage.checkTagIsDisplayedInTagListByNodeId(deleteTag.toLowerCase());
+
+        tagPage.deleteTagFromTagList(deleteTag.toLowerCase());
+
+        tagPage.checkTagIsNotDisplayedInTagList(deleteTag.toLowerCase());
+        tagPage.checkTagIsNotDisplayedInTagListByNodeId(deleteTag.toLowerCase());
+    });
+});
diff --git a/e2e/content-services/trashcan_pagination.e2e.ts b/e2e/content-services/trashcan_pagination.e2e.ts
new file mode 100644
index 0000000000..c32a1c15e3
--- /dev/null
+++ b/e2e/content-services/trashcan_pagination.e2e.ts
@@ -0,0 +1,147 @@
+/*!
+ * @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 LoginPage = require('../pages/adf/loginPage');
+import TrashcanPage = require('../pages/adf/trashcanPage');
+import PaginationPage = require('../pages/adf/paginationPage');
+import NavigationBarPage = require('../pages/adf/navigationBarPage');
+
+import AcsUserModel = require('../models/ACS/acsUserModel');
+import FolderModel = require('../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';
+
+describe('Trashcan - Pagination', () => {
+    let pagination = {
+        base: 'newFile',
+        extension: '.txt'
+    };
+
+    let itemsPerPage = {
+        five: '5',
+        fiveValue: 5,
+        ten: '10',
+        tenValue: 10,
+        fifteen: '15',
+        fifteenValue: 15,
+        twenty: '20',
+        twentyValue: 20,
+        default: '25'
+    };
+
+    let loginPage = new LoginPage();
+    let trashcanPage = new TrashcanPage();
+    let paginationPage = new PaginationPage();
+    let navigationBarPage = new NavigationBarPage();
+
+    let acsUser = new AcsUserModel();
+    let newFolderModel = new FolderModel({ 'name': 'newFolder' });
+    let nrOfFiles = 20;
+
+    beforeAll(async (done) => {
+        let uploadActions = new UploadActions();
+
+        let fileNames = Util.generateSeqeunceFiles(10, nrOfFiles + 9, pagination.base, pagination.extension);
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+        await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+
+        let folderUploadedModel = await uploadActions.uploadFolder(this.alfrescoJsApi, newFolderModel.name, '-my-');
+
+        let emptyFiles = await uploadActions.createEmptyFiles(this.alfrescoJsApi, fileNames, folderUploadedModel.entry.id);
+        await emptyFiles.list.entries.forEach(async (node) => {
+            await this.alfrescoJsApi.node.deleteNode(node.entry.id).then(() => {
+            }, () => {
+                this.alfrescoJsApi.node.deleteNode(node.entry.id);
+            });
+        });
+
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+
+        done();
+    });
+
+    it('[C272811] 20 Items per page', () => {
+        navigationBarPage.clickTrashcanButton();
+
+        trashcanPage.waitForTableBody();
+
+        paginationPage.selectItemsPerPage(itemsPerPage.twenty);
+
+        trashcanPage.waitForTableBody();
+        trashcanPage.waitForPagination();
+
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.twenty);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + nrOfFiles + ' of ' + nrOfFiles);
+        expect(trashcanPage.numberOfResultsDisplayed()).toBe(nrOfFiles);
+
+        paginationPage.checkNextPageButtonIsDisabled();
+        paginationPage.checkPreviousPageButtonIsDisabled();
+    });
+
+    it('[C276742] 15 Items per page', () => {
+        navigationBarPage.clickTrashcanButton();
+        trashcanPage.waitForTableBody();
+        paginationPage.selectItemsPerPage(itemsPerPage.fifteen);
+        trashcanPage.waitForTableBody();
+        trashcanPage.waitForPagination();
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.fifteen);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + itemsPerPage.fifteenValue + ' of ' + nrOfFiles);
+        expect(trashcanPage.numberOfResultsDisplayed()).toBe(itemsPerPage.fifteenValue);
+        paginationPage.checkNextPageButtonIsEnabled();
+        paginationPage.checkPreviousPageButtonIsDisabled();
+    });
+
+    it('[C276743] 10 Items per page', () => {
+        navigationBarPage.clickTrashcanButton();
+        trashcanPage.waitForTableBody();
+        paginationPage.selectItemsPerPage(itemsPerPage.ten);
+        trashcanPage.waitForTableBody();
+        trashcanPage.waitForPagination();
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.ten);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + itemsPerPage.tenValue + ' of ' + nrOfFiles);
+        expect(trashcanPage.numberOfResultsDisplayed()).toBe(itemsPerPage.tenValue);
+        paginationPage.checkNextPageButtonIsEnabled();
+        paginationPage.checkPreviousPageButtonIsDisabled();
+    });
+
+    it('[C276744] 5 Items per page', () => {
+        navigationBarPage.clickTrashcanButton();
+        trashcanPage.waitForTableBody();
+        paginationPage.selectItemsPerPage(itemsPerPage.five);
+        trashcanPage.waitForTableBody();
+        trashcanPage.waitForPagination();
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.five);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + itemsPerPage.fiveValue + ' of ' + nrOfFiles);
+        expect(trashcanPage.numberOfResultsDisplayed()).toBe(itemsPerPage.fiveValue);
+        paginationPage.checkNextPageButtonIsEnabled();
+        paginationPage.checkPreviousPageButtonIsDisabled();
+    });
+})
+;
diff --git a/e2e/content-services/upload/excluded_file.e2e.ts b/e2e/content-services/upload/excluded_file.e2e.ts
new file mode 100644
index 0000000000..e2fa3c463d
--- /dev/null
+++ b/e2e/content-services/upload/excluded_file.e2e.ts
@@ -0,0 +1,101 @@
+/*!
+ * @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';
+
+import LoginPage = require('../../pages/adf/loginPage');
+import ContentServicesPage = require('../../pages/adf/contentServicesPage');
+import UploadDialog = require('../../pages/adf/dialog/uploadDialog');
+import UploadToggles = require('../../pages/adf/dialog/uploadToggles');
+
+import AcsUserModel = require('../../models/ACS/acsUserModel');
+import FileModel = require('../../models/ACS/fileModel');
+import FolderModel = require('../../models/ACS/folderModel');
+
+import TestConfig = require('../../test.config');
+import resources = require('../../util/resources');
+
+import AlfrescoApi = require('alfresco-js-api-node');
+import { DropActions } from '../../actions/drop.actions';
+
+describe('Upload component - Excluded Files', () => {
+
+    let contentServicesPage = new ContentServicesPage();
+    let uploadDialog = new UploadDialog();
+    let uploadToggles = new UploadToggles();
+    let loginPage = new LoginPage();
+    let acsUser = new AcsUserModel();
+
+    let iniExcludedFile = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.INI.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.INI.file_location
+    });
+
+    let folderWithExcludedFile = new FolderModel({
+        'name': resources.Files.ADF_DOCUMENTS.FOLDER_EXCLUDED.folder_name,
+        'location': resources.Files.ADF_DOCUMENTS.FOLDER_EXCLUDED.folder_location
+    });
+
+    beforeAll(async (done) => {
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+        await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+
+        contentServicesPage.goToDocumentList();
+
+        done();
+    });
+
+    it('[C279914] Should not allow upload default excluded files using D&D', () => {
+        contentServicesPage.checkDandDIsDisplayed();
+
+        let dragAndDropArea = element(by.css('adf-upload-drag-area div'));
+
+        let dragAndDrop = new DropActions();
+
+        dragAndDrop.dropFile(dragAndDropArea, iniExcludedFile.location);
+
+        browser.driver.sleep(2000);
+
+        uploadDialog.dialogIsNotDisplayed();
+
+        contentServicesPage.checkContentIsNotDisplayed(iniExcludedFile.name);
+    });
+
+    it('[C260122] Should not allow upload default excluded files using Upload button', () => {
+        contentServicesPage
+            .uploadFile(iniExcludedFile.location)
+            .checkContentIsNotDisplayed(iniExcludedFile.name);
+    });
+
+    it('[C260125] Should not upload excluded file when they are in a Folder', () => {
+        uploadToggles.enableFolderUpload();
+
+        contentServicesPage.uploadFolder(folderWithExcludedFile.location).checkContentIsDisplayed(folderWithExcludedFile.name);
+
+        contentServicesPage.doubleClickRow(folderWithExcludedFile.name).checkContentIsNotDisplayed(iniExcludedFile.name).checkContentIsDisplayed('a_file.txt');
+    });
+});
diff --git a/e2e/content-services/upload/uploader_component.e2e.ts b/e2e/content-services/upload/uploader_component.e2e.ts
new file mode 100644
index 0000000000..8e5fefe6d8
--- /dev/null
+++ b/e2e/content-services/upload/uploader_component.e2e.ts
@@ -0,0 +1,408 @@
+/*!
+ * @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';
+
+import LoginPage = require('../../pages/adf/loginPage');
+import ContentServicesPage = require('../../pages/adf/contentServicesPage');
+import UploadDialog = require('../../pages/adf/dialog/uploadDialog');
+import UploadToggles = require('../../pages/adf/dialog/uploadToggles');
+
+import AcsUserModel = require('../../models/ACS/acsUserModel');
+import FileModel = require('../../models/ACS/fileModel');
+import FolderModel = require('../../models/ACS/folderModel');
+
+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 { DropActions } from '../../actions/drop.actions';
+
+describe('Upload component', () => {
+
+    let contentServicesPage = new ContentServicesPage();
+    let uploadDialog = new UploadDialog();
+    let uploadToggles = new UploadToggles();
+    let loginPage = new LoginPage();
+    let acsUser = new AcsUserModel();
+
+    let firstPdfFileModel = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.PDF_B.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.PDF_B.file_location
+    });
+    let docxFileModel = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.DOCX.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.DOCX.file_location
+    });
+    let pdfFileModel = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.PDF.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.PDF.file_location
+    });
+    let pngFileModel = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.PNG.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.PNG.file_location
+    });
+    let largeFile = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.LARGE_FILE.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.LARGE_FILE.file_location
+    });
+    let fileWithSpecificSize = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.TXT_400B.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.TXT_400B.file_location
+    });
+    let emptyFile = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.TXT_0B.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.TXT_0B.file_location
+    });
+    let folderOne = new FolderModel({
+        'name': resources.Files.ADF_DOCUMENTS.FOLDER_ONE.folder_name,
+        'location': resources.Files.ADF_DOCUMENTS.FOLDER_ONE.folder_location
+    });
+    let folderTwo = new FolderModel({
+        'name': resources.Files.ADF_DOCUMENTS.FOLDER_TWO.folder_name,
+        'location': resources.Files.ADF_DOCUMENTS.FOLDER_TWO.folder_location
+    });
+    let uploadedFileInFolder = new FileModel({ 'name': resources.Files.ADF_DOCUMENTS.FILE_INSIDE_FOLDER_ONE.file_name });
+    let uploadedFileInFolderTwo = new FileModel({ 'name': resources.Files.ADF_DOCUMENTS.FILE_INSIDE_FOLDER_TWO.file_name });
+    let filesLocation = [pdfFileModel.location, docxFileModel.location, pngFileModel.location, firstPdfFileModel.location];
+    let filesName = [pdfFileModel.name, docxFileModel.name, pngFileModel.name, firstPdfFileModel.name];
+
+    beforeAll(async (done) => {
+        let uploadActions = new UploadActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+        await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+
+        contentServicesPage.goToDocumentList();
+
+        let pdfUploadedFile = await uploadActions.uploadFile(this.alfrescoJsApi, firstPdfFileModel.location, firstPdfFileModel.name, '-my-');
+
+        Object.assign(firstPdfFileModel, pdfUploadedFile.entry);
+
+        done();
+    });
+
+    it('[C272788] Upload Button is visible on the page', () => {
+        expect(contentServicesPage.getSingleFileButtonTooltip()).toEqual('Custom tooltip');
+
+        contentServicesPage
+            .checkUploadButton()
+            .checkContentIsDisplayed(firstPdfFileModel.name);
+
+        contentServicesPage
+            .deleteContent(firstPdfFileModel.name)
+            .checkContentIsNotDisplayed(pdfFileModel.name);
+    });
+
+    it('[C272789] Upload a pdf file', () => {
+        contentServicesPage
+            .uploadFile(pdfFileModel.location)
+            .checkContentIsDisplayed(pdfFileModel.name);
+
+        uploadDialog.fileIsUploaded(pdfFileModel.name);
+
+        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
+
+        contentServicesPage
+            .deleteContent(pdfFileModel.name)
+            .checkContentIsNotDisplayed(pdfFileModel.name);
+    });
+
+    it('[C272790] Upload a text file', () => {
+        contentServicesPage
+            .uploadFile(docxFileModel.location)
+            .checkContentIsDisplayed(docxFileModel.name);
+
+        uploadDialog.fileIsUploaded(docxFileModel.name);
+        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
+
+        contentServicesPage
+            .deleteContent(docxFileModel.name)
+            .checkContentIsNotDisplayed(docxFileModel.name);
+    });
+
+    it('[C260141] Upload a png file', () => {
+        contentServicesPage
+            .uploadFile(pngFileModel.location)
+            .checkContentIsDisplayed(pngFileModel.name);
+
+        uploadDialog.fileIsUploaded(pngFileModel.name);
+        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
+
+        contentServicesPage
+            .deleteContent(pngFileModel.name)
+            .checkContentIsNotDisplayed(pngFileModel.name);
+    });
+
+    it('[C260143] Minimize and maximize the upload dialog box', () => {
+        contentServicesPage
+            .uploadFile(docxFileModel.location)
+            .checkContentIsDisplayed(docxFileModel.name);
+
+        uploadDialog.fileIsUploaded(docxFileModel.name).checkCloseButtonIsDisplayed();
+        expect(uploadDialog.getTitleText()).toEqual('Uploaded 1 / 1');
+        expect(uploadDialog.numberOfCurrentFilesUploaded()).toEqual('1');
+        expect(uploadDialog.numberOfInitialFilesUploaded()).toEqual('1');
+        uploadDialog.minimizeUploadDialog().dialogIsMinimized();
+        expect(uploadDialog.getTitleText()).toEqual('Uploaded 1 / 1');
+        expect(uploadDialog.numberOfCurrentFilesUploaded()).toEqual('1');
+        expect(uploadDialog.numberOfInitialFilesUploaded()).toEqual('1');
+        uploadDialog.maximizeUploadDialog().dialogIsDisplayed().fileIsUploaded(docxFileModel.name);
+        expect(uploadDialog.getTitleText()).toEqual('Uploaded 1 / 1');
+        expect(uploadDialog.numberOfCurrentFilesUploaded()).toEqual('1');
+        expect(uploadDialog.numberOfInitialFilesUploaded()).toEqual('1');
+        uploadDialog.checkCloseButtonIsDisplayed().clickOnCloseButton().dialogIsNotDisplayed();
+        contentServicesPage.deleteContent(docxFileModel.name).checkContentIsNotDisplayed(docxFileModel.name);
+    });
+
+    it('[C260168] Cancel the uploaded file through the upload dialog icon', () => {
+        contentServicesPage.uploadFile(pdfFileModel.location)
+            .checkContentIsDisplayed(pdfFileModel.name);
+        uploadDialog.removeUploadedFile(pdfFileModel.name).fileIsCancelled(pdfFileModel.name);
+        expect(uploadDialog.getTitleText()).toEqual('Upload canceled');
+        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
+        contentServicesPage.checkContentIsNotDisplayed(pdfFileModel.name);
+    });
+
+    it('[C272792] Cancel a big file through the upload dialog icon before the upload to be done', () => {
+        browser.executeScript(' setTimeout(() => {document.querySelector("#adf-upload-dialog-cancel-all").click();' +
+           'document.querySelector("#adf-upload-dialog-cancel").click();  }, 5000)');
+
+        contentServicesPage.uploadFile(largeFile.location);
+
+        expect(uploadDialog.getTitleText()).toEqual('Upload canceled');
+        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
+        contentServicesPage.checkContentIsNotDisplayed(largeFile.name);
+    });
+
+    xit('[C260169] Cancel a big file through the cancel uploads button', () => {
+        contentServicesPage.uploadFile(largeFile.location);
+        expect(uploadDialog.getTitleText()).toEqual('Uploading 0 / 1');
+        expect(uploadDialog.getConfirmationDialogTitleText()).toEqual('Cancel Upload');
+        expect(uploadDialog.getConfirmationDialogDescriptionText()).toEqual('Stop uploading and remove files already uploaded.');
+        uploadDialog.clickOnConfirmationDialogYesButton().fileIsCancelled(largeFile.name);
+        expect(uploadDialog.getTitleText()).toEqual('Upload canceled');
+        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
+        contentServicesPage.checkContentIsNotDisplayed(largeFile.name);
+    });
+
+    xit('[C272793] Cancel uploading multiple files', () => {
+        uploadToggles.enableMultipleFileUpload();
+        contentServicesPage.uploadMultipleFile([pngFileModel.location, largeFile.location]);
+        uploadDialog.cancelUploads();
+        expect(uploadDialog.getConfirmationDialogTitleText()).toEqual('Cancel Upload');
+        expect(uploadDialog.getConfirmationDialogDescriptionText()).toEqual('Stop uploading and remove files already uploaded.');
+        uploadDialog.clickOnConfirmationDialogYesButton().fileIsCancelled(pngFileModel.name).fileIsCancelled(largeFile.name);
+        expect(uploadDialog.getTitleText()).toEqual('Upload canceled');
+        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
+        contentServicesPage.checkContentIsNotDisplayed(pngFileModel.name).checkContentIsNotDisplayed(largeFile.name);
+        uploadToggles.disableMultipleFileUpload();
+    });
+
+    it('[C272794] Tooltip of uploading multiple files button', () => {
+        uploadToggles.enableMultipleFileUpload();
+        browser.driver.sleep(1000);
+        expect(contentServicesPage.getMultipleFileButtonTooltip()).toEqual('Custom tooltip');
+        uploadToggles.disableMultipleFileUpload();
+    });
+
+    it('[C260171] Should upload only the extension filter allowed when Enable extension filter is enabled', () => {
+        uploadToggles.enableExtensionFilter();
+        browser.driver.sleep(1000);
+        uploadToggles.addExtension('.docx');
+        contentServicesPage.uploadFile(docxFileModel.location).checkContentIsDisplayed(docxFileModel.name);
+        uploadDialog.removeUploadedFile(docxFileModel.name).fileIsCancelled(docxFileModel.name);
+        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
+        contentServicesPage.uploadFile(pngFileModel.location).checkContentIsNotDisplayed(pngFileModel.name);
+        uploadDialog.dialogIsNotDisplayed();
+        uploadToggles.disableExtensionFilter();
+    });
+
+    it('[C274687] Should upload with drag and drop only the extension filter allowed when Enable extension filter is enabled', () => {
+        uploadToggles.enableExtensionFilter();
+        browser.driver.sleep(1000);
+        uploadToggles.addExtension('.docx');
+
+        let dragAndDrop = new DropActions();
+        let dragAndDropArea = element(by.css('adf-upload-drag-area div'));
+
+        dragAndDrop.dropFile(dragAndDropArea, docxFileModel.location);
+        contentServicesPage.checkContentIsDisplayed(docxFileModel.name);
+
+        uploadDialog.removeUploadedFile(docxFileModel.name).fileIsCancelled(docxFileModel.name);
+        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
+
+        dragAndDrop.dropFile(dragAndDropArea, pngFileModel.location);
+        contentServicesPage.checkContentIsNotDisplayed(pngFileModel.name);
+        uploadDialog.dialogIsNotDisplayed();
+        uploadToggles.disableExtensionFilter();
+    });
+
+    it('[C279920] Upload same file twice', () => {
+        contentServicesPage.uploadFile(pdfFileModel.location).checkContentIsDisplayed(pdfFileModel.name);
+        pdfFileModel.setVersion('1');
+        contentServicesPage.uploadFile(pdfFileModel.location).checkContentIsDisplayed(pdfFileModel.getVersionName());
+        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
+        contentServicesPage.deleteContent(pdfFileModel.name).checkContentIsNotDisplayed(pdfFileModel.name);
+        contentServicesPage.deleteContent(pdfFileModel.getVersionName()).checkContentIsNotDisplayed(pdfFileModel.getVersionName());
+        pdfFileModel.setVersion('');
+    });
+
+    it('[C260172] Enable versioning', () => {
+        uploadToggles.enableVersioning();
+        contentServicesPage.uploadFile(pdfFileModel.location).checkContentIsDisplayed(pdfFileModel.name);
+        pdfFileModel.setVersion('1');
+        contentServicesPage.uploadFile(pdfFileModel.location).checkContentIsDisplayed(pdfFileModel.name);
+        uploadDialog.fileIsUploaded(pdfFileModel.name);
+        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
+        contentServicesPage.checkContentIsNotDisplayed(pdfFileModel.getVersionName());
+        contentServicesPage.deleteContent(pdfFileModel.name).checkContentIsNotDisplayed(pdfFileModel.name);
+        pdfFileModel.setVersion('');
+        uploadToggles.disableVersioning();
+    });
+
+    it('[C260173] Enable folder upload', () => {
+        uploadToggles.enableFolderUpload();
+        browser.driver.sleep(1000);
+        contentServicesPage.uploadFolder(folderOne.location).checkContentIsDisplayed(folderOne.name);
+        expect(contentServicesPage.getFolderButtonTooltip()).toEqual('Custom tooltip');
+        uploadDialog.fileIsUploaded(uploadedFileInFolder.name);
+        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
+        contentServicesPage.doubleClickRow(folderOne.name).checkContentIsDisplayed(uploadedFileInFolder.name);
+        contentServicesPage.goToDocumentList();
+        uploadToggles.disableFolderUpload();
+    });
+
+    it('[C260176] The files uploaded before closing the upload dialog box are not displayed anymore in the upload box', () => {
+        contentServicesPage.uploadFile(docxFileModel.location).checkContentIsDisplayed(docxFileModel.name);
+
+        uploadDialog.fileIsUploaded(docxFileModel.name);
+
+        contentServicesPage.uploadFile(pngFileModel.location).checkContentIsDisplayed(pngFileModel.name);
+
+        uploadDialog.fileIsUploaded(pngFileModel.name).fileIsUploaded(docxFileModel.name);
+        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
+
+        contentServicesPage.uploadFile(pdfFileModel.location).checkContentIsDisplayed(pdfFileModel.name);
+
+        uploadDialog.fileIsUploaded(pdfFileModel.name).fileIsNotDisplayedInDialog(pngFileModel.name).fileIsNotDisplayedInDialog(docxFileModel.name);
+        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
+
+        contentServicesPage.deleteContents([docxFileModel.name, pngFileModel.name, pdfFileModel.name])
+            .checkContentsAreNotDisplayed([docxFileModel.name, pngFileModel.name, pdfFileModel.name]);
+    });
+
+    it('[C260170] Upload files on the same time', () => {
+        contentServicesPage.goToDocumentList();
+        contentServicesPage.checkAcsContainer();
+
+        uploadToggles.enableMultipleFileUpload();
+
+        contentServicesPage.uploadMultipleFile(filesLocation).checkContentsAreDisplayed(filesName);
+
+        uploadDialog.filesAreUploaded(filesName);
+
+        expect(uploadDialog.getTitleText()).toEqual('Uploaded 4 / 4');
+
+        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
+
+        contentServicesPage.deleteContents(filesName).checkContentsAreNotDisplayed(filesName);
+
+        uploadToggles.disableMultipleFileUpload();
+    });
+
+    xit('[C279919] Enable max size and set it to 400', () => {
+        contentServicesPage.goToDocumentList();
+        contentServicesPage.checkAcsContainer();
+        uploadToggles.enableMaxSize();
+        uploadToggles.addMaxSize('400');
+        contentServicesPage.uploadFile(fileWithSpecificSize.location).checkContentIsDisplayed(fileWithSpecificSize.name);
+        uploadDialog.fileIsUploaded(fileWithSpecificSize.name).clickOnCloseButton().dialogIsNotDisplayed();
+        contentServicesPage.deleteContent(fileWithSpecificSize.name).checkContentIsNotDisplayed(fileWithSpecificSize.name);
+        uploadToggles.addMaxSize('399');
+        contentServicesPage.uploadFile(fileWithSpecificSize.location).checkContentIsNotDisplayed(fileWithSpecificSize.name);
+        expect(contentServicesPage.getErrorMessage()).toEqual('File ' + fileWithSpecificSize.name + ' is larger than the allowed file size');
+        uploadDialog.fileIsNotDisplayedInDialog(fileWithSpecificSize.name);
+        contentServicesPage.uploadFile(emptyFile.location).checkContentIsDisplayed(emptyFile.name);
+        uploadDialog.fileIsUploaded(emptyFile.name).clickOnCloseButton().dialogIsNotDisplayed();
+        contentServicesPage.deleteContent(emptyFile.name).checkContentIsNotDisplayed(emptyFile.name);
+        uploadToggles.disableMaxSize();
+    });
+
+    xit('[C272796] Enable max size and set it to 0', () => {
+        contentServicesPage.goToDocumentList();
+        uploadToggles.enableMaxSize();
+        uploadToggles.addMaxSize('0');
+        contentServicesPage.uploadFile(fileWithSpecificSize.location).checkContentIsNotDisplayed(fileWithSpecificSize.name);
+        expect(contentServicesPage.getErrorMessage()).toEqual('File ' + fileWithSpecificSize.name + ' is larger than the allowed file size');
+
+        uploadDialog.fileIsNotDisplayedInDialog(fileWithSpecificSize.name);
+        contentServicesPage.uploadFile(emptyFile.location).checkContentIsDisplayed(emptyFile.name);
+        uploadDialog.fileIsUploaded(emptyFile.name).clickOnCloseButton().dialogIsNotDisplayed();
+        contentServicesPage.deleteContent(emptyFile.name).checkContentIsNotDisplayed(emptyFile.name);
+        uploadToggles.disableMaxSize();
+    });
+
+    it('[C272797] Set max size to 1 and disable it', () => {
+        uploadToggles.enableMaxSize();
+        browser.driver.sleep(1000);
+        uploadToggles.addMaxSize('1');
+        uploadToggles.disableMaxSize();
+        contentServicesPage.uploadFile(fileWithSpecificSize.location).checkContentIsDisplayed(fileWithSpecificSize.name);
+        uploadDialog.fileIsUploaded(fileWithSpecificSize.name).clickOnCloseButton().dialogIsNotDisplayed();
+    });
+
+    it('[C91318] Should Enable/Disable upload button when change the disable property', () => {
+        uploadToggles.clickCheckboxDisableUpload();
+        expect(contentServicesPage.uploadButtonIsEnabled()).toBeFalsy();
+
+        uploadToggles.clickCheckboxDisableUpload();
+        expect(contentServicesPage.uploadButtonIsEnabled()).toBeTruthy();
+    });
+
+    it('[C279882] Should be possible Upload a folder in a folder', () => {
+        uploadToggles.enableFolderUpload();
+        browser.driver.sleep(1000);
+        contentServicesPage.uploadFolder(folderOne.location).checkContentIsDisplayed(folderOne.name);
+        uploadDialog.fileIsUploaded(uploadedFileInFolder.name);
+
+        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
+        contentServicesPage.doubleClickRow(folderOne.name).checkContentIsDisplayed(uploadedFileInFolder.name);
+
+        uploadToggles.enableFolderUpload();
+        browser.driver.sleep(1000);
+        contentServicesPage.uploadFolder(folderTwo.location).checkContentIsDisplayed(folderTwo.name);
+        uploadDialog.fileIsUploaded(uploadedFileInFolderTwo.name);
+
+        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
+        contentServicesPage.doubleClickRow(folderTwo.name).checkContentIsDisplayed(uploadedFileInFolderTwo.name);
+
+        uploadToggles.disableFolderUpload();
+    });
+
+});
diff --git a/e2e/content-services/upload/user_permission.e2e.ts b/e2e/content-services/upload/user_permission.e2e.ts
new file mode 100644
index 0000000000..730a58c78e
--- /dev/null
+++ b/e2e/content-services/upload/user_permission.e2e.ts
@@ -0,0 +1,246 @@
+/*!
+ * @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 LoginPage = require('../../pages/adf/loginPage');
+import ContentServicesPage = require('../../pages/adf/contentServicesPage');
+import UploadDialog = require('../../pages/adf/dialog/uploadDialog');
+import UploadToggles = require('../../pages/adf/dialog/uploadToggles');
+import NavigationBarPage = require('../../pages/adf/navigationBarPage');
+import NotificationPage = require('../../pages/adf/notificationPage');
+
+import AcsUserModel = require('../../models/ACS/acsUserModel');
+import FileModel = require('../../models/ACS/fileModel');
+import FolderModel = require('../../models/ACS/folderModel');
+
+import TestConfig = require('../../test.config');
+import resources = require('../../util/resources');
+
+import AlfrescoApi = require('alfresco-js-api-node');
+import { DropActions } from '../../actions/drop.actions';
+
+describe('Upload - User permission', () => {
+
+    let contentServicesPage = new ContentServicesPage();
+    let uploadDialog = new UploadDialog();
+    let uploadToggles = new UploadToggles();
+    let loginPage = new LoginPage();
+    let acsUser;
+    let acsUserTwo;
+    let navigationBarPage = new NavigationBarPage();
+    let notificationPage = new NotificationPage();
+
+    let emptyFile = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.TXT_0B.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.TXT_0B.file_location
+    });
+
+    let pngFile = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.PNG.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.PNG.file_location
+    });
+
+    let pdfFile = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.PDF.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.PDF.file_location
+    });
+
+    let folder = new FolderModel({
+        'name': resources.Files.ADF_DOCUMENTS.FOLDER_ONE.folder_name,
+        'location': resources.Files.ADF_DOCUMENTS.FOLDER_ONE.folder_location
+    });
+
+    beforeAll(() => {
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+    });
+
+    beforeEach(async (done) => {
+        acsUser = new AcsUserModel();
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+
+        done();
+    });
+
+    describe('limited permissions', () => {
+
+        beforeEach(async (done) => {
+            contentServicesPage.goToDocumentList();
+
+            done();
+        });
+
+        it('[C212861] Should not be allowed to Drag and drop a file/folder in a restricted user folder with limited permissions', () => {
+            contentServicesPage.checkDandDIsDisplayed();
+
+            let dragAndDrop = new DropActions();
+            let dragAndDropArea = element(by.css('adf-upload-drag-area div'));
+
+            dragAndDrop.dropFile(dragAndDropArea, emptyFile.location);
+            dragAndDrop.dropFolder(dragAndDropArea, folder.location);
+
+            contentServicesPage.checkContentIsDisplayed(emptyFile.name);
+            contentServicesPage.checkContentIsDisplayed(folder.name);
+
+            contentServicesPage.navigateToFolderViaBreadcrumbs('User Homes');
+
+            dragAndDrop.dropFile(dragAndDropArea, emptyFile.location);
+            dragAndDrop.dropFolder(dragAndDropArea, folder.location);
+
+            let fileInTheUploadedFolder = 'share_profile_pic.png';
+
+            uploadDialog.fileIsError(emptyFile.name);
+            uploadDialog.fileIsError(fileInTheUploadedFolder);
+
+            contentServicesPage.checkContentIsNotDisplayed(emptyFile.name);
+            contentServicesPage.checkContentIsNotDisplayed(folder.name);
+        });
+
+        it('[C279915] Should not be allowed to upload a file in a restricted user folder with limited permissions', () => {
+            navigationBarPage.clickLoginButton();
+
+            loginPage.loginToContentServicesUsingUserModel(acsUser);
+
+            contentServicesPage.goToDocumentList();
+
+            contentServicesPage.uploadFile(emptyFile.location).checkContentIsDisplayed(emptyFile.name);
+
+            uploadDialog.fileIsUploaded(emptyFile.name);
+
+            uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
+
+            contentServicesPage.navigateToFolderViaBreadcrumbs('User Homes');
+
+            contentServicesPage.uploadFile(emptyFile.location);
+
+            notificationPage.checkNotifyContains('You don\'t have the create permission to upload the content');
+        });
+
+        it('[C279916] Should not be allowed to upload a folder in a restricted user folder with limited permissions', () => {
+            uploadToggles.enableFolderUpload();
+
+            contentServicesPage.uploadFolder(folder.location).checkContentIsDisplayed(folder.name);
+
+            let fileInTheUploadedFolder = 'share_profile_pic.png';
+
+            uploadDialog.fileIsUploaded(fileInTheUploadedFolder);
+
+            uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
+
+            contentServicesPage.navigateToFolderViaBreadcrumbs('User Homes');
+
+            uploadToggles.enableFolderUpload();
+
+            contentServicesPage.uploadFolder(folder.location);
+
+            notificationPage.checkNotifyContains('You don\'t have the create permission to upload the content');
+        });
+    });
+
+    describe('full permissions', () => {
+
+        beforeEach(async (done) => {
+            loginPage.loginToContentServices(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+            contentServicesPage.goToDocumentList();
+
+            done();
+        });
+
+        it('[C260130] Should be allowed to Drag and drop a file/folder in a restricted user folder with full permissions', () => {
+            contentServicesPage.checkDandDIsDisplayed();
+
+            let dragAndDrop = new DropActions();
+
+            let dragAndDropArea = element(by.css('adf-upload-drag-area div'));
+
+            dragAndDrop.dropFile(dragAndDropArea, emptyFile.location);
+            dragAndDrop.dropFolder(dragAndDropArea, folder.location);
+
+            let fileInTheUploadedFolder = 'share_profile_pic.png';
+
+            uploadDialog.fileIsUploaded(emptyFile.name);
+            uploadDialog.fileIsUploaded(fileInTheUploadedFolder);
+        });
+
+        it('[C279917] Should be allowed to upload a file in a restricted user folder with full permissions', () => {
+            contentServicesPage.uploadFile(emptyFile.location);
+
+            uploadDialog.fileIsUploaded(emptyFile.name);
+        });
+
+        it('[C279918] Should be allowed to upload a folder in a restricted user folder with full permissions', () => {
+            uploadToggles.enableFolderUpload();
+
+            contentServicesPage.uploadFolder(folder.location);
+
+            let fileInTheUploadedFolder = 'share_profile_pic.png';
+
+            uploadDialog.fileIsUploaded(fileInTheUploadedFolder);
+        });
+    });
+
+    describe('multiple users', () => {
+
+        beforeEach(async (done) => {
+            acsUserTwo = new AcsUserModel();
+
+            await this.alfrescoJsApi.core.peopleApi.addPerson(acsUserTwo);
+
+            contentServicesPage.goToDocumentList();
+
+            done();
+        });
+
+        it('[C260175] Should two different user upload files in the proper User Home', () => {
+            contentServicesPage.uploadFile(emptyFile.location);
+
+            uploadDialog.fileIsUploaded(emptyFile.name);
+
+            contentServicesPage.checkContentIsDisplayed(emptyFile.name);
+
+            navigationBarPage.clickLoginButton();
+            loginPage.loginToContentServicesUsingUserModel(acsUserTwo);
+            contentServicesPage.goToDocumentList();
+
+            contentServicesPage.checkContentIsNotDisplayed(emptyFile.name);
+
+            contentServicesPage.uploadFile(pngFile.location);
+
+            contentServicesPage.checkContentIsDisplayed(pngFile.name);
+
+            navigationBarPage.clickLoginButton();
+            loginPage.loginToContentServicesUsingUserModel(acsUser);
+            contentServicesPage.goToDocumentList();
+
+            contentServicesPage.checkContentIsNotDisplayed(pngFile.name);
+
+            contentServicesPage.uploadFile(pdfFile.location);
+
+            contentServicesPage.checkContentIsDisplayed(pdfFile.name);
+        });
+    });
+
+});
diff --git a/e2e/content-services/version/version-actions.e2e.ts b/e2e/content-services/version/version-actions.e2e.ts
new file mode 100644
index 0000000000..90102252d0
--- /dev/null
+++ b/e2e/content-services/version/version-actions.e2e.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 { by, element } from 'protractor';
+
+import LoginPage = require('../../pages/adf/loginPage');
+import ContentServicesPage = require('../../pages/adf/contentServicesPage');
+import ContentListPage = require('../../pages/adf/dialog/contentList');
+import { VersionManagePage } from '../../pages/adf/versionManagerPage';
+
+import AcsUserModel = require('../../models/ACS/acsUserModel');
+import FileModel = require('../../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 path = require('path');
+
+describe('Version component actions', () => {
+
+    const loginPage = new LoginPage();
+    const contentServicesPage = new ContentServicesPage();
+    const contentListPage = new ContentListPage();
+    const versionManagePage = new VersionManagePage();
+
+    let acsUser = new AcsUserModel();
+
+    let txtFileModel = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.TXT.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.TXT.file_location
+    });
+
+    let fileModelVersionTwo = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.PNG.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.PNG.file_location
+    });
+
+    beforeAll(async (done) => {
+
+        let uploadActions = new UploadActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+        await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+
+        let txtUploadedFile = await uploadActions.uploadFile(this.alfrescoJsApi, txtFileModel.location, txtFileModel.name, '-my-');
+
+        Object.assign(txtFileModel, txtUploadedFile.entry);
+
+        txtFileModel.update(txtUploadedFile.entry);
+
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+
+        contentServicesPage.navigateToDocumentList();
+        contentListPage.versionManagerContent(txtFileModel.name);
+
+        done();
+    });
+
+    it('[C280003] Should not be possible delete a file version if there is only one version', () => {
+        versionManagePage.clickActionButton('1.0');
+        expect(element(by.css(`[id="adf-version-list-action-delete-1.0"]`)).isEnabled()).toBe(false);
+        versionManagePage.closeActionButton();
+        Util.waitUntilElementIsNotOnPage(element(by.css(`[id="adf-version-list-action-delete-1.0"]`)));
+    });
+
+    it('[C280004] Should not be possible restore the version if there is only one version', () => {
+        versionManagePage.clickActionButton('1.0');
+        expect(element(by.css(`[id="adf-version-list-action-restore-1.0"]`)).isEnabled()).toBe(false);
+        versionManagePage.closeActionButton();
+        Util.waitUntilElementIsNotOnPage(element(by.css(`[id="adf-version-list-action-restore-1.0"]`)));
+    });
+
+    it('[C280005] Should be showed all the default action when you have more then one version', () => {
+        versionManagePage.showNewVersionButton.click();
+
+        versionManagePage.uploadNewVersionFile(fileModelVersionTwo.location);
+
+        versionManagePage.clickActionButton('1.1').checkActionsArePresent('1.1');
+
+        versionManagePage.closeActionButton();
+    });
+
+    it('[C269081] Should be possible download all the version of a file', () => {
+        versionManagePage.downloadFileVersion('1.0');
+
+        expect(Util.fileExists(path.join(__dirname, 'downloads', txtFileModel.name), 20)).toBe(true);
+
+        versionManagePage.downloadFileVersion('1.1');
+
+        expect(Util.fileExists(path.join(__dirname, 'downloads', fileModelVersionTwo.name), 20)).toBe(true);
+    });
+
+    it('[C272819] Should be possible delete a version when click on delete version action', () => {
+        versionManagePage.deleteFileVersion('1.1');
+
+        versionManagePage.clickAcceptConfirm();
+
+        versionManagePage.chekFileVersionNotExist('1.1');
+        versionManagePage.chekFileVersionExist('1.0');
+    });
+
+    it('[C280006] Should be possible prevent a version to be deleted when click on No on the confirm dialog', () => {
+        versionManagePage.showNewVersionButton.click();
+
+        versionManagePage.uploadNewVersionFile(fileModelVersionTwo.location);
+
+        versionManagePage.chekFileVersionExist('1.1');
+
+        versionManagePage.deleteFileVersion('1.1');
+
+        versionManagePage.clickCancelConfirm();
+
+        versionManagePage.chekFileVersionExist('1.1');
+        versionManagePage.chekFileVersionExist('1.0');
+    });
+
+    it('[C280007] Should be possible restore an old version of your file', () => {
+        versionManagePage.restoreFileVersion('1.0');
+
+        versionManagePage.chekFileVersionExist('2.0');
+    });
+
+});
diff --git a/e2e/content-services/version/version-permissions.e2e.ts b/e2e/content-services/version/version-permissions.e2e.ts
new file mode 100644
index 0000000000..51008a91a9
--- /dev/null
+++ b/e2e/content-services/version/version-permissions.e2e.ts
@@ -0,0 +1,383 @@
+/*!
+ * @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 LoginPage = require('../../pages/adf/loginPage');
+import ContentListPage = require('../../pages/adf/dialog/contentList');
+import NavigationBarPage = require('../../pages/adf/navigationBarPage');
+import { VersionManagePage } from '../../pages/adf/versionManagerPage';
+import UploadDialog = require('../../pages/adf/dialog/uploadDialog');
+import NotificationPage = require('../../pages/adf/notificationPage');
+
+import AcsUserModel = require('../../models/ACS/acsUserModel');
+import FileModel = require('../../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 { NodeActions } from '../../actions/ACS/node.actions';
+
+import Util = require('../../util/util');
+import CONSTANTS = require('../../util/constants');
+
+describe('Version component permissions', () => {
+
+    const loginPage = new LoginPage();
+    const contentListPage = new ContentListPage();
+    const versionManagePage = new VersionManagePage();
+    const navigationBarPage = new NavigationBarPage();
+    const uploadDialog = new UploadDialog();
+    const notificationPage = new NotificationPage();
+    let site;
+
+    let acsUser = new AcsUserModel();
+    let consumerUser = new AcsUserModel();
+    let collaboratorUser = new AcsUserModel();
+    let contributorUser = new AcsUserModel();
+    let managerUser = new AcsUserModel();
+    let fileCreatorUser = new AcsUserModel();
+
+    let newVersionFile = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.PNG_B.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.PNG_B.file_location
+    });
+
+    let lockFileModel = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.PNG_C.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.PNG_C.file_location
+    });
+
+    let differentCreatoFile = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.PNG_D.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.PNG_D.file_location
+    });
+
+    beforeAll(async (done) => {
+
+        let uploadActions = new UploadActions();
+        let nodeActions = new NodeActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+        await this.alfrescoJsApi.core.peopleApi.addPerson(consumerUser);
+        await this.alfrescoJsApi.core.peopleApi.addPerson(collaboratorUser);
+        await this.alfrescoJsApi.core.peopleApi.addPerson(contributorUser);
+        await this.alfrescoJsApi.core.peopleApi.addPerson(managerUser);
+        await this.alfrescoJsApi.core.peopleApi.addPerson(fileCreatorUser);
+
+        site = await this.alfrescoJsApi.core.sitesApi.createSite({
+            title: Util.generateRandomString(),
+            visibility: 'PUBLIC'
+        });
+
+        await this.alfrescoJsApi.core.sitesApi.addSiteMember(site.entry.id, {
+            id: consumerUser.id,
+            role: CONSTANTS.CS_USER_ROLES.CONSUMER
+        });
+
+        await this.alfrescoJsApi.core.sitesApi.addSiteMember(site.entry.id, {
+            id: collaboratorUser.id,
+            role: CONSTANTS.CS_USER_ROLES.COLLABORATOR
+        });
+
+        await this.alfrescoJsApi.core.sitesApi.addSiteMember(site.entry.id, {
+            id: contributorUser.id,
+            role: CONSTANTS.CS_USER_ROLES.CONTRIBUTOR
+        });
+
+        await this.alfrescoJsApi.core.sitesApi.addSiteMember(site.entry.id, {
+            id: managerUser.id,
+            role: CONSTANTS.CS_USER_ROLES.MANAGER
+        });
+
+        await this.alfrescoJsApi.core.sitesApi.addSiteMember(site.entry.id, {
+            id: fileCreatorUser.id,
+            role: CONSTANTS.CS_USER_ROLES.MANAGER
+        });
+
+        let lockFileUploaded = await uploadActions.uploadFile(this.alfrescoJsApi, lockFileModel.location, lockFileModel.name, site.entry.guid);
+        Object.assign(lockFileModel, lockFileUploaded.entry);
+
+        nodeActions.lockNode(this.alfrescoJsApi, lockFileModel.id);
+
+        await this.alfrescoJsApi.login(fileCreatorUser.id, fileCreatorUser.password);
+
+        await uploadActions.uploadFile(this.alfrescoJsApi, differentCreatoFile.location, differentCreatoFile.name, site.entry.guid);
+
+        done();
+    });
+
+    describe('Manager', () => {
+
+        let sameCreatoFile = new FileModel({
+            'name': resources.Files.ADF_DOCUMENTS.PNG.file_name,
+            'location': resources.Files.ADF_DOCUMENTS.PNG.file_location
+        });
+
+        beforeAll(async (done) => {
+            let uploadActions = new UploadActions();
+
+            await this.alfrescoJsApi.login(managerUser.id, managerUser.password);
+
+            let sameCreatoFileUploaded = await uploadActions.uploadFile(this.alfrescoJsApi, sameCreatoFile.location, sameCreatoFile.name, site.entry.guid);
+            Object.assign(sameCreatoFile, sameCreatoFileUploaded.entry);
+
+            loginPage.loginToContentServicesUsingUserModel(managerUser);
+
+            navigationBarPage.openContentServicesFolder(site.entry.guid);
+
+            done();
+        });
+
+        afterAll(async (done) => {
+            await this.alfrescoJsApi.nodes.deleteNode(sameCreatoFile.id);
+            done();
+        });
+
+        it('[C277200] should a user with Manager permission be able to upload a new version for a file with different creator', () => {
+            contentListPage.versionManagerContent(differentCreatoFile.name);
+
+            versionManagePage.showNewVersionButton.click();
+
+            versionManagePage.uploadNewVersionFile(newVersionFile.location);
+
+            versionManagePage.chekFileVersionExist('1.1');
+            expect(versionManagePage.getFileVersionName('1.1')).toEqual(newVersionFile.name);
+            expect(versionManagePage.getFileVersionDate('1.1')).not.toBeUndefined();
+
+            versionManagePage.deleteFileVersion('1.1');
+            versionManagePage.clickAcceptConfirm();
+
+            versionManagePage.chekFileVersionNotExist('1.1');
+
+            versionManagePage.closeVersionDialog();
+
+            uploadDialog.clickOnCloseButton();
+        });
+
+        it('[C277204] Should a user with Manager permission not be able to upload a new version for a locked file', () => {
+            contentListPage.versionManagerContent(lockFileModel.name);
+
+            versionManagePage.showNewVersionButton.click();
+
+            versionManagePage.uploadNewVersionFile(newVersionFile.location);
+
+            versionManagePage.chekFileVersionNotExist('1.1');
+
+            versionManagePage.closeVersionDialog();
+
+            uploadDialog.clickOnCloseButton();
+        });
+
+        it('[C277196] Should a user with Manager permission be able to upload a new version for the created file', () => {
+            contentListPage.versionManagerContent(sameCreatoFile.name);
+
+            versionManagePage.showNewVersionButton.click();
+
+            versionManagePage.uploadNewVersionFile(newVersionFile.location);
+
+            versionManagePage.chekFileVersionExist('1.1');
+            expect(versionManagePage.getFileVersionName('1.1')).toEqual(newVersionFile.name);
+            expect(versionManagePage.getFileVersionDate('1.1')).not.toBeUndefined();
+
+            versionManagePage.deleteFileVersion('1.1');
+            versionManagePage.clickAcceptConfirm();
+
+            versionManagePage.chekFileVersionNotExist('1.1');
+
+            versionManagePage.closeVersionDialog();
+
+            uploadDialog.clickOnCloseButton();
+        });
+    });
+
+    describe('Consumer', () => {
+
+        beforeAll(async (done) => {
+            loginPage.loginToContentServicesUsingUserModel(consumerUser);
+
+            navigationBarPage.openContentServicesFolder(site.entry.guid);
+
+            done();
+        });
+
+        it('[C277197] Should a user with Consumer permission not be able to upload a new version for a file with different creator', () => {
+            contentListPage.versionManagerContent(differentCreatoFile.name);
+
+            notificationPage.checkNotifyContains(`You don't have access to do this`);
+        });
+
+        it('[C277201] Should a user with Consumer permission not be able to upload a new version for a locked file', () => {
+            contentListPage.versionManagerContent(lockFileModel.name);
+
+            notificationPage.checkNotifyContains(`You don't have access to do this`);
+        });
+
+    });
+
+    describe('Contributor', () => {
+        let sameCreatoFile = new FileModel({
+            'name': resources.Files.ADF_DOCUMENTS.PNG.file_name,
+            'location': resources.Files.ADF_DOCUMENTS.PNG.file_location
+        });
+
+        beforeAll(async (done) => {
+            let uploadActions = new UploadActions();
+
+            await this.alfrescoJsApi.login(contributorUser.id, contributorUser.password);
+
+            let sameCreatoFileUploaded = await uploadActions.uploadFile(this.alfrescoJsApi, sameCreatoFile.location, sameCreatoFile.name, site.entry.guid);
+            Object.assign(sameCreatoFile, sameCreatoFileUploaded.entry);
+
+            loginPage.loginToContentServicesUsingUserModel(contributorUser);
+
+            navigationBarPage.openContentServicesFolder(site.entry.guid);
+
+            done();
+        });
+
+        afterAll(async (done) => {
+            await this.alfrescoJsApi.nodes.deleteNode(sameCreatoFile.id);
+            done();
+        });
+
+        it('[C277177] Should a user with Contributor permission be able to upload a new version for the created file', () => {
+            contentListPage.versionManagerContent(sameCreatoFile.name);
+
+            versionManagePage.showNewVersionButton.click();
+
+            versionManagePage.uploadNewVersionFile(newVersionFile.location);
+
+            versionManagePage.chekFileVersionExist('1.1');
+            expect(versionManagePage.getFileVersionName('1.1')).toEqual(newVersionFile.name);
+            expect(versionManagePage.getFileVersionDate('1.1')).not.toBeUndefined();
+
+            versionManagePage.deleteFileVersion('1.1');
+            versionManagePage.clickAcceptConfirm();
+
+            versionManagePage.chekFileVersionNotExist('1.1');
+
+            versionManagePage.closeVersionDialog();
+
+            uploadDialog.clickOnCloseButton();
+        });
+
+        it('[C277198] Should a user with Contributor permission not be able to upload a new version for a file with different creator', () => {
+            contentListPage.versionManagerContent(differentCreatoFile.name);
+
+            notificationPage.checkNotifyContains(`You don't have access to do this`);
+        });
+
+        it('[C277202] Should a user with Contributor permission not be able to upload a new version for a locked file', () => {
+            contentListPage.versionManagerContent(lockFileModel.name);
+
+            notificationPage.checkNotifyContains(`You don't have access to do this`);
+        });
+    });
+
+    describe('Collaborator', () => {
+        let sameCreatoFile = new FileModel({
+            'name': resources.Files.ADF_DOCUMENTS.PNG.file_name,
+            'location': resources.Files.ADF_DOCUMENTS.PNG.file_location
+        });
+
+        beforeAll(async (done) => {
+            let uploadActions = new UploadActions();
+
+            await this.alfrescoJsApi.login(collaboratorUser.id, collaboratorUser.password);
+
+            let sameCreatoFileUploaded = await uploadActions.uploadFile(this.alfrescoJsApi, sameCreatoFile.location, sameCreatoFile.name, site.entry.guid);
+            Object.assign(sameCreatoFile, sameCreatoFileUploaded.entry);
+
+            loginPage.loginToContentServicesUsingUserModel(collaboratorUser);
+
+            navigationBarPage.openContentServicesFolder(site.entry.guid);
+
+            done();
+        });
+
+        afterAll(async (done) => {
+            await this.alfrescoJsApi.nodes.deleteNode(sameCreatoFile.id);
+            done();
+        });
+
+        it('[C277195] Should a user with Collaborator permission be able to upload a new version for the created file', () => {
+            contentListPage.versionManagerContent(sameCreatoFile.name);
+
+            versionManagePage.showNewVersionButton.click();
+
+            versionManagePage.uploadNewVersionFile(newVersionFile.location);
+
+            versionManagePage.chekFileVersionExist('1.1');
+            expect(versionManagePage.getFileVersionName('1.1')).toEqual(newVersionFile.name);
+            expect(versionManagePage.getFileVersionDate('1.1')).not.toBeUndefined();
+
+            versionManagePage.deleteFileVersion('1.1');
+            versionManagePage.clickAcceptConfirm();
+
+            versionManagePage.chekFileVersionNotExist('1.1');
+
+            versionManagePage.closeVersionDialog();
+
+            uploadDialog.clickOnCloseButton();
+        });
+
+        it('[C277203] Should a user with Collaborator permission not be able to upload a new version for a locked file', () => {
+            contentListPage.versionManagerContent(lockFileModel.name);
+
+            versionManagePage.showNewVersionButton.click();
+
+            versionManagePage.uploadNewVersionFile(newVersionFile.location);
+
+            versionManagePage.chekFileVersionNotExist('1.1');
+
+            versionManagePage.closeVersionDialog();
+
+            uploadDialog.clickOnCloseButton();
+        });
+
+        it('[C277199] should a user with Collaborator permission be able to upload a new version for a file with different creator', () => {
+            contentListPage.versionManagerContent(differentCreatoFile.name);
+
+            versionManagePage.showNewVersionButton.click();
+
+            versionManagePage.uploadNewVersionFile(newVersionFile.location);
+
+            versionManagePage.chekFileVersionExist('1.1');
+            expect(versionManagePage.getFileVersionName('1.1')).toEqual(newVersionFile.name);
+            expect(versionManagePage.getFileVersionDate('1.1')).not.toBeUndefined();
+
+            versionManagePage.clickActionButton('1.1');
+
+            expect(element(by.css(`[id="adf-version-list-action-delete-1.1"]`)).isEnabled()).toBe(false);
+
+            versionManagePage.closeActionButton();
+
+            versionManagePage.closeVersionDialog();
+        });
+    });
+
+});
diff --git a/e2e/content-services/version/version-properties.e2e.ts b/e2e/content-services/version/version-properties.e2e.ts
new file mode 100644
index 0000000000..65cce6259d
--- /dev/null
+++ b/e2e/content-services/version/version-properties.e2e.ts
@@ -0,0 +1,139 @@
+/*!
+ * @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 LoginPage = require('../../pages/adf/loginPage');
+import ContentServicesPage = require('../../pages/adf/contentServicesPage');
+import ContentListPage = require('../../pages/adf/dialog/contentList');
+import { VersionManagePage } from '../../pages/adf/versionManagerPage';
+
+import AcsUserModel = require('../../models/ACS/acsUserModel');
+import FileModel = require('../../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');
+
+describe('Version Properties', () => {
+
+    const loginPage = new LoginPage();
+    const contentServicesPage = new ContentServicesPage();
+    const contentListPage = new ContentListPage();
+    const versionManagePage = new VersionManagePage();
+
+    let acsUser = new AcsUserModel();
+
+    let txtFileModel = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.TXT_0B.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.TXT_0B.file_location
+    });
+
+    let fileModelVersionTwo = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.PNG.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.PNG.file_location
+    });
+
+    beforeAll(async (done) => {
+
+        let uploadActions = new UploadActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+        await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+
+        let txtUploadedFile = await uploadActions.uploadFile(this.alfrescoJsApi, txtFileModel.location, txtFileModel.name, '-my-');
+
+        Object.assign(txtFileModel, txtUploadedFile.entry);
+
+        txtFileModel.update(txtUploadedFile.entry);
+
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+
+        contentServicesPage.navigateToDocumentList();
+        contentListPage.versionManagerContent(txtFileModel.name);
+
+        done();
+    });
+
+    it('[C272817] Should NOT be present the download action when allowDownload property is false', () => {
+        versionManagePage.disableDownload();
+
+        versionManagePage.clickActionButton('1.0');
+
+        Util.waitUntilElementIsNotVisible(element(by.css(`[id="adf-version-list-action-download-1.0"]`)));
+
+        versionManagePage.closeActionButton();
+    });
+
+    it('[C279992] Should be present the download action when allowDownload property is true', () => {
+        versionManagePage.enableDownload();
+
+        versionManagePage.clickActionButton('1.0');
+
+        Util.waitUntilElementIsVisible(element(by.css(`[id="adf-version-list-action-download-1.0"]`)));
+
+        versionManagePage.closeActionButton();
+    });
+
+    it('[C269085] Should show/hide comments when showComments true/false', () => {
+        versionManagePage.enableComments();
+
+        versionManagePage.showNewVersionButton.click();
+        versionManagePage.enterCommentText('Example comment text');
+        versionManagePage.uploadNewVersionFile(fileModelVersionTwo.location);
+
+        versionManagePage.chekFileVersionExist('1.1');
+        expect(versionManagePage.getFileVersionComment('1.1')).toEqual('Example comment text');
+
+        versionManagePage.disableComments();
+
+        Util.waitUntilElementIsNotVisible(element(by.css(`[id="adf-version-list-item-comment-1.1"]`)));
+    });
+
+    it('[C277277] Should show/hide actions menu when readOnly is true/false', () => {
+        versionManagePage.disableReadOnly();
+
+        Util.waitUntilElementIsVisible(element(by.css(`[id="adf-version-list-action-menu-button-1.0"]`)));
+
+        versionManagePage.enableReadOnly();
+
+        Util.waitUntilElementIsNotVisible(element(by.css(`[id="adf-version-list-action-menu-button-1.0"]`)));
+    });
+
+    it('[C279994] Should show/hide upload new version button when readOnly is true/false', () => {
+        versionManagePage.disableReadOnly();
+
+        Util.waitUntilElementIsVisible(versionManagePage.showNewVersionButton);
+
+        versionManagePage.enableReadOnly();
+
+        Util.waitUntilElementIsNotVisible(versionManagePage.showNewVersionButton);
+        Util.waitUntilElementIsNotVisible(versionManagePage.uploadNewVersionButton);
+    });
+
+});
diff --git a/e2e/content-services/version/version-smoke-tests.e2e.ts b/e2e/content-services/version/version-smoke-tests.e2e.ts
new file mode 100644
index 0000000000..d4fd0e4b87
--- /dev/null
+++ b/e2e/content-services/version/version-smoke-tests.e2e.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 { browser } from 'protractor';
+
+import LoginPage = require('../../pages/adf/loginPage');
+import ContentServicesPage = require('../../pages/adf/contentServicesPage');
+import ContentListPage = require('../../pages/adf/dialog/contentList');
+import { VersionManagePage } from '../../pages/adf/versionManagerPage';
+
+import AcsUserModel = require('../../models/ACS/acsUserModel');
+import FileModel = require('../../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');
+
+describe('Version component', () => {
+
+    let txtUploadedFile;
+    const loginPage = new LoginPage();
+    const contentServicesPage = new ContentServicesPage();
+    const contentListPage = new ContentListPage();
+    const versionManagePage = new VersionManagePage();
+
+    let acsUser = new AcsUserModel();
+
+    let txtFileModel = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.TXT.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.TXT.file_location
+    });
+
+    let fileModelVersionTwo = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.PNG.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.PNG.file_location
+    });
+
+    let fileModelVersionThree = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.PNG_B.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.PNG_B.file_location
+    });
+
+    let fileModelVersionFor = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.PNG_C.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.PNG_C.file_location
+    });
+
+    let fileModelVersionFive = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.PNG_D.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.PNG_D.file_location
+    });
+
+    beforeAll(async (done) => {
+
+        let uploadActions = new UploadActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+        await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+
+        txtUploadedFile = await uploadActions.uploadFile(this.alfrescoJsApi, txtFileModel.location, txtFileModel.name, '-my-');
+        Object.assign(txtFileModel, txtUploadedFile.entry);
+
+        txtFileModel.update(txtUploadedFile.entry);
+
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+
+        contentServicesPage.navigateToDocumentList();
+        contentListPage.versionManagerContent(txtFileModel.name);
+
+        done();
+    });
+
+    it('[C272768] Should be visible the first file version when you upload a file', () => {
+        versionManagePage.checkUploadNewVersionsButtonIsDisplayed();
+
+        versionManagePage.chekFileVersionExist('1.0');
+        expect(versionManagePage.getFileVersionName('1.0')).toEqual(txtFileModel.name);
+        expect(versionManagePage.getFileVersionDate('1.0')).not.toBeUndefined();
+    });
+
+    it('[C279995] Should show/hide the new upload file options when click on add New version/canclel button', () => {
+        versionManagePage.showNewVersionButton.click();
+
+        browser.driver.sleep(300);
+
+        Util.waitUntilElementIsVisible(versionManagePage.cancelButton);
+        Util.waitUntilElementIsVisible(versionManagePage.majorRadio);
+        Util.waitUntilElementIsVisible(versionManagePage.minorRadio);
+        Util.waitUntilElementIsVisible(versionManagePage.cancelButton);
+        Util.waitUntilElementIsVisible(versionManagePage.commentText);
+        Util.waitUntilElementIsVisible(versionManagePage.uploadNewVersionButton);
+
+        versionManagePage.cancelButton.click();
+
+        browser.driver.sleep(300);
+
+        Util.waitUntilElementIsNotVisible(versionManagePage.cancelButton);
+        Util.waitUntilElementIsNotVisible(versionManagePage.majorRadio);
+        Util.waitUntilElementIsNotVisible(versionManagePage.minorRadio);
+        Util.waitUntilElementIsNotVisible(versionManagePage.cancelButton);
+        Util.waitUntilElementIsNotVisible(versionManagePage.commentText);
+        Util.waitUntilElementIsNotVisible(versionManagePage.uploadNewVersionButton);
+
+        Util.waitUntilElementIsVisible(versionManagePage.showNewVersionButton);
+    });
+
+    it('[C260244] Should show the version history when select a file with multiple version', () => {
+        versionManagePage.showNewVersionButton.click();
+        versionManagePage.uploadNewVersionFile(fileModelVersionTwo.location);
+
+        versionManagePage.chekFileVersionExist('1.0');
+        expect(versionManagePage.getFileVersionName('1.0')).toEqual(txtFileModel.name);
+        expect(versionManagePage.getFileVersionDate('1.0')).not.toBeUndefined();
+
+        versionManagePage.chekFileVersionExist('1.1');
+        expect(versionManagePage.getFileVersionName('1.1')).toEqual(fileModelVersionTwo.name);
+        expect(versionManagePage.getFileVersionDate('1.1')).not.toBeUndefined();
+    });
+
+    it('[C269084] Should be possible add a comment when add a new version', () => {
+        versionManagePage.showNewVersionButton.click();
+        versionManagePage.enterCommentText('Example comment text');
+        versionManagePage.uploadNewVersionFile(fileModelVersionThree.location);
+
+        versionManagePage.chekFileVersionExist('1.2');
+        expect(versionManagePage.getFileVersionName('1.2')).toEqual(fileModelVersionThree.name);
+        expect(versionManagePage.getFileVersionDate('1.2')).not.toBeUndefined();
+        expect(versionManagePage.getFileVersionComment('1.2')).toEqual('Example comment text');
+    });
+
+    it('[C275719] Should be possible preview the file when you add a new version', () => {
+        versionManagePage.showNewVersionButton.click();
+        versionManagePage.clickMajorChange();
+
+        versionManagePage.uploadNewVersionFile(fileModelVersionFor.location);
+
+        versionManagePage.chekFileVersionExist('2.0');
+        expect(versionManagePage.getFileVersionName('2.0')).toEqual(fileModelVersionFor.name);
+
+        versionManagePage.showNewVersionButton.click();
+        versionManagePage.clickMinorChange();
+
+        versionManagePage.uploadNewVersionFile(fileModelVersionFive.location);
+
+        versionManagePage.chekFileVersionExist('2.1');
+        expect(versionManagePage.getFileVersionName('2.1')).toEqual(fileModelVersionFive.name);
+    });
+
+});
diff --git a/e2e/content-services/z-finish.e2e.ts b/e2e/content-services/z-finish.e2e.ts
new file mode 100644
index 0000000000..561244b3fa
--- /dev/null
+++ b/e2e/content-services/z-finish.e2e.ts
@@ -0,0 +1,79 @@
+/*!
+ * @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 AlfrescoApi = require('alfresco-js-api-node');
+import TestConfig = require('../test.config');
+
+import fs = require('fs');
+import path = require('path');
+
+let buildNumber = process.env.TRAVIS_BUILD_NUMBER;
+let saveScreenshot = process.env.SAVE_SCREENSHOT;
+
+describe('Save screenshot at the end', () => {
+
+    beforeAll(async (done) => {
+
+        if (saveScreenshot === 'true') {
+            if (!buildNumber) {
+                buildNumber = Date.now();
+            }
+
+            let alfrescoJsApi = new AlfrescoApi({
+                provider: 'ECM',
+                hostEcm: TestConfig.adf.url
+            });
+
+            let files = fs.readdirSync(path.join(__dirname, '../../e2e-output/screenshots'));
+
+            if (files && files.length > 0) {
+                alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+                let folder = await alfrescoJsApi.nodes.addNode('-my-', {
+                    'name': 'content-services',
+                    'relativePath': 'Build-screenshot/Screenshot-e2e-' + buildNumber,
+                    'nodeType': 'cm:folder'
+                }, {}, {
+                    'overwrite': true
+                });
+
+                for (const fileName of files) {
+
+                    let pathFile = path.join(__dirname, '../../e2e-output/screenshots', fileName);
+                    let file: any = fs.createReadStream(pathFile);
+
+                    await  alfrescoJsApi.upload.uploadFile(
+                        file,
+                        '',
+                        folder.entry.id,
+                        null,
+                        {
+                            'name': file.name,
+                            'nodeType': 'cm:content'
+                        }
+                    );
+                }
+            }
+        }
+
+        done();
+    });
+
+    it('screenshot need it', () => {
+        expect(true).toEqual(true);
+    });
+});
diff --git a/e2e/core/card-view/aspect-oriented-config.e2e.ts b/e2e/core/card-view/aspect-oriented-config.e2e.ts
new file mode 100644
index 0000000000..66fd7389cf
--- /dev/null
+++ b/e2e/core/card-view/aspect-oriented-config.e2e.ts
@@ -0,0 +1,285 @@
+/*!
+ * @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 } from 'protractor';
+
+import LoginPage = require('../../pages/adf/loginPage');
+import ViewerPage = require('../../pages/adf/viewerPage');
+import CardViewPage = require('../../pages/adf/metadataViewPage');
+import NavigationBarPage = require('../../pages/adf/navigationBarPage');
+import { ConfigEditorPage } from '../../pages/adf/configEditorPage';
+
+import AcsUserModel = require('../../models/ACS/acsUserModel');
+import FileModel = require('../../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 ContentServicesPage = require('../../pages/adf/contentServicesPage');
+
+describe('Aspect oriented config', () => {
+
+    const loginPage = new LoginPage();
+    const viewerPage = new ViewerPage();
+    const metadataViewPage = new CardViewPage();
+    const navigationBarPage = new NavigationBarPage();
+    const configEditorPage = new ConfigEditorPage();
+    let contentServicesPage = new ContentServicesPage();
+
+    let acsUser = new AcsUserModel();
+
+    let pngFileModel = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.PNG.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.PNG.file_location
+    });
+
+    beforeAll(async (done) => {
+
+        let uploadActions = new UploadActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+        await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+
+        await uploadActions.uploadFile(this.alfrescoJsApi, pngFileModel.location, pngFileModel.name, '-my-');
+
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+
+        done();
+    });
+
+    beforeEach(async(done) => {
+        navigationBarPage.clickConfigEditorButton();
+        configEditorPage.clickClearMetadataButton();
+        done();
+    });
+
+    afterEach(async(done) => {
+        viewerPage.clickCloseButton();
+        contentServicesPage.checkAcsContainer();
+        browser.refresh();
+        contentServicesPage.checkAcsContainer();
+        done();
+    });
+
+    it('[C261117] Should be possible restrict the display properties of one an aspect', () => {
+
+        configEditorPage.enterMetadataConfiguration('{  "presets": {' +
+            '        "default": [{' +
+            '            "title": "IMAGE",' +
+            '            "items": [' +
+            '                {' +
+            '                    "aspect": "exif:exif", "properties": [ "exif:pixelXDimension", "exif:pixelYDimension", "exif:isoSpeedRatings"]' +
+            '                }' +
+            '            ]' +
+            '        }]' +
+            '    }');
+
+        configEditorPage.clickSaveMetadataButton();
+
+        navigationBarPage.clickContentServicesButton();
+
+        viewerPage.viewFile(pngFileModel.name);
+        viewerPage.clickInfoButton();
+        viewerPage.checkInfoSideBarIsDisplayed();
+        metadataViewPage.clickOnPropertiesTab();
+        metadataViewPage.informationButtonIsDisplayed();
+        metadataViewPage.clickOnInformationButton();
+
+        metadataViewPage.clickMetadatGroup('IMAGE');
+        metadataViewPage.checkPopertyIsVisible('properties.exif:pixelXDimension', 'textitem');
+        metadataViewPage.checkPopertyIsVisible('properties.exif:pixelYDimension', 'textitem');
+        metadataViewPage.checkPopertyIsNotVisible('properties.exif:isoSpeedRatings', 'textitem');
+
+        metadataViewPage.editIconClick();
+
+        metadataViewPage.checkPopertyIsVisible('properties.exif:isoSpeedRatings', 'textitem');
+    });
+
+    it('[C260185] Should ignore not existing aspect when present in the configuration', () => {
+
+        configEditorPage.enterMetadataConfiguration('   {' +
+            '        "presets": {' +
+            '            "default": {' +
+            '                "exif:exif": "*",' +
+            '                "cm:versionable": "*",' +
+            '                "not:exists": "*"' +
+            '            }' +
+            '        }' +
+            '    }');
+
+        configEditorPage.clickSaveMetadataButton();
+
+        navigationBarPage.clickContentServicesButton();
+
+        viewerPage.viewFile(pngFileModel.name);
+        viewerPage.clickInfoButton();
+        viewerPage.checkInfoSideBarIsDisplayed();
+        metadataViewPage.clickOnPropertiesTab();
+        metadataViewPage.informationButtonIsDisplayed();
+        metadataViewPage.clickOnInformationButton();
+
+        metadataViewPage.checkkMetadatGroupIsPresent('EXIF');
+        metadataViewPage.checkkMetadatGroupIsPresent('properties');
+        metadataViewPage.checkkMetadatGroupIsPresent('Versionable');
+        metadataViewPage.checkkMetadatGroupIsNotPresent('exists');
+    });
+
+    it('[C260183] Should show all the aspect if the content-metadata configuration is NOT provided' , () => {
+
+        configEditorPage.enterMetadataConfiguration('{ }');
+
+        configEditorPage.clickSaveMetadataButton();
+
+        navigationBarPage.clickContentServicesButton();
+
+        viewerPage.viewFile(pngFileModel.name);
+        viewerPage.clickInfoButton();
+        viewerPage.checkInfoSideBarIsDisplayed();
+        metadataViewPage.clickOnPropertiesTab();
+        metadataViewPage.informationButtonIsDisplayed();
+        metadataViewPage.clickOnInformationButton();
+
+        metadataViewPage.checkkMetadatGroupIsPresent('EXIF');
+        metadataViewPage.checkkMetadatGroupIsPresent('properties');
+        metadataViewPage.checkkMetadatGroupIsPresent('Versionable');
+        metadataViewPage.checkkMetadatGroupIsPresent('Titled');
+        metadataViewPage.checkkMetadatGroupIsPresent('Auditable');
+        metadataViewPage.checkkMetadatGroupIsPresent('Author');
+        metadataViewPage.checkkMetadatGroupIsPresent('Content');
+    });
+
+    it('[C260182] Should show all the aspects if the default configuration contains the * symbol' , () => {
+
+        configEditorPage.enterMetadataConfiguration('{' +
+            '    "presets": {' +
+            '        "default": "*"' +
+            '    }' +
+            '}');
+
+        configEditorPage.clickSaveMetadataButton();
+
+        navigationBarPage.clickContentServicesButton();
+
+        viewerPage.viewFile(pngFileModel.name);
+        viewerPage.clickInfoButton();
+        viewerPage.checkInfoSideBarIsDisplayed();
+        metadataViewPage.clickOnPropertiesTab();
+
+        metadataViewPage.informationButtonIsDisplayed();
+        metadataViewPage.clickOnInformationButton();
+
+        metadataViewPage.checkkMetadatGroupIsPresent('EXIF');
+        metadataViewPage.checkkMetadatGroupIsPresent('properties');
+        metadataViewPage.checkkMetadatGroupIsPresent('Versionable');
+        metadataViewPage.checkkMetadatGroupIsPresent('Titled');
+        metadataViewPage.checkkMetadatGroupIsPresent('Auditable');
+        metadataViewPage.checkkMetadatGroupIsPresent('Author');
+        metadataViewPage.checkkMetadatGroupIsPresent('Content');
+    });
+
+    it('[C268899] Should be possible use a Translation key as Title of a metadata group' , () => {
+
+        configEditorPage.enterMetadataConfiguration('{' +
+            '  "presets": {' +
+            '    "default": [' +
+            '      {' +
+            '        "title": "GROUP-TITLE1-TRANSLATION-KEY",' +
+            '        "items": [' +
+            '          {' +
+            '            "aspect": "exif:exif",' +
+            '            "properties": "*"' +
+            '          }' +
+            '        ]' +
+            '      },' +
+            '      {' +
+            '        "title": "GROUP-TITLE2-TRANSLATION-KEY",' +
+            '        "items": [' +
+            '          {' +
+            '            "aspect": "kitten:food",' +
+            '            "properties": [' +
+            '              "kitten:favourite-food",' +
+            '              "kitten:recommended-food"' +
+            '            ]' +
+            '          }' +
+            '        ]' +
+            '      }' +
+            '    ]' +
+            '  }' +
+            '}');
+
+        configEditorPage.clickSaveMetadataButton();
+
+        navigationBarPage.clickContentServicesButton();
+
+        viewerPage.viewFile(pngFileModel.name);
+        viewerPage.clickInfoButton();
+        viewerPage.checkInfoSideBarIsDisplayed();
+        metadataViewPage.clickOnPropertiesTab();
+
+        metadataViewPage.informationButtonIsDisplayed();
+        metadataViewPage.clickOnInformationButton();
+
+        metadataViewPage.checkkMetadatGroupIsPresent('GROUP-TITLE1-TRANSLATION-KEY');
+        metadataViewPage.checkkMetadatGroupIsPresent('GROUP-TITLE2-TRANSLATION-KEY');
+
+        expect(metadataViewPage.getkMetadatGroupTitle('GROUP-TITLE1-TRANSLATION-KEY')).toBe('CUSTOM TITLE TRANSLATION ONE');
+        expect(metadataViewPage.getkMetadatGroupTitle('GROUP-TITLE2-TRANSLATION-KEY')).toBe('CUSTOM TITLE TRANSLATION TWO');
+
+    });
+
+    it('[C279968] Should be possible use a custom preset' , () => {
+
+        configEditorPage.enterMetadataConfiguration('{' +
+            '    "presets": {' +
+            '        "custom-preset": {' +
+            '            "exif:exif": "*",' +
+            '            "cm:versionable": "*"' +
+            '        }' +
+            '    }' +
+            '}');
+
+        configEditorPage.clickSaveMetadataButton();
+
+        navigationBarPage.clickContentServicesButton();
+
+        viewerPage.viewFile(pngFileModel.name);
+        viewerPage.clickInfoButton();
+        viewerPage.checkInfoSideBarIsDisplayed();
+        metadataViewPage.clickOnPropertiesTab();
+
+        metadataViewPage.enablePreset();
+
+        metadataViewPage.enterPresetText('custom-preset');
+
+        metadataViewPage.informationButtonIsDisplayed();
+        metadataViewPage.clickOnInformationButton();
+
+        metadataViewPage.checkkMetadatGroupIsPresent('properties');
+        metadataViewPage.checkkMetadatGroupIsPresent('EXIF');
+        metadataViewPage.checkkMetadatGroupIsPresent('Versionable');
+    });
+});
diff --git a/e2e/core/card-view/card-view-component.e2e.ts b/e2e/core/card-view/card-view-component.e2e.ts
new file mode 100644
index 0000000000..9239b8af59
--- /dev/null
+++ b/e2e/core/card-view/card-view-component.e2e.ts
@@ -0,0 +1,315 @@
+/*!
+ * @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 LoginPage = require('../../pages/adf/loginPage');
+import NavigationBarPage = require('../../pages/adf/navigationBarPage');
+import CardViewPage = require('../../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');
+
+describe('CardView Component', () => {
+    const loginPage = new LoginPage();
+    const navigationBarPage = new NavigationBarPage();
+    const cardViewPageComponent = new CardViewPageComponent();
+    const metadataViewPage = new CardViewPage();
+
+    const app = resources.Files.APP_WITH_PROCESSES;
+
+    beforeAll(async (done) => {
+        const apps = new AppsActions();
+        const users = new UsersActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        let user = await users.createTenantAndUser(this.alfrescoJsApi);
+
+        await this.alfrescoJsApi.login(user.email, user.password);
+
+        await apps.importPublishDeployApp(this.alfrescoJsApi, app.file_location);
+
+        loginPage.loginToProcessServicesUsingUserModel(user);
+
+        navigationBarPage.clickCardViewButton();
+
+        done();
+    });
+
+    afterEach(() => {
+        cardViewPageComponent.clickOnResetButton();
+    });
+
+    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"]'));
+
+            Util.waitUntilElementIsPresent(label);
+        });
+
+        it('[C279898] Should be possible edit key-value pair properties', () => {
+            cardViewPageComponent.clickOnAddButton();
+            cardViewPageComponent.setName('testName');
+            cardViewPageComponent.setValue('testValue');
+            cardViewPageComponent.clickOnAddButton();
+            cardViewPageComponent.waitForOutput();
+            expect(cardViewPageComponent.getOutputText(0)).toBe('[CardView Key-Value Pairs Item] - [{"name":"testName","value":"testValue"}]');
+
+            cardViewPageComponent.deletePairsValues();
+
+            expect(cardViewPageComponent.getOutputText(1)).toBe('[CardView Key-Value Pairs Item] - []');
+        });
+    });
+
+    describe('Selectbox', () => {
+
+        it('[C279939] Should the label be present', () => {
+            let label = element(by.xpath('div[data-automation-id="card-select-label-select"]'));
+
+            Util.waitUntilElementIsPresent(label);
+        });
+
+        it('[C279899] Should be possible edit selectbox item', () => {
+            cardViewPageComponent.clickSelectBox();
+            cardViewPageComponent.selectValueFromComboBox(1);
+
+            expect(cardViewPageComponent.getOutputText(0))
+                .toBe('[CardView Select Item] - two');
+        });
+    });
+
+    describe('Text', () => {
+
+        it('[C279937] Should the label be present', () => {
+            let label = element(by.xpath('div[data-automation-id="card-textitem-label-name"]'));
+
+            Util.waitUntilElementIsPresent(label);
+        });
+
+        it('[C279943] Should be present a default value', () => {
+            expect(cardViewPageComponent.getTextFieldText()).toBe('Spock');
+        });
+
+        it('[C279934] Should be possible edit text item', () => {
+            cardViewPageComponent
+                .clickOnTextField()
+                .enterTextField('example')
+                .clickOnTextSaveIcon();
+
+            expect(cardViewPageComponent.getOutputText(0)).toBe('[CardView Text Item] - example');
+        });
+
+        it('[C279944] Should be possible undo text item modify when click on the clear button', () => {
+            cardViewPageComponent
+                .clickOnTextField()
+                .enterTextField('example')
+                .clickOnTextClearIcon();
+
+            expect(cardViewPageComponent.getTextFieldText()).toBe('Spock');
+        });
+    });
+
+    describe('Int', () => {
+
+        it('[C279940] Should the label be present', () => {
+            let label = element(by.xpath('div[data-automation-id="card-textitem-label-int"]'));
+
+            Util.waitUntilElementIsPresent(label);
+        });
+
+        it('[C279945] Should be present a default value', () => {
+            expect(cardViewPageComponent.getIntFieldText()).toBe('213');
+        });
+
+        it('[C279946] Should be possible edit int item', () => {
+            cardViewPageComponent
+                .clickOnIntField()
+                .enterIntField('99999')
+                .clickOnIntSaveIcon();
+
+            expect(cardViewPageComponent.getOutputText(0)).toBe('[CardView Int Item] - 99999');
+        });
+
+        it('[C279947] Should not be possible add string value to the int item', () => {
+            cardViewPageComponent
+                .clickOnIntField()
+                .enterIntField('string value')
+                .clickOnIntSaveIcon();
+
+            expect(cardViewPageComponent.getErrorInt()).toBe('Use an integer format');
+        });
+
+        it('[C279948] Should not be possible add float value to the int item', () => {
+            cardViewPageComponent
+                .clickOnIntField()
+                .enterIntField('0.22')
+                .clickOnIntSaveIcon();
+
+            expect(cardViewPageComponent.getErrorInt()).toBe('Use an integer format');
+        });
+
+        it('[C279949] Should not be possible have an empty value', () => {
+            cardViewPageComponent
+                .clickOnIntField()
+                .enterIntField(' ')
+                .clickOnIntSaveIcon();
+
+            expect(cardViewPageComponent.getErrorInt()).toBe('Use an integer format');
+        });
+
+        it('[C279950] Should return an error when the value is > 2147483647', () => {
+            cardViewPageComponent
+                .clickOnIntField()
+                .enterIntField('214748367')
+                .clickOnIntSaveIcon();
+
+            expect(cardViewPageComponent.getOutputText(0)).toBe('[CardView Int Item] - 214748367');
+
+            cardViewPageComponent
+                .clickOnIntField()
+                .enterIntField('2147483648')
+                .clickOnIntSaveIcon();
+
+            expect(cardViewPageComponent.getErrorInt()).toBe('Use an integer format');
+        });
+
+        it('[C279951] Should be possible undo item modify when click on the clear button', () => {
+            cardViewPageComponent
+                .clickOnIntField()
+                .enterIntField('999')
+                .clickOnIntClearIcon();
+
+            expect(cardViewPageComponent.getIntFieldText()).toBe('213');
+        });
+    });
+
+    describe('Float', () => {
+
+        it('[C279941] Should the label be present', () => {
+            let label = element(by.xpath('div[data-automation-id="card-textitem-label-float"]'));
+
+            Util.waitUntilElementIsPresent(label);
+        });
+
+        it('[C279952] Should be present a default value', () => {
+            expect(cardViewPageComponent.getFloatFieldText()).toBe('9.9');
+        });
+
+        it('[C279953] Should be possible edit float item', () => {
+            cardViewPageComponent
+                .clickOnFloatField()
+                .enterFloatField('77.33')
+                .clickOnFloatSaveIcon();
+
+            expect(cardViewPageComponent.getOutputText(0)).toBe('[CardView Float Item] - 77.33');
+        });
+
+        it('[C279954] Should not be possible add string value to the float item', () => {
+            cardViewPageComponent
+                .clickOnFloatField()
+                .enterFloatField('string value')
+                .clickOnFloatSaveIcon();
+
+            expect(cardViewPageComponent.getErrorFloat()).toBe('Use a number format');
+        });
+
+        it('[C279955] Should be possible undo item item modify when click on the clear button', () => {
+            cardViewPageComponent
+                .clickOnFloatField()
+                .enterFloatField('77.33')
+                .clickOnFloatClearIcon();
+
+            expect(cardViewPageComponent.getFloatFieldText()).toBe('9.9');
+        });
+
+        it('[C279956] Should not be possible have an empty value', () => {
+            cardViewPageComponent
+                .clickOnFloatField()
+                .enterFloatField(' ')
+                .clickOnFloatSaveIcon();
+
+            expect(cardViewPageComponent.getErrorFloat()).toBe('Use a number format');
+        });
+
+    });
+
+    describe('Boolean', () => {
+
+        it('[C279942] Should the label be present', () => {
+            let label = element(by.xpath('div[data-automation-id="card-boolean-label-boolean"]'));
+
+            Util.waitUntilElementIsPresent(label);
+        });
+
+        it('[C279957] Should be possible edit the checkbox value when click on it', () => {
+            cardViewPageComponent.checkboxClick();
+
+            expect(cardViewPageComponent.getOutputText(0)).toBe('[CardView Boolean Item] - false');
+
+            cardViewPageComponent.checkboxClick();
+
+            expect(cardViewPageComponent.getOutputText(1)).toBe('[CardView Boolean Item] - true');
+        });
+    });
+
+    describe('Date and DateTime', () => {
+
+        it('[C279961] Should the label be present', () => {
+            let labelDate = element(by.xpath('div[data-automation-id="card-dateitem-label-date"]'));
+
+            Util.waitUntilElementIsPresent(labelDate);
+
+            let labelDatetime = element(by.xpath('div[data-automation-id="card-dateitem-label-datetime"]'));
+
+            Util.waitUntilElementIsPresent(labelDatetime);
+        });
+
+        it('[C279962] Should be present a default value', () => {
+            expect(metadataViewPage.getPropertyText('date', 'date')).toEqual('24.12.1983');
+            expect(metadataViewPage.getPropertyText('datetime', 'datetime')).toEqual('Dec 24 1983 10:00');
+        });
+
+    });
+
+    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'));
+
+        Util.waitUntilElementIsNotVisible(editIconText);
+        Util.waitUntilElementIsNotVisible(editIconInt);
+        Util.waitUntilElementIsNotVisible(editIconFloat);
+        Util.waitUntilElementIsNotVisible(editIconKey);
+        Util.waitUntilElementIsNotVisible(editIconData);
+    });
+});
diff --git a/e2e/core/card-view/metadata-permissions.e2e.ts b/e2e/core/card-view/metadata-permissions.e2e.ts
new file mode 100644
index 0000000000..09436d83ff
--- /dev/null
+++ b/e2e/core/card-view/metadata-permissions.e2e.ts
@@ -0,0 +1,161 @@
+/*!
+ * @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 LoginPage = require('../../pages/adf/loginPage');
+import ViewerPage = require('../../pages/adf/viewerPage');
+import CardViewPage = require('../../pages/adf/metadataViewPage');
+import NavigationBarPage = require('../../pages/adf/navigationBarPage');
+
+import AcsUserModel = require('../../models/ACS/acsUserModel');
+import FileModel = require('../../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 CONSTANTS = require('../../util/constants');
+
+describe('permissions', () => {
+
+    const METADATA = {
+        DATAFORMAT: 'mmm dd yyyy',
+        TITLE: 'Details',
+        COMMENTS_TAB: 'COMMENTS',
+        PROPERTY_TAB: 'PROPERTIES',
+        DEFAULT_ASPECT: 'Properties',
+        MORE_INFO_BUTTON: 'More information',
+        LESS_INFO_BUTTON: 'Less information',
+        ARROW_DOWN: 'keyboard_arrow_down',
+        ARROW_UP: 'keyboard_arrow_up',
+        EDIT_BUTTON_TOOLTIP: 'Edit'
+    };
+
+    const loginPage = new LoginPage();
+    const viewerPage = new ViewerPage();
+    const metadataViewPage = new CardViewPage();
+    const navigationBarPage = new NavigationBarPage();
+
+    let consumerUser = new AcsUserModel();
+    let collaboratorUser = new AcsUserModel();
+    let contributorUser = new AcsUserModel();
+    let site;
+
+    let pngFileModel = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.PNG.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.PNG.file_location
+    });
+
+    beforeAll(async (done) => {
+
+        let uploadActions = new UploadActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(consumerUser);
+        await this.alfrescoJsApi.core.peopleApi.addPerson(collaboratorUser);
+        await this.alfrescoJsApi.core.peopleApi.addPerson(contributorUser);
+
+        site = await this.alfrescoJsApi.core.sitesApi.createSite({
+            title: Util.generateRandomString(),
+            visibility: 'PUBLIC'
+        });
+
+        await this.alfrescoJsApi.core.sitesApi.addSiteMember(site.entry.id, {
+            id: consumerUser.id,
+            role: CONSTANTS.CS_USER_ROLES.CONSUMER
+        });
+
+        await this.alfrescoJsApi.core.sitesApi.addSiteMember(site.entry.id, {
+            id: collaboratorUser.id,
+            role: CONSTANTS.CS_USER_ROLES.COLLABORATOR
+        });
+
+        await this.alfrescoJsApi.core.sitesApi.addSiteMember(site.entry.id, {
+            id: contributorUser.id,
+            role: CONSTANTS.CS_USER_ROLES.CONTRIBUTOR
+        });
+
+        await uploadActions.uploadFile(this.alfrescoJsApi, pngFileModel.location, pngFileModel.name, site.entry.guid);
+
+        done();
+    });
+
+    afterAll(async(done) => {
+        await this.alfrescoJsApi.core.sitesApi.deleteSite(site.entry.id);
+        done();
+    });
+
+    it('[C274692] Should not be possible edit metadata properties when the user is a consumer user', () => {
+        loginPage.loginToContentServicesUsingUserModel(consumerUser);
+
+        navigationBarPage.openContentServicesFolder(site.entry.guid);
+
+        viewerPage.viewFile(pngFileModel.name);
+        viewerPage.clickInfoButton();
+        viewerPage.checkInfoSideBarIsDisplayed();
+        metadataViewPage.clickOnPropertiesTab();
+        metadataViewPage.editIconIsNotDisplayed();
+    });
+
+    it('[C279971] Should be possible edit metadata properties when the user is a collaborator user', () => {
+        loginPage.loginToContentServicesUsingUserModel(collaboratorUser);
+
+        navigationBarPage.openContentServicesFolder(site.entry.guid);
+
+        viewerPage.viewFile(pngFileModel.name);
+        viewerPage.clickInfoButton();
+        viewerPage.checkInfoSideBarIsDisplayed();
+        metadataViewPage.clickOnPropertiesTab();
+        metadataViewPage.editIconIsDisplayed();
+
+        expect(viewerPage.getActiveTab()).toEqual(METADATA.PROPERTY_TAB);
+
+        metadataViewPage.clickOnInformationButton();
+
+        metadataViewPage.clickMetadatGroup('EXIF');
+
+        metadataViewPage.editIconIsDisplayed();
+    });
+
+    it('[C279972] Should be possible edit metadata properties when the user is a contributor user', () => {
+        loginPage.loginToContentServicesUsingUserModel(collaboratorUser);
+
+        navigationBarPage.openContentServicesFolder(site.entry.guid);
+
+        viewerPage.viewFile(pngFileModel.name);
+        viewerPage.clickInfoButton();
+        viewerPage.checkInfoSideBarIsDisplayed();
+        metadataViewPage.clickOnPropertiesTab();
+        metadataViewPage.editIconIsDisplayed();
+
+        expect(viewerPage.getActiveTab()).toEqual(METADATA.PROPERTY_TAB);
+
+        metadataViewPage.clickOnInformationButton();
+
+        metadataViewPage.clickMetadatGroup('EXIF');
+
+        metadataViewPage.editIconIsDisplayed();
+    });
+});
diff --git a/e2e/core/card-view/metadata-properties.e2e.ts b/e2e/core/card-view/metadata-properties.e2e.ts
new file mode 100644
index 0000000000..5e29d6e544
--- /dev/null
+++ b/e2e/core/card-view/metadata-properties.e2e.ts
@@ -0,0 +1,185 @@
+/*!
+ * @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 LoginPage = require('../../pages/adf/loginPage');
+import ContentServicesPage = require('../../pages/adf/contentServicesPage');
+import ViewerPage = require('../../pages/adf/viewerPage');
+import CardViewPage = require('../../pages/adf/metadataViewPage');
+
+import AcsUserModel = require('../../models/ACS/acsUserModel');
+import FileModel = require('../../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';
+
+describe('CardView Component - properties', () => {
+
+    let METADATA = {
+        DATAFORMAT: 'mmm dd yyyy',
+        TITLE: 'Details',
+        COMMENTS_TAB: 'COMMENTS',
+        PROPERTY_TAB: 'PROPERTIES',
+        DEFAULT_ASPECT: 'Properties',
+        MORE_INFO_BUTTON: 'More information',
+        LESS_INFO_BUTTON: 'Less information',
+        ARROW_DOWN: 'keyboard_arrow_down',
+        ARROW_UP: 'keyboard_arrow_up',
+        EDIT_BUTTON_TOOLTIP: 'Edit'
+    };
+
+    let loginPage = new LoginPage();
+    let contentServicesPage = new ContentServicesPage();
+    let viewerPage = new ViewerPage();
+    let metadataViewPage = new CardViewPage();
+
+    let acsUser = new AcsUserModel();
+
+    let pngFileModel = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.PNG.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.PNG.file_location
+    });
+
+    beforeAll(async (done) => {
+
+        let uploadActions = new UploadActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+        await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+
+        let pdfUploadedFile = await uploadActions.uploadFile(this.alfrescoJsApi, pngFileModel.location, pngFileModel.name, '-my-');
+
+        Object.assign(pngFileModel, pdfUploadedFile.entry);
+
+        pngFileModel.update(pdfUploadedFile.entry);
+
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+
+        contentServicesPage.navigateToDocumentList();
+
+        done();
+    });
+
+    afterEach(() => {
+        viewerPage.clickCloseButton();
+    });
+
+    it('[C246516] Should show/hide the empty metadata when the property displayEmpty is true/false', () => {
+        viewerPage.viewFile(pngFileModel.name);
+        viewerPage.clickInfoButton();
+        viewerPage.checkInfoSideBarIsDisplayed();
+        metadataViewPage.clickOnPropertiesTab();
+        metadataViewPage.editIconIsDisplayed();
+
+        expect(viewerPage.getActiveTab()).toEqual(METADATA.PROPERTY_TAB);
+
+        metadataViewPage.clickOnInformationButton();
+
+        metadataViewPage.clickMetadatGroup('EXIF');
+
+        metadataViewPage.checkPopertyIsVisible('properties.exif:flash', 'boolean');
+        metadataViewPage.checkPopertyIsNotVisible('properties.exif:model', 'textitem');
+
+        metadataViewPage.enableDisplayEmpty();
+
+        metadataViewPage.checkPopertyIsVisible('properties.exif:flash', 'boolean');
+        metadataViewPage.checkPopertyIsVisible('properties.exif:model', 'textitem');
+    });
+
+    it('[C260179] Should not be possible edit the basic property when readOnly is true', () => {
+        viewerPage.viewFile(pngFileModel.name);
+        viewerPage.clickInfoButton();
+        viewerPage.checkInfoSideBarIsDisplayed();
+        metadataViewPage.clickOnPropertiesTab();
+        metadataViewPage.editIconIsDisplayed();
+
+        metadataViewPage.enableReadonly();
+
+        metadataViewPage.editIconIsNotDisplayed();
+    });
+
+    it('[C268965] Should multi property allow expand multi accordion at the same time when set', () => {
+        viewerPage.viewFile(pngFileModel.name);
+        viewerPage.clickInfoButton();
+        viewerPage.checkInfoSideBarIsDisplayed();
+        metadataViewPage.clickOnPropertiesTab();
+
+        metadataViewPage.clickOnInformationButton();
+
+        metadataViewPage.chekMetadatGroupIsNotExpand('EXIF');
+        metadataViewPage.chekMetadatGroupIsNotExpand('properties');
+
+        metadataViewPage.clickMetadatGroup('properties');
+
+        metadataViewPage.chekMetadatGroupIsNotExpand('EXIF');
+        metadataViewPage.chekMetadatGroupIsExpand('properties');
+
+        metadataViewPage.clickMetadatGroup('EXIF');
+
+        metadataViewPage.chekMetadatGroupIsExpand('EXIF');
+        metadataViewPage.chekMetadatGroupIsNotExpand('properties');
+
+        metadataViewPage.enableMulti();
+
+        metadataViewPage.clickMetadatGroup('properties');
+
+        metadataViewPage.chekMetadatGroupIsExpand('EXIF');
+        metadataViewPage.chekMetadatGroupIsExpand('properties');
+
+    });
+
+    it('[C280559] Should show/hide the default metadata properties when displayDefaultProperties is true/false', () => {
+        viewerPage.viewFile(pngFileModel.name);
+        viewerPage.clickInfoButton();
+        viewerPage.checkInfoSideBarIsDisplayed();
+        metadataViewPage.clickOnPropertiesTab();
+
+        metadataViewPage.disabledDefaultProperties();
+
+        metadataViewPage.checkkMetadatGroupIsNotPresent('properties');
+        metadataViewPage.checkkMetadatGroupIsPresent('EXIF');
+        metadataViewPage.chekMetadatGroupIsExpand('EXIF');
+
+        metadataViewPage.enabledDefaultProperties();
+
+        metadataViewPage.checkkMetadatGroupIsPresent('properties');
+        metadataViewPage.chekMetadatGroupIsExpand('properties');
+    });
+
+    it('[C280560] Should show/hide the more properties button when displayDefaultProperties is true/false', () => {
+        viewerPage.viewFile(pngFileModel.name);
+        viewerPage.clickInfoButton();
+        viewerPage.checkInfoSideBarIsDisplayed();
+        metadataViewPage.clickOnPropertiesTab();
+
+        metadataViewPage.informationButtonIsDisplayed();
+
+        metadataViewPage.disabledDefaultProperties();
+
+        metadataViewPage.informationButtonIsNotDisplayed();
+    });
+});
diff --git a/e2e/core/card-view/metadata-smoke-tests.e2e.ts b/e2e/core/card-view/metadata-smoke-tests.e2e.ts
new file mode 100644
index 0000000000..2e1be454c8
--- /dev/null
+++ b/e2e/core/card-view/metadata-smoke-tests.e2e.ts
@@ -0,0 +1,311 @@
+/*!
+ * @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 } from 'protractor';
+
+import LoginPage = require('../../pages/adf/loginPage');
+import ContentServicesPage = require('../../pages/adf/contentServicesPage');
+import ViewerPage = require('../../pages/adf/viewerPage');
+import CardViewPage = require('../../pages/adf/metadataViewPage');
+import ContentListPage = require('../../pages/adf/dialog/contentList');
+
+import AcsUserModel = require('../../models/ACS/acsUserModel');
+import FileModel = require('../../models/ACS/fileModel');
+
+import TestConfig = require('../../test.config');
+import resources = require('../../util/resources');
+import dateFormat = require('dateformat');
+
+import AlfrescoApi = require('alfresco-js-api-node');
+import { UploadActions } from '../../actions/ACS/upload.actions';
+
+describe('Metadata component', () => {
+
+    const METADATA = {
+        DATAFORMAT: 'mmm dd yyyy',
+        TITLE: 'Details',
+        COMMENTS_TAB: 'COMMENTS',
+        PROPERTY_TAB: 'PROPERTIES',
+        DEFAULT_ASPECT: 'Properties',
+        MORE_INFO_BUTTON: 'More information',
+        LESS_INFO_BUTTON: 'Less information',
+        ARROW_DOWN: 'keyboard_arrow_down',
+        ARROW_UP: 'keyboard_arrow_up',
+        EDIT_BUTTON_TOOLTIP: 'Edit'
+    };
+
+    const loginPage = new LoginPage();
+    const contentServicesPage = new ContentServicesPage();
+    const viewerPage = new ViewerPage();
+    const metadataViewPage = new CardViewPage();
+    const contentListPage = new ContentListPage();
+
+    let acsUser = new AcsUserModel();
+
+    let folderName = 'Metadata Folder';
+
+    let pngFileModel = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.PNG.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.PNG.file_location
+    });
+
+    beforeAll(async (done) => {
+
+        let uploadActions = new UploadActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+        await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+
+        await uploadActions.uploadFolder(this.alfrescoJsApi, folderName, '-my-');
+
+        let pngUploadedFile = await uploadActions.uploadFile(this.alfrescoJsApi, pngFileModel.location, pngFileModel.name, '-my-');
+
+        Object.assign(pngFileModel, pngUploadedFile.entry);
+
+        pngFileModel.update(pngUploadedFile.entry);
+
+        done();
+    });
+
+    beforeEach(() => {
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+        contentServicesPage.navigateToDocumentList();
+    });
+
+    it('[C245652] Properties', () => {
+        viewerPage.viewFile(pngFileModel.name);
+
+        viewerPage.clickInfoButton();
+        viewerPage.checkInfoSideBarIsDisplayed();
+        metadataViewPage.clickOnPropertiesTab();
+
+        expect(metadataViewPage.getTitle()).toEqual(METADATA.TITLE);
+        expect(viewerPage.getActiveTab()).toEqual(METADATA.PROPERTY_TAB);
+        expect(metadataViewPage.getExpandedAspectName()).toEqual(METADATA.DEFAULT_ASPECT);
+        expect(metadataViewPage.getName()).toEqual(pngFileModel.name);
+        expect(metadataViewPage.getCreator()).toEqual(pngFileModel.getCreatedByUser().displayName);
+        expect(metadataViewPage.getCreatedDate()).toEqual(dateFormat(pngFileModel.createdAt, METADATA.DATAFORMAT));
+        expect(metadataViewPage.getModifier()).toEqual(pngFileModel.getCreatedByUser().displayName);
+        expect(metadataViewPage.getModifiedDate()).toEqual(dateFormat(pngFileModel.createdAt, METADATA.DATAFORMAT));
+        expect(metadataViewPage.getMimetypeName()).toEqual(pngFileModel.getContent().mimeTypeName);
+        expect(metadataViewPage.getSize()).toEqual(pngFileModel.getContent().getSizeInBytes());
+
+        metadataViewPage.editIconIsDisplayed();
+        metadataViewPage.informationButtonIsDisplayed();
+        expect(metadataViewPage.getInformationButtonText()).toEqual(METADATA.MORE_INFO_BUTTON);
+        expect(metadataViewPage.getInformationIconText()).toEqual(METADATA.ARROW_DOWN);
+
+        viewerPage.clickCloseButton();
+    });
+
+    it('[C272769] Information button', () => {
+        viewerPage.viewFile(pngFileModel.name);
+        viewerPage.clickInfoButton();
+        viewerPage.checkInfoSideBarIsDisplayed();
+        metadataViewPage.clickOnPropertiesTab();
+        metadataViewPage.informationButtonIsDisplayed();
+        metadataViewPage.clickOnInformationButton();
+        expect(metadataViewPage.getInformationButtonText()).toEqual(METADATA.LESS_INFO_BUTTON);
+        expect(metadataViewPage.getInformationIconText()).toEqual(METADATA.ARROW_UP);
+
+        viewerPage.clickCloseButton();
+    });
+
+    it('[C270952] Info icon', () => {
+        viewerPage.viewFile(pngFileModel.name);
+        viewerPage.clickInfoButton();
+        viewerPage.checkInfoSideBarIsDisplayed();
+        metadataViewPage.clickOnPropertiesTab().informationButtonIsDisplayed();
+        viewerPage.clickInfoButton();
+        viewerPage.checkInfoSideBarIsNotDisplayed();
+        viewerPage.clickInfoButton();
+        viewerPage.checkInfoSideBarIsDisplayed();
+        expect(viewerPage.getActiveTab()).toEqual(METADATA.COMMENTS_TAB);
+        metadataViewPage.clickOnPropertiesTab();
+        expect(viewerPage.getActiveTab()).toEqual(METADATA.PROPERTY_TAB);
+        expect(metadataViewPage.getEditIconTooltip()).toEqual(METADATA.EDIT_BUTTON_TOOLTIP);
+
+        viewerPage.clickCloseButton();
+    });
+
+    it('[C245654] Should be possible edit the basic Metadata Info of a Document', () => {
+        viewerPage.viewFile(pngFileModel.name);
+        viewerPage.clickInfoButton();
+        viewerPage.checkInfoSideBarIsDisplayed();
+        metadataViewPage.clickOnPropertiesTab();
+        metadataViewPage.editIconIsDisplayed();
+
+        expect(viewerPage.getActiveTab()).toEqual(METADATA.PROPERTY_TAB);
+
+        metadataViewPage.editIconClick();
+
+        metadataViewPage.editPropertyIconIsDisplayed('name');
+        metadataViewPage.editPropertyIconIsDisplayed('properties.cm:title');
+        metadataViewPage.editPropertyIconIsDisplayed('properties.cm:description');
+
+        expect(metadataViewPage.getPropertyIconTooltip('name', 'edit')).toEqual('Edit');
+        expect(metadataViewPage.getPropertyIconTooltip('properties.cm:title', 'edit')).toEqual('Edit');
+        expect(metadataViewPage.getPropertyIconTooltip('properties.cm:description', 'edit')).toEqual('Edit');
+
+        metadataViewPage.clickEditPropertyIcons('name');
+        metadataViewPage.updatePropertyIconIsDisplayed('name');
+        metadataViewPage.clearPropertyIconIsDisplayed('name');
+
+        metadataViewPage.enterPropertyText('name', 'exampleText');
+        metadataViewPage.clickClearPropertyIcon('name');
+        expect(metadataViewPage.getPropertyText('name')).toEqual(resources.Files.ADF_DOCUMENTS.PNG.file_name);
+
+        metadataViewPage.clickEditPropertyIcons('name');
+        metadataViewPage.enterPropertyText('name', 'exampleText.png');
+        metadataViewPage.clickUpdatePropertyIcon('name');
+        expect(metadataViewPage.getPropertyText('name')).toEqual('exampleText.png');
+
+        metadataViewPage.clickEditPropertyIcons('properties.cm:title');
+        metadataViewPage.enterPropertyText('properties.cm:title', 'example title');
+        metadataViewPage.clickUpdatePropertyIcon('properties.cm:title');
+        expect(metadataViewPage.getPropertyText('properties.cm:title')).toEqual('example title');
+
+        metadataViewPage.clickEditPropertyIcons('properties.cm:description');
+        metadataViewPage.enterDescriptionText('example description');
+        metadataViewPage.clickUpdatePropertyIcon('properties.cm:description');
+        expect(metadataViewPage.getPropertyText('properties.cm:description')).toEqual('example description');
+
+        viewerPage.clickCloseButton();
+
+        viewerPage.viewFile('exampleText.png');
+        viewerPage.clickInfoButton();
+        viewerPage.checkInfoSideBarIsDisplayed();
+        metadataViewPage.clickOnPropertiesTab();
+        metadataViewPage.editIconIsDisplayed();
+
+        expect(metadataViewPage.getPropertyText('name')).toEqual('exampleText.png');
+        expect(metadataViewPage.getPropertyText('properties.cm:title')).toEqual('example title');
+        expect(metadataViewPage.getPropertyText('properties.cm:description')).toEqual('example description');
+
+        metadataViewPage.editIconClick();
+
+        metadataViewPage.clickEditPropertyIcons('name');
+        metadataViewPage.enterPropertyText('name', resources.Files.ADF_DOCUMENTS.PNG.file_name);
+        metadataViewPage.clickUpdatePropertyIcon('name');
+        expect(metadataViewPage.getPropertyText('name')).toEqual(resources.Files.ADF_DOCUMENTS.PNG.file_name);
+
+        viewerPage.clickCloseButton();
+    });
+
+    it('[C279960] Should show the last username modifier when modify a File', async (done) => {
+        let fileUrl;
+
+        viewerPage.viewFile(pngFileModel.name);
+
+        fileUrl = await browser.getCurrentUrl();
+
+        loginPage.loginToContentServices(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        browser.get(fileUrl);
+
+        viewerPage.clickInfoButton();
+        viewerPage.checkInfoSideBarIsDisplayed();
+        metadataViewPage.clickOnPropertiesTab();
+        metadataViewPage.editIconIsDisplayed();
+
+        expect(viewerPage.getActiveTab()).toEqual(METADATA.PROPERTY_TAB);
+
+        metadataViewPage.editIconClick();
+
+        metadataViewPage.clickEditPropertyIcons('properties.cm:description');
+        metadataViewPage.enterDescriptionText('check author example description');
+        metadataViewPage.clickUpdatePropertyIcon('properties.cm:description');
+        expect(metadataViewPage.getPropertyText('properties.cm:description')).toEqual('check author example description');
+
+        browser.get(fileUrl);
+
+        viewerPage.clickInfoButton();
+        viewerPage.checkInfoSideBarIsDisplayed();
+        metadataViewPage.clickOnPropertiesTab();
+
+        expect(metadataViewPage.getPropertyText('modifiedByUser.displayName')).toEqual('Administrator');
+        done();
+    });
+
+    it('[C261157] Should be possible use the metadata component When the node is a Folder', () => {
+        contentListPage.metadataContent(folderName);
+
+        expect(metadataViewPage.getPropertyText('name')).toEqual(folderName);
+        expect(metadataViewPage.getPropertyText('createdByUser.displayName')).toEqual(acsUser.firstName + ' ' + acsUser.lastName);
+    });
+
+    it('[C261158] Should be possible edit the metadata When the node is a Folder', () => {
+        contentListPage.metadataContent(folderName);
+
+        metadataViewPage.editIconClick();
+
+        metadataViewPage.clickEditPropertyIcons('name');
+        metadataViewPage.enterPropertyText('name', 'newnameFolder');
+        metadataViewPage.clickClearPropertyIcon('name');
+        expect(metadataViewPage.getPropertyText('name')).toEqual(folderName);
+
+        metadataViewPage.clickEditPropertyIcons('name');
+        metadataViewPage.enterPropertyText('name', 'newnameFolder');
+        metadataViewPage.clickUpdatePropertyIcon('name');
+        expect(metadataViewPage.getPropertyText('name')).toEqual('newnameFolder');
+
+        metadataViewPage.clickEditPropertyIcons('name');
+        metadataViewPage.enterPropertyText('name', folderName);
+        metadataViewPage.clickUpdatePropertyIcon('name');
+        expect(metadataViewPage.getPropertyText('name')).toEqual(folderName);
+    });
+
+    it('[C260181] Should be possible edit all the metadata aspect', () => {
+        viewerPage.viewFile(pngFileModel.name);
+        viewerPage.clickInfoButton();
+        viewerPage.checkInfoSideBarIsDisplayed();
+        metadataViewPage.clickOnPropertiesTab();
+        metadataViewPage.editIconIsDisplayed();
+
+        expect(viewerPage.getActiveTab()).toEqual(METADATA.PROPERTY_TAB);
+
+        metadataViewPage.clickOnInformationButton();
+
+        metadataViewPage.clickMetadatGroup('EXIF');
+
+        metadataViewPage.editIconClick();
+
+        metadataViewPage.clickEditPropertyIcons('properties.exif:software');
+        metadataViewPage.enterPropertyText('properties.exif:software', 'test custom text software');
+        metadataViewPage.clickUpdatePropertyIcon('properties.exif:software');
+        expect(metadataViewPage.getPropertyText('properties.exif:software')).toEqual('test custom text software');
+
+        metadataViewPage.clickEditPropertyIcons('properties.exif:isoSpeedRatings');
+        metadataViewPage.enterPropertyText('properties.exif:isoSpeedRatings', 'test custom text isoSpeedRatings');
+        metadataViewPage.clickUpdatePropertyIcon('properties.exif:isoSpeedRatings');
+        expect(metadataViewPage.getPropertyText('properties.exif:isoSpeedRatings')).toEqual('test custom text isoSpeedRatings');
+
+        metadataViewPage.clickEditPropertyIcons('properties.exif:fNumber');
+        metadataViewPage.enterPropertyText('properties.exif:fNumber', 22);
+        metadataViewPage.clickUpdatePropertyIcon('properties.exif:fNumber');
+        expect(metadataViewPage.getPropertyText('properties.exif:fNumber')).toEqual('22');
+    });
+
+});
diff --git a/e2e/core/datatable/data-table-component-selection.e2e.ts b/e2e/core/datatable/data-table-component-selection.e2e.ts
new file mode 100644
index 0000000000..fc24bf3507
--- /dev/null
+++ b/e2e/core/datatable/data-table-component-selection.e2e.ts
@@ -0,0 +1,101 @@
+/*!
+ * @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 LoginPage = require('../../pages/adf/loginPage');
+import DataTablePage = require('../../pages/adf/dataTablePage');
+import TestConfig = require('../../test.config');
+
+import AcsUserModel = require('../../models/ACS/acsUserModel');
+import AlfrescoApi = require('alfresco-js-api-node');
+
+describe('Datatable component - selection', () => {
+
+    let dataTablePage = new DataTablePage();
+    let loginPage = new LoginPage();
+    let acsUser = new AcsUserModel();
+
+    beforeAll(async (done) => {
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+
+        dataTablePage.goToDatatable();
+
+        done();
+    });
+
+    it('[C213258] Should be possible change the selection modes when change the selectionMode property', () => {
+        dataTablePage.selectRow('2');
+        dataTablePage.checkRowIsSelected('2');
+        dataTablePage.getNumberOfSelectedRows().then((result) => {
+            expect(result).toEqual(1);
+        });
+        dataTablePage.selectRow('3');
+        dataTablePage.checkRowIsSelected('3');
+        dataTablePage.getNumberOfSelectedRows().then((result) => {
+            expect(result).toEqual(1);
+        });
+        dataTablePage.selectSelectionMode('Multiple');
+        dataTablePage.selectRow('1');
+        dataTablePage.checkRowIsSelected('1');
+        dataTablePage.selectRowWithKeyboard('3');
+        dataTablePage.checkRowIsSelected('1');
+        dataTablePage.checkRowIsSelected('3');
+        dataTablePage.checkRowIsNotSelected('2');
+        dataTablePage.checkRowIsNotSelected('4');
+        dataTablePage.selectSelectionMode('None');
+        dataTablePage.selectRow('1');
+        dataTablePage.checkNoRowIsSelected();
+    });
+
+    it('[C260059] Should be possible select multiple row when multiselect is true', () => {
+        dataTablePage.clickMultiSelect();
+        dataTablePage.clickCheckbox('1');
+        dataTablePage.checkRowIsChecked('1');
+        dataTablePage.clickCheckbox('3');
+        dataTablePage.checkRowIsChecked('3');
+        dataTablePage.checkRowIsNotChecked('2');
+        dataTablePage.checkRowIsNotChecked('4');
+        dataTablePage.clickCheckbox('3');
+        dataTablePage.checkRowIsNotChecked('3');
+        dataTablePage.checkRowIsChecked('1');
+    });
+
+    it('[C260058] Should be possible select all the rows when multiselect is true', () => {
+        dataTablePage.checkAllRows();
+        dataTablePage.checkRowIsChecked('1');
+        dataTablePage.checkRowIsChecked('2');
+        dataTablePage.checkRowIsChecked('3');
+        dataTablePage.checkRowIsChecked('4');
+    });
+
+    it('[C277262] Should be possible reset the selected row when click on the reset button', () => {
+        dataTablePage.checkRowIsChecked('1');
+        dataTablePage.checkRowIsChecked('2');
+        dataTablePage.checkRowIsChecked('3');
+        dataTablePage.checkRowIsChecked('4');
+        dataTablePage.clickReset();
+        dataTablePage.checkNoRowIsSelected();
+    });
+});
diff --git a/e2e/core/datatable/data-table-component.e2e.ts b/e2e/core/datatable/data-table-component.e2e.ts
new file mode 100644
index 0000000000..bfb0e9c58d
--- /dev/null
+++ b/e2e/core/datatable/data-table-component.e2e.ts
@@ -0,0 +1,73 @@
+/*!
+ * @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 LoginPage = require('../../pages/adf/loginPage.js');
+import DataTablePage = require('../../pages/adf/dataTablePage.js');
+import AcsUserModel = require('../../models/ACS/acsUserModel.js');
+import TestConfig = require('../../test.config.js');
+
+import AlfrescoApi = require('alfresco-js-api-node');
+
+describe('Datatable component', () => {
+
+    let dataTablePage = new DataTablePage();
+    let loginPage = new LoginPage();
+    let acsUser = new AcsUserModel();
+
+    beforeAll(async (done) => {
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+
+        dataTablePage.goToDatatable();
+
+        done();
+    });
+
+    it('[C91314] Should be possible add new row to the table', () => {
+        dataTablePage.getNumberOfRows().then((result) => {
+            dataTablePage.addRow();
+            expect(dataTablePage.getNumberOfRows()).toEqual(result + 1);
+            dataTablePage.addRow();
+            expect(dataTablePage.getNumberOfRows()).toEqual(result + 2);
+        });
+    });
+
+    it('[C260039] Should be possible replace rows', () => {
+        dataTablePage.replaceRows(1);
+    });
+
+    it('[C260041] Should be possible replace columns', () => {
+        dataTablePage.replaceColumns();
+    });
+
+    it('[C277314] Should filter the table rows when the input filter is passed', () => {
+        expect(dataTablePage.getNumberOfRows()).toEqual(5);
+        dataTablePage.insertFilter('Name');
+        expect(dataTablePage.getNumberOfRows()).toEqual(4);
+        dataTablePage.insertFilter('I');
+        expect(dataTablePage.getNumberOfRows()).toEqual(2);
+    });
+
+});
diff --git a/e2e/core/error_component.e2e.ts b/e2e/core/error_component.e2e.ts
new file mode 100644
index 0000000000..8332063f15
--- /dev/null
+++ b/e2e/core/error_component.e2e.ts
@@ -0,0 +1,77 @@
+/*!
+ * @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 LoginPage = require('../pages/adf/loginPage');
+import AcsUserModel = require('../models/ACS/acsUserModel');
+import TestConfig = require('../test.config');
+import AlfrescoApi = require('alfresco-js-api-node');
+import ErrorPage = require('../pages/adf/errorPage');
+import { browser } from '../../node_modules/protractor';
+
+describe('Error Component', () => {
+
+    let acsUser = new AcsUserModel();
+    let loginPage = new LoginPage();
+    let errorPage = new ErrorPage();
+
+    beforeAll(async (done) => {
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+
+        done();
+
+    });
+
+    it('[C277302] Should display the error 403 when access to unathorized page', () => {
+        browser.get(TestConfig.adf.url + '/error/403');
+        expect(errorPage.getErrorCode()).toBe('403');
+        expect(errorPage.getErrorTitle()).toBe('You don\'t have permission to access this server.');
+        expect(errorPage.getErrorDescription()).toBe('You\'re not allowed access to this resource on the server.');
+    });
+
+    it('[C280563] Should back home button navigate to the home page', () => {
+        browser.get(TestConfig.adf.url + '/error/404');
+
+        errorPage.clickBackButton();
+
+        expect(browser.getCurrentUrl()).toBe(TestConfig.adf.url + '/');
+    });
+
+    it('[C280564] Should secondary button by default redirect to report-issue URL', () => {
+        browser.get(TestConfig.adf.url + '/error/403');
+
+        errorPage.clickSecondButton();
+
+        expect(browser.getCurrentUrl()).toBe(TestConfig.adf.url + '/report-issue');
+    });
+
+    it('[C277304] We couldn’t find the page you were looking for.\' to be \'You\'re not allowed access to this resource on the server.', () => {
+        browser.get(TestConfig.adf.url + '/error/404');
+        expect(errorPage.getErrorCode()).toBe('404');
+        expect(errorPage.getErrorTitle()).toBe('An error occurred.');
+        expect(errorPage.getErrorDescription()).toBe('We couldn’t find the page you were looking for.');
+    });
+
+});
diff --git a/e2e/core/header_component.e2e.ts b/e2e/core/header_component.e2e.ts
new file mode 100644
index 0000000000..245e36b450
--- /dev/null
+++ b/e2e/core/header_component.e2e.ts
@@ -0,0 +1,151 @@
+/*!
+ * @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 LoginPage = require('../pages/adf/loginPage');
+import NavigationBarPage = require('../pages/adf/navigationBarPage');
+import { HeaderPage } from '../pages/adf/core/headerPage';
+import SettingsPage = require('../pages/adf/settingsPage');
+
+import TestConfig = require('../test.config');
+
+import AlfrescoApi = require('alfresco-js-api-node');
+import { UsersActions } from '../actions/users.actions';
+
+describe('Header Component', () => {
+
+    let loginPage = new LoginPage();
+    let navigationBarPage = new NavigationBarPage();
+    let headerPage = new HeaderPage();
+    let settingsPage = new SettingsPage();
+
+    let user, tenantId;
+
+    let names = {
+        app_title_default: 'ADF Demo Application',
+        app_title_custom: 'New Test App',
+        urlPath_default: './assets/images/logo.png',
+        urlPath_custom: 'https://upload.wikimedia.org/wikipedia/commons/b/ba/Flower_jtca001.jpg',
+        urlPath_logo_link: '"/settings-layout"',
+        color_primary: 'primary',
+        color_accent: 'accent',
+        color_warn: 'warn',
+        color_custom: '#862B2B',
+        logo_title: 'ADF Demo Application',
+        logo_tooltip: 'test_tooltip'
+    };
+
+    beforeAll(async(done) => {
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+        done();
+    });
+
+    beforeEach(async(done) => {
+        let users = new UsersActions();
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        user = await users.createTenantAndUser(this.alfrescoJsApi);
+
+        tenantId = user.tenantId;
+
+        await this.alfrescoJsApi.login(user.email, user.password);
+
+        await loginPage.loginToProcessServicesUsingUserModel(user);
+
+        await navigationBarPage.clickHeaderDataButton();
+
+        done();
+    });
+
+    afterEach(async(done) => {
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId);
+
+        done();
+    });
+
+    it('[C280002] Should be able to view Header component', () => {
+        headerPage.checkShowMenuCheckBoxIsDisplayed();
+        headerPage.checkChooseHeaderColourIsDisplayed();
+        headerPage.checkHexColorInputIsDisplayed();
+        headerPage.checkChangeTitleIsDisplayed();
+        headerPage.checkChangeUrlPathIsDisplayed();
+        headerPage.checkLogoHyperlinkInputIsDisplayed();
+        headerPage.checkLogoTooltipInputIsDisplayed();
+    });
+
+    it('[C279996] Should be able to show/hide menu button', () => {
+        headerPage.clickShowMenuButton();
+
+        navigationBarPage.checkMenuButtonIsNotDisplayed();
+
+        headerPage.clickShowMenuButton();
+
+        navigationBarPage.checkMenuButtonIsDisplayed();
+    });
+
+    it('[C279999] Should be able to change the colour between primary, accent and warn', () => {
+        headerPage.changeHeaderColor(names.color_accent);
+
+        navigationBarPage.checkToolbarColor(names.color_accent);
+
+        headerPage.changeHeaderColor(names.color_primary);
+
+        navigationBarPage.checkToolbarColor(names.color_primary);
+
+        headerPage.changeHeaderColor(names.color_warn);
+
+        navigationBarPage.checkToolbarColor(names.color_warn);
+    });
+
+    it('[C280552] Should be able to change the colour of the header by typing a hex code', () => {
+        headerPage.addHexCodeColor(names.color_custom);
+
+        navigationBarPage.checkToolbarColor(names.color_custom);
+
+    });
+
+    it('[C279997] Should be able to change the title of the app', () => {
+        headerPage.checkAppTitle(names.app_title_default);
+        headerPage.addTitle(names.app_title_custom);
+        headerPage.checkAppTitle(names.app_title_custom);
+    });
+
+    it('[C279998] Should be able to change the default logo of the app', () => {
+        headerPage.checkIconIsDisplayed(names.urlPath_default);
+        headerPage.addIcon(names.urlPath_custom);
+        headerPage.checkIconIsDisplayed(names.urlPath_custom);
+    });
+
+    it('[C280553] Should be able to set a hyperlink to the logo', () => {
+        headerPage.addLogoHyperlink(names.urlPath_logo_link);
+
+        navigationBarPage.clickAppLogo(names.logo_title);
+
+        settingsPage.checkProviderDropdownIsDisplayed();
+    });
+
+    it('[C280554] Should be able to customise the tooltip-text of the logo', () => {
+        headerPage.addLogoTooltip(names.logo_tooltip);
+
+        navigationBarPage.checkLogoTooltip(names.logo_tooltip);
+    });
+});
diff --git a/e2e/core/infinite_scrolling.e2e.ts b/e2e/core/infinite_scrolling.e2e.ts
new file mode 100644
index 0000000000..30f726b24e
--- /dev/null
+++ b/e2e/core/infinite_scrolling.e2e.ts
@@ -0,0 +1,81 @@
+/*!
+ * @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 LoginPage = require('../pages/adf/loginPage');
+import ContentServicesPage = require('../pages/adf/contentServicesPage');
+
+import AcsUserModel = require('../models/ACS/acsUserModel');
+import FolderModel = require('../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';
+
+describe('Enable infinite scrolling', () => {
+
+    let loginPage = new LoginPage();
+    let contentServicesPage = new ContentServicesPage();
+
+    let acsUser = new AcsUserModel();
+    let folderModel = new FolderModel({ 'name': 'folderOne' });
+
+    let fileNames = [], nrOfFiles = 30;
+    let fileNum = 0;
+
+    let files = {
+        base: 'newFile',
+        extension: '.txt'
+    };
+
+    beforeAll(async (done) => {
+        let uploadActions = new UploadActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+
+        contentServicesPage.goToDocumentList();
+
+        fileNames = Util.generateSeqeunceFiles(1, nrOfFiles, files.base, files.extension);
+
+        await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+
+        let folderUploadedModel = await uploadActions.uploadFolder(this.alfrescoJsApi, folderModel.name, '-my-');
+
+        await uploadActions.createEmptyFiles(this.alfrescoJsApi, fileNames, folderUploadedModel.entry.id);
+
+        done();
+    });
+
+    it('Enable infinite scrolling', () => {
+        contentServicesPage.navigateToFolder(folderModel.name);
+        contentServicesPage.enableInfiniteScrolling();
+        contentServicesPage.clickLoadMoreButton();
+        for (fileNum; fileNum < nrOfFiles; fileNum++) {
+            contentServicesPage.checkContentIsDisplayed(fileNames[fileNum]);
+        }
+    });
+});
diff --git a/e2e/core/login/login_component.e2e.ts b/e2e/core/login/login_component.e2e.ts
new file mode 100644
index 0000000000..6ff3b109bb
--- /dev/null
+++ b/e2e/core/login/login_component.e2e.ts
@@ -0,0 +1,251 @@
+/*!
+ * @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 } from 'protractor';
+
+import LoginPage = require('../../pages/adf/loginPage');
+import ContentServicesPage = require('../../pages/adf/contentServicesPage');
+import ProcessServicesPage = require('../../pages/adf/process_services/processServicesPage');
+import NavigationBarPage = require('../../pages/adf/navigationBarPage');
+import UserInfoDialog = require('../../pages/adf/dialog/userInfoDialog');
+
+import TestConfig = require('../../test.config');
+import AcsUserModel = require('../../models/ACS/acsUserModel');
+
+import AdfSettingsPage = require('../../pages/adf/settingsPage');
+import AlfrescoApi = require('alfresco-js-api-node');
+
+import Util = require('../../util/util');
+
+describe('Login component', () => {
+
+    let adfSettingsPage = new AdfSettingsPage();
+    let processServicesPage = new ProcessServicesPage();
+    let navigationBarPage = new NavigationBarPage();
+    let userInfoDialog = new UserInfoDialog();
+    let contentServicesPage = new ContentServicesPage();
+    let loginPage = new LoginPage();
+    let adminUserModel = new AcsUserModel({
+        'id': TestConfig.adf.adminUser,
+        'password': TestConfig.adf.adminPassword
+    });
+
+    let userA = new AcsUserModel();
+    let userB = new AcsUserModel();
+
+    let errorMessages = {
+        username: 'Your username needs to be at least 2 characters.',
+        invalid_credentials: 'You\'ve entered an unknown username or password',
+        password: 'Enter your password to sign in',
+        required: 'Required'
+    };
+
+    beforeAll(async (done) => {
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ALL',
+            hostEcm: TestConfig.adf.url,
+            hostBpm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(userA);
+        await this.alfrescoJsApi.core.peopleApi.addPerson(userB);
+
+        done();
+    });
+
+    it('[C260036] Username Required', () => {
+        loginPage.goToLoginPage();
+        loginPage.checkUsernameInactive();
+        loginPage.checkSignInButtonIsDisabled();
+        loginPage.enterUsername('A');
+        loginPage.checkUsernameTooltip(errorMessages.username);
+        loginPage.clearUsername();
+        loginPage.checkUsernameTooltip(errorMessages.required);
+        loginPage.checkUsernameHighlighted();
+        loginPage.checkSignInButtonIsDisabled();
+    });
+
+    it('[C260043] Enter Password to sign in', () => {
+        loginPage.goToLoginPage();
+        loginPage.checkPasswordInactive();
+        loginPage.checkSignInButtonIsDisabled();
+        loginPage.enterPassword('A');
+        loginPage.checkPasswordTooltipIsNotVisible();
+        loginPage.clearPassword();
+        loginPage.checkPasswordTooltip(errorMessages.password);
+        loginPage.checkPasswordHighlighted();
+        loginPage.checkSignInButtonIsDisabled();
+    });
+
+    it('[C260044] Username must be at least 2 characters long', () => {
+        loginPage.goToLoginPage();
+        loginPage.checkSignInButtonIsDisabled();
+        loginPage.enterUsername('A');
+        loginPage.checkUsernameTooltip(errorMessages.username);
+        loginPage.enterUsername('AB');
+        loginPage.checkUsernameTooltipIsNotVisible();
+        loginPage.checkSignInButtonIsDisabled();
+        loginPage.clearUsername();
+    });
+
+    it('[C260045] Login button is enabled', () => {
+        loginPage.goToLoginPage();
+        loginPage.enterUsername(adminUserModel.id);
+        loginPage.checkSignInButtonIsDisabled();
+        loginPage.enterPassword('a');
+        loginPage.checkSignInButtonIsEnabled();
+        loginPage.clearUsername(adminUserModel.id);
+        loginPage.clearPassword();
+    });
+
+    it('[C260046] You have entered an invalid username or password', () => {
+        loginPage.goToLoginPage();
+        loginPage.checkSignInButtonIsDisabled();
+        loginPage.enterUsername('test');
+        loginPage.enterPassword('test');
+        loginPage.checkSignInButtonIsEnabled();
+        loginPage.clickSignInButton();
+        loginPage.checkLoginError(errorMessages.invalid_credentials);
+        loginPage.clearUsername();
+        loginPage.clearPassword();
+    });
+
+    it('[C260047] Password field is crypted', () => {
+        loginPage.goToLoginPage();
+        loginPage.checkSignInButtonIsDisabled();
+        loginPage.enterPassword('test');
+        loginPage.showPassword();
+        loginPage.checkPasswordIsShown('test');
+        loginPage.hidePassword();
+        loginPage.checkPasswordIsHidden();
+        loginPage.clearPassword();
+    });
+
+    it('[C260048] Remember  Need Help? and Register are displayed and hidden', () => {
+        loginPage.goToLoginPage();
+        loginPage.enableFooter();
+        loginPage.checkRememberIsDisplayed();
+        loginPage.checkNeedHelpIsDisplayed();
+        loginPage.checkRegisterDisplayed();
+        loginPage.disableFooter();
+        loginPage.checkRememberIsNotDisplayed();
+        loginPage.checkNeedHelpIsNotDisplayed();
+        loginPage.checkRegisterIsNotDisplayed();
+    });
+
+    it('[C260049] Login to Process Services with Content Services disabled', () => {
+        loginPage.goToLoginPage();
+        loginPage.checkSignInButtonIsDisabled();
+        adfSettingsPage.setProviderBpm();
+        loginPage.login(adminUserModel.id, adminUserModel.password);
+        navigationBarPage.clickProcessServicesButton();
+        processServicesPage.checkApsContainer();
+        navigationBarPage.clickContentServicesButton();
+        loginPage.waitForElements();
+    });
+
+    it('[C260050] Login to Content Services with Process Services disabled', () => {
+        loginPage.goToLoginPage();
+        loginPage.checkSignInButtonIsDisabled();
+        adfSettingsPage.setProviderEcm();
+        loginPage.login(TestConfig.adf.adminUser, TestConfig.adf.adminPassword);
+        navigationBarPage.clickContentServicesButton();
+        contentServicesPage.checkAcsContainer();
+        navigationBarPage.clickProcessServicesButton();
+        loginPage.waitForElements();
+    });
+
+    it('[C260051] Able to login to both Content Services and Process Services', () => {
+        adfSettingsPage.setProviderEcmBpm();
+        loginPage.checkSignInButtonIsDisabled();
+        adfSettingsPage.setProviderEcmBpm();
+        loginPage.login(adminUserModel.id, adminUserModel.password);
+        navigationBarPage.clickProcessServicesButton();
+        processServicesPage.checkApsContainer();
+        navigationBarPage.clickContentServicesButton();
+        contentServicesPage.checkAcsContainer();
+        navigationBarPage.clickLoginButton();
+        loginPage.waitForElements();
+    });
+
+    it('[C277754] Should the user be redirect to the login page when the Content Service session expire', () => {
+        adfSettingsPage.setProviderEcmBpm();
+        loginPage.login(adminUserModel.id, adminUserModel.password);
+        browser.executeScript('window.localStorage.removeItem("ticket-ECM");').then(() => {
+            browser.get(TestConfig.adf.url + '/files');
+            loginPage.waitForElements();
+        });
+
+    });
+
+    it('[C279932] Should successRoute property change the landing page when the user Login', () => {
+        adfSettingsPage.setProviderEcmBpm();
+        loginPage.enableSuccessRouteSwitch();
+        loginPage.enterSuccessRoute('activiti');
+        loginPage.login(adminUserModel.id, adminUserModel.password);
+        processServicesPage.checkApsContainer();
+    });
+
+    it('[C279931] Should the user be redirect to the login page when the Process Service session expire', () => {
+        adfSettingsPage.setProviderEcmBpm();
+        loginPage.login(adminUserModel.id, adminUserModel.password);
+        browser.executeScript('window.localStorage.removeItem("ticket-BPM");').then(() => {
+            browser.get(TestConfig.adf.url + '/activiti');
+            loginPage.waitForElements();
+        });
+    });
+
+    it('[C279930] Should a user still be logged-in when open a new tab', () => {
+        adfSettingsPage.setProviderEcmBpm();
+        loginPage.login(adminUserModel.id, adminUserModel.password);
+
+        Util.openNewTabInBrowser();
+
+        browser.getAllWindowHandles().then((handles) => {
+
+            browser.ignoreSynchronization = true;
+            browser.switchTo().window(handles[1]).then(() => {
+                browser.get(TestConfig.adf.url + '/activiti');
+                processServicesPage.checkApsContainer();
+                browser.get(TestConfig.adf.url + '/files');
+                contentServicesPage.checkAcsContainer();
+            });
+        });
+    });
+
+    it('[C276746] Login with two different users', () => {
+        loginPage.loginToContentServicesUsingUserModel(userA);
+        navigationBarPage.clickUserProfile();
+        expect(userInfoDialog.getContentHeaderTitle()).toEqual(userA.firstName + ' ' + userA.lastName);
+        expect(userInfoDialog.getContentEmail()).toEqual(userA.email);
+
+        loginPage.loginToContentServicesUsingUserModel(userB);
+        navigationBarPage.clickUserProfile();
+        expect(userInfoDialog.getContentHeaderTitle()).toEqual(userB.firstName + ' ' + userB.lastName);
+        expect(userInfoDialog.getContentEmail()).toEqual(userB.email);
+    });
+
+    it('[C279933] Should be possible change the login component logo when logoImageUrl is changed', () => {
+        adfSettingsPage.setProviderEcmBpm();
+        loginPage.enableLogoSwitch();
+        loginPage.enterLogo('https://rawgit.com/Alfresco/alfresco-ng2-components/master/assets/angular2.png');
+        loginPage.checkLoginImgURL('https://rawgit.com/Alfresco/alfresco-ng2-components/master/assets/angular2.png');
+    });
+
+});
diff --git a/e2e/core/login/redirection.e2e.ts b/e2e/core/login/redirection.e2e.ts
new file mode 100644
index 0000000000..d04918f2a3
--- /dev/null
+++ b/e2e/core/login/redirection.e2e.ts
@@ -0,0 +1,137 @@
+/*!
+ * @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 } from 'protractor';
+
+import LoginPage = require('../../pages/adf/loginPage');
+import ContentServicesPage = require('../../pages/adf/contentServicesPage');
+import ProcessServicesPage = require('../../pages/adf/process_services/processServicesPage');
+import NavigationBarPage = require('../../pages/adf/navigationBarPage');
+
+import TestConfig = require('../../test.config');
+import AcsUserModel = require('../../models/ACS/acsUserModel');
+
+import AdfSettingsPage = require('../../pages/adf/settingsPage');
+import AlfrescoApi = require('alfresco-js-api-node');
+
+import Util = require('../../util/util');
+import { UploadActions } from '../../actions/ACS/upload.actions';
+
+describe('Login component', () => {
+
+    let adfSettingsPage = new AdfSettingsPage();
+    let processServicesPage = new ProcessServicesPage();
+    let navigationBarPage = new NavigationBarPage();
+    let contentServicesPage = new ContentServicesPage();
+    let loginPage = new LoginPage();
+    let adminUserModel = new AcsUserModel({
+        'id': TestConfig.adf.adminUser,
+        'password': TestConfig.adf.adminPassword
+    });
+
+    beforeAll(async (done) => {
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ALL',
+            hostEcm: TestConfig.adf.url,
+            hostBpm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        done();
+    });
+
+    it('[C213838] Should after login in CS be redirect to Login page when try to access to PS', () => {
+        adfSettingsPage.setProviderEcm();
+        loginPage.login(adminUserModel.id, adminUserModel.password);
+
+        navigationBarPage.clickContentServicesButton();
+        contentServicesPage.checkAcsContainer();
+
+        navigationBarPage.clickProcessServicesButton();
+
+        loginPage.waitForElements();
+    });
+
+    it('[C260085] Should after login in PS be redirect to Login page when try to access to CS', () => {
+        adfSettingsPage.setProviderBpm();
+
+        loginPage.enableSuccessRouteSwitch();
+        loginPage.enterSuccessRoute('activiti');
+
+        loginPage.login(adminUserModel.id, adminUserModel.password);
+
+        navigationBarPage.clickProcessServicesButton();
+        processServicesPage.checkApsContainer();
+
+        navigationBarPage.clickContentServicesButton();
+
+        loginPage.waitForElements();
+    });
+
+    it('[C260081] Should after login in BOTH not be redirect to Login page when try to access to CS or PS', () => {
+        adfSettingsPage.setProviderEcmBpm();
+
+        loginPage.login(adminUserModel.id, adminUserModel.password);
+
+        navigationBarPage.clickProcessServicesButton();
+        processServicesPage.checkApsContainer();
+
+        navigationBarPage.clickContentServicesButton();
+        contentServicesPage.checkAcsContainer();
+    });
+
+    it('[C260088] Sould 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();
+
+        adfSettingsPage.setProviderEcmBpm();
+        loginPage.login(adminUserModel.id, adminUserModel.password);
+
+        browser.controlFlow().execute(async () => {
+            uploadedFolder = await uploadActions.uploadFolder(this.alfrescoJsApi, folderName, '-my-');
+
+            navigationBarPage.openContentServicesFolder(uploadedFolder.entry.id);
+
+            browser.getCurrentUrl().then((actualUrl) => {
+                expect(actualUrl).toEqual(TestConfig.adf.url + '/files/' + uploadedFolder.entry.id);
+            });
+
+            browser.driver.sleep(1000);
+
+            navigationBarPage.clickLogoutButton();
+
+            browser.driver.sleep(1000);
+
+            navigationBarPage.openContentServicesFolder(uploadedFolder.entry.id);
+
+            loginPage.waitForElements();
+            loginPage.enterUsername(adminUserModel.id);
+            loginPage.enterPassword(adminUserModel.password);
+            loginPage.clickSignInButton();
+
+            browser.driver.sleep(1000);
+
+            browser.getCurrentUrl().then((actualUrl) => {
+                expect(actualUrl).toEqual(TestConfig.adf.url + '/files/' + uploadedFolder.entry.id);
+            });
+        });
+
+    });
+});
diff --git a/e2e/core/login/remember_me.e2e.ts b/e2e/core/login/remember_me.e2e.ts
new file mode 100644
index 0000000000..ce074d26e7
--- /dev/null
+++ b/e2e/core/login/remember_me.e2e.ts
@@ -0,0 +1,37 @@
+/*!
+ * @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 LoginPage = require('../../pages/adf/loginPage');
+
+import AdfSettingsPage = require('../../pages/adf/settingsPage');
+
+describe('Login component - Remember Me', () => {
+
+    let adfSettingsPage = new AdfSettingsPage();
+    let loginPage = new LoginPage();
+
+    beforeAll((done) => {
+        adfSettingsPage.setProviderEcmBpm();
+        done();
+    });
+
+    it('[C260501] Should Remember me checkbox not be present in the login if the property showRememberMe is false', () => {
+        loginPage.checkRememberIsDisplayed();
+        loginPage.disableRememberMe();
+        loginPage.checkRememberIsNotDisplayed();
+    });
+});
diff --git a/e2e/core/pagination_empty_current_page.e2e.ts b/e2e/core/pagination_empty_current_page.e2e.ts
new file mode 100644
index 0000000000..2c50e82aca
--- /dev/null
+++ b/e2e/core/pagination_empty_current_page.e2e.ts
@@ -0,0 +1,120 @@
+/*!
+ * @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 LoginPage = require('../pages/adf/loginPage');
+import ContentServicesPage = require('../pages/adf/contentServicesPage');
+import PaginationPage = require('../pages/adf/paginationPage');
+
+import AcsUserModel = require('../models/ACS/acsUserModel');
+import FolderModel = require('../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';
+
+describe('Pagination - returns to previous page when current is empty', () => {
+
+    let loginPage = new LoginPage();
+    let contentServicesPage = new ContentServicesPage();
+    let paginationPage = new PaginationPage();
+
+    let acsUser = new AcsUserModel();
+    let folderModel = new FolderModel({ 'name': 'folderOne' });
+
+    let fileNames = [], nrOfFiles = 6;
+    let lastFile = 'newFile6.txt';
+
+    let itemsPerPage = {
+        five: '5',
+        fiveValue: 5
+    };
+
+    let files = {
+        base: 'newFile',
+        extension: '.txt'
+    };
+
+    beforeAll(async (done) => {
+        let uploadActions = new UploadActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+        fileNames = Util.generateSeqeunceFiles(1, nrOfFiles, files.base, files.extension);
+
+        await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+
+        let folderUploadedModel = await uploadActions.uploadFolder(this.alfrescoJsApi, folderModel.name, '-my-');
+
+        await uploadActions.createEmptyFiles(this.alfrescoJsApi, fileNames, folderUploadedModel.entry.id);
+
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+
+        contentServicesPage.goToDocumentList();
+
+        done();
+    });
+
+    it('Pagination - returns to previous page when current is empty', () => {
+        contentServicesPage.navigateToFolder(folderModel.name);
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+
+        paginationPage.selectItemsPerPage(itemsPerPage.five);
+
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.five);
+        expect(contentServicesPage.numberOfResultsDisplayed()).toBe(itemsPerPage.fiveValue);
+
+        contentServicesPage.getAllRowsNameColumn().then((list) => {
+            expect(Util.arrayContainsArray(list, fileNames.slice(0, 5))).toEqual(true);
+        });
+
+        paginationPage.clickOnNextPage();
+
+        contentServicesPage.checkAcsContainer();
+        contentServicesPage.waitForTableBody();
+
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.five);
+
+        contentServicesPage.getAllRowsNameColumn().then((list) => {
+            expect(Util.arrayContainsArray(list, fileNames.slice(5, 6))).toEqual(true);
+        });
+
+        contentServicesPage.deleteContent(lastFile);
+        contentServicesPage.checkContentIsNotDisplayed(lastFile);
+
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.five);
+        expect(contentServicesPage.numberOfResultsDisplayed()).toBe(itemsPerPage.fiveValue);
+
+        contentServicesPage.getAllRowsNameColumn().then((list) => {
+            expect(Util.arrayContainsArray(list, fileNames.slice(0, 5))).toEqual(true);
+        });
+
+    });
+
+});
diff --git a/e2e/core/theming_component.e2e.ts b/e2e/core/theming_component.e2e.ts
new file mode 100644
index 0000000000..b358717391
--- /dev/null
+++ b/e2e/core/theming_component.e2e.ts
@@ -0,0 +1,70 @@
+/*!
+ * @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 LoginPage = require('../pages/adf/loginPage');
+import NavigationBarPage = require('../pages/adf/navigationBarPage');
+
+import TestConfig = require('../test.config');
+
+import AcsUserModel = require('../models/ACS/acsUserModel');
+import CONSTANTS = require('../util/constants');
+
+import AlfrescoApi = require('alfresco-js-api-node');
+
+describe('Theming component', () => {
+
+    let navigationBarPage = new NavigationBarPage();
+    let loginPage = new LoginPage();
+    let acsUser = new AcsUserModel();
+
+    beforeAll(async (done) => {
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+        loginPage.goToLoginPage();
+        loginPage.waitForElements();
+
+        done();
+    });
+
+    xit('Theming component', () => {
+        expect(loginPage.getShowPasswordIconColor()).toEqual(CONSTANTS.THEMING.DEFAULT_PASSWORD_ICON_COLOR);
+        expect(loginPage.getSignInButtonColor()).toEqual(CONSTANTS.THEMING.DEFAULT_LOGIN_BUTTON_COLOR);
+        expect(loginPage.getBackgroundColor()).toEqual(CONSTANTS.THEMING.DEFAULT_BACKGROUND_COLOR);
+
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+
+        navigationBarPage.clickThemeButton();
+        navigationBarPage.clickOnSpecificThemeButton(CONSTANTS.THEMING.PINK_BLUE_DARK);
+        navigationBarPage.clickLoginButton();
+        loginPage.waitForElements();
+
+        loginPage.enterUsername(acsUser.email);
+        loginPage.enterPassword(acsUser.password);
+
+        expect(loginPage.getShowPasswordIconColor()).toEqual(CONSTANTS.THEMING.PINK_BLUE_DARK_PASSWORD_ICON_COLOR);
+        expect(loginPage.getSignInButtonColor()).toEqual(CONSTANTS.THEMING.PINK_BLUE_DARK_LOGIN_BUTTON_COLOR);
+        expect(loginPage.getBackgroundColor()).toEqual(CONSTANTS.THEMING.PINK_BLUE_DARK_BACKGROUND_COLOR);
+    });
+
+});
diff --git a/e2e/core/user_info_component.e2e.ts b/e2e/core/user_info_component.e2e.ts
new file mode 100644
index 0000000000..1541767e42
--- /dev/null
+++ b/e2e/core/user_info_component.e2e.ts
@@ -0,0 +1,185 @@
+/*!
+ * @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 AdfSettingsPage = require('../pages/adf/settingsPage');
+import LoginPage = require('../pages/adf/loginPage');
+import UserInfoDialog = require('../pages/adf/dialog/userInfoDialog');
+import NavigationBarPage = require('../pages/adf/navigationBarPage');
+
+import AcsUserModel = require('../models/ACS/acsUserModel');
+import FileModel = require('../models/ACS/fileModel');
+
+import PeopleAPI = require('../restAPI/ACS/PeopleAPI');
+
+import TestConfig = require('../test.config');
+import resources = require('../util/resources');
+
+import AlfrescoApi = require('alfresco-js-api-node');
+import { UsersActions } from '../actions/users.actions';
+
+describe('User Info component', () => {
+
+    let adfSettingsPage = new AdfSettingsPage();
+    let loginPage = new LoginPage();
+    let navigationBarPage = new NavigationBarPage();
+    let userInfoDialog = new UserInfoDialog();
+    let processUserModel, contentUserModel;
+    let acsAvatarFileModel = new FileModel({
+        'name': resources.Files.PROFILE_IMAGES.ECM.file_name,
+        'location': resources.Files.PROFILE_IMAGES.ECM.file_location
+    });
+    let apsAvatarFileModel = new FileModel({
+        'name': resources.Files.PROFILE_IMAGES.BPM.file_name,
+        'location': resources.Files.PROFILE_IMAGES.BPM.file_location
+    });
+
+    beforeAll(async (done) => {
+        let users = new UsersActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ALL',
+            hostEcm: TestConfig.adf.url,
+            hostBpm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        processUserModel = await users.createTenantAndUser(this.alfrescoJsApi);
+
+        contentUserModel = new AcsUserModel({
+            'id': processUserModel.email,
+            'password': processUserModel.password,
+            'firstName': processUserModel.firstName,
+            'lastName': processUserModel.lastName,
+            'email': processUserModel.email
+        });
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(contentUserModel);
+
+        done();
+    });
+
+    it('1. Enable Process Services and Content Services ', () => {
+        loginPage.goToLoginPage();
+        adfSettingsPage.setProviderEcmBpm();
+        loginPage.login(contentUserModel.id, contentUserModel.password);
+        navigationBarPage.clickUserProfile();
+        userInfoDialog.dialogIsDisplayed().contentServicesTabIsDisplayed().processServicesTabIsDisplayed();
+        expect(userInfoDialog.getContentHeaderTitle()).toEqual(contentUserModel.firstName + ' ' + contentUserModel.lastName);
+        expect(userInfoDialog.getContentTitle()).toEqual(contentUserModel.firstName + ' ' + contentUserModel.lastName);
+        expect(userInfoDialog.getContentEmail()).toEqual(contentUserModel.email);
+        expect(userInfoDialog.getContentJobTitle()).toEqual(contentUserModel.jobTitle);
+        userInfoDialog.checkInitialImage();
+        userInfoDialog.APSProfileImageNotDisplayed();
+        userInfoDialog.ACSProfileImageNotDisplayed();
+        userInfoDialog.clickOnContentServicesTab();
+        expect(userInfoDialog.getContentHeaderTitle()).toEqual(contentUserModel.firstName + ' ' + contentUserModel.lastName);
+        expect(userInfoDialog.getContentTitle()).toEqual(contentUserModel.firstName + ' ' + contentUserModel.lastName);
+        expect(userInfoDialog.getContentEmail()).toEqual(contentUserModel.email);
+        expect(userInfoDialog.getContentJobTitle()).toEqual(contentUserModel.jobTitle);
+        userInfoDialog.checkInitialImage();
+        userInfoDialog.APSProfileImageNotDisplayed();
+        userInfoDialog.ACSProfileImageNotDisplayed();
+        userInfoDialog.clickOnProcessServicesTab().processServicesTabIsDisplayed();
+        expect(userInfoDialog.getProcessHeaderTitle()).toEqual(processUserModel.firstName + ' ' + processUserModel.lastName);
+        expect(userInfoDialog.getProcessTitle()).toEqual(processUserModel.firstName + ' ' + processUserModel.lastName);
+        expect(userInfoDialog.getProcessEmail()).toEqual(processUserModel.email);
+        userInfoDialog.checkInitialImage();
+        userInfoDialog.APSProfileImageNotDisplayed();
+        userInfoDialog.ACSProfileImageNotDisplayed();
+        userInfoDialog.closeUserProfile();
+    });
+
+    it('2. Enable Content Services and disable Process Services ', () => {
+        loginPage.goToLoginPage();
+        adfSettingsPage.setProviderEcm();
+        loginPage.login(contentUserModel.id, contentUserModel.password);
+
+        navigationBarPage.clickUserProfile();
+        userInfoDialog.dialogIsDisplayed().contentServicesTabIsNotDisplayed().processServicesTabIsNotDisplayed();
+        expect(userInfoDialog.getContentHeaderTitle()).toEqual(contentUserModel.firstName + ' ' + contentUserModel.lastName);
+        expect(userInfoDialog.getContentTitle()).toEqual(contentUserModel.firstName + ' ' + contentUserModel.lastName);
+        expect(userInfoDialog.getContentEmail()).toEqual(contentUserModel.email);
+        expect(userInfoDialog.getContentJobTitle()).toEqual(contentUserModel.jobTitle);
+        userInfoDialog.checkInitialImage();
+        userInfoDialog.APSProfileImageNotDisplayed();
+        userInfoDialog.ACSProfileImageNotDisplayed();
+        userInfoDialog.closeUserProfile();
+    });
+
+    it('3. Enable Process Services and disable Content Services ', () => {
+        loginPage.goToLoginPage();
+        adfSettingsPage.setProviderBpm();
+        loginPage.login(processUserModel.email, processUserModel.password);
+
+        navigationBarPage.clickUserProfile();
+
+        userInfoDialog.dialogIsDisplayed().contentServicesTabIsNotDisplayed().processServicesTabIsNotDisplayed();
+
+        expect(userInfoDialog.getProcessHeaderTitle()).toEqual(processUserModel.firstName + ' ' + processUserModel.lastName);
+        expect(userInfoDialog.getProcessTitle()).toEqual(processUserModel.firstName + ' ' + processUserModel.lastName);
+        expect(userInfoDialog.getProcessEmail()).toEqual(processUserModel.email);
+
+        userInfoDialog.checkInitialImage();
+        userInfoDialog.APSProfileImageNotDisplayed();
+        userInfoDialog.ACSProfileImageNotDisplayed();
+        userInfoDialog.closeUserProfile();
+    });
+
+    it('4. Enable Process Services and Content Services ', async(done) => {
+        browser.controlFlow().execute(async() => {
+            await PeopleAPI.updateAvatarViaAPI(contentUserModel, acsAvatarFileModel, '-me-');
+            await PeopleAPI.getAvatarViaAPI(4, contentUserModel, '-me-', function (result) {});
+        });
+
+        loginPage.goToLoginPage();
+        adfSettingsPage.setProviderEcm();
+        loginPage.login(contentUserModel.id, contentUserModel.password);
+        navigationBarPage.clickUserProfile();
+        userInfoDialog.checkACSProfileImage();
+        userInfoDialog.APSProfileImageNotDisplayed();
+        userInfoDialog.closeUserProfile();
+        done();
+    });
+
+    it('5. The profile picture is changed from APS', async () => {
+        let users = new UsersActions();
+        await this.alfrescoJsApi.login(contentUserModel.email, contentUserModel.password);
+        await users.changeProfilePictureAps(this.alfrescoJsApi, apsAvatarFileModel.getLocation());
+
+        loginPage.goToLoginPage();
+        adfSettingsPage.setProviderBpm();
+        loginPage.login(processUserModel.email, processUserModel.password);
+        navigationBarPage.clickUserProfile();
+        userInfoDialog.checkAPSProfileImage();
+        userInfoDialog.ACSProfileImageNotDisplayed();
+        userInfoDialog.initialImageNotDisplayed();
+        userInfoDialog.closeUserProfile();
+    });
+
+    it('6. Delete the profile picture from ACS', () => {
+        PeopleAPI.deleteAvatarViaAPI(contentUserModel, '-me-');
+        loginPage.goToLoginPage();
+        adfSettingsPage.setProviderEcm();
+        loginPage.login(contentUserModel.id, contentUserModel.password);
+        navigationBarPage.clickUserProfile();
+        userInfoDialog.checkInitialImage();
+        userInfoDialog.APSProfileImageNotDisplayed();
+        userInfoDialog.ACSProfileImageNotDisplayed();
+        userInfoDialog.closeUserProfile();
+    });
+});
diff --git a/e2e/core/viewer_content_services_component.e2e.ts b/e2e/core/viewer_content_services_component.e2e.ts
new file mode 100644
index 0000000000..a864ea755a
--- /dev/null
+++ b/e2e/core/viewer_content_services_component.e2e.ts
@@ -0,0 +1,373 @@
+/*!
+ * @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 } from 'protractor';
+
+import TestConfig = require('../test.config');
+
+import LoginPage = require('../pages/adf/loginPage');
+import ContentServicesPage = require('../pages/adf/contentServicesPage');
+import ViewerPage = require('../pages/adf/viewerPage');
+
+import resources = require('../util/resources');
+
+import FileModel = require('../models/ACS/fileModel');
+import AcsUserModel = require('../models/ACS/acsUserModel');
+
+import AlfrescoApi = require('alfresco-js-api-node');
+import { UploadActions } from '../actions/ACS/upload.actions';
+
+describe('Content Services Viewer', () => {
+
+    let acsUser = new AcsUserModel();
+    let viewerPage = new ViewerPage();
+    let contentServicesPage = new ContentServicesPage();
+    let loginPage = new LoginPage();
+    let zoom;
+
+    let pdfFile = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.PDF.file_name,
+        'firstPageText': resources.Files.ADF_DOCUMENTS.PDF.first_page_text,
+        'secondPageText': resources.Files.ADF_DOCUMENTS.PDF.second_page_text,
+        'lastPageNumber': resources.Files.ADF_DOCUMENTS.PDF.last_page_number
+    });
+    let protectedFile = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.file_name,
+        'firstPageText': resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.first_page_text,
+        'secondPageText': resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.second_page_text,
+        'lastPageNumber': resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.last_page_number,
+        'password': resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.password,
+        'location': resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.file_location
+    });
+    let docxFile = new FileModel({
+        'location': resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_location,
+        'name': resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_name,
+        'firstPageText': resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.first_page_text
+    });
+    let jpgFile = new FileModel({
+        'location': resources.Files.ADF_DOCUMENTS.JPG.file_location,
+        'name': resources.Files.ADF_DOCUMENTS.JPG.file_name
+    });
+    let mp4File = new FileModel({
+        'location': resources.Files.ADF_DOCUMENTS.MP4.file_location,
+        'name': resources.Files.ADF_DOCUMENTS.MP4.file_name
+    });
+    let unsupportedFile = new FileModel({
+        'location': resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_location,
+        'name': resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_name
+    });
+    let pptFile = new FileModel({
+        'location': resources.Files.ADF_DOCUMENTS.PPT.file_location,
+        'name': resources.Files.ADF_DOCUMENTS.PPT.file_name,
+        'firstPageText': resources.Files.ADF_DOCUMENTS.PPT.first_page_text
+    });
+
+    beforeAll(async (done) => {
+        let uploadActions = new UploadActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+        await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+
+        let pdfFileUploaded = await uploadActions.uploadFile(this.alfrescoJsApi, pdfFile.location, pdfFile.name, '-my-');
+        Object.assign(pdfFile, pdfFileUploaded.entry);
+
+        let protectedFileUploaded = await uploadActions.uploadFile(this.alfrescoJsApi, protectedFile.location, protectedFile.name, '-my-');
+        Object.assign(protectedFile, protectedFileUploaded.entry);
+
+        let docxFileUploaded = await uploadActions.uploadFile(this.alfrescoJsApi, docxFile.location, docxFile.name, '-my-');
+        Object.assign(docxFile, docxFileUploaded.entry);
+
+        let jpgFileUploaded = await uploadActions.uploadFile(this.alfrescoJsApi, jpgFile.location, jpgFile.name, '-my-');
+        Object.assign(jpgFile, jpgFileUploaded.entry);
+
+        let mp4FileUploaded = await uploadActions.uploadFile(this.alfrescoJsApi, mp4File.location, mp4File.name, '-my-');
+        Object.assign(mp4File, mp4FileUploaded.entry);
+
+        let pptFileUploaded = await uploadActions.uploadFile(this.alfrescoJsApi, pptFile.location, pptFile.name, '-my-');
+        Object.assign(pptFile, pptFileUploaded.entry);
+
+        let unsupportedFileUploaded = await uploadActions.uploadFile(this.alfrescoJsApi, unsupportedFile.location, unsupportedFile.name, '-my-');
+        Object.assign(unsupportedFile, unsupportedFileUploaded.entry);
+
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+
+        contentServicesPage.goToDocumentList();
+
+        done();
+    });
+
+    /*afterAll((done) => {
+        NodesAPI.deleteContent(acsUser, pdfFile.getId(), () => {
+            done();
+        });
+        NodesAPI.deleteContent(acsUser, jpgFile.getId(), () => {
+            done();
+        });
+        NodesAPI.deleteContent(acsUser, mp4File.getId(), () => {
+            done();
+        });
+        NodesAPI.deleteContent(acsUser, pagesFile.getId(), () => {
+            done();
+        });
+        NodesAPI.deleteContent(acsUser, pptFile.getId(), () => {
+            done();
+        });
+    });*/
+
+    it('[C260038] Should display first page, toolbar and pagination when opening a .pdf file', () => {
+        contentServicesPage.checkAcsContainer();
+
+        viewerPage.viewFile(pdfFile.name);
+
+        browser.driver.sleep(3000); // wait open file
+
+        viewerPage.checkFileContent('1', pdfFile.firstPageText);
+        viewerPage.checkCloseButtonIsDisplayed();
+        viewerPage.checkFileNameIsDisplayed(pdfFile.name);
+        viewerPage.checkFileThumbnailIsDisplayed();
+        viewerPage.checkDownloadButtonIsDisplayed();
+        viewerPage.checkFullScreenButtonIsDisplayed();
+        viewerPage.checkInfoButtonIsDisplayed();
+        viewerPage.checkPreviousPageButtonIsDisplayed();
+        viewerPage.checkNextPageButtonIsDisplayed();
+        viewerPage.checkPageSelectorInputIsDisplayed('1');
+        viewerPage.checkPercentageIsDisplayed();
+        viewerPage.checkZoomInButtonIsDisplayed();
+        viewerPage.checkZoomOutButtonIsDisplayed();
+        viewerPage.checkScalePageButtonIsDisplayed();
+    });
+
+    it('[C260040] Should be able to change pages and zoom when .pdf file is open', () => {
+        viewerPage.clickNextPageButton();
+        viewerPage.checkFileContent('2', pdfFile.secondPageText);
+        viewerPage.checkPageSelectorInputIsDisplayed('2');
+
+        viewerPage.clickPreviousPageButton();
+        viewerPage.checkFileContent('1', pdfFile.firstPageText);
+        viewerPage.checkPageSelectorInputIsDisplayed('1');
+
+        viewerPage.clearPageNumber();
+        viewerPage.checkPageSelectorInputIsDisplayed('');
+
+        viewerPage.clickZoomOutButton();
+
+        zoom = viewerPage.getZoom();
+        viewerPage.clickZoomOutButton();
+        viewerPage.checkZoomedOut(zoom);
+
+        zoom = viewerPage.getZoom();
+        viewerPage.clickZoomInButton();
+        viewerPage.checkZoomedIn(zoom);
+
+        viewerPage.clickCloseButton();
+    });
+
+    it('[C260042] Should be able to download, open full-screen and Info container from the Viewer', () => {
+        viewerPage.viewFile(jpgFile.name);
+        viewerPage.checkImgContainerIsDisplayed();
+
+        viewerPage.checkFullScreenButtonIsDisplayed();
+        viewerPage.clickFullScreenButton();
+
+        viewerPage.exitFullScreen();
+
+        viewerPage.checkDownloadButtonIsDisplayed();
+        viewerPage.clickDownloadButton();
+
+        viewerPage.clickCloseButton();
+    });
+
+    it('[C260052] Should display image, toolbar and pagination when opening a .jpg file', () => {
+        viewerPage.viewFile(jpgFile.name);
+        viewerPage.checkImgContainerIsDisplayed();
+
+        viewerPage.checkCloseButtonIsDisplayed();
+        viewerPage.checkFileNameIsDisplayed(jpgFile.name);
+        viewerPage.checkFileThumbnailIsDisplayed();
+        viewerPage.checkDownloadButtonIsDisplayed();
+        viewerPage.checkFullScreenButtonIsDisplayed();
+        viewerPage.checkInfoButtonIsDisplayed();
+        viewerPage.checkZoomInButtonIsDisplayed();
+        viewerPage.checkZoomOutButtonIsDisplayed();
+        viewerPage.checkPercentageIsDisplayed();
+        viewerPage.checkRotateLeftButtonIsDisplayed();
+        viewerPage.checkRotateRightButtonIsDisplayed();
+        viewerPage.checkScaleImgButtonIsDisplayed();
+    });
+
+    it('[C260483] Should be able to zoom and rotate image when .jpg file is open', () => {
+        zoom = viewerPage.getZoom();
+        viewerPage.clickZoomInButton();
+        viewerPage.checkZoomedIn(zoom);
+
+        zoom = viewerPage.getZoom();
+        viewerPage.clickZoomOutButton();
+        viewerPage.checkZoomedOut(zoom);
+
+        viewerPage.clickRotateLeftButton();
+        viewerPage.checkRotation('transform: scale(1, 1) rotate(-90deg) translate(0px, 0px);');
+
+        viewerPage.clickScaleImgButton();
+        viewerPage.checkRotation('transform: scale(1, 1) rotate(0deg) translate(0px, 0px);');
+
+        viewerPage.clickRotateRightButton();
+        viewerPage.checkRotation('transform: scale(1, 1) rotate(90deg) translate(0px, 0px);');
+
+        viewerPage.clickCloseButton();
+    });
+
+    it('[C279922] Open viewer for a .ppt file', () => {
+        viewerPage.viewFile(pptFile.name);
+        viewerPage.checkFileContent('1', pptFile.firstPageText);
+        viewerPage.checkCloseButtonIsDisplayed();
+        viewerPage.checkFileThumbnailIsDisplayed();
+        viewerPage.checkFileNameIsDisplayed(pptFile.name);
+        viewerPage.checkDownloadButtonIsDisplayed();
+        viewerPage.checkInfoButtonIsDisplayed();
+        viewerPage.checkPreviousPageButtonIsDisplayed();
+        viewerPage.checkNextPageButtonIsDisplayed();
+        viewerPage.checkPageSelectorInputIsDisplayed('1');
+        viewerPage.checkZoomInButtonIsDisplayed();
+        viewerPage.checkZoomOutButtonIsDisplayed();
+        viewerPage.checkScalePageButtonIsDisplayed();
+        viewerPage.clickCloseButton();
+    });
+
+    it('[C260053] Should display first page, toolbar and pagination when opening a .docx file', () => {
+        viewerPage.viewFile(docxFile.name);
+
+        viewerPage.checkFileContent('1', docxFile.firstPageText);
+        viewerPage.checkCloseButtonIsDisplayed();
+        viewerPage.checkFileThumbnailIsDisplayed();
+        viewerPage.checkFileNameIsDisplayed(docxFile.name);
+        viewerPage.checkDownloadButtonIsDisplayed();
+        viewerPage.checkInfoButtonIsDisplayed();
+        viewerPage.checkPreviousPageButtonIsDisplayed();
+        viewerPage.checkNextPageButtonIsDisplayed();
+        viewerPage.checkPageSelectorInputIsDisplayed('1');
+        viewerPage.checkZoomInButtonIsDisplayed();
+        viewerPage.checkZoomOutButtonIsDisplayed();
+        viewerPage.checkScalePageButtonIsDisplayed();
+        viewerPage.clickCloseButton();
+    });
+
+    it('[C260054] Should display "Preview couldn\'t be loaded" and viewer toolbar when opening an unsupported file', () => {
+        viewerPage.viewFile(unsupportedFile.name);
+
+        viewerPage.checkCloseButtonIsDisplayed();
+        viewerPage.checkFileNameIsDisplayed(unsupportedFile.name);
+        viewerPage.checkFileThumbnailIsDisplayed();
+        viewerPage.checkDownloadButtonIsDisplayed();
+        viewerPage.checkInfoButtonIsDisplayed();
+
+        viewerPage.checkZoomInButtonIsNotDisplayed();
+
+        viewerPage.clickCloseButton();
+    });
+
+    it('[C260056] Should display video and viewer toolbar when opening a media file', () => {
+        viewerPage.viewFile(mp4File.name);
+
+        viewerPage.checkMediaPlayerContainerIsDisplayed();
+        viewerPage.checkCloseButtonIsDisplayed();
+        viewerPage.checkFileThumbnailIsDisplayed();
+        viewerPage.checkFileNameIsDisplayed(mp4File.name);
+        viewerPage.checkDownloadButtonIsDisplayed();
+        viewerPage.checkInfoButtonIsDisplayed();
+        viewerPage.checkFullScreenButtonIsNotDisplayed();
+
+        viewerPage.checkZoomInButtonIsNotDisplayed();
+
+        viewerPage.clickCloseButton();
+    });
+
+    it('[C261123] Should be able to preview all pages and navigate to a page when using thumbnails', () => {
+        viewerPage.viewFile(pdfFile.name);
+
+        browser.driver.sleep(3000); // wait open file
+
+        viewerPage.checkFileContent('1', pdfFile.firstPageText);
+        viewerPage.checkThumbnailsBtnIsDisplayed();
+        viewerPage.clickThumbnailsBtn();
+
+        viewerPage.checkThumbnailsContentIsDisplayed();
+        viewerPage.checkThumbnailsCloseIsDisplayed();
+        viewerPage.checkAllThumbnailsDisplayed(pdfFile.lastPageNumber);
+
+        viewerPage.clickSecondThumbnail();
+        viewerPage.checkFileContent('2', pdfFile.secondPageText);
+        viewerPage.checkCurrentThumbnailIsSelected();
+
+        viewerPage.checkPreviousPageButtonIsDisplayed();
+        viewerPage.clickPreviousPageButton();
+        viewerPage.checkFileContent('1', pdfFile.firstPageText);
+        viewerPage.checkCurrentThumbnailIsSelected();
+
+        viewerPage.clickThumbnailsBtn();
+        viewerPage.checkThumbnailsContentIsNotDisplayed();
+        viewerPage.clickThumbnailsBtn();
+        viewerPage.checkThumbnailsCloseIsDisplayed();
+        viewerPage.clickThumbnailsClose();
+    });
+
+    it('[C268105] Should display current thumbnail when getting to the page following the last visible thumbnail', () => {
+        viewerPage.checkThumbnailsBtnIsDisplayed();
+        viewerPage.clickThumbnailsBtn();
+        viewerPage.clickLastThumbnailDisplayed();
+        viewerPage.checkCurrentThumbnailIsSelected();
+
+        viewerPage.checkNextPageButtonIsDisplayed();
+        viewerPage.clickNextPageButton();
+        viewerPage.checkCurrentThumbnailIsSelected();
+
+        viewerPage.clickCloseButton();
+    });
+
+    it('[C269109] Should not be able to open thumbnail pane before the pdf is loaded', () => {
+        viewerPage.viewFile(pdfFile.name);
+
+        viewerPage.checkThumbnailsBtnIsDisabled();
+
+        viewerPage.clickCloseButton();
+    });
+
+    it('[C268901] Should need a password when opening a protected file', () => {
+        viewerPage.viewFile(protectedFile.name);
+
+        browser.driver.sleep(3000); // wait open file
+
+        viewerPage.checkPasswordDialogIsDisplayed();
+        viewerPage.checkPasswordSubmitDisabledIsDisplayed();
+
+        viewerPage.enterPassword('random password');
+        viewerPage.clickPasswordSubmit();
+        viewerPage.checkPasswordErrorIsDisplayed();
+        viewerPage.checkPasswordInputIsDisplayed();
+
+        viewerPage.enterPassword(protectedFile.password);
+        viewerPage.clickPasswordSubmit();
+        viewerPage.checkFileContent('1', protectedFile.firstPageText);
+    });
+});
diff --git a/e2e/core/z-finish.e2e.ts b/e2e/core/z-finish.e2e.ts
new file mode 100644
index 0000000000..b74593ad97
--- /dev/null
+++ b/e2e/core/z-finish.e2e.ts
@@ -0,0 +1,79 @@
+/*!
+ * @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 AlfrescoApi = require('alfresco-js-api-node');
+import TestConfig = require('../test.config');
+
+import fs = require('fs');
+import path = require('path');
+
+let buildNumber = process.env.TRAVIS_BUILD_NUMBER;
+let saveScreenshot = process.env.SAVE_SCREENSHOT;
+
+describe('Save screenshot at the end', () => {
+
+    beforeAll(async (done) => {
+
+        if (saveScreenshot === 'true') {
+            if (!buildNumber) {
+                buildNumber = Date.now();
+            }
+
+            let alfrescoJsApi = new AlfrescoApi({
+                provider: 'ECM',
+                hostEcm: TestConfig.adf.url
+            });
+
+            let files = fs.readdirSync(path.join(__dirname, '../../e2e-output/screenshots'));
+
+            if (files && files.length > 0) {
+                alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+                let folder = await alfrescoJsApi.nodes.addNode('-my-', {
+                    'name': 'core',
+                    'relativePath': 'Build-screenshot/Screenshot-e2e-' + buildNumber,
+                    'nodeType': 'cm:folder'
+                }, {}, {
+                    'overwrite': true
+                });
+
+                for (const fileName of files) {
+
+                    let pathFile = path.join(__dirname, '../../e2e-output/screenshots', fileName);
+                    let file: any = fs.createReadStream(pathFile);
+
+                    await  alfrescoJsApi.upload.uploadFile(
+                        file,
+                        '',
+                        folder.entry.id,
+                        null,
+                        {
+                            'name': file.name,
+                            'nodeType': 'cm:content'
+                        }
+                    );
+                }
+            }
+        }
+
+        done();
+    });
+
+    it('screenshot need it', () => {
+        expect(true).toEqual(true);
+    });
+});
diff --git a/e2e/insights/analytics-component.e2e.ts b/e2e/insights/analytics-component.e2e.ts
new file mode 100644
index 0000000000..4aec6dcf3c
--- /dev/null
+++ b/e2e/insights/analytics-component.e2e.ts
@@ -0,0 +1,74 @@
+/*!
+ * @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 LoginPage = require('../pages/adf/loginPage');
+import NavigationBarPage = require('../pages/adf/navigationBarPage');
+import AnalyticsPage = require('../pages/adf/process_services/analyticsPage');
+import ProcessServicesPage = require('../pages/adf/process_services/processServicesPage');
+import AppNavigationBarPage = require('../pages/adf/process_services/appNavigationBarPage');
+import TestConfig = require('../test.config');
+import Tenant = require('../models/APS/Tenant');
+import User = require('../models/APS/User');
+
+import AlfrescoApi = require('alfresco-js-api-node');
+
+describe('Analytics Smoke Test', () => {
+
+    let loginPage = new LoginPage();
+    let navigationBarPage = new NavigationBarPage();
+    let appNavigationBarPage = new AppNavigationBarPage();
+    let analyticsPage = new AnalyticsPage();
+    let processServicesPage = new ProcessServicesPage();
+    let tenantId;
+    let reportTitle = 'New Title';
+
+    beforeAll(async (done) => {
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        let newTenant = await this.alfrescoJsApi.activiti.adminTenantsApi.createTenant(new Tenant());
+
+        tenantId = newTenant.id;
+        let procUserModel = new User({ tenantId: tenantId });
+
+        await this.alfrescoJsApi.activiti.adminUsersApi.createNewUser(procUserModel);
+
+        loginPage.loginToProcessServicesUsingUserModel(procUserModel);
+
+        done();
+    });
+
+    afterAll(async (done) => {
+        await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId);
+        done();
+    });
+
+    it('Change name from Process Definition Heat Map', () => {
+        navigationBarPage.clickProcessServicesButton();
+        processServicesPage.checkApsContainer();
+        processServicesPage.goToApp('Task App');
+        appNavigationBarPage.clickReportsButton();
+        analyticsPage.checkNoReportMessage();
+        analyticsPage.getReport('Process definition heat map');
+        analyticsPage.changeReportTitle(reportTitle);
+        expect(analyticsPage.getReportTitle()).toEqual(reportTitle);
+    });
+});
diff --git a/e2e/insights/z-finish.e2e.ts b/e2e/insights/z-finish.e2e.ts
new file mode 100644
index 0000000000..f9eec8ea0d
--- /dev/null
+++ b/e2e/insights/z-finish.e2e.ts
@@ -0,0 +1,79 @@
+/*!
+ * @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 AlfrescoApi = require('alfresco-js-api-node');
+import TestConfig = require('../test.config');
+
+import fs = require('fs');
+import path = require('path');
+
+let buildNumber = process.env.TRAVIS_BUILD_NUMBER;
+let saveScreenshot = process.env.SAVE_SCREENSHOT;
+
+describe('Save screenshot at the end', () => {
+
+    beforeAll(async (done) => {
+
+        if (saveScreenshot === 'true') {
+            if (!buildNumber) {
+                buildNumber = Date.now();
+            }
+
+            let alfrescoJsApi = new AlfrescoApi({
+                provider: 'ECM',
+                hostEcm: TestConfig.adf.url
+            });
+
+            let files = fs.readdirSync(path.join(__dirname, '../../e2e-output/screenshots'));
+
+            if (files && files.length > 0) {
+                alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+                let folder = await alfrescoJsApi.nodes.addNode('-my-', {
+                    'name': 'insights',
+                    'relativePath': 'Build-screenshot/Screenshot-e2e-' + buildNumber,
+                    'nodeType': 'cm:folder'
+                }, {}, {
+                    'overwrite': true
+                });
+
+                for (const fileName of files) {
+
+                    let pathFile = path.join(__dirname, '../../e2e-output/screenshots', fileName);
+                    let file: any = fs.createReadStream(pathFile);
+
+                    await  alfrescoJsApi.upload.uploadFile(
+                        file,
+                        '',
+                        folder.entry.id,
+                        null,
+                        {
+                            'name': file.name,
+                            'nodeType': 'cm:content'
+                        }
+                    );
+                }
+            }
+        }
+
+        done();
+    });
+
+    it('screenshot need it', () => {
+        expect(true).toEqual(true);
+    });
+});
diff --git a/e2e/models/ACS/acsUserModel.js b/e2e/models/ACS/acsUserModel.js
new file mode 100644
index 0000000000..dc2a378368
--- /dev/null
+++ b/e2e/models/ACS/acsUserModel.js
@@ -0,0 +1,56 @@
+/*!
+ * @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 AcsUserModel = function (details) {
+
+    this.firstName = Util.generateRandomString();
+    this.lastName = Util.generateRandomString();
+    this.password = Util.generateRandomString();
+    this.email = Util.generateRandomString();
+    this.id = Util.generateRandomString();
+    this.jobTitle = "N/A";
+
+    this.getFirstName = function () {
+        return this.firstName;
+    };
+
+    this.getLastName = function () {
+        return this.lastName;
+    };
+
+    this.getPassword = function () {
+        return this.password;
+    };
+
+    this.getEmail = function () {
+        return this.email;
+    };
+
+    this.getId = function () {
+        return this.id;
+    };
+
+    this.getJobTitle = function () {
+        return this.jobTitle;
+    };
+
+    Object.assign(this, details);
+
+};
+module.exports = AcsUserModel;
diff --git a/e2e/models/ACS/contentModel.js b/e2e/models/ACS/contentModel.js
new file mode 100644
index 0000000000..db5bf894d9
--- /dev/null
+++ b/e2e/models/ACS/contentModel.js
@@ -0,0 +1,49 @@
+/*!
+ * @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 ContentModel = function (details) {
+
+    this.mimeType = '';
+    this.mimeTypeName = '';
+    this.sizeInBytes = '';
+    this.encoding = '';
+
+    this.getMimeType = function () {
+        return this.mimeType;
+    };
+
+    this.getMimeTypeName = function () {
+        return this.mimeTypeName;
+    };
+
+    this.getSizeInBytes = function () {
+        if (this.sizeInBytes >= 1024) {
+            return (this.sizeInBytes / 1024).toFixed(2) + ' KB';
+        }
+        else {
+            return this.sizeInBytes;
+        }
+    };
+
+    this.getEncoding = function () {
+        return this.encoding;
+    };
+
+    Object.assign(this, details);
+
+};
+module.exports = ContentModel;
diff --git a/e2e/models/ACS/contentProperties.js b/e2e/models/ACS/contentProperties.js
new file mode 100644
index 0000000000..d7349324a0
--- /dev/null
+++ b/e2e/models/ACS/contentProperties.js
@@ -0,0 +1,38 @@
+/*!
+ * @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 ContentPropertiesModel = function (details) {
+    this['cm:author'] = '';
+    this['cm:description'] = '';
+    this['cm:title'] = '';
+
+    this.getAuthor = function () {
+        return this['cm:author'];
+    };
+
+    this.getDescription = function () {
+        return this['cm:description'];
+    };
+
+    this.getTitle = function () {
+        return this['cm:title'];
+    };
+
+    Object.assign(this, details);
+
+};
+module.exports = ContentPropertiesModel;
diff --git a/e2e/models/ACS/createdByModel.js b/e2e/models/ACS/createdByModel.js
new file mode 100644
index 0000000000..ba39dd069e
--- /dev/null
+++ b/e2e/models/ACS/createdByModel.js
@@ -0,0 +1,36 @@
+/*!
+ * @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 AcsUserModel = function (details) {
+
+    this.displayName = Util.generateRandomString();
+    this.id = Util.generateRandomString();
+
+    this.getId = function () {
+        return this.id;
+    };
+
+    this.getDisplayName = function () {
+        return this.displayName;
+    };
+
+    Object.assign(this, details);
+
+};
+module.exports = AcsUserModel;
diff --git a/e2e/models/ACS/fileModel.js b/e2e/models/ACS/fileModel.js
new file mode 100644
index 0000000000..9f637dbbde
--- /dev/null
+++ b/e2e/models/ACS/fileModel.js
@@ -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.
+ */
+
+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/filesModel.js b/e2e/models/ACS/filesModel.js
new file mode 100644
index 0000000000..c2d02d32b1
--- /dev/null
+++ b/e2e/models/ACS/filesModel.js
@@ -0,0 +1,34 @@
+/*!
+ * @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.js
new file mode 100644
index 0000000000..5082c46fc1
--- /dev/null
+++ b/e2e/models/ACS/folderModel.js
@@ -0,0 +1,52 @@
+/*!
+ * @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 FolderModel = function (details) {
+
+    this.id = Util.generateRandomString();
+    this.name = Util.generateRandomString();
+    this.shortName = this.name;
+    this.tooltip = this.name;
+    this.location = "";
+
+    this.getName = function () {
+        return this.name;
+    };
+
+    this.getShortName = function () {
+        return this.shortName;
+    };
+
+    this.getTooltip = function () {
+        return this.tooltip;
+    };
+
+    this.getId = function () {
+        return this.id;
+    };
+
+    this.getLocation = function () {
+        return this.location;
+    };
+
+    Object.assign(this, details);
+
+};
+module.exports = FolderModel;
+
diff --git a/e2e/models/APS/AppDefinition.js b/e2e/models/APS/AppDefinition.js
new file mode 100644
index 0000000000..25980fcfda
--- /dev/null
+++ b/e2e/models/APS/AppDefinition.js
@@ -0,0 +1,39 @@
+/*!
+ * @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.
+ */
+
+/**
+ * App definition representation JSON Object
+ *
+ * @param details - JSON object used to overwrite the default values
+ * @constructor
+ */
+
+var AppDefinition = function (details) {
+    this.defaultAppId = "1";
+    this.deploymentId = "1";
+    this.description = "App deployment";
+    this.icon = "default icon";
+    this.id = 0;
+    this.modelId = 0;
+    this.name = "App name";
+    this.tenantId = 0;
+    this.theme = "default theme";
+
+    Object.assign(this, details);
+};
+
+module.exports = AppDefinition;
\ No newline at end of file
diff --git a/e2e/models/APS/AppPublish.js b/e2e/models/APS/AppPublish.js
new file mode 100644
index 0000000000..546accb1de
--- /dev/null
+++ b/e2e/models/APS/AppPublish.js
@@ -0,0 +1,31 @@
+/*!
+ * @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.
+ */
+
+/**
+ * App definition publish representation JSON Object
+ *
+ * @param details - JSON object used to overwrite the default values
+ * @constructor
+ */
+var AppPublish = function (details) {
+    this.comment = '';
+    this.force = true;
+
+    Object.assign(this, details);
+};
+
+module.exports = AppPublish;
\ No newline at end of file
diff --git a/e2e/models/APS/FormDefinitionFieldModel.js b/e2e/models/APS/FormDefinitionFieldModel.js
new file mode 100644
index 0000000000..8fc5ee7a2d
--- /dev/null
+++ b/e2e/models/APS/FormDefinitionFieldModel.js
@@ -0,0 +1,58 @@
+/*!
+ * @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 FormDefinitionFieldModel = function (details) {
+
+    this.fieldType;
+    this.id;
+    this.name;
+    this.value;
+    this.type;
+    this.required;
+    this.readOnly;
+    this.overrideId;
+    this.colspan;
+    this.placeholder;
+    this.minLength;
+    this.maxLength;
+    this.minValue;
+    this.maxValue;
+    this.regexPattern;
+    this.optionType;
+    this.hasEmptyValue;
+    this.options;
+    this.restUrl;
+    this.restResponsePath;
+    this.restIdProperty;
+    this.setRestLabelProperty;
+    this.tab;
+    this.className;
+    this.dateDisplayFormat;
+    this.layout = {};
+    this.sizeX;
+    this.sizeY;
+    this.row;
+    this.col;
+    this.columnDefinitions;
+    this.visibilityCondition;
+    this.numberOfColumns;
+    this.fields = {};
+
+    Object.assign(this, details);
+};
+module.exports = FormDefinitionFieldModel;
+
diff --git a/e2e/models/APS/FormDefinitionModel.js b/e2e/models/APS/FormDefinitionModel.js
new file mode 100644
index 0000000000..1a48e918a3
--- /dev/null
+++ b/e2e/models/APS/FormDefinitionModel.js
@@ -0,0 +1,61 @@
+/*!
+ * @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 FormDefinitionFieldModel = require('./FormDefinitionFieldModel');
+
+var FormDefinitionModel = function (fields) {
+
+    var fields = null;
+    var widgets = null;
+
+    this.setFields = function (arr) {
+        fields = arr.map(function(item) {
+            return new FormDefinitionFieldModel(item);
+        })
+    };
+
+    this.setAllWidgets = function (arr) {
+        widgets = arr.reduce(function(acc, item) {
+            if(item.type === 'container') {
+                var children = Object.keys(item.fields).map(function(key) {
+                    return item.fields[key][0];
+                });
+
+                return acc.concat(children);
+            }
+            return acc.concat(item);
+        }, []);
+    };
+
+    this.getWidgets = function () {
+        return widgets;
+    };
+
+    this.getWidgetBy = function (key, value) {
+        return widgets.find(function(widget) {
+            return widget[key]===value;
+        })
+    };
+
+    this.findFieldBy = function(key, value) {
+        return fields.find(function(field) {
+            return field[key]===value;
+        })
+    };
+}
+
+module.exports = FormDefinitionModel;
diff --git a/e2e/models/APS/FormModel.js b/e2e/models/APS/FormModel.js
new file mode 100644
index 0000000000..dc38632af2
--- /dev/null
+++ b/e2e/models/APS/FormModel.js
@@ -0,0 +1,58 @@
+/*!
+ * @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 FormModel = function (details) {
+
+    this.id;
+    this.name;
+    this.description;
+    this.modelId;
+    this.appDefinitionId;
+    this.appDeploymentId;
+    this.tenantId;
+
+    this.getName = function () {
+        return this.name;
+    };
+
+    this.getId = function () {
+        return this.id;
+    };
+
+    this.getDescription = function () {
+        return this.description;
+    };
+
+    this.getModelId = function () {
+        return this.modelId;
+    };
+
+    this.getAppDefinitionId = function () {
+        return this.appDefinitionId;
+    };
+
+    this.getAppDeploymentId = function () {
+        return this.appDeploymentId;
+    };
+
+    this.getTenantId = function () {
+        return this.tenantId;
+    };
+
+    Object.assign(this, details);
+};
+module.exports = FormModel;
diff --git a/e2e/models/APS/Group.js b/e2e/models/APS/Group.js
new file mode 100644
index 0000000000..77826d5990
--- /dev/null
+++ b/e2e/models/APS/Group.js
@@ -0,0 +1,37 @@
+/*!
+ * @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/ProcessCreatedByModel.js b/e2e/models/APS/ProcessCreatedByModel.js
new file mode 100644
index 0000000000..61080af75f
--- /dev/null
+++ b/e2e/models/APS/ProcessCreatedByModel.js
@@ -0,0 +1,49 @@
+/*!
+ * @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 ProcessCreatedByModel = function (details) {
+
+    this.id;
+    this.firstName;
+    this.lastName;
+    this.email;
+
+    this.getFirstName = function () {
+        return this.firstName;
+    };
+
+    this.getId = function () {
+        return this.id;
+    };
+
+    this.getLastName = function () {
+        return this.lastName;
+    };
+
+    this.getEmail = function () {
+        return this.email;
+    };
+
+    this.getEntireName = function() {
+        return this.firstName + " " + this.getLastName();
+    };
+
+    Object.assign(this, details);
+
+};
+
+module.exports = ProcessCreatedByModel;
diff --git a/e2e/models/APS/ProcessInstance.js b/e2e/models/APS/ProcessInstance.js
new file mode 100644
index 0000000000..6446cd7d37
--- /dev/null
+++ b/e2e/models/APS/ProcessInstance.js
@@ -0,0 +1,32 @@
+/*!
+ * @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.
+ */
+
+/**
+ * Process Instance representation JSON Object
+ *
+ * @param details - JSON object used to overwrite the default values
+ * @constructor
+ */
+
+var ProcessInstance = function (details) {
+    this.processDefinitionId = 1234;
+    this.name = "Process started from REST API";
+
+    Object.assign(this, details);
+};
+
+module.exports = ProcessInstance;
diff --git a/e2e/models/APS/ProcessModel.js b/e2e/models/APS/ProcessModel.js
new file mode 100644
index 0000000000..0d88eee1c3
--- /dev/null
+++ b/e2e/models/APS/ProcessModel.js
@@ -0,0 +1,83 @@
+/*!
+ * @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 ProcessCreatedByModel = require('./ProcessCreatedByModel');
+
+var ProcessModel = function (details) {
+
+    this.id;
+    this.name;
+    this.version;
+    this.modelType;
+    this.description;
+    this.createdByFullName;
+    this.createdBy;
+    this.lastUpdatedByFullName;
+    this.lastUpdatedBy;
+    this.lastUpdated;
+    this.startedBy = {};
+
+    this.getName = function () {
+        return this.name;
+    };
+
+    this.getId = function () {
+        return this.id;
+    };
+
+    this.getVersion = function () {
+        return this.version;
+    };
+
+    this.getModelType = function () {
+        return this.modelType;
+    };
+
+    this.getDescription = function () {
+        return this.description;
+    };
+
+    this.getCreatedByFullName = function () {
+        return this.createdByFullName;
+    };
+
+    this.getCreatedBy = function () {
+        return this.createdBy;
+    };
+
+    this.getLastUpdatedByFullName = function () {
+        return this.lastUpdatedByFullName;
+    };
+
+    this.getLastUpdatedBy = function () {
+        return this.lastUpdatedBy;
+    };
+
+    this.getLastUpdated = function () {
+        return this.lastUpdated;
+    };
+
+    this.getStartedBy = function () {
+        return this.startedBy;
+    };
+
+    Object.assign(this, details);
+    Object.assign(this.startedBy, new ProcessCreatedByModel(details.startedBy));
+
+
+};
+module.exports = ProcessModel;
diff --git a/e2e/models/APS/StandaloneTask.js b/e2e/models/APS/StandaloneTask.js
new file mode 100644
index 0000000000..f23cdb4c8a
--- /dev/null
+++ b/e2e/models/APS/StandaloneTask.js
@@ -0,0 +1,33 @@
+/*!
+ * @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 Json Object for standalone task
+ *
+ * @param details - JSON object used to overwrite the default values
+ * @constructor
+ */
+
+var StandaloneTask = function (details) {
+
+    this.name = Util.generateRandomString();
+
+    Object.assign(this, details);
+};
+module.exports = StandaloneTask;
diff --git a/e2e/models/APS/Task.js b/e2e/models/APS/Task.js
new file mode 100644
index 0000000000..416de6e008
--- /dev/null
+++ b/e2e/models/APS/Task.js
@@ -0,0 +1,32 @@
+/*!
+ * @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.
+ */
+
+/**
+ * Create and manage task JSON Object
+ *
+ * @param details - JSON object used to overwrite the default values
+ * @constructor
+ */
+
+var Task = function (details) {
+
+    this.processInstanceId;
+    this.sort;
+
+    Object.assign(this, details);
+};
+module.exports = Task;
diff --git a/e2e/models/APS/TaskAssigneeModel.js b/e2e/models/APS/TaskAssigneeModel.js
new file mode 100644
index 0000000000..1ca3f68f0c
--- /dev/null
+++ b/e2e/models/APS/TaskAssigneeModel.js
@@ -0,0 +1,49 @@
+/*!
+ * @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 TaskAssigneeModel = function (details) {
+
+    this.id;
+    this.firstName;
+    this.lastName;
+    this.email;
+
+    this.getFirstName = function () {
+        return this.firstName;
+    };
+
+    this.getId = function () {
+        return this.id;
+    };
+
+    this.getLastName = function () {
+        return this.lastName;
+    };
+
+    this.getEmail = function () {
+        return this.email;
+    };
+
+    this.getEntireName = function() {
+        return this.firstName + " " + this.getLastName();
+    };
+
+    Object.assign(this, details);
+
+};
+
+module.exports = TaskAssigneeModel;
diff --git a/e2e/models/APS/TaskModel.js b/e2e/models/APS/TaskModel.js
new file mode 100644
index 0000000000..8c9a763f18
--- /dev/null
+++ b/e2e/models/APS/TaskModel.js
@@ -0,0 +1,76 @@
+/*!
+ * @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 TaskAssigneeModel = require('./TaskAssigneeModel');
+
+var TaskModel = function (details) {
+
+    this.id;
+    this.name;
+    this.description;
+    this.category;
+    this.created;
+    this.dueDate;
+    this.priority;
+    this.parentTaskName;
+    this.formKey;
+    this.assignee = {};
+
+    this.getName = function () {
+        return this.name;
+    };
+
+    this.getId = function () {
+        return this.id;
+    };
+
+    this.getDescription = function () {
+        return this.description;
+    };
+
+    this.getCategory = function () {
+        return this.category;
+    };
+
+    this.getCreated = function () {
+        return this.created;
+    };
+
+    this.getDueDate = function () {
+        return this.dueDate;
+    };
+
+    this.getPriority = function () {
+        return this.priority;
+    };
+
+    this.getParentTaskName = function () {
+        return this.parentTaskName;
+    };
+
+    this.getFormKey = function () {
+        return this.formKey;
+    };
+
+    this.getAssignee = function () {
+        return this.assignee;
+    };
+
+    Object.assign(this, details);
+    Object.assign(this.assignee, new TaskAssigneeModel(details.assignee));
+};
+module.exports = TaskModel;
diff --git a/e2e/models/APS/Tenant.js b/e2e/models/APS/Tenant.js
new file mode 100644
index 0000000000..80e1f7feaf
--- /dev/null
+++ b/e2e/models/APS/Tenant.js
@@ -0,0 +1,36 @@
+/*!
+ * @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 tenant JSON Object
+ *
+ * @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();
+
+    Object.assign(this, details);
+};
+
+module.exports = Tenant;
diff --git a/e2e/models/APS/User.js b/e2e/models/APS/User.js
new file mode 100644
index 0000000000..7c7c5e4163
--- /dev/null
+++ b/e2e/models/APS/User.js
@@ -0,0 +1,39 @@
+/*!
+ * @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 User JSON Object
+ *
+ * @param details - JSON object used to overwrite the default values
+ * @constructor
+ */
+
+var User = function (details) {
+
+    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;
diff --git a/e2e/pages/adf/cardViewPageComponent.js b/e2e/pages/adf/cardViewPageComponent.js
new file mode 100644
index 0000000000..96d3b963ef
--- /dev/null
+++ b/e2e/pages/adf/cardViewPageComponent.js
@@ -0,0 +1,234 @@
+/*!
+ * @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('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('console'));
+    const deleteButton = element.all(by.className('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-toogle-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
new file mode 100644
index 0000000000..8532fde696
--- /dev/null
+++ b/e2e/pages/adf/commentsPage.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 = require('../../util/util');
+
+export class CommentsPage {
+
+    numberOfComments = element(by.id('comment-header'));
+    commentUserIcon = element.all(by.id('comment-user-icon'));
+    commentUserName = element.all(by.id('comment-user'));
+    commentMessage = element.all(by.id('comment-message'));
+    commentTime = element.all(by.id('comment-time'));
+    commentInput = element(by.id('comment-input'));
+    addCommentButton = element(by.css("[data-automation-id='comments-input-add']"));
+
+    getTotalNumberOfComments() {
+        Util.waitUntilElementIsVisible(this.numberOfComments);
+        return this.numberOfComments.getText();
+    }
+
+    checkUserIconIsDisplayed(position) {
+        Util.waitUntilElementIsVisible(this.commentUserIcon);
+        return this.commentUserIcon.get(position);
+    }
+
+    getUserName(position) {
+        Util.waitUntilElementIsVisible(this.commentUserName);
+        return this.commentUserName.get(position).getText();
+    }
+
+    getMessage(position) {
+        Util.waitUntilElementIsVisible(this.commentMessage);
+        return this.commentMessage.get(position).getText();
+    }
+
+    getTime(position) {
+        Util.waitUntilElementIsVisible(this.commentTime);
+        return this.commentTime.get(position).getText();
+    }
+
+    checkCommentInputIsNotDisplayed() {
+        Util.waitUntilElementIsNotVisible(this.commentInput);
+    }
+
+    addComment(comment) {
+        Util.waitUntilElementIsVisible(this.commentInput);
+        this.commentInput.sendKeys(comment);
+        return this.addCommentButton.click();
+    }
+}
diff --git a/e2e/pages/adf/configEditorPage.ts b/e2e/pages/adf/configEditorPage.ts
new file mode 100644
index 0000000000..8446081ad5
--- /dev/null
+++ b/e2e/pages/adf/configEditorPage.ts
@@ -0,0 +1,46 @@
+/*!
+ * @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';
+import Util = require('../../util/util');
+
+export class ConfigEditorPage {
+
+    enterMetadataConfiguration(text) {
+        let textField = element(by.css('#adf-metadata-editor div.overflow-guard > textarea'));
+        browser.driver.sleep(1000);
+        Util.waitUntilElementIsVisible(textField);
+        textField.sendKeys('');
+        textField.clear();
+        textField.sendKeys(text);
+        return this;
+    }
+
+    clickSaveMetadataButton() {
+        let saveButton = element(by.xpath('//*[@id="adf-metadata-save"]'));
+        Util.waitUntilElementIsVisible(saveButton);
+        Util.waitUntilElementIsClickable(saveButton);
+        return saveButton.click();
+    }
+
+    clickClearMetadataButton() {
+        let clearButton = element(by.xpath('//*[@id="adf-metadata-clear"]'));
+        Util.waitUntilElementIsVisible(clearButton);
+        Util.waitUntilElementIsClickable(clearButton);
+        return clearButton.click();
+    }
+}
diff --git a/e2e/pages/adf/contentServicesPage.js b/e2e/pages/adf/contentServicesPage.js
new file mode 100644
index 0000000000..b1835516d8
--- /dev/null
+++ b/e2e/pages/adf/contentServicesPage.js
@@ -0,0 +1,606 @@
+/*!
+ * @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 CreateFolderDialog = require('./dialog/createFolderDialog');
+var path = require('path');
+var TestConfig = require('../../test.config');
+var NavigationBarPage = require('./navigationBarPage');
+var remote = require('selenium-webdriver/remote');
+
+var ContentServicesPage = function () {
+
+    var contentList = new ContentList();
+    var createFolderDialog = new CreateFolderDialog();
+    var uploadBorder = element(by.css("div[id='document-list-container']"));
+    var tableBody = element.all(by.css("adf-document-list div[class='adf-datatable-body']")).first();
+    var contentServices = element(by.css("a[data-automation-id='Content Services']"));
+    var currentFolder = element(by.css("div[class*='adf-breadcrumb-item active'] div"));
+    var createFolderButton = element(by.cssContainingText("mat-icon", "create_new_folder"));
+    var activeBreadcrumb = element(by.css("div[class*='active']"));
+    var folderID = element.all(by.css("div[class*='settings'] p")).first();
+    var tooltip = by.css("div[class*='--text full-width'] span");
+    var uploadFileButton = element(by.css("input[data-automation-id='upload-single-file']"));
+    var uploadMultipleFileButton = element(by.css("input[data-automation-id='upload-multiple-files']"));
+    var uploadFolderButton = element(by.css("input[data-automation-id='uploadFolder']"));
+    var errorSnackBar = element(by.css("simple-snack-bar[class*='mat-simple-snackbar']"));
+    var contentServicesURL = TestConfig.adf.url + TestConfig.adf.port + "/files";
+    var loadMoreButton = element(by.css("button[data-automation-id='adf-infinite-pagination-button']"));
+    var emptyPagination = element(by.css("adf-pagination[class*='adf-pagination__empty']"));
+    var dragAndDrop = element(by.css("adf-upload-drag-area div"));
+    var nameHeader = element(by.css("div[data-automation-id='auto_id_name'] > span"));
+    var sizeHeader = element(by.css("div[data-automation-id='auto_id_content.sizeInBytes'] > span"));
+    var createdByHeader = element(by.css("div[data-automation-id='auto_id_createdByUser.displayName'] > span"));
+    var createdHeader = element(by.css("div[data-automation-id='auto_id_createdAt'] > span"));
+    var recentFiles = element(by.css(".adf-container-recent"));
+    var recentFilesExpanded = element(by.css(".adf-container-recent mat-expansion-panel-header.mat-expanded"));
+    var recentFilesClosed = element(by.css(".adf-container-recent mat-expansion-panel-header"));
+    var recentFileIcon = element(by.css(".adf-container-recent mat-expansion-panel-header mat-icon"));
+    var documentListSpinner = element(by.css("mat-progress-spinner"));
+    var emptyFolder = element(by.css(".adf-empty-folder-this-space-is-empty"));
+    var emptyFolderImage = element(by.css(".adf-empty-folder-image"));
+    var emptyRecent = element(by.css(".adf-container-recent .empty-list__title"));
+    var gridViewButton = element(by.css("button[data-automation-id='document-list-grid-view']"));
+    var cardViewContainer = element(by.css("div.document-list-container div.adf-data-table-card"));
+    var copyButton = element(by.css('button[data-automation-id="content-node-selector-actions-choose"]'));
+    var searchInputElement = element(by.css('input[data-automation-id="content-node-selector-search-input"'));
+
+    this.checkRecentFileToBeShowed = function () {
+        Util.waitUntilElementIsVisible(recentFiles);
+    };
+
+    this.expandRecentFiles = function () {
+        this.checkRecentFileToBeShowed();
+        this.checkRecentFileToBeClosed();
+        recentFilesClosed.click();
+        this.checkRecentFileToBeOpened()
+    };
+
+    this.closeRecentFiles = function() {
+        this.checkRecentFileToBeShowed();
+        this.checkRecentFileToBeOpened()
+        recentFilesExpanded.click();
+        this.checkRecentFileToBeClosed();
+    };
+
+    this.checkRecentFileToBeClosed = function () {
+        Util.waitUntilElementIsVisible(recentFilesClosed);
+    };
+
+    this.checkRecentFileToBeOpened = function () {
+        Util.waitUntilElementIsVisible(recentFilesExpanded);
+    };
+
+    this.getRecentFileIcon = async function () {
+        await Util.waitUntilElementIsVisible(recentFileIcon);
+        return recentFileIcon.getText();
+    };
+
+    /**
+     * Check Document List is displayed
+     * @method checkAcsContainer
+     */
+    this.checkAcsContainer = function () {
+        Util.waitUntilElementIsVisible(uploadBorder);
+        return this;
+    };
+
+    this.waitForTableBody = function () {
+        Util.waitUntilElementIsVisible(tableBody);
+    };
+
+    /**
+     * Go to Document List Page
+     * @method goToDocumentList
+     * */
+    this.goToDocumentList = function () {
+        this.clickOnContentServices();
+        this.checkAcsContainer();
+    };
+
+    this.clickOnContentServices = function () {
+        Util.waitUntilElementIsVisible(contentServices);
+        Util.waitUntilElementIsClickable(contentServices);
+        contentServices.click();
+    };
+
+    this.navigateToDocumentList = function () {
+        var navigationBarPage = new NavigationBarPage();
+        navigationBarPage.clickContentServicesButton();
+        this.checkAcsContainer();
+    };
+
+    this.numberOfResultsDisplayed = function () {
+        return contentList.getAllDisplayedRows();
+    };
+
+    this.currentFolderName = function () {
+        var deferred = protractor.promise.defer();
+        Util.waitUntilElementIsVisible(currentFolder);
+        currentFolder.getText().then(function (result) {
+            deferred.fulfill(result);
+        });
+        return deferred.promise;
+    };
+
+    this.getTooltip = function (content) {
+        return contentList.getRowByRowName(content).element(tooltip).getAttribute('title');
+    };
+
+    this.getBreadcrumbTooltip = function (content) {
+        return element(by.css("nav[data-automation-id='breadcrumb'] div[title='" + content + "']")).getAttribute('title');
+    };
+
+    this.getAllRowsNameColumn = function () {
+        return contentList.getAllRowsNameColumn();
+    };
+    /**
+     *  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);
+    };
+
+    /**
+     *  Sort the list by author column.
+     *
+     * @param sortOrder : 'true' to sort the list ascendant and 'false' for descendant
+     */
+    this.sortByAuthor = function (sortOrder) {
+        contentList.sortByAuthor(sortOrder);
+    };
+
+    /**
+     *  Sort the list by created column.
+     *
+     * @param sortOrder : 'true' to sort the list ascendant and 'false' for descendant
+     */
+    this.sortByCreated = function (sortOrder) {
+        return contentList.sortByCreated(sortOrder);
+    };
+
+    /**
+     *  Sort by name and check the list is sorted.
+     *
+     * @param sortOrder : 'true' if the list is expected to be sorted ascendant and 'false' for descendant
+     * @return result : 'true' if the list is sorted as expected and 'false' if it isn't
+     */
+    this.sortAndCheckListIsOrderedByName = function (sortOrder) {
+        this.sortByName(sortOrder);
+        var deferred = protractor.promise.defer();
+        contentList.checkListIsOrderedByNameColumn(sortOrder).then(function (result) {
+            deferred.fulfill(result);
+        });
+        return deferred.promise;
+    };
+
+    this.checkListIsSortedByNameColumn = async function(sortOrder) {
+        await contentList.checkListIsOrderedByNameColumn(sortOrder);
+    };
+
+    this.checkListIsSortedByCreatedColumn = async function(sortOrder) {
+        await contentList.checkListIsOrderedByCreatedColumn(sortOrder);
+    };
+
+    this.checkListIsSortedByAuthorColumn = async function(sortOrder) {
+        await contentList.checkListIsOrderedByAuthorColumn(sortOrder);
+    };
+
+    this.checkListIsSortedBySizeColumn = async function(sortOrder) {
+        await contentList.checkListIsOrderedBySizeColumn(sortOrder);
+    };
+
+    /**
+     *  Sort by author and check the list is sorted.
+     *
+     * @param sortOrder : 'true' if the list is expected to be sorted ascendant and 'false' for descendant
+     * @return result : 'true' if the list is sorted as expected and 'false' if it isn't
+     */
+    this.sortAndCheckListIsOrderedByAuthor = function (sortOrder) {
+        this.sortByAuthor(sortOrder);
+        var deferred = protractor.promise.defer();
+        contentList.checkListIsOrderedByAuthorColumn(sortOrder).then(function (result) {
+            deferred.fulfill(result);
+        });
+        return deferred.promise;
+    };
+
+    /**
+     *  Sort by created and check the list is sorted.
+     *
+     * @param sortOrder : 'true' if the list is expected to be sorted ascendant and 'false' for descendant
+     * @return result : 'true' if the list is sorted as expected and 'false' if it isn't
+     */
+    this.sortAndCheckListIsOrderedByCreated = function (sortOrder) {
+        this.sortByCreated(sortOrder);
+        var deferred = protractor.promise.defer();
+        contentList.checkListIsOrderedByCreatedColumn(sortOrder).then(function (result) {
+            deferred.fulfill(result);
+        });
+        return deferred.promise;
+    };
+
+    this.navigateToFolder = function (folder) {
+        contentList.navigateToFolder(folder);
+        return this;
+    };
+
+    this.doubleClickRow = function (folder) {
+        contentList.doubleClickRow(folder);
+        return this;
+    };
+
+    this.doubleClickEntireRow = function (folder) {
+        contentList.doubleClickEntireRow(folder);
+        return this;
+    };
+
+    this.clickOnCreateNewFolder = function () {
+        Util.waitUntilElementIsVisible(createFolderButton);
+        createFolderButton.click();
+        return this;
+    };
+
+    this.createNewFolder = function (folder) {
+        this.clickOnCreateNewFolder();
+        createFolderDialog.addFolderName(folder);
+        createFolderDialog.clickOnCreateButton();
+        return this;
+    };
+
+    this.checkContentIsDisplayed = function (content) {
+        contentList.checkContentIsDisplayed(content);
+        return this;
+    };
+
+    this.checkContentsAreDisplayed = function (content) {
+        for (var i = 0; i < content.length; i++) {
+            this.checkContentIsDisplayed(content[i]);
+        }
+        return this;
+    };
+
+    this.checkContentIsNotDisplayed = function (content) {
+        contentList.checkContentIsNotDisplayed(content);
+        return this;
+    };
+
+    this.checkContentsAreNotDisplayed = function (content) {
+        for (var i = 0; i < content.length; i++) {
+            this.checkContentIsNotDisplayed(content[i]);
+        }
+        return this;
+    };
+
+    this.checkEmptyFolderMessageIsDisplayed = function () {
+        contentList.checkEmptyFolderMessageIsDisplayed();
+        return this;
+    };
+
+    this.checkElementIsDisplayed = function (elementName) {
+        let dataElement = element(by.css(`div[data-automation-id="${elementName}"]`));
+        Util.waitUntilElementIsVisible(dataElement);
+    };
+
+    this.navigateToFolderViaBreadcrumbs = function (folder) {
+        contentList.tableIsLoaded();
+        var breadcrumb = element(by.css("a[data-automation-id='breadcrumb_" + folder + "']"));
+        Util.waitUntilElementIsVisible(breadcrumb);
+        breadcrumb.click();
+        contentList.tableIsLoaded();
+        return this;
+    };
+
+    this.getActiveBreadcrumb = function () {
+        Util.waitUntilElementIsVisible(activeBreadcrumb);
+        return activeBreadcrumb.getAttribute("title");
+    };
+
+    this.getCurrentFolderID = function () {
+        Util.waitUntilElementIsVisible(folderID);
+        return folderID.getText();
+    };
+
+    this.checkIconColumn = function (file, extension) {
+        contentList.checkIconColumn(file, extension);
+        return this;
+    };
+
+    this.uploadFile = function (fileLocation) {
+        browser.setFileDetector(new remote.FileDetector());
+        this.checkUploadButton();
+        Util.waitUntilElementIsVisible(uploadFileButton);
+        uploadFileButton.sendKeys(path.resolve(path.join(TestConfig.main.rootPath, fileLocation)));
+        this.checkUploadButton();
+        return this;
+    };
+
+    this.uploadMultipleFile = function (files) {
+        browser.setFileDetector(new remote.FileDetector());
+        Util.waitUntilElementIsVisible(uploadMultipleFileButton);
+        var allFiles = path.resolve(path.join(TestConfig.main.rootPath, files[0]));
+        for (var i = 1; i < files.length; i++) {
+            allFiles = allFiles + "\n" + path.resolve(path.join(TestConfig.main.rootPath, files[i]));
+        }
+        uploadMultipleFileButton.sendKeys(allFiles);
+        Util.waitUntilElementIsVisible(uploadMultipleFileButton);
+        return this;
+    };
+
+    this.uploadFolder = function (folder) {
+        browser.setFileDetector(new remote.FileDetector());
+        Util.waitUntilElementIsVisible(uploadFolderButton);
+        uploadFolderButton.sendKeys(path.resolve(path.join(TestConfig.main.rootPath, folder)));
+        Util.waitUntilElementIsVisible(uploadFolderButton);
+        return this;
+    };
+
+    this.getSingleFileButtonTooltip = function () {
+        Util.waitUntilElementIsVisible(uploadFileButton);
+        return uploadFileButton.getAttribute("title");
+    };
+
+    this.getMultipleFileButtonTooltip = function () {
+        Util.waitUntilElementIsVisible(uploadMultipleFileButton);
+        return uploadMultipleFileButton.getAttribute("title");
+    };
+
+    this.getFolderButtonTooltip = function () {
+        Util.waitUntilElementIsVisible(uploadFolderButton);
+        return uploadFolderButton.getAttribute("title");
+    };
+
+    this.checkUploadButton = function () {
+        Util.waitUntilElementIsVisible(uploadFileButton);
+        Util.waitUntilElementIsClickable(uploadFileButton);
+        return this;
+    };
+
+    this.uploadButtonIsEnabled = function () {
+        return uploadFileButton.isEnabled();
+    };
+
+    this.deleteContent = function (content) {
+        contentList.deleteContent(content);
+        return this;
+    };
+
+    this.deleteContents = function (content) {
+        for (var i = 0; i < content.length; i++) {
+            this.deleteContent(content[i]);
+            this.checkContentIsNotDisplayed(content[i]);
+            browser.driver.sleep(1000);
+        }
+        return this;
+    };
+
+    this.getErrorMessage = function () {
+        Util.waitUntilElementIsVisible(errorSnackBar);
+        var deferred = protractor.promise.defer();
+        errorSnackBar.getText().then(function (text) {
+            /*tslint:disable-next-line*/
+            console.log(text);
+            deferred.fulfill(text);
+        });
+        return deferred.promise;
+    };
+
+    this.checkItemInDocList = function (fileName) {
+        Util.waitUntilElementIsVisible(element(by.css("div[data-automation-id='text_" + fileName + "']")));
+    };
+
+    this.enableInfiniteScrolling = function () {
+        var infiniteScrollButton = element(by.cssContainingText('.mat-slide-toggle-content', 'Enable Infinite Scrolling'));
+        Util.waitUntilElementIsVisible(infiniteScrollButton);
+        infiniteScrollButton.click();
+        return this;
+    };
+
+    this.enableCustomPermissionMessage = function () {
+        var customPermissionMessage = element(by.cssContainingText('.mat-slide-toggle-content', 'Enable custom permission message'));
+        Util.waitUntilElementIsVisible(customPermissionMessage);
+        customPermissionMessage.click();
+        return this;
+    };
+
+    this.enableMediumTimeFormat = function () {
+        var mediumTimeFormat = element(by.css('#enableMediumTimeFormat'));
+        Util.waitUntilElementIsVisible(mediumTimeFormat);
+        mediumTimeFormat.click();
+        return this;
+    };
+
+    this.enableThumbnails = function () {
+        var thumbnailSlide = element(by.css('#enableThumbnails'));
+        Util.waitUntilElementIsVisible(thumbnailSlide);
+        thumbnailSlide.click();
+        return this;
+    };
+
+    this.clickLoadMoreButton = function () {
+        Util.waitUntilElementIsVisible(loadMoreButton);
+        Util.waitUntilElementIsClickable(loadMoreButton);
+        loadMoreButton.click();
+        return this;
+    };
+
+    this.checkPaginationIsNotDisplayed = function () {
+        Util.waitUntilElementIsVisible(emptyPagination);
+    };
+
+    this.getDocumentListRowNumber = function() {
+        let documentList = element(by.css('adf-upload-drag-area adf-document-list'));
+        Util.waitUntilElementIsVisible(documentList);
+        let actualRows = $$('adf-upload-drag-area adf-document-list .adf-datatable-row').count();
+        return actualRows;
+    };
+
+    this.checkColumnNameHeader = function() {
+        Util.waitUntilElementIsVisible(nameHeader);
+    };
+
+    this.checkColumnSizeHeader = function() {
+        Util.waitUntilElementIsVisible(sizeHeader);
+    };
+
+    this.checkColumnCreatedByHeader = function() {
+        Util.waitUntilElementIsVisible(createdByHeader);
+    };
+
+    this.checkColumnCreatedHeader = function() {
+        Util.waitUntilElementIsVisible(createdHeader);
+    };
+
+    this.checkDandDIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(dragAndDrop);
+    };
+
+    this.checkLockIsDislpayedForElement = function(name) {
+        let lockButton = element(by.css(`div.adf-data-table-cell[filename="${name}"] button`));
+        Util.waitUntilElementIsVisible(lockButton);
+    };
+
+    this.getColumnValueForRow = function (file, columnName) {
+        let row = contentList.getRowByRowName(file);
+        Util.waitUntilElementIsVisible(row);
+        let rowColumn = row.element(by.css('div[title="'+columnName+'"] span'));
+        Util.waitUntilElementIsVisible(rowColumn);
+        return rowColumn.getText();
+    };
+
+    this.getStyleValueForRowText = async function(rowName, styleName) {
+        let row = element(by.css(`div.adf-data-table-cell[filename="${rowName}"] span.adf-datatable-cell-value[title="${rowName}"]`));
+        Util.waitUntilElementIsVisible(row);
+        return row.getCssValue(styleName);
+    };
+
+    this.checkSpinnerIsShowed = function () {
+        Util.waitUntilElementIsPresent(documentListSpinner);
+    };
+
+    this.checkEmptyFolderTextToBe = function (text) {
+        Util.waitUntilElementIsVisible(emptyFolder);
+        expect(emptyFolder.getText()).toContain(text);
+    };
+
+    this.checkEmptyFolderImageUrlToContain = function (url) {
+        Util.waitUntilElementIsVisible(emptyFolderImage);
+        expect(emptyFolderImage.getAttribute('src')).toContain(url);
+    };
+
+    this.checkEmptyRecentFileIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(emptyRecent);
+    };
+
+    this.checkIconForRowIsDisplayed = function(fileName) {
+        let iconRow = element(by.css(`.document-list-container div.adf-data-table-cell[filename="${fileName}"] img`));
+        Util.waitUntilElementIsVisible(iconRow);
+        return iconRow;
+    }
+
+    this.getRowIconImageUrl = async function(fileName) {
+        let iconRow = this.checkIconForRowIsDisplayed(fileName);
+        return iconRow.getAttribute('src');
+    }
+
+    this.checkGridViewButtonIsVisible = function () {
+        Util.waitUntilElementIsVisible(gridViewButton);
+    }
+
+    this.clickGridViewButton = function() {
+        this.checkGridViewButtonIsVisible();
+        gridViewButton.click();
+    }
+
+    this.checkCardViewContainerIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(cardViewContainer);
+    }
+
+    this.getCardElementShowedInPage = function() {
+        this.checkCardViewContainerIsDisplayed();
+        let actualCards = $$('div.document-list-container div.adf-data-table-card div.cell-value img').count();
+        return actualCards;
+    }
+
+    this.getDocumentCardIconForElement = function(elementName){
+        let elementIcon = element(by.css(`.document-list-container div.adf-data-table-cell[filename="${elementName}"] img`));
+        return elementIcon.getAttribute('src');
+    }
+
+    this.checkDocumentCardPropertyIsShowed = function(elementName, propertyName) {
+        let elementProperty = element(by.css(`.document-list-container div.adf-data-table-cell[filename="${elementName}"][title="${propertyName}"]`));
+        Util.waitUntilElementIsVisible(elementProperty);
+    }
+
+    this.getAttributeValueForElement = function(elementName, propertyName) {
+        let elementSize = element(by.css(`.document-list-container div.adf-data-table-cell[filename="${elementName}"][title="${propertyName}"] span`));
+        return elementSize.getText();
+    }
+
+    this.checkMenuIsShowedForElementIndex = function(elementIndex) {
+        let elementMenu = element(by.css(`button[data-automation-id="action_menu_${elementIndex}"]`));
+        Util.waitUntilElementIsVisible(elementMenu);
+    }
+
+    this.navigateToCardFolder = function(folderName) {
+        let folderCard = element(by.css(`.document-list-container div.image-table-cell.adf-data-table-cell[filename="${folderName}"]`));
+        folderCard.click();
+        let folderSelected = element(by.css(`.adf-datatable-row.is-selected div[filename="${folderName}"].adf-data-table-cell--image`));
+        Util.waitUntilElementIsVisible(folderSelected);
+        browser.actions().sendKeys(protractor.Key.ENTER).perform();
+    }
+
+    this.getGridViewSortingDropdown = function() {
+        let sortingDropdown = element(by.css('mat-select[data-automation-id="grid-view-sorting"]'));
+        Util.waitUntilElementIsVisible(sortingDropdown);
+        return sortingDropdown;
+    }
+
+    this.selectGridSortingFromDropdown = function(sortingChosen){
+        let dropdownSorting = this.getGridViewSortingDropdown();
+        dropdownSorting.click();
+        let optionToClick = element(by.css(`mat-option[data-automation-id="grid-view-sorting-${sortingChosen}"]`));
+        Util.waitUntilElementIsPresent(optionToClick);
+        optionToClick.click();
+    }
+
+    this.checkRowIsDisplayed = function(rowName){
+        let row = contentList.getRowByRowName(rowName);
+        Util.waitUntilElementIsVisible(row);
+    }
+
+    this.typeIntoNodeSelectorSearchField = function(text) {
+        Util.waitUntilElementIsVisible(searchInputElement);
+        searchInputElement.sendKeys(text);
+    }
+
+    this.clickContentNodeSelectorResult = function(name){
+        let resultElement = element(by.css(`div[data-automation-id="content-node-selector-content-list"] div[filename="${name}"`));
+        Util.waitUntilElementIsVisible(resultElement);
+        resultElement.click();
+    }
+
+    this.clickCopyButton = function(){
+        Util.waitUntilElementIsClickable(copyButton);
+        copyButton.click();
+    }
+};
+
+module.exports = ContentServicesPage;
diff --git a/e2e/pages/adf/core/headerPage.ts b/e2e/pages/adf/core/headerPage.ts
new file mode 100644
index 0000000000..5e6f8c0582
--- /dev/null
+++ b/e2e/pages/adf/core/headerPage.ts
@@ -0,0 +1,109 @@
+/*!
+ * @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, protractor } from 'protractor';
+
+import Util = require('../../../util/util');
+
+export class HeaderPage {
+
+    checkBox = element(by.cssContainingText('.mat-checkbox-label', 'Show menu button'));
+    headerColor = element(by.css('option[value="primary"]'));
+    titleInput = element(by.css('input[name="title"]'));
+    iconInput = element(by.css('input[placeholder="URL path"]'));
+    hexColorInput = element(by.css('input[placeholder="hex color code"]'));
+    logoHyperlinkInput = element(by.css('input[placeholder="Redirect URL"]'));
+    logoTooltipInput =  element(by.css('input[placeholder="Tooltip text"]'));
+
+    checkShowMenuCheckBoxIsDisplayed() {
+        return Util.waitUntilElementIsVisible(this.checkBox);
+    }
+
+    checkChooseHeaderColourIsDisplayed() {
+        return Util.waitUntilElementIsVisible(this.headerColor);
+    }
+
+    checkChangeTitleIsDisplayed() {
+        return Util.waitUntilElementIsVisible(this.titleInput);
+    }
+
+    checkChangeUrlPathIsDisplayed() {
+        return Util.waitUntilElementIsVisible(this.iconInput);
+    }
+
+    clickShowMenuButton() {
+        let checkBox = element.all(by.css('mat-checkbox'));
+        Util.waitUntilElementIsVisible(checkBox);
+        return checkBox.get(0).click();
+    }
+
+    changeHeaderColor(color) {
+        let headerColor = element(by.css('option[value="' + color + '"]'));
+        return headerColor.click();
+    }
+
+    checkAppTitle(name) {
+        let title = element(by.cssContainingText('.adf-app-title', name));
+        return Util.waitUntilElementIsVisible(title);
+    }
+
+    addTitle(title) {
+        Util.waitUntilElementIsVisible(this.titleInput);
+        this.titleInput.click();
+        this.titleInput.sendKeys(title);
+        this.titleInput.sendKeys(protractor.Key.ENTER);
+    }
+
+    checkIconIsDisplayed(url) {
+        let icon = element(by.css('img[src="' + url + '"]'));
+        Util.waitUntilElementIsVisible(icon);
+    }
+
+    addIcon(url) {
+        Util.waitUntilElementIsVisible(this.iconInput);
+        this.iconInput.click();
+        this.iconInput.sendKeys(url);
+        this.iconInput.sendKeys(protractor.Key.ENTER);
+    }
+
+    checkHexColorInputIsDisplayed() {
+        return Util.waitUntilElementIsVisible(this.hexColorInput);
+    }
+
+    checkLogoHyperlinkInputIsDisplayed() {
+        return Util.waitUntilElementIsVisible(this.logoHyperlinkInput);
+    }
+
+    checkLogoTooltipInputIsDisplayed() {
+        return Util.waitUntilElementIsVisible(this.logoTooltipInput);
+    }
+
+    addHexCodeColor(hexCode) {
+        Util.waitUntilElementIsVisible(this.hexColorInput);
+        return this.hexColorInput.click().sendKeys(hexCode).sendKeys(protractor.Key.ENTER);
+    }
+
+    addLogoHyperlink(hyperlink) {
+        Util.waitUntilElementIsVisible(this.logoHyperlinkInput);
+        return this.logoHyperlinkInput.click().sendKeys(hyperlink).sendKeys(protractor.Key.ENTER);
+    }
+
+    addLogoTooltip(tooltip) {
+        Util.waitUntilElementIsVisible(this.logoTooltipInput);
+        return this.logoTooltipInput.click().sendKeys(tooltip).sendKeys(protractor.Key.ENTER);
+    }
+}
diff --git a/e2e/pages/adf/core/toggleState.js b/e2e/pages/adf/core/toggleState.js
new file mode 100644
index 0000000000..4487f8dcb3
--- /dev/null
+++ b/e2e/pages/adf/core/toggleState.js
@@ -0,0 +1,51 @@
+/*!
+ * @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 ToggleState = function () {
+
+    var toggleButton = by.xpath("ancestor::mat-slide-toggle");
+
+    this.enableToggle = function (toggle) {
+        Util.waitUntilElementIsVisible(toggle);
+        Util.waitUntilElementIsPresent(toggle);
+        var finalToggleButton = toggle.element(toggleButton);
+        finalToggleButton.getAttribute('class').then(function (value) {
+            if (value.indexOf('mat-checked')===-1) {
+                finalToggleButton.click();
+            }
+        });
+        return this;
+    };
+
+    this.disableToggle = function (toggle) {
+        Util.waitUntilElementIsVisible(toggle);
+        var finalToggleButton = toggle.element(toggleButton);
+        finalToggleButton.getAttribute('class').then(function (value) {
+            if (value.indexOf('mat-checked')!==-1) {
+                finalToggleButton.click();
+            }
+        });
+        return this;
+    };
+
+};
+module.exports = ToggleState;
+
+
+
diff --git a/e2e/pages/adf/dataTablePage.js b/e2e/pages/adf/dataTablePage.js
new file mode 100644
index 0000000000..dffc83c258
--- /dev/null
+++ b/e2e/pages/adf/dataTablePage.js
@@ -0,0 +1,264 @@
+/*!
+ * @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 TestConfig = require('../../test.config');
+var Util = require('../../util/util');
+
+var DataTablePage = function () {
+
+    var dataTableURL = TestConfig.adf.url + TestConfig.adf.port + "/datatable";
+    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 = element.all(by.css("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 loadNode = element(by.xpath("//span[contains(text(),'Load Node')]/.."));
+    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("adf-document-list div[class='adf-datatable-body']")).first();
+
+    this.goToDatatable = function () {
+        browser.driver.get(dataTableURL);
+        Util.waitUntilElementIsVisible(pageLoaded);
+    };
+
+    /**
+     * 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) {
+        var 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) {
+        var 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) {
+        var 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) {
+        var 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) {
+        var 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);
+    };
+
+    /**
+     * check the nodeID is the same with the userHome folder's ID
+     * @method replaceColumns
+     */
+    this.checkLoadNode = function (userHome) {
+        var nodeId = element(by.css("div[data-automation-id*='" + userHome + "']"));
+
+        Util.waitUntilElementIsVisible(loadNode);
+        loadNode.click();
+        Util.waitUntilElementIsVisible(nodeId, 10000);
+    };
+
+    this.navigateToContent = function (content) {
+        var row = this.getRowByRowName(content);
+        Util.waitUntilElementIsPresent(row);
+        row.click();
+        this.checkRowIsSelected(content);
+        browser.actions().sendKeys(protractor.Key.ENTER).perform();
+        return this;
+    };
+
+    this.getRowsName = function (content) {
+        var row = element(by.css("div[data-automation-id*='" + content + "']"));
+        Util.waitUntilElementIsPresent(row);
+        return row;
+    };
+
+    this.getRowByRowName = function (content) {
+        var 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) {
+        var inputFilter = element(by.xpath("//*[@id=\"adf-datatable-filter-input\"]"));
+        inputFilter.clear();
+        return inputFilter.sendKeys(filterText);
+    };
+
+};
+module.exports = DataTablePage;
diff --git a/e2e/pages/adf/dialog/contentList.js b/e2e/pages/adf/dialog/contentList.js
new file mode 100644
index 0000000000..e22dcc0b8f
--- /dev/null
+++ b/e2e/pages/adf/dialog/contentList.js
@@ -0,0 +1,344 @@
+/*!
+ * @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[id*='document-list-container'] div[class*='adf-datatable-row'] div[class*='--text full-width'] span");
+    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']"));
+
+    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.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 (content) {
+        Util.waitUntilElementIsNotVisible(element.all(by.xpath("//div[@id='document-list-container']//div[@filename='" + content + "']")).first());
+        return this;
+    };
+
+    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);
+        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);
+    }
+
+};
+module.exports = ContentList;
diff --git a/e2e/pages/adf/dialog/createFolderDialog.js b/e2e/pages/adf/dialog/createFolderDialog.js
new file mode 100644
index 0000000000..4580f8c0a2
--- /dev/null
+++ b/e2e/pages/adf/dialog/createFolderDialog.js
@@ -0,0 +1,63 @@
+/*!
+ * @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/searchDialog.js b/e2e/pages/adf/dialog/searchDialog.js
new file mode 100644
index 0000000000..2a63f83f3c
--- /dev/null
+++ b/e2e/pages/adf/dialog/searchDialog.js
@@ -0,0 +1,132 @@
+/*!
+ * @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']"));
+    var allRows = element.all(by.css("h4[class*='adf-search-fixed-text']"));
+
+    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().then(function () {
+            searchBar.sendKeys(protractor.Key.ESCAPE);
+        });
+        return deferred.promise;
+    };
+};
+module.exports = SearchDialog;
diff --git a/e2e/pages/adf/dialog/uploadDialog.js b/e2e/pages/adf/dialog/uploadDialog.js
new file mode 100644
index 0000000000..4b54f61c5d
--- /dev/null
+++ b/e2e/pages/adf/dialog/uploadDialog.js
@@ -0,0 +1,191 @@
+/*!
+ * @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/uploadToggles.js b/e2e/pages/adf/dialog/uploadToggles.js
new file mode 100644
index 0000000000..95b0bef3d5
--- /dev/null
+++ b/e2e/pages/adf/dialog/uploadToggles.js
@@ -0,0 +1,111 @@
+/*!
+ * @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 ToggleState = require('../core/toggleState');
+
+var UploadToggles = function () {
+
+    var toggleState = new ToggleState();
+
+    var toggleButton = by.xpath("ancestor::mat-slide-toggle");
+    var multipleFileUploadToggle = element(by.cssContainingText("span[class*='toggle-content']", "Multiple File Upload"));
+    var uploadFolderToggle = element(by.cssContainingText("span[class*='toggle-content']", "Folder upload"));
+    var extensionFilterToggle = element(by.cssContainingText("span[class*='toggle-content']", "Custom extensions filter"));
+    var maxSizeToggle = element(by.cssContainingText("span[class*='toggle-content']", "Max size filter"));
+    var versioningToggle = element(by.cssContainingText("span[class*='toggle-content']", "Enable versioning"));
+    var extensionAcceptedField = element(by.css("input[data-automation-id='accepted-files-type']"));
+    var maxSizeField = element(by.css("input[data-automation-id='max-files-size']"));
+    var disableUploadCheckbox = element(by.css("[id='adf-disable-upload']"));
+
+    this.enableMultipleFileUpload = function () {
+        toggleState.enableToggle(multipleFileUploadToggle);
+        return this;
+    };
+
+    this.disableMultipleFileUpload = function () {
+        toggleState.disableToggle(multipleFileUploadToggle);
+        return this;
+    };
+
+    this.enableFolderUpload = function () {
+        toggleState.enableToggle(uploadFolderToggle);
+        return this;
+    };
+
+    this.disableFolderUpload = function () {
+        toggleState.disableToggle(uploadFolderToggle);
+        return this;
+    };
+
+    this.enableExtensionFilter = function () {
+        toggleState.enableToggle(extensionFilterToggle);
+        return this;
+    };
+
+    this.disableExtensionFilter = function () {
+        toggleState.disableToggle(extensionFilterToggle);
+        return this;
+    };
+
+    this.enableMaxSize = function () {
+        toggleState.enableToggle(maxSizeToggle);
+        return this;
+    };
+
+    this.disableMaxSize = function () {
+        toggleState.disableToggle(maxSizeToggle);
+        return this;
+    };
+
+    this.enableVersioning = function () {
+        toggleState.enableToggle(versioningToggle);
+        return this;
+    };
+
+    this.disableVersioning = function () {
+        toggleState.disableToggle(versioningToggle);
+        return this;
+    };
+
+    this.clickCheckboxDisableUpload = function () {
+        return disableUploadCheckbox.click();
+    };
+
+    this.addExtension = function (extension) {
+        Util.waitUntilElementIsVisible(extensionAcceptedField);
+        extensionAcceptedField.sendKeys("," + extension);
+    };
+
+    this.addMaxSize = function (size) {
+        this.clearText();
+        maxSizeField.sendKeys(size);
+    };
+
+    this.clearText = function () {
+        Util.waitUntilElementIsVisible(maxSizeField);
+        var deferred = protractor.promise.defer();
+        maxSizeField.clear().then(function (value) {
+            maxSizeField.sendKeys(protractor.Key.ESCAPE);
+        });
+        return deferred.promise;
+    };
+
+};
+module.exports = UploadToggles;
+
+
diff --git a/e2e/pages/adf/dialog/userInfoDialog.js b/e2e/pages/adf/dialog/userInfoDialog.js
new file mode 100644
index 0000000000..271ce27989
--- /dev/null
+++ b/e2e/pages/adf/dialog/userInfoDialog.js
@@ -0,0 +1,154 @@
+/*!
+ * @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 UserInfoDialog = function () {
+
+    var dialog = element(by.css("mat-card[class*='adf-userinfo-card']"));
+    var contentServicesTab = element(by.css("div[id*='mat-tab-label-0-0']"));
+    var processServicesTab = element(by.css("div[id*='mat-tab-label-0-1']"));
+    var userImage = element(by.css("div[id='user-initial-image']"));
+    var userInfoEcmHeaderTitle = element(by.css("div[id='ecm-username']"));
+    var userInfoEcmTitle = element(by.css("mat-card-content span[id='ecm-full-name']"));
+    var ecmEmail = element(by.css("span[id='ecm-email']"));
+    var ecmJobTitle = element(by.css("span[id='ecm-job-title']"));
+    var userInfoProcessHeaderTitle = element(by.css("div[id='bpm-username']"));
+    var userInfoProcessTitle = element(by.css("mat-card-content span[id='bpm-full-name']"));
+    var processEmail = element(by.css("span[id='bpm-email']"));
+    var processTenant = element(by.css("span[class='detail-profile']"));
+    var apsImage = element(by.css("img[id='bpm-user-detail-image']"));
+    var acsImage = element(by.css("img[id='ecm-user-detail-image']"));
+    var initialImage = element.all(by.css("div[id='user-initials-image']")).first();
+
+    this.dialogIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(dialog);
+        return this;
+    };
+
+    this.dialogIsNotDisplayed = function () {
+        Util.waitUntilElementIsNotOnPage(dialog);
+        return this;
+    };
+
+    this.contentServicesTabIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(contentServicesTab);
+        return this;
+    };
+
+    this.contentServicesTabIsNotDisplayed = function () {
+        Util.waitUntilElementIsNotOnPage(contentServicesTab);
+        return this;
+    };
+
+    this.clickOnContentServicesTab = function () {
+        this.contentServicesTabIsDisplayed();
+        contentServicesTab.click();
+        return this;
+    };
+
+    this.processServicesTabIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(processServicesTab);
+        return this;
+    };
+
+    this.processServicesTabIsNotDisplayed = function () {
+        Util.waitUntilElementIsNotOnPage(processServicesTab);
+        return this;
+    };
+
+    this.clickOnProcessServicesTab = function () {
+        this.processServicesTabIsDisplayed();
+        processServicesTab.click();
+        return this;
+    };
+
+    this.userImageIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(userImage);
+        return this;
+    };
+
+    this.getContentHeaderTitle = function () {
+        Util.waitUntilElementIsVisible(userInfoEcmHeaderTitle);
+        return userInfoEcmHeaderTitle.getText();
+    };
+
+    this.getContentTitle = function () {
+        Util.waitUntilElementIsVisible(userInfoEcmTitle);
+        return userInfoEcmTitle.getText();
+    };
+
+    this.getContentEmail = function () {
+        Util.waitUntilElementIsVisible(ecmEmail);
+        return ecmEmail.getText();
+    };
+
+    this.getContentJobTitle = function () {
+        Util.waitUntilElementIsVisible(ecmJobTitle);
+        return ecmJobTitle.getText();
+    };
+
+    this.getProcessHeaderTitle = function () {
+        Util.waitUntilElementIsVisible(userInfoProcessHeaderTitle);
+        return userInfoProcessHeaderTitle.getText();
+    };
+
+    this.getProcessTitle = function () {
+        Util.waitUntilElementIsVisible(userInfoProcessTitle);
+        return userInfoProcessTitle.getText();
+    };
+
+    this.getProcessEmail = function () {
+        Util.waitUntilElementIsVisible(processEmail);
+        return processEmail.getText();
+    };
+
+    this.getProcessTenant = function () {
+        Util.waitUntilElementIsVisible(processTenant);
+        return processTenant.getText();
+    };
+
+    this.closeUserProfile = function () {
+        Util.waitUntilElementIsVisible(dialog);
+        browser.actions().sendKeys(protractor.Key.ESCAPE).perform();
+    };
+
+    this.checkACSProfileImage = function () {
+        Util.waitUntilElementIsVisible(acsImage);
+    };
+
+    this.checkAPSProfileImage = function () {
+        Util.waitUntilElementIsVisible(apsImage);
+    };
+
+    this.checkInitialImage = function () {
+        Util.waitUntilElementIsVisible(initialImage);
+    };
+
+    this.initialImageNotDisplayed = function () {
+        Util.waitUntilElementIsNotOnPage(initialImage);
+    };
+
+    this.ACSProfileImageNotDisplayed = function () {
+        Util.waitUntilElementIsNotOnPage(acsImage);
+    };
+
+    this.APSProfileImageNotDisplayed = function () {
+        Util.waitUntilElementIsNotOnPage(apsImage);
+    };
+};
+module.exports = UserInfoDialog;
diff --git a/e2e/pages/adf/documentListPage.js b/e2e/pages/adf/documentListPage.js
new file mode 100644
index 0000000000..da4c911966
--- /dev/null
+++ b/e2e/pages/adf/documentListPage.js
@@ -0,0 +1,778 @@
+/*!
+ * @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*='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
new file mode 100644
index 0000000000..52ad88729c
--- /dev/null
+++ b/e2e/pages/adf/errorPage.js
@@ -0,0 +1,72 @@
+/*!
+ * @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();
+    };
+
+};
+
+module.exports = ErrorPage;
diff --git a/e2e/pages/adf/filePreviewPage.js b/e2e/pages/adf/filePreviewPage.js
new file mode 100644
index 0000000000..0e5448f7bb
--- /dev/null
+++ b/e2e/pages/adf/filePreviewPage.js
@@ -0,0 +1,475 @@
+/*!
+ * @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/loginPage.js b/e2e/pages/adf/loginPage.js
new file mode 100644
index 0000000000..f833e72482
--- /dev/null
+++ b/e2e/pages/adf/loginPage.js
@@ -0,0 +1,554 @@
+/*!
+ * @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 TestConfig = require('../../test.config');
+var AdfSettingsPage = require('./settingsPage');
+
+var LoginPage = function () {
+
+    var loginURL = TestConfig.adf.url + TestConfig.adf.port + "/login";
+    var txtUsername = element(by.css("input[id='username']"));
+    var txtPassword = element(by.css("input[id='password']"));
+    var logoImg = element(by.css("img[id='adf-login-img-logo']"));
+    var successRouteTxt = element(by.css("input[data-automation-id='adf-success-route']"));
+    var logoTxt = element(by.css("input[data-automation-id='adf-url-logo']"));
+    var usernameTooltip = element(by.css("span[data-automation-id='username-error']"));
+    var passwordTooltip = element(by.css("span[data-automation-id='password-required']"));
+    var loginTooltip = element(by.css("span[class='login-error-message']"));
+    var usernameInactive = element(by.css("input[id='username'][aria-invalid='false']"));
+    var passwordInactive = element(by.css("input[id='password'][aria-invalid='false']"));
+    var adfLogo = element(by.css("img[class='adf-img-logo ng-star-inserted']"));
+    var usernameHighlighted = element(by.css("input[id='username'][aria-invalid='true']"));
+    var passwordHighlighted = element(by.css("input[id='password'][aria-invalid='true']"));
+    var signInButton = element(by.id('login-button'));
+    var showPassword = element(by.css("mat-icon[data-automation-id='show_password']"));
+    var hidePassword = element(by.css("mat-icon[data-automation-id='hide_password']"));
+    var rememberMe = element(by.css("mat-checkbox[id='adf-login-remember']"));
+    var needHelp = element(by.css("div[id='adf-login-action-left']"));
+    var register = element(by.css("div[id='adf-login-action-right']"));
+    var footerSwitch = element(by.id("switch4"));
+    var rememberMeSwitch = element(by.id("adf-toogle-show-rememberme"));
+    var successRouteSwitch = element(by.id("adf-toogle-show-successRoute"));
+    var logoSwitch = element(by.id("adf-toogle-logo"));
+    var userPicture = element(by.id("userinfo_container"));
+    var header = element(by.id("adf-header"));
+    var cardBackground = element(by.css("mat-card[class*='adf-login-card']"));
+    var adfSettingsPage = new AdfSettingsPage();
+
+    /**
+     * Provides the longer wait required
+     * @property waitForElements
+     * @type protractor.Element
+     * */
+    this.waitForElements = function () {
+        var deferred = protractor.promise.defer();
+
+        Util.waitUntilElementIsVisible(txtUsername).then(() => {
+            Util.waitUntilElementIsVisible(txtPassword).then(() => {
+                deferred.fulfill();
+            }, () => {
+                deferred.rejected();
+            })
+        });
+
+        return deferred.promise;
+
+    };
+
+    /**
+     * Fills the username input
+     * @method enterUsername
+     * @param {String} username
+     */
+    this.enterUsername = function (username) {
+        Util.waitUntilElementIsVisible(txtUsername);
+        txtUsername.sendKeys('');
+        return txtUsername.clear().sendKeys(username);
+    };
+
+    /**
+     * Fills the password input
+     * @method enterPassword
+     * @param {String} password
+     */
+    this.enterPassword = function (password) {
+        Util.waitUntilElementIsVisible(txtPassword);
+        return txtPassword.clear().sendKeys(password);
+    };
+
+    /**
+     * clears username input
+     * @method clearUsername
+     * @param {String} username
+     */
+    this.clearUsername = function () {
+        Util.waitUntilElementIsVisible(txtUsername);
+        return txtUsername.click().clear();
+    };
+
+    /**
+     * clears password input
+     * @method clearPassword
+     * @param {String} password
+     */
+    this.clearPassword = function () {
+        Util.waitUntilElementIsVisible(txtPassword);
+        txtPassword.getAttribute('value').then(function (value) {
+            for (var i = value.length; i >= 0; i--) {
+                txtPassword.sendKeys(protractor.Key.BACK_SPACE);
+            }
+        });
+    };
+
+    /**
+     * checks username tooltips
+     * @method checkUsernameTooltip
+     * @param {String} message
+     */
+    this.checkUsernameTooltip = function () {
+        Util.waitUntilElementIsVisible(usernameTooltip);
+    };
+
+    /**
+     * checks password tooltips
+     * @method checkPasswordTooltip
+     * @param {String} message
+     */
+    this.checkPasswordTooltip = function () {
+        Util.waitUntilElementIsVisible(passwordTooltip);
+    };
+
+    /**
+     * checks login error tooltips
+     * @method checkLoginError
+     * @param {String} message
+     */
+    this.checkLoginError = function (message) {
+        Util.waitUntilElementIsVisible(loginTooltip);
+        expect(loginTooltip.getText()).toEqual(message);
+    };
+
+    /**
+     * checks login error tooltips
+     * @method checkLoginError
+     * @param {String} message
+     */
+    this.checkLoginImgURL = function (url) {
+        Util.waitUntilElementIsVisible(logoImg);
+        expect(logoImg.getAttribute('src')).toEqual(url);
+    };
+
+    /**
+     * checks username field is inactive
+     * @method checkUsernameInactive
+     */
+    this.checkUsernameInactive = function () {
+        Util.waitUntilElementIsVisible(usernameInactive);
+    };
+
+    /**
+     * checks password field is inactive
+     * @method checkPasswordInactive
+     */
+    this.checkPasswordInactive = function () {
+        Util.waitUntilElementIsVisible(passwordInactive);
+    };
+
+    /**
+     * checks username field is highlighted
+     * @method checkUsernameHighlighted
+     */
+    this.checkUsernameHighlighted = function () {
+        adfLogo.click();
+        Util.waitUntilElementIsVisible(usernameHighlighted);
+    };
+
+    /**
+     * checks password field is highlighted
+     * @method checkPasswordHighlighted
+     */
+    this.checkPasswordHighlighted = function () {
+        adfLogo.click();
+        Util.waitUntilElementIsVisible(passwordHighlighted);
+    };
+
+    /**
+     * check Username tooltip is not visible
+     * @method checkUsernameTooltipIsNotVisible
+     */
+    this.checkUsernameTooltipIsNotVisible = function () {
+        Util.waitUntilElementIsNotVisible(usernameTooltip);
+    };
+
+    /**
+     * checks password tooltip is not visible
+     * @method checkPasswordTooltipIsNotVisible
+     */
+    this.checkPasswordTooltipIsNotVisible = function () {
+        Util.waitUntilElementIsNotVisible(passwordTooltip);
+    };
+
+    /**
+     * checks sign in button is enabled
+     * @method checkSignInButtonIsEnabled
+     */
+    this.checkSignInButtonIsEnabled = function () {
+        Util.waitUntilElementIsVisible(signInButton);
+        expect(signInButton.isEnabled()).toBe(true);
+    };
+
+    /**
+     * Logs into adf using default host config
+     * @method defaultLogin
+     */
+    this.defaultLogin = function () {
+        browser.driver.get(TestConfig.adf.url + TestConfig.adf.login);
+        this.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+    };
+
+    /**
+     * Logs into adf using userModel
+     * @method loginUsingUserModel
+     */
+    this.loginUsingUserModel = function (userModel) {
+        browser.driver.get(TestConfig.adf.url + TestConfig.adf.login);
+        this.waitForElements();
+        this.login(userModel.getId(), userModel.getPassword());
+    };
+
+    /**
+     * Logs into ADF using userModel - only Process Services enabled
+     * @method loginUsingUserModel
+     */
+    this.loginToProcessServicesUsingUserModel = function (userModel) {
+        adfSettingsPage.setProviderBpm();
+        this.waitForElements();
+        this.login(userModel.email, userModel.password);
+    };
+
+
+    this.loginToProcessServicesUsingDefaultUser = function () {
+        adfSettingsPage.setProviderBpm();
+        this.waitForElements();
+        this.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+    };
+
+    this.loginToContentServicesUsingUserModel = function (userModel) {
+        adfSettingsPage.setProviderEcm();
+        this.waitForElements();
+
+        this.login(userModel.getId(), userModel.getPassword());
+    };
+
+    this.loginToContentServices = function (username, password) {
+        adfSettingsPage.setProviderEcm();
+        this.waitForElements();
+
+        this.login(username, password);
+    };
+
+    /**

+     * Go to adf login page

+     * @method goToLoginPage

+     */
+    this.goToLoginPage = function () {
+        browser.driver.get(TestConfig.adf.url + TestConfig.adf.port + '/login');
+        this.waitForElements();
+    };
+
+    /**
+     * checks sign in button is disabled
+     * @method checkSignInButtonIsDisabled
+     */
+    this.checkSignInButtonIsDisabled = function () {
+        Util.waitUntilElementIsVisible(signInButton);
+        expect(signInButton.isEnabled()).toBe(false);
+    };
+
+    /**
+     * clicks the sign in button
+     * @method clickSignInButton
+     */
+    this.clickSignInButton = function () {
+        Util.waitUntilElementIsVisible(signInButton);
+        signInButton.click();
+    };
+
+    /**
+     * clicks the remember me checkbox
+     */
+    this.clickRememberMe = function () {
+        Util.waitUntilElementIsVisible(rememberMe);
+        rememberMe.click();
+    };
+
+    /**
+     * clicks icon to show password
+     * @method showPassword
+     */
+    this.showPassword = function () {
+        Util.waitUntilElementIsVisible(showPassword);
+        showPassword.click();
+    };
+
+    this.getShowPasswordIconColor = function () {
+        var deferred = protractor.promise.defer();
+
+        Util.waitUntilElementIsVisible(showPassword);
+        showPassword.getCssValue('color').then(function (value) {
+            deferred.fulfill(value);
+        });
+
+        return deferred.promise;
+    };
+
+    this.getSignInButtonColor = function () {
+        var deferred = protractor.promise.defer();
+
+        Util.waitUntilElementIsVisible(signInButton);
+        signInButton.getCssValue("color").then(function (value) {
+            deferred.fulfill(value);
+        });
+
+        return deferred.promise;
+    };
+
+    this.getBackgroundColor = function () {
+        var deferred = protractor.promise.defer();
+
+        Util.waitUntilElementIsVisible(cardBackground);
+        cardBackground.getCssValue("color").then(function (value) {
+            deferred.fulfill(value);
+        });
+
+        return deferred.promise;
+    };
+
+    /**
+     * clicks icon to hide password
+     * @method hidePassword
+     */
+    this.hidePassword = function () {
+        Util.waitUntilElementIsVisible(hidePassword);
+        hidePassword.click();
+    };
+
+    /**
+     * checks if password is shown
+     * @method checkPasswordIsShown
+     * @param password
+     */
+    this.checkPasswordIsShown = function (password) {
+        txtPassword.getAttribute('value').then(function (text) {
+            expect(text).toEqual(password);
+        });
+    };
+
+    /**
+     * checks if password is hidden
+     * @method checkPasswordIsHidden
+     */
+    this.checkPasswordIsHidden = function () {
+        Util.waitUntilElementIsVisible(txtPassword);
+    };
+
+    /**
+     * checks 'Remember me' is displayed
+     * @method checkRememberIsDisplayed
+     */
+    this.checkRememberIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(rememberMe);
+    };
+
+    /**
+     * checks 'Remember me' is not displayed
+     * @method checkRememberIsNotDisplayed
+     */
+    this.checkRememberIsNotDisplayed = function () {
+        Util.waitUntilElementIsNotVisible(rememberMe);
+    };
+
+    /**
+     * checks 'Need help' is Displayed
+     * @method checkNeedHelpIsDisplayed
+     */
+    this.checkNeedHelpIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(needHelp);
+    };
+
+    /**
+     * checks 'Need Help' is not displayed
+     * @method checkNeedHelpIsNotDisplayed
+     */
+    this.checkNeedHelpIsNotDisplayed = function () {
+        Util.waitUntilElementIsNotVisible(needHelp);
+    };
+
+    /**
+     * checks 'Register' is displayed
+     * @method checkRegisterDisplayed
+     */
+    this.checkRegisterDisplayed = function () {
+        Util.waitUntilElementIsVisible(register);
+    };
+
+    /**
+     * checks 'Register' is not displayed
+     * @method checkRegisterIsNotDisplayed
+     */
+    this.checkRegisterIsNotDisplayed = function () {
+        Util.waitUntilElementIsNotVisible(register);
+    };
+
+    /**
+     * enables footer switch
+     * @method enableFooter
+     */
+    this.enableFooter = function () {
+        Util.waitUntilElementIsVisible(footerSwitch);
+        footerSwitch.getAttribute('class').then(function (check) {
+            if (check === 'mat-slide-toggle mat-primary') {
+                footerSwitch.click();
+                expect(footerSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary mat-checked');
+            }
+        })
+    };
+
+    /**
+     * disables footer switch
+     * @method disableFooter
+     */
+    this.disableFooter = function () {
+        Util.waitUntilElementIsVisible(footerSwitch);
+        footerSwitch.getAttribute('class').then(function (check) {
+            if (check === 'mat-slide-toggle mat-primary mat-checked') {
+                footerSwitch.click();
+                expect(footerSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary');
+            }
+        })
+    };
+
+    /**
+     * disables RememberMe
+     */
+    this.disableRememberMe = function () {
+        Util.waitUntilElementIsVisible(rememberMeSwitch);
+        rememberMeSwitch.getAttribute('class').then(function (check) {
+            if (check === 'mat-slide-toggle mat-primary mat-checked') {
+                rememberMeSwitch.click();
+                expect(rememberMeSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary');
+            }
+        })
+    };
+
+    /**
+     * enables footer switch
+     * @method enableFooter
+     */
+    this.enableRememberMe = function () {
+        Util.waitUntilElementIsVisible(rememberMeSwitch);
+        rememberMeSwitch.getAttribute('class').then(function (check) {
+            if (check === 'mat-slide-toggle mat-primary') {
+                rememberMeSwitch.click();
+                expect(rememberMeSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary mat-checked');
+            }
+        })
+    };
+
+    /**
+     * disables successRouteSwitch
+     */
+    this.disableSuccessRouteSwitch = function () {
+        Util.waitUntilElementIsVisible(successRouteSwitch);
+        successRouteSwitch.getAttribute('class').then(function (check) {
+            if (check === 'mat-slide-toggle mat-primary mat-checked') {
+                successRouteSwitch.click();
+                expect(successRouteSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary');
+            }
+        })
+    };
+
+    /**
+     * enables successRouteSwitch
+     * @method enableFooter
+     */
+    this.enableSuccessRouteSwitch = function () {
+        Util.waitUntilElementIsVisible(rememberMeSwitch);
+        successRouteSwitch.getAttribute('class').then(function (check) {
+            if (check === 'mat-slide-toggle mat-primary') {
+                successRouteSwitch.click();
+                expect(successRouteSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary mat-checked');
+            }
+        })
+    };
+
+    /**
+     * disables successRouteSwitch
+     */
+    this.disableLogowitch = function () {
+        Util.waitUntilElementIsVisible(logoSwitch);
+        logoSwitch.getAttribute('class').then(function (check) {
+            if (check === 'mat-slide-toggle mat-primary mat-checked') {
+                logoSwitch.click();
+                expect(logoSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary');
+            }
+        })
+    };
+
+    /**
+     * enables successRouteSwitch
+     * @method enableFooter
+     */
+    this.enableLogoSwitch = function () {
+        Util.waitUntilElementIsVisible(rememberMeSwitch);
+        logoSwitch.getAttribute('class').then(function (check) {
+            if (check === 'mat-slide-toggle mat-primary') {
+                logoSwitch.click();
+                expect(logoSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary mat-checked');
+            }
+        })
+    };
+
+    this.enterSuccessRoute = function (route) {
+        Util.waitUntilElementIsVisible(successRouteTxt);
+        successRouteTxt.sendKeys('');
+        return successRouteTxt.clear().sendKeys(route);
+    };
+
+    this.enterLogo = function (logo) {
+        Util.waitUntilElementIsVisible(logoTxt);
+        logoTxt.sendKeys('');
+        return logoTxt.clear().sendKeys(logo);
+    };
+
+    /**
+     * logs in with a valid user
+     * @method login
+     * @param {String, String} username, password
+     */
+    this.login = function (username, password) {
+        this.waitForElements();
+        this.enterUsername(username);
+        this.enterPassword(password);
+        this.clickSignInButton();
+        return Util.waitUntilElementIsVisible(header);
+    };
+
+};
+
+module.exports = LoginPage;
diff --git a/e2e/pages/adf/metadataViewPage.js b/e2e/pages/adf/metadataViewPage.js
new file mode 100644
index 0000000000..8af3e6ce44
--- /dev/null
+++ b/e2e/pages/adf/metadataViewPage.js
@@ -0,0 +1,424 @@
+/*!
+ * @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.clickRightChevronToGetToTab = (tabName) => {
+        element.all(by.css('.mat-tab-label'))
+            .map((element) => element.getAttribute('innerText'))
+            .then((texts) => {
+                for (let text of texts) {
+                    if (text === tabName) {
+                        break;
+                    }
+                    this.clickRightChevron();
+                }
+            });
+    };
+
+    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.clickMetadatGroup = function (groupName) {
+        var group = element(by.css('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"]'));
+        Util.waitUntilElementIsVisible(group);
+        group.click();
+    };
+
+    this.checkkMetadatGroupIsPresent = function (groupName) {
+        var group = element(by.css('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"]'));
+        return Util.waitUntilElementIsVisible(group);
+    };
+
+    this.checkkMetadatGroupIsNotPresent = function (groupName) {
+        var group = element(by.css('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"]'));
+        return Util.waitUntilElementIsNotVisible(group);
+    };
+
+    this.chekMetadatGroupIsExpand = 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.chekMetadatGroupIsNotExpand = 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.getkMetadatGroupTitle = 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.checkPopertyIsVisible = function (propertyName, type) {
+        var property = element(by.css('div[data-automation-id="card-' + type + '-label-' + propertyName + '"]'));
+        Util.waitUntilElementIsVisible(property);
+    };
+
+    this.checkPopertyIsNotVisible = 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/navigationBarPage.js b/e2e/pages/adf/navigationBarPage.js
new file mode 100644
index 0000000000..b2e5738cff
--- /dev/null
+++ b/e2e/pages/adf/navigationBarPage.js
@@ -0,0 +1,165 @@
+/*!
+ * @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 TestConfig = require('../../test.config');
+
+var NavigationBarPage = function () {
+
+    var contentServicesButton = element(by.css("a[data-automation-id='Content Services']"));
+    var configEditoButton = element(by.css("a[data-automation-id='Configuration Editor']"));
+    var processServicesButton = element(by.css("a[data-automation-id='Process Services']"));
+    var loginButton = element(by.css("a[data-automation-id='Login']"));
+    var trashcanButton = element(by.css("a[data-automation-id='Trashcan']"));
+    var userProfileButton = element(by.css("button[data-automation-id='adf-user-profile']"));
+    var themeButton = element(by.css("button[data-automation-id='theme menu']"));
+    var themeMenuContent = element(by.css("div[class*='mat-menu-panel']"));
+    var logoutButton = element(by.css("a[adf-logout]"));
+    var cardViewButton = element(by.cssContainingText(".sidenav-menu-label", "CardView"));
+    var languageMenuButton = element(by.css('button[data-automation-id="language-menu-button"]'));
+    var appTitle = element(by.css('.adf-app-title'));
+    var headerDataButton = element(by.css("a[data-automation-id='Header Data']"));
+    var menuButton = element(by.css('button[data-automation-id="adf-menu-icon"]'));
+
+    /**
+     * Click Content Services Button
+     * @method clickContentServicesButton
+     */
+    this.clickContentServicesButton = function () {
+        Util.waitUntilElementIsVisible(contentServicesButton);
+        contentServicesButton.click();
+    };
+
+    /**
+     * Click on Config Editor Button
+     * @method clickContentServicesButton
+     */
+    this.clickConfigEditorButton = function () {
+        Util.waitUntilElementIsVisible(configEditoButton);
+        configEditoButton.click();
+    };
+
+    /**
+     * Click Process Services Button
+     * @method clickProcessServicesButton
+     */
+    this.clickProcessServicesButton = function () {
+        Util.waitUntilElementIsVisible(processServicesButton);
+        processServicesButton.click();
+    };
+
+    /**
+     * Click Login Button
+     * @method clickLoginButton
+     */
+    this.clickLoginButton = function () {
+        Util.waitUntilElementIsVisible(loginButton);
+        loginButton.click();
+    };
+
+    this.clickTrashcanButton = function () {
+        Util.waitUntilElementIsVisible(trashcanButton);
+        trashcanButton.click();
+    };
+
+    this.clickUserProfile = function () {
+        Util.waitUntilElementIsVisible(userProfileButton);
+        userProfileButton.click();
+    };
+
+    this.clickThemeButton = function () {
+        Util.waitUntilElementIsVisible(themeButton);
+        themeButton.click();
+        Util.waitUntilElementIsVisible(themeMenuContent);
+    };
+
+    this.clickOnSpecificThemeButton = function (themeName) {
+        var themeElement = element(by.css("button[data-automation-id='" + themeName + "']"));
+        Util.waitUntilElementIsVisible(themeElement);
+        Util.waitUntilElementIsClickable(themeElement);
+        themeElement.click();
+    };
+
+    /**
+     * Click Logout Button
+     * @method clickLogoutButton
+     */
+    this.clickLogoutButton = function () {
+        Util.waitUntilElementIsVisible(logoutButton);
+        logoutButton.click();
+    };
+
+    /**
+     * Click Card View Button
+     * @method clickCardViewButton
+     */
+    this.clickCardViewButton = function () {
+        Util.waitUntilElementIsVisible(cardViewButton);
+        cardViewButton.click();
+    };
+
+    /**
+     * Click Card View Button
+     * @method clickCardViewButton
+     */
+    this.openContentServicesFolder = function (folderId) {
+        return browser.get(TestConfig.adf.url + '/files/' + folderId);
+    };
+
+    this.chooseLanguage = function(language) {
+        let buttonLanguage = element(by.xpath(`//adf-language-menu//button[contains(text(), '${language}')]`));
+        Util.waitUntilElementIsVisible(buttonLanguage);
+        buttonLanguage.click();
+    };
+
+    this.openLanguageMenu = function () {
+        Util.waitUntilElementIsVisible(languageMenuButton);
+        languageMenuButton.click();
+        Util.waitUntilElementIsVisible(appTitle);
+    };
+
+    this.clickHeaderDataButton = function () {
+        Util.waitUntilElementIsVisible(headerDataButton);
+        return headerDataButton.click();
+    };
+
+    this.checkMenuButtonIsDisplayed = function () {
+        return Util.waitUntilElementIsVisible(menuButton);
+    };
+
+    this.checkMenuButtonIsNotDisplayed = function () {
+        return Util.waitUntilElementIsNotVisible(menuButton);
+    };
+
+    this.checkToolbarColor = function (color) {
+        var toolbarColor = element(by.css(`mat-toolbar[class*="mat-${color}"]`));
+        return Util.waitUntilElementIsVisible(toolbarColor);
+    };
+
+    this.clickAppLogo = function (logoTitle) {
+        var appLogo = element(by.css('a[title="'+ logoTitle +'"]'));
+        Util.waitUntilElementIsVisible(appLogo);
+        appLogo.click();
+    };
+
+    this.checkLogoTooltip = function (logoTooltip) {
+        var logoTooltip = element(by.css('a[title="'+ logoTooltip +'"]'));
+        Util.waitUntilElementIsVisible(logoTooltip);
+    }
+};
+
+module.exports = NavigationBarPage;
diff --git a/e2e/pages/adf/notificationPage.js b/e2e/pages/adf/notificationPage.js
new file mode 100644
index 0000000000..61f08134ec
--- /dev/null
+++ b/e2e/pages/adf/notificationPage.js
@@ -0,0 +1,128 @@
+/*!
+ * @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 NotificationPage = function () {
+
+    var messageField = element(by.css("input[data-automation-id='notification-message']"));
+    var horizontalPosition = element(by.css("mat-select[data-automation-id='notification-horizontal-position']"));
+    var verticalPosition = element(by.css("mat-select[data-automation-id='notification-vertical-position']"));
+    var durationField = element(by.css("input[data-automation-id='notification-duration']"));
+    var direction = element(by.css("mat-select[data-automation-id='notification-direction']"));
+    var actionToggle = element(by.css("mat-slide-toggle[data-automation-id='notification-action-toggle']"));
+    var notificationSnackBar = element.all(by.css("simple-snack-bar")).first();
+    var actionOutput = element(by.css("div[data-automation-id='notification-action-output']"));
+    var actionButton = element(by.css("simple-snack-bar > div > button"));
+    var defaultNotificationButton = element(by.css("button[data-automation-id='notification-default-button']"));
+    var customNotificationButton = element(by.css("button[data-automation-id='notification-custom-config-button']"));
+    var selectionDropDown = element.all(by.css("div[class*='mat-select-content']")).first();
+    var notificationsPage = element(by.css("a[data-automation-id='Notifications']"));
+    var notificationConfig = element(by.css("p[data-automation-id='notification-custom-object']"));
+
+    this.checkNotifyContains = function (message) {
+        Util.waitUntilElementIsVisible(element(by.cssContainingText('simple-snack-bar', message)));
+        return this;
+    };
+
+    this.goToNotificationsPage = function () {
+        Util.waitUntilElementIsVisible(notificationsPage);
+        notificationsPage.click();
+    };
+
+    this.getConfigObject = function () {
+        Util.waitUntilElementIsVisible(notificationConfig);
+        return notificationConfig.getText();
+    };
+
+    this.getSnackBarText = function () {
+        return notificationSnackBar.getText();
+    };
+
+    this.checkNotificationSnackBarIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(notificationSnackBar);
+        return this;
+    };
+
+    this.checkNotificationSnackBarIsDisplayedWithMessage = function (message) {
+        let notificationSnackBarMessage = element(by.cssContainingText("simple-snack-bar", message));
+        Util.waitUntilElementIsVisible(notificationSnackBarMessage);
+        return this;
+    };
+
+    this.checkNotificationSnackBarIsNotDisplayed = function () {
+        Util.waitUntilElementIsNotVisible(notificationSnackBar);
+        return this;
+    };
+
+    this.enterMessageField = function (text) {
+        Util.waitUntilElementIsVisible(messageField);
+        messageField.clear().sendKeys(text);
+    };
+
+    this.enterDurationField = function (time) {
+        Util.waitUntilElementIsVisible(durationField);
+        durationField.clear().sendKeys(time);
+    };
+
+    this.selectHorizontalPosition = function (selectedItem) {
+        var selectItem = element(by.cssContainingText("span[class='mat-option-text']", selectedItem));
+        horizontalPosition.click();
+        Util.waitUntilElementIsVisible(selectionDropDown);
+        selectItem.click();
+    };
+
+    this.selectVerticalPosition = function (selectedItem) {
+        var selectItem = element(by.cssContainingText("span[class='mat-option-text']", selectedItem));
+        verticalPosition.click();
+        Util.waitUntilElementIsVisible(selectionDropDown);
+        selectItem.click();
+    };
+
+    this.selectDirection = function (selectedItem) {
+        var selectItem = element(by.cssContainingText("span[class='mat-option-text']", selectedItem));
+        direction.click();
+        Util.waitUntilElementIsVisible(selectionDropDown);
+        selectItem.click();
+    };
+
+    this.clickDefaultNotificationButton = function () {
+        Util.waitUntilElementIsVisible(defaultNotificationButton);
+        defaultNotificationButton.click();
+    };
+
+    this.clickCustomNotificationButton = function () {
+        Util.waitUntilElementIsVisible(customNotificationButton);
+        customNotificationButton.click();
+    };
+
+    this.checkActionEvent = function () {
+        Util.waitUntilElementIsVisible(actionOutput);
+        return this;
+    };
+
+    this.clickActionToggle = function () {
+        Util.waitUntilElementIsVisible(actionToggle);
+        actionToggle.click();
+    };
+
+    this.clickActionButton = function () {
+        actionButton.click();
+    };
+};
+
+module.exports = NotificationPage;
diff --git a/e2e/pages/adf/paginationPage.js b/e2e/pages/adf/paginationPage.js
new file mode 100644
index 0000000000..64f5bb6322
--- /dev/null
+++ b/e2e/pages/adf/paginationPage.js
@@ -0,0 +1,135 @@
+/*!
+ * @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 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 ng-star-inserted']"));
+
+    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.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);
+        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);
+    };
+
+};
+module.exports = PaginationPage;
+
diff --git a/e2e/pages/adf/process_services/analyticsPage.js b/e2e/pages/adf/process_services/analyticsPage.js
new file mode 100644
index 0000000000..bcc9167974
--- /dev/null
+++ b/e2e/pages/adf/process_services/analyticsPage.js
@@ -0,0 +1,56 @@
+/*!
+ * @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);
+        toolbarTitleContainer.click();
+        Util.waitUntilElementIsVisible(toolbarTitleInput);
+        toolbarTitleInput.clear();
+        toolbarTitleInput.sendKeys(title);
+        toolbarTitleInput.sendKeys(protractor.Key.ENTER);
+    };
+
+    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/appNavigationBarPage.js b/e2e/pages/adf/process_services/appNavigationBarPage.js
new file mode 100644
index 0000000000..0eee6dc981
--- /dev/null
+++ b/e2e/pages/adf/process_services/appNavigationBarPage.js
@@ -0,0 +1,43 @@
+/*!
+ * @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 AppNavigationBarPage = function () {
+
+    var tasksButton = element.all(by.cssContainingText("div[class*='mat-tab-label'] .mat-tab-labels div", "Tasks")).first();
+    var processButton = element.all(by.cssContainingText("div[class*='mat-tab-label'] .mat-tab-labels div", "Process")).first();
+    var reportsButton = element.all(by.cssContainingText("div[class*='mat-tab-label'] .mat-tab-labels div", "Reports")).first();
+    var reportsButtonSelected = element.all(by.cssContainingText("div[class*='mat-tab-label'] .mat-tab-labels div[aria-selected='true']", "Reports")).first();
+
+    this.clickTasksButton = function () {
+        Util.waitUntilElementIsVisible(tasksButton);
+        return tasksButton.click();
+    };
+
+    this.clickProcessButton = function () {
+        return processButton.click();
+    };
+
+    this.clickReportsButton = function () {
+        Util.waitUntilElementIsVisible(reportsButton);
+        reportsButton.click();
+        return Util.waitUntilElementIsVisible(reportsButtonSelected);
+    };
+};
+
+module.exports = AppNavigationBarPage;
diff --git a/e2e/pages/adf/process_services/attachFormPage.ts b/e2e/pages/adf/process_services/attachFormPage.ts
new file mode 100644
index 0000000000..a8173931ae
--- /dev/null
+++ b/e2e/pages/adf/process_services/attachFormPage.ts
@@ -0,0 +1,75 @@
+/*!
+ * @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 = require('../../../util/util');
+
+export class AttachFormPage {
+
+    noFormMessage =  element(by.id('adf-no-form-message'));
+    attachFormButton = element(by.id('adf-no-form-attach-form-button'));
+    completeButton = element(by.id('adf-no-form-complete-button'));
+    formDropdown = element(by.id('form_id'));
+    cancelButton = element(by.id('adf-no-form-cancel-button'));
+    defaultTitle = element(by.css('mat-card-title[class="mat-card-title mat-card-title"]'));
+    attachFormDropdown = element(by.css("div[class='adf-attach-form-row']"));
+
+    checkNoFormMessageIsDisplayed() {
+        return Util.waitUntilElementIsVisible(this.noFormMessage);
+    }
+
+    checkAttachFormButtonIsDisplayed() {
+        return Util.waitUntilElementIsVisible(this.attachFormButton);
+    }
+
+    checkCompleteButtonIsDisplayed() {
+        return Util.waitUntilElementIsVisible(this.completeButton);
+    }
+
+    clickAttachFormButton() {
+        Util.waitUntilElementIsVisible(this.attachFormButton);
+        return this.attachFormButton.click();
+    }
+
+    checkDefaultFormTitleIsDisplayed(formTitle) {
+        this.defaultTitle.getText().then((result) => {
+            expect(result).toEqual(formTitle);
+        });
+    }
+
+    checkFormDropdownIsDisplayed() {
+        return Util.waitUntilElementIsVisible(this.formDropdown);
+    }
+
+    checkCancelButtonIsDisplayed() {
+        return Util.waitUntilElementIsVisible(this.cancelButton);
+    }
+
+    clickAttachFormDropdown() {
+        Util.waitUntilElementIsClickable(this.attachFormDropdown);
+        return this.attachFormDropdown.click();
+    }
+
+    selectAttachFormOption(option) {
+        Util.waitUntilElementIsClickable(element(by.cssContainingText("mat-option[role='option']", option)));
+        return element(by.cssContainingText("mat-option[role='option']", option)).click();
+    }
+
+    clickCancelButton() {
+        Util.waitUntilElementIsVisible(this.cancelButton);
+        return this.cancelButton.click();
+    }
+}
diff --git a/e2e/pages/adf/process_services/attachmentListPage.ts b/e2e/pages/adf/process_services/attachmentListPage.ts
new file mode 100644
index 0000000000..8203e69193
--- /dev/null
+++ b/e2e/pages/adf/process_services/attachmentListPage.ts
@@ -0,0 +1,105 @@
+/*!
+ * @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, protractor, browser } from 'protractor';
+
+import Util = require('../../../util/util');
+import TestConfig = require('../../../test.config');
+import path = require('path');
+import remote = require('selenium-webdriver/remote');
+
+export class AttachmentListPage {
+
+    attachFileButton = element(by.css("input[type='file']"));
+    buttonMenu = element(by.css("button[data-automation-id='action_menu_0']"));
+    menuPanel = element(by.css("div[class*='mat-menu-panel'] div[class*='mat-menu-content']"));
+    viewButton = element(by.css("button[data-automation-id*='MENU_ACTIONS.VIEW_CONTENT']"));
+    removeButton = element(by.css("button[data-automation-id*='MENU_ACTIONS.REMOVE_CONTENT']"));
+    downloadButton = element(by.css("button[data-automation-id*='MENU_ACTIONS.DOWNLOAD_CONTENT']"));
+    noContentContainer = element(by.css("div[class*='adf-no-content-container']"));
+
+    checkEmptyAttachmentList() {
+        Util.waitUntilElementIsVisible(this.noContentContainer);
+    }
+
+    clickAttachFileButton(fileLocation) {
+        browser.setFileDetector(new remote.FileDetector());
+
+        Util.waitUntilElementIsVisible(this.attachFileButton);
+        return this.attachFileButton.sendKeys(path.resolve(path.join(TestConfig.main.rootPath, fileLocation)));
+    }
+
+    checkFileIsAttached(name) {
+        let fileAttached = element(by.css('div[filename="' + name + '"]'));
+        Util.waitUntilElementIsVisible(fileAttached);
+    }
+
+    checkAttachFileButtonIsNotDisplayed() {
+        Util.waitUntilElementIsNotVisible(this.attachFileButton);
+    }
+
+    viewFile(name) {
+        Util.waitUntilElementIsVisible(element(by.css('div[filename="' + name + '"]')));
+        element(by.css('div[filename="' + name + '"]')).click();
+        Util.waitUntilElementIsVisible(this.buttonMenu);
+        this.buttonMenu.click();
+        Util.waitUntilElementIsVisible(this.viewButton);
+        browser.driver.sleep(500);
+        this.viewButton.click();
+        browser.driver.sleep(500);
+        return this;
+    }
+
+    removeFile(name) {
+        Util.waitUntilElementIsVisible(element(by.css('div[filename="' + name + '"]')));
+        element(by.css('div[filename="' + name + '"]')).click();
+        Util.waitUntilElementIsVisible(this.buttonMenu);
+        this.buttonMenu.click();
+        Util.waitUntilElementIsVisible(this.removeButton);
+        browser.driver.sleep(500);
+        this.removeButton.click();
+        browser.driver.sleep(500);
+        return this;
+    }
+
+    downloadFile(name) {
+        Util.waitUntilElementIsVisible(element(by.css('div[filename="' + name + '"]')));
+        element(by.css('div[filename="' + name + '"]')).click();
+        Util.waitUntilElementIsVisible(this.buttonMenu);
+        this.buttonMenu.click();
+        Util.waitUntilElementIsVisible(this.downloadButton);
+        browser.driver.sleep(500);
+        this.downloadButton.click();
+        return this;
+    }
+
+    doubleClickFile(name) {
+        Util.waitUntilElementIsVisible(element(by.css('div[filename="' + name + '"]')));
+        let fileAttached = element(by.css('div[filename="' + name + '"]'));
+        Util.waitUntilElementIsVisible(fileAttached);
+        Util.waitUntilElementIsClickable(fileAttached);
+        fileAttached.click();
+        browser.actions().sendKeys(protractor.Key.ENTER).perform();
+    }
+
+    checkFileIsRemoved(name) {
+        let fileAttached = element(by.css('div[filename="' + name + '"]'));
+        Util.waitUntilElementIsNotVisible(fileAttached);
+        return this;
+    }
+
+}
diff --git a/e2e/pages/adf/process_services/dialog/createChecklistDialog.js b/e2e/pages/adf/process_services/dialog/createChecklistDialog.js
new file mode 100644
index 0000000000..df014edfca
--- /dev/null
+++ b/e2e/pages/adf/process_services/dialog/createChecklistDialog.js
@@ -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.
+ */
+
+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/startTaskDialog.js b/e2e/pages/adf/process_services/dialog/startTaskDialog.js
new file mode 100644
index 0000000000..2f1838e3e1
--- /dev/null
+++ b/e2e/pages/adf/process_services/dialog/startTaskDialog.js
@@ -0,0 +1,100 @@
+/*!
+ * @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 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-cancle']"));
+    var removeAssigneeIcon = element(by.css("button[data-automation-id='adf-people-selector-deselect']"));
+
+    this.addName = function (userName) {
+        Util.waitUntilElementIsVisible(name);
+        name.sendKeys(userName);
+        return this;
+    };
+
+    this.addDescription = function (userDescription) {
+        Util.waitUntilElementIsVisible(description);
+        description.sendKeys(userDescription);
+        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/taskDetailsToggles.js b/e2e/pages/adf/process_services/dialog/taskDetailsToggles.js
new file mode 100644
index 0000000000..42d57c44f9
--- /dev/null
+++ b/e2e/pages/adf/process_services/dialog/taskDetailsToggles.js
@@ -0,0 +1,39 @@
+/*!
+ * @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 ToggleState = require('../../core/toggleState');
+
+var TaskDetailsToggles = function () {
+
+    var toggleState = new ToggleState();
+    
+    var showDetailsHeaderToggle = element(by.id("showHeaderToggle-input"));
+
+    this.enableShowHeader = function () {
+        toggleState.enableToggle(showDetailsHeaderToggle);
+        return this;
+    };
+
+    this.disableShowHeader = function () {
+        toggleState.disableToggle(showDetailsHeaderToggle);
+        return this;
+    };
+
+};
+module.exports = TaskDetailsToggles;
+
+
diff --git a/e2e/pages/adf/process_services/filtersPage.js b/e2e/pages/adf/process_services/filtersPage.js
new file mode 100644
index 0000000000..fe9d8dcd23
--- /dev/null
+++ b/e2e/pages/adf/process_services/filtersPage.js
@@ -0,0 +1,50 @@
+/*!
+ * @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/formFields.js b/e2e/pages/adf/process_services/formFields.js
new file mode 100644
index 0000000000..0df1bfbbb0
--- /dev/null
+++ b/e2e/pages/adf/process_services/formFields.js
@@ -0,0 +1,134 @@
+/*!
+ * @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(by.css("adf-attach-form div[class*='mat-select-arrow']"));
+    var selectFormContent = element(by.css("div[class*='mat-select-content']"));
+    var completeButton = element(by.id('adf-form-complete'));
+
+    this.setFieldValue = function (By, field, value) {
+        var fieldElement =  element(By(field));
+        Util.waitUntilElementIsVisible(fieldElement);
+        fieldElement.clear().sendKeys(value);
+        return this;
+    };
+
+    this.getWidget = function (fieldId) {
+        var widget = element(by.css("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) {
+        return this.getFieldText(fieldId, labelLocatorParam);
+    };
+
+    this.getFieldText = function (fieldId, labelLocatorParam) {
+        var label = this.getWidget(fieldId).element(labelLocatorParam || labelLocator);
+        Util.waitUntilElementIsVisible(label);
+        return label.getText();
+    };
+
+    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("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();
+    };
+};
+
+module.exports = FormFields;
diff --git a/e2e/pages/adf/process_services/processDetailsPage.js b/e2e/pages/adf/process_services/processDetailsPage.js
new file mode 100644
index 0000000000..2e69cebb1a
--- /dev/null
+++ b/e2e/pages/adf/process_services/processDetailsPage.js
@@ -0,0 +1,149 @@
+/*!
+ * @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 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 taskTitle = element(by.css("h2[class='activiti-task-details__header']"));
+
+    this.checkProcessTitleIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(processTitle);
+        return processTitle.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);
+        activeTask.click();
+    };
+
+    this.checkActiveTaskTitleIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(taskTitle);
+    };
+
+    this.checkProcessDetailsCard = function () {
+        Util.waitUntilElementIsVisible(propertiesList);
+    };
+};
+
+module.exports = ProcessDetailsPage;
diff --git a/e2e/pages/adf/process_services/processFiltersPage.js b/e2e/pages/adf/process_services/processFiltersPage.js
new file mode 100644
index 0000000000..8543979645
--- /dev/null
+++ b/e2e/pages/adf/process_services/processFiltersPage.js
@@ -0,0 +1,125 @@
+/*!
+ * @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 adf-accordion"));
+    var buttonWindow = element(by.css("div > button[data-automation-id='btn-start-process'] > div"));
+    var noContentMessage = element(by.css("p[class='adf-empty-content__title']"));
+    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[class*='--text'] span");
+
+    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(by.css('div[data-automation-id="text_' + title + '"]'));
+        Util.waitUntilElementIsVisible(processName);
+        processName.click();
+    };
+
+    this.checkFilterIsHighlighted = function (filterName) {
+        var processNameHighlighted = element(by.css("mat-list-item.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.checkFilterIsNotDisplayed = function (name) {
+        var filterName = element(by.css("span[data-automation-id='" + name + "_filter']"));
+        return Util.waitUntilElementIsNotVisible(filterName);
+    };
+};
+
+module.exports = ProcessFiltersPage;
diff --git a/e2e/pages/adf/process_services/processListPage.js b/e2e/pages/adf/process_services/processListPage.js
new file mode 100644
index 0000000000..0365ce5466
--- /dev/null
+++ b/e2e/pages/adf/process_services/processListPage.js
@@ -0,0 +1,75 @@
+/*!
+ * @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 TestConfig = require('../../../test.config');
+var NavigationBarPage = require('../navigationBarPage');
+
+var ProcessListPage = function () {
+
+    var processListURL = TestConfig.adf.url + TestConfig.adf.port + "/activiti/apps/0/processes/";
+    var processListIcon = element(by.css("mat-icon[class='adf-empty-content__icon mat-icon material-icons']"));
+    var processListTitle = element(by.css("p[class='adf-empty-content__title']"));
+    var processListSubtitle = element(by.css("p[class='adf-empty-content__subtitle']"));
+    var processDetailsMessage = element(by.css("adf-process-instance-details div[class='ng-star-inserted']"));
+    var openProcessDropdown = element(by.css('mat-select[aria-label="Select Process"]'));
+    var selectProcessDropdown = element.all(by.css('span[class="mat-option-text"]'));
+    var startProcessButton = element(by.css('button[data-automation-id="btn-start"]'));
+
+    this.goToProcessList = function () {
+        var navigationBarPage = new NavigationBarPage();
+        navigationBarPage.clickProcessServicesButton();
+        Util.waitUntilElementIsVisible(pageLoaded);
+    };
+
+    this.checkProcessListTitleIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(processListTitle);
+        return processListTitle.getText();
+    };
+
+    this.checkProcessDetailsMessagee = function () {
+        Util.waitUntilElementIsVisible(processListTitle);
+        return processDetailsMessage.getText();
+    };
+
+    this.openProcessDropdown = function () {
+        Util.waitUntilElementIsVisible(openProcessDropdown);
+        return openProcessDropdown.click();
+    };
+
+    this.selectProcessDropdown = function (index) {
+        Util.waitUntilElementIsVisible(selectProcessDropdown);
+        return selectProcessDropdown.get(index).click();
+    };
+
+    this.startProcess = function () {
+        Util.waitUntilElementIsVisible(startProcessButton);
+        return startProcessButton.click();
+    };
+
+    this.checkProcessListIcon = function () {
+        Util.waitUntilElementIsVisible(processListIcon);
+        return processListIcon.getText();
+    };
+
+    this.checkProcessListSubtitle = function () {
+        Util.waitUntilElementIsVisible(processListSubtitle);
+        return processListSubtitle.getText();
+    };
+};
+
+module.exports = ProcessListPage;
diff --git a/e2e/pages/adf/process_services/processServicesPage.js b/e2e/pages/adf/process_services/processServicesPage.js
new file mode 100644
index 0000000000..aa4207db5f
--- /dev/null
+++ b/e2e/pages/adf/process_services/processServicesPage.js
@@ -0,0 +1,108 @@
+/*!
+ * @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 AppNavigationBarPage = require('./appNavigationBarPage');
+
+var ProcessServicesPage = function(){
+
+    var apsAppsContainer = element(by.css("div[class='adf-app-listgrid ng-star-inserted']"));
+    var processServices = element(by.css("a[data-automation-id='Process Services']"));
+    var taskApp = element(by.css("mat-card[title='Task App']"));
+    var iconTypeLocator = by.css("mat-icon[class*='card-logo-icon']");
+    var descriptionLocator = by.css("mat-card-subtitle[class*='subtitle']");
+    var processInstanceList = element(by.css("adf-process-instance-list"));
+
+    /**
+     * Check Process Page Container is displayed
+     * @method checkApsContainer
+     */
+    this.checkApsContainer = function(){
+        Util.waitUntilElementIsVisible(apsAppsContainer);
+    };
+
+    /**
+     * Go to Process Services Page
+     * @method goToProcessServices
+     * */
+    this.goToProcessServices = function() {
+        Util.waitUntilElementIsVisible(processServices);
+        processServices.click();
+        this.checkApsContainer();
+        return this;
+    };
+
+    /**
+     * Go to App
+     * @method goToApp
+     * */
+    this.goToApp = function(applicationName) {
+        var app = element(by.css("mat-card[title='" + applicationName +"']"));
+        Util.waitUntilElementIsVisible(app);
+        app.click();
+        return new AppNavigationBarPage();
+    };
+
+    /**
+     * Go to Task App
+     * @method goToTaskApp
+     * */
+    this.goToTaskApp = function() {
+        Util.waitUntilElementIsVisible(taskApp);
+        taskApp.click();
+        return new AppNavigationBarPage();
+    };
+
+    this.getAppIconType = function (applicationName) {
+        var app = element(by.css("mat-card[title='" + applicationName +"']"));
+        Util.waitUntilElementIsVisible(app);
+        var iconType = app.element(iconTypeLocator);
+        Util.waitUntilElementIsVisible(iconType);
+        return iconType.getText();
+    };
+
+    this.getBackgroundColor = function(applicationName) {
+        var app = element(by.css("mat-card[title='" + applicationName +"']"));
+        Util.waitUntilElementIsVisible(app);
+        return app.getCssValue("background-color");
+    };
+
+    this.getDescription = function(applicationName) {
+        var app = element(by.css("mat-card[title='" + applicationName +"']"));
+        Util.waitUntilElementIsVisible(app);
+        var description = app.element(descriptionLocator);
+        Util.waitUntilElementIsVisible(description);
+        return description.getText();
+    };
+
+    this.checkAppIsNotDisplayed = function(applicationName) {
+        var app = element(by.css("mat-card[title='" + applicationName +"']"));
+        return Util.waitUntilElementIsNotOnPage(app);
+    };
+
+    this.checkAppIsDisplayed = function(applicationName) {
+        var app = element(by.css("mat-card[title='" + applicationName +"']"));
+        return Util.waitUntilElementIsVisible(app);
+    };
+
+    this.checkProcessListIsDisplayed = function() {
+        Util.waitUntilElementIsVisible(processInstanceList);
+    }
+
+};
+
+module.exports = ProcessServicesPage;
diff --git a/e2e/pages/adf/process_services/startProcessPage.js b/e2e/pages/adf/process_services/startProcessPage.js
new file mode 100644
index 0000000000..655ce185bd
--- /dev/null
+++ b/e2e/pages/adf/process_services/startProcessPage.js
@@ -0,0 +1,86 @@
+/*!
+ * @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("div[class='mat-select-arrow-wrapper'] div"));
+    var cancelProcessButton = element(by.id('cancle_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'));
+
+    this.checkNoProcessMessage = function () {
+        Util.waitUntilElementIsVisible(noProcess);
+    }
+
+    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);
+        processNameInput.clear();
+        processNameInput.sendKeys(name);
+    };
+
+    this.selectFromProcessDropdown = function (name) {
+        Util.waitUntilElementIsVisible(selectProcessDropdownArrow);
+        Util.waitUntilElementIsClickable(selectProcessDropdownArrow)
+        selectProcessDropdownArrow.click();
+        var selectProcessDropdown = element(by.cssContainingText('.mat-option-text', name));
+        Util.waitUntilElementIsVisible(selectProcessDropdown);
+        Util.waitUntilElementIsClickable(selectProcessDropdown);
+        selectProcessDropdown.click();
+        return this;
+    };
+
+    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);
+    };
+
+};
+
+module.exports = StartProcessPage;
diff --git a/e2e/pages/adf/process_services/taskDetailsPage.js b/e2e/pages/adf/process_services/taskDetailsPage.js
new file mode 100644
index 0000000000..e9cc845b97
--- /dev/null
+++ b/e2e/pages/adf/process_services/taskDetailsPage.js
@@ -0,0 +1,305 @@
+/*!
+ * @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 TaskDetailsToggles = require('./dialog/taskDetailsToggles');
+
+var TaskDetailsPage = function () {
+
+    var formNameField = element(by.css("span[data-automation-id*='formName'] span"));
+    var assigneeField = element(by.css("span[data-automation-id*='assignee'] span"));
+    var statusField = element(by.css("span[data-automation-id*='status'] span"));
+    var categoryField = element(by.css("span[data-automation-id*='category'] span"));
+    var parentNameField = element(by.css("span[data-automation-id*='parentName'] span"));
+    var createdField = element(by.css("span[data-automation-id='card-dateitem-created'] span"));
+    var idField = element(by.css("span[data-automation-id*='id'] span"));
+    var descriptionField = element(by.css("span[data-automation-id*='description'] span"));
+    var dueDateField = element(by.css("span[data-automation-id*='dueDate'] span"));
+    var activitiesTitle = element(by.css("div[class*='adf-info-drawer-layout-header-title'] div"));
+    var commentField = element(by.id("comment-input"));
+    var addCommentButton = element(by.css("[data-automation-id='comments-input-add']"));
+    var activityTab = element(by.cssContainingText("div[class*='mat-tab-label ']", "Activity"));
+    var detailsTab = element(by.cssContainingText("div[class*='mat-tab-label ']", "Details"));
+    var involvePeopleButton = element(by.css("div[class*='add-people']"));
+    var addPeopleField = element(by.css("input[data-automation-id='adf-people-search-input']"));
+    var addInvolvedUserButton = element(by.css("button[id='add-people'] span"));
+    var emailInvolvedUser = by.xpath("following-sibling::div[@class='people-email ng-star-inserted']");
+    var editActionInvolvedUser = by.xpath("following-sibling::div[@class='people-edit-label ng-star-inserted']");
+    var involvedUserPic = by.xpath("ancestor::div/ancestor::div/preceding-sibling::div//div[@class='adf-people-search-people-pic ng-star-inserted']");
+    var infoDrawer = element(by.css("adf-info-drawer"));
+    var taskDetailsSection = element(by.css("div[data-automation-id='adf-tasks-details']"));
+    var taskDetailsEmptySection = element(by.css("div[data-automation-id='adf-tasks-details--empty']"));
+    var completeTask = element(by.css("button[id='adf-no-form-complete-button']"));
+    var auditLogButton = element(by.css("button[adf-task-audit]"));
+
+    var noPeopleInvolved = element(by.id('no-people-label'));
+    var cancelInvolvePeopleButton = element(by.id('close-people-search'));
+    var involvePeopleHeader = element(by.css("div[class='search-text-header']"));
+    var removeInvolvedPeople = element(by.css("button[data-automation-id='Remove']"));
+    var peopleTitle = element(by.id("people-title"));
+
+    this.getFormName = function () {
+        Util.waitUntilElementIsVisible(formNameField);
+        return formNameField.getText();
+    };
+
+    this.getAssignee = function () {
+        Util.waitUntilElementIsVisible(assigneeField);
+        return assigneeField.getText();
+    };
+
+    this.getStatus = function () {
+        Util.waitUntilElementIsVisible(statusField);
+        return statusField.getText();
+    };
+
+    this.getCategory = function () {
+        Util.waitUntilElementIsVisible(categoryField);
+        return categoryField.getText();
+    };
+
+    this.getParentName = function () {
+        Util.waitUntilElementIsVisible(parentNameField);
+        return parentNameField.getText();
+    };
+
+    this.getCreated = function () {
+        Util.waitUntilElementIsVisible(createdField);
+        return createdField.getText();
+    };
+
+    this.getId = function () {
+        Util.waitUntilElementIsVisible(idField);
+        return idField.getText();
+    };
+
+    this.getDescription = function () {
+        Util.waitUntilElementIsVisible(descriptionField);
+        return descriptionField.getText();
+    };
+
+    this.getDueDate = function () {
+        Util.waitUntilElementIsVisible(dueDateField);
+        return dueDateField.getText();
+    };
+
+    this.getTitle = function () {
+        Util.waitUntilElementIsVisible(activitiesTitle);
+        return activitiesTitle.getText();
+    };
+
+    this.selectActivityTab = function () {
+        Util.waitUntilElementIsVisible(activityTab);
+        activityTab.getAttribute('aria-selected').then(function (check) {
+            if (check === 'false') {
+                activityTab.click();
+                expect(activityTab.getAttribute('aria-selected')==="true");
+            }
+        });
+        return this;
+    };
+
+    this.selectDetailsTab = function () {
+        Util.waitUntilElementIsVisible(detailsTab);
+        detailsTab.getAttribute('aria-selected').then(function (check) {
+            if (check === 'false') {
+                detailsTab.click();
+                expect(detailsTab.getAttribute('aria-selected')==="true");
+            }
+        });
+        return this;
+    };
+
+    this.addComment = function (comment) {
+        Util.waitUntilElementIsVisible(commentField);
+        commentField.sendKeys(comment);
+        addCommentButton.click();
+        return this;
+    };
+
+    this.clearComment = function (comment) {
+        Util.waitUntilElementIsVisible(commentField);
+        commentField.sendKeys(protractor.Key.ENTER);
+        return this;
+    };
+
+    this.checkCommentIsDisplayed = function (comment) {
+        var row = element(by.cssContainingText("div[id='comment-message']", comment));
+        Util.waitUntilElementIsVisible(row);
+        return this;
+    };
+
+    this.clickInvolvePeopleButton = function () {
+        Util.waitUntilElementIsVisible(involvePeopleButton);
+        Util.waitUntilElementIsClickable(involvePeopleButton);
+        browser.actions().mouseMove(involvePeopleButton).perform();
+        involvePeopleButton.click();
+        return this;
+    };
+
+    this.typeUser = function (user) {
+        Util.waitUntilElementIsVisible(addPeopleField);
+        addPeopleField.sendKeys(user);
+        return this;
+    };
+
+    this.selectUserToInvolve = function(user) {
+        this.getRowsUser(user).click();
+        return this;
+    };
+
+    this.checkUserIsSelected = function(user) {
+        var row = element(by.cssContainingText("div[class*='search-list-container'] div[class*='people-full-name']", user));
+        var selectedRow = this.getRowsUser(user).element(by.css("ancestor::tr[class*='is-selected']"));
+        Util.waitUntilElementIsVisible(row);
+        return this;
+    };
+
+    this.clickAddInvolvedUserButton = function () {
+        Util.waitUntilElementIsVisible(addInvolvedUserButton);
+        Util.waitUntilElementIsClickable(addInvolvedUserButton);
+        addInvolvedUserButton.click();
+        return this;
+    }
+
+    this.getRowsUser = function (user) {
+        var row = element(by.cssContainingText("div[class*='people-full-name']", user));
+        Util.waitUntilElementIsVisible(row);
+        return row;
+    };
+
+    this.removeInvolvedUser = function (user) {
+        var row = this.getRowsUser(user).element(by.xpath("ancestor::div[contains(@class, 'adf-datatable-row')]"));
+        Util.waitUntilElementIsVisible(row);
+        row.element(by.css("button[data-automation-id='action_menu_0']")).click();
+        Util.waitUntilElementIsVisible(removeInvolvedPeople);
+        return removeInvolvedPeople.click();
+    };
+
+    this.getInvolvedUserEmail = function (user) {
+        var email = this.getRowsUser(user).element(emailInvolvedUser);
+        Util.waitUntilElementIsVisible(email);
+        return email.getText();
+    };
+
+    this.getInvolvedUserEditAction = function (user) {
+        var edit = this.getRowsUser(user).element(editActionInvolvedUser);
+        Util.waitUntilElementIsVisible(edit);
+        return edit.getText();
+    };
+
+    this.clickAuditLogButton = function () {
+        Util.waitUntilElementIsVisible(auditLogButton);
+        auditLogButton.click();
+    };
+
+    this.usingTaskDetailsToggles = function () {
+        return new TaskDetailsToggles();
+    };
+
+    this.taskInfoDrawerIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(infoDrawer);
+    };
+
+    this.taskInfoDrawerIsNotDisplayed = function () {
+        Util.waitUntilElementIsNotOnPage(infoDrawer);
+    };
+
+    this.checkNoPeopleIsInvolved = function () {
+        Util.waitUntilElementIsVisible(noPeopleInvolved);
+        return this;
+    };
+
+    this.clickCancelInvolvePeopleButton = function () {
+        Util.waitUntilElementIsVisible(cancelInvolvePeopleButton);
+        cancelInvolvePeopleButton.click();
+        return this;
+    };
+
+    this.getInvolvePeopleHeader = function () {
+        Util.waitUntilElementIsVisible(involvePeopleHeader);
+        return involvePeopleHeader.getText();
+    };
+
+    this.getInvolvePeoplePlaceholder = function () {
+        Util.waitUntilElementIsVisible(addPeopleField);
+        return addPeopleField.getAttribute('placeholder');
+    };
+
+    this.checkCancelButtonIsEnabled = function () {
+        Util.waitUntilElementIsVisible(cancelInvolvePeopleButton);
+        Util.waitUntilElementIsClickable(cancelInvolvePeopleButton);
+        return this;
+    };
+
+    this.checkAddPeopleButtonIsEnabled = function () {
+        Util.waitUntilElementIsVisible(addInvolvedUserButton);
+        Util.waitUntilElementIsClickable(addInvolvedUserButton);
+        return this;
+    };
+
+    this.noUserIsDisplayedInSearchInvolvePeople = function (user) {
+        Util.waitUntilElementIsNotOnPage(element(by.cssContainingText("div[class*='people-full-name']", user)));
+        return this;
+    };
+
+    this.getInvolvedPeopleTitle = function () {
+        Util.waitUntilElementIsVisible(peopleTitle);
+        return peopleTitle.getText();
+    };
+
+    this.getInvolvedPeopleInitialImage = function (user) {
+        var pic = this.getRowsUser(user).element(involvedUserPic);
+        Util.waitUntilElementIsVisible(pic);
+        return pic.getText();
+    }
+    
+    this.checkTaskDetails = function () {
+        Util.waitUntilElementIsVisible(taskDetailsSection);
+        return taskDetailsSection.getText();
+    };
+
+    this.checkTaskDetailsEmpty = function () {
+        Util.waitUntilElementIsVisible(taskDetailsEmptySection);
+        return taskDetailsEmptySection.getText();
+    };
+
+    this.checkTaskDetailsDisplayed = function () {
+        Util.waitUntilElementIsVisible(taskDetailsSection);
+        Util.waitUntilElementIsVisible(formNameField);
+        Util.waitUntilElementIsVisible(assigneeField);
+        Util.waitUntilElementIsVisible(statusField);
+        Util.waitUntilElementIsVisible(categoryField);
+        Util.waitUntilElementIsVisible(parentNameField);
+        Util.waitUntilElementIsVisible(createdField);
+        Util.waitUntilElementIsVisible(idField);
+        Util.waitUntilElementIsVisible(descriptionField);
+        Util.waitUntilElementIsVisible(dueDateField);
+        Util.waitUntilElementIsVisible(dueDateField);
+        Util.waitUntilElementIsVisible(activitiesTitle);
+
+        return taskDetailsSection.getText();
+    };
+
+    this.clickCompleteTask = function () {
+        Util.waitUntilElementIsVisible(completeTask);
+        return completeTask.click();
+    };
+
+};
+
+module.exports = TaskDetailsPage;
diff --git a/e2e/pages/adf/process_services/taskFiltersPage.js b/e2e/pages/adf/process_services/taskFiltersPage.js
new file mode 100644
index 0000000000..5de2bf59f4
--- /dev/null
+++ b/e2e/pages/adf/process_services/taskFiltersPage.js
@@ -0,0 +1,115 @@
+/*!
+ * @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 TaskFiltersPage = function () {
+
+    var myTasks = element(by.css("span[data-automation-id='My Tasks_filter']"));
+    var queuedTask = element(by.css("span[data-automation-id='Queued Tasks_filter']"));
+    var completedTask = element(by.css("span[data-automation-id='Completed Tasks_filter']"));
+    var involvedTask = element(by.css("span[data-automation-id='Involved Tasks_filter']"));
+    var tasksAccordionButton = element(by.css("div[data-automation-id='adf-panel-heading']"));
+    var tasksAccordionExpanded = element(by.xpath("mat-expansion-panel[contains(@class, 'mat-expanded')]"));
+    var startTaskButton = element(by.css("button[id='button-start']"));
+    var newTaskButton = element(by.css("button[data-automation-id='btn-start-task']"));
+    var activeFilter = element(by.xpath("mat-list-item[contains(@class, 'active')]"));
+    var emptyTaskDetails = element(by.css("adf-task-details > div > div"));
+    var emptyTaskList = element(by.css("p[class='adf-empty-content__title']"));
+    
+    this.checkMyTasksItem = function() {
+        Util.waitUntilElementIsVisible(myTasks);
+        return myTasks;
+    };
+
+    this.checkQueuedTaskItem = function() {
+        Util.waitUntilElementIsVisible(queuedTask);
+        return queuedTask;
+    };
+    
+    this.clickMyTaskTaskItem = function() {
+        Util.waitUntilElementIsVisible(myTasks);
+        return myTasks.click();
+    };
+
+    this.clickCompletedTaskItem = function() {
+        Util.waitUntilElementIsVisible(completedTask);
+        return completedTask.click();
+    };
+
+    this.checkCompletedTaskItem = function() {
+        Util.waitUntilElementIsVisible(completedTask);
+        return completedTask;
+    };
+
+    this.clickQueuedTaskItem = function() {
+        Util.waitUntilElementIsVisible(queuedTask);
+        return queuedTask.click();
+    };
+
+    this.clickInvolvedTaskItem = function() {
+        Util.waitUntilElementIsVisible(involvedTask);
+        return involvedTask.click();
+    };
+
+    this.checkInvolvedTaskItem = function() {
+        Util.waitUntilElementIsVisible(involvedTask);
+        return involvedTask;
+    };
+
+    this.clickTasksAccordionButton = function() {
+        Util.waitUntilElementIsVisible(tasksAccordionButton);
+        return tasksAccordionButton.click();
+    };
+
+    this.checkTasksAccordionExtended = function() {
+        Util.waitUntilElementIsVisible(tasksAccordionExpanded);
+        return tasksAccordionExpanded;
+    };
+
+    this.checkTasksAccordionClosed = function() {
+        Util.waitUntilElementIsNotVisible(tasksAccordionExpanded);
+        return tasksAccordionExpanded;
+    };
+
+    this.clickStartTaskButton = function() {
+        Util.waitUntilElementIsVisible(startTaskButton);
+        startTaskButton.click();
+    };
+
+    this.clickNewTaskButton = function() {
+        Util.waitUntilElementIsVisible(newTaskButton);
+        newTaskButton.click();
+    };
+
+    this.checkActiveFilterActive = function() {
+        Util.waitUntilElementIsVisible(activeFilter);
+        return activeFilter.getText();
+    }
+
+    this.checkEmptyTaskList = function() {
+        Util.waitUntilElementIsVisible(emptyTaskList);
+        return emptyTaskList.getText();
+    };
+
+    this.checkEmptyTaskDetails = function() {
+        Util.waitUntilElementIsVisible(emptyTaskDetails);
+        return emptyTaskDetails.getText();
+    }
+};
+
+module.exports = TaskFiltersPage;
diff --git a/e2e/pages/adf/process_services/tasksListPage.js b/e2e/pages/adf/process_services/tasksListPage.js
new file mode 100644
index 0000000000..76bb4100ef
--- /dev/null
+++ b/e2e/pages/adf/process_services/tasksListPage.js
@@ -0,0 +1,77 @@
+/*!
+ * @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 TasksListPage = function () {
+
+    var taskList = element(by.css("adf-tasklist"));
+    var tableBody = element.all(by.css("adf-datatable div[class='adf-datatable-body']")).first();
+    var sortByName = element(by.css('div[data-automation-id="auto_id_name"]'));
+    var firstTaskOnTaskList = element.all(by.css('div[class="adf-datatable-body"] span')).first();
+    var spinner = element(by.css('mat-progress-spinner'));
+
+    this.clickSortByName = function () {
+        Util.waitUntilElementIsVisible(sortByName);
+        return sortByName.click();
+    };
+
+    this.checkHighlightedTaskInTasksList = function(taskName) {
+        var row = by.cssContainingText('div[class="adf-datatable-row is-selected ng-star-inserted"] span', taskName);
+        Util.waitUntilElementIsVisible(taskList.element(row));
+        return this;
+    };
+    
+    this.checkTaskIsDisplayedInTasksList = function(taskName) {
+        var row = by.cssContainingText("span", taskName);
+        Util.waitUntilElementIsVisible(taskList.element(row));
+        return this;
+    };
+
+    this.selectTaskFromTasksList = function(taskName) {
+        var row = by.cssContainingText("span", taskName);
+        Util.waitUntilElementIsVisible(taskList.element(row));
+        taskList.element(row).click();
+        return this;
+    };
+
+    this.checkTaskIsNotDisplayedInTasksList = function(taskName) {
+        var row = by.cssContainingText("span", taskName);
+        Util.waitUntilElementIsNotOnPage(taskList.element(row));
+        return this;
+    };
+
+    this.checkTaskListIsLoaded = function () {
+        Util.waitUntilElementIsVisible(taskList);
+        return this;
+    };
+
+    this.waitForTableBody = function (){
+        Util.waitUntilElementIsVisible(tableBody);
+    };
+
+    this.firstTaskOnTaskList = function (){
+        Util.waitUntilElementIsVisible(firstTaskOnTaskList);
+        return firstTaskOnTaskList.getText();
+    };
+
+    this.checkSpinnerIsDisplayed = function () {
+        Util.waitUntilElementIsPresent(spinner);
+    };
+};
+
+module.exports = TasksListPage;
diff --git a/e2e/pages/adf/process_services/tasksPage.js b/e2e/pages/adf/process_services/tasksPage.js
new file mode 100644
index 0000000000..1588918998
--- /dev/null
+++ b/e2e/pages/adf/process_services/tasksPage.js
@@ -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.
+ */
+
+var Util = require('../../../util/util');
+var StartTaskDialog = require('./dialog/startTaskDialog');
+var FormFields = require('./formFields');
+var TaskDetails = require('./taskDetailsPage');
+var FiltersPage = require('./filtersPage');
+var ChecklistDialog = require('./dialog/createChecklistDialog');
+var TasksListPage = require('./tasksListPage');
+
+var TasksPage = function () {
+
+    var createButton = element(by.css("button[data-automation-id='create-button'"));
+    var newTaskButton = element(by.css("button[data-automation-id='btn-start-task']"));
+    var addChecklistButton = element(by.css("button[class*='adf-add-to-checklist-button']"));
+    var rowByRowName = by.xpath("ancestor::mat-chip");
+    var checklistContainer = by.css("div[class*='checklist-menu']");
+    var taskTitle = "h2[class='activiti-task-details__header'] span";
+    var rows = by.css("div[class*='adf-datatable-body'] div[class*='adf-datatable-row'] div[class*='adf-data-table-cell']");
+    var completeButtonNoForm = element(by.id("adf-no-form-complete-button"));
+    var checklistDialog = element(by.id("checklist-dialog"));
+    var checklistNoMessage = element(by.id("checklist-none-message"));
+    var numberOfChecklists = element(by.css("[data-automation-id='checklist-label'] mat-chip"));
+
+    this.createNewTask = function () {
+        this.createButtonIsDisplayed();
+        this.clickOnCreateButton();
+        this.newTaskButtonIsDisplayed();
+        newTaskButton.click();
+        return new StartTaskDialog();
+    };
+
+    this.clickOnNewTaskButton = function() {
+        Util.waitUntilElementIsClickable(newTaskButton);
+        newTaskButton.click();
+        return this;
+    };
+
+    this.createButtonIsDisplayed = function() {
+        Util.waitUntilElementIsVisible(createButton);
+        return this;
+    };
+
+    this.newTaskButtonIsDisplayed = function() {
+        Util.waitUntilElementIsVisible(newTaskButton);
+        return this;
+    };
+
+    this.clickOnCreateButton = function() {
+        Util.waitUntilElementIsClickable(createButton);
+        createButton.click();
+        return this;
+    };
+
+    this.usingFormFields = function () {
+      return new FormFields();
+    };
+
+    this.usingTaskDetails = function () {
+        return new TaskDetails();
+    };
+
+    this.usingFiltersPage = function () {
+        return new FiltersPage();
+    };
+
+    this.usingTasksListPage = function () {
+        return new TasksListPage();
+    };
+
+    this.usingCheckListDialog = function () {
+        return new ChecklistDialog();
+    };
+
+    this.clickOnAddChecklistButton = function () {
+        Util.waitUntilElementIsClickable(addChecklistButton);
+        addChecklistButton.click();
+        return new ChecklistDialog();
+    };
+
+    this.getRowsName = function (name) {
+        var row = element(checklistContainer).element(by.cssContainingText("span", name));
+        Util.waitUntilElementIsVisible(row);
+        return row;
+    };
+
+    this.getChecklistByName = function (checklist) {
+        var row = this.getRowsName(checklist).element(rowByRowName);
+        Util.waitUntilElementIsVisible(row);
+        return row;
+    };
+
+    this.checkChecklistIsDisplayed = function (checklist) {
+        Util.waitUntilElementIsVisible(this.getChecklistByName(checklist));
+        return this;
+    };
+
+    this.checkChecklistIsNotDisplayed = function (checklist) {
+        Util.waitUntilElementIsNotOnPage(element(checklistContainer).element(by.cssContainingText("span", checklist)));
+        return this;
+    };
+
+    this.checkTaskTitle = function(taskName) {
+        Util.waitUntilElementIsVisible(element(by.css(taskTitle)));
+        var title = element(by.cssContainingText(taskTitle, taskName));
+        Util.waitUntilElementIsVisible(title);
+        return this;
+    };
+
+    this.getAllDisplayedRows = function(){
+        return element.all(rows).count();
+    };
+
+    this.completeTaskNoForm = function () {
+        Util.waitUntilElementIsClickable(completeButtonNoForm);
+        completeButtonNoForm.click();
+    };
+
+    this.completeTaskNoFormNotDisplayed = function () {
+        Util.waitUntilElementIsNotOnPage(completeButtonNoForm);
+        return this;
+    };
+
+    this.checkChecklistDialogIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(checklistDialog);
+        return this;
+    };
+
+    this.checkChecklistDialogIsNotDisplayed = function () {
+        Util.waitUntilElementIsNotOnPage(checklistDialog);
+        return this;
+    };
+
+    this.checkNoChecklistIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(checklistNoMessage);
+        return this;
+    };
+
+    this.getNumberOfChecklists = function () {
+        Util.waitUntilElementIsVisible(numberOfChecklists);
+        return numberOfChecklists.getText();
+    };
+
+    this.removeChecklists = function (checklist) {
+        var row = this.getRowsName(checklist).element(rowByRowName);
+        Util.waitUntilElementIsVisible(row.element(by.css('button')));
+        row.element(by.css('button')).click();
+        return this;
+    };
+
+    this.checkChecklistsRemoveButtonIsNotDisplayed = function (checklist) {
+        var row = this.getRowsName(checklist).element(rowByRowName);
+        Util.waitUntilElementIsNotOnPage(row.element(by.css('button')));
+        return this;
+    };
+
+};
+
+module.exports = TasksPage;
diff --git a/e2e/pages/adf/process_services/widgets/AttachFile.js b/e2e/pages/adf/process_services/widgets/AttachFile.js
new file mode 100644
index 0000000000..de2ad866b7
--- /dev/null
+++ b/e2e/pages/adf/process_services/widgets/AttachFile.js
@@ -0,0 +1,59 @@
+/*!
+ * @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 FormFields = require('../formFields');
+var TestConfig = require('../../../../test.config');
+var path = require('path');
+var Util = require('../../../../util/util');
+var remote = require('selenium-webdriver/remote');
+
+var AttachFile = function () {
+
+    var formFields = new FormFields();
+    var uploadLocator = by.css("button[id='attachfile']");
+    var localStorageButton = element(by.css("input[id='attachfile']"));
+    var filesListLocator = by.css("div[id='adf-attach-widget-readonly-list']");
+
+    this.attachFile = function (fieldId, fileLocation) {
+        browser.setFileDetector(new remote.FileDetector());
+        var widget = formFields.getWidget(fieldId);
+        var uploadButton = widget.element(uploadLocator);
+        Util.waitUntilElementIsVisible(uploadButton);
+        uploadButton.click();
+
+        Util.waitUntilElementIsVisible(localStorageButton);
+        localStorageButton.sendKeys(path.resolve(path.join(TestConfig.main.rootPath, fileLocation)));
+        return this;
+    };
+
+    this.checkFileIsAttached = function (fieldId, name) {
+        var widget = formFields.getWidget(fieldId);
+        var fileAttached = widget.element(filesListLocator).element(by.cssContainingText("mat-list-item span ", name));
+        Util.waitUntilElementIsVisible(fileAttached);
+        return this;
+    };
+
+    this.viewFile = function (name) {
+        var fileView = element(filesListLocator).element(by.cssContainingText("mat-list-item span ", name));
+        Util.waitUntilElementIsVisible(fileView);
+        fileView.click();
+        browser.actions().doubleClick(fileView).perform();
+        return this;
+    };
+};
+
+module.exports = AttachFile;
diff --git a/e2e/pages/adf/process_services/widgets/DisplayText.js b/e2e/pages/adf/process_services/widgets/DisplayText.js
new file mode 100644
index 0000000000..19694f4fa0
--- /dev/null
+++ b/e2e/pages/adf/process_services/widgets/DisplayText.js
@@ -0,0 +1,33 @@
+/*!
+ * @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 FormFields = require('../formFields');
+
+var DisplayText = function () {
+
+    var formFields = new FormFields();
+
+    var labelLocator = by.css("div[class*='display-text-widget']");
+
+    this.getFieldLabel = function (fieldId) {
+        return formFields.getFieldLabel(fieldId, labelLocator);
+    };
+
+};
+
+module.exports = DisplayText;
+
diff --git a/e2e/pages/adf/process_services/widgets/DisplayValue.js b/e2e/pages/adf/process_services/widgets/DisplayValue.js
new file mode 100644
index 0000000000..09b7711b08
--- /dev/null
+++ b/e2e/pages/adf/process_services/widgets/DisplayValue.js
@@ -0,0 +1,34 @@
+/*!
+ * @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 FormFields = require('../formFields');
+
+var DisplayValue = function () {
+
+    var formFields = new FormFields();
+
+    var labelLocator = by.css("span[class*='unknown-text']");
+
+    this.getFieldLabel = function (fieldId) {
+        return formFields.getFieldLabel(fieldId, labelLocator);
+    };
+
+};
+
+module.exports = DisplayValue;
+
+
diff --git a/e2e/pages/adf/process_services/widgets/Dropdown.js b/e2e/pages/adf/process_services/widgets/Dropdown.js
new file mode 100644
index 0000000000..7c3b9c0d08
--- /dev/null
+++ b/e2e/pages/adf/process_services/widgets/Dropdown.js
@@ -0,0 +1,32 @@
+/*!
+ * @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 FormFields = require('../formFields');
+
+var Dropdown = function () {
+
+    var formFields = new FormFields();
+
+    var selectedOptionLocator = by.css("mat-select[id='dropdown'] span span");
+
+    this.getSelectedOptionText = function (fieldId) {
+        return formFields.getFieldText(fieldId, selectedOptionLocator);
+    };
+
+};
+
+module.exports = Dropdown;
diff --git a/e2e/pages/adf/process_services/widgets/DynamicTable.js b/e2e/pages/adf/process_services/widgets/DynamicTable.js
new file mode 100644
index 0000000000..adede7648e
--- /dev/null
+++ b/e2e/pages/adf/process_services/widgets/DynamicTable.js
@@ -0,0 +1,37 @@
+/*!
+ * @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 FormFields = require('../formFields');
+
+var DynamicTable = function () {
+
+    var formFields = new FormFields();
+
+    var labelLocator = by.css("dynamic-table-widget div div");
+    var columnNameLocator = by.css("table[id*='dynamic-table'] th");
+
+    this.getFieldLabel = function (fieldId) {
+        return formFields.getFieldLabel(fieldId, labelLocator);
+    };
+
+    this.getColumnName = function (fieldId) {
+        return formFields.getFieldText(fieldId, columnNameLocator);
+    };
+
+};
+
+module.exports = DynamicTable;
diff --git a/e2e/pages/adf/process_services/widgets/Header.js b/e2e/pages/adf/process_services/widgets/Header.js
new file mode 100644
index 0000000000..7dabf4ed3e
--- /dev/null
+++ b/e2e/pages/adf/process_services/widgets/Header.js
@@ -0,0 +1,32 @@
+/*!
+ * @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 FormFields = require('../formFields');
+
+var Header = function () {
+
+    var formFields = new FormFields();
+
+    var labelLocator = by.css("span[id='container-header-label']");
+
+    this.getFieldLabel = function (fieldId) {
+        return formFields.getFieldLabel(fieldId, labelLocator);
+    };
+
+};
+
+module.exports = Header;
diff --git a/e2e/pages/adf/process_services/widgets/Hyperlink.js b/e2e/pages/adf/process_services/widgets/Hyperlink.js
new file mode 100644
index 0000000000..880b8d9c37
--- /dev/null
+++ b/e2e/pages/adf/process_services/widgets/Hyperlink.js
@@ -0,0 +1,32 @@
+/*!
+ * @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 FormFields = require('../formFields');
+
+var Hyperlink = function () {
+
+    var formFields = new FormFields();
+
+    var fieldLocator = by.css("div[class='adf-hyperlink-widget '] a");
+
+    this.getFieldText = function (fieldId) {
+        return formFields.getFieldText(fieldId, fieldLocator);
+    };
+
+};
+
+module.exports = Hyperlink;
diff --git a/e2e/pages/adf/process_services/widgets/MultilineText.js b/e2e/pages/adf/process_services/widgets/MultilineText.js
new file mode 100644
index 0000000000..007ae8abdf
--- /dev/null
+++ b/e2e/pages/adf/process_services/widgets/MultilineText.js
@@ -0,0 +1,33 @@
+/*!
+ * @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 FormFields = require('../formFields');
+
+var MultilineText = function () {
+
+    var formFields = new FormFields();
+
+    var valueLocator = by.css("textarea");
+
+    this.getFieldValue = function (fieldId) {
+        return formFields.getFieldValue(fieldId, valueLocator);
+    };
+
+};
+
+module.exports = MultilineText;
+
diff --git a/e2e/pages/adf/process_services/widgets/RadioButtons.js b/e2e/pages/adf/process_services/widgets/RadioButtons.js
new file mode 100644
index 0000000000..8043e8a1de
--- /dev/null
+++ b/e2e/pages/adf/process_services/widgets/RadioButtons.js
@@ -0,0 +1,34 @@
+/*!
+ * @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 FormFields = require('../formFields');
+var Util = require('../../../../util/util');
+
+var RadioButtons = function () {
+
+    var formFields = new FormFields();
+
+    this.getSpecificOptionLabel = function (fieldId, optionNumber) {
+        var optionLocator = by.css("label[for*='radiobuttons-option_" + optionNumber + "'] div[class*='content']");
+        var option = formFields.getWidget(fieldId).element(optionLocator);
+        Util.waitUntilElementIsVisible(option);
+        return option.getText();
+    };
+
+};
+
+module.exports = RadioButtons;
diff --git a/e2e/pages/adf/process_services/widgets/usingWidget.js b/e2e/pages/adf/process_services/widgets/usingWidget.js
new file mode 100644
index 0000000000..397acd957f
--- /dev/null
+++ b/e2e/pages/adf/process_services/widgets/usingWidget.js
@@ -0,0 +1,69 @@
+/*!
+ * @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 MultilineText = require('./MultilineText');
+var Header = require('./Header');
+var DisplayText = require('./DisplayText');
+var AttachFile = require('./AttachFile');
+var DisplayValue = require('./DisplayValue');
+var RadioButtons = require('./RadioButtons');
+var Hyperlink = require('./Hyperlink');
+var Dropdown = require('./Dropdown');
+var DynamicTable = require('./DynamicTable');
+
+var UsingWidget = function () {
+
+    this.usingMultilineTextWidget = function () {
+        return new MultilineText();
+    };
+
+    this.usingHeaderWidget = function () {
+        return new Header();
+    };
+
+    this.usingDisplayTextWidget = function () {
+        return new DisplayText();
+    };
+
+    this.usingAttachFileWidget = function () {
+        return new AttachFile();
+    };
+
+    this.usingDisplayValueWidget = function () {
+        return new DisplayValue();
+    };
+
+    this.usingRadioWidget = function () {
+        return new RadioButtons();
+    };
+
+    this.usingHyperlink = function () {
+        return new Hyperlink();
+    };
+
+    this.usingDropdown = function () {
+        return new Dropdown();
+    };
+
+    this.usingDynamicTable = function () {
+        return new DynamicTable();
+    };
+
+};
+
+module.exports = UsingWidget;
+
diff --git a/e2e/pages/adf/searchFiltersPage.js b/e2e/pages/adf/searchFiltersPage.js
new file mode 100644
index 0000000000..1f20a1ae80
--- /dev/null
+++ b/e2e/pages/adf/searchFiltersPage.js
@@ -0,0 +1,98 @@
+/*!
+ * @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 SearchFiltersPage = function () {
+
+    var searchFilters = element(by.css("adf-search-filter"));
+    var fileTypeFilter = element(by.css("mat-expansion-panel[data-automation-id='expansion-panel-1:Type'"));
+    var searchFileTypeFilter = element(by.css("input[data-automation-id='facet-result-filter-1:Type'"));
+    var creatorFilter = element(by.css("mat-expansion-panel[data-automation-id='expansion-panel-3:Creator'"));
+    var searchCreatorFilter = element(by.css("input[data-automation-id='facet-result-filter-3:Creator'"));
+
+    this.checkSearchFiltersIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(searchFilters);
+    };
+
+    this.checkFileTypeFilterIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(fileTypeFilter);
+    };
+
+    this.checkSearchFileTypeFilterIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(fileTypeFilter);
+    };
+
+    this.checkCreatorFilterIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(creatorFilter);
+    };
+
+    this.checkSearchCreatorFilterIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(searchCreatorFilter);
+    };
+
+    this.clickFileTypeFilter = function () {
+        Util.waitUntilElementIsClickable(fileTypeFilter);
+        return fileTypeFilter.click();
+    };
+
+    this.clickCreatorFilter = function () {
+        Util.waitUntilElementIsClickable(creatorFilter);
+        return creatorFilter.click();
+    };
+
+    this.searchInFileTypeFilter = function (fileType) {
+        Util.waitUntilElementIsClickable(searchFileTypeFilter);
+        searchFileTypeFilter.clear();
+        searchFileTypeFilter.sendKeys(fileType);
+    };
+
+    this.searchInCreatorFilter = function (creatorName) {
+        Util.waitUntilElementIsClickable(searchCreatorFilter);
+        searchCreatorFilter.clear();
+        searchCreatorFilter.sendKeys(creatorName);
+    };
+
+    this.selectFileType = function (fileType) {
+        let result = element(by.css(`mat-checkbox[data-automation-id='checkbox-1:Type-${fileType}']`));
+        Util.waitUntilElementIsClickable(result);
+        result.click();
+    };
+
+    this.selectCreator = function (creatorName) {
+        let result = element(by.css(`mat-checkbox[data-automation-id='checkbox-3:Creator-${creatorName}']`));
+        Util.waitUntilElementIsClickable(result);
+        result.click();
+    };
+
+    this.filterByFileType = function (fileType) {
+        this.checkFileTypeFilterIsDisplayed();
+
+        this.checkSearchFileTypeFilterIsDisplayed();
+        this.searchInFileTypeFilter(fileType);
+        this.selectFileType(fileType);
+    };
+
+    this.filterByCreator = function (creatorFirstName, creatorLastName) {
+        this.checkCreatorFilterIsDisplayed();
+
+        this.checkSearchCreatorFilterIsDisplayed();
+        this.searchInCreatorFilter(`${creatorFirstName} ${creatorLastName}`);
+        this.selectCreator(`${creatorFirstName} ${creatorLastName}`);
+    };
+};
+module.exports = SearchFiltersPage;
diff --git a/e2e/pages/adf/searchResultsPage.js b/e2e/pages/adf/searchResultsPage.js
new file mode 100644
index 0000000000..63759040d6
--- /dev/null
+++ b/e2e/pages/adf/searchResultsPage.js
@@ -0,0 +1,195 @@
+/*!
+ * @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 DatatablePage = require('./dataTablePage');
+
+var SearchResultsPage = function () {
+
+    var noResultsMessage = element(by.css("div[class='adf-no-result-message']"));
+    var noResultsMessageBy = by.css("div[class='adf-no-result-message']");
+    var contentList = new ContentList();
+    var dataTable = new DatatablePage();
+    var sortArrowLocator = by.css("adf-sorting-picker button mat-icon");
+    var sortDropdownLocator = by.css("mat-option span");
+    var sortingArrow = element(by.css("adf-sorting-picker div[class='mat-select-arrow']"));
+
+    this.closeActionButton = function () {
+        let container = element(by.css('div.cdk-overlay-backdrop.cdk-overlay-transparent-backdrop.cdk-overlay-backdrop-showing'));
+        Util.waitUntilElementIsVisible(container);
+        container.click();
+        Util.waitUntilElementIsNotVisible(container);
+        return this;
+    }
+
+    this.checkContentIsDisplayed = function (content) {
+        contentList.checkContentIsDisplayed(content);
+        return this;
+    };
+
+    this.numberOfResultsDisplayed = function () {
+        return contentList.getAllDisplayedRows();
+    };
+
+    this.checkContentIsNotDisplayed = function (content) {
+        Util.waitUntilElementIsNotOnPage(element(by.css("span[title='" + content +"']")));
+    };
+
+    this.checkNoResultMessageIsDisplayed = function() {
+        Util.waitUntilElementIsPresent(element(noResultsMessageBy));
+        Util.waitUntilElementIsVisible(element(noResultsMessageBy));
+        return this;
+    };
+
+    this.checkNoResultMessageIsNotDisplayed = function () {
+        Util.waitUntilElementIsNotOnPage(noResultsMessage);
+        return this;
+    };
+
+    this.navigateToFolder = function(content) {
+        dataTable.navigateToContent(content);
+        return this;
+    };
+
+    this.deleteContent = function(content) {

+        contentList.deleteContent(content);
+    
};
+
+    this.copyContent = function(content) {

+        contentList.copyContent(content);
+    
};
+
+    this.moveContent = function(content) {

+        contentList.moveContent(content);

+    };
+
+    /**
+     * Sort the list by name column.
+     *
+     * @param sortOrder: 'true' to sort the list ascendant and 'false' for descendant
+     */
+    this.sortByName = function (sortOrder) {
+        this.sortBy(sortOrder, "Name");
+    };
+
+    /**
+     * Sort the list by any option.
+     *
+     * @param sortOrder: 'true' to sort the list ascendant and 'false' for descendant
+     * @param option
+     */
+    this.sortBy = function (sortOrder, option) {
+
+        Util.waitUntilElementIsVisible(sortingArrow);
+        sortingArrow.click();
+
+        element.all(sortDropdownLocator).each(function(element) {
+            element.getText().then(function(text) {
+                if (text === option) {
+                    element.click();
+                }
+            });
+         });
+
+        this.sortByOrder(sortOrder);
+    };
+
+    this.sortByOrder = function(sortOrder) {
+        Util.waitUntilElementIsVisible(element(sortArrowLocator));
+        return element(sortArrowLocator).getText().then(function (result) {
+            if(sortOrder===true) {
+                if(result !== 'arrow_upward') {
+                        element(sortArrowLocator).click();
+                }
+            }
+            else {
+                if(result === 'arrow_upward') {
+                    element(sortArrowLocator).click();
+                }
+            }
+
+            return Promise.resolve();
+        });
+    };
+
+    /**
+     * Sort the list by author column.
+     *
+     * @param sortOrder: 'true' to sort the list ascendant and 'false' for descendant
+     */
+    this.sortByAuthor = function (sortOrder) {
+        this.sortBy(sortOrder, "Author");
+    };
+
+    /**
+     * Sort the list by created column.
+     *
+     * @param sortOrder: 'true' to sort the list ascendant and 'false' for descendant
+     */
+    this.sortByCreated = function (sortOrder) {
+        this.sortBy(sortOrder, "Created");
+    };
+
+    /**
+     * Sort by name and check the list is sorted.
+     *
+     * @param sortOrder: 'true' if the list is expected to be sorted ascendant and 'false' for descendant
+     * @return result : 'true' if the list is sorted as expected and 'false' if it isn't
+     */
+    this.sortAndCheckListIsOrderedByName = function (sortOrder) {
+        this.sortByName(sortOrder);
+        dataTable.waitForTableBody();
+        var deferred = protractor.promise.defer();
+        contentList.checkListIsOrderedByNameColumn(sortOrder).then(function(result) {
+            deferred.fulfill(result);
+        });
+        return deferred.promise;
+    };
+
+    /**
+     * Sort by author and check the list is sorted.
+     *
+     * @param sortOrder: 'true' if the list is expected to be sorted ascendant and 'false' for descendant
+     * @return result : 'true' if the list is sorted as expected and 'false' if it isn't
+     */
+    this.sortAndCheckListIsOrderedByAuthor = function (sortOrder) {
+        this.sortByAuthor(sortOrder);
+        var deferred = protractor.promise.defer();
+        contentList.checkListIsOrderedByAuthorColumn(sortOrder).then(function(result) {
+            deferred.fulfill(result);
+        });
+        return deferred.promise;
+    };
+
+    /**
+     * Sort by created and check the list is sorted.
+     *
+     * @param sortOrder: 'true' if the list is expected to be sorted ascendant and 'false' for descendant
+     * @return result : 'true' if the list is sorted as expected and 'false' if it isn't
+     */
+    this.sortAndCheckListIsOrderedByCreated = function (sortOrder) {
+        this.sortByCreated(sortOrder);
+        var deferred = protractor.promise.defer();
+        contentList.checkListIsOrderedByCreatedColumn(sortOrder).then(function(result) {
+            deferred.fulfill(result);
+        });
+        return deferred.promise;
+    };
+
+};
+module.exports = SearchResultsPage;
diff --git a/e2e/pages/adf/settingsPage.js b/e2e/pages/adf/settingsPage.js
new file mode 100644
index 0000000000..098ea4a50b
--- /dev/null
+++ b/e2e/pages/adf/settingsPage.js
@@ -0,0 +1,135 @@
+/*!
+ * @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 TestConfig = require('../../test.config');
+var Util = require('../../util/util');
+
+var SettingsPage = function () {
+
+    var settingsURL = TestConfig.adf.url + TestConfig.adf.port + "/settings";
+    var providerDropdown = element(by.css("mat-select[aria-label='Provider'] div[class='mat-select-arrow-wrapper']"));
+    var ecmAndBpm = {
+        option: element(by.xpath("//SPAN[@class='mat-option-text'][contains(text(),'ALL')]")),
+        text: "ALL"
+    };
+    var bpm = {
+        option: element(by.xpath("//SPAN[@class='mat-option-text'][contains(text(),'BPM') and not (contains(text(),'and'))]")),
+        text: "BPM"
+    };
+    var ecm = {
+        option: element(by.xpath("//SPAN[@class='mat-option-text'][contains(text(),'ECM') and not (contains(text(),'and'))]")),
+        text: "ECM"
+    };
+    var oauth = {
+        option: element(by.xpath("//SPAN[@class='mat-option-text'][contains(text(),'OAUTH')]")),
+        text: "OAUTH"
+    };
+    var selectedOption = element.all(by.css("span[class*='ng-star-inserted']")).first();
+    var ecmText = element(by.css("input[data-automation-id*='ecmHost']"));
+    var bpmText = element(by.css("input[data-automation-id*='bpmHost']"));
+    var authHostText = element(by.css("input[id='oauthHost']"));
+    var silentLoginToggle = element(by.css("mat-slide-toggle[name='silentLogin'] div[class='mat-slide-toggle-thumb']"));
+    var silentLoginEnabled = element(by.css("mat-slide-toggle[class*='mat-checked'][name='silentLogin'] div[class='mat-slide-toggle-thumb']"));
+    var backButton = element(by.cssContainingText("span[class='mat-button-wrapper']", "Back"));
+    var applyButton = element(by.css("button[data-automation-id*='host-button']"));
+
+    this.goToSettingsPage = function () {
+        browser.driver.get(settingsURL);
+        Util.waitUntilElementIsVisible(providerDropdown);
+        return this;
+    };
+
+    /**
+     * Selects provider
+     * @method setProvider
+     * @param {String} option, {String} selected
+     */
+    this.setProvider = function (option, selected) {
+        Util.waitUntilElementIsVisible(providerDropdown);
+        providerDropdown.click();
+        Util.waitUntilElementIsVisible(option);
+        option.click();
+        return expect(selectedOption.getText()).toEqual(selected);
+    };
+
+    /**
+     * Sets provider as ECM and BPM
+     * @method setProviderEcmBpm
+     */
+    this.setProviderEcmBpm = function () {
+        this.goToSettingsPage();
+        this.setProvider(ecmAndBpm.option, ecmAndBpm.text);
+        Util.waitUntilElementIsVisible(bpmText);
+        Util.waitUntilElementIsVisible(ecmText);
+        this.clickApply();
+        return this;
+    };
+
+    /**
+     * Sets provider as BPM
+     * @method setProviderBpm
+     */
+    this.setProviderBpm = function () {
+        this.goToSettingsPage();
+        this.setProvider(bpm.option, bpm.text);
+        Util.waitUntilElementIsVisible(bpmText);
+        expect(ecmText.isPresent()).toBe(false);
+        this.clickApply();
+        return this;
+    };
+
+    /**
+     * Sets provider as ECM
+     * @method setProviderEcm
+     */
+    this.setProviderEcm = function () {
+        this.goToSettingsPage();
+        this.setProvider(ecm.option, ecm.text);
+        Util.waitUntilElementIsVisible(ecmText);
+        expect(bpmText.isPresent()).toBe(false);
+        this.clickApply();
+        return this;
+    };
+
+    /**
+     * Sets provider as OAUTH
+     * @method setProviderOauth
+     */
+    this.setProviderOauth = function () {
+        this.goToSettingsPage();
+        this.setProvider(oauth.option, oauth.text);
+        Util.waitUntilElementIsVisible(bpmText);
+        Util.waitUntilElementIsVisible(ecmText);
+        expect(authHostText.isPresent()).toBe(true);
+        this.clickApply();
+        return this;
+    };
+
+    /**
+     * Clicks Apply button
+     * @method clickApply
+     */
+    this.clickApply = function () {
+        Util.waitUntilElementIsVisible(applyButton);
+        applyButton.click();
+    };
+
+    this.checkProviderDropdownIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(providerDropdown);
+    };
+};
+module.exports = SettingsPage;
diff --git a/e2e/pages/adf/tagPage.js b/e2e/pages/adf/tagPage.js
new file mode 100644
index 0000000000..4e963b9f6f
--- /dev/null
+++ b/e2e/pages/adf/tagPage.js
@@ -0,0 +1,162 @@
+/*!
+ * @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 TestConfig = require('../../test.config');
+var Util = require('../../util/util');
+var ContentList = require('./dialog/contentList');
+
+var TagPage = function () {
+
+    var tagURL = TestConfig.adf.url + TestConfig.adf.port + "/tag";
+    var addTagButton = element(by.css("button[id='add-tag']"));
+    var insertNodeId = element(by.css("input[id='nodeId']"));
+    var newTagInput = element(by.css("input[id='new-tag-text']"));
+    var tagListRow = element(by.css("adf-tag-node-actions-list mat-list-item"));
+    var tagListByNodeIdRow = element(by.css("adf-tag-node-list mat-chip"));
+    var errorMessage = element(by.css("mat-hint[data-automation-id='errorMessage']"));
+    var tagListRowLocator = by.css("adf-tag-node-actions-list mat-list-item div");
+    var tagListByNodeIdRowLocator = by.css("adf-tag-node-list mat-chip span");
+    var tagListContentServicesRowLocator = by.css("div[class='adf-list-tag']");
+
+    this.goToTagPage = function () {
+        browser.driver.get(tagURL);
+        Util.waitUntilElementIsVisible(addTagButton);
+        return this;
+    };
+
+    this.getNodeId = function () {
+        Util.waitUntilElementIsVisible(insertNodeId);
+        return insertNodeId.getAttribute('value');
+    };
+
+    this.insertNodeId = function (nodeId) {
+        Util.waitUntilElementIsVisible(insertNodeId);
+        insertNodeId.clear();
+        insertNodeId.sendKeys(nodeId);
+        browser.driver.sleep(200);
+        insertNodeId.sendKeys(' ')
+        browser.driver.sleep(200);
+        insertNodeId.sendKeys(protractor.Key.BACK_SPACE);
+    };
+
+    this.addNewTagInput = function (tag) {
+        Util.waitUntilElementIsVisible(newTagInput);
+        newTagInput.sendKeys(tag);
+        return this;
+    };
+
+    this.addTag = function (tag) {
+        this.addNewTagInput(tag);
+        Util.waitUntilElementIsVisible(addTagButton);
+        Util.waitUntilElementIsClickable(addTagButton);
+        addTagButton.click();
+        return this;
+    };
+
+    this.deleteTagFromTagListByNodeId = function (name) {
+        var deleteChip = element(by.css('button[id="tag_chips_delete_' + name + '"]'));
+        Util.waitUntilElementIsVisible(deleteChip);
+        deleteChip.click();
+        return this;
+    };
+
+    this.deleteTagFromTagList = function (name) {
+        var deleteChip = element(by.xpath('//*[@id="tag_chips_delete_' + name + '"]/mat-icon'));
+        Util.waitUntilElementIsVisible(deleteChip);
+        deleteChip.click();
+        return this;
+    };
+
+    this.getNewTagInput = function () {
+        Util.waitUntilElementIsVisible(newTagInput);
+        return newTagInput.getAttribute('value');
+    };
+
+    this.getNewTagPlaceholder = function () {
+        Util.waitUntilElementIsVisible(newTagInput);
+        return newTagInput.getAttribute("placeholder");
+    };
+
+    this.addTagButtonIsEnabled = function () {
+        Util.waitUntilElementIsVisible(addTagButton);
+        return addTagButton.isEnabled();
+    };
+
+    this.checkTagIsDisplayedInTagList = function (tagName) {
+        var tag = element(by.cssContainingText("div[id*='tag_name']", tagName));
+        return Util.waitUntilElementIsVisible(tag);
+    };
+
+    this.checkTagIsNotDisplayedInTagList = function (tagName) {
+        var tag = element(by.cssContainingText("div[id*='tag_name']", tagName));
+        return Util.waitUntilElementIsNotOnPage(tag);
+    };
+
+    this.checkTagIsNotDisplayedInTagListByNodeId = function (tagName) {
+        var tag = element(by.cssContainingText("span[id*='tag_name']", tagName));
+        return Util.waitUntilElementIsNotOnPage(tag);
+    };
+
+    this.checkTagIsDisplayedInTagListByNodeId = function (tagName) {
+        var tag = element(by.cssContainingText("span[id*='tag_name']", tagName));
+        return Util.waitUntilElementIsVisible(tag);
+    };
+
+    this.checkTagListIsEmpty = function () {
+        Util.waitUntilElementIsNotOnPage(tagListRow);
+    };
+
+    this.checkTagListByNodeIdIsEmpty = function () {
+        return Util.waitUntilElementIsNotOnPage(tagListByNodeIdRow);
+    };
+
+    this.checkTagIsDisplayedInTagListContentServices = function (tagName) {
+        var tag = element(by.cssContainingText("div[class='adf-list-tag'][id*='tag_name']", tagName));
+        return Util.waitUntilElementIsVisible(tag);
+    };
+
+    this.getErrorMessage = function () {
+        Util.waitUntilElementIsPresent(errorMessage);
+        return errorMessage.getText();
+    };
+
+    this.checkTagListIsOrderedAscending = function () {
+        var deferred = protractor.promise.defer();
+        new ContentList().checkListIsSorted(false, tagListRowLocator).then(function (result) {
+            deferred.fulfill(result);
+        });
+        return deferred.promise;
+    };
+
+    this.checkTagListByNodeIdIsOrderedAscending = function () {
+        var deferred = protractor.promise.defer();
+        new ContentList().checkListIsSorted(false, tagListByNodeIdRowLocator).then(function (result) {
+            deferred.fulfill(result);
+        });
+        return deferred.promise;
+    };
+
+    this.checkTagListContentServicesIsOrderedAscending = function () {
+        var deferred = protractor.promise.defer();
+        new ContentList().checkListIsSorted(false, tagListContentServicesRowLocator).then(function (result) {
+            deferred.fulfill(result);
+        });
+        return deferred.promise;
+    };
+
+};
+module.exports = TagPage;
diff --git a/e2e/pages/adf/trashcanPage.js b/e2e/pages/adf/trashcanPage.js
new file mode 100644
index 0000000000..3e256dd14e
--- /dev/null
+++ b/e2e/pages/adf/trashcanPage.js
@@ -0,0 +1,39 @@
+/*!
+ * @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 TrashcanPage = function () {
+
+    var rows = by.css("adf-document-list div[class*='adf-datatable-body'] div[class*='adf-datatable-row']");
+    var tableBody = element.all(by.css("adf-document-list div[class='adf-datatable-body']")).first();
+    var pagination = element(by.css("adf-pagination"));
+
+    this.numberOfResultsDisplayed = function () {
+        return element.all(rows).count();
+    };
+
+    this.waitForTableBody = function (){
+        Util.waitUntilElementIsVisible(tableBody);
+    };
+
+    this.waitForPagination = function (){
+        Util.waitUntilElementIsVisible(pagination);
+    };
+
+};
+module.exports = TrashcanPage;
diff --git a/e2e/pages/adf/versionManagerPage.ts b/e2e/pages/adf/versionManagerPage.ts
new file mode 100644
index 0000000000..9af72054fd
--- /dev/null
+++ b/e2e/pages/adf/versionManagerPage.ts
@@ -0,0 +1,234 @@
+/*!
+ * @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 = require('../../util/util');
+import TestConfig = require('../../test.config');
+import path = require('path');
+import remote = require('selenium-webdriver/remote');
+import { browser, by, element, protractor } from 'protractor';
+
+export class VersionManagePage {
+
+    showNewVersionButton = element(by.css('#adf-show-version-upload-button'));
+    uploadNewVersionButton = element(by.css('adf-upload-version-button input[data-automation-id="upload-single-file"]'));
+    uploadNewVersionContainer = element(by.css('#adf-new-version-uploader-container'));
+    cancelButton = element(by.css('#adf-new-version-cancel'));
+    majorRadio = element(by.css('#adf-new-version-major'));
+    minorRadio = element(by.css('#adf-new-version-minor'));
+    commentText = element(by.css('#adf-new-version-text-area'));
+    readOnlySwitch = element(by.id('adf-version-manager-switch-readonly'));
+    downloadSwitch = element(by.id('adf-version-manager-switch-download'));
+    commentsSwitch = element(by.id('adf-version-manager-switch-comments'));
+
+    checkUploadNewVersionsButtonIsDisplayed() {
+        Util.waitUntilElementIsVisible(this.showNewVersionButton);
+        return this;
+    }
+
+    uploadNewVersionFile(fileLocation) {
+        browser.setFileDetector(new remote.FileDetector());
+        Util.waitUntilElementIsVisible(this.uploadNewVersionButton);
+        this.uploadNewVersionButton.sendKeys(path.resolve(path.join(TestConfig.main.rootPath, fileLocation)));
+        Util.waitUntilElementIsVisible(this.showNewVersionButton);
+        return this;
+    }
+
+    getFileVersionName(version) {
+        let fileElement = element(by.css(`[id="adf-version-list-item-name-${version}"]`));
+        Util.waitUntilElementIsVisible(fileElement);
+        return fileElement.getText();
+    }
+
+    chekFileVersionExist(version) {
+        let fileVersion = element(by.css(`[id="adf-version-list-item-version-${version}"]`));
+        return Util.waitUntilElementIsVisible(fileVersion);
+    }
+
+    chekFileVersionNotExist(version) {
+        let fileVersion = element(by.css(`[id="adf-version-list-item-version-${version}"]`));
+        return Util.waitUntilElementIsNotVisible(fileVersion);
+    }
+
+    getFileVersionComment(version) {
+        let fileComment = element(by.css(`[id="adf-version-list-item-comment-${version}"]`));
+        Util.waitUntilElementIsVisible(fileComment);
+        return fileComment.getText();
+    }
+
+    getFileVersionDate(version) {
+        let fileDate = element(by.css(`[id="adf-version-list-item-date-${version}"]`));
+        Util.waitUntilElementIsVisible(fileDate);
+        return fileDate.getText();
+    }
+
+    enterCommentText(text) {
+        Util.waitUntilElementIsVisible(this.commentText);
+        this.commentText.sendKeys('');
+        this.commentText.clear();
+        this.commentText.sendKeys(text);
+        return this;
+    }
+
+    clickMajorChange() {
+        let radioMajor = element(by.css(`[id="adf-new-version-major"]`));
+        Util.waitUntilElementIsVisible(radioMajor);
+        radioMajor.click();
+    }
+
+    clickMinorChange() {
+        let radioMinor = element(by.css(`[id="adf-new-version-minor"]`));
+        Util.waitUntilElementIsVisible(radioMinor);
+        radioMinor.click();
+    }
+
+    /**
+     * disables download
+     */
+    disableReadOnly() {
+        Util.waitUntilElementIsVisible(this.readOnlySwitch);
+        this.readOnlySwitch.getAttribute('class').then((check) => {
+            if (check.indexOf('mat-checked') >= 0) {
+                this.readOnlySwitch.click();
+            }
+        });
+    }
+
+    /**
+     * enables download
+     */
+    enableReadOnly() {
+        Util.waitUntilElementIsVisible(this.readOnlySwitch);
+        this.readOnlySwitch.getAttribute('class').then((check) => {
+            if (check.indexOf('mat-checked') < 0) {
+                this.readOnlySwitch.click();
+            }
+        });
+    }
+
+    /**
+     * disables download
+     */
+    disableDownload() {
+        Util.waitUntilElementIsVisible(this.downloadSwitch);
+        this.downloadSwitch.getAttribute('class').then((check) => {
+            if (check.indexOf('mat-checked') >= 0) {
+                this.downloadSwitch.click();
+            }
+        });
+    }
+
+    /**
+     * enables download
+     */
+    enableDownload() {
+        Util.waitUntilElementIsVisible(this.downloadSwitch);
+        this.downloadSwitch.getAttribute('class').then((check) => {
+            if (check.indexOf('mat-checked') < 0) {
+                this.downloadSwitch.click();
+            }
+        });
+    }
+
+    /**
+     *
+     * disables comments
+     */
+    disableComments() {
+        Util.waitUntilElementIsVisible(this.commentsSwitch);
+        this.commentsSwitch.getAttribute('class').then((check) => {
+            if (check.indexOf('mat-checked') >= 0) {
+                this.commentsSwitch.click();
+            }
+        });
+    }
+
+    /**
+     * enables comments
+     */
+    enableComments() {
+        Util.waitUntilElementIsVisible(this.commentsSwitch);
+        this.commentsSwitch.getAttribute('class').then((check) => {
+            if (check.indexOf('mat-checked') < 0) {
+                this.commentsSwitch.click();
+            }
+        });
+    }
+
+    clickActionButton(version) {
+        Util.waitUntilElementIsVisible(element(by.css(`[id="adf-version-list-action-menu-button-${version}"]`)));
+        element(by.css(`[id="adf-version-list-action-menu-button-${version}"]`)).click();
+        return this;
+    }
+
+    clickAcceptConfirm() {
+        Util.waitUntilElementIsVisible(element(by.css(`[id="adf-confirm-accept"]`)));
+        element(by.css(`[id="adf-confirm-accept"]`)).click();
+        return this;
+    }
+
+    clickCancelConfirm() {
+        Util.waitUntilElementIsVisible(element(by.css(`[id="adf-confirm-cancel"]`)));
+        element(by.css(`[id="adf-confirm-cancel"]`)).click();
+        return this;
+    }
+
+    closeActionButton() {
+        let container = element(by.css('div.cdk-overlay-backdrop.cdk-overlay-transparent-backdrop.cdk-overlay-backdrop-showing'));
+        Util.waitUntilElementIsVisible(container);
+        container.click();
+        Util.waitUntilElementIsNotVisible(container);
+        return this;
+    }
+
+    downloadFileVersion(version) {
+        this.clickActionButton(version);
+        let downloadButton = element(by.css(`[id="adf-version-list-action-download-${version}"]`));
+        Util.waitUntilElementIsVisible(downloadButton);
+        browser.driver.sleep(500);
+        downloadButton.click();
+        return this;
+    }
+
+    deleteFileVersion(version) {
+        this.clickActionButton(version);
+        let deleteButton = element(by.css(`[id="adf-version-list-action-delete-${version}"]`));
+        Util.waitUntilElementIsVisible(deleteButton);
+        browser.driver.sleep(500);
+        deleteButton.click();
+        return this;
+    }
+
+    restoreFileVersion(version) {
+        this.clickActionButton(version);
+        let restoreButton = element(by.css(`[id="adf-version-list-action-restore-${version}"]`));
+        Util.waitUntilElementIsVisible(restoreButton);
+        browser.driver.sleep(500);
+        restoreButton.click();
+        return this;
+    }
+
+    checkActionsArePresent(version) {
+        Util.waitUntilElementIsVisible(element(by.css(`[id="adf-version-list-action-download-${version}"]`)));
+        Util.waitUntilElementIsVisible(element(by.css(`[id="adf-version-list-action-delete-${version}"]`)));
+        Util.waitUntilElementIsVisible(element(by.css(`[id="adf-version-list-action-restore-${version}"]`)));
+    }
+
+    closeVersionDialog() {
+        browser.actions().sendKeys(protractor.Key.ESCAPE).perform();
+        Util.waitUntilElementIsNotOnPage(this.uploadNewVersionContainer);
+    }
+}
diff --git a/e2e/pages/adf/viewerPage.js b/e2e/pages/adf/viewerPage.js
new file mode 100644
index 0000000000..78f2c4c051
--- /dev/null
+++ b/e2e/pages/adf/viewerPage.js
@@ -0,0 +1,435 @@
+/*!
+ * @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 ViewerToolbarPage = function () {
+
+    var closeButton = element(by.css("button[data-automation-id='adf-toolbar-back']"));
+    var fileName = element(by.id("adf-viewer-display-name"));
+    var downloadButton = element(by.css("button[data-automation-id='adf-toolbar-download'] > span > mat-icon"));
+    var infoButton = element(by.css("button[data-automation-id='adf-toolbar-sidebar']"));
+    var previousPageButton = element(by.id("viewer-previous-page-button"));
+    var nextPageButton = element(by.id("viewer-next-page-button"));
+    var zoomInButton = element(by.id("viewer-zoom-in-button"));
+    var zoomOutButton = element(by.id("viewer-zoom-out-button"));
+    var scalePageButton = element(by.id("viewer-scale-page-button"));
+    var pdfContainer = element(by.id("viewer-pdf-container"));
+    var fullScreenButton = element(by.css("button[data-automation-id='adf-toolbar-fullscreen']"));
+    var rotateLeft = element(by.css("button[id='viewer-rotate-left-button']"));
+    var rotateRight = element(by.css("button[id='viewer-rotate-right-button']"));
+    var scaleImg = element(by.css("button[id='viewer-reset-button']"));
+    var customBtn = element(by.css("data-automation-id='adf-toolbar-custom-btn'"));
+    var fileThumbnail = element(by.css("img[data-automation-id='adf-file-thumbnail']"));
+    var pageSelectorInput = element(by.css("input[data-automation-id='adf-page-selector']"));
+    var imgContainer = element(by.css("div[data-automation-id='adf-image-container']"));
+    var mediaContainer = element(by.css("adf-media-player[class='adf-media-player ng-star-inserted']"));
+    var allPages = element.all(by.css("div[class='canvasWrapper'] > canvas")).first();
+    var percentage = element(by.css("div[data-automation-id='adf-page-scale'"));
+    var thumbnailsBtn = element(by.css("button[data-automation-id='adf-thumbnails-button']"));
+    var thumbnailsContent = element(by.css("div[data-automation-id='adf-thumbnails-content']"));
+    var thumbnailsClose = element(by.css("button[data-automation-id='adf-thumbnails-close']"));
+    var secondThumbnail = element(by.css("adf-pdf-thumb > img[title='Page 2'"));
+    var lastThumbnailDisplayed = element.all(by.css("adf-pdf-thumb")).last();
+    var passwordDialog = element(by.css("adf-pdf-viewer-password-dialog"));
+    var passwordSubmit = element(by.css("button[data-automation-id='adf-password-dialog-submit']"));
+    var passwordSubmitDisabled = element(by.css("button[data-automation-id='adf-password-dialog-submit'][disabled]"));
+    var passwordInput = element(by.css("input[data-automation-id='adf-password-dialog-input']"));
+    var passwordError = element(by.css("mat-error[data-automation-id='adf-password-dialog-error']"));
+    var infoSideBar = element(by.css("div[class='adf-info-drawer-layout-header']"));
+    var unsupportedFileContainer = element(by.cssContainingText(".label", "Document preview could not be loaded"));
+    var pageCanvas = element.all(by.css("div[class='canvasWrapper']")).first();
+    var activeTab = element(by.css("div[class*='mat-tab-label-active']"));
+    var uploadNewVersionButton = element(by.css("input[data-automation-id='upload-single-file']"));
+    var rightChevron = element(by.css("div[class*='header-pagination-after']"));
+
+    this.canvasHeight = function () {
+        var deferred = protractor.promise.defer();
+        pageCanvas.getAttribute("style").then(function (value) {
+            var canvasHeight = value.split("height: ")[1].split("px")[0];
+            deferred.fulfill(canvasHeight);
+        });
+        return deferred.promise;
+    };
+
+    this.canvasWidth = function () {
+        var deferred = protractor.promise.defer();
+        pageCanvas.getAttribute("style").then(function (value) {
+            var canvasWidth = value.split("width: ")[1].split("px")[0];
+            deferred.fulfill(canvasWidth);
+        });
+        return deferred.promise;
+    };
+
+    this.viewFile = function (fileName) {
+        var fileView = element.all(by.xpath("//div[@id='document-list-container']//div[@filename='" + fileName + "']")).first();
+        Util.waitUntilElementIsVisible(fileView);
+        fileView.click();
+        browser.actions().sendKeys(protractor.Key.ENTER).perform();
+    };
+
+    this.clearPageNumber = function () {
+        Util.waitUntilElementIsVisible(pageSelectorInput);
+        pageSelectorInput.clear();
+        pageSelectorInput.sendKeys(protractor.Key.ENTER);
+    };
+
+    this.getZoom = function () {
+        return percentage.getText();
+    };
+
+    this.exitFullScreen = function () {
+        var jsCode = "document.exitFullscreen?document.exitFullscreen():document.webkitExitFullscreen&&document.webkitExitFullscreen();";
+        browser.executeScript(jsCode);
+    };
+
+    this.enterPassword = function (password) {
+        Util.waitUntilElementIsVisible(passwordInput);
+        passwordInput.clear();
+        passwordInput.sendKeys(password);
+    };
+
+    this.checkPasswordErrorIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(passwordError);
+    };
+
+    this.checkPasswordInputIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(passwordInput);
+    };
+
+    this.checkPasswordSubmitDisabledIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(passwordSubmitDisabled);
+    };
+
+    this.checkPasswordDialogIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(passwordDialog);
+    };
+
+    this.checkAllThumbnailsDisplayed = function (nbPages) {
+        var defaultThumbnailHeight = 143;
+        expect(thumbnailsContent.getAttribute("style")).toEqual("height: " + nbPages * defaultThumbnailHeight + "px; transform: translate(-50%, 0px);");
+    };
+
+    this.checkCurrentThumbnailIsSelected = function () {
+        var selectedThumbnail = element(by.css("adf-pdf-thumb[class='pdf-thumbnails__thumb ng-star-inserted pdf-thumbnails__thumb--selected'] > img"));
+        pageSelectorInput.getAttribute("value").then(function (pageNumber) {
+            expect("Page " + pageNumber).toEqual(selectedThumbnail.getAttribute("title"));
+        });
+    };
+
+    this.checkThumbnailsCloseIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(thumbnailsClose);
+    };
+
+    this.checkThumbnailsBtnIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(thumbnailsBtn);
+    };
+
+    this.checkThumbnailsBtnIsDisabled = function () {
+        Util.waitUntilElementIsVisible(thumbnailsBtn.getAttribute("disabled"));
+        return this;
+    };
+
+    this.checkThumbnailsContentIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(thumbnailsContent);
+    };
+
+    this.checkThumbnailsContentIsNotDisplayed = function () {
+        Util.waitUntilElementIsNotVisible(thumbnailsContent);
+    };
+
+    this.checkCloseButtonIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(closeButton);
+    };
+
+    this.checkDownloadButtonIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(downloadButton);
+    };
+
+    this.checkInfoButtonIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(infoButton);
+    };
+
+    this.checkFileThumbnailIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(fileThumbnail);
+    };
+
+    this.checkFileNameIsDisplayed = function (file) {
+        Util.waitUntilElementIsVisible(fileName);
+        expect(fileName.getText()).toEqual(file);
+    };
+
+    this.checkPreviousPageButtonIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(previousPageButton);
+    };
+
+    this.checkNextPageButtonIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(nextPageButton);
+    };
+
+    this.checkZoomInButtonIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(zoomInButton);
+    };
+
+    this.checkZoomInButtonIsNotDisplayed = function () {
+        Util.waitUntilElementIsNotVisible(zoomInButton);
+    };
+
+    this.checkZoomOutButtonIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(zoomOutButton);
+    };
+
+    this.checkScalePageButtonIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(scalePageButton);
+    };
+
+    this.checkPageSelectorInputIsDisplayed = function (number) {
+        Util.waitUntilElementIsVisible(pageSelectorInput);
+        pageSelectorInput.getAttribute("value").then(function (pageNumber) {
+            expect(pageNumber).toEqual(number);
+        });
+    };
+
+    this.checkImgContainerIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(imgContainer);
+    };
+
+    this.checkPdfContainerIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(pdfContainer);
+    };
+
+    this.checkMediaPlayerContainerIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(mediaContainer);
+    };
+
+    this.checkFileContent = function (pageNumber, text) {
+        var pageLoaded = element.all(by.css("div[data-page-number='" + pageNumber + "'][data-loaded='true']")).first();
+        var textLayerLoaded = element.all(by.css("div[data-page-number='" + pageNumber + "'] div[class='textLayer'] > div")).first();
+        var specificText = element.all(by.cssContainingText("div[data-page-number='" + pageNumber + "'] div[class='textLayer'] > div", text)).first();
+        Util.waitUntilElementIsVisible(allPages);
+        Util.waitUntilElementIsVisible(pageLoaded);
+        Util.waitUntilElementIsVisible(textLayerLoaded);
+        Util.waitUntilElementIsVisible(specificText);
+    };
+
+    this.checkFullScreenButtonIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(fullScreenButton);
+    };
+
+    this.checkFullScreenButtonIsNotDisplayed = function () {
+        Util.waitUntilElementIsNotVisible(fullScreenButton);
+    };
+
+    this.checkPercentageIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(percentage);
+    };
+
+    this.checkZoomedIn = function (zoom) {
+        expect(percentage.getText()).toBeGreaterThan(zoom);
+    };
+
+    this.checkZoomedOut = function (zoom) {
+        expect(percentage.getText()).toBeLessThan(zoom);
+    };
+
+    this.checkRotateLeftButtonIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(rotateLeft);
+    };
+
+    this.checkRotateRightButtonIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(rotateRight);
+    };
+
+    this.checkScaled = function (zoom) {
+        expect(percentage.getText()).toEqual(zoom);
+    };
+
+    this.checkScaleImgButtonIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(scaleImg);
+    };
+
+    this.checkRotation = function (text) {
+        var rotation = imgContainer.getAttribute("style");
+        expect(rotation).toEqual(text);
+    };
+
+    this.checkCustomBtnDisplayed = function () {
+        Util.waitUntilElementIsVisible(customBtn);
+    };
+
+    this.checkUnsupportedFileContainerIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(unsupportedFileContainer);
+    };
+
+    this.checkInfoSideBarIsNotDisplayed = function () {
+        Util.waitUntilElementIsNotVisible(infoSideBar);
+    };
+
+    this.checkInfoSideBarIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(infoSideBar);
+    };
+
+    this.checkInfoSideBarIsNotDisplayed = function () {
+        Util.waitUntilElementIsNotOnPage(infoSideBar);
+    };
+
+    this.clickInfoButton = function () {
+        Util.waitUntilElementIsVisible(infoButton);
+        return infoButton.click();
+    };
+
+    this.clickPasswordSubmit = function () {
+        Util.waitUntilElementIsVisible(passwordSubmit);
+        passwordSubmit.click();
+    };
+
+    this.clickSecondThumbnail = function () {
+        Util.waitUntilElementIsClickable(secondThumbnail);
+        secondThumbnail.click();
+    };
+
+    this.clickLastThumbnailDisplayed = function () {
+        Util.waitUntilElementIsClickable(lastThumbnailDisplayed);
+        lastThumbnailDisplayed.click();
+    };
+
+    this.clickThumbnailsClose = function () {
+        Util.waitUntilElementIsClickable(thumbnailsClose);
+        thumbnailsClose.click();
+    };
+
+    this.clickThumbnailsBtn = function () {
+        Util.waitUntilElementIsVisible(thumbnailsBtn);
+        Util.waitUntilElementIsClickable(thumbnailsBtn);
+        thumbnailsBtn.click();
+    };
+
+    this.clickScaleImgButton = function () {
+        Util.waitUntilElementIsClickable(scaleImg);
+        scaleImg.click();
+    };
+
+    this.clickScalePdfButton = function () {
+        Util.waitUntilElementIsClickable(scalePageButton);
+        scalePageButton.click();
+    };
+
+    this.clickDownloadButton = function () {
+        Util.waitUntilElementIsVisible(downloadButton);
+        downloadButton.click();
+    };
+
+    this.clickCloseButton = function () {
+        closeButton.click();
+    };
+
+    this.clickPreviousPageButton = function () {
+        Util.waitUntilElementIsVisible(previousPageButton);
+        previousPageButton.click();
+    };
+
+    this.clickNextPageButton = function () {
+        Util.waitUntilElementIsVisible(nextPageButton);
+        nextPageButton.click();
+    };
+
+    this.clickZoomInButton = function () {
+        Util.waitUntilElementIsVisible(zoomInButton);
+        zoomInButton.click();
+    };
+
+    this.clickZoomOutButton = function () {
+        Util.waitUntilElementIsVisible(zoomOutButton);
+        zoomOutButton.click();
+    };
+
+    this.clickScalePageButton = function () {
+        Util.waitUntilElementIsVisible(scalePageButton);
+        scalePageButton.click();
+    };
+
+    this.clickFullScreenButton = function () {
+        Util.waitUntilElementIsClickable(fullScreenButton);
+        fullScreenButton.click();
+    };
+
+    this.clickRotateLeftButton = function () {
+        Util.waitUntilElementIsClickable(rotateLeft);
+        rotateLeft.click();
+    };
+
+    this.clickRotateRightButton = function () {
+        Util.waitUntilElementIsClickable(rotateRight);
+        rotateRight.click();
+    };
+
+    this.getActiveTab = function () {
+        Util.waitUntilElementIsVisible(activeTab);
+        return activeTab.getText();
+    };
+
+    this.checkUnsupportedFileContainerIsDisplayed = function () {
+        Util.waitUntilElementIsVisible(unsupportedFileContainer);
+    };
+
+    this.clickRightChevronToGetToTab = (tabName) => {
+        element.all(by.css('.mat-tab-label'))
+            .map((element) => element.getAttribute('innerText'))
+            .then((texts) => {
+                for (let text of texts) {
+                    if (text === tabName ) {
+                        break;
+                    }
+                    this.clickRightChevron();
+                }
+            });
+    };
+
+    this.clickRightChevron = function() {
+        Util.waitUntilElementIsVisible(rightChevron);
+        rightChevron.click();
+        return this;
+    };
+
+    this.clickOnVersionsTab = function() {
+        this.clickRightChevronToGetToTab('Versions');
+        var versionsTab = element(by.cssContainingText("div[id*='mat-tab-label']", "Versions"));
+        Util.waitUntilElementIsVisible(versionsTab);
+        versionsTab.click();
+        return this;
+    };
+
+    this.checkUploadVersionsButtonIsDisplayed = function() {
+        Util.waitUntilElementIsVisible(uploadNewVersionButton);
+        return this;
+    };
+
+    this.checkVersionIsDisplayed = function(version) {
+        Util.waitUntilElementIsVisible(element(by.cssContainingText("h4[class*='adf-version-list-item-name']", version)));
+        return this;
+    };
+
+    this.clickOnCommentsTab = function() {
+        var commentsTab = element(by.cssContainingText("div[id*='mat-tab-label']", "Comments"));
+        Util.waitUntilElementIsVisible(commentsTab);
+        commentsTab.click();
+        return this;
+    };
+
+};
+
+module.exports = ViewerToolbarPage;
diff --git a/e2e/process-services/apps-section.e2e.ts b/e2e/process-services/apps-section.e2e.ts
new file mode 100644
index 0000000000..10da19082b
--- /dev/null
+++ b/e2e/process-services/apps-section.e2e.ts
@@ -0,0 +1,147 @@
+/*!
+ * @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 } from 'protractor';
+import LoginPage = require('../pages/adf/loginPage');
+import ProcessServicesPage = require('../pages/adf/process_services/processServicesPage');
+import NavigationBarPage = require('../pages/adf/navigationBarPage');
+
+import CONSTANTS = require('../util/constants');
+
+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 { ModelsActions } from '../actions/APS/models.actions';
+
+describe('Modify applications', () => {
+
+    let loginPage = new LoginPage();
+    let navigationBarPage = new NavigationBarPage();
+    let processServicesPage = new ProcessServicesPage();
+    let app = resources.Files.APP_WITH_PROCESSES;
+    let appTobeDeleted = resources.Files.SIMPLE_APP_WITH_USER_FORM;
+    let replacingApp = resources.Files.WIDGETS_SMOKE_TEST;
+    let apps = new AppsActions();
+    let modelActions = new ModelsActions();
+    let firstApp, appVersionToBeDeleted;
+
+    beforeAll(async (done) => {
+        let users = new UsersActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        let user = await users.createTenantAndUser(this.alfrescoJsApi);
+
+        await this.alfrescoJsApi.login(user.email, user.password);
+
+        firstApp = await apps.importPublishDeployApp(this.alfrescoJsApi, app.file_location);
+        appVersionToBeDeleted = await apps.importPublishDeployApp(this.alfrescoJsApi, appTobeDeleted.file_location);
+
+        loginPage.loginToProcessServicesUsingUserModel(user);
+
+        done();
+    });
+
+    it('[C260198] Should the app be displayed on dashboard when is deployed on APS', () => {
+        navigationBarPage.clickProcessServicesButton();
+
+        processServicesPage.checkApsContainer();
+
+        expect(processServicesPage.getAppIconType(app.title)).toEqual(CONSTANTS.APP_ICON.UNIT);
+        expect(processServicesPage.getBackgroundColor(app.title)).toEqual(CONSTANTS.APP_COLOR.BLUE);
+        expect(processServicesPage.getDescription(app.title)).toEqual(app.description);
+    });
+
+    it('[C260213] Should a new version of the app be displayed on dashboard when is replaced by importing another app in APS', async () => {
+        navigationBarPage.clickProcessServicesButton();
+
+        processServicesPage.checkApsContainer();
+
+        expect(processServicesPage.getAppIconType(app.title)).toEqual(CONSTANTS.APP_ICON.UNIT);
+        expect(processServicesPage.getBackgroundColor(app.title)).toEqual(CONSTANTS.APP_COLOR.BLUE);
+        expect(processServicesPage.getDescription(app.title)).toEqual(app.description);
+
+        browser.controlFlow().execute(() => {
+            return apps.importNewVersionAppDefinitionPublishDeployApp(this.alfrescoJsApi, replacingApp.file_location, firstApp.id);
+        });
+
+        browser.refresh();
+
+        processServicesPage.checkApsContainer();
+
+        expect(processServicesPage.getAppIconType(app.title)).toEqual(CONSTANTS.APP_ICON.FAVORITE);
+        expect(processServicesPage.getBackgroundColor(app.title)).toEqual(CONSTANTS.APP_COLOR.GREY);
+        expect(processServicesPage.getDescription(app.title)).toEqual(app.description);
+    });
+
+    it('[C260220] Should the app not be displayed on dashboard after it was deleted in APS', async () => {
+        navigationBarPage.clickProcessServicesButton();
+
+        processServicesPage.checkApsContainer();
+
+        processServicesPage.checkAppIsDisplayed(app.title);
+
+        browser.controlFlow().execute(() => {
+            return modelActions.deleteEntireModel(this.alfrescoJsApi, firstApp.id);
+        });
+
+        browser.refresh();
+
+        processServicesPage.checkApsContainer();
+        processServicesPage.checkAppIsNotDisplayed(app.title);
+    });
+
+    it('[C260215] Should the penultimate version of an app be displayed on dashboard when the last version is deleted in APS', async () => {
+        navigationBarPage.clickProcessServicesButton();
+
+        processServicesPage.checkApsContainer();
+
+        processServicesPage.checkAppIsDisplayed(appTobeDeleted.title);
+        expect(processServicesPage.getBackgroundColor(appTobeDeleted.title)).toEqual(CONSTANTS.APP_COLOR.ORANGE);
+
+        browser.controlFlow().execute(() => {
+            return apps.importNewVersionAppDefinitionPublishDeployApp(this.alfrescoJsApi, replacingApp.file_location, appVersionToBeDeleted.id);
+        });
+
+        browser.refresh();
+
+        processServicesPage.getBackgroundColor(appTobeDeleted.title);
+
+        expect(processServicesPage.getBackgroundColor(appTobeDeleted.title)).toEqual(CONSTANTS.APP_COLOR.GREY);
+
+        browser.controlFlow().execute(async () => {
+            await modelActions.deleteVersionModel(this.alfrescoJsApi, appVersionToBeDeleted.id);
+            await modelActions.deleteVersionModel(this.alfrescoJsApi, appVersionToBeDeleted.id);
+            await apps.publishDeployApp(this.alfrescoJsApi, appVersionToBeDeleted.id);
+        });
+
+        browser.refresh();
+
+        processServicesPage.checkApsContainer();
+        processServicesPage.checkAppIsDisplayed(appTobeDeleted.title);
+        expect(processServicesPage.getBackgroundColor(appTobeDeleted.title)).toEqual(CONSTANTS.APP_COLOR.ORANGE);
+    });
+
+});
diff --git a/e2e/process-services/attach-file-widget.e2e.ts b/e2e/process-services/attach-file-widget.e2e.ts
new file mode 100644
index 0000000000..793574af66
--- /dev/null
+++ b/e2e/process-services/attach-file-widget.e2e.ts
@@ -0,0 +1,104 @@
+/*!
+ * @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 LoginPage = require('../pages/adf/loginPage');
+import TasksPage = require('../pages/adf/process_services/tasksPage');
+import ViewerPage = require('../pages/adf/viewerPage');
+import UsingWidget = require('../pages/adf/process_services/widgets/usingWidget');
+import ProcessServicesPage = require('../pages/adf/process_services/processServicesPage');
+
+import CONSTANTS = require('../util/constants');
+
+import FileModel = require('../models/ACS/fileModel');
+
+import TestConfig = require('../test.config');
+import resources = require('../util/resources');
+
+import { AppsActions } from '../actions/APS/apps.actions';
+import AlfrescoApi = require('alfresco-js-api-node');
+import { UsersActions } from '../actions/users.actions';
+
+describe('Start Task - Task App', () => {
+
+    let loginPage = new LoginPage();
+    let viewerPage = new ViewerPage();
+    let usingWidget = new UsingWidget();
+    let processServicesPage = new ProcessServicesPage();
+    let taskPage = new TasksPage();
+
+    let processUserModel;
+    let app = resources.Files.WIDGETS_SMOKE_TEST;
+    let pdfFile = new FileModel({ 'name': resources.Files.ADF_DOCUMENTS.PDF.file_name });
+    let appFields = app.form_fields;
+
+    beforeAll(async (done) => {
+        let users = new UsersActions();
+        let apps = new AppsActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        processUserModel = await users.createTenantAndUser(this.alfrescoJsApi);
+
+        await this.alfrescoJsApi.login(processUserModel.email, processUserModel.password);
+
+        await apps.importPublishDeployApp(this.alfrescoJsApi, app.file_location);
+
+        await loginPage.loginToProcessServicesUsingUserModel(processUserModel);
+
+        done();
+    });
+
+    afterAll(async (done) => {
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
+
+        done();
+    });
+
+    it('[C274690] Task List attachment - View file', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+
+        taskPage.createNewTask()
+            .addName('View file')
+            .addForm(app.formName)
+            .clickStartButton()
+            .then(() => {
+                usingWidget.usingAttachFileWidget().attachFile(appFields.attachfile_id, pdfFile.location);
+                usingWidget.usingAttachFileWidget().checkFileIsAttached(appFields.attachfile_id, pdfFile.name);
+
+                usingWidget.usingAttachFileWidget().viewFile(pdfFile.name);
+                viewerPage.checkFileContent('1', pdfFile.firstPageText);
+                viewerPage.checkCloseButtonIsDisplayed();
+                viewerPage.clickCloseButton();
+                taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList('View file');
+            });
+    });
+
+});
diff --git a/e2e/process-services/attach_form_component.e2e.ts b/e2e/process-services/attach_form_component.e2e.ts
new file mode 100644
index 0000000000..75ee3adee2
--- /dev/null
+++ b/e2e/process-services/attach_form_component.e2e.ts
@@ -0,0 +1,150 @@
+/*!
+ * @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 LoginPage = require('../pages/adf/loginPage');
+import ProcessServicesPage = require('../pages/adf/process_services/processServicesPage');
+import TasksPage = require('../pages/adf/process_services/tasksPage');
+import { AttachFormPage } from '../pages/adf/process_services/attachFormPage';
+import FormFields = require('../pages/adf/process_services/formFields');
+
+import CONSTANTS = require('../util/constants');
+
+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';
+
+describe('Attach Form Component', () => {
+
+    let loginPage = new LoginPage();
+    let processServicesPage = new ProcessServicesPage();
+    let taskPage = new TasksPage();
+    let attachFormPage = new AttachFormPage();
+    let formFields = new FormFields();
+
+    let app = resources.Files.SIMPLE_APP_WITH_USER_FORM;
+    let formTextField = app.form_fields.form_fieldId;
+    let user, tenantId, appId;
+
+    let testNames = {
+        taskName: 'Test Task',
+        formTitle: 'Select Form To Attach',
+        formName: 'Simple form',
+        widgetTitle: 'textfield',
+        formFieldValue: 'Test value'
+    };
+
+    beforeAll(async(done) => {
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+        done();
+    });
+
+    beforeEach(async(done) => {
+
+        let users = new UsersActions();
+        let appsActions = new AppsActions();
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        user = await users.createTenantAndUser(this.alfrescoJsApi);
+
+        tenantId = user.tenantId;
+
+        await this.alfrescoJsApi.login(user.email, user.password);
+
+        let appModel = await appsActions.importPublishDeployApp(this.alfrescoJsApi, app.file_location);
+
+        appId = appModel.id;
+
+        await this.alfrescoJsApi.activiti.taskApi.createNewTask({name: testNames.taskName});
+
+        await loginPage.loginToProcessServicesUsingUserModel(user);
+
+        done();
+    });
+
+    afterEach(async(done) => {
+
+        await this.alfrescoJsApi.activiti.modelsApi.deleteModel(appId);
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId);
+
+        done();
+    });
+
+    it('[C280047] Should be able to view the attach-form component after creating a standalone task', () => {
+
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.usingTasksListPage().selectTaskFromTasksList(testNames.taskName);
+
+        attachFormPage.checkNoFormMessageIsDisplayed();
+        attachFormPage.checkAttachFormButtonIsDisplayed();
+        attachFormPage.checkCompleteButtonIsDisplayed();
+    });
+
+    it('[C280048] Should be able to view the attach-form component after clicking cancel button', () => {
+
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.usingTasksListPage().selectTaskFromTasksList(testNames.taskName);
+
+        attachFormPage.clickAttachFormButton();
+        attachFormPage.checkDefaultFormTitleIsDisplayed(testNames.formTitle);
+        attachFormPage.checkFormDropdownIsDisplayed();
+        attachFormPage.checkCancelButtonIsDisplayed();
+        attachFormPage.clickAttachFormDropdown();
+        attachFormPage.selectAttachFormOption(testNames.formName);
+
+        formFields.checkWidgetIsReadOnlyMode(testNames.widgetTitle);
+
+        attachFormPage.clickCancelButton();
+        attachFormPage.checkAttachFormButtonIsDisplayed();
+    });
+
+    it('[C280017] Should be able to attach a form on a standalone task and complete', () => {
+
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.usingTasksListPage().selectTaskFromTasksList(testNames.taskName);
+
+        attachFormPage.clickAttachFormButton();
+        attachFormPage.clickAttachFormDropdown();
+        attachFormPage.selectAttachFormOption(testNames.formName);
+        attachFormPage.clickAttachFormButton();
+
+        formFields.setFieldValue(by.id, formTextField, testNames.formFieldValue);
+        formFields.completeForm();
+
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.COMPL_TASKS);
+        taskPage.usingTasksListPage().selectTaskFromTasksList(testNames.taskName);
+
+        expect(formFields.getFieldValue(formTextField)).toEqual(testNames.formFieldValue);
+    });
+});
diff --git a/e2e/process-services/attachment-list-process.e2e.ts b/e2e/process-services/attachment-list-process.e2e.ts
new file mode 100644
index 0000000000..cedcb16c26
--- /dev/null
+++ b/e2e/process-services/attachment-list-process.e2e.ts
@@ -0,0 +1,91 @@
+/*!
+ * @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 LoginPage = require('../pages/adf/loginPage');
+import ProcessServicesPage = require('../pages/adf/process_services/processServicesPage');
+import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage');
+import FileModel = require('../models/ACS/fileModel');
+import { AttachmentListPage } from '../pages/adf/process_services/attachmentListPage';
+
+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';
+
+describe('Attachment list', () => {
+
+    let loginPage = new LoginPage();
+    let processServicesPage = new ProcessServicesPage();
+    let attachmentListPage = new AttachmentListPage();
+    let processFiltersPage = new ProcessFiltersPage();
+
+    let processUserModel;
+    let app = resources.Files.APP_WITH_PROCESSES;
+    let pngFile = new FileModel({
+        'location': resources.Files.ADF_DOCUMENTS.PNG.file_location,
+        'name': resources.Files.ADF_DOCUMENTS.PNG.file_name
+    });
+    let pdfFile = new FileModel({ 'name': resources.Files.ADF_DOCUMENTS.PDF.file_name });
+
+    beforeAll(async(done) => {
+        let users = new UsersActions();
+        let apps = new AppsActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        processUserModel = await users.createTenantAndUser(this.alfrescoJsApi);
+
+        await this.alfrescoJsApi.login(processUserModel.email, processUserModel.password);
+
+        await apps.importPublishDeployApp(this.alfrescoJsApi, app.file_location);
+
+        loginPage.loginToProcessServicesUsingUserModel(processUserModel);
+
+        done();
+    });
+
+    it('[C277296] Attach a file to task app - process list', function () {
+        processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton();
+        processFiltersPage.startProcess().selectFromProcessDropdown(app.process_se_name).clickFormStartProcessButton();
+        processFiltersPage.clickRunningFilterButton();
+        processFiltersPage.selectFromProcessList('My Default Name');
+        attachmentListPage.clickAttachFileButton(pngFile.location);
+        attachmentListPage.checkFileIsAttached(pngFile.name);
+        attachmentListPage.clickAttachFileButton(pdfFile.location);
+        attachmentListPage.checkFileIsAttached(pngFile.name);
+        attachmentListPage.checkFileIsAttached(pdfFile.name);
+    });
+
+    it('[C277299] Attach a file to custom app - process list', function () {
+        processServicesPage.goToProcessServices().goToApp(app.title).clickProcessButton();
+        processFiltersPage.startProcess().selectFromProcessDropdown(app.process_se_name).clickFormStartProcessButton();
+        processFiltersPage.clickRunningFilterButton();
+        processFiltersPage.selectFromProcessList('My Default Name');
+        attachmentListPage.clickAttachFileButton(pngFile.location);
+        attachmentListPage.checkFileIsAttached(pngFile.name);
+        attachmentListPage.clickAttachFileButton(pdfFile.location);
+        attachmentListPage.checkFileIsAttached(pngFile.name);
+        attachmentListPage.checkFileIsAttached(pdfFile.name);
+    });
+});
diff --git a/e2e/process-services/checklist_component.e2e.ts b/e2e/process-services/checklist_component.e2e.ts
new file mode 100644
index 0000000000..6ea95e1ac3
--- /dev/null
+++ b/e2e/process-services/checklist_component.e2e.ts
@@ -0,0 +1,190 @@
+/*!
+ * @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 LoginPage = require('../pages/adf/loginPage');
+import ProcessServicesPage = require('../pages/adf/process_services/processServicesPage');
+import TasksPage = require('../pages/adf/process_services/tasksPage');
+
+import CONSTANTS = require('../util/constants');
+
+import Tenant = require('../models/APS/Tenant');
+
+import TestConfig = require('../test.config');
+import resources = require('../util/resources');
+
+import AlfrescoApi = require('alfresco-js-api-node');
+import { UsersActions } from '../actions/users.actions';
+import fs = require('fs');
+import path = require('path');
+
+describe('Checklist component', () => {
+
+    let loginPage = new LoginPage();
+    let processServicesPage = new ProcessServicesPage();
+    let processUserModel;
+    let app = resources.Files.SIMPLE_APP_WITH_USER_FORM;
+    let taskPage = new TasksPage();
+
+    let tasks = ['no checklist created task', 'checklist number task', 'remove running checklist', 'remove completed checklist', 'hierarchy'];
+    let checklists = ['cancelCheckList', 'dialogChecklist', 'addFirstChecklist', 'addSecondChecklist'];
+    let removeChecklist = ['removeFirstRunningChecklist', 'removeSecondRunningChecklist', 'removeFirstCompletedChecklist', 'removeSecondCompletedChecklist'];
+    let hierarchyChecklist = ['checklistOne', 'checklistTwo', 'checklistOneChild', 'checklistTwoChild'];
+
+    beforeAll(async (done) => {
+        let users = new UsersActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        let newTenant = await this.alfrescoJsApi.activiti.adminTenantsApi.createTenant(new Tenant());
+
+        processUserModel = await users.createApsUser(this.alfrescoJsApi, newTenant.id);
+
+        let pathFile = path.join(TestConfig.main.rootPath + app.file_location);
+        let file = fs.createReadStream(pathFile);
+
+        await this.alfrescoJsApi.login(processUserModel.email, processUserModel.password);
+
+        await this.alfrescoJsApi.activiti.appsApi.importAppDefinition(file);
+
+        for (let i = 0; i < tasks.length; i++) {
+            this.alfrescoJsApi.activiti.taskApi.createNewTask({name: tasks[i]});
+        }
+
+        loginPage.loginToProcessServicesUsingUserModel(processUserModel);
+
+        done();
+    });
+
+    it('[C279976] Should no checklist be created when no title is typed', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[0]).selectTaskFromTasksList(tasks[0]);
+
+        taskPage.clickOnAddChecklistButton().clickCreateChecklistButton();
+        taskPage.checkChecklistDialogIsNotDisplayed().checkNoChecklistIsDisplayed();
+        expect(taskPage.getNumberOfChecklists()).toEqual('0');
+    });
+
+    it('[C279975] Should no checklist be created when clicking on Cancel button on checklist dialog', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[0]).selectTaskFromTasksList(tasks[0]);
+
+        taskPage.clickOnAddChecklistButton().addName(checklists[0]).clickCancelButton();
+        taskPage.checkChecklistDialogIsNotDisplayed().checkNoChecklistIsDisplayed();
+        expect(taskPage.getNumberOfChecklists()).toEqual('0');
+    });
+
+    it('[C261025] Should Checklist dialog be displayed when clicking on add checklist button', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[0]).selectTaskFromTasksList(tasks[0]);
+
+        taskPage.clickOnAddChecklistButton();
+        taskPage.checkChecklistDialogIsDisplayed();
+        expect(taskPage.usingCheckListDialog().getDialogTitle()).toEqual('New Check');
+        expect(taskPage.usingCheckListDialog().getNameFieldPlaceholder()).toEqual('Name');
+        taskPage.usingCheckListDialog().checkAddChecklistButtonIsEnabled().checkCancelButtonIsEnabled();
+        taskPage.usingCheckListDialog().clickCancelButton();
+    });
+
+    it('[C261026] Should Checklist number increase when a new checklist is added', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[1]).selectTaskFromTasksList(tasks[1]);
+
+        taskPage.clickOnAddChecklistButton().addName(checklists[2]).clickCreateChecklistButton();
+        taskPage.checkChecklistIsDisplayed(checklists[2]);
+        expect(taskPage.getNumberOfChecklists()).toEqual('1');
+
+        taskPage.clickOnAddChecklistButton().addName(checklists[3]).clickCreateChecklistButton();
+        taskPage.checkChecklistIsDisplayed(checklists[3]);
+        taskPage.checkChecklistIsDisplayed(checklists[2]);
+        expect(taskPage.getNumberOfChecklists()).toEqual('2');
+    });
+
+    it('[C279980] Should checklist be removed when clicking on remove button', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[2]).selectTaskFromTasksList(tasks[2]);
+
+        taskPage.clickOnAddChecklistButton().addName(removeChecklist[0]).clickCreateChecklistButton();
+        taskPage.clickOnAddChecklistButton().addName(removeChecklist[1]).clickCreateChecklistButton();
+        taskPage.checkChecklistIsDisplayed(removeChecklist[0]);
+        taskPage.checkChecklistIsDisplayed(removeChecklist[1]);
+
+        taskPage.removeChecklists(removeChecklist[1]);
+        taskPage.checkChecklistIsDisplayed(removeChecklist[0]);
+        taskPage.checkChecklistIsNotDisplayed(removeChecklist[1]);
+        expect(taskPage.getNumberOfChecklists()).toEqual('1');
+    });
+
+    it('[C261027] Should not be able to remove a completed Checklist when clicking on remove button', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[3]).selectTaskFromTasksList(tasks[3]);
+
+        taskPage.clickOnAddChecklistButton().addName(removeChecklist[2]).clickCreateChecklistButton();
+        taskPage.clickOnAddChecklistButton().addName(removeChecklist[3]).clickCreateChecklistButton();
+        taskPage.checkChecklistIsDisplayed(removeChecklist[2]);
+        taskPage.checkChecklistIsDisplayed(removeChecklist[3]);
+
+        taskPage.usingTasksListPage().selectTaskFromTasksList(removeChecklist[3]);
+        taskPage.completeTaskNoForm();
+        taskPage.usingTasksListPage().checkTaskIsNotDisplayedInTasksList(removeChecklist[3]);
+
+        taskPage.usingTasksListPage().selectTaskFromTasksList(tasks[3]);
+        taskPage.checkChecklistIsDisplayed(removeChecklist[2]);
+        taskPage.checkChecklistIsDisplayed(removeChecklist[3]);
+        expect(taskPage.getNumberOfChecklists()).toEqual('2');
+
+        taskPage.checkChecklistsRemoveButtonIsNotDisplayed(removeChecklist[3]);
+    });
+
+    it('[C261028] Should all checklists of a task be completed when the task is completed', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[4]).selectTaskFromTasksList(tasks[4]);
+
+        taskPage.clickOnAddChecklistButton().addName(hierarchyChecklist[0]).clickCreateChecklistButton();
+        taskPage.clickOnAddChecklistButton().addName(hierarchyChecklist[1]).clickCreateChecklistButton();
+
+        taskPage.usingTasksListPage().selectTaskFromTasksList(hierarchyChecklist[0]);
+        taskPage.clickOnAddChecklistButton().addName(hierarchyChecklist[2]).clickCreateChecklistButton();
+        taskPage.checkChecklistIsDisplayed(hierarchyChecklist[2]);
+
+        taskPage.usingTasksListPage().selectTaskFromTasksList(hierarchyChecklist[1]);
+        taskPage.clickOnAddChecklistButton().addName(hierarchyChecklist[3]).clickCreateChecklistButton();
+        taskPage.checkChecklistIsDisplayed(hierarchyChecklist[3]);
+
+        taskPage.usingTasksListPage().selectTaskFromTasksList(tasks[4]);
+        taskPage.completeTaskNoForm();
+
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.COMPL_TASKS);
+        taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[4]);
+        taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(hierarchyChecklist[0]);
+        taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(hierarchyChecklist[1]);
+        taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(hierarchyChecklist[2]);
+        taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(hierarchyChecklist[3]);
+    });
+
+});
diff --git a/e2e/process-services/comment_component_processes.e2e.ts b/e2e/process-services/comment_component_processes.e2e.ts
new file mode 100644
index 0000000000..a988e184a6
--- /dev/null
+++ b/e2e/process-services/comment_component_processes.e2e.ts
@@ -0,0 +1,158 @@
+/*!
+ * @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 } from 'protractor';
+import LoginPage = require('../pages/adf/loginPage');
+import ProcessServicesPage = require('../pages/adf/process_services/processServicesPage');
+import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage.js');
+import { CommentsPage } from '../pages/adf/commentsPage';
+
+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';
+
+describe('Comment component for Processes', () => {
+
+    let loginPage = new LoginPage();
+    let processServicesPage = new ProcessServicesPage();
+    let processFiltersPage = new ProcessFiltersPage();
+    let commentsPage = new CommentsPage();
+
+    let app = resources.Files.SIMPLE_APP_WITH_USER_FORM;
+    let user, tenantId, appId, processInstanceId, comment, taskComment, addedComment;
+
+    beforeAll(async(done) => {
+       this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+       done();
+    });
+
+    beforeEach(async(done) => {
+        let apps = new AppsActions();
+        let users = new UsersActions();
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        user = await users.createTenantAndUser(this.alfrescoJsApi);
+
+        tenantId = user.tenantId;
+
+        await this.alfrescoJsApi.login(user.email, user.password);
+
+        let importedApp = await apps.importPublishDeployApp(this.alfrescoJsApi, app.file_location);
+        appId = importedApp.id;
+
+        let processWithComment = await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Comment APS');
+        processInstanceId = processWithComment.id;
+
+        await loginPage.loginToProcessServicesUsingUserModel(user);
+
+        done();
+    });
+
+    afterEach(async(done) => {
+        await loginPage.loginToProcessServicesUsingUserModel(user);
+
+        await this.alfrescoJsApi.activiti.modelsApi.deleteModel(appId);
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId);
+
+        done();
+    });
+
+    it('[C260464] Should be able to add a comment on APS and check on ADF', () => {
+        browser.controlFlow().execute(async() => {
+            comment = {message: 'HELLO'};
+
+            await this.alfrescoJsApi.activiti.commentsApi.addProcessInstanceComment(comment, processInstanceId);
+        });
+
+        processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton();
+
+        processFiltersPage.clickRunningFilterButton();
+        processFiltersPage.selectFromProcessList('Comment APS');
+
+        browser.controlFlow().execute(async() => {
+            addedComment = await this.alfrescoJsApi.activiti.commentsApi.getProcessInstanceComments(processInstanceId, {'latestFirst': true});
+
+            commentsPage.checkUserIconIsDisplayed(0);
+
+            expect(commentsPage.getTotalNumberOfComments()).toEqual('Comments (' + addedComment.total + ')');
+            expect(commentsPage.getMessage(0)).toEqual(addedComment.data[0].message);
+            expect(commentsPage.getUserName(0)).toEqual(addedComment.data[0].createdBy.firstName + ' ' + addedComment.data[0].createdBy.lastName);
+            expect(commentsPage.getTime(0)).toContain('ago');
+        });
+    });
+
+    it('[C260465] Should not be able to view process comment on included task', () => {
+        browser.controlFlow().execute(async() => {
+            comment = {message: 'GOODBYE'};
+
+            await this.alfrescoJsApi.activiti.commentsApi.addProcessInstanceComment(comment, processInstanceId);
+        });
+
+        processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton();
+
+        processFiltersPage.clickRunningFilterButton();
+        processFiltersPage.selectFromProcessList('Comment APS');
+
+        browser.controlFlow().execute(async() => {
+            let taskQuery = await this.alfrescoJsApi.activiti.taskApi.listTasks({processInstanceId: processInstanceId});
+
+            let taskId = taskQuery.data[0].id;
+
+            let taskComments = await this.alfrescoJsApi.activiti.commentsApi.getTaskComments(taskId, {'latestFirst': true});
+            expect(taskComments.total).toEqual(0);
+        });
+    });
+
+    it('[C260466] Should be able to display comments from Task on the related Process', () => {
+        browser.controlFlow().execute(async() => {
+            let taskQuery = await this.alfrescoJsApi.activiti.taskApi.listTasks({processInstanceId: processInstanceId});
+
+            let taskId = taskQuery.data[0].id;
+
+            taskComment = {message: 'Task Comment'};
+
+            await this.alfrescoJsApi.activiti.taskApi.addTaskComment(taskComment, taskId);
+        });
+
+        processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton();
+
+        processFiltersPage.clickRunningFilterButton();
+        processFiltersPage.selectFromProcessList('Comment APS');
+
+        browser.controlFlow().execute(async() => {
+            let addedTaskComment = await this.alfrescoJsApi.activiti.commentsApi.getProcessInstanceComments(processInstanceId, {'latestFirst': true});
+
+            commentsPage.checkUserIconIsDisplayed(0);
+
+            expect(commentsPage.getTotalNumberOfComments()).toEqual('Comments (' + addedTaskComment.total + ')');
+            expect(commentsPage.getMessage(0)).toEqual(addedTaskComment.data[0].message);
+            expect(commentsPage.getUserName(0)).toEqual(addedTaskComment.data[0].createdBy.firstName + ' ' + addedTaskComment.data[0].createdBy.lastName);
+            expect(commentsPage.getTime(0)).toContain('ago');
+        });
+    });
+});
diff --git a/e2e/process-services/comment_component_tasks.e2e.ts b/e2e/process-services/comment_component_tasks.e2e.ts
new file mode 100644
index 0000000000..d28a340d9f
--- /dev/null
+++ b/e2e/process-services/comment_component_tasks.e2e.ts
@@ -0,0 +1,183 @@
+/*!
+ * @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 } from 'protractor';
+
+import LoginPage = require('../pages/adf/loginPage');
+import ProcessServicesPage = require('../pages/adf/process_services/processServicesPage');
+import TasksPage = require('../pages/adf/process_services/tasksPage');
+import { CommentsPage } from '../pages/adf/commentsPage';
+
+import CONSTANTS = require('../util/constants');
+
+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';
+
+describe('Comment component for Processes', () => {
+
+    let loginPage = new LoginPage();
+    let processServicesPage = new ProcessServicesPage();
+    let taskPage = new TasksPage();
+    let commentsPage = new CommentsPage();
+
+    let app = resources.Files.SIMPLE_APP_WITH_USER_FORM;
+    let user, tenantId, appId, secondUser, newTaskId;
+
+    let taskName = {
+        completed_task: 'Test Completed',
+        multiple_users: 'Test Comment multiple users'
+    };
+
+    beforeAll(async(done) => {
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+        done();
+    });
+
+    beforeEach(async(done) => {
+        let apps = new AppsActions();
+        let users = new UsersActions();
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        user = await users.createTenantAndUser(this.alfrescoJsApi);
+
+        tenantId = user.tenantId;
+
+        secondUser = await users.createApsUser(this.alfrescoJsApi, tenantId);
+
+        await this.alfrescoJsApi.login(user.email, user.password);
+
+        let importedApp = await apps.importPublishDeployApp(this.alfrescoJsApi, app.file_location);
+        appId = importedApp.id;
+
+        await loginPage.loginToProcessServicesUsingUserModel(user);
+
+        done();
+    });
+
+    afterEach(async(done) => {
+        await loginPage.loginToProcessServicesUsingUserModel(user);
+
+        await this.alfrescoJsApi.activiti.modelsApi.deleteModel(appId);
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId);
+
+        done();
+    });
+
+    it('[C260237] Should not be able to add a comment on a completed task', () => {
+        browser.controlFlow().execute(async() => {
+            let newTask = await this.alfrescoJsApi.activiti.taskApi.createNewTask({name: taskName.completed_task});
+
+            let taskId = newTask.id;
+
+            this.alfrescoJsApi.activiti.taskActionsApi.completeTask(taskId);
+        });
+
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.COMPL_TASKS);
+        taskPage.usingTasksListPage().selectTaskFromTasksList(taskName.completed_task);
+
+        commentsPage.checkCommentInputIsNotDisplayed();
+    });
+
+    it('[C212864] Should be able to add multiple comments on a single task using different users', () => {
+        browser.controlFlow().execute(async() => {
+            let newTask = await this.alfrescoJsApi.activiti.taskApi.createNewTask({name: taskName.multiple_users});
+
+            newTaskId = newTask.id;
+
+            await this.alfrescoJsApi.activiti.taskApi.involveUser(newTaskId, {email: secondUser.email});
+
+            let taskComment = {message: 'Task Comment'};
+            let secondTaskComment = {message: 'Second Task Comment'};
+
+            await this.alfrescoJsApi.activiti.taskApi.addTaskComment(taskComment, newTaskId);
+            await this.alfrescoJsApi.activiti.taskApi.addTaskComment(secondTaskComment, newTaskId);
+        });
+
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.usingTasksListPage().selectTaskFromTasksList(taskName.multiple_users);
+        taskPage.usingTaskDetails().selectActivityTab();
+
+        browser.controlFlow().execute(async() => {
+            let totalComments = await this.alfrescoJsApi.activiti.taskApi.getTaskComments(newTaskId, {'latestFirst': true});
+
+            let thirdTaskComment = {message: 'Third Task Comment'};
+
+            await commentsPage.checkUserIconIsDisplayed(0);
+            await commentsPage.checkUserIconIsDisplayed(1);
+
+            await expect(commentsPage.getTotalNumberOfComments()).toEqual('Comments (' + totalComments.total + ')');
+
+            await expect(commentsPage.getMessage(0)).toEqual(totalComments.data[0].message);
+            await expect(commentsPage.getMessage(1)).toEqual(totalComments.data[1].message);
+
+            await expect(commentsPage.getUserName(0)).toEqual(totalComments.data[0].createdBy.firstName + ' ' + totalComments.data[0].createdBy.lastName);
+            await expect(commentsPage.getUserName(1)).toEqual(totalComments.data[1].createdBy.firstName + ' ' + totalComments.data[1].createdBy.lastName);
+
+            await expect(commentsPage.getTime(0)).toContain('ago');
+            await expect(commentsPage.getTime(1)).toContain('ago');
+
+            await loginPage.loginToProcessServicesUsingUserModel(secondUser);
+
+            await this.alfrescoJsApi.activiti.taskApi.addTaskComment(thirdTaskComment, newTaskId);
+        });
+
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.INV_TASKS);
+        taskPage.usingTasksListPage().selectTaskFromTasksList(taskName.multiple_users);
+        taskPage.usingTaskDetails().selectActivityTab();
+
+        browser.controlFlow().execute(async() => {
+            let totalComments = await this.alfrescoJsApi.activiti.taskApi.getTaskComments(newTaskId, {'latestFirst': true});
+
+            await commentsPage.checkUserIconIsDisplayed(0);
+            await commentsPage.checkUserIconIsDisplayed(1);
+            await commentsPage.checkUserIconIsDisplayed(2);
+
+            await expect(commentsPage.getTotalNumberOfComments()).toEqual('Comments (' + totalComments.total + ')');
+
+            await expect(commentsPage.getMessage(0)).toEqual(totalComments.data[0].message);
+            await expect(commentsPage.getMessage(1)).toEqual(totalComments.data[1].message);
+            await expect(commentsPage.getMessage(2)).toEqual(totalComments.data[2].message);
+
+            await expect(commentsPage.getUserName(0)).toEqual(totalComments.data[0].createdBy.firstName + ' ' + totalComments.data[0].createdBy.lastName);
+            await expect(commentsPage.getUserName(1)).toEqual(totalComments.data[1].createdBy.firstName + ' ' + totalComments.data[1].createdBy.lastName);
+            await expect(commentsPage.getUserName(2)).toEqual(totalComments.data[2].createdBy.firstName + ' ' + totalComments.data[2].createdBy.lastName);
+
+            await expect(commentsPage.getTime(0)).toContain('ago');
+            await expect(commentsPage.getTime(1)).toContain('ago');
+            await expect(commentsPage.getTime(2)).toContain('ago');
+        });
+    });
+});
diff --git a/e2e/process-services/custom_process_filters.e2e.ts b/e2e/process-services/custom_process_filters.e2e.ts
new file mode 100644
index 0000000000..6b262d7a06
--- /dev/null
+++ b/e2e/process-services/custom_process_filters.e2e.ts
@@ -0,0 +1,142 @@
+/*!
+ * @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 } from 'protractor';
+
+import LoginPage = require('../pages/adf/loginPage');
+import ProcessServicesPage = require('../pages/adf/process_services/processServicesPage');
+import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage.js');
+
+import TestConfig = require('../test.config');
+
+import AlfrescoApi = require('alfresco-js-api-node');
+import { UsersActions } from '../actions/users.actions';
+
+describe('New Process Filters', () => {
+
+    let loginPage = new LoginPage();
+    let processServicesPage = new ProcessServicesPage();
+    let processFiltersPage = new ProcessFiltersPage();
+
+    let tenantId, user, filterId, customProcessFilter;
+
+    let processFilter = {
+        running: 'Running',
+        all: 'All',
+        completed: 'Completed',
+        new_filter: 'New Filter',
+        edited: 'Edited Filter'
+    };
+
+    beforeAll(async(done) => {
+        let users = new UsersActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        user = await users.createTenantAndUser(this.alfrescoJsApi);
+
+        tenantId = user.tenantId;
+
+        await this.alfrescoJsApi.login(user.email, user.password);
+
+        done();
+    });
+
+    afterAll(async(done) => {
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+        await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId);
+        done();
+    });
+
+    it('[C279965] Should be able to view default filters on ADF', () => {
+        loginPage.loginToProcessServicesUsingUserModel(user);
+
+        processServicesPage
+            .goToProcessServices()
+            .goToTaskApp()
+            .clickProcessButton();
+
+        processFiltersPage.checkFilterIsDisplayed(processFilter.running);
+        processFiltersPage.checkFilterIsDisplayed(processFilter.all);
+        processFiltersPage.checkFilterIsDisplayed(processFilter.completed);
+    });
+
+    it('[C260473] Should be able to create a new filter on APS and display it on ADF', () => {
+        browser.controlFlow().execute(async () => {
+            customProcessFilter = await this.alfrescoJsApi.activiti.userFiltersApi.createUserProcessInstanceFilter({
+                'appId': null,
+                'name': processFilter.new_filter,
+                'icon': 'glyphicon-random',
+                'filter': {'sort': 'created-desc', 'name': '', 'state': 'running'}
+            });
+
+            filterId = customProcessFilter.id;
+
+            return customProcessFilter;
+        });
+
+        loginPage.loginToProcessServicesUsingUserModel(user);
+
+        processServicesPage
+            .goToProcessServices()
+            .goToTaskApp()
+            .clickProcessButton();
+
+        processFiltersPage.checkFilterIsDisplayed(processFilter.new_filter);
+    });
+
+    it('[C260474] Should be able to edit a filter on APS and check it on ADF', () => {
+        browser.controlFlow().execute(() => {
+            return this.alfrescoJsApi.activiti.userFiltersApi.updateUserProcessInstanceFilter(filterId, {
+                'appId': null,
+                'name': processFilter.edited,
+                'icon': 'glyphicon-random',
+                'filter': {'sort': 'created-desc', 'name': '', 'state': 'running'}
+            });
+        });
+
+        loginPage.loginToProcessServicesUsingUserModel(user);
+
+        processServicesPage
+            .goToProcessServices()
+            .goToTaskApp()
+            .clickProcessButton();
+
+        processFiltersPage.checkFilterIsDisplayed(processFilter.edited);
+    });
+
+    it('[C260475] Should be able to delete a filter on APS and check it on ADF', () => {
+        browser.controlFlow().execute(() => {
+            return this.alfrescoJsApi.activiti.userFiltersApi.deleteUserProcessInstanceFilter(filterId);
+        });
+
+        loginPage.loginToProcessServicesUsingUserModel(user);
+
+        processServicesPage
+            .goToProcessServices()
+            .goToTaskApp()
+            .clickProcessButton();
+
+        processFiltersPage.checkFilterIsNotDisplayed(processFilter.edited);
+    });
+
+});
diff --git a/e2e/process-services/custom_process_filters_sorting.e2e.ts b/e2e/process-services/custom_process_filters_sorting.e2e.ts
new file mode 100644
index 0000000000..7ea85eaf91
--- /dev/null
+++ b/e2e/process-services/custom_process_filters_sorting.e2e.ts
@@ -0,0 +1,386 @@
+/*!
+ * @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 } from 'protractor';
+
+import LoginPage = require('../pages/adf/loginPage');
+import ProcessServicesPage = require('../pages/adf/process_services/processServicesPage');
+import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage.js');
+import FiltersPage = require('../pages/adf/process_services/filtersPage.js');
+
+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';
+
+describe('Sorting for process filters', () => {
+
+    let loginPage = new LoginPage();
+    let processServicesPage = new ProcessServicesPage();
+    let processFiltersPage = new ProcessFiltersPage();
+    let filtersPage = new FiltersPage();
+
+    let apps = new AppsActions();
+
+    let app = resources.Files.SIMPLE_APP_WITH_USER_FORM;
+    let tenantId, appId, user, processesQuery;
+
+    let processFilter = {
+        running_old_first: 'Running - Oldest first',
+        completed_old_first: 'Completed - Oldest first',
+        all_old_first: 'All - Oldest first',
+        running_new_first: 'Running - Newest first',
+        completed_new_first: 'Completed - Newest first',
+        all_new_first: 'All - Newest first',
+        completed_most_recently: 'Completed - Most recently',
+        completed_least_recently: 'Completed - Least recently'
+    };
+
+    beforeAll(async(done) => {
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+        done();
+    });
+
+    beforeEach(async(done) => {
+        let users = new UsersActions();
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        user = await users.createTenantAndUser(this.alfrescoJsApi);
+        tenantId = user.tenantId;
+
+        await this.alfrescoJsApi.login(user.email, user.password);
+
+        let importedApp = await apps.importPublishDeployApp(this.alfrescoJsApi, app.file_location);
+        appId = importedApp.id;
+
+        loginPage.loginToProcessServicesUsingUserModel(user);
+
+        processServicesPage
+            .goToProcessServices()
+            .goToTaskApp()
+            .clickProcessButton();
+
+        done();
+    });
+
+    afterEach(async(done) => {
+        await this.alfrescoJsApi.activiti.modelsApi.deleteModel(appId);
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId);
+
+        done();
+    });
+
+    it('[C260476] Should be able to create a filter on APS for running processes - Oldest first and check on ADF', () => {
+        browser.controlFlow().execute(async () => {

+            await this.alfrescoJsApi.activiti.userFiltersApi.createUserProcessInstanceFilter({
+
'appId': null,
 'name': processFilter.running_old_first,
 'icon': 'glyphicon-random',

+                'filter': {'sort': 'created-asc', 'name': '', 'state': 'running'}

+            });

+            await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 1');

+            await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 2');

+            await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 3');

+        });

        loginPage.loginToProcessServicesUsingUserModel(user);

        processServicesPage

+            .goToProcessServices()

+            .goToTaskApp()

+            .clickProcessButton();

        processFiltersPage.checkFilterIsDisplayed(processFilter.running_old_first);

        filtersPage.goToFilter(processFilter.running_old_first);

        browser.controlFlow().execute(async () => {

+            processesQuery = await this.alfrescoJsApi.activiti.processApi.getProcessInstances({
+                'processDefinitionId': null, 'appDefinitionId': null, 'state': 'running', 'sort': 'created-asc'
+            });
+            expect(processesQuery.data[0].name).toEqual('Process 1');
+            expect(processesQuery.data[1].name).toEqual('Process 2');
+            expect(processesQuery.data[2].name).toEqual('Process 3');
+        });

    });
+
+    it('[C260477] Should be able to create a filter on APS for completed processes - Oldest first and check on ADF', () => {
+        browser.controlFlow().execute(async () => {
+            await this.alfrescoJsApi.activiti.userFiltersApi.createUserProcessInstanceFilter({
+
'appId': null,
 'name': processFilter.completed_old_first,
 'icon': 'glyphicon-random',
+                'filter': {'sort': 'created-asc', 'name': '', 'state': 'completed'}
+            });
+
+            let firstProc = await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 1');
+            let secondProc = await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 2');
+            let thirdProc = await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 3');
+
+            await this.alfrescoJsApi.activiti.processInstancesApi.deleteProcessInstance(firstProc.id);
+            await this.alfrescoJsApi.activiti.processInstancesApi.deleteProcessInstance(secondProc.id);
+            await this.alfrescoJsApi.activiti.processInstancesApi.deleteProcessInstance(thirdProc.id);
+        });
+
+        loginPage.loginToProcessServicesUsingUserModel(user);
+
+        processServicesPage
+            .goToProcessServices()
+            .goToTaskApp()
+            .clickProcessButton();
+
+        processFiltersPage.checkFilterIsDisplayed(processFilter.completed_old_first);
+
+        filtersPage.goToFilter(processFilter.completed_old_first);
+
+        browser.controlFlow().execute(async () => {
+            processesQuery = await this.alfrescoJsApi.activiti.processApi.getProcessInstances({
+                'processDefinitionId': null, 'appDefinitionId': null, 'state': 'completed', 'sort': 'created-asc'
+            });
+            expect(processesQuery.data[0].name).toEqual('Process 1');
+            expect(processesQuery.data[1].name).toEqual('Process 2');
+            expect(processesQuery.data[2].name).toEqual('Process 3');
+        });
+    });
+
+    it('[C260478] Should be able to create a filter on APS for all processes - Oldest first and check on ADF', () => {
+        browser.controlFlow().execute(async () => {
+            await this.alfrescoJsApi.activiti.userFiltersApi.createUserProcessInstanceFilter({

+                'appId': null,
 'name': processFilter.all_old_first,
 'icon': 'glyphicon-random',
+                'filter': {'sort': 'created-asc', 'name': '', 'state': 'all'}
+            });
+
+            await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 1');
+            await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 2');
+            await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 3');
+
+            let firstProc = await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 4');
+            let secondProc = await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 5');
+            let thirdProc = await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 6');
+
+            await this.alfrescoJsApi.activiti.processInstancesApi.deleteProcessInstance(firstProc.id);
+            await this.alfrescoJsApi.activiti.processInstancesApi.deleteProcessInstance(secondProc.id);
+            await this.alfrescoJsApi.activiti.processInstancesApi.deleteProcessInstance(thirdProc.id);
+        });
+
+        loginPage.loginToProcessServicesUsingUserModel(user);
+
+        processServicesPage
+            .goToProcessServices()
+            .goToTaskApp()
+            .clickProcessButton();
+
+        processFiltersPage.checkFilterIsDisplayed(processFilter.all_old_first);
+
+        filtersPage.goToFilter(processFilter.all_old_first);
+
+        browser.controlFlow().execute(async () => {
+            processesQuery = await this.alfrescoJsApi.activiti.processApi.getProcessInstances({
+                'processDefinitionId': null, 'appDefinitionId': null, 'state': 'all', 'sort': 'created-asc'
+            });
+            expect(processesQuery.data[0].name).toEqual('Process 1');
+            expect(processesQuery.data[1].name).toEqual('Process 2');
+            expect(processesQuery.data[2].name).toEqual('Process 3');
+            expect(processesQuery.data[3].name).toEqual('Process 4');
+            expect(processesQuery.data[4].name).toEqual('Process 5');
+            expect(processesQuery.data[5].name).toEqual('Process 6');
+        });
+    });
+
+    it('[C260479] Should be able to create a filter on APS for running processes - Newest first and check on ADF', () => {
+        browser.controlFlow().execute(async () => {
+            await this.alfrescoJsApi.activiti.userFiltersApi.createUserProcessInstanceFilter({

+                'appId': null,
 'name': processFilter.running_new_first,
 'icon': 'glyphicon-random',
+                'filter': {'sort': 'created-desc', 'name': '', 'state': 'running'}
+            });
+
+            await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 1');
+            await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 2');
+            await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 3');
+        });
+
+        loginPage.loginToProcessServicesUsingUserModel(user);
+
+        processServicesPage
+            .goToProcessServices()
+            .goToTaskApp()
+            .clickProcessButton();
+
+        processFiltersPage.checkFilterIsDisplayed(processFilter.running_new_first);
+
+        filtersPage.goToFilter(processFilter.running_new_first);
+
+        browser.controlFlow().execute(async () => {
+            processesQuery = await this.alfrescoJsApi.activiti.processApi.getProcessInstances({
+                'processDefinitionId': null, 'appDefinitionId': null, 'state': 'running', 'sort': 'created-desc'
+            });
+            expect(processesQuery.data[0].name).toEqual('Process 3');
+            expect(processesQuery.data[1].name).toEqual('Process 2');
+            expect(processesQuery.data[2].name).toEqual('Process 1');
+        });
+    });
+
+    it('[C260480] Should be able to create a filter on APS for completed processes - Newest first and check on ADF', () => {
+        browser.controlFlow().execute(async () => {
+            await this.alfrescoJsApi.activiti.userFiltersApi.createUserProcessInstanceFilter({

+                'appId': null,
 'name': processFilter.completed_new_first,
 'icon': 'glyphicon-random',
+                'filter': {'sort': 'created-desc', 'name': '', 'state': 'completed'}
+            });
+
+            let firstProc = await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 1');
+            let secondProc = await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 2');
+            let thirdProc = await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 3');
+
+            await this.alfrescoJsApi.activiti.processInstancesApi.deleteProcessInstance(firstProc.id);
+            await this.alfrescoJsApi.activiti.processInstancesApi.deleteProcessInstance(secondProc.id);
+            await this.alfrescoJsApi.activiti.processInstancesApi.deleteProcessInstance(thirdProc.id);
+        });
+
+        loginPage.loginToProcessServicesUsingUserModel(user);
+
+        processServicesPage
+            .goToProcessServices()
+            .goToTaskApp()
+            .clickProcessButton();
+
+        processFiltersPage.checkFilterIsDisplayed(processFilter.completed_new_first);
+
+        filtersPage.goToFilter(processFilter.completed_new_first);
+
+        browser.controlFlow().execute(async () => {
+            processesQuery = await this.alfrescoJsApi.activiti.processApi.getProcessInstances({
+                'processDefinitionId': null, 'appDefinitionId': null, 'state': 'completed', 'sort': 'created-desc'
+            });
+            expect(processesQuery.data[0].name).toEqual('Process 3');
+            expect(processesQuery.data[1].name).toEqual('Process 2');
+            expect(processesQuery.data[2].name).toEqual('Process 1');
+        });
+    });
+
+    it('[C260481] Should be able to create a filter on APS for all processes - Newest first and check on ADF', () => {
+        browser.controlFlow().execute(async () => {
+            await this.alfrescoJsApi.activiti.userFiltersApi.createUserProcessInstanceFilter({

+                'appId': null,
 'name': processFilter.all_new_first,
 'icon': 'glyphicon-random',
+                'filter': {'sort': 'created-desc', 'name': '', 'state': 'all'}
+            });
+
+            await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 1');
+            await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 2');
+            await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 3');
+
+            let firstProc = await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 4');
+            let secondProc = await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 5');
+            let thirdProc = await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 6');
+
+            await this.alfrescoJsApi.activiti.processInstancesApi.deleteProcessInstance(firstProc.id);
+            await this.alfrescoJsApi.activiti.processInstancesApi.deleteProcessInstance(secondProc.id);
+            await this.alfrescoJsApi.activiti.processInstancesApi.deleteProcessInstance(thirdProc.id);
+        });
+
+        loginPage.loginToProcessServicesUsingUserModel(user);
+
+        processServicesPage
+            .goToProcessServices()
+            .goToTaskApp()
+            .clickProcessButton();
+
+        processFiltersPage.checkFilterIsDisplayed(processFilter.all_new_first);
+
+        filtersPage.goToFilter(processFilter.all_new_first);
+
+        browser.controlFlow().execute(async () => {
+            processesQuery = await this.alfrescoJsApi.activiti.processApi.getProcessInstances({
+                'processDefinitionId': null, 'appDefinitionId': null, 'state': 'all', 'sort': 'created-desc'
+            });
+            expect(processesQuery.data[0].name).toEqual('Process 6');
+            expect(processesQuery.data[1].name).toEqual('Process 5');
+            expect(processesQuery.data[2].name).toEqual('Process 4');
+            expect(processesQuery.data[3].name).toEqual('Process 3');
+            expect(processesQuery.data[4].name).toEqual('Process 2');
+            expect(processesQuery.data[5].name).toEqual('Process 1');
+        });
+    });
+
+    it('[C272815] Should be able to create a filter on APS for completed processes - Completed most recently and check on ADF', () => {
+        browser.controlFlow().execute(async () => {
+            await this.alfrescoJsApi.activiti.userFiltersApi.createUserProcessInstanceFilter({

+                'appId': null,
 'name': processFilter.completed_most_recently,
 'icon': 'glyphicon-random',
+                'filter': {'sort': 'ended-asc', 'name': '', 'state': 'completed'}
+            });
+
+            let firstProc = await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 1');
+            let secondProc = await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 2');
+            let thirdProc = await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 3');
+
+            await this.alfrescoJsApi.activiti.processInstancesApi.deleteProcessInstance(secondProc.id);
+            await this.alfrescoJsApi.activiti.processInstancesApi.deleteProcessInstance(firstProc.id);
+            await this.alfrescoJsApi.activiti.processInstancesApi.deleteProcessInstance(thirdProc.id);
+        });
+
+        loginPage.loginToProcessServicesUsingUserModel(user);
+
+        processServicesPage
+            .goToProcessServices()
+            .goToTaskApp()
+            .clickProcessButton();
+
+        processFiltersPage.checkFilterIsDisplayed(processFilter.completed_most_recently);
+
+        filtersPage.goToFilter(processFilter.completed_most_recently);
+
+        browser.controlFlow().execute(async () => {
+            processesQuery = await this.alfrescoJsApi.activiti.processApi.getProcessInstances({
+                'processDefinitionId': null, 'appDefinitionId': null, 'state': 'completed', 'sort': 'ended-asc'
+            });
+            expect(processesQuery.data[0].name).toEqual('Process 2');
+            expect(processesQuery.data[1].name).toEqual('Process 1');
+            expect(processesQuery.data[2].name).toEqual('Process 3');
+        });
+    });
+
+    it('[C272816] Should be able to create a filter on APS for completed processes - Completed least recently and check on ADF', () => {
+        browser.controlFlow().execute(async () => {
+            await this.alfrescoJsApi.activiti.userFiltersApi.createUserProcessInstanceFilter({

+                'appId': null,
 'name': processFilter.completed_least_recently,
 'icon': 'glyphicon-random',
+                'filter': {'sort': 'ended-desc', 'name': '', 'state': 'completed'}
+            });
+
+            let firstProc = await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 1');
+            let secondProc = await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 2');
+            let thirdProc = await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 3');
+
+            await this.alfrescoJsApi.activiti.processInstancesApi.deleteProcessInstance(secondProc.id);
+            await this.alfrescoJsApi.activiti.processInstancesApi.deleteProcessInstance(firstProc.id);
+            await this.alfrescoJsApi.activiti.processInstancesApi.deleteProcessInstance(thirdProc.id);
+        });
+
+        loginPage.loginToProcessServicesUsingUserModel(user);
+
+        processServicesPage
+            .goToProcessServices()
+            .goToTaskApp()
+            .clickProcessButton();
+
+        processFiltersPage.checkFilterIsDisplayed(processFilter.completed_least_recently);
+
+        filtersPage.goToFilter(processFilter.completed_least_recently);
+
+        browser.controlFlow().execute(async () => {
+            processesQuery = await this.alfrescoJsApi.activiti.processApi.getProcessInstances({
+                'processDefinitionId': null, 'appDefinitionId': null, 'state': 'completed', 'sort': 'ended-desc'
+            });
+            expect(processesQuery.data[0].name).toEqual('Process 3');
+            expect(processesQuery.data[1].name).toEqual('Process 1');
+            expect(processesQuery.data[2].name).toEqual('Process 2');
+        });
+    });
+});
diff --git a/e2e/process-services/empty_process_list_component.e2e.ts b/e2e/process-services/empty_process_list_component.e2e.ts
new file mode 100644
index 0000000000..0da1fbdefb
--- /dev/null
+++ b/e2e/process-services/empty_process_list_component.e2e.ts
@@ -0,0 +1,97 @@
+/*!
+ * @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 TestConfig = require('../test.config');
+import resources = require('../util/resources');
+import LoginPage = require('../pages/adf/loginPage');
+import NavigationBarPage = require('../pages/adf/navigationBarPage');
+import ProcessServicesPage = require('../pages/adf/process_services/processServicesPage');
+import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage');
+import ProcessDetailsPage = require('../pages/adf/process_services/processDetailsPage');
+import ProcessListPage = require('../pages/adf/process_services/processListPage');
+
+import AlfrescoApi = require('alfresco-js-api-node');
+import { AppsActions } from '../actions/APS/apps.actions';
+import { UsersActions } from '../actions/users.actions';
+
+describe('Empty Process List Test', () => {
+
+    let loginPage = new LoginPage();
+    let navigationBarPage = new NavigationBarPage();
+    let processServicesPage = new ProcessServicesPage();
+    let processFiltersPage = new ProcessFiltersPage();
+    let processDetailsPage = new ProcessDetailsPage();
+    let processListPage = new ProcessListPage();
+
+    let appA = resources.Files.APP_WITH_PROCESSES;
+    let appB = resources.Files.SIMPLE_APP_WITH_USER_FORM;
+
+    let user;
+
+    beforeAll(async (done) => {
+        let apps = new AppsActions();
+        let users = new UsersActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        user = await users.createTenantAndUser(this.alfrescoJsApi);
+
+        await this.alfrescoJsApi.login(user.email, user.password);
+
+        await apps.importPublishDeployApp(this.alfrescoJsApi, appA.file_location);
+        await apps.importPublishDeployApp(this.alfrescoJsApi, appB.file_location);
+
+        done();
+    });
+
+    it('[C260494] Should add process to list when a process is created', () => {
+        loginPage.loginToProcessServicesUsingUserModel(user);
+        navigationBarPage.clickProcessServicesButton();
+        processServicesPage.checkApsContainer();
+        processServicesPage.goToApp(appA.title).clickProcessButton();
+        expect(processListPage.checkProcessListTitleIsDisplayed()).toEqual('No Processes Found');
+        expect(processListPage.checkProcessDetailsMessagee()).toEqual('No process details found');
+
+        processFiltersPage.clickCreateProcessButton();
+        processFiltersPage.clickNewProcessDropdown();
+        processListPage.openProcessDropdown();
+        processListPage.selectProcessDropdown(1);
+        processListPage.startProcess();
+        expect(processFiltersPage.numberOfProcessRows()).toEqual(1);
+
+        processDetailsPage.checkProcessDetailsCard();
+        navigationBarPage.clickProcessServicesButton();
+        processServicesPage.checkApsContainer();
+        processServicesPage.goToApp(appB.title).clickProcessButton();
+        expect(processListPage.checkProcessListTitleIsDisplayed()).toEqual('No Processes Found');
+        expect(processListPage.checkProcessDetailsMessagee()).toEqual('No process details found');
+
+        processFiltersPage.clickCreateProcessButton();
+        processFiltersPage.clickNewProcessDropdown();
+        processListPage.openProcessDropdown();
+        processListPage.selectProcessDropdown(0);
+        processListPage.startProcess();
+        expect(processFiltersPage.numberOfProcessRows()).toEqual(1);
+        processDetailsPage.checkProcessDetailsCard();
+    });
+
+});
diff --git a/e2e/process-services/form_widgets_component.e2e.ts b/e2e/process-services/form_widgets_component.e2e.ts
new file mode 100644
index 0000000000..250f294557
--- /dev/null
+++ b/e2e/process-services/form_widgets_component.e2e.ts
@@ -0,0 +1,211 @@
+/*!
+ * @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 LoginPage = require('../pages/adf/loginPage');
+import ProcessServicesPage = require('../pages/adf/process_services/processServicesPage');
+import TasksPage = require('../pages/adf/process_services/tasksPage');
+import UsingWidget = require('../pages/adf/process_services/widgets/usingWidget');
+
+import CONSTANTS = require('../util/constants');
+
+import FormDefinitionModel = require('../models/APS/FormDefinitionModel');
+import Task = require('../models/APS/Task');
+
+import TestConfig = require('../test.config');
+import resources = require('../util/resources');
+
+let formInstance = new FormDefinitionModel();
+
+import AlfrescoApi = require('alfresco-js-api-node');
+import { AppsActions } from '../actions/APS/apps.actions';
+import { UsersActions } from '../actions/users.actions';
+
+describe('Form widgets', () => {
+
+    let loginPage = new LoginPage();
+    let processServicesPage = new ProcessServicesPage();
+    let processUserModel;
+    let app = resources.Files.WIDGETS_SMOKE_TEST;
+    let appFields = app.form_fields;
+    let taskPage = new TasksPage();
+    let appModel;
+    let newTask = 'First task';
+    let usingWidget = new UsingWidget();
+    let alfrescoJsApi;
+
+    beforeAll(async (done) => {
+        let users = new UsersActions();
+        let appsActions = new AppsActions();
+
+        alfrescoJsApi = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+        await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        processUserModel = await users.createTenantAndUser(alfrescoJsApi);
+
+        await alfrescoJsApi.login(processUserModel.email, processUserModel.password);
+
+        appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, app.file_location);
+
+        done();
+    });
+
+    afterAll(async (done) => {
+
+        await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
+
+        done();
+    });
+
+    it('[C272778] Check text, multiline widgets - label, value and displayed', () => {
+        loginPage.loginToProcessServicesUsingUserModel(processUserModel);
+        processServicesPage.goToProcessServices().goToApp(appModel.name)
+            .clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.createNewTask().addName(newTask).addDescription('Description').addForm(app.formName).clickStartButton()
+            .then(() => {
+                taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(newTask);
+                taskPage.usingFormFields().checkFormIsDisplayed();
+                expect(taskPage.usingTaskDetails().getTitle()).toEqual('Activities');
+            })
+            .then(() => {
+                return alfrescoJsApi.activiti.taskApi.listTasks(new Task({ sort: 'created-desc' }));
+            })
+            .then( (response) => {
+                return alfrescoJsApi.activiti.taskFormsApi.getTaskForm(response.data[0].id);
+            })
+            .then((formDefinition) => {
+                formInstance.setFields(formDefinition.fields);
+                formInstance.setAllWidgets(formDefinition.fields);
+                return formInstance;
+            })
+            .then(() => {
+                expect(taskPage.usingFormFields().getFieldLabel(appFields.text_id))
+                    .toEqual(formInstance.getWidgetBy('id', appFields.text_id).name);
+                expect(taskPage.usingFormFields().getFieldValue(appFields.text_id))
+                    .toEqual(formInstance.getWidgetBy('id', appFields.text_id).value || '');
+
+                expect(usingWidget.usingMultilineTextWidget().getFieldValue(appFields.multiline_id))
+                    .toEqual(formInstance.getWidgetBy('id', appFields.multiline_id).value || '');
+                expect(taskPage.usingFormFields().getFieldLabel(appFields.multiline_id))
+                    .toEqual(formInstance.getWidgetBy('id', appFields.multiline_id).name);
+            });
+
+    });
+
+    it('[C272779] Check number, amount widgets - label, value and displayed', () => {
+
+        expect(taskPage.usingFormFields().getFieldValue(appFields.number_id))
+            .toEqual(formInstance.getWidgetBy('id', appFields.number_id).value || '');
+        expect(taskPage.usingFormFields().getFieldLabel(appFields.number_id))
+            .toEqual(formInstance.getWidgetBy('id', appFields.number_id).name);
+
+        expect(taskPage.usingFormFields().getFieldValue(appFields.amount_id))
+            .toEqual(formInstance.getWidgetBy('id', appFields.amount_id).value || '');
+        expect(taskPage.usingFormFields().getFieldLabel(appFields.amount_id))
+            .toEqual(formInstance.getWidgetBy('id', appFields.amount_id).name);
+    });
+
+    it('[C272780] Check attachfolder, attachfile widgets - label and displayed', () => {
+
+        expect(taskPage.usingFormFields().getFieldLabel(appFields.attachfolder_id))
+            .toEqual(formInstance.getWidgetBy('id', appFields.attachfolder_id).name);
+        expect(taskPage.usingFormFields().getFieldLabel(appFields.attachfile_id))
+            .toEqual(formInstance.getWidgetBy('id', appFields.attachfile_id).name);
+    });
+
+    it('[C272781] Check date, date & time widgets - label, value and displayed', () => {
+
+        expect(taskPage.usingFormFields().getFieldLabel(appFields.date_id))
+            .toContain(formInstance.getWidgetBy('id', appFields.date_id).name);
+        expect(taskPage.usingFormFields().getFieldValue(appFields.date_id))
+            .toEqual(formInstance.getWidgetBy('id', appFields.date_id).value || '');
+
+        expect(taskPage.usingFormFields().getFieldLabel(appFields.dateTime_id))
+            .toContain(formInstance.getWidgetBy('id', appFields.dateTime_id).name);
+        expect(taskPage.usingFormFields().getFieldValue(appFields.dateTime_id))
+            .toEqual(formInstance.getWidgetBy('id', appFields.dateTime_id).value || '');
+    });
+
+    it('[C272782] Check people, group widgets - label, value and displayed', () => {
+
+        expect(taskPage.usingFormFields().getFieldValue(appFields.people_id))
+            .toEqual(formInstance.getWidgetBy('id', appFields.people_id).value || '');
+        expect(taskPage.usingFormFields().getFieldLabel(appFields.people_id))
+            .toEqual(formInstance.getWidgetBy('id', appFields.people_id).name);
+
+        expect(taskPage.usingFormFields().getFieldValue(appFields.group_id))
+            .toEqual(formInstance.getWidgetBy('id', appFields.group_id).value || '');
+        expect(taskPage.usingFormFields().getFieldLabel(appFields.group_id))
+            .toEqual(formInstance.getWidgetBy('id', appFields.group_id).name);
+    });
+
+    it('[C272783] Check displayText, displayValue widgets - value and displayed', () => {
+
+        expect(usingWidget.usingDisplayTextWidget().getFieldLabel(appFields.displaytext_id))
+            .toEqual(formInstance.getWidgetBy('id', appFields.displaytext_id).value);
+        expect(usingWidget.usingDisplayValueWidget().getFieldLabel(appFields.displayvalue_id))
+            .toEqual(formInstance.getWidgetBy('id', appFields.displayvalue_id).value || 'Unknown type: readonly');
+    });
+
+    it('[C272784] Check typeahead, header widgets - label, value and displayed', () => {
+
+        expect(usingWidget.usingHeaderWidget().getFieldLabel(appFields.header_id))
+            .toEqual(formInstance.getWidgetBy('id', appFields.header_id).name);
+
+        expect(taskPage.usingFormFields().getFieldValue(appFields.typeahead_id))
+            .toEqual(formInstance.getWidgetBy('id', appFields.typeahead_id).value || '');
+        expect(taskPage.usingFormFields().getFieldLabel(appFields.typeahead_id))
+            .toEqual(formInstance.getWidgetBy('id', appFields.typeahead_id).name);
+    });
+
+    it('[C272785] Check checkbox, radiobuttons widgets - label, value and displayed', () => {
+        let radioOption = 1;
+
+        expect(taskPage.usingFormFields().getFieldLabel(appFields.checkbox_id))
+            .toContain(formInstance.getWidgetBy('id', appFields.checkbox_id).name);
+
+        expect(taskPage.usingFormFields().getFieldLabel(appFields.radiobuttons_id))
+            .toContain(formInstance.getWidgetBy('id', appFields.radiobuttons_id).name);
+        expect(usingWidget.usingRadioWidget().getSpecificOptionLabel(appFields.radiobuttons_id, radioOption))
+            .toContain(formInstance.getWidgetBy('id', appFields.radiobuttons_id).options[radioOption - 1].name);
+    });
+
+    it('[C268149] Check hyperlink, dropdown, dynamictable widgets - label, value and displayed', () => {
+
+        expect(usingWidget.usingHyperlink().getFieldText(appFields.hyperlink_id))
+            .toEqual(formInstance.getWidgetBy('id', appFields.hyperlink_id).hyperlinkUrl || '');
+        expect(taskPage.usingFormFields().getFieldLabel(appFields.hyperlink_id))
+            .toEqual(formInstance.getWidgetBy('id', appFields.hyperlink_id).name);
+
+        expect(taskPage.usingFormFields().getFieldLabel(appFields.dropdown_id))
+            .toContain(formInstance.getWidgetBy('id', appFields.dropdown_id).name);
+        expect(usingWidget.usingDropdown().getSelectedOptionText(appFields.dropdown_id))
+            .toContain(formInstance.getWidgetBy('id', appFields.dropdown_id).value);
+
+        expect(usingWidget.usingDynamicTable().getFieldLabel(appFields.dynamictable_id))
+            .toContain(formInstance.getWidgetBy('id', appFields.dynamictable_id).name);
+        expect(usingWidget.usingDynamicTable().getColumnName(appFields.dynamictable_id))
+            .toContain(formInstance.getWidgetBy('id', appFields.dynamictable_id).columnDefinitions[0].name);
+    });
+
+});
diff --git a/e2e/process-services/pagination_processlist_addingProcesses.e2e.ts b/e2e/process-services/pagination_processlist_addingProcesses.e2e.ts
new file mode 100644
index 0000000000..cdbdce2745
--- /dev/null
+++ b/e2e/process-services/pagination_processlist_addingProcesses.e2e.ts
@@ -0,0 +1,104 @@
+/*!
+ * @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 LoginPage = require('../pages/adf/loginPage');
+import ProcessServicesPage = require('../pages/adf/process_services/processServicesPage');
+import PaginationPage = require('../pages/adf/paginationPage');
+import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage');
+import ProcessDetailsPage = require('../pages/adf/process_services/processDetailsPage');
+
+import TestConfig = require('../test.config');
+import resources = require('../util/resources');
+
+import AlfrescoApi = require('alfresco-js-api-node');
+import { AppsActions } from '../actions/APS/apps.actions';
+import { UsersActions } from '../actions/users.actions';
+
+describe('Process List - Pagination when adding processes', () => {
+
+    let itemsPerPage = {
+        fifteen: '15',
+        fifteenValue: 15
+    };
+
+    let loginPage = new LoginPage();
+    let processServicesPage = new ProcessServicesPage();
+    let paginationPage = new PaginationPage();
+    let processFiltersPage = new ProcessFiltersPage();
+    let processDetailsPage = new ProcessDetailsPage();
+
+    let processUserModel;
+    let app = resources.Files.SIMPLE_APP_WITH_USER_FORM;
+    let nrOfProcesses = 25;
+    let page, totalPages;
+
+    beforeAll(async (done) => {
+        let apps = new AppsActions();
+        let users = new UsersActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        processUserModel = await users.createTenantAndUser(this.alfrescoJsApi);
+
+        await this.alfrescoJsApi.login(processUserModel.email, processUserModel.password);
+
+        let resultApp = await apps.importPublishDeployApp(this.alfrescoJsApi, app.file_location);
+
+        for (let i = 0; i < nrOfProcesses; i++) {
+            await apps.startProcess(this.alfrescoJsApi, resultApp);
+        }
+
+        loginPage.loginToProcessServicesUsingUserModel(processUserModel);
+
+        done();
+    });
+
+    it('[C261046] Items per page set to 15 and adding of processes', () => {
+        totalPages = 2;
+        page = 1;
+        processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton();
+        processDetailsPage.checkProcessTitleIsDisplayed();
+        processFiltersPage.waitForTableBody();
+        paginationPage.selectItemsPerPage(itemsPerPage.fifteen);
+        processDetailsPage.checkProcessTitleIsDisplayed();
+        processFiltersPage.waitForTableBody();
+        expect(paginationPage.getCurrentPage()).toEqual('Page ' + page);
+        expect(paginationPage.getTotalPages()).toEqual('of ' + totalPages);
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.fifteen);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + itemsPerPage.fifteenValue * page + ' of ' + nrOfProcesses);
+        expect(processFiltersPage.numberOfProcessRows()).toBe(itemsPerPage.fifteenValue);
+        paginationPage.checkNextPageButtonIsEnabled();
+        paginationPage.checkPreviousPageButtonIsDisabled();
+
+        page++;
+        paginationPage.clickOnNextPage();
+        processDetailsPage.checkProcessTitleIsDisplayed();
+        processFiltersPage.waitForTableBody();
+        expect(paginationPage.getCurrentPage()).toEqual('Page ' + page);
+        expect(paginationPage.getTotalPages()).toEqual('of ' + totalPages);
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.fifteen);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 16-' + nrOfProcesses + ' of ' + nrOfProcesses);
+        expect(processFiltersPage.numberOfProcessRows()).toBe(nrOfProcesses - itemsPerPage.fifteenValue);
+        paginationPage.checkNextPageButtonIsDisabled();
+        paginationPage.checkPreviousPageButtonIsEnabled();
+    });
+});
diff --git a/e2e/process-services/pagination_tasklist_addingTasks.e2e.ts b/e2e/process-services/pagination_tasklist_addingTasks.e2e.ts
new file mode 100644
index 0000000000..119b8fb06f
--- /dev/null
+++ b/e2e/process-services/pagination_tasklist_addingTasks.e2e.ts
@@ -0,0 +1,95 @@
+/*!
+ * @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 LoginPage = require('../pages/adf/loginPage');
+import ProcessServicesPage = require('../pages/adf/process_services/processServicesPage');
+import TasksPage = require('../pages/adf/process_services/tasksPage');
+import PaginationPage = require('../pages/adf/paginationPage');
+
+import CONSTANTS = require('../util/constants');
+
+import AlfrescoApi = require('alfresco-js-api-node');
+import { AppsActions } from '../actions/APS/apps.actions';
+import { UsersActions } from '../actions/users.actions';
+
+import TestConfig = require('../test.config');
+import resources = require('../util/resources');
+
+describe('Items per page set to 15 and adding of tasks', () => {
+
+    let loginPage = new LoginPage();
+    let processServicesPage = new ProcessServicesPage();
+    let taskPage = new TasksPage();
+    let paginationPage = new PaginationPage();
+
+    let processUserModel;
+    let app = resources.Files.SIMPLE_APP_WITH_USER_FORM;
+    let currentPage = 1, nrOfTasks = 25, totalPages = 2;
+
+    let itemsPerPage = {
+        fifteen: '15',
+        fifteenValue: 15
+    };
+
+    beforeAll(async (done) => {
+        let apps = new AppsActions();
+        let users = new UsersActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        processUserModel = await users.createTenantAndUser(this.alfrescoJsApi);
+
+        await this.alfrescoJsApi.login(processUserModel.email, processUserModel.password);
+
+        let resultApp = await apps.importPublishDeployApp(this.alfrescoJsApi, app.file_location);
+
+        for (let i = 0; i < nrOfTasks; i++) {
+            await apps.startProcess(this.alfrescoJsApi, resultApp);
+        }
+
+        loginPage.loginToProcessServicesUsingUserModel(processUserModel);
+
+        done();
+    });
+
+    it('[C260306] Items per page set to 15 and adding of tasks', () => {
+        processServicesPage.goToProcessServices().goToTaskApp();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.INV_TASKS);
+        paginationPage.selectItemsPerPage(itemsPerPage.fifteen);
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.fifteen);
+        expect(paginationPage.getCurrentPage()).toEqual('Page ' + currentPage);
+        expect(paginationPage.getTotalPages()).toEqual('of ' + totalPages);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + itemsPerPage.fifteenValue + ' of ' + nrOfTasks);
+        expect(taskPage.getAllDisplayedRows()).toBe(itemsPerPage.fifteenValue);
+        currentPage++;
+        paginationPage.clickOnNextPage();
+
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.fifteen);
+        expect(paginationPage.getCurrentPage()).toEqual('Page ' + currentPage);
+        expect(paginationPage.getTotalPages()).toEqual('of ' + totalPages);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 16-' + nrOfTasks + ' of ' + nrOfTasks);
+        expect(taskPage.getAllDisplayedRows()).toBe(nrOfTasks - itemsPerPage.fifteenValue);
+        paginationPage.checkNextPageButtonIsDisabled();
+        paginationPage.checkPreviousPageButtonIsEnabled();
+    });
+
+});
diff --git a/e2e/process-services/people_component.e2e.ts b/e2e/process-services/people_component.e2e.ts
new file mode 100644
index 0000000000..46a8b53e9b
--- /dev/null
+++ b/e2e/process-services/people_component.e2e.ts
@@ -0,0 +1,226 @@
+/*!
+ * @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 LoginPage = require('../pages/adf/loginPage');
+import ProcessServicesPage = require('../pages/adf/process_services/processServicesPage');
+import TasksPage = require('../pages/adf/process_services/tasksPage');
+
+import CONSTANTS = require('../util/constants');
+
+import Tenant = require('../models/APS/Tenant');
+
+import TestConfig = require('../test.config');
+import resources = require('../util/resources');
+
+import AlfrescoApi = require('alfresco-js-api-node');
+import { UsersActions } from '../actions/users.actions';
+import fs = require('fs');
+import path = require('path');
+
+describe('People component', () => {
+
+    let loginPage = new LoginPage();
+    let processServicesPage = new ProcessServicesPage();
+    let processUserModel, assigneeUserModel, secondAssigneeUserModel;
+    let app = resources.Files.SIMPLE_APP_WITH_USER_FORM;
+    let taskPage = new TasksPage();
+    let peopleTitle = 'People this task is shared with ';
+
+    let tasks = ['no people involved task', 'remove people task', 'can not complete task', 'multiple users', 'completed filter'];
+
+    beforeAll(async (done) => {
+        let users = new UsersActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        let newTenant = await this.alfrescoJsApi.activiti.adminTenantsApi.createTenant(new Tenant());
+
+        assigneeUserModel = await users.createApsUser(this.alfrescoJsApi, newTenant.id);
+
+        secondAssigneeUserModel = await users.createApsUser(this.alfrescoJsApi, newTenant.id);
+
+        processUserModel = await users.createApsUser(this.alfrescoJsApi, newTenant.id);
+
+        let pathFile = path.join(TestConfig.main.rootPath + app.file_location);
+        let file = fs.createReadStream(pathFile);
+
+        await this.alfrescoJsApi.login(processUserModel.email, processUserModel.password);
+
+        await this.alfrescoJsApi.activiti.appsApi.importAppDefinition(file);
+
+        for (let i = 0; i < tasks.length; i++) {
+            this.alfrescoJsApi.activiti.taskApi.createNewTask({name: tasks[i]});
+        }
+
+        loginPage.loginToProcessServicesUsingUserModel(processUserModel);
+
+        done();
+    });
+
+    it('[C279989] Should no people be involved when no user is typed', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[0]).selectTaskFromTasksList(tasks[0]);
+
+        taskPage.usingTaskDetails().clickInvolvePeopleButton();
+        taskPage.usingTaskDetails().clickAddInvolvedUserButton();
+        taskPage.usingTaskDetails().checkNoPeopleIsInvolved();
+    });
+
+    it('[C279990] Should no people be involved when clicking on Cancel button', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[0]).selectTaskFromTasksList(tasks[0]);
+
+        taskPage.usingTaskDetails().clickInvolvePeopleButton()
+            .typeUser(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName)
+            .selectUserToInvolve(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName)
+            .checkUserIsSelected(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName);
+        taskPage.usingTaskDetails().clickCancelInvolvePeopleButton();
+        taskPage.usingTaskDetails().checkNoPeopleIsInvolved();
+    });
+
+    it('[C261029] Should People dialog be displayed when clicking on add people button', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[0]).selectTaskFromTasksList(tasks[0]);
+
+        taskPage.usingTaskDetails().clickInvolvePeopleButton();
+        expect(taskPage.usingTaskDetails().getInvolvePeopleHeader()).toEqual('Add people and groups');
+        expect(taskPage.usingTaskDetails().getInvolvePeoplePlaceholder()).toEqual('Search user');
+        taskPage.usingTaskDetails().checkAddPeopleButtonIsEnabled().checkCancelButtonIsEnabled();
+        taskPage.usingTaskDetails().clickCancelInvolvePeopleButton();
+    });
+
+    it('[C279991] Should not be able to involve a user when is the creator of the task', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[0]).selectTaskFromTasksList(tasks[0]);
+
+        taskPage.usingTaskDetails().clickInvolvePeopleButton()
+            .typeUser(processUserModel.firstName + ' ' + processUserModel.lastName)
+            .noUserIsDisplayedInSearchInvolvePeople(processUserModel.firstName + ' ' + processUserModel.lastName);
+        taskPage.usingTaskDetails().clickAddInvolvedUserButton();
+        taskPage.usingTaskDetails().checkNoPeopleIsInvolved();
+    });
+
+    it('[C261030] Should involved user be removed when clicking on remove button', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[0]).selectTaskFromTasksList(tasks[0]);
+
+        taskPage.usingTaskDetails().clickInvolvePeopleButton()
+            .typeUser(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName)
+            .selectUserToInvolve(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName)
+            .checkUserIsSelected(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName);
+        taskPage.usingTaskDetails().clickAddInvolvedUserButton();
+
+        expect(taskPage.usingTaskDetails().getInvolvedUserEmail(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName))
+            .toEqual(assigneeUserModel.email);
+        taskPage.usingTaskDetails().removeInvolvedUser(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName);
+        taskPage.usingTaskDetails().checkNoPeopleIsInvolved();
+    });
+
+    it('[C280013] Should not be able to complete a task by a involved user', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[1]).selectTaskFromTasksList(tasks[1]);
+
+        taskPage.usingTaskDetails().clickInvolvePeopleButton()
+            .typeUser(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName)
+            .selectUserToInvolve(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName)
+            .checkUserIsSelected(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName);
+        taskPage.usingTaskDetails().clickAddInvolvedUserButton();
+
+        expect(taskPage.usingTaskDetails().getInvolvedUserEmail(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName))
+            .toEqual(assigneeUserModel.email);
+
+        loginPage.loginToProcessServicesUsingUserModel(assigneeUserModel);
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.INV_TASKS);
+        taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[1]).selectTaskFromTasksList(tasks[1]);
+
+        taskPage.completeTaskNoFormNotDisplayed();
+    });
+
+    it('[C261031] Should be able to involve multiple users to a task', () => {
+        loginPage.loginToProcessServicesUsingUserModel(processUserModel);
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[2]).selectTaskFromTasksList(tasks[2]);
+
+        taskPage.usingTaskDetails().clickInvolvePeopleButton()
+            .typeUser(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName)
+            .selectUserToInvolve(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName)
+            .checkUserIsSelected(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName);
+        taskPage.usingTaskDetails().clickAddInvolvedUserButton();
+
+        expect(taskPage.usingTaskDetails().getInvolvedUserEmail(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName))
+            .toEqual(assigneeUserModel.email);
+        expect(taskPage.usingTaskDetails().getInvolvedUserEditAction(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName))
+            .toEqual('can edit');
+        expect(taskPage.usingTaskDetails().getInvolvedPeopleTitle()).toEqual(peopleTitle + '(1)');
+
+        taskPage.usingTaskDetails().clickInvolvePeopleButton()
+            .typeUser(secondAssigneeUserModel.firstName + ' ' + secondAssigneeUserModel.lastName)
+            .selectUserToInvolve(secondAssigneeUserModel.firstName + ' ' + secondAssigneeUserModel.lastName)
+            .checkUserIsSelected(secondAssigneeUserModel.firstName + ' ' + secondAssigneeUserModel.lastName);
+        taskPage.usingTaskDetails().clickAddInvolvedUserButton();
+
+        expect(taskPage.usingTaskDetails().getInvolvedUserEmail(secondAssigneeUserModel.firstName + ' ' + secondAssigneeUserModel.lastName))
+            .toEqual(secondAssigneeUserModel.email);
+
+        expect(taskPage.usingTaskDetails().getInvolvedUserEditAction(secondAssigneeUserModel.firstName + ' ' + secondAssigneeUserModel.lastName))
+            .toEqual('can edit');
+        expect(taskPage.usingTaskDetails().getInvolvedPeopleTitle()).toEqual(peopleTitle + '(2)');
+    });
+
+    it('[C280014] Should involved user see the task in completed filters when the task is completed', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[3]).selectTaskFromTasksList(tasks[3]);
+
+        taskPage.usingTaskDetails().clickInvolvePeopleButton()
+            .typeUser(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName)
+            .selectUserToInvolve(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName)
+            .checkUserIsSelected(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName);
+        taskPage.usingTaskDetails().clickAddInvolvedUserButton();
+
+        expect(taskPage.usingTaskDetails().getInvolvedUserEmail(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName))
+            .toEqual(assigneeUserModel.email);
+
+        taskPage.completeTaskNoForm();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.COMPL_TASKS);
+        taskPage.usingTasksListPage().selectTaskFromTasksList(tasks[3]);
+        expect(taskPage.usingTaskDetails().getInvolvedUserEmail(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName))
+            .toEqual(assigneeUserModel.email);
+
+        loginPage.loginToProcessServicesUsingUserModel(assigneeUserModel);
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.COMPL_TASKS);
+        taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[3]).selectTaskFromTasksList(tasks[3]);
+
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.INV_TASKS);
+        taskPage.usingTasksListPage().checkTaskIsNotDisplayedInTasksList(tasks[3]);
+    });
+
+});
diff --git a/e2e/process-services/process_attachmentList_actionMenu.e2e.ts b/e2e/process-services/process_attachmentList_actionMenu.e2e.ts
new file mode 100644
index 0000000000..79c55b682b
--- /dev/null
+++ b/e2e/process-services/process_attachmentList_actionMenu.e2e.ts
@@ -0,0 +1,193 @@
+/*!
+ * @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 LoginPage = require('../pages/adf/loginPage');
+import ProcessServicesPage = require('../pages/adf/process_services/processServicesPage');
+import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage.js');
+import ProcessDetailsPage = require('../pages/adf/process_services/processDetailsPage.js');
+import { AttachmentListPage } from '../pages/adf/process_services/attachmentListPage';
+import ViewerPage = require('../pages/adf/viewerPage.js');
+
+import TestConfig = require('../test.config');
+import resources = require('../util/resources');
+import Util = require('../util/util.js');
+
+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 { browser } from '../../node_modules/protractor';
+
+describe('Attachment list action menu for processes', () => {
+
+    let loginPage = new LoginPage();
+    let processServicesPage = new ProcessServicesPage();
+    let processFiltersPage = new ProcessFiltersPage();
+    let processDetailsPage = new ProcessDetailsPage();
+    let attachmentListPage = new AttachmentListPage();
+    let viewerPage = new ViewerPage();
+    let app = resources.Files.SIMPLE_APP_WITH_USER_FORM;
+    let pngFile = new FileModel({
+        location: resources.Files.ADF_DOCUMENTS.PNG.file_location,
+        name: resources.Files.ADF_DOCUMENTS.PNG.file_name
+    });
+
+    let downloadedPngFile = path.join(__dirname, 'downloads', pngFile.name);
+    let tenantId, appId;
+    let processName = {
+        active: 'Active Process',
+        completed: 'Completed Process',
+        taskApp: 'Task App Name',
+        emptyList: 'Empty List',
+        dragDrop: 'Drag and Drop'
+    };
+
+    beforeAll(async (done) => {
+        let apps = new AppsActions();
+        let users = new UsersActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        let user = await users.createTenantAndUser(this.alfrescoJsApi);
+
+        tenantId = user.tenantId;
+
+        await this.alfrescoJsApi.login(user.email, user.password);
+
+        let importedApp = await apps.importPublishDeployApp(this.alfrescoJsApi, app.file_location);
+        appId = importedApp.id;
+
+        await apps.startProcess(this.alfrescoJsApi, importedApp, processName.completed);
+        await apps.startProcess(this.alfrescoJsApi, importedApp, processName.active);
+        await apps.startProcess(this.alfrescoJsApi, 'Task App', processName.taskApp);
+        await apps.startProcess(this.alfrescoJsApi, 'Task App', processName.emptyList);
+        await apps.startProcess(this.alfrescoJsApi, 'Task App', processName.dragDrop);
+
+        await loginPage.loginToProcessServicesUsingUserModel(user);
+
+        done();
+    });
+
+    afterAll(async (done) => {
+        await this.alfrescoJsApi.activiti.modelsApi.deleteModel(appId);
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+        await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId);
+        done();
+    });
+
+    it('[C260228] Option menu functionality - Active Process', () => {
+        processServicesPage.goToProcessServices().goToApp(app.title).clickProcessButton();
+
+        processFiltersPage.selectFromProcessList(processName.active);
+
+        processDetailsPage.checkProcessTitleIsDisplayed();
+
+        attachmentListPage.clickAttachFileButton(pngFile.location);
+        attachmentListPage.viewFile(pngFile.name);
+
+        viewerPage.checkFileNameIsDisplayed(pngFile.name);
+        viewerPage.clickCloseButton();
+
+        processFiltersPage.clickRunningFilterButton();
+        processFiltersPage.selectFromProcessList(processName.active);
+
+        attachmentListPage.doubleClickFile(pngFile.name);
+
+        viewerPage.checkFileNameIsDisplayed(pngFile.name);
+        viewerPage.clickCloseButton();
+        browser.sleep(20000);
+        processFiltersPage.clickRunningFilterButton();
+        processFiltersPage.selectFromProcessList(processName.active);
+
+        attachmentListPage.downloadFile(pngFile.name);
+
+        browser.driver.sleep(1000);
+
+        expect(Util.fileExists(downloadedPngFile, 30)).toBe(true);
+
+        attachmentListPage.removeFile(pngFile.name);
+        attachmentListPage.checkFileIsRemoved(pngFile.name);
+    });
+
+    it('[C279886] Option menu functionality - Completed Process', () => {
+        processServicesPage.goToProcessServices().goToApp(app.title).clickProcessButton();
+
+        processFiltersPage.clickRunningFilterButton();
+        processFiltersPage.selectFromProcessList(processName.completed);
+
+        processDetailsPage.checkProcessTitleIsDisplayed();
+
+        attachmentListPage.clickAttachFileButton(pngFile.location);
+
+        processDetailsPage.clickCancelProcessButton();
+        browser.sleep(20000);
+        processFiltersPage.clickCompletedFilterButton();
+
+        processDetailsPage.checkProcessTitleIsDisplayed();
+
+        attachmentListPage.checkAttachFileButtonIsNotDisplayed();
+        attachmentListPage.viewFile(pngFile.name);
+
+        viewerPage.checkFileNameIsDisplayed(pngFile.name);
+        viewerPage.clickCloseButton();
+
+        processFiltersPage.clickCompletedFilterButton();
+
+        attachmentListPage.downloadFile(pngFile.name);
+
+        browser.driver.sleep(1000);
+
+        expect(Util.fileExists(downloadedPngFile, 30)).toBe(true);
+
+        attachmentListPage.removeFile(pngFile.name);
+        attachmentListPage.checkFileIsRemoved(pngFile.name);
+    });
+
+    it('[C277296] Upload file - ProcessList - Task APP', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton();
+
+        processFiltersPage.clickRunningFilterButton();
+        processFiltersPage.selectFromProcessList(processName.taskApp);
+
+        processDetailsPage.checkProcessTitleIsDisplayed();
+
+        attachmentListPage.clickAttachFileButton(pngFile.location);
+        attachmentListPage.checkFileIsAttached(pngFile.name);
+    });
+
+    it('[C260235] Empty list component', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton();
+
+        processFiltersPage.clickRunningFilterButton();
+        processFiltersPage.selectFromProcessList(processName.emptyList);
+
+        attachmentListPage.checkEmptyAttachmentList();
+        attachmentListPage.clickAttachFileButton(pngFile.location);
+        attachmentListPage.checkFileIsAttached(pngFile.name);
+        attachmentListPage.removeFile(pngFile.name);
+        attachmentListPage.checkFileIsRemoved(pngFile.name);
+        attachmentListPage.checkEmptyAttachmentList();
+    });
+
+});
diff --git a/e2e/process-services/process_filters_component.e2e.ts b/e2e/process-services/process_filters_component.e2e.ts
new file mode 100644
index 0000000000..2ce219762a
--- /dev/null
+++ b/e2e/process-services/process_filters_component.e2e.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 TestConfig = require('../test.config');
+import resources = require('../util/resources');
+import LoginPage = require('../pages/adf/loginPage');
+import NavigationBarPage = require('../pages/adf/navigationBarPage');
+import ProcessServicesPage = require('../pages/adf/process_services/processServicesPage');
+import StartProcessPage = require('../pages/adf/process_services/startProcessPage');
+import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage');
+import AppNavigationBarPage = require('../pages/adf/process_services/appNavigationBarPage');
+import ProcessDetailsPage = require('../pages/adf/process_services/processDetailsPage');
+
+import AlfrescoApi = require('alfresco-js-api-node');
+
+import { AppsActions } from '../actions/APS/apps.actions';
+import { UsersActions } from '../actions/users.actions';
+import { browser } from 'protractor';
+
+describe('Process Filters Test', () => {
+
+    let loginPage = new LoginPage();
+    let navigationBarPage = new NavigationBarPage();
+    let processServicesPage = new ProcessServicesPage();
+    let startProcessPage = new StartProcessPage();
+    let processFiltersPage = new ProcessFiltersPage();
+    let appNavigationBarPage = new AppNavigationBarPage();
+    let processDetailsPage = new ProcessDetailsPage();
+    let appModel;
+
+    let app = resources.Files.APP_WITH_DATE_FIELD_FORM;
+
+    let processTitle = {
+        running: 'Test_running',
+        completed: 'Test_completed'
+    };
+    let processFilter = {
+        running: 'Running',
+        all: 'All',
+        completed: 'Completed'
+    };
+
+    beforeAll(async (done) => {
+        let apps = new AppsActions();
+        let users = new UsersActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        let user = await users.createTenantAndUser(this.alfrescoJsApi);
+
+        await this.alfrescoJsApi.login(user.email, user.password);
+
+        appModel = await apps.importPublishDeployApp(this.alfrescoJsApi, app.file_location);
+
+        await loginPage.loginToProcessServicesUsingUserModel(user);
+
+        done();
+    });
+
+    beforeEach(() => {
+        navigationBarPage.clickProcessServicesButton();
+        processServicesPage.checkApsContainer();
+        processServicesPage.goToApp(app.title);
+        appNavigationBarPage.clickProcessButton();
+        processServicesPage.checkProcessListIsDisplayed();
+    });
+
+    it('[C260387] Should the running process be displayed when clicking on Running filter', () => {
+        processFiltersPage.clickCreateProcessButton();
+        processFiltersPage.clickNewProcessDropdown();
+
+        startProcessPage.enterProcessName(processTitle.completed);
+        startProcessPage.selectFromProcessDropdown(app.process_title);
+        startProcessPage.clickFormStartProcessButton();
+
+        processDetailsPage.clickCancelProcessButton();
+        navigationBarPage.clickProcessServicesButton();
+
+        processServicesPage.goToApp(app.title);
+
+        appNavigationBarPage.clickProcessButton();
+
+        processFiltersPage.clickCreateProcessButton();
+        processFiltersPage.clickNewProcessDropdown();
+
+        startProcessPage.enterProcessName(processTitle.running);
+        startProcessPage.selectFromProcessDropdown(app.process_title);
+        startProcessPage.clickFormStartProcessButton();
+
+        processFiltersPage.checkFilterIsHighlighted(processFilter.running);
+        processFiltersPage.selectFromProcessList(processTitle.running);
+
+        processDetailsPage.checkProcessDetailsCard();
+    });
+
+    it('[C280063] Should both the new created process and a completed one to be displayed when clicking on All filter', () => {
+        processFiltersPage.clickAllFilterButton();
+        processFiltersPage.checkFilterIsHighlighted(processFilter.all);
+        processFiltersPage.selectFromProcessList(processTitle.running);
+        processFiltersPage.selectFromProcessList(processTitle.completed);
+        processDetailsPage.checkProcessDetailsCard();
+    });
+
+    it('[C280064] Should the completed process be displayed when clicking on Completed filter', () => {
+        processFiltersPage.clickCompletedFilterButton();
+        processFiltersPage.checkFilterIsHighlighted(processFilter.completed);
+        processFiltersPage.selectFromProcessList(processTitle.completed);
+        processDetailsPage.checkProcessDetailsCard();
+    });
+
+    it('[C280407] Should be able to access the filters with URL', async () => {
+
+        let defaultFiltersNumber = 3;
+        let deployedApp, processFilterUrl;
+
+        let taskAppFilters = await browser.controlFlow().execute(async() => {
+
+            let appDefinitions = await this.alfrescoJsApi.activiti.appsApi.getAppDefinitions();
+
+            deployedApp = appDefinitions.data.find((currentApp) => {
+
+                    return currentApp.modelId === appModel.id;
+            });
+
+            processFilterUrl = TestConfig.adf.url + '/activiti/apps/' + deployedApp.id + '/processes/';
+
+            return this.alfrescoJsApi.activiti.userFiltersApi.getUserProcessInstanceFilters({appId: deployedApp.id});
+        });
+
+        expect(taskAppFilters.size).toBe(defaultFiltersNumber);
+
+        taskAppFilters.data.forEach((filter) => {
+            browser.get(processFilterUrl + filter.id);
+            processServicesPage.checkProcessListIsDisplayed();
+            processFiltersPage.checkFilterIsHighlighted(filter.name);
+        });
+    });
+});
diff --git a/e2e/process-services/processlist_pagination.e2e.ts b/e2e/process-services/processlist_pagination.e2e.ts
new file mode 100644
index 0000000000..f892c25868
--- /dev/null
+++ b/e2e/process-services/processlist_pagination.e2e.ts
@@ -0,0 +1,394 @@
+/*!
+ * @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 LoginPage = require('../pages/adf/loginPage');
+import ProcessServicesPage = require('../pages/adf/process_services/processServicesPage');
+import PaginationPage = require('../pages/adf/paginationPage');
+import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage');
+import ProcessDetailsPage = require('../pages/adf/process_services/processDetailsPage');
+
+import TestConfig = require('../test.config');
+import resources = require('../util/resources');
+
+import Util = require('../util/util');
+
+import AlfrescoApi = require('alfresco-js-api-node');
+import { AppsActions } from '../actions/APS/apps.actions';
+import { UsersActions } from '../actions/users.actions';
+
+describe('Process List - Pagination', function () {
+
+    let itemsPerPage = {
+        five: '5',
+        fiveValue: 5,
+        ten: '10',
+        tenValue: 10,
+        fifteen: '15',
+        fifteenValue: 15,
+        twenty: '20',
+        twentyValue: 20,
+        default: '25'
+    };
+
+    let processFilterRunning = 'Running';
+
+    let loginPage = new LoginPage();
+    let processServicesPage = new ProcessServicesPage();
+    let paginationPage = new PaginationPage();
+    let processFiltersPage = new ProcessFiltersPage();
+    let processDetailsPage = new ProcessDetailsPage();
+    let deployedTestApp;
+    let processUserModel;
+    let app = resources.Files.SIMPLE_APP_WITH_USER_FORM;
+    let nrOfProcesses = 20;
+    let page, totalPages, processNameBase = 'process';
+    let processNames = Util.generateSeqeunceFiles(10, nrOfProcesses + 9, processNameBase, '');
+
+    beforeAll(async (done) => {
+        let apps = new AppsActions();
+        let users = new UsersActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        processUserModel = await users.createTenantAndUser(this.alfrescoJsApi);
+
+        await this.alfrescoJsApi.login(processUserModel.email, processUserModel.password);
+
+        deployedTestApp = await apps.importPublishDeployApp(this.alfrescoJsApi, app.file_location);
+
+        loginPage.loginToProcessServicesUsingUserModel(processUserModel);
+
+        done();
+    });
+
+    describe('Empty processes', function () {
+
+        it('[C261042] Should show empty content message an no pagination when no process are present', function () {
+            processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton();
+            processFiltersPage.checkNoContentMessage();
+            paginationPage.checkPaginationIsNotDisplayed();
+        });
+    });
+
+    describe('With processes Pagination', function () {
+
+        beforeAll(async (done) => {
+            let apps = new AppsActions();
+
+            this.alfrescoJsApi = new AlfrescoApi({
+                provider: 'BPM',
+                hostBpm: TestConfig.adf.url
+            });
+
+            await this.alfrescoJsApi.login(processUserModel.email, processUserModel.password);
+
+            for (let i = 0; i < nrOfProcesses; i++) {
+                await apps.startProcess(this.alfrescoJsApi, deployedTestApp);
+            }
+
+            done();
+        });
+
+        it('[C261042] Default pagination', function () {
+            processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton();
+
+            page = 1;
+            totalPages = 1;
+            processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton();
+            processFiltersPage.clickRunningFilterButton();
+            processFiltersPage.checkFilterIsHighlighted(processFilterRunning);
+            processDetailsPage.checkProcessTitleIsDisplayed();
+            processFiltersPage.waitForTableBody();
+            expect(paginationPage.getCurrentPage()).toEqual('Page ' + page);
+            expect(paginationPage.getTotalPages()).toEqual('of ' + totalPages);
+
+            expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.twenty);
+            expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + nrOfProcesses + ' of ' + nrOfProcesses);
+            expect(processFiltersPage.numberOfProcessRows()).toBe(nrOfProcesses);
+            paginationPage.checkNextPageButtonIsDisabled();
+            paginationPage.checkPreviousPageButtonIsDisabled();
+        });
+
+        it('[C261043] Items per page set to 15', function () {
+            page = 1;
+            totalPages = 2;
+            processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton();
+            processFiltersPage.clickRunningFilterButton();
+            processFiltersPage.checkFilterIsHighlighted(processFilterRunning);
+            processDetailsPage.checkProcessTitleIsDisplayed();
+            processFiltersPage.waitForTableBody();
+            paginationPage.selectItemsPerPage(itemsPerPage.fifteen);
+            processDetailsPage.checkProcessTitleIsDisplayed();
+            processFiltersPage.waitForTableBody();
+            expect(paginationPage.getCurrentPage()).toEqual('Page ' + page);
+            expect(paginationPage.getTotalPages()).toEqual('of ' + totalPages);
+            expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.fifteen);
+            expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + itemsPerPage.fifteenValue * page + ' of ' + nrOfProcesses);
+            expect(processFiltersPage.numberOfProcessRows()).toBe(itemsPerPage.fifteenValue);
+            paginationPage.checkNextPageButtonIsEnabled();
+            paginationPage.checkPreviousPageButtonIsDisabled();
+
+            page++;
+            paginationPage.clickOnNextPage();
+            processDetailsPage.checkProcessTitleIsDisplayed();
+            processFiltersPage.waitForTableBody();
+            expect(paginationPage.getCurrentPage()).toEqual('Page ' + page);
+            expect(paginationPage.getTotalPages()).toEqual('of ' + totalPages);
+            expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.fifteen);
+            expect(paginationPage.getPaginationRange()).toEqual('Showing 16-' + nrOfProcesses + ' of ' + nrOfProcesses);
+            expect(processFiltersPage.numberOfProcessRows()).toBe(nrOfProcesses - itemsPerPage.fifteenValue);
+            paginationPage.checkNextPageButtonIsDisabled();
+            paginationPage.checkPreviousPageButtonIsEnabled();
+
+            page = 1;
+            processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton();
+            processFiltersPage.clickRunningFilterButton();
+            processFiltersPage.checkFilterIsHighlighted(processFilterRunning);
+            processDetailsPage.checkProcessTitleIsDisplayed();
+            processFiltersPage.waitForTableBody();
+            expect(paginationPage.getCurrentPage()).toEqual('Page ' + page);
+            expect(paginationPage.getTotalPages()).toEqual('of ' + totalPages);
+            expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.fifteen);
+        });
+
+        it('[C261044] Items per page set to 10', function () {
+            page = 1;
+            totalPages = 2;
+            processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton();
+            processFiltersPage.clickRunningFilterButton();
+            processFiltersPage.checkFilterIsHighlighted(processFilterRunning);
+            processDetailsPage.checkProcessTitleIsDisplayed();
+            processFiltersPage.waitForTableBody();
+            paginationPage.selectItemsPerPage(itemsPerPage.ten);
+            processDetailsPage.checkProcessTitleIsDisplayed();
+            processFiltersPage.waitForTableBody();
+            expect(paginationPage.getCurrentPage()).toEqual('Page ' + page);
+            expect(paginationPage.getTotalPages()).toEqual('of ' + totalPages);
+            expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.ten);
+            expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + itemsPerPage.tenValue * page + ' of ' + nrOfProcesses);
+            expect(processFiltersPage.numberOfProcessRows()).toBe(itemsPerPage.tenValue);
+            paginationPage.checkNextPageButtonIsEnabled();
+            paginationPage.checkPreviousPageButtonIsDisabled();
+
+            page++;
+            paginationPage.clickOnNextPage();
+            processDetailsPage.checkProcessTitleIsDisplayed();
+            processFiltersPage.waitForTableBody();
+            expect(paginationPage.getCurrentPage()).toEqual('Page ' + page);
+            expect(paginationPage.getTotalPages()).toEqual('of ' + totalPages);
+            expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.ten);
+            expect(paginationPage.getPaginationRange()).toEqual('Showing 11-' + nrOfProcesses + ' of ' + nrOfProcesses);
+            expect(processFiltersPage.numberOfProcessRows()).toBe(itemsPerPage.tenValue);
+            paginationPage.checkNextPageButtonIsDisabled();
+            paginationPage.checkPreviousPageButtonIsEnabled();
+
+            page = 1;
+            processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton();
+            processFiltersPage.clickRunningFilterButton();
+            processFiltersPage.checkFilterIsHighlighted(processFilterRunning);
+            processDetailsPage.checkProcessTitleIsDisplayed();
+            processFiltersPage.waitForTableBody();
+            expect(paginationPage.getCurrentPage()).toEqual('Page ' + page);
+            expect(paginationPage.getTotalPages()).toEqual('of ' + totalPages);
+            expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.ten);
+        });
+
+        it('[C261047] Items per page set to 20', function () {
+            page = 1;
+            totalPages = 1;
+            processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton();
+            processFiltersPage.clickRunningFilterButton();
+            processFiltersPage.checkFilterIsHighlighted(processFilterRunning);
+            processDetailsPage.checkProcessTitleIsDisplayed();
+            processFiltersPage.waitForTableBody();
+            paginationPage.selectItemsPerPage(itemsPerPage.twenty);
+            processDetailsPage.checkProcessTitleIsDisplayed();
+            processFiltersPage.waitForTableBody();
+            expect(paginationPage.getCurrentPage()).toEqual('Page ' + page);
+            expect(paginationPage.getTotalPages()).toEqual('of ' + totalPages);
+            expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.twenty);
+            expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + nrOfProcesses + ' of ' + nrOfProcesses);
+            expect(processFiltersPage.numberOfProcessRows()).toBe(nrOfProcesses);
+            paginationPage.checkNextPageButtonIsDisabled();
+            paginationPage.checkPreviousPageButtonIsDisabled();
+
+            processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton();
+            processFiltersPage.clickRunningFilterButton();
+            processFiltersPage.checkFilterIsHighlighted(processFilterRunning);
+            processDetailsPage.checkProcessTitleIsDisplayed();
+            processFiltersPage.waitForTableBody();
+            expect(paginationPage.getCurrentPage()).toEqual('Page ' + page);
+            expect(paginationPage.getTotalPages()).toEqual('of ' + totalPages);
+            expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.twenty);
+        });
+
+        it('[C261045] 5 Items per page', function () {
+            let showing;
+            page = 1;
+            totalPages = 4;
+            processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton();
+            processFiltersPage.clickRunningFilterButton();
+            processFiltersPage.checkFilterIsHighlighted(processFilterRunning);
+            processDetailsPage.checkProcessTitleIsDisplayed();
+            processFiltersPage.waitForTableBody();
+            paginationPage.selectItemsPerPage(itemsPerPage.five);
+            processDetailsPage.checkProcessTitleIsDisplayed();
+            processFiltersPage.waitForTableBody();
+            expect(paginationPage.getCurrentPage()).toEqual('Page ' + page);
+            expect(paginationPage.getTotalPages()).toEqual('of ' + totalPages);
+            expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.five);
+
+            showing = (itemsPerPage.fiveValue * page);
+            expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + showing + ' of ' + nrOfProcesses);
+            expect(processFiltersPage.numberOfProcessRows()).toBe(itemsPerPage.fiveValue);
+            paginationPage.checkNextPageButtonIsEnabled();
+            paginationPage.checkPreviousPageButtonIsDisabled();
+
+            page++;
+            paginationPage.clickOnNextPage();
+            processDetailsPage.checkProcessTitleIsDisplayed();
+            processFiltersPage.waitForTableBody();
+            expect(paginationPage.getCurrentPage()).toEqual('Page ' + page);
+            expect(paginationPage.getTotalPages()).toEqual('of ' + totalPages);
+            expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.five);
+
+            showing = (itemsPerPage.fiveValue * page);
+            expect(paginationPage.getPaginationRange()).toEqual('Showing 6-' + showing + ' of ' + nrOfProcesses);
+            expect(processFiltersPage.numberOfProcessRows()).toBe(itemsPerPage.fiveValue);
+            paginationPage.checkNextPageButtonIsEnabled();
+            paginationPage.checkPreviousPageButtonIsEnabled();
+
+            page++;
+            paginationPage.clickOnNextPage();
+            processDetailsPage.checkProcessTitleIsDisplayed();
+            processFiltersPage.waitForTableBody();
+            expect(paginationPage.getCurrentPage()).toEqual('Page ' + page);
+            expect(paginationPage.getTotalPages()).toEqual('of ' + totalPages);
+            expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.five);
+
+            showing = (itemsPerPage.fiveValue * page);
+            expect(paginationPage.getPaginationRange()).toEqual('Showing 11-' + showing + ' of ' + nrOfProcesses);
+            expect(processFiltersPage.numberOfProcessRows()).toBe(itemsPerPage.fiveValue);
+            paginationPage.checkNextPageButtonIsEnabled();
+            paginationPage.checkPreviousPageButtonIsEnabled();
+
+            page++;
+            paginationPage.clickOnNextPage();
+            processDetailsPage.checkProcessTitleIsDisplayed();
+            processFiltersPage.waitForTableBody();
+            expect(paginationPage.getCurrentPage()).toEqual('Page ' + page);
+            expect(paginationPage.getTotalPages()).toEqual('of ' + totalPages);
+            expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.five);
+
+            showing = (itemsPerPage.fiveValue * page);
+            expect(paginationPage.getPaginationRange()).toEqual('Showing 16-' + showing + ' of ' + nrOfProcesses);
+            expect(processFiltersPage.numberOfProcessRows()).toBe(itemsPerPage.fiveValue);
+            paginationPage.checkNextPageButtonIsDisabled();
+            paginationPage.checkPreviousPageButtonIsEnabled();
+
+            page = 1;
+            processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton();
+            processFiltersPage.clickRunningFilterButton();
+            processFiltersPage.checkFilterIsHighlighted(processFilterRunning);
+            processDetailsPage.checkProcessTitleIsDisplayed();
+            processFiltersPage.waitForTableBody();
+            expect(paginationPage.getCurrentPage()).toEqual('Page ' + page);
+            expect(paginationPage.getTotalPages()).toEqual('of ' + totalPages);
+            expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.five);
+        });
+
+        it('[C261049] Page number dropdown', function () {
+            let showing;
+            page = 1;
+            totalPages = 2;
+            processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton();
+            processFiltersPage.clickRunningFilterButton();
+            processDetailsPage.checkProcessTitleIsDisplayed();
+            processFiltersPage.waitForTableBody();
+            paginationPage.selectItemsPerPage(itemsPerPage.ten);
+            processDetailsPage.checkProcessTitleIsDisplayed();
+            processFiltersPage.waitForTableBody();
+            expect(paginationPage.getCurrentPage()).toEqual('Page ' + page);
+            expect(paginationPage.getTotalPages()).toEqual('of ' + totalPages);
+            expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.ten);
+
+            showing = (itemsPerPage.tenValue * page);
+            expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + showing + ' of ' + nrOfProcesses);
+            expect(processFiltersPage.numberOfProcessRows()).toBe(itemsPerPage.tenValue);
+            paginationPage.checkNextPageButtonIsEnabled();
+            paginationPage.checkPreviousPageButtonIsDisabled();
+
+            paginationPage.clickOnPageDropdown();
+            expect(paginationPage.getPageDropdownOptions()).toEqual(['1', '2']);
+            page = 2;
+            paginationPage.clickOnPageDropdownOption('2');
+            processDetailsPage.checkProcessTitleIsDisplayed();
+            processFiltersPage.waitForTableBody();
+            expect(paginationPage.getCurrentPage()).toEqual('Page ' + page);
+            expect(paginationPage.getTotalPages()).toEqual('of ' + totalPages);
+            expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.ten);
+
+            showing = (itemsPerPage.tenValue * page);
+            expect(paginationPage.getPaginationRange()).toEqual('Showing 11-' + showing + ' of ' + nrOfProcesses);
+            expect(processFiltersPage.numberOfProcessRows()).toBe(itemsPerPage.tenValue);
+            paginationPage.checkNextPageButtonIsDisabled();
+            paginationPage.checkPreviousPageButtonIsEnabled();
+
+            paginationPage.clickOnPageDropdown();
+            expect(paginationPage.getPageDropdownOptions()).toEqual(['1', '2']);
+            page = 1;
+            paginationPage.clickOnPageDropdownOption('1');
+            processDetailsPage.checkProcessTitleIsDisplayed();
+            processFiltersPage.waitForTableBody();
+            expect(paginationPage.getCurrentPage()).toEqual('Page ' + page);
+            expect(paginationPage.getTotalPages()).toEqual('of ' + totalPages);
+            expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.ten);
+
+            showing = (itemsPerPage.tenValue * page);
+            expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + showing + ' of ' + nrOfProcesses);
+            expect(processFiltersPage.numberOfProcessRows()).toBe(itemsPerPage.tenValue);
+            paginationPage.checkNextPageButtonIsEnabled();
+            paginationPage.checkPreviousPageButtonIsDisabled();
+        });
+
+        xit('[C261048] Sorting by Name', function () {
+            processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton();
+            processFiltersPage.clickRunningFilterButton();
+            processFiltersPage.checkFilterIsHighlighted(processFilterRunning);
+            processDetailsPage.checkProcessTitleIsDisplayed();
+            processFiltersPage.waitForTableBody();
+            paginationPage.selectItemsPerPage(itemsPerPage.twenty);
+            processDetailsPage.checkProcessTitleIsDisplayed();
+            processFiltersPage.waitForTableBody();
+            processFiltersPage.sortByName(true);
+            processFiltersPage.waitForTableBody();
+            processFiltersPage.getAllRowsNameColumn().then(function (list) {
+                expect(JSON.stringify(list) === JSON.stringify(processNames)).toEqual(true);
+            });
+            processFiltersPage.sortByName(false);
+            processFiltersPage.getAllRowsNameColumn().then(function (list) {
+                processNames.reverse();
+                expect(JSON.stringify(list) === JSON.stringify(processNames)).toEqual(true);
+            });
+        });
+    });
+});
diff --git a/e2e/process-services/sort_tasklist_pagination.e2e.ts b/e2e/process-services/sort_tasklist_pagination.e2e.ts
new file mode 100644
index 0000000000..70c4c09437
--- /dev/null
+++ b/e2e/process-services/sort_tasklist_pagination.e2e.ts
@@ -0,0 +1,98 @@
+/*!
+ * @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 LoginPage = require('../pages/adf/loginPage');
+import ProcessServicesPage = require('../pages/adf/process_services/processServicesPage');
+import TasksPage = require('../pages/adf/process_services/tasksPage');
+import PaginationPage = require('../pages/adf/paginationPage');
+
+import CONSTANTS = require('../util/constants');
+
+import TestConfig = require('../test.config');
+import resources = require('../util/resources');
+import Util = require('../util/util');
+
+import AlfrescoApi = require('alfresco-js-api-node');
+import { AppsActions } from '../actions/APS/apps.actions';
+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();
+
+    let app = resources.Files.SIMPLE_APP_WITH_USER_FORM;
+    let nrOfTasks = 20, processUserModel;
+    let taskNameBase = 'Task';
+    let taskNames = Util.generateSeqeunceFiles(10, nrOfTasks + 9, taskNameBase, '');
+
+    let itemsPerPage = {
+        five: '5',
+        fiveValue: 5,
+        ten: '10',
+        tenValue: 10,
+        twenty: '20',
+        twentyValue: 20
+    };
+
+    beforeAll(async (done) => {
+        let apps = new AppsActions();
+        let users = new UsersActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        processUserModel = await users.createTenantAndUser(this.alfrescoJsApi);
+
+        await this.alfrescoJsApi.login(processUserModel.email, processUserModel.password);
+
+        await apps.importPublishDeployApp(this.alfrescoJsApi, app.file_location);
+
+        for (let i = 0; i < nrOfTasks; i++) {
+            this.alfrescoJsApi.activiti.taskApi.createNewTask({name: taskNames[i]});
+        }
+
+        loginPage.loginToProcessServicesUsingUserModel(processUserModel);
+
+        done();
+    });
+
+    it('[C260308] Sorting by Name', () => {
+        processServicesPage.goToProcessServices().goToTaskApp();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.INV_TASKS);
+        taskPage.usingTasksListPage().waitForTableBody();
+        paginationPage.selectItemsPerPage(itemsPerPage.twenty);
+        taskPage.usingTasksListPage().waitForTableBody();
+        taskPage.usingFiltersPage().sortByName(true);
+        taskPage.usingTasksListPage().waitForTableBody();
+        taskPage.usingFiltersPage().getAllRowsNameColumn().then(function (list) {
+            expect(JSON.stringify(list) === JSON.stringify(taskNames)).toEqual(true);
+        });
+        taskPage.usingFiltersPage().sortByName(false);
+        taskPage.usingFiltersPage().getAllRowsNameColumn().then(function (list) {
+            taskNames.reverse();
+            expect(JSON.stringify(list) === JSON.stringify(taskNames)).toEqual(true);
+        });
+    });
+
+});
diff --git a/e2e/process-services/standalone_task.e2e.ts b/e2e/process-services/standalone_task.e2e.ts
new file mode 100644
index 0000000000..3f84097d09
--- /dev/null
+++ b/e2e/process-services/standalone_task.e2e.ts
@@ -0,0 +1,139 @@
+/*!
+ * @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 } from 'protractor';
+
+import LoginPage = require('../pages/adf/loginPage');
+import ProcessServicesPage = require('../pages/adf/process_services/processServicesPage');
+import TasksPage = require('../pages/adf/process_services/tasksPage');
+
+import CONSTANTS = require('../util/constants');
+
+import Tenant = require('../models/APS/Tenant');
+import Task = require('../models/APS/Task');
+
+import TestConfig = require('../test.config');
+import resources = require('../util/resources');
+
+import AlfrescoApi = require('.alfresco-js-api-node');
+import { UsersActions } from '../actions/users.actions';
+import fs = require('fs');
+import path = require('path');
+import Util = require('..ro/util/util');
+
+describe('Start Task - Task App', () => {
+
+    let loginPage = new LoginPage();
+    let processServicesPage = new ProcessServicesPage();
+    let processUserModel;
+    let app = resources.Files.SIMPLE_APP_WITH_USER_FORM;
+    let taskPage = new TasksPage();
+    let tasks = ['Standalone task', 'Completed standalone task', 'Add a form', 'Remove form'];
+    let noFormMessage = 'No forms attached';
+
+    beforeAll(async (done) => {
+        let users = new UsersActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        let newTenant = await this.alfrescoJsApi.activiti.adminTenantsApi.createTenant(new Tenant());
+
+        processUserModel = await users.createApsUser(this.alfrescoJsApi, newTenant.id);
+
+        let pathFile = path.join(TestConfig.main.rootPath + app.file_location);
+        let file = fs.createReadStream(pathFile);
+
+        await this.alfrescoJsApi.login(processUserModel.email, processUserModel.password);
+
+        await this.alfrescoJsApi.activiti.appsApi.importAppDefinition(file);
+
+        loginPage.loginToProcessServicesUsingUserModel(processUserModel);
+
+        done();
+    });
+
+    it('[C260421] Should a standalone task be displayed when creating a new task without form', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.createNewTask().addName(tasks[0]).clickStartButton()
+            .then(() => {
+                taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[0]);
+                taskPage.usingFormFields().noFormIsDisplayed();
+                expect(taskPage.usingTaskDetails().getFormName()).toEqual(CONSTANTS.TASKDETAILS.NO_FORM);
+                expect(taskPage.usingFormFields().getNoFormMessage()).toEqual(noFormMessage);
+            });
+    });
+
+    it('[C268910] Should a standalone task be displayed in completed tasks when completing it', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.createNewTask().addName(tasks[1]).clickStartButton()
+            .then(() => {
+                taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[1]);
+                taskPage.usingFormFields().noFormIsDisplayed();
+
+                taskPage.completeTaskNoForm();
+                taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.COMPL_TASKS);
+                taskPage.usingTasksListPage().selectTaskFromTasksList(tasks[1]);
+                expect(taskPage.usingFormFields().getCompletedTaskNoFormMessage()).toEqual('Task ' + tasks[1] + ' completed');
+
+                taskPage.usingFormFields().noFormIsDisplayed();
+                expect(taskPage.usingTaskDetails().getFormName()).toEqual(CONSTANTS.TASKDETAILS.NO_FORM);
+            });
+    });
+
+    it('[C268911] Should allow adding a form to a standalone task when clicking on Add form button', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.createNewTask().addName(tasks[2]).clickStartButton()
+            .then(() => {
+                taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[2]);
+                taskPage.usingFormFields().noFormIsDisplayed();
+
+                taskPage.usingFormFields().clickOnAttachFormButton().selectForm(app.formName).clickOnAttachFormButton();
+                expect(taskPage.usingTaskDetails().getFormName()).toEqual(app.formName);
+            });
+    });
+
+    it('[C268912] Should a standalone task be displayed when removing the form from APS', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.createNewTask().addName(tasks[3]).addForm(app.formName).clickStartButton();
+
+        taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[3]);
+        expect(taskPage.usingTaskDetails().getFormName()).toEqual(app.formName);
+
+        browser.controlFlow().execute(async () => {
+            const listOfTasks = await this.alfrescoJsApi.activiti.taskApi.listTasks(new Task({ sort: 'created-desc' }));
+            await this.alfrescoJsApi.activiti.taskApi.removeForm(listOfTasks.data[0].id);
+        });
+
+        browser.refresh();
+        taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[3]);
+        taskPage.checkTaskTitle(tasks[3]);
+
+        taskPage.usingFormFields().noFormIsDisplayed();
+        expect(taskPage.usingTaskDetails().getFormName()).toEqual(CONSTANTS.TASKDETAILS.NO_FORM);
+        expect(taskPage.usingFormFields().getNoFormMessage()).toEqual(noFormMessage);
+    });
+
+});
diff --git a/e2e/process-services/start_process_component.e2e.ts b/e2e/process-services/start_process_component.e2e.ts
new file mode 100644
index 0000000000..8e620f33a6
--- /dev/null
+++ b/e2e/process-services/start_process_component.e2e.ts
@@ -0,0 +1,338 @@
+/*!
+ * @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 = require('../util/util');
+import TestConfig = require('../test.config');
+import resources = require('../util/resources');
+import CONSTANTS = require('../util/constants');
+import LoginPage = require('../pages/adf/loginPage');
+import NavigationBarPage = require('../pages/adf/navigationBarPage');
+import ProcessServicesPage = require('../pages/adf/process_services/processServicesPage');
+import StartProcessPage = require('../pages/adf/process_services/startProcessPage');
+import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage');
+import AppNavigationBarPage = require('../pages/adf/process_services/appNavigationBarPage');
+import ProcessDetailsPage = require('../pages/adf/process_services/processDetailsPage');
+import { AttachmentListPage } from '../pages/adf/process_services/attachmentListPage';
+
+import User = require('../models/APS/User');
+import AppPublish = require('../models/APS/AppPublish');
+import Tenant = require('../models/APS/Tenant');
+
+import FileModel = require('../models/ACS/fileModel');
+import dateFormat = require('dateformat');
+
+import AlfrescoApi = require('alfresco-js-api-node');
+import fs = require('fs');
+import path = require('path');
+
+describe('Start Process Component', () => {
+
+    let loginPage = new LoginPage();
+    let navigationBarPage = new NavigationBarPage();
+    let processServicesPage = new ProcessServicesPage();
+    let startProcessPage = new StartProcessPage();
+    let processFiltersPage = new ProcessFiltersPage();
+    let appNavigationBarPage = new AppNavigationBarPage();
+    let processDetailsPage = new ProcessDetailsPage();
+    let attachmentListPage = new AttachmentListPage();
+    let app = resources.Files.APP_WITH_PROCESSES;
+    let appId, procUserModel, secondProcUserModel, tenantId;
+
+    let auditLogFile = path.join('../e2e/download/', 'Audit.pdf');
+
+    let jpgFile = new FileModel({
+        'location': resources.Files.ADF_DOCUMENTS.JPG.file_location,
+        'name': resources.Files.ADF_DOCUMENTS.JPG.file_name
+    });
+
+    beforeAll(async (done) => {
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        let newTenant = await this.alfrescoJsApi.activiti.adminTenantsApi.createTenant(new Tenant());
+
+        tenantId = newTenant.id;
+        procUserModel = new User({ tenantId: tenantId });
+        secondProcUserModel = new User({ tenantId: tenantId });
+
+        await this.alfrescoJsApi.activiti.adminUsersApi.createNewUser(procUserModel);
+        await this.alfrescoJsApi.activiti.adminUsersApi.createNewUser(secondProcUserModel);
+
+        this.alfrescoJsApiUserTwo = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApiUserTwo.login(secondProcUserModel.email, secondProcUserModel.password);
+
+        let pathFile = path.join(TestConfig.main.rootPath + app.file_location);
+        let file = fs.createReadStream(pathFile);
+
+        let appCreated = await this.alfrescoJsApiUserTwo.activiti.appsApi.importAppDefinition(file);
+
+        appId = appCreated.id;
+
+        let publishApp = await this.alfrescoJsApiUserTwo.activiti.appsApi.publishAppDefinition(appId, new AppPublish());
+
+        await this.alfrescoJsApiUserTwo.activiti.appsApi.deployAppDefinitions({ appDefinitions: [{ id: publishApp.appDefinition.id }] });
+
+        done();
+
+    });
+
+    afterAll(async (done) => {
+        await this.alfrescoJsApiUserTwo.activiti.modelsApi.deleteModel(appId);
+
+        // await this.alfrescoJsApiUserTwo.activiti.modelsApi.deleteModel(secondModelId);
+        //
+        // await this.alfrescoJsApiUserTwo.activiti.modelsApi.deleteModel(modelId);
+
+        await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId);
+
+        done();
+    });
+
+    describe(' Once logged with user without apps', () => {
+
+        beforeEach(() => {
+            loginPage.loginToProcessServicesUsingUserModel(procUserModel);
+            navigationBarPage.clickProcessServicesButton();
+            processServicesPage.checkApsContainer();
+        });
+
+        it('[C260458] Check start a process without a process model included', () => {
+            processServicesPage.goToApp('Task App');
+            appNavigationBarPage.clickProcessButton();
+            processFiltersPage.clickCreateProcessButton();
+            processFiltersPage.clickNewProcessDropdown();
+            startProcessPage.checkNoProcessMessage();
+        });
+    });
+
+    describe(' Once logged with user with app', () => {
+
+        beforeEach(() => {
+            loginPage.loginToProcessServicesUsingUserModel(secondProcUserModel);
+            navigationBarPage.clickProcessServicesButton();
+            processServicesPage.checkApsContainer();
+        });
+
+        it('[C260441] Check Start Process within Task App', () => {
+            processServicesPage.goToApp('Task App');
+            appNavigationBarPage.clickProcessButton();
+            processFiltersPage.clickCreateProcessButton();
+            processFiltersPage.clickNewProcessDropdown();
+            expect(startProcessPage.getDefaultName()).toEqual('My Default Name');
+        });
+
+        it('[C260445] Process Definition is required and cancel button is clicked', () => {
+            processServicesPage.goToApp('Task App');
+            appNavigationBarPage.clickProcessButton();
+            processFiltersPage.clickCreateProcessButton();
+            processFiltersPage.clickNewProcessDropdown();
+            startProcessPage.selectFromProcessDropdown('Choose one...');
+            startProcessPage.checkStartProcessButtonIsDisabled();
+            startProcessPage.clickCancelProcessButton();
+            processFiltersPage.checkNoContentMessage();
+        });
+
+        it('[C260444] Name of the process is required', () => {
+            processServicesPage.goToApp(app.title);
+            appNavigationBarPage.clickProcessButton();
+            processFiltersPage.clickCreateProcessButton();
+            processFiltersPage.clickNewProcessDropdown();
+            startProcessPage.selectFromProcessDropdown('process_without_se');
+            startProcessPage.deleteDefaultName('My Default Name');
+            startProcessPage.checkStartProcessButtonIsDisabled();
+        });
+
+        it('[C260443] Check Start Process within an app without a start event', () => {
+            processServicesPage.goToApp(app.title);
+            appNavigationBarPage.clickProcessButton();
+            processFiltersPage.clickCreateProcessButton();
+            processFiltersPage.clickNewProcessDropdown();
+            startProcessPage.selectFromProcessDropdown('process_without_se');
+            expect(startProcessPage.getDefaultName()).toEqual('My Default Name');
+            startProcessPage.checkStartProcessButtonIsEnabled();
+        });
+
+        xit('[C260449] Start a process within an app with a start event', () => {
+            processServicesPage.goToApp(app.title);
+            appNavigationBarPage.clickProcessButton();
+            processFiltersPage.clickCreateProcessButton();
+            processFiltersPage.clickNewProcessDropdown();
+            startProcessPage.enterProcessName('Test');
+            startProcessPage.selectFromProcessDropdown('process_with_se');
+            startProcessPage.clickFormStartProcessButton()
+                .then(() => {
+                    processDetailsPage.getId()
+                        .then(function (result) {
+                            return this.alfrescoJsApi.activiti.processApi.getProcessInstance(result);
+                        })
+                        .then(function (response) {
+                            expect(processDetailsPage.getProcessStatus()).toEqual(CONSTANTS.PROCESSSTATUS.RUNNING);
+                            expect(processDetailsPage.getEndDate()).toEqual(CONSTANTS.PROCESSENDDATE);
+                            expect(processDetailsPage.getProcessCategory()).toEqual(CONSTANTS.PROCESSCATEGORY);
+                            expect(processDetailsPage.getBusinessKey()).toEqual(CONSTANTS.PROCESSBUSINESSKEY);
+                            expect(processDetailsPage.getCreatedBy()).toEqual(response.getStartedBy().getEntireName());
+                            expect(processDetailsPage.getCreated()).toEqual(dateFormat(CONSTANTS.PROCESSDATEFORMAT));
+                            expect(processDetailsPage.getId()).toEqual(response.getId());
+                            expect(processDetailsPage.getProcessDescription()).toEqual(CONSTANTS.PROCESSDESCRIPTION);
+                            expect(processDetailsPage.checkProcessTitleIsDisplayed()).toEqual(response.getName());
+                        });
+                });
+        });
+
+        it('[C260453] Add a comment on an active process', () => {
+            processServicesPage.goToApp(app.title);
+            appNavigationBarPage.clickProcessButton();
+            processFiltersPage.clickCreateProcessButton();
+            processFiltersPage.clickNewProcessDropdown();
+            startProcessPage.enterProcessName('Comment Process');
+            startProcessPage.selectFromProcessDropdown('process_with_se');
+            startProcessPage.clickFormStartProcessButton();
+            processFiltersPage.clickRunningFilterButton();
+            processFiltersPage.selectFromProcessList('Comment Process');
+            processDetailsPage.addComment('comment1');
+            processDetailsPage.checkCommentIsDisplayed('comment1');
+        });
+
+        it('[C260454] Click Audit Log button', () => {
+            processServicesPage.goToApp(app.title);
+            appNavigationBarPage.clickProcessButton();
+            processFiltersPage.clickCreateProcessButton();
+            processFiltersPage.clickNewProcessDropdown();
+            startProcessPage.enterProcessName('Audit Log');
+            startProcessPage.selectFromProcessDropdown('process_with_se');
+            startProcessPage.clickFormStartProcessButton();
+            processFiltersPage.clickRunningFilterButton();
+            processFiltersPage.selectFromProcessList('Audit Log');
+            processDetailsPage.clickAuditLogButton();
+
+            expect(Util.fileExists(auditLogFile, 15)).toBe(true);
+        });
+
+        it('Add a file in the attachment list using the button', () => {
+            processServicesPage.goToApp(app.title);
+
+            appNavigationBarPage.clickProcessButton();
+
+            processFiltersPage.clickCreateProcessButton();
+            processFiltersPage.clickNewProcessDropdown();
+
+            startProcessPage.enterProcessName('Attach File');
+            startProcessPage.selectFromProcessDropdown('process_with_se');
+            startProcessPage.clickFormStartProcessButton();
+
+            processFiltersPage.clickRunningFilterButton();
+            processFiltersPage.selectFromProcessList('Attach File');
+
+            attachmentListPage.clickAttachFileButton(jpgFile.location);
+            attachmentListPage.checkFileIsAttached(jpgFile.name);
+        });
+
+        it('[C260451] Click Show Diagram', () => {
+            processServicesPage.goToApp(app.title);
+
+            appNavigationBarPage.clickProcessButton();
+
+            processFiltersPage.clickCreateProcessButton();
+            processFiltersPage.clickNewProcessDropdown();
+
+            startProcessPage.enterProcessName('Show Diagram');
+            startProcessPage.selectFromProcessDropdown('process_with_se');
+            startProcessPage.clickFormStartProcessButton();
+
+            processFiltersPage.clickRunningFilterButton();
+            processFiltersPage.selectFromProcessList('Show Diagram');
+
+            processDetailsPage.clickShowDiagram();
+        });
+
+        it('[C260452] Click on an active task', () => {
+            processServicesPage.goToApp(app.title);
+            appNavigationBarPage.clickProcessButton();
+            processFiltersPage.clickCreateProcessButton();
+            processFiltersPage.clickNewProcessDropdown();
+            startProcessPage.enterProcessName('Active Task');
+            startProcessPage.selectFromProcessDropdown('process_with_se');
+            startProcessPage.clickFormStartProcessButton();
+            processFiltersPage.clickRunningFilterButton();
+            processFiltersPage.selectFromProcessList('Active Task');
+            processDetailsPage.clickOnActiveTask();
+            processDetailsPage.checkActiveTaskTitleIsDisplayed(app.task_name);
+        });
+
+        it('[C260457] Click Cancel process button', () => {
+            loginPage.loginToProcessServicesUsingUserModel(secondProcUserModel);
+            navigationBarPage.clickProcessServicesButton();
+            processServicesPage.checkApsContainer();
+            processServicesPage.goToApp(app.title);
+            appNavigationBarPage.clickProcessButton();
+            processFiltersPage.clickCreateProcessButton();
+            processFiltersPage.clickNewProcessDropdown();
+            startProcessPage.enterProcessName('Cancel Process');
+            startProcessPage.selectFromProcessDropdown('process_with_se');
+            startProcessPage.clickFormStartProcessButton();
+            processFiltersPage.clickRunningFilterButton();
+            processFiltersPage.selectFromProcessList('Cancel Process');
+            processDetailsPage.clickCancelProcessButton();
+            processFiltersPage.clickCompletedFilterButton();
+            processFiltersPage.selectFromProcessList('Cancel Process');
+            processDetailsPage.checkShowDiagramIsDisabled();
+        });
+
+        it('[C260461] Add a comment on a complete process', () => {
+            processServicesPage.goToApp(app.title);
+            appNavigationBarPage.clickProcessButton();
+            processFiltersPage.clickCreateProcessButton();
+            processFiltersPage.clickNewProcessDropdown();
+            startProcessPage.enterProcessName('Comment Process 2');
+            startProcessPage.selectFromProcessDropdown('process_with_se');
+            startProcessPage.clickFormStartProcessButton();
+            processFiltersPage.clickRunningFilterButton();
+            processFiltersPage.selectFromProcessList('Comment Process 2');
+            processDetailsPage.clickCancelProcessButton();
+            processFiltersPage.clickCompletedFilterButton();
+            processFiltersPage.selectFromProcessList('Comment Process 2');
+            processDetailsPage.addComment('goodbye');
+            processDetailsPage.checkCommentIsDisplayed('goodbye');
+        });
+
+        it('[C260467] Cannot attach a file on a completed process', () => {
+            processServicesPage.goToApp(app.title);
+            appNavigationBarPage.clickProcessButton();
+            processFiltersPage.clickCreateProcessButton();
+            processFiltersPage.clickNewProcessDropdown();
+            startProcessPage.enterProcessName('File');
+            startProcessPage.selectFromProcessDropdown('process_with_se');
+            startProcessPage.clickFormStartProcessButton();
+            processFiltersPage.clickRunningFilterButton();
+            processFiltersPage.selectFromProcessList('File');
+            processDetailsPage.clickCancelProcessButton();
+            processFiltersPage.clickCompletedFilterButton();
+            processFiltersPage.selectFromProcessList('File');
+            attachmentListPage.checkAttachFileButtonIsNotDisplayed();
+        });
+
+    });
+
+});
diff --git a/e2e/process-services/start_task_custom_app.e2e.ts b/e2e/process-services/start_task_custom_app.e2e.ts
new file mode 100644
index 0000000000..e6d5cd773f
--- /dev/null
+++ b/e2e/process-services/start_task_custom_app.e2e.ts
@@ -0,0 +1,231 @@
+/*!
+ * @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 } from 'protractor';
+
+import LoginPage = require('../pages/adf/loginPage');
+import ProcessServicesPage = require('../pages/adf/process_services/processServicesPage');
+import TasksPage = require('../pages/adf/process_services/tasksPage');
+import { AttachmentListPage } from '../pages/adf/process_services/attachmentListPage';
+import CONSTANTS = require('../util/constants');
+
+import Task = require('../models/APS/Task');
+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 TestConfig = require('../test.config');
+import resources = require('../util/resources');
+
+import dateFormat = require('dateformat');
+
+import AlfrescoApi = require('alfresco-js-api-node');
+import { AppsActions } from '../actions/APS/apps.actions';
+import { UsersActions } from '../actions/users.actions';
+
+describe('Start Task - Custom App', () => {
+
+    let TASKDATAFORMAT = 'mmm dd yyyy';
+    let loginPage = new LoginPage();
+    let processServicesPage = new ProcessServicesPage();
+    let attachmentListPage = new AttachmentListPage();
+    let processUserModel, assigneeUserModel;
+    let app = resources.Files.SIMPLE_APP_WITH_USER_FORM;
+    let formTextField = app.form_fields.form_fieldId;
+    let formFieldValue = 'First value ';
+    let taskPage = new TasksPage();
+    let firstComment = 'comm1', firstChecklist = 'checklist1';
+    let tasks = ['Modifying task', 'Information box', 'No form', 'Not Created', 'Refreshing form', 'Assignee task', 'Attach File', 'Spinner'];
+    let showHeaderTask = 'Show Header';
+    let appModel;
+    let pngFile = new FileModel({
+        'location': resources.Files.ADF_DOCUMENTS.PNG.file_location,
+        'name': resources.Files.ADF_DOCUMENTS.PNG.file_name
+    });
+
+    beforeAll(async (done) => {
+        let apps = new AppsActions();
+        let users = new UsersActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        let newTenant = await this.alfrescoJsApi.activiti.adminTenantsApi.createTenant(new Tenant());
+
+        assigneeUserModel = await users.createApsUser(this.alfrescoJsApi, newTenant.id);
+
+        processUserModel = await users.createApsUser(this.alfrescoJsApi, newTenant.id);
+
+        await this.alfrescoJsApi.login(processUserModel.email, processUserModel.password);
+
+        appModel = await apps.importPublishDeployApp(this.alfrescoJsApi, app.file_location);
+
+        loginPage.loginToProcessServicesUsingUserModel(processUserModel);
+
+        done();
+    });
+
+    it('[C263942] Modifying task', () => {
+        processServicesPage.goToProcessServices().goToApp(appModel.name).clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.createNewTask().addName(tasks[0])
+            .addForm(app.formName).clickStartButton()
+            .then(() => {
+                taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[0]);
+                taskPage.usingTaskDetails().clickInvolvePeopleButton()
+                    .typeUser(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName)
+                    .selectUserToInvolve(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName)
+                    .checkUserIsSelected(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName);
+                taskPage.usingTaskDetails().clickAddInvolvedUserButton();
+                expect(taskPage.usingTaskDetails().getInvolvedUserEmail(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName))
+                    .toEqual(assigneeUserModel.email);
+                taskPage.usingTaskDetails().selectActivityTab().addComment(firstComment)
+                    .checkCommentIsDisplayed(firstComment);
+                taskPage.clickOnAddChecklistButton().addName(firstChecklist).clickCreateChecklistButton();
+                taskPage.checkChecklistIsDisplayed(firstChecklist);
+                taskPage.usingTaskDetails().selectDetailsTab();
+            });
+    });
+
+    it('[C263946] Information box', () => {
+        processServicesPage.goToProcessServices().goToApp(appModel.name).clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.createNewTask().addName(tasks[1]).addDescription('Description')
+            .addForm(app.formName).clickStartButton()
+            .then(() => {
+                expect(taskPage.usingTaskDetails().getTitle()).toEqual('Activities');
+            })
+            .then(() => {
+                return this.alfrescoJsApi.activiti.taskApi.listTasks(new Task({ sort: 'created-desc' }));
+            })
+            .then((response) => {
+                let taskModel = new TaskModel(response.data[0]);
+                taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(taskModel.getName());
+
+                expect(taskPage.usingTaskDetails().getCreated()).toEqual(dateFormat(taskModel.getCreated(), TASKDATAFORMAT));
+                expect(taskPage.usingTaskDetails().getId()).toEqual(taskModel.getId());
+                expect(taskPage.usingTaskDetails().getDescription()).toEqual(taskModel.getDescription());
+                expect(taskPage.usingTaskDetails().getAssignee()).toEqual(taskModel.getAssignee().getEntireName());
+                expect(taskPage.usingTaskDetails().getCategory())
+                    .toEqual(taskModel.getCategory() === null ? CONSTANTS.TASKDETAILS.NO_CATEGORY : taskModel.getCategory());
+                expect(taskPage.usingTaskDetails().getDueDate())
+                    .toEqual(taskModel.getDueDate() === null ? CONSTANTS.TASKDETAILS.NO_DATE : taskModel.getDueDate());
+                expect(taskPage.usingTaskDetails().getParentName())
+                    .toEqual(taskModel.getParentTaskName() === null ? CONSTANTS.TASKDETAILS.NO_PARENT : taskModel.getParentTaskName());
+                expect(taskPage.usingTaskDetails().getStatus()).toEqual(CONSTANTS.TASKSTATUS.RUNNING);
+
+                return this.alfrescoJsApi.activiti.taskFormsApi.getTaskForm(response.data[0].id);
+            })
+            .then((response) => {
+                let formModel = new FormModel(response);
+                expect(taskPage.usingTaskDetails().getFormName())
+                    .toEqual(formModel.getName() === null ? CONSTANTS.TASKDETAILS.NO_FORM : formModel.getName());
+            });
+    });
+
+    it('[C263947] Start task with no form', () => {
+        processServicesPage.goToProcessServices().goToApp(appModel.name).clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.createNewTask().addName(tasks[2]).clickStartButton()
+            .then(() => {
+                taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[2]);
+                taskPage.usingFormFields().noFormIsDisplayed();
+                expect(taskPage.usingTaskDetails().getFormName()).toEqual(CONSTANTS.TASKDETAILS.NO_FORM);
+            });
+    });
+
+    it('[C263948] Start task buttons', () => {
+        processServicesPage.goToProcessServices().goToApp(appModel.name).clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.createNewTask().checkStartButtonIsDisabled().addName(tasks[3])
+            .checkStartButtonIsEnabled().clickCancelButton()
+            .then(() => {
+                taskPage.usingTasksListPage().checkTaskIsNotDisplayedInTasksList(tasks[3]);
+                expect(taskPage.usingFiltersPage().getActiveFilter()).toEqual(CONSTANTS.TASKFILTERS.MY_TASKS);
+            });
+    });
+
+    it('[C263949] Refreshing the form', () => {
+        processServicesPage.goToProcessServices().goToApp(appModel.name).clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.createNewTask()
+            .addForm(app.formName).addName(tasks[4]).clickStartButton()
+            .then(() => {
+                taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[4]);
+                expect(taskPage.usingFormFields().setFieldValue(by.id, formTextField, formFieldValue)
+                    .getFieldValue(formTextField)).toEqual(formFieldValue);
+                taskPage.usingFormFields().refreshForm().checkFieldValue(by.id, formTextField, '');
+                taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[4]);
+                taskPage.usingFormFields().setFieldValue(by.id, formTextField, formFieldValue)
+                    .checkFieldValue(by.id, formTextField, formFieldValue);
+                taskPage.usingFormFields().saveForm().checkFieldValue(by.id, formTextField, formFieldValue);
+            });
+    });
+
+    it('[C263951] Assign User', () => {
+        processServicesPage.goToProcessServices().goToApp(appModel.name).clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.createNewTask().addName(tasks[5]).addAssignee(assigneeUserModel.firstName).clickStartButton()
+            .then(() => {
+                taskPage.usingTasksListPage().checkTaskListIsLoaded();
+                taskPage.usingTasksListPage().waitForTableBody();
+                taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.INV_TASKS);
+                taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[5]).selectTaskFromTasksList(tasks[5]);
+                taskPage.checkTaskTitle(tasks[5]);
+                expect(taskPage.usingTaskDetails().getAssignee()).toEqual(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName);
+            });
+    });
+
+    it('Attach a file', () => {
+        processServicesPage.goToProcessServices().goToApp(appModel.name).clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.createNewTask().addName(tasks[6]).clickStartButton()
+            .then(() => {
+                attachmentListPage.clickAttachFileButton(pngFile.location);
+                attachmentListPage.checkFileIsAttached(pngFile.name);
+            });
+    });
+
+    it('[C263945] Should Information box be hidden when showHeaderContent property is set on false on custom app', () => {
+        processServicesPage.goToProcessServices().goToApp(appModel.name).clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.createNewTask().addName(showHeaderTask).clickStartButton();
+        taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(showHeaderTask).selectTaskFromTasksList(showHeaderTask);
+
+        taskPage.usingTaskDetails().usingTaskDetailsToggles().disableShowHeader();
+        taskPage.usingTaskDetails().taskInfoDrawerIsNotDisplayed();
+
+        taskPage.usingTaskDetails().usingTaskDetailsToggles().enableShowHeader();
+        taskPage.usingTaskDetails().taskInfoDrawerIsDisplayed();
+    });
+
+    it('[C263950] Should be able to see Spinner loading on task list when clicking on Tasks on custom app', () => {
+        processServicesPage.goToProcessServices().goToApp(appModel.name).clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.createNewTask().addName(tasks[7]).clickStartButton();
+
+        processServicesPage.goToProcessServices().goToTaskApp();
+        taskPage.usingTasksListPage().checkSpinnerIsDisplayed();
+    });
+
+});
diff --git a/e2e/process-services/start_task_task_app.e2e.ts b/e2e/process-services/start_task_task_app.e2e.ts
new file mode 100644
index 0000000000..d8dad1a543
--- /dev/null
+++ b/e2e/process-services/start_task_task_app.e2e.ts
@@ -0,0 +1,230 @@
+/*!
+ * @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 } from 'protractor';
+
+import LoginPage = require('../pages/adf/loginPage');
+import ProcessServicesPage = require('../pages/adf/process_services/processServicesPage');
+import TasksPage = require('../pages/adf/process_services/tasksPage');
+import { AttachmentListPage } from '../pages/adf/process_services/attachmentListPage';
+
+import CONSTANTS = require('../util/constants');
+
+import Tenant = require('../models/APS/Tenant');
+import Task = require('../models/APS/Task');
+import TaskModel = require('../models/APS/TaskModel');
+import FormModel = require('../models/APS/FormModel');
+import FileModel = require('../models/ACS/fileModel');
+
+import TestConfig = require('../test.config');
+import resources = require('../util/resources');
+
+import dateFormat = require('dateformat');
+
+import AlfrescoApi = require('alfresco-js-api-node');
+import { UsersActions } from '../actions/users.actions';
+import fs = require('fs');
+import path = require('path');
+
+describe('Start Task - Task App', () => {
+
+    let TASKDATAFORMAT = 'mmm dd yyyy';
+    let loginPage = new LoginPage();
+    let processServicesPage = new ProcessServicesPage();
+    let attachmentListPage = new AttachmentListPage();
+    let processUserModel, assigneeUserModel;
+    let app = resources.Files.SIMPLE_APP_WITH_USER_FORM;
+    let formTextField = app.form_fields.form_fieldId;
+    let formFieldValue = 'First value ';
+    let taskPage = new TasksPage();
+    let formModel;
+    let firstComment = 'comm1', firstChecklist = 'checklist1';
+    let tasks = ['Modifying task', 'Information box', 'No form', 'Not Created', 'Refreshing form', 'Assignee task', 'Attach File'];
+    let showHeaderTask = 'Show Header';
+    let jpgFile = new FileModel({
+        'location': resources.Files.ADF_DOCUMENTS.JPG.file_location,
+        'name': resources.Files.ADF_DOCUMENTS.JPG.file_name
+    });
+
+    beforeAll(async (done) => {
+        let users = new UsersActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        let newTenant = await this.alfrescoJsApi.activiti.adminTenantsApi.createTenant(new Tenant());
+
+        assigneeUserModel = await users.createApsUser(this.alfrescoJsApi, newTenant.id);
+
+        processUserModel = await users.createApsUser(this.alfrescoJsApi, newTenant.id);
+
+        let pathFile = path.join(TestConfig.main.rootPath + app.file_location);
+        let file = fs.createReadStream(pathFile);
+
+        await this.alfrescoJsApi.login(processUserModel.email, processUserModel.password);
+
+        await this.alfrescoJsApi.activiti.appsApi.importAppDefinition(file);
+
+        await this.alfrescoJsApi.activiti.taskApi.createNewTask({name: showHeaderTask});
+
+        loginPage.loginToProcessServicesUsingUserModel(processUserModel);
+
+        done();
+    });
+
+    it('[C260383] Modifying task', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.createNewTask().addName(tasks[0])
+            .addForm(app.formName).clickStartButton()
+            .then(() => {
+                taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[0]);
+                taskPage.usingTaskDetails().clickInvolvePeopleButton()
+                    .typeUser(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName)
+                    .selectUserToInvolve(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName)
+                    .checkUserIsSelected(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName);
+                taskPage.usingTaskDetails().clickAddInvolvedUserButton();
+                expect(taskPage.usingTaskDetails().getInvolvedUserEmail(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName))
+                    .toEqual(assigneeUserModel.email);
+                taskPage.usingTaskDetails().selectActivityTab().addComment(firstComment)
+                    .checkCommentIsDisplayed(firstComment);
+                taskPage.clickOnAddChecklistButton().addName(firstChecklist).clickCreateChecklistButton();
+                taskPage.checkChecklistIsDisplayed(firstChecklist);
+                taskPage.usingTaskDetails().selectDetailsTab();
+            });
+    });
+
+    it('[C260506] Information box', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.createNewTask().addName(tasks[1]).addDescription('Description')
+            .addForm(app.formName).clickStartButton()
+            .then(() => {
+                expect(taskPage.usingTaskDetails().getTitle()).toEqual('Activities');
+            })
+            .then(() => {
+                return this.alfrescoJsApi.activiti.taskApi.listTasks(new Task({ sort: 'created-desc' }));
+            })
+            .then((response) => {
+                let taskModel = new TaskModel(response.data[0]);
+                taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(taskModel.getName());
+                expect(taskPage.usingTaskDetails().getCreated()).toEqual(dateFormat(taskModel.getCreated(), TASKDATAFORMAT));
+                expect(taskPage.usingTaskDetails().getId()).toEqual(taskModel.getId());
+                expect(taskPage.usingTaskDetails().getDescription()).toEqual(taskModel.getDescription());
+                expect(taskPage.usingTaskDetails().getAssignee()).toEqual(taskModel.getAssignee().getEntireName());
+                expect(taskPage.usingTaskDetails().getCategory())
+                    .toEqual(taskModel.getCategory() === null ? CONSTANTS.TASKDETAILS.NO_CATEGORY : taskModel.getCategory());
+                expect(taskPage.usingTaskDetails().getDueDate())
+                    .toEqual(taskModel.getDueDate() === null ? CONSTANTS.TASKDETAILS.NO_DATE : taskModel.getDueDate());
+                expect(taskPage.usingTaskDetails().getParentName())
+                    .toEqual(taskModel.getParentTaskName() === null ? CONSTANTS.TASKDETAILS.NO_PARENT : taskModel.getParentTaskName());
+                expect(taskPage.usingTaskDetails().getStatus()).toEqual(CONSTANTS.TASKSTATUS.RUNNING);
+                return this.alfrescoJsApi.activiti.taskFormsApi.getTaskForm(response.data[0].id);
+            })
+            .then(function (response) {
+                formModel = new FormModel(response);
+                expect(taskPage.usingTaskDetails().getFormName())
+                    .toEqual(formModel.getName() === null ? CONSTANTS.TASKDETAILS.NO_FORM : formModel.getName());
+            });
+    });
+
+    it('Start task with no form', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.createNewTask().addName(tasks[2]).clickStartButton()
+            .then(() => {
+                taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[2]);
+                taskPage.usingFormFields().noFormIsDisplayed();
+                expect(taskPage.usingTaskDetails().getFormName()).toEqual(CONSTANTS.TASKDETAILS.NO_FORM);
+            });
+    });
+
+    it('[C260422] Start task buttons', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.createNewTask().checkStartButtonIsDisabled().addName(tasks[3])
+            .checkStartButtonIsEnabled().clickCancelButton()
+            .then(() => {
+                taskPage.usingTasksListPage().checkTaskIsNotDisplayedInTasksList(tasks[3]);
+                expect(taskPage.usingFiltersPage().getActiveFilter()).toEqual(CONSTANTS.TASKFILTERS.MY_TASKS);
+            });
+    });
+
+    it('[C260423] Refreshing the form', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.createNewTask()
+            .addForm(app.formName).addName(tasks[4]).clickStartButton()
+            .then(() => {
+                taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[4]);
+                expect(taskPage.usingFormFields().setFieldValue(by.id, formTextField, formFieldValue)
+                    .getFieldValue(formTextField)).toEqual(formFieldValue);
+                taskPage.usingFormFields().refreshForm().checkFieldValue(by.id, formTextField, '');
+                taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[4]);
+                taskPage.usingFormFields().setFieldValue(by.id, formTextField, formFieldValue)
+                    .checkFieldValue(by.id, formTextField, formFieldValue);
+                taskPage.usingFormFields().saveForm().checkFieldValue(by.id, formTextField, formFieldValue);
+            });
+    });
+
+    it('[C260425] Assign User', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.createNewTask().addName(tasks[5])
+            .addAssignee(assigneeUserModel.firstName).clickStartButton()
+            .then(() => {
+                taskPage.usingTasksListPage().checkTaskListIsLoaded();
+                taskPage.usingTasksListPage().waitForTableBody();
+                taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.INV_TASKS);
+                taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(tasks[5]).selectTaskFromTasksList(tasks[5]);
+                taskPage.checkTaskTitle(tasks[5]);
+                expect(taskPage.usingTaskDetails().getAssignee()).toEqual(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName);
+            });
+    });
+
+    it('Attach a file', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.createNewTask().addName(tasks[6]).clickStartButton()
+            .then(() => {
+                attachmentListPage.clickAttachFileButton(jpgFile.location);
+                attachmentListPage.checkFileIsAttached(jpgFile.name);
+            });
+    });
+
+    it('[C260420] Should Information box be hidden when showHeaderContent property is set on false', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(showHeaderTask).selectTaskFromTasksList(showHeaderTask);
+
+        taskPage.usingTaskDetails().usingTaskDetailsToggles().disableShowHeader();
+        taskPage.usingTaskDetails().taskInfoDrawerIsNotDisplayed();
+
+        taskPage.usingTaskDetails().usingTaskDetailsToggles().enableShowHeader();
+        taskPage.usingTaskDetails().taskInfoDrawerIsDisplayed();
+    });
+
+    it('[C260424] Should be able to see Spinner loading on task list when clicking on Tasks', () => {
+        processServicesPage.goToProcessServices().goToTaskApp();
+        taskPage.usingTasksListPage().checkSpinnerIsDisplayed();
+    });
+
+});
diff --git a/e2e/process-services/task-audit.e2e.ts b/e2e/process-services/task-audit.e2e.ts
new file mode 100644
index 0000000000..3bd9d5933f
--- /dev/null
+++ b/e2e/process-services/task-audit.e2e.ts
@@ -0,0 +1,127 @@
+/*!
+ * @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 LoginPage = require('../pages/adf/loginPage');
+import ProcessServicesPage = require('../pages/adf/process_services/processServicesPage');
+import TasksPage = require('../pages/adf/process_services/tasksPage');
+
+import CONSTANTS = require('../util/constants');
+
+import Tenant = require('../models/APS/Tenant');
+
+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 path = require('path');
+import Util = require('./util/util');
+
+describe('Start Task - Task App', () => {
+
+    let loginPage = new LoginPage();
+    let processServicesPage = new ProcessServicesPage();
+    let processUserModel;
+    let app = resources.Files.SIMPLE_APP_WITH_USER_FORM;
+    let taskPage = new TasksPage();
+    let taskTaskApp = 'Audit task task app';
+    let taskCustomApp = 'Audit task custom app';
+    let taskCompleteCustomApp = 'Audit completed task custom app';
+    let auditLogFile = path.join('./e2e/download/', 'Audit.pdf');
+    let appModel;
+
+    beforeAll(async (done) => {
+        let users = new UsersActions();
+        let apps = new AppsActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        let newTenant = await this.alfrescoJsApi.activiti.adminTenantsApi.createTenant(new Tenant());
+
+        processUserModel = await users.createApsUser(this.alfrescoJsApi, newTenant.id);
+
+        await this.alfrescoJsApi.login(processUserModel.email, processUserModel.password);
+
+        this.alfrescoJsApi.activiti.taskApi.createNewTask({name: taskTaskApp});
+
+        appModel = await apps.importPublishDeployApp(this.alfrescoJsApi, app.file_location);
+
+        loginPage.loginToProcessServicesUsingUserModel(processUserModel);
+
+        done();
+    });
+
+    it('[C260386] Should Audit file be downloaded when clicking on Task Audit log icon on a standalone running task', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(taskTaskApp);
+
+        taskPage.usingTaskDetails().clickAuditLogButton();
+        expect(Util.fileExists(auditLogFile, 10)).toBe(true);
+    });
+
+    it('[C260389] Should Audit file be downloaded when clicking on Task Audit log icon on a standalone completed task', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(taskTaskApp);
+
+        taskPage.completeTaskNoForm();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.COMPL_TASKS);
+        taskPage.usingTasksListPage().selectTaskFromTasksList(taskTaskApp);
+        expect(taskPage.usingFormFields().getCompletedTaskNoFormMessage()).toEqual('Task ' + taskTaskApp + ' completed');
+
+        taskPage.usingTaskDetails().clickAuditLogButton();
+        expect(Util.fileExists(auditLogFile, 20)).toBe(true);
+    });
+
+    it('[C263944] Should Audit file be downloaded when clicking on Task Audit log icon on a custom app standalone completed task', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+
+        taskPage.createNewTask().addName(taskCompleteCustomApp).clickStartButton();
+
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(taskCompleteCustomApp);
+
+        taskPage.completeTaskNoForm();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.COMPL_TASKS);
+        taskPage.usingTasksListPage().selectTaskFromTasksList(taskCompleteCustomApp);
+        expect(taskPage.usingFormFields().getCompletedTaskNoFormMessage()).toEqual('Task ' + taskCompleteCustomApp + ' completed');
+
+        taskPage.usingTaskDetails().clickAuditLogButton();
+        expect(Util.fileExists(auditLogFile, 20)).toBe(true);
+    });
+
+    it('[C263943] Should Audit file be downloaded when clicking on Task Audit log icon on a custom app standalone running task', () => {
+        processServicesPage.goToProcessServices().goToApp(appModel.name).clickTasksButton();
+
+        taskPage.createNewTask().addName(taskCustomApp).clickStartButton();
+
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(taskCustomApp);
+
+        taskPage.usingTaskDetails().clickAuditLogButton();
+        expect(Util.fileExists(auditLogFile, 10)).toBe(true);
+    });
+
+});
diff --git a/e2e/process-services/task_attachmentList_actionMenu.e2e.ts b/e2e/process-services/task_attachmentList_actionMenu.e2e.ts
new file mode 100644
index 0000000000..f6dd9fdb28
--- /dev/null
+++ b/e2e/process-services/task_attachmentList_actionMenu.e2e.ts
@@ -0,0 +1,212 @@
+/*!
+ * @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 } from 'protractor';
+
+import LoginPage = require('../pages/adf/loginPage');
+import ProcessServicesPage = require('../pages/adf/process_services/processServicesPage');
+import TasksPage = require('../pages/adf/process_services/tasksPage');
+import { AttachmentListPage } from '../pages/adf/process_services/attachmentListPage';
+import ViewerPage = require('../pages/adf/viewerPage.js');
+
+import CONSTANTS = require('../util/constants');
+
+import TestConfig = require('../test.config');
+import resources = require('../util/resources');
+import Util = require('../util/util.js');
+
+import path = require('path');
+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');
+
+describe('Attachment list action menu for tasks', () => {
+
+    let loginPage = new LoginPage();
+    let processServicesPage = new ProcessServicesPage();
+    let taskPage = new TasksPage();
+    let attachmentListPage = new AttachmentListPage();
+    let viewerPage = new ViewerPage();
+    let app = resources.Files.SIMPLE_APP_WITH_USER_FORM;
+    let pngFile = new FileModel({
+        location: resources.Files.ADF_DOCUMENTS.PNG.file_location,
+        name: resources.Files.ADF_DOCUMENTS.PNG.file_name
+    });
+    let downloadedPngFile = path.join(__dirname, 'downloads', pngFile.name);
+    let tenantId, appId, relatedContent, relatedContentId;
+    let taskName = {
+        active: 'Active Task',
+        completed: 'Completed Task',
+        taskApp: 'Task App Name',
+        emptyList: 'Empty List'
+    };
+
+    beforeAll(async(done) => {
+        let apps = new AppsActions();
+        let users = new UsersActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        let user = await users.createTenantAndUser(this.alfrescoJsApi);
+
+        tenantId = user.tenantId;
+
+        await this.alfrescoJsApi.login(user.email, user.password);
+
+        let importedApp = await apps.importPublishDeployApp(this.alfrescoJsApi, app.file_location);
+        appId = importedApp.id;
+
+        await loginPage.loginToProcessServicesUsingUserModel(user);
+
+        done();
+    });
+
+    afterAll(async(done) => {
+        await this.alfrescoJsApi.activiti.modelsApi.deleteModel(appId);
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+        await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId);
+        done();
+    });
+
+    it('[C277311] Should be able to View /Download /Remove from Attachment List on an active task', () => {
+        processServicesPage.goToProcessServices().goToApp(app.title).clickTasksButton();
+
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.createNewTask().addName(taskName.active).clickStartButton();
+
+        attachmentListPage.clickAttachFileButton(pngFile.location);
+        attachmentListPage.viewFile(pngFile.name);
+
+        viewerPage.checkFileNameIsDisplayed(pngFile.name);
+        viewerPage.clickCloseButton();
+
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+
+        attachmentListPage.doubleClickFile(pngFile.name);
+
+        viewerPage.checkFileNameIsDisplayed(pngFile.name);
+        viewerPage.clickCloseButton();
+
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+
+        attachmentListPage.downloadFile(pngFile.name);
+
+        browser.driver.sleep(1000);
+
+        expect(Util.fileExists(downloadedPngFile, 30)).toBe(true);
+
+        attachmentListPage.removeFile(pngFile.name);
+        attachmentListPage.checkFileIsRemoved(pngFile.name);
+    });
+
+    it('[C260236] Should be able to View /Download /Remove from Attachment List on a completed task', () => {
+        processServicesPage.goToProcessServices().goToApp(app.title).clickTasksButton();
+
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.createNewTask().addName(taskName.completed).clickStartButton();
+
+        attachmentListPage.clickAttachFileButton(pngFile.location);
+        attachmentListPage.checkFileIsAttached(pngFile.name);
+
+        taskPage.completeTaskNoForm();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.COMPL_TASKS);
+        taskPage.usingTasksListPage().selectTaskFromTasksList(taskName.completed);
+
+        attachmentListPage.checkAttachFileButtonIsNotDisplayed();
+        attachmentListPage.viewFile(pngFile.name);
+
+        viewerPage.checkFileNameIsDisplayed(pngFile.name);
+        viewerPage.clickCloseButton();
+
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.COMPL_TASKS);
+        taskPage.usingTasksListPage().selectTaskFromTasksList(taskName.completed);
+
+        attachmentListPage.downloadFile(pngFile.name);
+
+        browser.driver.sleep(1000);
+
+        expect(Util.fileExists(downloadedPngFile, 30)).toBe(true);
+
+        attachmentListPage.removeFile(pngFile.name);
+        attachmentListPage.checkFileIsRemoved(pngFile.name);
+    });
+
+    it('[C260225] Should be able to upload a file in the Attachment list on Task App', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.createNewTask().addName(taskName.taskApp).clickStartButton();
+
+        attachmentListPage.clickAttachFileButton(pngFile.location);
+        attachmentListPage.checkFileIsAttached(pngFile.name);
+    });
+
+    it('[C279884] Should be able to view the empty attachment list for tasks', () => {
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.createNewTask().addName(taskName.emptyList).clickStartButton();
+
+        attachmentListPage.checkEmptyAttachmentList();
+        attachmentListPage.clickAttachFileButton(pngFile.location);
+        attachmentListPage.checkFileIsAttached(pngFile.name);
+        attachmentListPage.removeFile(pngFile.name);
+        attachmentListPage.checkFileIsRemoved(pngFile.name);
+        attachmentListPage.checkEmptyAttachmentList();
+    });
+
+    it('[C260234] Should be able to attache a file on a task on APS and check on ADF', () => {
+        browser.controlFlow().execute(async() => {
+            let newTask = await this.alfrescoJsApi.activiti.taskApi.createNewTask({name: 'SHARE KNOWLEDGE'});
+
+            let newTaskId = newTask.id;
+
+            let filePath = path.join(TestConfig.main.rootPath + pngFile.location);
+
+            let file = fs.createReadStream(filePath);
+
+            relatedContent = await this.alfrescoJsApi.activiti.contentApi.createRelatedContentOnTask(newTaskId, file, {'isRelatedContent': true});
+            relatedContentId = relatedContent.id;
+        });
+
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.usingTasksListPage().selectTaskFromTasksList('SHARE KNOWLEDGE');
+
+        attachmentListPage.checkFileIsAttached(pngFile.name);
+
+        browser.controlFlow().execute(async() => {
+            await this.alfrescoJsApi.activiti.contentApi.deleteContent(relatedContentId);
+        });
+
+        processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton();
+
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS);
+        taskPage.usingTasksListPage().selectTaskFromTasksList('SHARE KNOWLEDGE');
+
+        attachmentListPage.checkEmptyAttachmentList();
+    });
+});
diff --git a/e2e/process-services/task_filters_component.e2e.ts b/e2e/process-services/task_filters_component.e2e.ts
new file mode 100644
index 0000000000..e0b342bf52
--- /dev/null
+++ b/e2e/process-services/task_filters_component.e2e.ts
@@ -0,0 +1,178 @@
+/*!
+ * @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 TestConfig = require('../test.config');
+import resources = require('../util/resources');
+import LoginPage = require('../pages/adf/loginPage');
+import NavigationBarPage = require('../pages/adf/navigationBarPage');
+import ProcessServicesPage = require('../pages/adf/process_services/processServicesPage');
+import TasksPage = require('../pages/adf/process_services/tasksPage');
+import TasksListPage = require('../pages/adf/process_services/tasksListPage');
+import TaskFiltersPage = require('../pages/adf/process_services/taskFiltersPage');
+import TaskDetailsPage = require('../pages/adf/process_services/taskDetailsPage');
+
+import AlfrescoApi = require('alfresco-js-api-node');
+import { AppsActions } from '../actions/APS/apps.actions';
+import { UsersActions } from '../actions/users.actions';
+
+describe('Task Filters Test', () => {
+
+    let loginPage = new LoginPage();
+    let navigationBarPage = new NavigationBarPage();
+    let processServicesPage = new ProcessServicesPage();
+    let tasksPage = new TasksPage();
+    let tasksListPage = new TasksListPage();
+    let taskFiltersPage = new TaskFiltersPage();
+    let taskDetailsPage = new TaskDetailsPage();
+
+    let app = resources.Files.APP_WITH_DATE_FIELD_FORM;
+
+    beforeAll(async (done) => {
+        let apps = new AppsActions();
+        let users = new UsersActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        let user = await users.createTenantAndUser(this.alfrescoJsApi);
+
+        await this.alfrescoJsApi.login(user.email, user.password);
+
+        await apps.importPublishDeployApp(this.alfrescoJsApi, app.file_location);
+
+        await loginPage.loginToProcessServicesUsingUserModel(user);
+
+        done();
+    });
+
+    beforeEach(async (done) => {
+        navigationBarPage.clickProcessServicesButton();
+        processServicesPage.checkApsContainer();
+        processServicesPage.goToApp(app.title);
+
+        done();
+    });
+
+    it('[C260330] Should display task list when app is in task section', () => {
+        tasksPage.clickOnCreateButton();
+        taskFiltersPage.clickNewTaskButton();
+        tasksPage.createNewTask().addName('Test').clickStartButton();
+        taskFiltersPage.clickMyTaskTaskItem();
+        tasksListPage.checkTaskIsDisplayedInTasksList('Test');
+        expect(taskFiltersPage.checkActiveFilterActive()).toBe('My Tasks');
+        expect(taskDetailsPage.checkTaskDetailsDisplayed()).toBeDefined();
+
+        taskFiltersPage.clickQueuedTaskItem();
+        expect(taskFiltersPage.checkActiveFilterActive()).toBe('Queued Tasks');
+        tasksListPage.checkTaskIsNotDisplayedInTasksList('Test');
+        expect(taskDetailsPage.checkTaskDetailsEmpty()).toBeDefined();
+
+        taskFiltersPage.clickInvolvedTaskItem();
+        expect(taskFiltersPage.checkActiveFilterActive()).toBe('Involved Tasks');
+        tasksListPage.checkTaskIsDisplayedInTasksList('Test');
+        expect( taskDetailsPage.checkTaskDetailsDisplayed()).toBeDefined();
+
+        taskFiltersPage.clickCompletedTaskItem();
+        expect(taskFiltersPage.checkActiveFilterActive()).toBe('Completed Tasks');
+        tasksListPage.checkTaskIsNotDisplayedInTasksList('Test');
+        expect(taskDetailsPage.checkTaskDetailsEmpty()).toBeDefined();
+    });
+
+    it('[C260348] Should display task list when app is in task section', () => {
+        expect(taskFiltersPage.checkMyTasksItem()).toBeDefined();
+        expect(taskFiltersPage.checkQueuedTaskItem()).toBeDefined();
+        expect(taskFiltersPage.checkInvolvedTaskItem()).toBeDefined();
+        expect(taskFiltersPage.checkCompletedTaskItem()).toBeDefined();
+        expect(taskFiltersPage.checkTasksAccordionExtended()).toBeDefined();
+
+        taskFiltersPage.clickTasksAccordionButton();
+        expect(taskFiltersPage.checkTasksAccordionClosed()).toBeDefined();
+
+        taskFiltersPage.clickTasksAccordionButton();
+        expect(taskFiltersPage.checkMyTasksItem()).toBeDefined();
+        expect(taskFiltersPage.checkQueuedTaskItem()).toBeDefined();
+        expect(taskFiltersPage.checkInvolvedTaskItem()).toBeDefined();
+        expect(taskFiltersPage.checkCompletedTaskItem()).toBeDefined();
+
+        tasksPage.clickOnCreateButton();
+        taskFiltersPage.clickNewTaskButton();
+        tasksPage.createNewTask().addName('Test').clickStartButton();
+        taskFiltersPage.clickMyTaskTaskItem();
+        tasksListPage.checkTaskIsDisplayedInTasksList('Test');
+        expect(taskFiltersPage.checkActiveFilterActive()).toBe('My Tasks');
+        expect(taskDetailsPage.checkTaskDetailsDisplayed()).toBeDefined();
+
+        taskFiltersPage.clickQueuedTaskItem();
+        expect(taskFiltersPage.checkActiveFilterActive()).toBe('Queued Tasks');
+        expect(taskFiltersPage.checkEmptyTaskList()).toBe('No Tasks Found');
+        expect(taskFiltersPage.checkEmptyTaskDetails()).toBe('No task details found');
+
+        taskFiltersPage.clickInvolvedTaskItem();
+        expect(taskFiltersPage.checkActiveFilterActive()).toBe('Involved Tasks');
+        tasksListPage.checkTaskIsDisplayedInTasksList('Test');
+        expect(taskDetailsPage.checkTaskDetailsDisplayed()).toBeDefined();
+
+        taskFiltersPage.clickCompletedTaskItem();
+        expect(taskFiltersPage.checkActiveFilterActive()).toBe('Completed Tasks');
+        expect(taskFiltersPage.checkEmptyTaskList()).toBe('No Tasks Found');
+        expect(taskFiltersPage.checkEmptyTaskDetails()).toBe('No task details found');
+    });
+
+    it('[C260349] Should display task list when app is in task section', () => {
+        tasksPage.clickOnCreateButton();
+        taskFiltersPage.clickNewTaskButton();
+        tasksPage.createNewTask().addName('Test1').clickStartButton();
+        taskDetailsPage.clickCompleteTask();
+        tasksPage.clickOnCreateButton();
+        taskFiltersPage.clickNewTaskButton();
+        tasksPage.createNewTask().addName('Test2').clickStartButton();
+        taskDetailsPage.clickCompleteTask();
+        tasksPage.clickOnCreateButton();
+        taskFiltersPage.clickNewTaskButton();
+        tasksPage.createNewTask().addName('Test3').clickStartButton();
+
+        tasksPage.clickOnCreateButton();
+        taskFiltersPage.clickNewTaskButton();
+        tasksPage.createNewTask().addName('Test4').clickStartButton();
+        tasksListPage.checkTaskIsDisplayedInTasksList('Test4');
+        tasksListPage.checkHighlightedTaskInTasksList('Test4');
+        tasksListPage.checkTaskIsDisplayedInTasksList('Test3');
+        taskDetailsPage.checkTaskDetailsDisplayed();
+
+        tasksListPage.clickSortByName();
+        expect(tasksListPage.firstTaskOnTaskList()).toBe('Test3');
+        tasksListPage.clickSortByName();
+        expect(tasksListPage.firstTaskOnTaskList()).toBe('Test4');
+
+        taskFiltersPage.clickCompletedTaskItem();
+        tasksListPage.checkTaskIsDisplayedInTasksList('Test1');
+        tasksListPage.checkTaskIsDisplayedInTasksList('Test2');
+        expect(tasksListPage.firstTaskOnTaskList()).toBe('Test2');
+
+        tasksListPage.clickSortByName();
+        expect(tasksListPage.firstTaskOnTaskList()).toBe('Test1');
+
+        taskFiltersPage.clickInvolvedTaskItem();
+        tasksListPage.checkTaskIsDisplayedInTasksList('Test3');
+        tasksListPage.checkTaskIsDisplayedInTasksList('Test4');
+    });
+
+});
diff --git a/e2e/process-services/task_list_pagination.e2e.ts b/e2e/process-services/task_list_pagination.e2e.ts
new file mode 100644
index 0000000000..b6309018a5
--- /dev/null
+++ b/e2e/process-services/task_list_pagination.e2e.ts
@@ -0,0 +1,206 @@
+/*!
+ * @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 LoginPage = require('../pages/adf/loginPage');
+import ProcessServicesPage = require('../pages/adf/process_services/processServicesPage');
+import TasksPage = require('../pages/adf/process_services/tasksPage');
+import PaginationPage = require('../pages/adf/paginationPage');
+
+import CONSTANTS = require('../util/constants');
+
+import TestConfig = require('../test.config');
+import resources = require('../util/resources');
+
+import AlfrescoApi = require('alfresco-js-api-node');
+import { AppsActions } from '../actions/APS/apps.actions';
+import { UsersActions } from '../actions/users.actions';
+
+describe('Task List Pagination', () => {
+
+    let loginPage = new LoginPage();
+    let processServicesPage = new ProcessServicesPage();
+    let taskPage = new TasksPage();
+    let paginationPage = new PaginationPage();
+
+    let processUserModel, processUserModelEmpty;
+    let app = resources.Files.SIMPLE_APP_WITH_USER_FORM;
+    let currentPage = 1, nrOfTasks = 20, totalPages;
+
+    let itemsPerPage = {
+        five: '5',
+        fiveValue: 5,
+        ten: '10',
+        tenValue: 10,
+        fifteen: '15',
+        fifteenValue: 15,
+        twenty: '20',
+        twentyValue: 20,
+        default: '20'
+    };
+
+    beforeAll(async (done) => {
+        let apps = new AppsActions();
+        let users = new UsersActions();
+
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'BPM',
+            hostBpm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        processUserModel = await users.createTenantAndUser(this.alfrescoJsApi);
+        processUserModelEmpty = await users.createTenantAndUser(this.alfrescoJsApi);
+
+        await this.alfrescoJsApi.login(processUserModel.email, processUserModel.password);
+
+        let resultApp = await apps.importPublishDeployApp(this.alfrescoJsApi, app.file_location);
+
+        for (let i = 0; i < nrOfTasks; i++) {
+            await apps.startProcess(this.alfrescoJsApi, resultApp);
+        }
+
+        loginPage.loginToProcessServicesUsingUserModel(processUserModel);
+
+        done();
+    });
+
+    it('[C260301] Pagination at first 20 started tasks', () => {
+        processServicesPage.goToProcessServices().goToTaskApp();
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.default);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + nrOfTasks + ' of ' + nrOfTasks);
+        expect(taskPage.getAllDisplayedRows()).toBe(nrOfTasks);
+        paginationPage.checkNextPageButtonIsDisabled();
+        paginationPage.checkPreviousPageButtonIsDisabled();
+        paginationPage.selectItemsPerPage(itemsPerPage.twenty);
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.twenty);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + nrOfTasks + ' of ' + nrOfTasks);
+    });
+
+    it('[C260304] Items per page set to 5', () => {
+        processServicesPage.goToProcessServices().goToTaskApp();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.INV_TASKS);
+        paginationPage.selectItemsPerPage(itemsPerPage.five);
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.five);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + itemsPerPage.fiveValue + ' of ' + nrOfTasks);
+        expect(taskPage.getAllDisplayedRows()).toBe(itemsPerPage.fiveValue);
+        paginationPage.clickOnNextPage();
+        currentPage++;
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.five);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 6-' + itemsPerPage.fiveValue * currentPage + ' of ' + nrOfTasks);
+        expect(taskPage.getAllDisplayedRows()).toBe(itemsPerPage.fiveValue);
+        paginationPage.clickOnNextPage();
+        currentPage++;
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.five);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 11-' + itemsPerPage.fiveValue * currentPage + ' of ' + nrOfTasks);
+        expect(taskPage.getAllDisplayedRows()).toBe(itemsPerPage.fiveValue);
+        paginationPage.clickOnNextPage();
+        currentPage++;
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.five);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 16-' + itemsPerPage.fiveValue * currentPage + ' of ' + nrOfTasks);
+        expect(taskPage.getAllDisplayedRows()).toBe(itemsPerPage.fiveValue);
+
+        processServicesPage.goToProcessServices().goToTaskApp();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.INV_TASKS);
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.five);
+    });
+
+    it('[C260303] Items per page set to 10', () => {
+        processServicesPage.goToProcessServices().goToTaskApp();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.INV_TASKS);
+        paginationPage.selectItemsPerPage(itemsPerPage.ten);
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.ten);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + itemsPerPage.tenValue + ' of ' + nrOfTasks);
+        expect(taskPage.getAllDisplayedRows()).toBe(itemsPerPage.tenValue);
+        paginationPage.clickOnNextPage();
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.ten);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 11-' + itemsPerPage.twentyValue + ' of ' + nrOfTasks);
+        expect(taskPage.getAllDisplayedRows()).toBe(itemsPerPage.tenValue);
+
+        processServicesPage.goToProcessServices().goToTaskApp();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.INV_TASKS);
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.ten);
+    });
+
+    it('[C260302] Items per page set to 15', () => {
+        processServicesPage.goToProcessServices().goToTaskApp();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.INV_TASKS);
+        paginationPage.selectItemsPerPage(itemsPerPage.fifteen);
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.fifteen);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + itemsPerPage.fifteenValue + ' of ' + nrOfTasks);
+        expect(taskPage.getAllDisplayedRows()).toBe(itemsPerPage.fifteenValue);
+        paginationPage.clickOnNextPage();
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.fifteen);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 16-' + itemsPerPage.twentyValue + ' of ' + nrOfTasks);
+        expect(taskPage.getAllDisplayedRows()).toBe(itemsPerPage.fiveValue);
+
+        processServicesPage.goToProcessServices().goToTaskApp();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.INV_TASKS);
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.fifteen);
+    });
+
+    it('[C261006] Page number dropdown', () => {
+        currentPage = 1;
+        totalPages = 2;
+        processServicesPage.goToProcessServices().goToTaskApp();
+        taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.INV_TASKS);
+        taskPage.usingTasksListPage().waitForTableBody();
+        paginationPage.selectItemsPerPage(itemsPerPage.ten);
+        taskPage.usingTasksListPage().waitForTableBody();
+        expect(paginationPage.getCurrentPage()).toEqual('Page ' + currentPage);
+        expect(paginationPage.getTotalPages()).toEqual('of ' + totalPages);
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.ten);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + itemsPerPage.tenValue * currentPage + ' of ' + nrOfTasks);
+        expect(taskPage.getAllDisplayedRows()).toBe(itemsPerPage.tenValue);
+        paginationPage.checkNextPageButtonIsEnabled();
+        paginationPage.checkPreviousPageButtonIsDisabled();
+
+        paginationPage.clickOnPageDropdown();
+        expect(paginationPage.getPageDropdownOptions()).toEqual(['1', '2']);
+        currentPage = 2;
+        paginationPage.clickOnPageDropdownOption('2');
+        taskPage.usingTasksListPage().waitForTableBody();
+        expect(paginationPage.getCurrentPage()).toEqual('Page ' + currentPage);
+        expect(paginationPage.getTotalPages()).toEqual('of ' + totalPages);
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.ten);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 11-' + itemsPerPage.tenValue * currentPage + ' of ' + nrOfTasks);
+        expect(taskPage.getAllDisplayedRows()).toBe(itemsPerPage.tenValue);
+        paginationPage.checkNextPageButtonIsDisabled();
+        paginationPage.checkPreviousPageButtonIsEnabled();
+
+        paginationPage.clickOnPageDropdown();
+        expect(paginationPage.getPageDropdownOptions()).toEqual(['1', '2']);
+        currentPage = 1;
+        paginationPage.clickOnPageDropdownOption('1');
+        taskPage.usingTasksListPage().waitForTableBody();
+        expect(paginationPage.getCurrentPage()).toEqual('Page ' + currentPage);
+        expect(paginationPage.getTotalPages()).toEqual('of ' + totalPages);
+        expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.ten);
+        expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + itemsPerPage.tenValue * currentPage + ' of ' + nrOfTasks);
+        expect(taskPage.getAllDisplayedRows()).toBe(itemsPerPage.tenValue);
+        paginationPage.checkNextPageButtonIsEnabled();
+        paginationPage.checkPreviousPageButtonIsDisabled();
+    });
+
+    it('Pagination in an empty task list', () => {
+        loginPage.loginToProcessServicesUsingUserModel(processUserModelEmpty);
+
+        processServicesPage.goToProcessServices().goToTaskApp();
+        paginationPage.checkPaginationIsNotDisplayed();
+    });
+
+});
diff --git a/e2e/process-services/z-finish.e2e.ts b/e2e/process-services/z-finish.e2e.ts
new file mode 100644
index 0000000000..7a3876a528
--- /dev/null
+++ b/e2e/process-services/z-finish.e2e.ts
@@ -0,0 +1,79 @@
+/*!
+ * @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 AlfrescoApi = require('alfresco-js-api-node');
+import TestConfig = require('../test.config');
+
+import fs = require('fs');
+import path = require('path');
+
+let buildNumber = process.env.TRAVIS_BUILD_NUMBER;
+let saveScreenshot = process.env.SAVE_SCREENSHOT;
+
+describe('Save screenshot at the end', () => {
+
+    beforeAll(async (done) => {
+
+        if (saveScreenshot === 'true') {
+            if (!buildNumber) {
+                buildNumber = Date.now();
+            }
+
+            let alfrescoJsApi = new AlfrescoApi({
+                provider: 'ECM',
+                hostEcm: TestConfig.adf.url
+            });
+
+            let files = fs.readdirSync(path.join(__dirname, '../../e2e-output/screenshots'));
+
+            if (files && files.length > 0) {
+                alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+                let folder = await alfrescoJsApi.nodes.addNode('-my-', {
+                    'name': 'process-services',
+                    'relativePath': 'Build-screenshot/Screenshot-e2e-' + buildNumber,
+                    'nodeType': 'cm:folder'
+                }, {}, {
+                    'overwrite': true
+                });
+
+                for (const fileName of files) {
+
+                    let pathFile = path.join(__dirname, '../../e2e-output/screenshots', fileName);
+                    let file: any = fs.createReadStream(pathFile);
+
+                    await  alfrescoJsApi.upload.uploadFile(
+                        file,
+                        '',
+                        folder.entry.id,
+                        null,
+                        {
+                            'name': file.name,
+                            'nodeType': 'cm:content'
+                        }
+                    );
+                }
+            }
+        }
+
+        done();
+    });
+
+    it('screenshot need it', () => {
+        expect(true).toEqual(true);
+    });
+});
diff --git a/e2e/proxy.conf.js b/e2e/proxy.conf.js
new file mode 100644
index 0000000000..2cddf1714a
--- /dev/null
+++ b/e2e/proxy.conf.js
@@ -0,0 +1,28 @@
+var PROXY_HOST_ADF = process.env.PROXY_HOST_ADF;
+var HOST = process.env.URL_HOST_ADF;
+
+module.exports = {
+    "/alfresco": {
+        "target": "http://" + (PROXY_HOST_ADF || HOST),
+        "secure": false,
+        "pathRewrite": {
+            "^/alfresco/alfresco": ""
+        },
+        "changeOrigin": true,
+        // workaround for REPO-2260
+        onProxyRes: function (proxyRes, req, res) {
+            const header = proxyRes.headers['www-authenticate'];
+            if (header && header.startsWith('Basic')) {
+                proxyRes.headers['www-authenticate'] = 'x' + header;
+            }
+        }
+    },
+    "/activiti-app": {
+        "target": "http://" + (PROXY_HOST_ADF || HOST),
+        "secure": false,
+        "pathRewrite": {
+            "^/activiti-app/activiti-app": ""
+        },
+        "changeOrigin": true
+    }
+};
diff --git a/e2e/resources/adf/BigFile.zip b/e2e/resources/adf/BigFile.zip
new file mode 100644
index 0000000000..7f02134a82
Binary files /dev/null and b/e2e/resources/adf/BigFile.zip differ
diff --git a/e2e/resources/adf/activiti_profile_pic.png b/e2e/resources/adf/activiti_profile_pic.png
new file mode 100644
index 0000000000..d0b7d1b1ff
Binary files /dev/null and b/e2e/resources/adf/activiti_profile_pic.png differ
diff --git a/e2e/resources/adf/allFileTypes/a_excel_file.xlsx b/e2e/resources/adf/allFileTypes/a_excel_file.xlsx
new file mode 100644
index 0000000000..f24000a548
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/a_excel_file.xlsx differ
diff --git a/e2e/resources/adf/allFileTypes/a_file_protected.pdf b/e2e/resources/adf/allFileTypes/a_file_protected.pdf
new file mode 100644
index 0000000000..1051ea6ee0
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/a_file_protected.pdf differ
diff --git a/e2e/resources/adf/allFileTypes/a_file_supported.docx b/e2e/resources/adf/allFileTypes/a_file_supported.docx
new file mode 100644
index 0000000000..4aa4a73e6e
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/a_file_supported.docx differ
diff --git a/e2e/resources/adf/allFileTypes/a_file_supported.pdf b/e2e/resources/adf/allFileTypes/a_file_supported.pdf
new file mode 100644
index 0000000000..7a60b2ee60
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/a_file_supported.pdf differ
diff --git a/e2e/resources/adf/allFileTypes/a_file_unsupported.docx b/e2e/resources/adf/allFileTypes/a_file_unsupported.docx
new file mode 100644
index 0000000000..a7d93d3f96
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/a_file_unsupported.docx differ
diff --git a/e2e/resources/adf/allFileTypes/a_jpg_file.jpg b/e2e/resources/adf/allFileTypes/a_jpg_file.jpg
new file mode 100644
index 0000000000..0d58782ab9
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/a_jpg_file.jpg differ
diff --git a/e2e/resources/adf/allFileTypes/a_mp4_file.mp4 b/e2e/resources/adf/allFileTypes/a_mp4_file.mp4
new file mode 100644
index 0000000000..f7fd0f4ad7
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/a_mp4_file.mp4 differ
diff --git a/e2e/resources/adf/allFileTypes/a_png_file.png b/e2e/resources/adf/allFileTypes/a_png_file.png
new file mode 100644
index 0000000000..e50d31fca3
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/a_png_file.png differ
diff --git a/e2e/resources/adf/allFileTypes/a_ppt_file.pptx b/e2e/resources/adf/allFileTypes/a_ppt_file.pptx
new file mode 100644
index 0000000000..4f2e970d5c
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/a_ppt_file.pptx differ
diff --git a/e2e/resources/adf/allFileTypes/a_txt_file.rtf b/e2e/resources/adf/allFileTypes/a_txt_file.rtf
new file mode 100644
index 0000000000..6e1243b3b6
--- /dev/null
+++ b/e2e/resources/adf/allFileTypes/a_txt_file.rtf
@@ -0,0 +1,260 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1404\cocoasubrtf470
+{\fonttbl\f0\fnil\fcharset0 Cambria;\f1\froman\fcharset0 Times-Roman;\f2\fnil\fcharset178 GeezaPro;
+\f3\fswiss\fcharset0 Helvetica;\f4\froman\fcharset0 TimesNewRomanPSMT;}
+{\colortbl;\red255\green255\blue255;\red191\green191\blue191;}
+\paperw11900\paperh16840\margl1440\margr1440\vieww10800\viewh8400\viewkind0
+\deftab720
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f0\fs24 \cf0 This is a test document, has a lot of accented/special characters.\
+\
+Special characters:\
+\'b1!@#$%^&*()_+\{\}:\'94|<>?\'a7\'99\'a3-=[];\'92\\,./\
+\
+Arabic characters:\
+
+\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrt\brdrnil \trbrdrl\brdrnil \trbrdrt\brdrnil \trbrdrr\brdrnil 
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx308
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx617
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx925
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx1234
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx1542
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx1851
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx2160
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx2468
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx2777
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx3085
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx3394
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx3702
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx4011
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx4320
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx4628
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx4937
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx5245
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx5554
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx5862
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx6171
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx6480
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx6788
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx7097
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx7405
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx7714
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx8022
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx8331
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx8640
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f1\fs20 \cf0 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2\fs24 \cf0 \'db
+\f3  
+\f2\fs20 \'d9
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d6
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d0
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'ce
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'cb
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'ca
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d4
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d1
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'de
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d5
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'dd
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'da
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d3
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'e4
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'e3
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'e1
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'df
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'ed
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d8
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'cd
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d2
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'e6
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'e5
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'cf
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'cc
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'c8
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2\fs24 \cf0 \'c7
+\f1\fs20 \cell \lastrow\row
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f4\fs24 \cf0 \
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f0 \cf0 French characters:\
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f4 \cf0 \'c0\'e2\'e6\'e7\'e9\'e8\'ea\'eb\'ef\'ee\'f4\'9c\'f9\'fb\'fc\'ff\
+\
+Greek characters: \
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f3 \cf0 \uc0\u940 \u941 \u942 \u943 \u970 \u970 \u912 \u972 \u973 \u971 \u944 \u974 \u952 \u969 \u949 \u961 \u964 \u968 \u965 \u953 \u959 \u960 \u945 \u963 \u948 \u966 \u947 \u951 \u962 \u954 \u955 \u950 \u967 \u958 \u969 \u946 \u957 \u956 
+\f4 \
+\
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f0 \cf0 Polish accented characters:\
+
+\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrt\brdrnil \trbrdrl\brdrnil \trbrdrr\brdrnil 
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx960
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx1920
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx2880
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx3840
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx4800
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx5760
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx6720
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx7680
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx8640
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f1\fs20 \cf0 \uc0\u260 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u262 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u280 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u321 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u323 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \'d3\cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u346 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u377 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u379 \cell \row
+
+\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrt\brdrnil \trbrdrr\brdrnil 
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx960
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx1920
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx2880
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx3840
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx4800
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx5760
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx6720
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx7680
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx8640
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u261 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u263 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u281 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u322 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u324 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \'f3\cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u347 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u378 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u380 \cell \lastrow\row
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f4\fs24 \cf0 \
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f0 \cf0 Spanish accented characters:\
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f4 \cf0 \'e1, \'e9, \'ed, \'f3, \'fa, \'f1, \'d1, \'fc, \'dc, \'bf, \'a1. \'c1, \'c9, \'cd, \'d3, \'da \
+\
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f0 \cf0 Swedish characters:\
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f4 \cf0 \'e4\'e5\'e9\'f6\
+\
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f0 \cf0 \'b1
+\f2 \'c7
+\f4 \'c0
+\f1\fs20  \uc0\u260  \u261 
+\f4\fs24  \'e1\'e4\
+}
\ No newline at end of file
diff --git a/e2e/resources/adf/allFileTypes/a_zip_file.mp4.zip b/e2e/resources/adf/allFileTypes/a_zip_file.mp4.zip
new file mode 100644
index 0000000000..a156c10fe0
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/a_zip_file.mp4.zip differ
diff --git a/e2e/resources/adf/allFileTypes/b_excel_file.xlsx b/e2e/resources/adf/allFileTypes/b_excel_file.xlsx
new file mode 100644
index 0000000000..f24000a548
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/b_excel_file.xlsx differ
diff --git a/e2e/resources/adf/allFileTypes/b_file_supported.pdf b/e2e/resources/adf/allFileTypes/b_file_supported.pdf
new file mode 100644
index 0000000000..7a60b2ee60
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/b_file_supported.pdf differ
diff --git a/e2e/resources/adf/allFileTypes/b_file_unsupported.docx b/e2e/resources/adf/allFileTypes/b_file_unsupported.docx
new file mode 100644
index 0000000000..a7d93d3f96
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/b_file_unsupported.docx differ
diff --git a/e2e/resources/adf/allFileTypes/b_jpg_file.jpg b/e2e/resources/adf/allFileTypes/b_jpg_file.jpg
new file mode 100644
index 0000000000..0d58782ab9
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/b_jpg_file.jpg differ
diff --git a/e2e/resources/adf/allFileTypes/b_mp4_file.mp4 b/e2e/resources/adf/allFileTypes/b_mp4_file.mp4
new file mode 100644
index 0000000000..f7fd0f4ad7
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/b_mp4_file.mp4 differ
diff --git a/e2e/resources/adf/allFileTypes/b_png_file.png b/e2e/resources/adf/allFileTypes/b_png_file.png
new file mode 100644
index 0000000000..e50d31fca3
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/b_png_file.png differ
diff --git a/e2e/resources/adf/allFileTypes/b_ppt_file.pptx b/e2e/resources/adf/allFileTypes/b_ppt_file.pptx
new file mode 100644
index 0000000000..c50b11536b
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/b_ppt_file.pptx differ
diff --git a/e2e/resources/adf/allFileTypes/b_txt_file.rtf b/e2e/resources/adf/allFileTypes/b_txt_file.rtf
new file mode 100644
index 0000000000..6e1243b3b6
--- /dev/null
+++ b/e2e/resources/adf/allFileTypes/b_txt_file.rtf
@@ -0,0 +1,260 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1404\cocoasubrtf470
+{\fonttbl\f0\fnil\fcharset0 Cambria;\f1\froman\fcharset0 Times-Roman;\f2\fnil\fcharset178 GeezaPro;
+\f3\fswiss\fcharset0 Helvetica;\f4\froman\fcharset0 TimesNewRomanPSMT;}
+{\colortbl;\red255\green255\blue255;\red191\green191\blue191;}
+\paperw11900\paperh16840\margl1440\margr1440\vieww10800\viewh8400\viewkind0
+\deftab720
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f0\fs24 \cf0 This is a test document, has a lot of accented/special characters.\
+\
+Special characters:\
+\'b1!@#$%^&*()_+\{\}:\'94|<>?\'a7\'99\'a3-=[];\'92\\,./\
+\
+Arabic characters:\
+
+\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrt\brdrnil \trbrdrl\brdrnil \trbrdrt\brdrnil \trbrdrr\brdrnil 
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx308
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx617
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx925
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx1234
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx1542
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx1851
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx2160
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx2468
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx2777
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx3085
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx3394
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx3702
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx4011
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx4320
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx4628
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx4937
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx5245
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx5554
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx5862
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx6171
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx6480
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx6788
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx7097
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx7405
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx7714
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx8022
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx8331
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx8640
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f1\fs20 \cf0 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2\fs24 \cf0 \'db
+\f3  
+\f2\fs20 \'d9
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d6
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d0
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'ce
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'cb
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'ca
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d4
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d1
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'de
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d5
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'dd
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'da
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d3
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'e4
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'e3
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'e1
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'df
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'ed
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d8
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'cd
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d2
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'e6
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'e5
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'cf
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'cc
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'c8
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2\fs24 \cf0 \'c7
+\f1\fs20 \cell \lastrow\row
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f4\fs24 \cf0 \
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f0 \cf0 French characters:\
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f4 \cf0 \'c0\'e2\'e6\'e7\'e9\'e8\'ea\'eb\'ef\'ee\'f4\'9c\'f9\'fb\'fc\'ff\
+\
+Greek characters: \
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f3 \cf0 \uc0\u940 \u941 \u942 \u943 \u970 \u970 \u912 \u972 \u973 \u971 \u944 \u974 \u952 \u969 \u949 \u961 \u964 \u968 \u965 \u953 \u959 \u960 \u945 \u963 \u948 \u966 \u947 \u951 \u962 \u954 \u955 \u950 \u967 \u958 \u969 \u946 \u957 \u956 
+\f4 \
+\
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f0 \cf0 Polish accented characters:\
+
+\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrt\brdrnil \trbrdrl\brdrnil \trbrdrr\brdrnil 
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx960
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx1920
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx2880
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx3840
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx4800
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx5760
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx6720
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx7680
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx8640
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f1\fs20 \cf0 \uc0\u260 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u262 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u280 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u321 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u323 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \'d3\cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u346 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u377 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u379 \cell \row
+
+\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrt\brdrnil \trbrdrr\brdrnil 
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx960
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx1920
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx2880
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx3840
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx4800
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx5760
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx6720
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx7680
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx8640
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u261 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u263 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u281 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u322 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u324 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \'f3\cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u347 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u378 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u380 \cell \lastrow\row
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f4\fs24 \cf0 \
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f0 \cf0 Spanish accented characters:\
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f4 \cf0 \'e1, \'e9, \'ed, \'f3, \'fa, \'f1, \'d1, \'fc, \'dc, \'bf, \'a1. \'c1, \'c9, \'cd, \'d3, \'da \
+\
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f0 \cf0 Swedish characters:\
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f4 \cf0 \'e4\'e5\'e9\'f6\
+\
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f0 \cf0 \'b1
+\f2 \'c7
+\f4 \'c0
+\f1\fs20  \uc0\u260  \u261 
+\f4\fs24  \'e1\'e4\
+}
\ No newline at end of file
diff --git a/e2e/resources/adf/allFileTypes/b_zip_file.mp4.zip b/e2e/resources/adf/allFileTypes/b_zip_file.mp4.zip
new file mode 100644
index 0000000000..a156c10fe0
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/b_zip_file.mp4.zip differ
diff --git a/e2e/resources/adf/allFileTypes/c_excel_file.xlsx b/e2e/resources/adf/allFileTypes/c_excel_file.xlsx
new file mode 100644
index 0000000000..f24000a548
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/c_excel_file.xlsx differ
diff --git a/e2e/resources/adf/allFileTypes/c_file_supported.pdf b/e2e/resources/adf/allFileTypes/c_file_supported.pdf
new file mode 100644
index 0000000000..7a60b2ee60
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/c_file_supported.pdf differ
diff --git a/e2e/resources/adf/allFileTypes/c_file_unsupported.docx b/e2e/resources/adf/allFileTypes/c_file_unsupported.docx
new file mode 100644
index 0000000000..a7d93d3f96
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/c_file_unsupported.docx differ
diff --git a/e2e/resources/adf/allFileTypes/c_jpg_file.jpg b/e2e/resources/adf/allFileTypes/c_jpg_file.jpg
new file mode 100644
index 0000000000..0d58782ab9
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/c_jpg_file.jpg differ
diff --git a/e2e/resources/adf/allFileTypes/c_mp4_file.mp4 b/e2e/resources/adf/allFileTypes/c_mp4_file.mp4
new file mode 100644
index 0000000000..f7fd0f4ad7
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/c_mp4_file.mp4 differ
diff --git a/e2e/resources/adf/allFileTypes/c_png_file.png b/e2e/resources/adf/allFileTypes/c_png_file.png
new file mode 100644
index 0000000000..e50d31fca3
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/c_png_file.png differ
diff --git a/e2e/resources/adf/allFileTypes/c_ppt_file.pptx b/e2e/resources/adf/allFileTypes/c_ppt_file.pptx
new file mode 100644
index 0000000000..c50b11536b
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/c_ppt_file.pptx differ
diff --git a/e2e/resources/adf/allFileTypes/c_txt_file.rtf b/e2e/resources/adf/allFileTypes/c_txt_file.rtf
new file mode 100644
index 0000000000..6e1243b3b6
--- /dev/null
+++ b/e2e/resources/adf/allFileTypes/c_txt_file.rtf
@@ -0,0 +1,260 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1404\cocoasubrtf470
+{\fonttbl\f0\fnil\fcharset0 Cambria;\f1\froman\fcharset0 Times-Roman;\f2\fnil\fcharset178 GeezaPro;
+\f3\fswiss\fcharset0 Helvetica;\f4\froman\fcharset0 TimesNewRomanPSMT;}
+{\colortbl;\red255\green255\blue255;\red191\green191\blue191;}
+\paperw11900\paperh16840\margl1440\margr1440\vieww10800\viewh8400\viewkind0
+\deftab720
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f0\fs24 \cf0 This is a test document, has a lot of accented/special characters.\
+\
+Special characters:\
+\'b1!@#$%^&*()_+\{\}:\'94|<>?\'a7\'99\'a3-=[];\'92\\,./\
+\
+Arabic characters:\
+
+\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrt\brdrnil \trbrdrl\brdrnil \trbrdrt\brdrnil \trbrdrr\brdrnil 
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx308
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx617
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx925
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx1234
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx1542
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx1851
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx2160
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx2468
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx2777
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx3085
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx3394
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx3702
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx4011
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx4320
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx4628
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx4937
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx5245
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx5554
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx5862
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx6171
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx6480
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx6788
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx7097
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx7405
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx7714
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx8022
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx8331
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx8640
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f1\fs20 \cf0 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2\fs24 \cf0 \'db
+\f3  
+\f2\fs20 \'d9
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d6
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d0
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'ce
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'cb
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'ca
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d4
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d1
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'de
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d5
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'dd
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'da
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d3
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'e4
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'e3
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'e1
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'df
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'ed
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d8
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'cd
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d2
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'e6
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'e5
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'cf
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'cc
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'c8
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2\fs24 \cf0 \'c7
+\f1\fs20 \cell \lastrow\row
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f4\fs24 \cf0 \
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f0 \cf0 French characters:\
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f4 \cf0 \'c0\'e2\'e6\'e7\'e9\'e8\'ea\'eb\'ef\'ee\'f4\'9c\'f9\'fb\'fc\'ff\
+\
+Greek characters: \
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f3 \cf0 \uc0\u940 \u941 \u942 \u943 \u970 \u970 \u912 \u972 \u973 \u971 \u944 \u974 \u952 \u969 \u949 \u961 \u964 \u968 \u965 \u953 \u959 \u960 \u945 \u963 \u948 \u966 \u947 \u951 \u962 \u954 \u955 \u950 \u967 \u958 \u969 \u946 \u957 \u956 
+\f4 \
+\
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f0 \cf0 Polish accented characters:\
+
+\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrt\brdrnil \trbrdrl\brdrnil \trbrdrr\brdrnil 
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx960
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx1920
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx2880
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx3840
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx4800
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx5760
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx6720
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx7680
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx8640
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f1\fs20 \cf0 \uc0\u260 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u262 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u280 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u321 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u323 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \'d3\cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u346 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u377 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u379 \cell \row
+
+\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrt\brdrnil \trbrdrr\brdrnil 
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx960
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx1920
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx2880
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx3840
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx4800
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx5760
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx6720
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx7680
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx8640
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u261 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u263 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u281 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u322 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u324 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \'f3\cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u347 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u378 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u380 \cell \lastrow\row
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f4\fs24 \cf0 \
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f0 \cf0 Spanish accented characters:\
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f4 \cf0 \'e1, \'e9, \'ed, \'f3, \'fa, \'f1, \'d1, \'fc, \'dc, \'bf, \'a1. \'c1, \'c9, \'cd, \'d3, \'da \
+\
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f0 \cf0 Swedish characters:\
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f4 \cf0 \'e4\'e5\'e9\'f6\
+\
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f0 \cf0 \'b1
+\f2 \'c7
+\f4 \'c0
+\f1\fs20  \uc0\u260  \u261 
+\f4\fs24  \'e1\'e4\
+}
\ No newline at end of file
diff --git a/e2e/resources/adf/allFileTypes/c_zip_file.mp4.zip b/e2e/resources/adf/allFileTypes/c_zip_file.mp4.zip
new file mode 100644
index 0000000000..a156c10fe0
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/c_zip_file.mp4.zip differ
diff --git a/e2e/resources/adf/allFileTypes/d_excel_file.xlsx b/e2e/resources/adf/allFileTypes/d_excel_file.xlsx
new file mode 100644
index 0000000000..f24000a548
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/d_excel_file.xlsx differ
diff --git a/e2e/resources/adf/allFileTypes/d_file_supported.pdf b/e2e/resources/adf/allFileTypes/d_file_supported.pdf
new file mode 100644
index 0000000000..7a60b2ee60
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/d_file_supported.pdf differ
diff --git a/e2e/resources/adf/allFileTypes/d_file_unsupported.docx b/e2e/resources/adf/allFileTypes/d_file_unsupported.docx
new file mode 100644
index 0000000000..a7d93d3f96
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/d_file_unsupported.docx differ
diff --git a/e2e/resources/adf/allFileTypes/d_jpg_file.jpg b/e2e/resources/adf/allFileTypes/d_jpg_file.jpg
new file mode 100644
index 0000000000..0d58782ab9
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/d_jpg_file.jpg differ
diff --git a/e2e/resources/adf/allFileTypes/d_mp4_file.mp4 b/e2e/resources/adf/allFileTypes/d_mp4_file.mp4
new file mode 100644
index 0000000000..f7fd0f4ad7
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/d_mp4_file.mp4 differ
diff --git a/e2e/resources/adf/allFileTypes/d_png_file.png b/e2e/resources/adf/allFileTypes/d_png_file.png
new file mode 100644
index 0000000000..e50d31fca3
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/d_png_file.png differ
diff --git a/e2e/resources/adf/allFileTypes/d_ppt_file.pptx b/e2e/resources/adf/allFileTypes/d_ppt_file.pptx
new file mode 100644
index 0000000000..c50b11536b
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/d_ppt_file.pptx differ
diff --git a/e2e/resources/adf/allFileTypes/d_txt_file.rtf b/e2e/resources/adf/allFileTypes/d_txt_file.rtf
new file mode 100644
index 0000000000..6e1243b3b6
--- /dev/null
+++ b/e2e/resources/adf/allFileTypes/d_txt_file.rtf
@@ -0,0 +1,260 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1404\cocoasubrtf470
+{\fonttbl\f0\fnil\fcharset0 Cambria;\f1\froman\fcharset0 Times-Roman;\f2\fnil\fcharset178 GeezaPro;
+\f3\fswiss\fcharset0 Helvetica;\f4\froman\fcharset0 TimesNewRomanPSMT;}
+{\colortbl;\red255\green255\blue255;\red191\green191\blue191;}
+\paperw11900\paperh16840\margl1440\margr1440\vieww10800\viewh8400\viewkind0
+\deftab720
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f0\fs24 \cf0 This is a test document, has a lot of accented/special characters.\
+\
+Special characters:\
+\'b1!@#$%^&*()_+\{\}:\'94|<>?\'a7\'99\'a3-=[];\'92\\,./\
+\
+Arabic characters:\
+
+\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrt\brdrnil \trbrdrl\brdrnil \trbrdrt\brdrnil \trbrdrr\brdrnil 
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx308
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx617
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx925
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx1234
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx1542
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx1851
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx2160
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx2468
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx2777
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx3085
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx3394
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx3702
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx4011
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx4320
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx4628
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx4937
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx5245
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx5554
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx5862
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx6171
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx6480
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx6788
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx7097
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx7405
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx7714
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx8022
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx8331
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx8640
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f1\fs20 \cf0 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2\fs24 \cf0 \'db
+\f3  
+\f2\fs20 \'d9
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d6
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d0
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'ce
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'cb
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'ca
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d4
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d1
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'de
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d5
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'dd
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'da
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d3
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'e4
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'e3
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'e1
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'df
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'ed
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d8
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'cd
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d2
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'e6
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'e5
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'cf
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'cc
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'c8
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2\fs24 \cf0 \'c7
+\f1\fs20 \cell \lastrow\row
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f4\fs24 \cf0 \
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f0 \cf0 French characters:\
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f4 \cf0 \'c0\'e2\'e6\'e7\'e9\'e8\'ea\'eb\'ef\'ee\'f4\'9c\'f9\'fb\'fc\'ff\
+\
+Greek characters: \
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f3 \cf0 \uc0\u940 \u941 \u942 \u943 \u970 \u970 \u912 \u972 \u973 \u971 \u944 \u974 \u952 \u969 \u949 \u961 \u964 \u968 \u965 \u953 \u959 \u960 \u945 \u963 \u948 \u966 \u947 \u951 \u962 \u954 \u955 \u950 \u967 \u958 \u969 \u946 \u957 \u956 
+\f4 \
+\
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f0 \cf0 Polish accented characters:\
+
+\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrt\brdrnil \trbrdrl\brdrnil \trbrdrr\brdrnil 
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx960
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx1920
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx2880
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx3840
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx4800
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx5760
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx6720
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx7680
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx8640
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f1\fs20 \cf0 \uc0\u260 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u262 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u280 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u321 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u323 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \'d3\cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u346 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u377 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u379 \cell \row
+
+\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrt\brdrnil \trbrdrr\brdrnil 
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx960
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx1920
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx2880
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx3840
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx4800
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx5760
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx6720
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx7680
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx8640
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u261 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u263 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u281 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u322 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u324 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \'f3\cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u347 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u378 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u380 \cell \lastrow\row
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f4\fs24 \cf0 \
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f0 \cf0 Spanish accented characters:\
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f4 \cf0 \'e1, \'e9, \'ed, \'f3, \'fa, \'f1, \'d1, \'fc, \'dc, \'bf, \'a1. \'c1, \'c9, \'cd, \'d3, \'da \
+\
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f0 \cf0 Swedish characters:\
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f4 \cf0 \'e4\'e5\'e9\'f6\
+\
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f0 \cf0 \'b1
+\f2 \'c7
+\f4 \'c0
+\f1\fs20  \uc0\u260  \u261 
+\f4\fs24  \'e1\'e4\
+}
\ No newline at end of file
diff --git a/e2e/resources/adf/allFileTypes/d_zip_file.mp4.zip b/e2e/resources/adf/allFileTypes/d_zip_file.mp4.zip
new file mode 100644
index 0000000000..a156c10fe0
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/d_zip_file.mp4.zip differ
diff --git a/e2e/resources/adf/allFileTypes/desktop.ini b/e2e/resources/adf/allFileTypes/desktop.ini
new file mode 100644
index 0000000000..5f1cfce266
--- /dev/null
+++ b/e2e/resources/adf/allFileTypes/desktop.ini
@@ -0,0 +1 @@
+example file
diff --git a/e2e/resources/adf/allFileTypes/e_excel_file.xlsx b/e2e/resources/adf/allFileTypes/e_excel_file.xlsx
new file mode 100644
index 0000000000..f24000a548
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/e_excel_file.xlsx differ
diff --git a/e2e/resources/adf/allFileTypes/e_file_supported.pdf b/e2e/resources/adf/allFileTypes/e_file_supported.pdf
new file mode 100644
index 0000000000..7a60b2ee60
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/e_file_supported.pdf differ
diff --git a/e2e/resources/adf/allFileTypes/e_file_unsupported.docx b/e2e/resources/adf/allFileTypes/e_file_unsupported.docx
new file mode 100644
index 0000000000..a7d93d3f96
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/e_file_unsupported.docx differ
diff --git a/e2e/resources/adf/allFileTypes/e_jpg_file.jpg b/e2e/resources/adf/allFileTypes/e_jpg_file.jpg
new file mode 100644
index 0000000000..0d58782ab9
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/e_jpg_file.jpg differ
diff --git a/e2e/resources/adf/allFileTypes/e_mp4_file.mp4 b/e2e/resources/adf/allFileTypes/e_mp4_file.mp4
new file mode 100644
index 0000000000..f7fd0f4ad7
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/e_mp4_file.mp4 differ
diff --git a/e2e/resources/adf/allFileTypes/e_png_file.png b/e2e/resources/adf/allFileTypes/e_png_file.png
new file mode 100644
index 0000000000..e50d31fca3
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/e_png_file.png differ
diff --git a/e2e/resources/adf/allFileTypes/e_ppt_file.pptx b/e2e/resources/adf/allFileTypes/e_ppt_file.pptx
new file mode 100644
index 0000000000..c50b11536b
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/e_ppt_file.pptx differ
diff --git a/e2e/resources/adf/allFileTypes/e_txt_file.rtf b/e2e/resources/adf/allFileTypes/e_txt_file.rtf
new file mode 100644
index 0000000000..6e1243b3b6
--- /dev/null
+++ b/e2e/resources/adf/allFileTypes/e_txt_file.rtf
@@ -0,0 +1,260 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1404\cocoasubrtf470
+{\fonttbl\f0\fnil\fcharset0 Cambria;\f1\froman\fcharset0 Times-Roman;\f2\fnil\fcharset178 GeezaPro;
+\f3\fswiss\fcharset0 Helvetica;\f4\froman\fcharset0 TimesNewRomanPSMT;}
+{\colortbl;\red255\green255\blue255;\red191\green191\blue191;}
+\paperw11900\paperh16840\margl1440\margr1440\vieww10800\viewh8400\viewkind0
+\deftab720
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f0\fs24 \cf0 This is a test document, has a lot of accented/special characters.\
+\
+Special characters:\
+\'b1!@#$%^&*()_+\{\}:\'94|<>?\'a7\'99\'a3-=[];\'92\\,./\
+\
+Arabic characters:\
+
+\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrt\brdrnil \trbrdrl\brdrnil \trbrdrt\brdrnil \trbrdrr\brdrnil 
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx308
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx617
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx925
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx1234
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx1542
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx1851
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx2160
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx2468
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx2777
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx3085
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx3394
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx3702
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx4011
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx4320
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx4628
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx4937
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx5245
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx5554
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx5862
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx6171
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx6480
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx6788
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx7097
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx7405
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx7714
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx8022
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx8331
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx8640
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f1\fs20 \cf0 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2\fs24 \cf0 \'db
+\f3  
+\f2\fs20 \'d9
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d6
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d0
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'ce
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'cb
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'ca
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d4
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d1
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'de
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d5
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'dd
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'da
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d3
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'e4
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'e3
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'e1
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'df
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'ed
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d8
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'cd
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'d2
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'e6
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'e5
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'cf
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'cc
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2 \cf0 \'c8
+\f1 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f2\fs24 \cf0 \'c7
+\f1\fs20 \cell \lastrow\row
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f4\fs24 \cf0 \
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f0 \cf0 French characters:\
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f4 \cf0 \'c0\'e2\'e6\'e7\'e9\'e8\'ea\'eb\'ef\'ee\'f4\'9c\'f9\'fb\'fc\'ff\
+\
+Greek characters: \
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f3 \cf0 \uc0\u940 \u941 \u942 \u943 \u970 \u970 \u912 \u972 \u973 \u971 \u944 \u974 \u952 \u969 \u949 \u961 \u964 \u968 \u965 \u953 \u959 \u960 \u945 \u963 \u948 \u966 \u947 \u951 \u962 \u954 \u955 \u950 \u967 \u958 \u969 \u946 \u957 \u956 
+\f4 \
+\
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f0 \cf0 Polish accented characters:\
+
+\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrt\brdrnil \trbrdrl\brdrnil \trbrdrr\brdrnil 
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx960
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx1920
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx2880
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx3840
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx4800
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx5760
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx6720
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx7680
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx8640
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+
+\f1\fs20 \cf0 \uc0\u260 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u262 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u280 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u321 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u323 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \'d3\cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u346 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u377 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u379 \cell \row
+
+\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrt\brdrnil \trbrdrr\brdrnil 
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx960
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx1920
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx2880
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx3840
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx4800
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx5760
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx6720
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx7680
+\clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw20\brdrcf2 \clbrdrl\brdrs\brdrw20\brdrcf2 \clbrdrb\brdrs\brdrw20\brdrcf2 \clbrdrr\brdrs\brdrw20\brdrcf2 \clpadl100 \clpadr100 \gaph\cellx8640
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u261 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u263 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u281 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u322 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u324 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \'f3\cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u347 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u378 \cell 
+\pard\intbl\itap1\pardeftab720\ri720\qc\partightenfactor0
+\cf0 \uc0\u380 \cell \lastrow\row
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f4\fs24 \cf0 \
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f0 \cf0 Spanish accented characters:\
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f4 \cf0 \'e1, \'e9, \'ed, \'f3, \'fa, \'f1, \'d1, \'fc, \'dc, \'bf, \'a1. \'c1, \'c9, \'cd, \'d3, \'da \
+\
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f0 \cf0 Swedish characters:\
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f4 \cf0 \'e4\'e5\'e9\'f6\
+\
+\pard\pardeftab720\ri720\partightenfactor0
+
+\f0 \cf0 \'b1
+\f2 \'c7
+\f4 \'c0
+\f1\fs20  \uc0\u260  \u261 
+\f4\fs24  \'e1\'e4\
+}
\ No newline at end of file
diff --git a/e2e/resources/adf/allFileTypes/e_zip_file.mp4.zip b/e2e/resources/adf/allFileTypes/e_zip_file.mp4.zip
new file mode 100644
index 0000000000..a156c10fe0
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/e_zip_file.mp4.zip differ
diff --git a/e2e/resources/adf/allFileTypes/file400Bytes.txt b/e2e/resources/adf/allFileTypes/file400Bytes.txt
new file mode 100644
index 0000000000..7a40fb1825
--- /dev/null
+++ b/e2e/resources/adf/allFileTypes/file400Bytes.txt
@@ -0,0 +1 @@
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
\ No newline at end of file
diff --git a/e2e/resources/adf/allFileTypes/file_unsupported.3DS b/e2e/resources/adf/allFileTypes/file_unsupported.3DS
new file mode 100755
index 0000000000..be21d11425
--- /dev/null
+++ b/e2e/resources/adf/allFileTypes/file_unsupported.3DS
@@ -0,0 +1 @@
+��
\ No newline at end of file
diff --git a/e2e/resources/adf/allFileTypes/file_unsupported.pages b/e2e/resources/adf/allFileTypes/file_unsupported.pages
new file mode 100644
index 0000000000..a64a96b68e
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/file_unsupported.pages differ
diff --git a/e2e/resources/adf/allFileTypes/pdf_all_properties.pdf b/e2e/resources/adf/allFileTypes/pdf_all_properties.pdf
new file mode 100644
index 0000000000..9202d665ec
Binary files /dev/null and b/e2e/resources/adf/allFileTypes/pdf_all_properties.pdf differ
diff --git a/e2e/resources/adf/allFileTypes/testExtension.test b/e2e/resources/adf/allFileTypes/testExtension.test
new file mode 100644
index 0000000000..b7bd1f38e1
--- /dev/null
+++ b/e2e/resources/adf/allFileTypes/testExtension.test
@@ -0,0 +1 @@
+test extension
\ No newline at end of file
diff --git a/e2e/resources/adf/allFileTypes/zeroBytesFile.txt b/e2e/resources/adf/allFileTypes/zeroBytesFile.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/e2e/resources/adf/folderExcluded/a_file.txt b/e2e/resources/adf/folderExcluded/a_file.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/e2e/resources/adf/folderOne/share_profile_pic.png b/e2e/resources/adf/folderOne/share_profile_pic.png
new file mode 100644
index 0000000000..1e4aece6ef
Binary files /dev/null and b/e2e/resources/adf/folderOne/share_profile_pic.png differ
diff --git a/e2e/resources/adf/folderTwo/a_file.txt b/e2e/resources/adf/folderTwo/a_file.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/e2e/resources/adf/share_profile_pic.jpg b/e2e/resources/adf/share_profile_pic.jpg
new file mode 100644
index 0000000000..c47bdb43cb
Binary files /dev/null and b/e2e/resources/adf/share_profile_pic.jpg differ
diff --git a/e2e/resources/adf/share_profile_pic.png b/e2e/resources/adf/share_profile_pic.png
new file mode 100644
index 0000000000..1e4aece6ef
Binary files /dev/null and b/e2e/resources/adf/share_profile_pic.png differ
diff --git a/e2e/resources/apps/App_with_processes.zip b/e2e/resources/apps/App_with_processes.zip
new file mode 100644
index 0000000000..b7e06bc565
Binary files /dev/null and b/e2e/resources/apps/App_with_processes.zip differ
diff --git a/e2e/resources/apps/Simple App with User Form.zip b/e2e/resources/apps/Simple App with User Form.zip
new file mode 100644
index 0000000000..377f7cf08f
Binary files /dev/null and b/e2e/resources/apps/Simple App with User Form.zip differ
diff --git a/e2e/resources/apps/SimpleAppWithUserForm.png b/e2e/resources/apps/SimpleAppWithUserForm.png
new file mode 100644
index 0000000000..06ec8b8116
Binary files /dev/null and b/e2e/resources/apps/SimpleAppWithUserForm.png differ
diff --git a/e2e/resources/apps/TestDate.zip b/e2e/resources/apps/TestDate.zip
new file mode 100644
index 0000000000..9a1074d39a
Binary files /dev/null and b/e2e/resources/apps/TestDate.zip differ
diff --git a/e2e/resources/apps/Widgets smoke test.zip b/e2e/resources/apps/Widgets smoke test.zip
new file mode 100644
index 0000000000..1bdc6cae52
Binary files /dev/null and b/e2e/resources/apps/Widgets smoke test.zip differ
diff --git a/e2e/restAPI/ACS/PeopleAPI.js b/e2e/restAPI/ACS/PeopleAPI.js
new file mode 100644
index 0000000000..1505920007
--- /dev/null
+++ b/e2e/restAPI/ACS/PeopleAPI.js
@@ -0,0 +1,134 @@
+/*!
+ * @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 request = require('request');
+var RequestCoreAPI = require('./RequestUtil/RequestCoreAPI');
+var url = require('url-join');
+var path = require('path');
+var fs = require('fs');
+var TestConfig = require('../../test.config');
+
+var peopleBaseUrl = 'people';
+
+
+function read(initialFile) {
+    return new Promise(function (resolve, reject) {
+        fs.readFile(initialFile, function (err, file) {
+            if (err) {
+                //console.log('read error', err);
+                reject(err);
+            }
+
+            // console.log('read success', file);
+            resolve(file);
+        })
+    })
+}
+
+function write(file, uri, header) {
+    return new Promise(function (resolve, reject) {
+        request.put({url: uri, headers: header, body: file}, function (err, httpResponse, body) {
+            if (err) {
+                console.error('updated failed:', err);
+                reject(err);
+            }
+            var json_data = JSON.parse(body);
+
+            // console.log('write success', json_data);
+            resolve(body);
+        });
+    });
+}
+
+/**
+ * Update avatar using API
+ *
+ * @param requestUserModel {User that makes the request}
+ * @param fileModel
+ * @param personId
+ * @method updateAvatarViaAPI
+ */
+exports.updateAvatarViaAPI = function (requestUserModel, fileModel, personId) {
+
+    var absolutePath = path.resolve(path.join(TestConfig.main.rootPath, fileModel.getLocation()));
+    var uri = url(RequestCoreAPI.getBaseURL(), peopleBaseUrl, personId, "avatar");
+    // console.debug("Update avatar via API: fileName=" + fileModel.getName() + " uri=" + uri + " auth=" + requestUserModel.id + " password: " + requestUserModel.password);
+
+    var allHeaders = RequestCoreAPI.requestHeaders(requestUserModel);
+    allHeaders['Content-Type'] = 'application/octet-stream';
+
+    return read(absolutePath)
+        .then(function (file) {
+            return write(file, uri, allHeaders);
+        });
+};
+
+/**
+ * Get avatar using API
+ *
+ * @param requestUserModel {User that makes the request}
+ * @param personId
+ * @method getAvatarViaAPIWithRetry
+ */
+exports.getAvatarViaAPI = function (retry, requestUserModel, personId, callback) {
+    var uri = url(RequestCoreAPI.getBaseURL(), peopleBaseUrl, personId, "avatar");
+
+    // console.debug("Get avatar via API: uri= " + uri + " auth=" + requestUserModel.id + " password: " + requestUserModel.password);
+
+    function run() {
+        request.get({
+            url: uri,
+            headers: RequestCoreAPI.requestHeaders(requestUserModel)
+        }, function (error, httpResponse, body) {
+            retry--;
+            var statusCode = httpResponse.statusCode;
+            // console.log("status code: " + statusCode);
+            if (statusCode != "200" && retry > 0) {
+                run();
+            }
+            else if (typeof callback === 'function') {
+                callback.apply(null);
+            }
+        });
+    }
+
+    run();
+};
+
+/**
+ * Delete avatar using API
+ *
+ * @param requestUserModel {User that makes the request}
+ * @param personId
+ * @param callback
+ */
+exports.deleteAvatarViaAPI = function (requestUserModel, personId, callback) {
+
+    var uri = url(RequestCoreAPI.getBaseURL(), peopleBaseUrl, personId, "avatar");
+
+    request.del({url: uri, headers: RequestCoreAPI.requestHeaders(requestUserModel)}, function (error, response, body) {
+        if (error) {
+            return console.error('delete failed:', error);
+        }
+        // console.debug("Avatar deleted via API: " + " uri=" + uri + " auth=" + requestUserModel.id + " password: " + requestUserModel.password);
+
+        if (typeof callback === 'function') {
+            callback.apply(null);
+        }
+    });
+};
diff --git a/e2e/restAPI/ACS/RequestUtil/RequestCoreAPI.js b/e2e/restAPI/ACS/RequestUtil/RequestCoreAPI.js
new file mode 100644
index 0000000000..db5dbc72f2
--- /dev/null
+++ b/e2e/restAPI/ACS/RequestUtil/RequestCoreAPI.js
@@ -0,0 +1,32 @@
+/*!
+ * @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 url = require('url-join');
+var APIUtils = require('../../../restAPI/APIUtil');
+var CONSTANTS = require('../../../util/constants');
+
+var ACMBaseURL = '/alfresco/versions/1';
+
+exports.getBaseURL = function () {
+    return url(new APIUtils().getBaseURL(CONSTANTS.APPLICATION.ADF_ACS), ACMBaseURL);
+};
+
+exports.requestHeaders = function (auth) {
+    return {
+        'Authorization': new APIUtils().getAuthorization(auth.id, auth.password)
+    };
+};
diff --git a/e2e/restAPI/APIUtil.js b/e2e/restAPI/APIUtil.js
new file mode 100644
index 0000000000..3bbdebbae5
--- /dev/null
+++ b/e2e/restAPI/APIUtil.js
@@ -0,0 +1,63 @@
+/*!
+ * @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 url = require('url-join');
+var TestConfig = require('../test.config');
+
+var APIUtils = function () {
+    /**
+     * Return Basic authorization
+     *
+     * @param user
+     * @param password
+     * @returns Basic authorization
+     */
+    this.getAuthorization = function (user, password) {
+        return 'Basic ' + Buffer.from(user + ':' + password).toString('base64');
+    };
+
+    /**

+     * Return any application base URL

+     * <protocol>://<hostname>:<port>/<pathname>

+     *
+     * @param application - any application declared in config file: main or adf

+     * @param urlComponentsParam - Object with details required to define the baseURL

+     * {

+      *      protocol: "http",

+      *      hostname: "localhost",

+      *      port: "8080"

+      * }

+     * If urlComponents empty {}, the default test configuration values are set

+     */
+    this.getBaseURL = function (application, urlComponentsParam) {
+        var urlComponents = {};
+        urlComponents.protocol = TestConfig[application].protocol;
+        urlComponents.hostname = TestConfig[application].host;
+        urlComponents.port = TestConfig[application].port;
+        urlComponents.path = TestConfig[application].apiContextRoot;
+        Object.assign(urlComponents, urlComponentsParam);
+
+        return url(urlComponents.protocol
+            + "://" + urlComponents.hostname
+            + (urlComponents.port !== "" ? ":" + urlComponents.port : ""),
+            urlComponents.path);
+    };
+
+};
+
+module.exports = APIUtils;
+
diff --git a/e2e/restAPI/httpRequest/BasicAuthorization.js b/e2e/restAPI/httpRequest/BasicAuthorization.js
new file mode 100644
index 0000000000..f64f3f9c08
--- /dev/null
+++ b/e2e/restAPI/httpRequest/BasicAuthorization.js
@@ -0,0 +1,27 @@
+/*!
+ * @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 BasicAuthorization = function (user, password) {
+    this.user = user;
+    this.password = password;
+
+    this.displayCredentials = function () {
+        // console.info("Basic Authorization: " + user + "(" + password + ")");
+    }
+};
+
+module.exports = BasicAuthorization;
diff --git a/e2e/restAPI/httpRequest/HTTPRequestBase.js b/e2e/restAPI/httpRequest/HTTPRequestBase.js
new file mode 100644
index 0000000000..55d10ea14e
--- /dev/null
+++ b/e2e/restAPI/httpRequest/HTTPRequestBase.js
@@ -0,0 +1,32 @@
+/*!
+ * @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 HTTPRequestBase = function(host, rootPath, requestMethod, uri, dataSet, port) {
+    this.host = host;
+
+    if (!port) {
+        port = "";
+    }
+
+    this.port = port;
+    this.rootPath = rootPath;
+    this.requestMethod = requestMethod;
+    this.uri = uri;
+    this.dataSet = dataSet;
+};
+
+module.exports = HTTPRequestBase;
diff --git a/lib/content-services/search/response-facet-query.interface.ts b/e2e/restAPI/httpRequest/HTTPRequestPublic.js
similarity index 83%
rename from lib/content-services/search/response-facet-query.interface.ts
rename to e2e/restAPI/httpRequest/HTTPRequestPublic.js
index 2a6df4149f..62b977f97c 100644
--- a/lib/content-services/search/response-facet-query.interface.ts
+++ b/e2e/restAPI/httpRequest/HTTPRequestPublic.js
@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 
-export interface ResponseFacetQuery {
-    label: string;
-    mincount: number;
-
-    $checked?: boolean;
+var HTTPRequestPublic = function(authorization) {
+    this.authorization = authorization;
 }
+
+module.exports = HTTPRequestPublic;
diff --git a/e2e/test.config.js b/e2e/test.config.js
new file mode 100644
index 0000000000..0183937f1b
--- /dev/null
+++ b/e2e/test.config.js
@@ -0,0 +1,106 @@
+/**
+ * Contains the default app deployment settings
+ * @class config.test.config
+ */
+
+var HOST = process.env.URL_HOST_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;
+
+module.exports = {
+
+    main: {
+        timeout: TIMEOUT,
+
+        presence_timeout: 60000,
+
+        rootPath: __dirname
+    },
+
+    adf: {
+        /**
+         * base
+         */
+        url: "http://" + HOST,
+
+        /**
+         * adf port
+         */
+        port: "",
+
+        /**
+         * adf login
+         */
+        login: "/login",
+
+        /**
+         * admin username
+         */
+        adminUser: USERNAME,
+
+        /**
+         * main admin email
+         */
+        adminEmail: EMAIL,
+
+        /**
+         * main admin password
+         */
+        adminPassword: PASSWORD
+    },
+
+    adf_acs: {
+        /**

+         * The protocol where the app runs.

+         * @config main.protocol {String}

+         */
+        protocol: "http",
+
+        /**

+         * The protocol where the app runs.

+         * @config main.protocol {String}

+         */
+        host: HOST,
+
+        /**

+         * * The port where the app runs.

+         * * @config main.port {String}

+         * */
+        port: "",
+
+        /**


+         * The ECM API context required for calls


+         * @config adf.ACSAPIContextRoot {String}


+         */
+        apiContextRoot: "/alfresco/api/-default-/public",
+    },
+
+    adf_aps: {
+        /**

+         * The protocol where the app runs.

+         * @config main.protocol {String}

+         */
+        protocol: "http",
+
+        /**

+         * The host where the app runs.

+         * @config main.host {String}

+         */
+        host: HOST,
+
+        /**

+         * * The port where the app runs.

+         * * @config main.port {String}

+         * */
+        port: "",
+
+        /**


+         * The BPM API context required for calls


+         * @config adf.APSAPIContextRoot {String}


+         */
+        apiContextRoot: "/activiti-app"
+    }
+
+};
diff --git a/e2e/tsconfig.e2e.json b/e2e/tsconfig.e2e.json
new file mode 100644
index 0000000000..1d9e5edf09
--- /dev/null
+++ b/e2e/tsconfig.e2e.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/e2e",
+    "baseUrl": "./",
+    "module": "commonjs",
+    "target": "es5",
+    "types": [
+      "jasmine",
+      "jasminewd2",
+      "node"
+    ]
+  }
+}
diff --git a/e2e/util/constants.js b/e2e/util/constants.js
new file mode 100644
index 0000000000..1b6d88c134
--- /dev/null
+++ b/e2e/util/constants.js
@@ -0,0 +1,129 @@
+/*!
+ * @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 = {};
+
+/**
+ *Rest API Response statusCodes
+ */
+exports.HTTP_RESPONSE_STATUS_CODE = {
+    FORBIDDEN: 403,
+    OK: 200,
+    BAD_REQUEST: 400,
+    INTERNAL_SERVER_ERROR: 500,
+    UNAUTHORIZED: 401,
+    NOT_FOUND: 404
+};
+
+/**
+ *Rest API Response Messages
+ */
+exports.HTTP_RESPONSE_STATUS = {
+    OK: {
+        'CODE': 200,
+        'MESSAGE': 'OK'
+    },
+    CREATED: {
+        'CODE': 201,
+        'MESSAGE': 'Created'
+    },
+    NO_CONTENT: {
+        'CODE': 204,
+        'MESSAGE': 'No Content'
+    },
+    NOT_FOUND: {
+        'CODE': 404,
+        'MESSAGE': 'Not Found'
+    }
+};
+
+/**
+ *Rest API HTTP content types
+ */
+exports.HTTP_CONTENT_TYPE = {
+    JSON: 'application/json',
+    URLENCODED: 'application/x-www-form-urlencoded',
+    IMAGE_PNG: 'image/png',
+    TEXT: 'text/csv'
+};
+
+exports.APPLICATION = {
+    ADF_APS: 'adf_aps',
+    ADF_ACS: 'adf_acs',
+    APS: 'main'
+};
+
+exports.TASKFILTERS = {
+    MY_TASKS: 'My Tasks',
+    INV_TASKS: 'Involved Tasks',
+    QUE_TASKS: 'Queued Tasks',
+    COMPL_TASKS: 'Completed Tasks'
+};
+
+exports.TASKDETAILS = {
+    NO_FORM: 'No form',
+    NO_PARENT: 'No parent',
+    NO_DATE: 'No date',
+    NO_CATEGORY: 'No category'
+};
+
+exports.TASKSTATUS = {
+    RUNNING: 'Running'
+};
+
+exports.THEMING = {
+    PINK_BLUE_DARK: "Pink Bluegrey Dark",
+    DEFAULT_PASSWORD_ICON_COLOR: "rgba(0, 0, 0, 0.87)",
+    DEFAULT_LOGIN_BUTTON_COLOR: "rgba(0, 0, 0, 0.38)",
+    DEFAULT_BACKGROUND_COLOR: "rgba(0, 0, 0, 0.87)",
+    PINK_BLUE_DARK_PASSWORD_ICON_COLOR: "rgba(255, 255, 255, 1)",
+    PINK_BLUE_DARK_LOGIN_BUTTON_COLOR: "rgba(255, 255, 255, 0.87)",
+    PINK_BLUE_DARK_BACKGROUND_COLOR: "rgba(255, 255, 255, 1)",
+};
+
+exports.APP_COLOR = {
+    BLUE: "rgba(38, 154, 188, 1)",
+    GREY: "rgba(105, 108, 103, 1)",
+    ORANGE: "rgba(250, 185, 108, 1)"
+};
+
+exports.APP_ICON = {
+    FAVORITE: "favorite_border",
+    UNIT: "ac_unit"
+};
+
+exports.PROCESSENDDATE = "No date";
+
+exports.PROCESSCATEGORY = "http://www.activiti.org/processdef";
+
+exports.PROCESSBUSINESSKEY = "None";
+
+exports.PROCESSDESCRIPTION = "No description";
+
+exports.PROCESSDATEFORMAT = "mmm dd yyyy";
+
+exports.PROCESSSTATUS = {
+    RUNNING: 'Running',
+    COMPLETED: 'Completed'
+};
+
+exports.CS_USER_ROLES = {
+    CONSUMER: 'SiteConsumer',
+    COLLABORATOR: 'SiteCollaborator',
+    CONTRIBUTOR: 'SiteContributor',
+    MANAGER: 'SiteManager'
+};
diff --git a/e2e/util/resources.js b/e2e/util/resources.js
new file mode 100644
index 0000000000..b9533ec1a9
--- /dev/null
+++ b/e2e/util/resources.js
@@ -0,0 +1,251 @@
+/*!
+ * @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.
+ */
+
+
+/**
+ * Provides resources used throughout the application
+ *
+ * @class util.Resources
+ */
+var exports = module.exports = {};
+
+exports.Files = {
+
+    APP_WITH_DATE_FIELD_FORM: {
+        file_location: "/resources/apps/TestDate.zip",
+        title: "TestDate",
+        process_title: "TestDateField",
+        id: -1,
+        form_fields: {
+            testdate_field: "activiti-testdate",
+            completed_task_date_field: "span[ng-if*='field.dateDisplayFormat']"
+        }
+    },
+
+    APP_WITH_PROCESSES:{
+        file_location:"/resources/apps/App_with_processes.zip",
+        title: "App_with_processes",
+        description: "Description for app",
+        process_se_name: "process_with_se",
+        task_name: "Task Test 2"
+    },
+
+    SIMPLE_APP: {
+        file_location: "/resources/Simple App.zip",
+        title: "Simple App",
+        id: -18,
+        process_definitions: null,
+        start_form: null
+    },
+
+    SIMPLE_APP_WITH_USER_FORM: {
+        file_location: "/resources/apps/Simple App with User Form.zip",
+        title: "Simple App with User Form",
+        processName: "Simple Process",
+        processDiagramFileLocation: '/resources/apps/SimpleAppWithUserForm.png',
+        processThumbnail: '/resources/processes/Simple Process Thumbnail.png',
+        formName: "Simple form",
+        id: -19,
+        taskName: "User Task",
+        form_fields: {
+            text_field: "activiti-textfield",
+            form_fieldId: "textfield",
+            text_field_value: "Hi tester, from Rest call"
+        }
+    },
+
+    WIDGETS_SMOKE_TEST: {
+        file_location: "/resources/apps/Widgets smoke test.zip",
+        formName: "Widgets smoke test",
+        form_fields: {
+            text_id: "text",
+            header_id: "header",
+            number_id: "number",
+            amount_id: "amount",
+            people_id: "people",
+            group_id: "groupofpeople",
+            multiline_id: "multilinetext",
+            typeahead_id: "typeahead",
+            displaytext_id: "displaytext",
+            displayvalue_id: "displayvalue",
+            hyperlink_id: "hyperlink",
+            attachfolder_id: "attachfolder",
+            attachfile_id: "attachfile",
+            date_id: "date",
+            dateTime_id: "dateandtime",
+            checkbox_id: "checkbox",
+            dropdown_id: "dropdown",
+            dropdown_value: "mat-select[id='dropdown'] span span",
+            radiobuttons_id: "radiobuttons",
+            dynamictable_id: "dynamictable"
+        }
+    },
+
+    ADF_DOCUMENTS: {
+        PDF: {
+            file_location: "/resources/adf/allFileTypes/a_file_supported.pdf",
+            file_name: "a_file_supported.pdf",
+            short_file_name: "a_file",
+            first_page_text: "A Journey into Test Frameworks",
+            second_page_text: "After looking into Spock’s GitHub",
+            last_page_text: "and provide feedback. The main advantages being the readability of the te",
+            last_page_number: "8"
+        },
+        PDF_B: {
+            file_location: "/resources/adf/allFileTypes/b_file_supported.pdf",
+            file_name: "b_file_supported.pdf"
+        },
+        PDF_C: {
+            file_location: "/resources/adf/allFileTypes/c_file_supported.pdf",
+            file_name: "c_file_supported.pdf"
+        },
+        PDF_D: {
+            file_location: "/resources/adf/allFileTypes/d_file_supported.pdf",
+            file_name: "d_file_supported.pdf"
+        },
+        PDF_ALL: {
+            file_location: "/resources/adf/allFileTypes/pdf_all_properties.pdf",
+            file_name: "pdf_all_properties.pdf"
+        },
+        PDF_PROTECTED: {
+            file_location: "/resources/adf/allFileTypes/a_file_protected.pdf",
+            file_name: "a_file_protected.pdf",
+            first_page_text: "A Journey into Test Frameworks",
+            second_page_text: "After looking into Spock’s GitHub",
+            last_page_text: "and provide feedback. The main advantages being the readability of the te",
+            last_page_number: "8",
+            password: "1q2w3e4r"
+        },
+        LARGE_FILE:{
+            file_location: "/resources/adf/BigFile.zip",
+            file_name: "BigFile.zip"
+        },
+        EXCEL: {
+            file_location: "/resources/adf/allFileTypes/a_excel_file.xlsx",
+            file_name: "a_excel_file.xlsx"
+        },
+        DOCX_SUPPORTED: {
+            file_location: "/resources/adf/allFileTypes/a_file_supported.docx",
+            file_name: "a_file_supported.docx",
+            first_page_text: "A Journey into Test Frameworks",
+            second_page_text: "After looking into Spock’s GitHub",
+            last_page_text: "and provide feedback. The main advantages being the readability of the te",
+            last_page_number: "8"
+        },
+        DOCX: {
+            file_location: "/resources/adf/allFileTypes/a_file_unsupported.docx",
+            file_name: "a_file_unsupported.docx"
+        },
+        FOLDER_ONE: {
+            folder_location: "/resources/adf/folderOne",
+            folder_name: "folderOne"
+        },
+        FOLDER_TWO: {
+            folder_location: "/resources/adf/folderTwo",
+            folder_name: "folderTwo"
+        },
+        FOLDER_EXCLUDED: {
+            folder_location: "/resources/adf/folderExcluded",
+            folder_name: "folderExcluded"
+        },
+        FILE_INSIDE_FOLDER_ONE: {
+            file_location: "/resources/adf/folderOne/share_profile_pic.png",
+            file_name: "share_profile_pic.png"
+        },
+        FILE_INSIDE_FOLDER_TWO: {
+            file_location: "/resources/adf/folderOne/a_file.txt",
+            file_name: "a_file.txt"
+        },
+        JPG: {
+            file_location: "/resources/adf/allFileTypes/a_jpg_file.jpg",
+            file_name: "a_jpg_file.jpg"
+        },
+        MP4: {
+            file_location: "/resources/adf/allFileTypes/a_mp4_file.mp4",
+            file_name: "a_mp4_file.mp4"
+        },
+        PNG: {
+            file_location: "/resources/adf/allFileTypes/a_png_file.png",
+            file_name: "a_png_file.png"
+        },
+        PNG_B: {
+            file_location: "/resources/adf/allFileTypes/b_png_file.png",
+            file_name: "b_png_file.png"
+        },
+        PNG_C: {
+            file_location: "/resources/adf/allFileTypes/c_png_file.png",
+            file_name: "c_png_file.png"
+        },
+        PNG_D: {
+            file_location: "/resources/adf/allFileTypes/d_png_file.png",
+            file_name: "d_png_file.png"
+        },
+        PPT: {
+            file_location: "/resources/adf/allFileTypes/a_ppt_file.pptx",
+            file_name: "a_ppt_file.pptx",
+            first_page_text: "PPTX test file"
+        },
+        PPT_B: {
+            file_location: "/resources/adf/allFileTypes/b_ppt_file.pptx",
+            file_name: "b_ppt_file.pptx"
+        },
+        TEST: {
+            file_location: "/resources/adf/allFileTypes/testExtension.test",
+            file_name: "testExtension.test"
+        },
+        TXT: {
+            file_location: "/resources/adf/allFileTypes/a_txt_file.rtf",
+            file_name: "a_txt_file.rtf"
+        },
+        TXT_400B: {
+            file_location: "/resources/adf/allFileTypes/file400Bytes.txt",
+            file_name: "file400Bytes.txt"
+        },
+        TXT_0B: {
+            file_location: "/resources/adf/allFileTypes/zeroBytesFile.txt",
+            file_name: "zeroBytesFile.txt"
+        },
+        ZIP: {
+            file_location: "/resources/adf/allFileTypes/a_zip_file.mp4.zip",
+            file_name: "a_zip_file.mp4.zip"
+        },
+        PAGES:{
+            file_location: "/resources/adf/allFileTypes/file_unsupported.pages",
+            file_name: "file_unsupported.pages"
+        },
+        UNSUPPORTED:{
+            file_location: "/resources/adf/allFileTypes/file_unsupported.3DS",
+            file_name: "file_unsupported.3DS"
+        },
+        INI:{
+            file_location: "/resources/adf/allFileTypes/desktop.ini",
+            file_name: "desktop.ini"
+        }
+    },
+
+    PROFILE_IMAGES: {
+        ECM: {
+            file_location: "/resources/adf/share_profile_pic.jpg",
+            file_name: "share_profile_pic.jpg"
+        },
+        BPM: {
+            file_location: "/resources/adf/activiti_profile_pic.png",
+            file_name: "activiti_profile_pic.png"
+        }
+    }
+
+};
diff --git a/e2e/util/util.js b/e2e/util/util.js
new file mode 100644
index 0000000000..1a68346796
--- /dev/null
+++ b/e2e/util/util.js
@@ -0,0 +1,519 @@
+/*!
+ * @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 remote = require('selenium-webdriver/remote');
+
+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) {
+    browser.setFileDetector(new remote.FileDetector());
+
+    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);
+};
+
+/**
+ * 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 generateSeqeunceFiles
+ */
+exports.generateSeqeunceFiles = 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/integration/base_ver_2_app/package-lock.json b/integration/base_ver_2_app/package-lock.json
new file mode 100644
index 0000000000..7120ca3df7
--- /dev/null
+++ b/integration/base_ver_2_app/package-lock.json
@@ -0,0 +1,11916 @@
+{
+  "name": "adf-cli-acs-aps-template",
+  "version": "2.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@alfresco/adf-content-services": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-2.0.0.tgz",
+      "integrity": "sha512-GuD5fyYzm7ZEs1+f7wzQxabGoVsFRIvLS5ZHkml6yQrUv01zjzTt85+zcpDhYiW4NY7F+2JgoyMN4+YXfop8XA==",
+      "requires": {
+        "@alfresco/adf-core": "2.0.0",
+        "@angular/animations": "5.0.0",
+        "@angular/cdk": "5.0.0-rc0",
+        "@angular/common": "5.0.0",
+        "@angular/compiler": "5.0.0",
+        "@angular/core": "5.0.0",
+        "@angular/flex-layout": "2.0.0-beta.10",
+        "@angular/forms": "5.0.0",
+        "@angular/http": "5.0.0",
+        "@angular/material": "5.0.0-rc0",
+        "@angular/material-moment-adapter": "5.1.1",
+        "@angular/platform-browser": "5.0.0",
+        "@angular/platform-browser-dynamic": "5.0.0",
+        "@angular/router": "5.0.0",
+        "@ngx-translate/core": "8.0.0",
+        "alfresco-js-api": "2.0.0",
+        "chart.js": "2.5.0",
+        "core-js": "2.4.1",
+        "hammerjs": "2.0.8",
+        "minimatch": "3.0.4",
+        "moment": "2.15.2",
+        "ng2-charts": "1.6.0",
+        "pdfjs-dist": "1.5.404",
+        "raphael": "2.2.7",
+        "reflect-metadata": "0.1.10",
+        "rxjs": "5.5.2",
+        "systemjs": "0.19.27",
+        "zone.js": "0.8.14"
+      },
+      "dependencies": {
+        "@angular/animations": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.0.0.tgz",
+          "integrity": "sha1-ta0ZnGf5P3WVREd+/+ZnnhVJkfs=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/cdk": {
+          "version": "5.0.0-rc0",
+          "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-5.0.0-rc0.tgz",
+          "integrity": "sha512-wZg/mzHisiTieVt7Q/YNPB+r07PHvjoAT3+0mwyIP7wuC00W8BJLPhTZd/tIM5q7Nd69kuA1HSx1qLkcmlCZkw==",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/common": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.0.0.tgz",
+          "integrity": "sha1-+W1mpRe5ldG6mygwnxXC41lnWCU=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/compiler": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.0.0.tgz",
+          "integrity": "sha1-uf+/GMijnYt9rOxHMZOpDiTMK8k=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/core": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.0.0.tgz",
+          "integrity": "sha1-T5dqIl993fNJkvLK2CTJVDpG9Mg=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/flex-layout": {
+          "version": "2.0.0-beta.10",
+          "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-2.0.0-beta.10.tgz",
+          "integrity": "sha512-Y4f+Gw8pjDBwb9IykSTGiYRfVyzLfzTxFvRzKuDYEGUFi2UG3zOmAr2OzkpA/+K4mE5zQ+hYkBJaJD+DXAd/6w==",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/forms": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.0.0.tgz",
+          "integrity": "sha1-x/3fo1OWdZrphSkgowzdqMQe0d4=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/http": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/http/-/http-5.0.0.tgz",
+          "integrity": "sha1-Byiivgz7sHhyfF64fUyF1T/smlE=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/material": {
+          "version": "5.0.0-rc0",
+          "resolved": "https://registry.npmjs.org/@angular/material/-/material-5.0.0-rc0.tgz",
+          "integrity": "sha512-ZW9gy3c8l2NbFfX9DRYSW+i67pPoL9DZoMCb16STQlhdDfwwAWNpjGF0etXkXw30hDnRCMGVVJVU+45cNXJspA==",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/platform-browser": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.0.0.tgz",
+          "integrity": "sha1-xwOPfN6AcFtiAUiXIx4YLuyXb+0=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/platform-browser-dynamic": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.0.0.tgz",
+          "integrity": "sha1-iH4QbIsQOwQVz2FWpCXabYP0yJ0=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/router": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/router/-/router-5.0.0.tgz",
+          "integrity": "sha1-/ktSGmc4QIvOMPk6U0mRQMk6T3Y=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@ngx-translate/core": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-8.0.0.tgz",
+          "integrity": "sha1-dR/WtRLYDzp0jS3o38lt/vopr+A="
+        },
+        "alfresco-js-api": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.0.0.tgz",
+          "integrity": "sha512-BQgHq10PCFBcRwCyqUp4GuvUh/acJxKc2GF59mT7uQ7xEPwDH0mkmXotFjuUVw1qAJYQVn/3YxO0ezxa6ph31A==",
+          "requires": {
+            "event-emitter": "0.3.4",
+            "superagent": "3.4.1"
+          }
+        },
+        "moment": {
+          "version": "2.15.2",
+          "resolved": "https://registry.npmjs.org/moment/-/moment-2.15.2.tgz",
+          "integrity": "sha1-G/3t9qbjRfMi/pVtXfW9CKjOhNw="
+        },
+        "rxjs": {
+          "version": "5.5.2",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.2.tgz",
+          "integrity": "sha512-oRYoIKWBU3Ic37fLA5VJu31VqQO4bWubRntcHSJ+cwaDQBwdnZ9x4zmhJfm/nFQ2E82/I4loSioHnACamrKGgA==",
+          "requires": {
+            "symbol-observable": "1.2.0"
+          }
+        },
+        "superagent": {
+          "version": "3.4.1",
+          "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.4.1.tgz",
+          "integrity": "sha1-S9EnQSJNDs5tn3V/HDvsvn8kwRU=",
+          "requires": {
+            "component-emitter": "1.2.1",
+            "cookiejar": "2.1.2",
+            "debug": "2.6.9",
+            "extend": "3.0.2",
+            "form-data": "2.3.2",
+            "formidable": "1.2.1",
+            "methods": "1.1.2",
+            "mime": "1.6.0",
+            "qs": "6.5.2",
+            "readable-stream": "2.3.6"
+          }
+        }
+      }
+    },
+    "@alfresco/adf-core": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-2.0.0.tgz",
+      "integrity": "sha512-BOBV6XbnrnnZ7/C2jk9kzSMQCzP301JmEHB8hraFHC0oKGIgozxLEXBcX448aX0yORllQaFS2b2Mmqe2U7i/Tg==",
+      "requires": {
+        "@angular/animations": "5.0.0",
+        "@angular/cdk": "5.0.0-rc0",
+        "@angular/common": "5.0.0",
+        "@angular/compiler": "5.0.0",
+        "@angular/core": "5.0.0",
+        "@angular/flex-layout": "2.0.0-beta.10",
+        "@angular/forms": "5.0.0",
+        "@angular/http": "5.0.0",
+        "@angular/material": "5.0.0-rc0",
+        "@angular/material-moment-adapter": "5.1.1",
+        "@angular/platform-browser": "5.0.0",
+        "@angular/platform-browser-dynamic": "5.0.0",
+        "@angular/router": "5.0.0",
+        "@ngx-translate/core": "8.0.0",
+        "alfresco-js-api": "2.0.0",
+        "chart.js": "2.5.0",
+        "core-js": "2.4.1",
+        "hammerjs": "2.0.8",
+        "minimatch": "3.0.4",
+        "moment": "2.15.2",
+        "ng2-charts": "1.6.0",
+        "pdfjs-dist": "1.5.404",
+        "raphael": "2.2.7",
+        "reflect-metadata": "0.1.10",
+        "rxjs": "5.5.2",
+        "systemjs": "0.19.27",
+        "zone.js": "0.8.14"
+      },
+      "dependencies": {
+        "@angular/animations": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.0.0.tgz",
+          "integrity": "sha1-ta0ZnGf5P3WVREd+/+ZnnhVJkfs=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/cdk": {
+          "version": "5.0.0-rc0",
+          "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-5.0.0-rc0.tgz",
+          "integrity": "sha512-wZg/mzHisiTieVt7Q/YNPB+r07PHvjoAT3+0mwyIP7wuC00W8BJLPhTZd/tIM5q7Nd69kuA1HSx1qLkcmlCZkw==",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/common": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.0.0.tgz",
+          "integrity": "sha1-+W1mpRe5ldG6mygwnxXC41lnWCU=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/compiler": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.0.0.tgz",
+          "integrity": "sha1-uf+/GMijnYt9rOxHMZOpDiTMK8k=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/core": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.0.0.tgz",
+          "integrity": "sha1-T5dqIl993fNJkvLK2CTJVDpG9Mg=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/flex-layout": {
+          "version": "2.0.0-beta.10",
+          "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-2.0.0-beta.10.tgz",
+          "integrity": "sha512-Y4f+Gw8pjDBwb9IykSTGiYRfVyzLfzTxFvRzKuDYEGUFi2UG3zOmAr2OzkpA/+K4mE5zQ+hYkBJaJD+DXAd/6w==",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/forms": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.0.0.tgz",
+          "integrity": "sha1-x/3fo1OWdZrphSkgowzdqMQe0d4=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/http": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/http/-/http-5.0.0.tgz",
+          "integrity": "sha1-Byiivgz7sHhyfF64fUyF1T/smlE=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/material": {
+          "version": "5.0.0-rc0",
+          "resolved": "https://registry.npmjs.org/@angular/material/-/material-5.0.0-rc0.tgz",
+          "integrity": "sha512-ZW9gy3c8l2NbFfX9DRYSW+i67pPoL9DZoMCb16STQlhdDfwwAWNpjGF0etXkXw30hDnRCMGVVJVU+45cNXJspA==",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/platform-browser": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.0.0.tgz",
+          "integrity": "sha1-xwOPfN6AcFtiAUiXIx4YLuyXb+0=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/platform-browser-dynamic": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.0.0.tgz",
+          "integrity": "sha1-iH4QbIsQOwQVz2FWpCXabYP0yJ0=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/router": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/router/-/router-5.0.0.tgz",
+          "integrity": "sha1-/ktSGmc4QIvOMPk6U0mRQMk6T3Y=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@ngx-translate/core": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-8.0.0.tgz",
+          "integrity": "sha1-dR/WtRLYDzp0jS3o38lt/vopr+A="
+        },
+        "alfresco-js-api": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.0.0.tgz",
+          "integrity": "sha512-BQgHq10PCFBcRwCyqUp4GuvUh/acJxKc2GF59mT7uQ7xEPwDH0mkmXotFjuUVw1qAJYQVn/3YxO0ezxa6ph31A==",
+          "requires": {
+            "event-emitter": "0.3.4",
+            "superagent": "3.4.1"
+          }
+        },
+        "moment": {
+          "version": "2.15.2",
+          "resolved": "https://registry.npmjs.org/moment/-/moment-2.15.2.tgz",
+          "integrity": "sha1-G/3t9qbjRfMi/pVtXfW9CKjOhNw="
+        },
+        "rxjs": {
+          "version": "5.5.2",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.2.tgz",
+          "integrity": "sha512-oRYoIKWBU3Ic37fLA5VJu31VqQO4bWubRntcHSJ+cwaDQBwdnZ9x4zmhJfm/nFQ2E82/I4loSioHnACamrKGgA==",
+          "requires": {
+            "symbol-observable": "1.2.0"
+          }
+        },
+        "superagent": {
+          "version": "3.4.1",
+          "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.4.1.tgz",
+          "integrity": "sha1-S9EnQSJNDs5tn3V/HDvsvn8kwRU=",
+          "requires": {
+            "component-emitter": "1.2.1",
+            "cookiejar": "2.1.2",
+            "debug": "2.6.9",
+            "extend": "3.0.2",
+            "form-data": "2.3.2",
+            "formidable": "1.2.1",
+            "methods": "1.1.2",
+            "mime": "1.6.0",
+            "qs": "6.5.2",
+            "readable-stream": "2.3.6"
+          }
+        }
+      }
+    },
+    "@alfresco/adf-insights": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-insights/-/adf-insights-2.0.1.tgz",
+      "integrity": "sha512-gJs9weO7mJMU/DsUjWMHX0pGA5XwkXFpfWsgOP+g3U64hlwY7oWIkXtr6zjTmGnBwiNJNFT1e+5uHz6ED4Pbog==",
+      "requires": {
+        "@alfresco/adf-core": "2.0.0",
+        "@angular/animations": "5.0.0",
+        "@angular/cdk": "5.0.0-rc0",
+        "@angular/common": "5.0.0",
+        "@angular/compiler": "5.0.0",
+        "@angular/core": "5.0.0",
+        "@angular/flex-layout": "2.0.0-beta.10",
+        "@angular/forms": "5.0.0",
+        "@angular/http": "5.0.0",
+        "@angular/material": "5.0.0-rc0",
+        "@angular/material-moment-adapter": "5.1.1",
+        "@angular/platform-browser": "5.0.0",
+        "@angular/platform-browser-dynamic": "5.0.0",
+        "@angular/router": "5.0.0",
+        "@ngx-translate/core": "8.0.0",
+        "alfresco-js-api": "2.0.0",
+        "chart.js": "2.5.0",
+        "core-js": "2.4.1",
+        "hammerjs": "2.0.8",
+        "minimatch": "3.0.4",
+        "moment": "2.15.2",
+        "ng2-charts": "1.6.0",
+        "pdfjs-dist": "1.5.404",
+        "raphael": "2.2.7",
+        "reflect-metadata": "0.1.10",
+        "rxjs": "5.5.2",
+        "systemjs": "0.19.27",
+        "zone.js": "0.8.14"
+      },
+      "dependencies": {
+        "@angular/animations": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.0.0.tgz",
+          "integrity": "sha1-ta0ZnGf5P3WVREd+/+ZnnhVJkfs=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/cdk": {
+          "version": "5.0.0-rc0",
+          "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-5.0.0-rc0.tgz",
+          "integrity": "sha512-wZg/mzHisiTieVt7Q/YNPB+r07PHvjoAT3+0mwyIP7wuC00W8BJLPhTZd/tIM5q7Nd69kuA1HSx1qLkcmlCZkw==",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/common": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.0.0.tgz",
+          "integrity": "sha1-+W1mpRe5ldG6mygwnxXC41lnWCU=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/compiler": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.0.0.tgz",
+          "integrity": "sha1-uf+/GMijnYt9rOxHMZOpDiTMK8k=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/core": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.0.0.tgz",
+          "integrity": "sha1-T5dqIl993fNJkvLK2CTJVDpG9Mg=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/flex-layout": {
+          "version": "2.0.0-beta.10",
+          "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-2.0.0-beta.10.tgz",
+          "integrity": "sha512-Y4f+Gw8pjDBwb9IykSTGiYRfVyzLfzTxFvRzKuDYEGUFi2UG3zOmAr2OzkpA/+K4mE5zQ+hYkBJaJD+DXAd/6w==",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/forms": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.0.0.tgz",
+          "integrity": "sha1-x/3fo1OWdZrphSkgowzdqMQe0d4=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/http": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/http/-/http-5.0.0.tgz",
+          "integrity": "sha1-Byiivgz7sHhyfF64fUyF1T/smlE=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/material": {
+          "version": "5.0.0-rc0",
+          "resolved": "https://registry.npmjs.org/@angular/material/-/material-5.0.0-rc0.tgz",
+          "integrity": "sha512-ZW9gy3c8l2NbFfX9DRYSW+i67pPoL9DZoMCb16STQlhdDfwwAWNpjGF0etXkXw30hDnRCMGVVJVU+45cNXJspA==",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/platform-browser": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.0.0.tgz",
+          "integrity": "sha1-xwOPfN6AcFtiAUiXIx4YLuyXb+0=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/platform-browser-dynamic": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.0.0.tgz",
+          "integrity": "sha1-iH4QbIsQOwQVz2FWpCXabYP0yJ0=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/router": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/router/-/router-5.0.0.tgz",
+          "integrity": "sha1-/ktSGmc4QIvOMPk6U0mRQMk6T3Y=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@ngx-translate/core": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-8.0.0.tgz",
+          "integrity": "sha1-dR/WtRLYDzp0jS3o38lt/vopr+A="
+        },
+        "alfresco-js-api": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.0.0.tgz",
+          "integrity": "sha512-BQgHq10PCFBcRwCyqUp4GuvUh/acJxKc2GF59mT7uQ7xEPwDH0mkmXotFjuUVw1qAJYQVn/3YxO0ezxa6ph31A==",
+          "requires": {
+            "event-emitter": "0.3.4",
+            "superagent": "3.4.1"
+          }
+        },
+        "moment": {
+          "version": "2.15.2",
+          "resolved": "https://registry.npmjs.org/moment/-/moment-2.15.2.tgz",
+          "integrity": "sha1-G/3t9qbjRfMi/pVtXfW9CKjOhNw="
+        },
+        "rxjs": {
+          "version": "5.5.2",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.2.tgz",
+          "integrity": "sha512-oRYoIKWBU3Ic37fLA5VJu31VqQO4bWubRntcHSJ+cwaDQBwdnZ9x4zmhJfm/nFQ2E82/I4loSioHnACamrKGgA==",
+          "requires": {
+            "symbol-observable": "1.2.0"
+          }
+        },
+        "superagent": {
+          "version": "3.4.1",
+          "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.4.1.tgz",
+          "integrity": "sha1-S9EnQSJNDs5tn3V/HDvsvn8kwRU=",
+          "requires": {
+            "component-emitter": "1.2.1",
+            "cookiejar": "2.1.2",
+            "debug": "2.6.9",
+            "extend": "3.0.2",
+            "form-data": "2.3.2",
+            "formidable": "1.2.1",
+            "methods": "1.1.2",
+            "mime": "1.6.0",
+            "qs": "6.5.2",
+            "readable-stream": "2.3.6"
+          }
+        }
+      }
+    },
+    "@alfresco/adf-process-services": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-process-services/-/adf-process-services-2.0.0.tgz",
+      "integrity": "sha512-nhx+xdrY+bBv47/W2XUoAkWJUFin6iPNSUzeFhAI2vDtYmupKfDtScKTIsjXREwjDZM8H5OJPzXz9hewprY1Mg==",
+      "requires": {
+        "@alfresco/adf-core": "2.0.0",
+        "@angular/animations": "5.0.0",
+        "@angular/cdk": "5.0.0-rc0",
+        "@angular/common": "5.0.0",
+        "@angular/compiler": "5.0.0",
+        "@angular/core": "5.0.0",
+        "@angular/flex-layout": "2.0.0-beta.10",
+        "@angular/forms": "5.0.0",
+        "@angular/http": "5.0.0",
+        "@angular/material": "5.0.0-rc0",
+        "@angular/material-moment-adapter": "5.1.1",
+        "@angular/platform-browser": "5.0.0",
+        "@angular/platform-browser-dynamic": "5.0.0",
+        "@angular/router": "5.0.0",
+        "@ngx-translate/core": "8.0.0",
+        "alfresco-js-api": "2.0.0",
+        "chart.js": "2.5.0",
+        "core-js": "2.4.1",
+        "hammerjs": "2.0.8",
+        "minimatch": "3.0.4",
+        "moment": "2.15.2",
+        "ng2-charts": "1.6.0",
+        "pdfjs-dist": "1.5.404",
+        "raphael": "2.2.7",
+        "reflect-metadata": "0.1.10",
+        "rxjs": "5.5.2",
+        "systemjs": "0.19.27",
+        "zone.js": "0.8.14"
+      },
+      "dependencies": {
+        "@angular/animations": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.0.0.tgz",
+          "integrity": "sha1-ta0ZnGf5P3WVREd+/+ZnnhVJkfs=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/cdk": {
+          "version": "5.0.0-rc0",
+          "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-5.0.0-rc0.tgz",
+          "integrity": "sha512-wZg/mzHisiTieVt7Q/YNPB+r07PHvjoAT3+0mwyIP7wuC00W8BJLPhTZd/tIM5q7Nd69kuA1HSx1qLkcmlCZkw==",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/common": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.0.0.tgz",
+          "integrity": "sha1-+W1mpRe5ldG6mygwnxXC41lnWCU=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/compiler": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.0.0.tgz",
+          "integrity": "sha1-uf+/GMijnYt9rOxHMZOpDiTMK8k=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/core": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.0.0.tgz",
+          "integrity": "sha1-T5dqIl993fNJkvLK2CTJVDpG9Mg=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/flex-layout": {
+          "version": "2.0.0-beta.10",
+          "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-2.0.0-beta.10.tgz",
+          "integrity": "sha512-Y4f+Gw8pjDBwb9IykSTGiYRfVyzLfzTxFvRzKuDYEGUFi2UG3zOmAr2OzkpA/+K4mE5zQ+hYkBJaJD+DXAd/6w==",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/forms": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.0.0.tgz",
+          "integrity": "sha1-x/3fo1OWdZrphSkgowzdqMQe0d4=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/http": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/http/-/http-5.0.0.tgz",
+          "integrity": "sha1-Byiivgz7sHhyfF64fUyF1T/smlE=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/material": {
+          "version": "5.0.0-rc0",
+          "resolved": "https://registry.npmjs.org/@angular/material/-/material-5.0.0-rc0.tgz",
+          "integrity": "sha512-ZW9gy3c8l2NbFfX9DRYSW+i67pPoL9DZoMCb16STQlhdDfwwAWNpjGF0etXkXw30hDnRCMGVVJVU+45cNXJspA==",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/platform-browser": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.0.0.tgz",
+          "integrity": "sha1-xwOPfN6AcFtiAUiXIx4YLuyXb+0=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/platform-browser-dynamic": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.0.0.tgz",
+          "integrity": "sha1-iH4QbIsQOwQVz2FWpCXabYP0yJ0=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@angular/router": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/@angular/router/-/router-5.0.0.tgz",
+          "integrity": "sha1-/ktSGmc4QIvOMPk6U0mRQMk6T3Y=",
+          "requires": {
+            "tslib": "1.9.3"
+          }
+        },
+        "@ngx-translate/core": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-8.0.0.tgz",
+          "integrity": "sha1-dR/WtRLYDzp0jS3o38lt/vopr+A="
+        },
+        "alfresco-js-api": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.0.0.tgz",
+          "integrity": "sha512-BQgHq10PCFBcRwCyqUp4GuvUh/acJxKc2GF59mT7uQ7xEPwDH0mkmXotFjuUVw1qAJYQVn/3YxO0ezxa6ph31A==",
+          "requires": {
+            "event-emitter": "0.3.4",
+            "superagent": "3.4.1"
+          }
+        },
+        "moment": {
+          "version": "2.15.2",
+          "resolved": "https://registry.npmjs.org/moment/-/moment-2.15.2.tgz",
+          "integrity": "sha1-G/3t9qbjRfMi/pVtXfW9CKjOhNw="
+        },
+        "rxjs": {
+          "version": "5.5.2",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.2.tgz",
+          "integrity": "sha512-oRYoIKWBU3Ic37fLA5VJu31VqQO4bWubRntcHSJ+cwaDQBwdnZ9x4zmhJfm/nFQ2E82/I4loSioHnACamrKGgA==",
+          "requires": {
+            "symbol-observable": "1.2.0"
+          }
+        },
+        "superagent": {
+          "version": "3.4.1",
+          "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.4.1.tgz",
+          "integrity": "sha1-S9EnQSJNDs5tn3V/HDvsvn8kwRU=",
+          "requires": {
+            "component-emitter": "1.2.1",
+            "cookiejar": "2.1.2",
+            "debug": "2.6.9",
+            "extend": "3.0.2",
+            "form-data": "2.3.2",
+            "formidable": "1.2.1",
+            "methods": "1.1.2",
+            "mime": "1.6.0",
+            "qs": "6.5.2",
+            "readable-stream": "2.3.6"
+          }
+        }
+      }
+    },
+    "@angular-devkit/build-optimizer": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.3.2.tgz",
+      "integrity": "sha512-U0BCZtThq5rUfY08shHXpxe8ZhSsiYB/cJjUvAWRTs/ORrs8pbngS6xwseQws8d/vHoVrtqGD9GU9h8AmFRERQ==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "1.1.0",
+        "source-map": "0.5.7",
+        "typescript": "2.6.2",
+        "webpack-sources": "1.1.0"
+      }
+    },
+    "@angular-devkit/core": {
+      "version": "0.0.28",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.0.28.tgz",
+      "integrity": "sha512-rfGRVdpx080zZq9NGZ3RNG+cmoq/ZPaCzpM4dAbosEM46ficUkwr/JKjhjZUUoSyb9ItrT1lp9C33GfE/YpSVQ==",
+      "dev": true,
+      "requires": {
+        "ajv": "5.5.2",
+        "chokidar": "1.7.0",
+        "rxjs": "5.5.11",
+        "source-map": "0.5.7"
+      },
+      "dependencies": {
+        "rxjs": {
+          "version": "5.5.11",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.11.tgz",
+          "integrity": "sha512-3bjO7UwWfA2CV7lmwYMBzj4fQ6Cq+ftHc2MvUe+WMS7wcdJ1LosDWmdjPQanYp2dBRj572p7PeU81JUxHKOcBA==",
+          "dev": true,
+          "requires": {
+            "symbol-observable": "1.0.1"
+          }
+        },
+        "symbol-observable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
+          "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=",
+          "dev": true
+        }
+      }
+    },
+    "@angular-devkit/schematics": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.3.2.tgz",
+      "integrity": "sha512-B6zZoqvHaTJy+vVdA6EtlxnCdGMa5elCa4j9lQLC3JI8DLvMXUWkCIPVbPzJ/GSRR9nsKWpvYMYaJyfBDUqfhw==",
+      "dev": true,
+      "requires": {
+        "@ngtools/json-schema": "1.2.0",
+        "rxjs": "5.5.11"
+      },
+      "dependencies": {
+        "rxjs": {
+          "version": "5.5.11",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.11.tgz",
+          "integrity": "sha512-3bjO7UwWfA2CV7lmwYMBzj4fQ6Cq+ftHc2MvUe+WMS7wcdJ1LosDWmdjPQanYp2dBRj572p7PeU81JUxHKOcBA==",
+          "dev": true,
+          "requires": {
+            "symbol-observable": "1.0.1"
+          }
+        },
+        "symbol-observable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
+          "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=",
+          "dev": true
+        }
+      }
+    },
+    "@angular/animations": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.1.1.tgz",
+      "integrity": "sha512-PHLBWDnAzr5b5l52pk5ZYmv/6m0YUe2ICwu5dmbS0d8Kf5dXadMphAWCDbljMF+djGyZeFq2/dQ/t7ygYl3YuA==",
+      "requires": {
+        "tslib": "1.9.3"
+      }
+    },
+    "@angular/cdk": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-5.1.1.tgz",
+      "integrity": "sha512-V8kQmwf1PhtxiiE0cS1x9SW7/VFrJ7LcL9RqxUOMmJMl8kVR43dQBEeuVOOYJlGo9LAR5ctfemlJHwd9+PoHew==",
+      "requires": {
+        "tslib": "1.9.3"
+      }
+    },
+    "@angular/cli": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-1.7.4.tgz",
+      "integrity": "sha512-URdb1QtnQf+Ievy93wjq7gE81s25BkWUwJFPey+YkphBA3G1lbCAQPiEh2pntBwaIKavgEuCw+Sf2YZdgTVhDA==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/build-optimizer": "0.3.2",
+        "@angular-devkit/core": "0.3.2",
+        "@angular-devkit/schematics": "0.3.2",
+        "@ngtools/json-schema": "1.2.0",
+        "@ngtools/webpack": "1.10.2",
+        "@schematics/angular": "0.3.2",
+        "@schematics/package-update": "0.3.2",
+        "ajv": "6.5.2",
+        "autoprefixer": "7.2.6",
+        "cache-loader": "1.2.2",
+        "chalk": "2.2.2",
+        "circular-dependency-plugin": "4.4.0",
+        "clean-css": "4.2.0",
+        "common-tags": "1.8.0",
+        "copy-webpack-plugin": "4.4.3",
+        "core-object": "3.1.5",
+        "denodeify": "1.2.1",
+        "ember-cli-string-utils": "1.1.0",
+        "extract-text-webpack-plugin": "3.0.2",
+        "file-loader": "1.1.11",
+        "fs-extra": "4.0.3",
+        "glob": "7.1.2",
+        "html-webpack-plugin": "2.30.1",
+        "istanbul-instrumenter-loader": "3.0.1",
+        "karma-source-map-support": "1.3.0",
+        "less": "2.7.3",
+        "less-loader": "4.1.0",
+        "license-webpack-plugin": "1.4.0",
+        "loader-utils": "1.1.0",
+        "lodash": "4.17.10",
+        "memory-fs": "0.4.1",
+        "minimatch": "3.0.4",
+        "node-modules-path": "1.0.1",
+        "node-sass": "4.9.2",
+        "nopt": "4.0.1",
+        "opn": "5.1.0",
+        "portfinder": "1.0.13",
+        "postcss": "6.0.23",
+        "postcss-import": "11.1.0",
+        "postcss-loader": "2.1.6",
+        "postcss-url": "7.3.2",
+        "raw-loader": "0.5.1",
+        "resolve": "1.8.1",
+        "rxjs": "5.5.11",
+        "sass-loader": "6.0.7",
+        "semver": "5.5.0",
+        "silent-error": "1.1.0",
+        "source-map-support": "0.4.18",
+        "style-loader": "0.19.1",
+        "stylus": "0.54.5",
+        "stylus-loader": "3.0.2",
+        "uglifyjs-webpack-plugin": "1.2.7",
+        "url-loader": "0.6.2",
+        "webpack": "3.11.0",
+        "webpack-dev-middleware": "1.12.2",
+        "webpack-dev-server": "2.11.2",
+        "webpack-merge": "4.1.4",
+        "webpack-sources": "1.1.0",
+        "webpack-subresource-integrity": "1.0.4"
+      },
+      "dependencies": {
+        "@angular-devkit/core": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.3.2.tgz",
+          "integrity": "sha512-zABk/iP7YX5SVbmK4e+IX7j2d0D37MQJQiKgWdV3JzfvVJhNJzddiirtT980pIafoq+KyvTgVwXtc+vnux0oeQ==",
+          "dev": true,
+          "requires": {
+            "ajv": "5.5.2",
+            "chokidar": "1.7.0",
+            "rxjs": "5.5.11",
+            "source-map": "0.5.7"
+          },
+          "dependencies": {
+            "ajv": {
+              "version": "5.5.2",
+              "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+              "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+              "dev": true,
+              "requires": {
+                "co": "4.6.0",
+                "fast-deep-equal": "1.1.0",
+                "fast-json-stable-stringify": "2.0.0",
+                "json-schema-traverse": "0.3.1"
+              }
+            }
+          }
+        },
+        "ajv": {
+          "version": "6.5.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.2.tgz",
+          "integrity": "sha512-hOs7GfvI6tUI1LfZddH82ky6mOMyTuY0mk7kE2pWpmhhUSkumzaTO5vbVwij39MdwPQWCV4Zv57Eo06NtL/GVA==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "2.0.1",
+            "fast-json-stable-stringify": "2.0.0",
+            "json-schema-traverse": "0.4.1",
+            "uri-js": "4.2.2"
+          },
+          "dependencies": {
+            "fast-deep-equal": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+              "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+              "dev": true
+            },
+            "json-schema-traverse": {
+              "version": "0.4.1",
+              "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+              "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+              "dev": true
+            }
+          }
+        },
+        "rxjs": {
+          "version": "5.5.11",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.11.tgz",
+          "integrity": "sha512-3bjO7UwWfA2CV7lmwYMBzj4fQ6Cq+ftHc2MvUe+WMS7wcdJ1LosDWmdjPQanYp2dBRj572p7PeU81JUxHKOcBA==",
+          "dev": true,
+          "requires": {
+            "symbol-observable": "1.0.1"
+          }
+        },
+        "symbol-observable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
+          "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=",
+          "dev": true
+        }
+      }
+    },
+    "@angular/common": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.1.1.tgz",
+      "integrity": "sha512-SFRzdDthoiKaMLuV+TAwjKXFWwTRFGuidlWC3BhUf8/HzNSePAdvfdQcqbEaE5buMn403OV105S9Tyx5tILQeA==",
+      "requires": {
+        "tslib": "1.9.3"
+      }
+    },
+    "@angular/compiler": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.1.1.tgz",
+      "integrity": "sha512-k4J2kRiBjtjkDcDut2JVUpqQGLJWd8j3Don+swzZHuEklbLmsVRGM6u/fmH0K9TMwKHtC5Ycap8kj4bWXUYfwg==",
+      "requires": {
+        "tslib": "1.9.3"
+      }
+    },
+    "@angular/compiler-cli": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-5.1.1.tgz",
+      "integrity": "sha512-X3n1V0fAsZzJDRLM2OPiOri8rrQ2ILFS0VDqPdHMa1HbpF0ZKe1Yyux2rhGSbS83a1Eanx6RqfDkrUalKEprbw==",
+      "dev": true,
+      "requires": {
+        "chokidar": "1.7.0",
+        "minimist": "1.2.0",
+        "reflect-metadata": "0.1.10",
+        "tsickle": "0.25.6"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
+    "@angular/core": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.1.1.tgz",
+      "integrity": "sha512-8HJ0lNM5Z+pf+JfOl5mAWgNfrdtnMhVcEGCEniJAQweKOfYCziuyB0ALkX/Q6jGmd2IshR36SarwCYEc5ttt/w==",
+      "requires": {
+        "tslib": "1.9.3"
+      }
+    },
+    "@angular/flex-layout": {
+      "version": "2.0.0-beta.12",
+      "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-2.0.0-beta.12.tgz",
+      "integrity": "sha512-QTOKZxehYTh8fj64V/pNVWNbfNtebSbssyMIXiGJuHTzfyF7GYdRmtjoR2pNpllycz3rE5NYX77EB140Y6BCnw==",
+      "requires": {
+        "tslib": "1.9.3"
+      }
+    },
+    "@angular/forms": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.1.1.tgz",
+      "integrity": "sha512-4iN/8N0DgnV82XIb/8PqlFIGrog8BHJlzQ9sdAlpT29biPFezFpqpsXkjLBouBc7oBFTgoyXMgWDj8IGRmwLGQ==",
+      "requires": {
+        "tslib": "1.9.3"
+      }
+    },
+    "@angular/http": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@angular/http/-/http-5.1.1.tgz",
+      "integrity": "sha512-oeiLX00TaFlGS5Y4EAGnxxVitN8T9X8olhSC+XDDAAL3JHTAyh4dj7me8vNZk1VaqPFa9AXu4D34vu1Zsm0c1g==",
+      "requires": {
+        "tslib": "1.9.3"
+      }
+    },
+    "@angular/language-service": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-5.0.0.tgz",
+      "integrity": "sha1-bMu2n0dXJw3QTsWFfTdjSy8CxAw=",
+      "dev": true
+    },
+    "@angular/material": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@angular/material/-/material-5.1.1.tgz",
+      "integrity": "sha512-RC3xkbX35daNq4w+XBmm+Vgi16TJvLbSkw5xkdxCqLSysFx9ymwDOjUbLeHt2nJtvYWvnSjuVukdSAeaBknTFg==",
+      "requires": {
+        "tslib": "1.9.3"
+      }
+    },
+    "@angular/material-moment-adapter": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-5.1.1.tgz",
+      "integrity": "sha512-1wpISrZOHmcC2o0tmOHX2Lt726WFUZxQs0iYe3x2yHVuxoV2W8gy0unfPkSyaZQ9v68o9xQ3DQEhSByPhr0tZg==",
+      "requires": {
+        "tslib": "1.9.3"
+      }
+    },
+    "@angular/platform-browser": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.1.1.tgz",
+      "integrity": "sha512-QpkNXoO2pqURQJxXPhZo6RFeirKbr56O0SwoMpYfXGGN1qEIicoWZHobCUTp7/jvjx5Xjc7886Fvu/qJrE7wVA==",
+      "requires": {
+        "tslib": "1.9.3"
+      }
+    },
+    "@angular/platform-browser-dynamic": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.1.1.tgz",
+      "integrity": "sha512-xnin1eK5nF7EO4tYZvRlhT28DyhL3p4NKWsZQwfqyBwSF0T2mJ1vjhjCZVT0MmaOyt5D+0eUkHIhBDqeZyBMMQ==",
+      "requires": {
+        "tslib": "1.9.3"
+      }
+    },
+    "@angular/router": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-5.1.1.tgz",
+      "integrity": "sha512-96mBZS1b1Dt7HFOGKh5zI/1U6F3zT4cdjIaBmcCKkbyKhs3WRAPXxxCkuCwr6lWmBeQt4iEvSdXiHQbD0iCG7Q==",
+      "requires": {
+        "tslib": "1.9.3"
+      }
+    },
+    "@mat-datetimepicker/core": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@mat-datetimepicker/core/-/core-2.0.1.tgz",
+      "integrity": "sha1-4NsdtdTPe6Vrck7AQIF8totXdfI=",
+      "requires": {
+        "tslib": "1.9.3"
+      }
+    },
+    "@mat-datetimepicker/moment": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@mat-datetimepicker/moment/-/moment-2.0.1.tgz",
+      "integrity": "sha1-Yr0WQ23j2ds9roFyEYNMMpqdhvA=",
+      "requires": {
+        "tslib": "1.9.3"
+      }
+    },
+    "@ngtools/json-schema": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@ngtools/json-schema/-/json-schema-1.2.0.tgz",
+      "integrity": "sha512-pMh+HDc6mOjUO3agRfB1tInimo7hf67u+0Cska2bfXFe6oU7rSMnr5PLVtiZVgwMoBHpx/6XjBymvcnWPo2Uzg==",
+      "dev": true
+    },
+    "@ngtools/webpack": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-1.10.2.tgz",
+      "integrity": "sha512-3u2zg2rarG3qNLSukBClGADWuq/iNn5SQtlSeAbfKzwBeyLGbF0gN1z1tVx1Bcr8YwFzR6NdRePQmJGcoqq1fg==",
+      "dev": true,
+      "requires": {
+        "chalk": "2.2.2",
+        "enhanced-resolve": "3.4.1",
+        "loader-utils": "1.1.0",
+        "magic-string": "0.22.5",
+        "semver": "5.5.0",
+        "source-map": "0.5.7",
+        "tree-kill": "1.2.0",
+        "webpack-sources": "1.1.0"
+      }
+    },
+    "@ngx-translate/core": {
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-10.0.2.tgz",
+      "integrity": "sha512-7nM3DrJaqKswwtJlbu2kuKNl+hE8Isr18sKsKvGGpSxQk+G0gO0reDlx2PhUNus7TJTkA1C59vU/JoN8hIvZ4g==",
+      "requires": {
+        "tslib": "1.9.3"
+      }
+    },
+    "@schematics/angular": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.3.2.tgz",
+      "integrity": "sha512-Elrk0BA951s0ScFZU0AWrpUeJBYVR52DZ1QTIO5R0AhwEd1PW4olI8szPLGQlVW5Sd6H0FA/fyFLIvn2r9v6Rw==",
+      "dev": true,
+      "requires": {
+        "typescript": "2.6.2"
+      }
+    },
+    "@schematics/package-update": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@schematics/package-update/-/package-update-0.3.2.tgz",
+      "integrity": "sha512-7aVP4994Hu8vRdTTohXkfGWEwLhrdNP3EZnWyBootm5zshWqlQojUGweZe5zwewsKcixeVOiy2YtW+aI4aGSLA==",
+      "dev": true,
+      "requires": {
+        "rxjs": "5.5.11",
+        "semver": "5.5.0",
+        "semver-intersect": "1.3.1"
+      },
+      "dependencies": {
+        "rxjs": {
+          "version": "5.5.11",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.11.tgz",
+          "integrity": "sha512-3bjO7UwWfA2CV7lmwYMBzj4fQ6Cq+ftHc2MvUe+WMS7wcdJ1LosDWmdjPQanYp2dBRj572p7PeU81JUxHKOcBA==",
+          "dev": true,
+          "requires": {
+            "symbol-observable": "1.0.1"
+          }
+        },
+        "symbol-observable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
+          "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=",
+          "dev": true
+        }
+      }
+    },
+    "@types/jasmine": {
+      "version": "2.5.54",
+      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.5.54.tgz",
+      "integrity": "sha512-B9YofFbUljs19g5gBKUYeLIulsh31U5AK70F41BImQRHEZQGm4GcN922UvnYwkduMqbC/NH+9fruWa/zrqvHIg==",
+      "dev": true
+    },
+    "@types/jasminewd2": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.3.tgz",
+      "integrity": "sha512-hYDVmQZT5VA2kigd4H4bv7vl/OhlympwREUemqBdOqtrYTo5Ytm12a5W5/nGgGYdanGVxj0x/VhZ7J3hOg/YKg==",
+      "dev": true,
+      "requires": {
+        "@types/jasmine": "2.5.54"
+      }
+    },
+    "@types/node": {
+      "version": "6.0.115",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.115.tgz",
+      "integrity": "sha512-PWA07jqflLli+PAk7VaJn0MVdTw96egk5B1FxwocV/tcc3RamNGbza1ZgS0OGUsTuAYCFCboL+IlG2bPazV2Nw==",
+      "dev": true
+    },
+    "@types/q": {
+      "version": "0.0.32",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz",
+      "integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=",
+      "dev": true
+    },
+    "@types/selenium-webdriver": {
+      "version": "2.53.43",
+      "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-2.53.43.tgz",
+      "integrity": "sha512-UBYHWph6P3tutkbXpW6XYg9ZPbTKjw/YC2hGG1/GEvWwTbvezBUv3h+mmUFw79T3RFPnmedpiXdOBbXX+4l0jg==",
+      "dev": true
+    },
+    "abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "dev": true
+    },
+    "accepts": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
+      "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
+      "dev": true,
+      "requires": {
+        "mime-types": "2.1.19",
+        "negotiator": "0.6.1"
+      }
+    },
+    "acorn": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz",
+      "integrity": "sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==",
+      "dev": true
+    },
+    "acorn-dynamic-import": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz",
+      "integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=",
+      "dev": true,
+      "requires": {
+        "acorn": "4.0.13"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "4.0.13",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
+          "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
+          "dev": true
+        }
+      }
+    },
+    "adm-zip": {
+      "version": "0.4.11",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.11.tgz",
+      "integrity": "sha512-L8vcjDTCOIJk7wFvmlEUN7AsSb8T+2JrdP7KINBjzr24TJ5Mwj590sLu3BC7zNZowvJWa/JtPmD8eJCzdtDWjA==",
+      "dev": true
+    },
+    "after": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
+      "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=",
+      "dev": true
+    },
+    "agent-base": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz",
+      "integrity": "sha1-1t4Q1a9hMtW9aSQn1G/FOFOQlMc=",
+      "dev": true,
+      "requires": {
+        "extend": "3.0.2",
+        "semver": "5.0.3"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.0.3",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz",
+          "integrity": "sha1-d0Zt5YnNXTyV8TiqeLxWmjy10no=",
+          "dev": true
+        }
+      }
+    },
+    "ajv": {
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+      "dev": true,
+      "requires": {
+        "co": "4.6.0",
+        "fast-deep-equal": "1.1.0",
+        "fast-json-stable-stringify": "2.0.0",
+        "json-schema-traverse": "0.3.1"
+      }
+    },
+    "ajv-keywords": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz",
+      "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=",
+      "dev": true
+    },
+    "alfresco-js-api": {
+      "version": "2.5.0-d5acbab9993711f37b66351a6aaedf6fc72d1ce2",
+      "resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.5.0-d5acbab9993711f37b66351a6aaedf6fc72d1ce2.tgz",
+      "integrity": "sha512-tcwfDzOHvgWchmpurmiRT6XwyojxZ02pr/fM+w36sU5sWyAlgsf2PNiOEzPaYCOC64FOOyNOK9XZOeQZkgs6Uw==",
+      "requires": {
+        "event-emitter": "0.3.4",
+        "jsrsasign": "8.0.12",
+        "superagent": "3.8.2"
+      }
+    },
+    "align-text": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
+      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
+      "dev": true,
+      "requires": {
+        "kind-of": "3.2.2",
+        "longest": "1.0.1",
+        "repeat-string": "1.6.1"
+      }
+    },
+    "amdefine": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+      "dev": true
+    },
+    "ansi-html": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
+      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
+      "dev": true
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "requires": {
+        "color-convert": "1.9.2"
+      },
+      "dependencies": {
+        "color-convert": {
+          "version": "1.9.2",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz",
+          "integrity": "sha512-3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.1"
+          }
+        },
+        "color-name": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz",
+          "integrity": "sha1-SxQVMEz1ACjqgWQ2Q72C6gWANok=",
+          "dev": true
+        }
+      }
+    },
+    "anymatch": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
+      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
+      "dev": true,
+      "requires": {
+        "micromatch": "2.3.11",
+        "normalize-path": "2.1.1"
+      }
+    },
+    "app-root-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.1.0.tgz",
+      "integrity": "sha1-mL9lmTJ+zqGZMJhm6BQDaP0uZGo=",
+      "dev": true
+    },
+    "append-transform": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-1.0.0.tgz",
+      "integrity": "sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==",
+      "dev": true,
+      "requires": {
+        "default-require-extensions": "2.0.0"
+      }
+    },
+    "aproba": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+      "dev": true
+    },
+    "are-we-there-yet": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
+      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+      "dev": true,
+      "requires": {
+        "delegates": "1.0.0",
+        "readable-stream": "2.3.6"
+      }
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "1.0.3"
+      }
+    },
+    "arr-diff": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
+      "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
+      "dev": true,
+      "requires": {
+        "arr-flatten": "1.1.0"
+      }
+    },
+    "arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true
+    },
+    "arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "dev": true
+    },
+    "array-find-index": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
+      "dev": true
+    },
+    "array-flatten": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz",
+      "integrity": "sha1-Qmu52oQJDBg42BLIFQryCoMx4pY=",
+      "dev": true
+    },
+    "array-includes": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz",
+      "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=",
+      "dev": true,
+      "requires": {
+        "define-properties": "1.1.2",
+        "es-abstract": "1.12.0"
+      }
+    },
+    "array-slice": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+      "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
+      "dev": true
+    },
+    "array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "dev": true,
+      "requires": {
+        "array-uniq": "1.0.3"
+      }
+    },
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "dev": true
+    },
+    "array-unique": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
+      "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
+      "dev": true
+    },
+    "arraybuffer.slice": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz",
+      "integrity": "sha1-8zshWfBTKj8xB6JywMz70a0peco=",
+      "dev": true
+    },
+    "arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+      "dev": true
+    },
+    "asap": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
+      "dev": true,
+      "optional": true
+    },
+    "asn1": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": "2.1.2"
+      }
+    },
+    "asn1.js": {
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.8",
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.1"
+      }
+    },
+    "assert": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
+      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
+      "dev": true,
+      "requires": {
+        "util": "0.10.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+          "dev": true
+        },
+        "util": {
+          "version": "0.10.3",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.1"
+          }
+        }
+      }
+    },
+    "assert-plus": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
+      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
+      "dev": true,
+      "optional": true
+    },
+    "assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+      "dev": true
+    },
+    "async": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
+      "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
+      "dev": true,
+      "requires": {
+        "lodash": "4.17.10"
+      }
+    },
+    "async-each": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
+      "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
+      "dev": true
+    },
+    "async-foreach": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
+      "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
+      "dev": true,
+      "optional": true
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "atob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz",
+      "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio=",
+      "dev": true
+    },
+    "autoprefixer": {
+      "version": "7.2.6",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.6.tgz",
+      "integrity": "sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==",
+      "dev": true,
+      "requires": {
+        "browserslist": "2.11.3",
+        "caniuse-lite": "1.0.30000874",
+        "normalize-range": "0.1.2",
+        "num2fraction": "1.2.2",
+        "postcss": "6.0.23",
+        "postcss-value-parser": "3.3.0"
+      }
+    },
+    "aws-sign2": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
+      "dev": true,
+      "optional": true
+    },
+    "aws4": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz",
+      "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==",
+      "dev": true
+    },
+    "babel-code-frame": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "esutils": "2.0.2",
+        "js-tokens": "3.0.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "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"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "babel-generator": {
+      "version": "6.26.1",
+      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
+      "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.10",
+        "source-map": "0.5.7",
+        "trim-right": "1.0.1"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+          "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
+          "dev": true
+        }
+      }
+    },
+    "babel-messages": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-runtime": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "dev": true,
+      "requires": {
+        "core-js": "2.4.1",
+        "regenerator-runtime": "0.11.1"
+      }
+    },
+    "babel-template": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
+      "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.10"
+      }
+    },
+    "babel-traverse": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
+      "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.9",
+        "globals": "9.18.0",
+        "invariant": "2.2.4",
+        "lodash": "4.17.10"
+      }
+    },
+    "babel-types": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
+      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "esutils": "2.0.2",
+        "lodash": "4.17.10",
+        "to-fast-properties": "1.0.3"
+      }
+    },
+    "babylon": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+      "dev": true
+    },
+    "backo2": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
+      "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=",
+      "dev": true
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+    },
+    "base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dev": true,
+      "requires": {
+        "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": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "1.0.2"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        }
+      }
+    },
+    "base64-arraybuffer": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
+      "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=",
+      "dev": true
+    },
+    "base64-js": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
+      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
+      "dev": true
+    },
+    "base64id": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz",
+      "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=",
+      "dev": true
+    },
+    "batch": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
+      "dev": true
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "tweetnacl": "0.14.5"
+      }
+    },
+    "better-assert": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
+      "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=",
+      "dev": true,
+      "requires": {
+        "callsite": "1.0.0"
+      }
+    },
+    "big.js": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
+      "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
+      "dev": true
+    },
+    "binary-extensions": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz",
+      "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=",
+      "dev": true
+    },
+    "blob": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz",
+      "integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=",
+      "dev": true
+    },
+    "block-stream": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "inherits": "2.0.3"
+      }
+    },
+    "blocking-proxy": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/blocking-proxy/-/blocking-proxy-0.0.5.tgz",
+      "integrity": "sha1-RikF4Nz76pcPQao3Ij3anAexkSs=",
+      "dev": true,
+      "requires": {
+        "minimist": "1.2.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
+    "bluebird": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
+      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
+      "dev": true
+    },
+    "bn.js": {
+      "version": "4.11.8",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+      "dev": true
+    },
+    "body-parser": {
+      "version": "1.18.2",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz",
+      "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=",
+      "dev": true,
+      "requires": {
+        "bytes": "3.0.0",
+        "content-type": "1.0.4",
+        "debug": "2.6.9",
+        "depd": "1.1.2",
+        "http-errors": "1.6.3",
+        "iconv-lite": "0.4.19",
+        "on-finished": "2.3.0",
+        "qs": "6.5.1",
+        "raw-body": "2.3.2",
+        "type-is": "1.6.16"
+      },
+      "dependencies": {
+        "qs": {
+          "version": "6.5.1",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
+          "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
+          "dev": true
+        }
+      }
+    },
+    "bonjour": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
+      "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
+      "dev": true,
+      "requires": {
+        "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": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
+      "dev": true
+    },
+    "boom": {
+      "version": "2.10.1",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
+      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+      "dev": true,
+      "requires": {
+        "hoek": "2.16.3"
+      }
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "requires": {
+        "balanced-match": "1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
+      "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
+      "dev": true,
+      "requires": {
+        "expand-range": "1.8.2",
+        "preserve": "0.2.0",
+        "repeat-element": "1.1.2"
+      }
+    },
+    "brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+      "dev": true
+    },
+    "browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "dev": true,
+      "requires": {
+        "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": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "dev": true,
+      "requires": {
+        "browserify-aes": "1.2.0",
+        "browserify-des": "1.0.2",
+        "evp_bytestokey": "1.0.3"
+      }
+    },
+    "browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "1.0.4",
+        "des.js": "1.0.0",
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "browserify-rsa": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.8",
+        "randombytes": "2.0.6"
+      }
+    },
+    "browserify-sign": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
+      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.8",
+        "browserify-rsa": "4.0.1",
+        "create-hash": "1.2.0",
+        "create-hmac": "1.1.7",
+        "elliptic": "6.4.0",
+        "inherits": "2.0.3",
+        "parse-asn1": "5.1.1"
+      }
+    },
+    "browserify-zlib": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "dev": true,
+      "requires": {
+        "pako": "1.0.6"
+      }
+    },
+    "browserslist": {
+      "version": "2.11.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
+      "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
+      "dev": true,
+      "requires": {
+        "caniuse-lite": "1.0.30000874",
+        "electron-to-chromium": "1.3.55"
+      }
+    },
+    "buffer": {
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+      "dev": true,
+      "requires": {
+        "base64-js": "1.3.0",
+        "ieee754": "1.1.12",
+        "isarray": "1.0.0"
+      }
+    },
+    "buffer-alloc": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
+      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
+      "dev": true,
+      "requires": {
+        "buffer-alloc-unsafe": "1.1.0",
+        "buffer-fill": "1.0.0"
+      }
+    },
+    "buffer-alloc-unsafe": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
+      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
+      "dev": true
+    },
+    "buffer-fill": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
+      "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=",
+      "dev": true
+    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "dev": true
+    },
+    "buffer-indexof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
+      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
+      "dev": true
+    },
+    "buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+      "dev": true
+    },
+    "builtin-modules": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
+      "dev": true
+    },
+    "builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+      "dev": true
+    },
+    "bytes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
+      "dev": true
+    },
+    "cacache": {
+      "version": "10.0.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz",
+      "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
+      "dev": true,
+      "requires": {
+        "bluebird": "3.5.1",
+        "chownr": "1.0.1",
+        "glob": "7.1.2",
+        "graceful-fs": "4.1.11",
+        "lru-cache": "4.1.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.0",
+        "y18n": "4.0.0"
+      }
+    },
+    "cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "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"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        }
+      }
+    },
+    "cache-loader": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/cache-loader/-/cache-loader-1.2.2.tgz",
+      "integrity": "sha512-rsGh4SIYyB9glU+d0OcHwiXHXBoUgDhHZaQ1KAbiXqfz1CDPxtTboh1gPbJ0q2qdO8a9lfcjgC5CJ2Ms32y5bw==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "1.1.0",
+        "mkdirp": "0.5.1",
+        "neo-async": "2.5.1",
+        "schema-utils": "0.4.5"
+      }
+    },
+    "callsite": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
+      "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=",
+      "dev": true
+    },
+    "camel-case": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
+      "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
+      "dev": true,
+      "requires": {
+        "no-case": "2.3.2",
+        "upper-case": "1.1.3"
+      }
+    },
+    "camelcase": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+      "dev": true
+    },
+    "camelcase-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
+      "dev": true,
+      "requires": {
+        "camelcase": "2.1.1",
+        "map-obj": "1.0.1"
+      }
+    },
+    "caniuse-lite": {
+      "version": "1.0.30000874",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000874.tgz",
+      "integrity": "sha512-29nr1EPiHwrJTAHHsEmTt2h+55L8j2GNFdAcYPlRy2NX6iFz7ZZiepVI7kP/QqlnHLq3KvfWpbmGa0d063U09w==",
+      "dev": true
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+      "dev": true
+    },
+    "center-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
+      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
+      "dev": true,
+      "requires": {
+        "align-text": "0.1.4",
+        "lazy-cache": "1.0.4"
+      }
+    },
+    "chalk": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.2.2.tgz",
+      "integrity": "sha512-LvixLAQ4MYhbf7hgL4o5PeK32gJKvVzDRiSNIApDofQvyhl8adgG2lJVXn4+ekQoK7HL9RF8lqxwerpe0x2pCw==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "3.2.1",
+        "escape-string-regexp": "1.0.5",
+        "supports-color": "4.5.0"
+      }
+    },
+    "chart.js": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.5.0.tgz",
+      "integrity": "sha1-/m51Gok3afVucr7lrZEgfhxZKVc=",
+      "requires": {
+        "chartjs-color": "2.2.0",
+        "moment": "2.20.1"
+      }
+    },
+    "chartjs-color": {
+      "version": "2.2.0",
+      "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": {
+      "version": "0.5.0",
+      "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.1.3"
+      }
+    },
+    "chokidar": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
+      "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
+      "dev": true,
+      "requires": {
+        "anymatch": "1.3.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.1.0"
+      }
+    },
+    "chownr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
+      "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=",
+      "dev": true
+    },
+    "cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "circular-dependency-plugin": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-4.4.0.tgz",
+      "integrity": "sha512-yEFtUNUYT4jBykEX5ZOHw+5goA3glGZr9wAXIQqoyakjz5H5TeUmScnWRc52douAhb9eYzK3s7V6bXfNnjFdzg==",
+      "dev": true
+    },
+    "class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "dev": true,
+      "requires": {
+        "arr-union": "3.1.0",
+        "define-property": "0.2.5",
+        "isobject": "3.0.1",
+        "static-extend": "0.1.2"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "0.1.6"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        }
+      }
+    },
+    "classlist.js": {
+      "version": "1.1.20150312",
+      "resolved": "https://registry.npmjs.org/classlist.js/-/classlist.js-1.1.20150312.tgz",
+      "integrity": "sha1-HXCEL3Ai8I2awIbOaeWyUPLFd4k="
+    },
+    "clean-css": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.0.tgz",
+      "integrity": "sha1-Cp1iBAzdx5BMXtrum97KZC2bnBw=",
+      "dev": true,
+      "requires": {
+        "source-map": "0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "cliui": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+      "dev": true,
+      "requires": {
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1",
+        "wrap-ansi": "2.1.0"
+      }
+    },
+    "clone": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
+      "dev": true
+    },
+    "clone-deep": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz",
+      "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
+      "dev": true,
+      "requires": {
+        "for-own": "1.0.0",
+        "is-plain-object": "2.0.4",
+        "kind-of": "6.0.2",
+        "shallow-clone": "1.0.0"
+      },
+      "dependencies": {
+        "for-own": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
+          "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
+          "dev": true,
+          "requires": {
+            "for-in": "1.0.2"
+          }
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        }
+      }
+    },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+      "dev": true
+    },
+    "code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+      "dev": true
+    },
+    "codelyzer": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-3.2.2.tgz",
+      "integrity": "sha512-VNvW9gRThsqRarEnLioiILd0Pdk0yCq/7cVgYvqHpC+3CHqfnrJfmXjoana7vzWfSis+9pODXofjCWX+nlU9Gw==",
+      "dev": true,
+      "requires": {
+        "app-root-path": "2.1.0",
+        "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"
+      }
+    },
+    "collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+      "dev": true,
+      "requires": {
+        "map-visit": "1.0.0",
+        "object-visit": "1.0.1"
+      }
+    },
+    "color-convert": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz",
+      "integrity": "sha1-vbbGnOZg+t/+CwAHzER+G59ygr0="
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
+    "colors": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+      "dev": true
+    },
+    "combine-lists": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz",
+      "integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=",
+      "dev": true,
+      "requires": {
+        "lodash": "4.17.10"
+      }
+    },
+    "combined-stream": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
+      "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
+      "requires": {
+        "delayed-stream": "1.0.0"
+      }
+    },
+    "commander": {
+      "version": "2.16.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz",
+      "integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==",
+      "dev": true
+    },
+    "common-tags": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz",
+      "integrity": "sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==",
+      "dev": true
+    },
+    "commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "dev": true
+    },
+    "compare-versions": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.3.0.tgz",
+      "integrity": "sha512-MAAAIOdi2s4Gl6rZ76PNcUa9IOYB+5ICdT41o5uMRf09aEu/F9RK+qhe8RjXNPwcTjGV7KU7h2P/fljThFVqyQ==",
+      "dev": true
+    },
+    "component-bind": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
+      "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=",
+      "dev": true
+    },
+    "component-emitter": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+      "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
+    },
+    "component-inherit": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
+      "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=",
+      "dev": true
+    },
+    "compressible": {
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.14.tgz",
+      "integrity": "sha1-MmxfUH+7BV9UEWeCuWmoG2einac=",
+      "dev": true,
+      "requires": {
+        "mime-db": "1.35.0"
+      }
+    },
+    "compression": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz",
+      "integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==",
+      "dev": true,
+      "requires": {
+        "accepts": "1.3.5",
+        "bytes": "3.0.0",
+        "compressible": "2.0.14",
+        "debug": "2.6.9",
+        "on-headers": "1.0.1",
+        "safe-buffer": "5.1.2",
+        "vary": "1.1.2"
+      }
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "1.1.1",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6",
+        "typedarray": "0.0.6"
+      }
+    },
+    "connect": {
+      "version": "3.6.6",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
+      "integrity": "sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "finalhandler": "1.1.0",
+        "parseurl": "1.3.2",
+        "utils-merge": "1.0.1"
+      },
+      "dependencies": {
+        "finalhandler": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
+          "integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
+          "dev": true,
+          "requires": {
+            "debug": "2.6.9",
+            "encodeurl": "1.0.2",
+            "escape-html": "1.0.3",
+            "on-finished": "2.3.0",
+            "parseurl": "1.3.2",
+            "statuses": "1.3.1",
+            "unpipe": "1.0.0"
+          }
+        },
+        "statuses": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
+          "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
+          "dev": true
+        }
+      }
+    },
+    "connect-history-api-fallback": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz",
+      "integrity": "sha1-sGhzk0vF40T+9hGhlqb6rgruAVo=",
+      "dev": true
+    },
+    "console-browserify": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+      "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
+      "dev": true,
+      "requires": {
+        "date-now": "0.1.4"
+      }
+    },
+    "console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+      "dev": true
+    },
+    "constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+      "dev": true
+    },
+    "content-disposition": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
+      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=",
+      "dev": true
+    },
+    "content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "dev": true
+    },
+    "convert-source-map": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz",
+      "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=",
+      "dev": true
+    },
+    "cookie": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
+      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
+      "dev": true
+    },
+    "cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
+      "dev": true
+    },
+    "cookiejar": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz",
+      "integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA=="
+    },
+    "copy-concurrently": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
+      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+      "dev": true,
+      "requires": {
+        "aproba": "1.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": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+      "dev": true
+    },
+    "copy-webpack-plugin": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.4.3.tgz",
+      "integrity": "sha512-v4THQ24Tks2NkyOvZuFDgZVfDD9YaA9rwYLZTrWg2GHIA8lrH5DboEyeoorh5Skki+PUbgSmnsCwhMWqYrQZrA==",
+      "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.3.0",
+        "serialize-javascript": "1.5.0"
+      },
+      "dependencies": {
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
+          "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "2.1.1"
+          }
+        }
+      }
+    },
+    "core-js": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
+      "integrity": "sha1-TekR5mew6ukSTjQlS1OupvxhjT4="
+    },
+    "core-object": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/core-object/-/core-object-3.1.5.tgz",
+      "integrity": "sha512-sA2/4+/PZ/KV6CKgjrVrrUVBKCkdDO02CUlQ0YKTQoYUwPYNOtOAcWlbYhd5v/1JqYaA6oZ4sDlOU4ppVw6Wbg==",
+      "dev": true,
+      "requires": {
+        "chalk": "2.2.2"
+      }
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+    },
+    "cosmiconfig": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz",
+      "integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
+      "dev": true,
+      "requires": {
+        "is-directory": "0.3.1",
+        "js-yaml": "3.12.0",
+        "parse-json": "4.0.0",
+        "require-from-string": "2.0.2"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+          "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+          "dev": true
+        },
+        "js-yaml": {
+          "version": "3.12.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
+          "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
+          "dev": true,
+          "requires": {
+            "argparse": "1.0.10",
+            "esprima": "4.0.1"
+          }
+        },
+        "parse-json": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+          "dev": true,
+          "requires": {
+            "error-ex": "1.3.2",
+            "json-parse-better-errors": "1.0.2"
+          }
+        }
+      }
+    },
+    "create-ecdh": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
+      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.8",
+        "elliptic": "6.4.0"
+      }
+    },
+    "create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "1.0.4",
+        "inherits": "2.0.3",
+        "md5.js": "1.3.4",
+        "ripemd160": "2.0.2",
+        "sha.js": "2.4.11"
+      }
+    },
+    "create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "dev": true,
+      "requires": {
+        "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": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
+      "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "lru-cache": "4.1.3",
+        "which": "1.3.1"
+      }
+    },
+    "cryptiles": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "boom": "2.10.1"
+      }
+    },
+    "crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "dev": true,
+      "requires": {
+        "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.16",
+        "public-encrypt": "4.0.2",
+        "randombytes": "2.0.6",
+        "randomfill": "1.0.4"
+      }
+    },
+    "css-parse": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz",
+      "integrity": "sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=",
+      "dev": true
+    },
+    "css-select": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
+      "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
+      "dev": true,
+      "requires": {
+        "boolbase": "1.0.0",
+        "css-what": "2.1.0",
+        "domutils": "1.5.1",
+        "nth-check": "1.0.1"
+      }
+    },
+    "css-selector-tokenizer": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz",
+      "integrity": "sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=",
+      "dev": true,
+      "requires": {
+        "cssesc": "0.1.0",
+        "fastparse": "1.1.1",
+        "regexpu-core": "1.0.0"
+      }
+    },
+    "css-what": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz",
+      "integrity": "sha1-lGfQMsOM+u+58teVASUwYvh/ob0=",
+      "dev": true
+    },
+    "cssauron": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz",
+      "integrity": "sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=",
+      "dev": true,
+      "requires": {
+        "through": "2.3.8"
+      }
+    },
+    "cssesc": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz",
+      "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=",
+      "dev": true
+    },
+    "cuint": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz",
+      "integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=",
+      "dev": true
+    },
+    "currently-unhandled": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
+      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
+      "dev": true,
+      "requires": {
+        "array-find-index": "1.0.2"
+      }
+    },
+    "custom-event": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
+      "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=",
+      "dev": true
+    },
+    "custom-event-polyfill": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/custom-event-polyfill/-/custom-event-polyfill-0.3.0.tgz",
+      "integrity": "sha1-mYB4Ob5i7bRGtkWDLg2A6tb6GIg="
+    },
+    "cyclist": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
+      "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
+      "dev": true
+    },
+    "d": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/d/-/d-0.1.1.tgz",
+      "integrity": "sha1-2hhMU10Y2O57oqoim5FACfrhEwk=",
+      "requires": {
+        "es5-ext": "0.10.45"
+      }
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        }
+      }
+    },
+    "date-now": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
+      "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
+      "dev": true
+    },
+    "debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
+    },
+    "decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "dev": true
+    },
+    "deep-equal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
+      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
+      "dev": true
+    },
+    "default-require-extensions": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-2.0.0.tgz",
+      "integrity": "sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=",
+      "dev": true,
+      "requires": {
+        "strip-bom": "3.0.0"
+      },
+      "dependencies": {
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        }
+      }
+    },
+    "define-properties": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
+      "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
+      "dev": true,
+      "requires": {
+        "foreach": "2.0.5",
+        "object-keys": "1.0.12"
+      }
+    },
+    "define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "dev": true,
+      "requires": {
+        "is-descriptor": "1.0.2",
+        "isobject": "3.0.1"
+      },
+      "dependencies": {
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        }
+      }
+    },
+    "del": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
+      "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
+      "dev": true,
+      "requires": {
+        "globby": "6.1.0",
+        "is-path-cwd": "1.0.0",
+        "is-path-in-cwd": "1.0.1",
+        "p-map": "1.2.0",
+        "pify": "3.0.0",
+        "rimraf": "2.6.2"
+      },
+      "dependencies": {
+        "globby": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+          "dev": true,
+          "requires": {
+            "array-union": "1.0.2",
+            "glob": "7.1.2",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
+          },
+          "dependencies": {
+            "pify": {
+              "version": "2.3.0",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+              "dev": true
+            }
+          }
+        }
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
+    "delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+      "dev": true
+    },
+    "denodeify": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/denodeify/-/denodeify-1.2.1.tgz",
+      "integrity": "sha1-OjYof1A05pnnV3kBBSwubJQlFjE=",
+      "dev": true
+    },
+    "depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+      "dev": true
+    },
+    "des.js": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
+      "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.1"
+      }
+    },
+    "destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
+      "dev": true
+    },
+    "detect-indent": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
+      "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
+      "dev": true,
+      "requires": {
+        "repeating": "2.0.1"
+      }
+    },
+    "detect-node": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.3.tgz",
+      "integrity": "sha1-ogM8CcyOFY03dI+951B4Mr1s4Sc=",
+      "dev": true
+    },
+    "di": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
+      "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
+      "dev": true
+    },
+    "diff": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+      "dev": true
+    },
+    "diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.8",
+        "miller-rabin": "4.0.1",
+        "randombytes": "2.0.6"
+      }
+    },
+    "dir-glob": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
+      "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
+      "dev": true,
+      "requires": {
+        "arrify": "1.0.1",
+        "path-type": "3.0.0"
+      }
+    },
+    "dns-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
+      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=",
+      "dev": true
+    },
+    "dns-packet": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
+      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
+      "dev": true,
+      "requires": {
+        "ip": "1.1.5",
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "dns-txt": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
+      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
+      "dev": true,
+      "requires": {
+        "buffer-indexof": "1.1.1"
+      }
+    },
+    "dom-converter": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.1.4.tgz",
+      "integrity": "sha1-pF71cnuJDJv/5tfIduexnLDhfzs=",
+      "dev": true,
+      "requires": {
+        "utila": "0.3.3"
+      },
+      "dependencies": {
+        "utila": {
+          "version": "0.3.3",
+          "resolved": "https://registry.npmjs.org/utila/-/utila-0.3.3.tgz",
+          "integrity": "sha1-1+jn1+MJEHCSsF+NloiCTWM6QiY=",
+          "dev": true
+        }
+      }
+    },
+    "dom-serialize": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
+      "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
+      "dev": true,
+      "requires": {
+        "custom-event": "1.0.1",
+        "ent": "2.2.0",
+        "extend": "3.0.2",
+        "void-elements": "2.0.1"
+      }
+    },
+    "dom-serializer": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
+      "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
+      "dev": true,
+      "requires": {
+        "domelementtype": "1.1.3",
+        "entities": "1.1.1"
+      },
+      "dependencies": {
+        "domelementtype": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
+          "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
+          "dev": true
+        }
+      }
+    },
+    "domain-browser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+      "dev": true
+    },
+    "domelementtype": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
+      "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=",
+      "dev": true
+    },
+    "domhandler": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.1.0.tgz",
+      "integrity": "sha1-0mRvXlf2w7qxHPbLBdPArPdBJZQ=",
+      "dev": true,
+      "requires": {
+        "domelementtype": "1.3.0"
+      }
+    },
+    "domutils": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+      "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
+      "dev": true,
+      "requires": {
+        "dom-serializer": "0.1.0",
+        "domelementtype": "1.3.0"
+      }
+    },
+    "duplexify": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz",
+      "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "1.4.1",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6",
+        "stream-shift": "1.0.0"
+      }
+    },
+    "ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "jsbn": "0.1.1",
+        "safer-buffer": "2.1.2"
+      }
+    },
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
+      "dev": true
+    },
+    "ejs": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.6.1.tgz",
+      "integrity": "sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==",
+      "dev": true
+    },
+    "electron-to-chromium": {
+      "version": "1.3.55",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.55.tgz",
+      "integrity": "sha1-8VDhCyC3fZ1Br8yjEu/gw7Gn/c4=",
+      "dev": true
+    },
+    "elliptic": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz",
+      "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=",
+      "dev": true,
+      "requires": {
+        "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"
+      }
+    },
+    "ember-cli-string-utils": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ember-cli-string-utils/-/ember-cli-string-utils-1.1.0.tgz",
+      "integrity": "sha1-ObZ3/CgF9VFzc1N2/O8njqpEUqE=",
+      "dev": true
+    },
+    "emojis-list": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+      "dev": true
+    },
+    "encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+      "dev": true
+    },
+    "end-of-stream": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
+      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
+      "dev": true,
+      "requires": {
+        "once": "1.4.0"
+      }
+    },
+    "engine.io": {
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.8.3.tgz",
+      "integrity": "sha1-jef5eJXSDTm4X4ju7nd7K9QrE9Q=",
+      "dev": true,
+      "requires": {
+        "accepts": "1.3.3",
+        "base64id": "1.0.0",
+        "cookie": "0.3.1",
+        "debug": "2.3.3",
+        "engine.io-parser": "1.3.2",
+        "ws": "1.1.2"
+      },
+      "dependencies": {
+        "accepts": {
+          "version": "1.3.3",
+          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz",
+          "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=",
+          "dev": true,
+          "requires": {
+            "mime-types": "2.1.19",
+            "negotiator": "0.6.1"
+          }
+        },
+        "debug": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
+          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.2"
+          }
+        },
+        "ms": {
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
+          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
+          "dev": true
+        }
+      }
+    },
+    "engine.io-client": {
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.3.tgz",
+      "integrity": "sha1-F5jtk0USRkU9TG9jXXogH+lA1as=",
+      "dev": true,
+      "requires": {
+        "component-emitter": "1.2.1",
+        "component-inherit": "0.0.3",
+        "debug": "2.3.3",
+        "engine.io-parser": "1.3.2",
+        "has-cors": "1.1.0",
+        "indexof": "0.0.1",
+        "parsejson": "0.0.3",
+        "parseqs": "0.0.5",
+        "parseuri": "0.0.5",
+        "ws": "1.1.2",
+        "xmlhttprequest-ssl": "1.5.3",
+        "yeast": "0.1.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
+          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.2"
+          }
+        },
+        "ms": {
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
+          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
+          "dev": true
+        }
+      }
+    },
+    "engine.io-parser": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz",
+      "integrity": "sha1-k3sHnwAH0Ik+xW1GyyILjLQ1Igo=",
+      "dev": true,
+      "requires": {
+        "after": "0.8.2",
+        "arraybuffer.slice": "0.0.6",
+        "base64-arraybuffer": "0.1.5",
+        "blob": "0.0.4",
+        "has-binary": "0.1.7",
+        "wtf-8": "1.0.0"
+      }
+    },
+    "enhanced-resolve": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz",
+      "integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "memory-fs": "0.4.1",
+        "object-assign": "4.1.1",
+        "tapable": "0.2.8"
+      }
+    },
+    "ent": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
+      "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
+      "dev": true
+    },
+    "entities": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
+      "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=",
+      "dev": true
+    },
+    "errno": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
+      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+      "dev": true,
+      "requires": {
+        "prr": "1.0.1"
+      }
+    },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "0.2.1"
+      }
+    },
+    "es-abstract": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz",
+      "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==",
+      "dev": true,
+      "requires": {
+        "es-to-primitive": "1.1.1",
+        "function-bind": "1.1.1",
+        "has": "1.0.3",
+        "is-callable": "1.1.4",
+        "is-regex": "1.0.4"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
+      "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
+      "dev": true,
+      "requires": {
+        "is-callable": "1.1.4",
+        "is-date-object": "1.0.1",
+        "is-symbol": "1.0.1"
+      }
+    },
+    "es5-ext": {
+      "version": "0.10.45",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.45.tgz",
+      "integrity": "sha512-FkfM6Vxxfmztilbxxz5UKSD4ICMf5tSpRFtDNtkAhOxZ0EKtX6qwmXNyH/sFyIbX2P/nU5AMiA9jilWsUGJzCQ==",
+      "requires": {
+        "es6-iterator": "2.0.3",
+        "es6-symbol": "3.1.1",
+        "next-tick": "1.0.0"
+      }
+    },
+    "es6-iterator": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.45",
+        "es6-symbol": "3.1.1"
+      },
+      "dependencies": {
+        "d": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
+          "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
+          "requires": {
+            "es5-ext": "0.10.45"
+          }
+        }
+      }
+    },
+    "es6-map": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
+      "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.45",
+        "es6-iterator": "2.0.3",
+        "es6-set": "0.1.5",
+        "es6-symbol": "3.1.1",
+        "event-emitter": "0.3.5"
+      },
+      "dependencies": {
+        "d": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
+          "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
+          "dev": true,
+          "requires": {
+            "es5-ext": "0.10.45"
+          }
+        },
+        "event-emitter": {
+          "version": "0.3.5",
+          "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+          "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
+          "dev": true,
+          "requires": {
+            "d": "1.0.0",
+            "es5-ext": "0.10.45"
+          }
+        }
+      }
+    },
+    "es6-set": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
+      "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.45",
+        "es6-iterator": "2.0.3",
+        "es6-symbol": "3.1.1",
+        "event-emitter": "0.3.5"
+      },
+      "dependencies": {
+        "d": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
+          "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
+          "dev": true,
+          "requires": {
+            "es5-ext": "0.10.45"
+          }
+        },
+        "event-emitter": {
+          "version": "0.3.5",
+          "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+          "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
+          "dev": true,
+          "requires": {
+            "d": "1.0.0",
+            "es5-ext": "0.10.45"
+          }
+        }
+      }
+    },
+    "es6-symbol": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
+      "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.45"
+      },
+      "dependencies": {
+        "d": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
+          "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
+          "requires": {
+            "es5-ext": "0.10.45"
+          }
+        }
+      }
+    },
+    "es6-weak-map": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz",
+      "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.45",
+        "es6-iterator": "2.0.3",
+        "es6-symbol": "3.1.1"
+      },
+      "dependencies": {
+        "d": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
+          "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
+          "dev": true,
+          "requires": {
+            "es5-ext": "0.10.45"
+          }
+        }
+      }
+    },
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "escope": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
+      "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
+      "dev": true,
+      "requires": {
+        "es6-map": "0.1.5",
+        "es6-weak-map": "2.0.2",
+        "esrecurse": "4.2.1",
+        "estraverse": "4.2.0"
+      }
+    },
+    "esprima": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+      "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+      "dev": true
+    },
+    "esrecurse": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "dev": true,
+      "requires": {
+        "estraverse": "4.2.0"
+      }
+    },
+    "estraverse": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+      "dev": true
+    },
+    "etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "dev": true
+    },
+    "eve-raphael": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/eve-raphael/-/eve-raphael-0.5.0.tgz",
+      "integrity": "sha1-F8dUt5K+7z+maE15z1pHxjxM2jA="
+    },
+    "event-emitter": {
+      "version": "0.3.4",
+      "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.45"
+      }
+    },
+    "eventemitter3": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
+      "integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==",
+      "dev": true
+    },
+    "events": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
+      "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
+      "dev": true
+    },
+    "eventsource": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-0.1.6.tgz",
+      "integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=",
+      "dev": true,
+      "requires": {
+        "original": "1.0.1"
+      }
+    },
+    "evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dev": true,
+      "requires": {
+        "md5.js": "1.3.4",
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "execa": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "5.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"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+          "dev": true,
+          "requires": {
+            "lru-cache": "4.1.3",
+            "shebang-command": "1.2.0",
+            "which": "1.3.1"
+          }
+        }
+      }
+    },
+    "exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+      "dev": true
+    },
+    "expand-braces": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz",
+      "integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=",
+      "dev": true,
+      "requires": {
+        "array-slice": "0.2.3",
+        "array-unique": "0.2.1",
+        "braces": "0.1.5"
+      },
+      "dependencies": {
+        "braces": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz",
+          "integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=",
+          "dev": true,
+          "requires": {
+            "expand-range": "0.1.1"
+          }
+        },
+        "expand-range": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz",
+          "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=",
+          "dev": true,
+          "requires": {
+            "is-number": "0.1.1",
+            "repeat-string": "0.2.2"
+          }
+        },
+        "is-number": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz",
+          "integrity": "sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=",
+          "dev": true
+        },
+        "repeat-string": {
+          "version": "0.2.2",
+          "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz",
+          "integrity": "sha1-x6jTI2BoNiBZp+RlH8aITosftK4=",
+          "dev": true
+        }
+      }
+    },
+    "expand-brackets": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
+      "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
+      "dev": true,
+      "requires": {
+        "is-posix-bracket": "0.1.1"
+      }
+    },
+    "expand-range": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
+      "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
+      "dev": true,
+      "requires": {
+        "fill-range": "2.2.4"
+      }
+    },
+    "express": {
+      "version": "4.16.3",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.16.3.tgz",
+      "integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=",
+      "dev": true,
+      "requires": {
+        "accepts": "1.3.5",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.18.2",
+        "content-disposition": "0.5.2",
+        "content-type": "1.0.4",
+        "cookie": "0.3.1",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "1.1.2",
+        "encodeurl": "1.0.2",
+        "escape-html": "1.0.3",
+        "etag": "1.8.1",
+        "finalhandler": "1.1.1",
+        "fresh": "0.5.2",
+        "merge-descriptors": "1.0.1",
+        "methods": "1.1.2",
+        "on-finished": "2.3.0",
+        "parseurl": "1.3.2",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "2.0.4",
+        "qs": "6.5.1",
+        "range-parser": "1.2.0",
+        "safe-buffer": "5.1.1",
+        "send": "0.16.2",
+        "serve-static": "1.13.2",
+        "setprototypeof": "1.1.0",
+        "statuses": "1.4.0",
+        "type-is": "1.6.16",
+        "utils-merge": "1.0.1",
+        "vary": "1.1.2"
+      },
+      "dependencies": {
+        "array-flatten": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+          "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
+          "dev": true
+        },
+        "qs": {
+          "version": "6.5.1",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
+          "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
+          "dev": true
+        },
+        "safe-buffer": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
+          "dev": true
+        }
+      }
+    },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+    },
+    "extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "requires": {
+        "assign-symbols": "1.0.0",
+        "is-extendable": "1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "2.0.4"
+          }
+        }
+      }
+    },
+    "extglob": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
+      "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
+      "dev": true,
+      "requires": {
+        "is-extglob": "1.0.0"
+      }
+    },
+    "extract-text-webpack-plugin": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz",
+      "integrity": "sha512-bt/LZ4m5Rqt/Crl2HiKuAl/oqg0psx1tsTLkvWbJen1CtD+fftkZhMaQ9HOtY2gWsl2Wq+sABmMVi9z3DhKWQQ==",
+      "dev": true,
+      "requires": {
+        "async": "2.6.1",
+        "loader-utils": "1.1.0",
+        "schema-utils": "0.3.0",
+        "webpack-sources": "1.1.0"
+      },
+      "dependencies": {
+        "schema-utils": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
+          "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
+          "dev": true,
+          "requires": {
+            "ajv": "5.5.2"
+          }
+        }
+      }
+    },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "dev": true
+    },
+    "fast-deep-equal": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+      "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
+      "dev": true
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+      "dev": true
+    },
+    "fastparse": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz",
+      "integrity": "sha1-0eJkOzipTXWDtHkGDmxK/8lAcfg=",
+      "dev": true
+    },
+    "faye-websocket": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
+      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
+      "dev": true,
+      "requires": {
+        "websocket-driver": "0.7.0"
+      }
+    },
+    "file-loader": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz",
+      "integrity": "sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "1.1.0",
+        "schema-utils": "0.4.5"
+      }
+    },
+    "filename-regex": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
+      "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
+      "dev": true
+    },
+    "fileset": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz",
+      "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.2",
+        "minimatch": "3.0.4"
+      }
+    },
+    "fill-range": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
+      "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
+      "dev": true,
+      "requires": {
+        "is-number": "2.1.0",
+        "isobject": "2.1.0",
+        "randomatic": "3.0.0",
+        "repeat-element": "1.1.2",
+        "repeat-string": "1.6.1"
+      }
+    },
+    "finalhandler": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
+      "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "encodeurl": "1.0.2",
+        "escape-html": "1.0.3",
+        "on-finished": "2.3.0",
+        "parseurl": "1.3.2",
+        "statuses": "1.4.0",
+        "unpipe": "1.0.0"
+      }
+    },
+    "find-cache-dir": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz",
+      "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
+      "dev": true,
+      "requires": {
+        "commondir": "1.0.1",
+        "make-dir": "1.3.0",
+        "pkg-dir": "2.0.0"
+      }
+    },
+    "find-up": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "dev": true,
+      "requires": {
+        "locate-path": "2.0.0"
+      }
+    },
+    "flush-write-stream": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz",
+      "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6"
+      }
+    },
+    "follow-redirects": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.2.tgz",
+      "integrity": "sha512-kssLorP/9acIdpQ2udQVTiCS5LQmdEz9mvdIfDcl1gYX2tPKFADHSyFdvJS040XdFsPzemWtgI3q8mFVCxtX8A==",
+      "dev": true,
+      "requires": {
+        "debug": "3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "dev": true
+    },
+    "for-own": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+      "dev": true,
+      "requires": {
+        "for-in": "1.0.2"
+      }
+    },
+    "foreach": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
+      "dev": true
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "dev": true
+    },
+    "form-data": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
+      "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
+      "requires": {
+        "asynckit": "0.4.0",
+        "combined-stream": "1.0.6",
+        "mime-types": "2.1.19"
+      }
+    },
+    "formidable": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz",
+      "integrity": "sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg=="
+    },
+    "forwarded": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+      "dev": true
+    },
+    "fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+      "dev": true,
+      "requires": {
+        "map-cache": "0.2.2"
+      }
+    },
+    "fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "dev": true
+    },
+    "from2": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6"
+      }
+    },
+    "fs-access": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
+      "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
+      "dev": true,
+      "requires": {
+        "null-check": "1.0.0"
+      }
+    },
+    "fs-extra": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
+      "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "jsonfile": "4.0.0",
+        "universalify": "0.1.2"
+      }
+    },
+    "fs-write-stream-atomic": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
+      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "iferr": "0.1.5",
+        "imurmurhash": "0.1.4",
+        "readable-stream": "2.3.6"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "fsevents": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
+      "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "nan": "2.10.0",
+        "node-pre-gyp": "0.10.0"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "aproba": {
+          "version": "1.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "delegates": "1.0.0",
+            "readable-stream": "2.3.6"
+          }
+        },
+        "balanced-match": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "brace-expansion": {
+          "version": "1.1.11",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "balanced-match": "1.0.0",
+            "concat-map": "0.0.1"
+          }
+        },
+        "chownr": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "debug": {
+          "version": "2.6.9",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "deep-extend": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "detect-libc": {
+          "version": "1.0.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "fs-minipass": {
+          "version": "1.2.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minipass": "2.2.4"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "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.2"
+          }
+        },
+        "glob": {
+          "version": "7.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "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"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "iconv-lite": {
+          "version": "0.4.21",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safer-buffer": "2.1.2"
+          }
+        },
+        "ignore-walk": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minimatch": "3.0.4"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "once": "1.4.0",
+            "wrappy": "1.0.2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true,
+          "dev": true
+        },
+        "ini": {
+          "version": "1.3.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "number-is-nan": "1.0.1"
+          }
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "brace-expansion": "1.1.11"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true,
+          "dev": true
+        },
+        "minipass": {
+          "version": "2.2.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.1.1",
+            "yallist": "3.0.2"
+          }
+        },
+        "minizlib": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minipass": "2.2.4"
+          }
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "needle": {
+          "version": "2.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "2.6.9",
+            "iconv-lite": "0.4.21",
+            "sax": "1.2.4"
+          }
+        },
+        "node-pre-gyp": {
+          "version": "0.10.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "detect-libc": "1.0.3",
+            "mkdirp": "0.5.1",
+            "needle": "2.2.0",
+            "nopt": "4.0.1",
+            "npm-packlist": "1.1.10",
+            "npmlog": "4.1.2",
+            "rc": "1.2.7",
+            "rimraf": "2.6.2",
+            "semver": "5.5.0",
+            "tar": "4.4.1"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1.1.1",
+            "osenv": "0.1.5"
+          }
+        },
+        "npm-bundled": {
+          "version": "1.0.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "npm-packlist": {
+          "version": "1.1.10",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ignore-walk": "3.0.1",
+            "npm-bundled": "1.0.3"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "are-we-there-yet": "1.1.4",
+            "console-control-strings": "1.1.0",
+            "gauge": "2.7.4",
+            "set-blocking": "2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "wrappy": "1.0.2"
+          }
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "osenv": {
+          "version": "0.1.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "os-homedir": "1.0.2",
+            "os-tmpdir": "1.0.2"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.7",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "deep-extend": "0.5.1",
+            "ini": "1.3.5",
+            "minimist": "1.2.0",
+            "strip-json-comments": "2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "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.2"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "glob": "7.1.2"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "safer-buffer": {
+          "version": "2.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "sax": {
+          "version": "1.2.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "semver": {
+          "version": "5.5.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "4.4.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chownr": "1.0.1",
+            "fs-minipass": "1.2.5",
+            "minipass": "2.2.4",
+            "minizlib": "1.1.0",
+            "mkdirp": "0.5.1",
+            "safe-buffer": "5.1.1",
+            "yallist": "3.0.2"
+          }
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "wide-align": {
+          "version": "1.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "string-width": "1.0.2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "yallist": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true
+        }
+      }
+    },
+    "fstream": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "inherits": "2.0.3",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.2"
+      }
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "gauge": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+      "dev": true,
+      "requires": {
+        "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"
+      }
+    },
+    "gaze": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
+      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "globule": "1.2.1"
+      }
+    },
+    "get-caller-file": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+      "dev": true
+    },
+    "get-stdin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
+      "dev": true
+    },
+    "get-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+      "dev": true
+    },
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+      "dev": true
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        }
+      }
+    },
+    "glob": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "dev": true,
+      "requires": {
+        "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": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
+      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
+      "dev": true,
+      "requires": {
+        "glob-parent": "2.0.0",
+        "is-glob": "2.0.1"
+      }
+    },
+    "glob-parent": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
+      "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+      "dev": true,
+      "requires": {
+        "is-glob": "2.0.1"
+      }
+    },
+    "globals": {
+      "version": "9.18.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
+      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+      "dev": true
+    },
+    "globby": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
+      "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
+      "dev": true,
+      "requires": {
+        "array-union": "1.0.2",
+        "dir-glob": "2.0.0",
+        "glob": "7.1.2",
+        "ignore": "3.3.10",
+        "pify": "3.0.0",
+        "slash": "1.0.0"
+      }
+    },
+    "globule": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
+      "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "glob": "7.1.2",
+        "lodash": "4.17.10",
+        "minimatch": "3.0.4"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+      "dev": true
+    },
+    "hammerjs": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
+      "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
+    },
+    "handle-thing": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz",
+      "integrity": "sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=",
+      "dev": true
+    },
+    "har-schema": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
+      "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
+      "dev": true,
+      "optional": true
+    },
+    "har-validator": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
+      "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "ajv": "4.11.8",
+        "har-schema": "1.0.5"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "4.11.8",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
+          "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
+          }
+        }
+      }
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "requires": {
+        "function-bind": "1.1.1"
+      }
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "2.1.1"
+      }
+    },
+    "has-binary": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz",
+      "integrity": "sha1-aOYesWIQyVRaClzOBqhzkS/h5ow=",
+      "dev": true,
+      "requires": {
+        "isarray": "0.0.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        }
+      }
+    },
+    "has-cors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
+      "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=",
+      "dev": true
+    },
+    "has-flag": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+      "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+      "dev": true
+    },
+    "has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
+      "dev": true
+    },
+    "has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "dev": true,
+      "requires": {
+        "get-value": "2.0.6",
+        "has-values": "1.0.0",
+        "isobject": "3.0.1"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        }
+      }
+    },
+    "has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "dev": true,
+      "requires": {
+        "is-number": "3.0.0",
+        "kind-of": "4.0.0"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.6"
+              }
+            }
+          }
+        },
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "1.1.6"
+          }
+        }
+      }
+    },
+    "hash-base": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "hash.js": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.5.tgz",
+      "integrity": "sha512-eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA==",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.1"
+      }
+    },
+    "hawk": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "boom": "2.10.1",
+        "cryptiles": "2.0.5",
+        "hoek": "2.16.3",
+        "sntp": "1.0.9"
+      }
+    },
+    "he": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
+      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
+      "dev": true
+    },
+    "hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
+      "requires": {
+        "hash.js": "1.1.5",
+        "minimalistic-assert": "1.0.1",
+        "minimalistic-crypto-utils": "1.0.1"
+      }
+    },
+    "hoek": {
+      "version": "2.16.3",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+      "dev": true
+    },
+    "homedir-polyfill": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz",
+      "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=",
+      "dev": true,
+      "requires": {
+        "parse-passwd": "1.0.0"
+      }
+    },
+    "hosted-git-info": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
+      "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==",
+      "dev": true
+    },
+    "hpack.js": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+      "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "obuf": "1.1.2",
+        "readable-stream": "2.3.6",
+        "wbuf": "1.7.3"
+      }
+    },
+    "html-entities": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
+      "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
+      "dev": true
+    },
+    "html-minifier": {
+      "version": "3.5.19",
+      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.19.tgz",
+      "integrity": "sha512-Qr2JC9nsjK8oCrEmuB430ZIA8YWbF3D5LSjywD75FTuXmeqacwHgIM8wp3vHYzzPbklSjp53RdmDuzR4ub2HzA==",
+      "dev": true,
+      "requires": {
+        "camel-case": "3.0.0",
+        "clean-css": "4.1.11",
+        "commander": "2.16.0",
+        "he": "1.1.1",
+        "param-case": "2.1.1",
+        "relateurl": "0.2.7",
+        "uglify-js": "3.4.6"
+      },
+      "dependencies": {
+        "clean-css": {
+          "version": "4.1.11",
+          "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.11.tgz",
+          "integrity": "sha1-Ls3xRaujj1R0DybO/Q/z4D4SXWo=",
+          "dev": true,
+          "requires": {
+            "source-map": "0.5.7"
+          }
+        }
+      }
+    },
+    "html-webpack-plugin": {
+      "version": "2.30.1",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-2.30.1.tgz",
+      "integrity": "sha1-f5xCG36pHsRg9WUn1430hO51N9U=",
+      "dev": true,
+      "requires": {
+        "bluebird": "3.5.1",
+        "html-minifier": "3.5.19",
+        "loader-utils": "0.2.17",
+        "lodash": "4.17.10",
+        "pretty-error": "2.1.1",
+        "toposort": "1.0.7"
+      },
+      "dependencies": {
+        "loader-utils": {
+          "version": "0.2.17",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
+          "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
+          "dev": true,
+          "requires": {
+            "big.js": "3.2.0",
+            "emojis-list": "2.1.0",
+            "json5": "0.5.1",
+            "object-assign": "4.1.1"
+          }
+        }
+      }
+    },
+    "htmlparser2": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz",
+      "integrity": "sha1-zHDQWln2VC5D8OaFyYLhTJJKnv4=",
+      "dev": true,
+      "requires": {
+        "domelementtype": "1.3.0",
+        "domhandler": "2.1.0",
+        "domutils": "1.1.6",
+        "readable-stream": "1.0.34"
+      },
+      "dependencies": {
+        "domutils": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.1.6.tgz",
+          "integrity": "sha1-vdw94Jm5ou+sxRxiPyj0FuzFdIU=",
+          "dev": true,
+          "requires": {
+            "domelementtype": "1.3.0"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        }
+      }
+    },
+    "http-deceiver": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
+      "dev": true
+    },
+    "http-errors": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+      "dev": true,
+      "requires": {
+        "depd": "1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.0",
+        "statuses": "1.4.0"
+      }
+    },
+    "http-parser-js": {
+      "version": "0.4.13",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.13.tgz",
+      "integrity": "sha1-O9bW/ebjFyyTNMOzO2wZPYD+ETc=",
+      "dev": true
+    },
+    "http-proxy": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
+      "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
+      "dev": true,
+      "requires": {
+        "eventemitter3": "3.1.0",
+        "follow-redirects": "1.5.2",
+        "requires-port": "1.0.0"
+      }
+    },
+    "http-proxy-middleware": {
+      "version": "0.17.4",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz",
+      "integrity": "sha1-ZC6ISIUdZvCdTxJJEoRtuutBuDM=",
+      "dev": true,
+      "requires": {
+        "http-proxy": "1.17.0",
+        "is-glob": "3.1.0",
+        "lodash": "4.17.10",
+        "micromatch": "2.3.11"
+      },
+      "dependencies": {
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "2.1.1"
+          }
+        }
+      }
+    },
+    "http-signature": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+      "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "assert-plus": "0.2.0",
+        "jsprim": "1.4.1",
+        "sshpk": "1.14.2"
+      }
+    },
+    "https-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
+      "dev": true
+    },
+    "https-proxy-agent": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz",
+      "integrity": "sha1-NffabEjOTdv6JkiRrFk+5f+GceY=",
+      "dev": true,
+      "requires": {
+        "agent-base": "2.1.1",
+        "debug": "2.6.9",
+        "extend": "3.0.2"
+      }
+    },
+    "iconv-lite": {
+      "version": "0.4.19",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
+      "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==",
+      "dev": true
+    },
+    "ieee754": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz",
+      "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==",
+      "dev": true
+    },
+    "iferr": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
+      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
+      "dev": true
+    },
+    "ignore": {
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+      "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
+      "dev": true
+    },
+    "image-size": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
+      "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
+      "dev": true,
+      "optional": true
+    },
+    "import-cwd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
+      "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
+      "dev": true,
+      "requires": {
+        "import-from": "2.1.0"
+      }
+    },
+    "import-from": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
+      "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
+      "dev": true,
+      "requires": {
+        "resolve-from": "3.0.0"
+      }
+    },
+    "import-local": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-1.0.0.tgz",
+      "integrity": "sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==",
+      "dev": true,
+      "requires": {
+        "pkg-dir": "2.0.0",
+        "resolve-cwd": "2.0.0"
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
+    "in-publish": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
+      "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
+      "dev": true,
+      "optional": true
+    },
+    "indent-string": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+      "dev": true,
+      "requires": {
+        "repeating": "2.0.1"
+      }
+    },
+    "indexof": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
+      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "1.4.0",
+        "wrappy": "1.0.2"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+    },
+    "ini": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "dev": true
+    },
+    "internal-ip": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-1.2.0.tgz",
+      "integrity": "sha1-rp+/k7mEh4eF1QqN4bNWlWBYz1w=",
+      "dev": true,
+      "requires": {
+        "meow": "3.7.0"
+      }
+    },
+    "interpret": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
+      "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=",
+      "dev": true
+    },
+    "intl": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/intl/-/intl-1.2.5.tgz",
+      "integrity": "sha1-giRKIZDE5Bn4Nx9ao02qNCDiq94="
+    },
+    "invariant": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "dev": true,
+      "requires": {
+        "loose-envify": "1.4.0"
+      }
+    },
+    "invert-kv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+      "dev": true
+    },
+    "ip": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
+      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
+      "dev": true
+    },
+    "ipaddr.js": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz",
+      "integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4=",
+      "dev": true
+    },
+    "is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "requires": {
+        "kind-of": "3.2.2"
+      }
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "dev": true
+    },
+    "is-binary-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "dev": true,
+      "requires": {
+        "binary-extensions": "1.11.0"
+      }
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "is-builtin-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
+      "dev": true,
+      "requires": {
+        "builtin-modules": "1.1.1"
+      }
+    },
+    "is-callable": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
+      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
+      "dev": true
+    },
+    "is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "requires": {
+        "kind-of": "3.2.2"
+      }
+    },
+    "is-date-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
+      "dev": true
+    },
+    "is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "requires": {
+        "is-accessor-descriptor": "0.1.6",
+        "is-data-descriptor": "0.1.4",
+        "kind-of": "5.1.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
+      }
+    },
+    "is-directory": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
+      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
+      "dev": true
+    },
+    "is-dotfile": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
+      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
+      "dev": true
+    },
+    "is-equal-shallow": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
+      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
+      "dev": true,
+      "requires": {
+        "is-primitive": "2.0.0"
+      }
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true
+    },
+    "is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+      "dev": true
+    },
+    "is-finite": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
+      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
+      "dev": true,
+      "requires": {
+        "number-is-nan": "1.0.1"
+      }
+    },
+    "is-fullwidth-code-point": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "dev": true,
+      "requires": {
+        "number-is-nan": "1.0.1"
+      }
+    },
+    "is-glob": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+      "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+      "dev": true,
+      "requires": {
+        "is-extglob": "1.0.0"
+      }
+    },
+    "is-number": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
+      "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
+      "dev": true,
+      "requires": {
+        "kind-of": "3.2.2"
+      }
+    },
+    "is-path-cwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
+      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
+      "dev": true
+    },
+    "is-path-in-cwd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
+      "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
+      "dev": true,
+      "requires": {
+        "is-path-inside": "1.0.1"
+      }
+    },
+    "is-path-inside": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
+      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
+      "dev": true,
+      "requires": {
+        "path-is-inside": "1.0.2"
+      }
+    },
+    "is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "requires": {
+        "isobject": "3.0.1"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        }
+      }
+    },
+    "is-posix-bracket": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
+      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
+      "dev": true
+    },
+    "is-primitive": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
+      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
+      "dev": true
+    },
+    "is-regex": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "dev": true,
+      "requires": {
+        "has": "1.0.3"
+      }
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true
+    },
+    "is-symbol": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
+      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=",
+      "dev": true
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
+    },
+    "is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+      "dev": true
+    },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true
+    },
+    "is-wsl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
+      "dev": true
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
+    "isbinaryfile": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
+      "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
+      "dev": true,
+      "requires": {
+        "buffer-alloc": "1.2.0"
+      }
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "isobject": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+      "dev": true,
+      "requires": {
+        "isarray": "1.0.0"
+      }
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "dev": true
+    },
+    "istanbul-api": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.3.1.tgz",
+      "integrity": "sha512-duj6AlLcsWNwUpfyfHt0nWIeRiZpuShnP40YTxOGQgtaN8fd6JYSxsvxUphTDy8V5MfDXo4s/xVCIIvVCO808g==",
+      "dev": true,
+      "requires": {
+        "async": "2.6.1",
+        "compare-versions": "3.3.0",
+        "fileset": "2.0.3",
+        "istanbul-lib-coverage": "1.2.0",
+        "istanbul-lib-hook": "1.2.1",
+        "istanbul-lib-instrument": "1.10.1",
+        "istanbul-lib-report": "1.1.4",
+        "istanbul-lib-source-maps": "1.2.5",
+        "istanbul-reports": "1.3.0",
+        "js-yaml": "3.7.0",
+        "mkdirp": "0.5.1",
+        "once": "1.4.0"
+      }
+    },
+    "istanbul-instrumenter-loader": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz",
+      "integrity": "sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w==",
+      "dev": true,
+      "requires": {
+        "convert-source-map": "1.5.1",
+        "istanbul-lib-instrument": "1.10.1",
+        "loader-utils": "1.1.0",
+        "schema-utils": "0.3.0"
+      },
+      "dependencies": {
+        "schema-utils": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
+          "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
+          "dev": true,
+          "requires": {
+            "ajv": "5.5.2"
+          }
+        }
+      }
+    },
+    "istanbul-lib-coverage": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz",
+      "integrity": "sha512-GvgM/uXRwm+gLlvkWHTjDAvwynZkL9ns15calTrmhGgowlwJBbWMYzWbKqE2DT6JDP1AFXKa+Zi0EkqNCUqY0A==",
+      "dev": true
+    },
+    "istanbul-lib-hook": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.2.1.tgz",
+      "integrity": "sha512-eLAMkPG9FU0v5L02lIkcj/2/Zlz9OuluaXikdr5iStk8FDbSwAixTK9TkYxbF0eNnzAJTwM2fkV2A1tpsIp4Jg==",
+      "dev": true,
+      "requires": {
+        "append-transform": "1.0.0"
+      }
+    },
+    "istanbul-lib-instrument": {
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.1.tgz",
+      "integrity": "sha512-1dYuzkOCbuR5GRJqySuZdsmsNKPL3PTuyPevQfoCXJePT9C8y1ga75neU+Tuy9+yS3G/dgx8wgOmp2KLpgdoeQ==",
+      "dev": true,
+      "requires": {
+        "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.0",
+        "semver": "5.5.0"
+      }
+    },
+    "istanbul-lib-report": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.4.tgz",
+      "integrity": "sha512-Azqvq5tT0U09nrncK3q82e/Zjkxa4tkFZv7E6VcqP0QCPn6oNljDPfrZEC/umNXds2t7b8sRJfs6Kmpzt8m2kA==",
+      "dev": true,
+      "requires": {
+        "istanbul-lib-coverage": "1.2.0",
+        "mkdirp": "0.5.1",
+        "path-parse": "1.0.5",
+        "supports-color": "3.2.3"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "istanbul-lib-source-maps": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.5.tgz",
+      "integrity": "sha512-8O2T/3VhrQHn0XcJbP1/GN7kXMiRAlPi+fj3uEHrjBD8Oz7Py0prSC25C09NuAZS6bgW1NNKAvCSHZXB0irSGA==",
+      "dev": true,
+      "requires": {
+        "debug": "3.1.0",
+        "istanbul-lib-coverage": "1.2.0",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.2",
+        "source-map": "0.5.7"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "istanbul-reports": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.3.0.tgz",
+      "integrity": "sha512-y2Z2IMqE1gefWUaVjrBm0mSKvUkaBy9Vqz8iwr/r40Y9hBbIteH5wqHG/9DLTfJ9xUnUT2j7A3+VVJ6EaYBllA==",
+      "dev": true,
+      "requires": {
+        "handlebars": "4.0.11"
+      },
+      "dependencies": {
+        "async": {
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+          "dev": true
+        },
+        "camelcase": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+          "dev": true,
+          "optional": true
+        },
+        "cliui": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+          "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "center-align": "0.1.3",
+            "right-align": "0.1.3",
+            "wordwrap": "0.0.2"
+          },
+          "dependencies": {
+            "wordwrap": {
+              "version": "0.0.2",
+              "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+              "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "handlebars": {
+          "version": "4.0.11",
+          "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz",
+          "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=",
+          "dev": true,
+          "requires": {
+            "async": "1.5.2",
+            "optimist": "0.6.1",
+            "source-map": "0.4.4",
+            "uglify-js": "2.8.29"
+          }
+        },
+        "optimist": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+          "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8",
+            "wordwrap": "0.0.3"
+          }
+        },
+        "source-map": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+          "dev": true,
+          "requires": {
+            "amdefine": "1.0.1"
+          }
+        },
+        "uglify-js": {
+          "version": "2.8.29",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
+          "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "source-map": "0.5.7",
+            "uglify-to-browserify": "1.0.2",
+            "yargs": "3.10.0"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "yargs": {
+          "version": "3.10.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "camelcase": "1.2.1",
+            "cliui": "2.1.0",
+            "decamelize": "1.2.0",
+            "window-size": "0.1.0"
+          }
+        }
+      }
+    },
+    "jasmine": {
+      "version": "2.99.0",
+      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.99.0.tgz",
+      "integrity": "sha1-jKctEC5jm4Z8ZImFbg4YqceqQrc=",
+      "dev": true,
+      "requires": {
+        "exit": "0.1.2",
+        "glob": "7.1.2",
+        "jasmine-core": "2.99.1"
+      },
+      "dependencies": {
+        "jasmine-core": {
+          "version": "2.99.1",
+          "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.99.1.tgz",
+          "integrity": "sha1-5kAN8ea1bhMLYcS80JPap/boyhU=",
+          "dev": true
+        }
+      }
+    },
+    "jasmine-core": {
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.6.4.tgz",
+      "integrity": "sha1-3skmzQqfoof7bbXHVfpIfnTOysU=",
+      "dev": true
+    },
+    "jasmine-spec-reporter": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.1.1.tgz",
+      "integrity": "sha1-Wm1Yq11hvqcwn7wnkjlRF1axtYg=",
+      "dev": true,
+      "requires": {
+        "colors": "1.1.2"
+      }
+    },
+    "jasminewd2": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-2.2.0.tgz",
+      "integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=",
+      "dev": true
+    },
+    "js-base64": {
+      "version": "2.4.8",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.8.tgz",
+      "integrity": "sha512-hm2nYpDrwoO/OzBhdcqs/XGT6XjSuSSCVEpia+Kl2J6x4CYt5hISlVL/AYU1khoDXv0AQVgxtdJySb9gjAn56Q==",
+      "dev": true,
+      "optional": true
+    },
+    "js-tokens": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz",
+      "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=",
+      "dev": true,
+      "requires": {
+        "argparse": "1.0.10",
+        "esprima": "2.7.3"
+      }
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "dev": true,
+      "optional": true
+    },
+    "jsesc": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+      "dev": true
+    },
+    "json-loader": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz",
+      "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
+      "dev": true
+    },
+    "json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+      "dev": true
+    },
+    "json-schema-traverse": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
+      "dev": true
+    },
+    "json-stable-stringify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
+      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "jsonify": "0.0.0"
+      }
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true
+    },
+    "json3": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
+      "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
+      "dev": true
+    },
+    "json5": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+      "dev": true
+    },
+    "jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11"
+      }
+    },
+    "jsonify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
+      "dev": true,
+      "optional": true
+    },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        }
+      }
+    },
+    "jsrsasign": {
+      "version": "8.0.12",
+      "resolved": "https://registry.npmjs.org/jsrsasign/-/jsrsasign-8.0.12.tgz",
+      "integrity": "sha1-Iqu5ZW00owuVMENnIINeicLlwxY="
+    },
+    "karma": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz",
+      "integrity": "sha512-k5pBjHDhmkdaUccnC7gE3mBzZjcxyxYsYVaqiL2G5AqlfLyBO5nw2VdNK+O16cveEPd/gIOWULH7gkiYYwVNHg==",
+      "dev": true,
+      "requires": {
+        "bluebird": "3.5.1",
+        "body-parser": "1.18.2",
+        "chokidar": "1.7.0",
+        "colors": "1.1.2",
+        "combine-lists": "1.0.1",
+        "connect": "3.6.6",
+        "core-js": "2.4.1",
+        "di": "0.0.1",
+        "dom-serialize": "2.2.1",
+        "expand-braces": "0.1.2",
+        "glob": "7.1.2",
+        "graceful-fs": "4.1.11",
+        "http-proxy": "1.17.0",
+        "isbinaryfile": "3.0.3",
+        "lodash": "3.10.1",
+        "log4js": "0.6.38",
+        "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": "1.7.3",
+        "source-map": "0.5.7",
+        "tmp": "0.0.31",
+        "useragent": "2.3.0"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "3.10.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
+          "dev": true
+        },
+        "optimist": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+          "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8",
+            "wordwrap": "0.0.3"
+          }
+        }
+      }
+    },
+    "karma-chrome-launcher": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.1.1.tgz",
+      "integrity": "sha1-IWh5xorATY1RQOmWGboEtZr9Rs8=",
+      "dev": true,
+      "requires": {
+        "fs-access": "1.0.1",
+        "which": "1.3.1"
+      }
+    },
+    "karma-cli": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/karma-cli/-/karma-cli-1.0.1.tgz",
+      "integrity": "sha1-rmw8WKMTodALRRZMRVubhs4X+WA=",
+      "dev": true,
+      "requires": {
+        "resolve": "1.8.1"
+      }
+    },
+    "karma-coverage-istanbul-reporter": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-1.4.3.tgz",
+      "integrity": "sha1-O13/RmT6W41RlrmInj9hwforgNk=",
+      "dev": true,
+      "requires": {
+        "istanbul-api": "1.3.1",
+        "minimatch": "3.0.4"
+      }
+    },
+    "karma-jasmine": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-1.1.2.tgz",
+      "integrity": "sha1-OU8rJf+0pkS5rabyLUQ+L9CIhsM=",
+      "dev": true
+    },
+    "karma-jasmine-html-reporter": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-0.2.2.tgz",
+      "integrity": "sha1-SKjl7xiAdhfuK14zwRlMNbQ5Ukw=",
+      "dev": true,
+      "requires": {
+        "karma-jasmine": "1.1.2"
+      }
+    },
+    "karma-source-map-support": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.3.0.tgz",
+      "integrity": "sha512-HcPqdAusNez/ywa+biN4EphGz62MmQyPggUsDfsHqa7tSe4jdsxgvTKuDfIazjL+IOxpVWyT7Pr4dhAV+sxX5Q==",
+      "dev": true,
+      "requires": {
+        "source-map-support": "0.5.6"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "source-map-support": {
+          "version": "0.5.6",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.6.tgz",
+          "integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==",
+          "dev": true,
+          "requires": {
+            "buffer-from": "1.1.1",
+            "source-map": "0.6.1"
+          }
+        }
+      }
+    },
+    "killable": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.0.tgz",
+      "integrity": "sha1-2ouEvUfeU5WHj5XWTQLyRJ/gXms=",
+      "dev": true
+    },
+    "kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "requires": {
+        "is-buffer": "1.1.6"
+      }
+    },
+    "lazy-cache": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
+      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
+      "dev": true
+    },
+    "lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+      "dev": true,
+      "requires": {
+        "invert-kv": "1.0.0"
+      }
+    },
+    "less": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/less/-/less-2.7.3.tgz",
+      "integrity": "sha512-KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ==",
+      "dev": true,
+      "requires": {
+        "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.81.0",
+        "source-map": "0.5.7"
+      }
+    },
+    "less-loader": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-4.1.0.tgz",
+      "integrity": "sha512-KNTsgCE9tMOM70+ddxp9yyt9iHqgmSs0yTZc5XH5Wo+g80RWRIYNqE58QJKm/yMud5wZEvz50ugRDuzVIkyahg==",
+      "dev": true,
+      "requires": {
+        "clone": "2.1.2",
+        "loader-utils": "1.1.0",
+        "pify": "3.0.0"
+      }
+    },
+    "license-webpack-plugin": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-1.4.0.tgz",
+      "integrity": "sha512-iwuNFMWbXS76WiQXJBTs8/7Tby4NQnY8AIkBMuJG5El79UT8zWrJQMfpW+KRXt4Y2Bs5uk+Myg/MO7ROSF8jzA==",
+      "dev": true,
+      "requires": {
+        "ejs": "2.6.1"
+      }
+    },
+    "load-json-file": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+      "dev": true,
+      "requires": {
+        "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": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "loader-runner": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz",
+      "integrity": "sha1-9IKuqC1UPgeSFwDVpG7yb9rGuKI=",
+      "dev": true
+    },
+    "loader-utils": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
+      "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
+      "dev": true,
+      "requires": {
+        "big.js": "3.2.0",
+        "emojis-list": "2.1.0",
+        "json5": "0.5.1"
+      }
+    },
+    "locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "dev": true,
+      "requires": {
+        "p-locate": "2.0.0",
+        "path-exists": "3.0.0"
+      }
+    },
+    "lodash": {
+      "version": "4.17.10",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
+      "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==",
+      "dev": true
+    },
+    "lodash.assign": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
+      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
+      "dev": true,
+      "optional": true
+    },
+    "lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+      "dev": true
+    },
+    "lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
+      "dev": true
+    },
+    "lodash.mergewith": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz",
+      "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==",
+      "dev": true,
+      "optional": true
+    },
+    "lodash.tail": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz",
+      "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=",
+      "dev": true
+    },
+    "log4js": {
+      "version": "0.6.38",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz",
+      "integrity": "sha1-LElBFmldb7JUgJQ9P8hy5mKlIv0=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "1.0.34",
+        "semver": "4.3.6"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "semver": {
+          "version": "4.3.6",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
+          "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
+          "dev": true
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        }
+      }
+    },
+    "loglevel": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.1.tgz",
+      "integrity": "sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=",
+      "dev": true
+    },
+    "longest": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
+      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
+      "dev": true
+    },
+    "loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dev": true,
+      "requires": {
+        "js-tokens": "3.0.2"
+      }
+    },
+    "loud-rejection": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
+      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
+      "dev": true,
+      "requires": {
+        "currently-unhandled": "0.4.1",
+        "signal-exit": "3.0.2"
+      }
+    },
+    "lower-case": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
+      "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
+      "dev": true
+    },
+    "lru-cache": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
+      "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
+      "dev": true,
+      "requires": {
+        "pseudomap": "1.0.2",
+        "yallist": "2.1.2"
+      }
+    },
+    "magic-string": {
+      "version": "0.22.5",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz",
+      "integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==",
+      "dev": true,
+      "requires": {
+        "vlq": "0.2.3"
+      }
+    },
+    "make-dir": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+      "dev": true,
+      "requires": {
+        "pify": "3.0.0"
+      }
+    },
+    "make-error": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.4.tgz",
+      "integrity": "sha512-0Dab5btKVPhibSalc9QGXb559ED7G7iLjFXBaj9Wq8O3vorueR5K5jaE3hkG6ZQINyhA/JgG6Qk4qdFQjsYV6g==",
+      "dev": true
+    },
+    "map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+      "dev": true
+    },
+    "map-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+      "dev": true
+    },
+    "map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "dev": true,
+      "requires": {
+        "object-visit": "1.0.1"
+      }
+    },
+    "math-random": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz",
+      "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=",
+      "dev": true
+    },
+    "md5.js": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
+      "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
+      "dev": true,
+      "requires": {
+        "hash-base": "3.0.4",
+        "inherits": "2.0.3"
+      }
+    },
+    "media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+      "dev": true
+    },
+    "mem": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
+      "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
+      "dev": true,
+      "requires": {
+        "mimic-fn": "1.2.0"
+      }
+    },
+    "memory-fs": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "dev": true,
+      "requires": {
+        "errno": "0.1.7",
+        "readable-stream": "2.3.6"
+      }
+    },
+    "meow": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
+      "dev": true,
+      "requires": {
+        "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": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
+    "merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
+      "dev": true
+    },
+    "methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
+    },
+    "micromatch": {
+      "version": "2.3.11",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
+      "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
+      "dev": true,
+      "requires": {
+        "arr-diff": "2.0.0",
+        "array-unique": "0.2.1",
+        "braces": "1.8.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"
+      }
+    },
+    "miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.8",
+        "brorand": "1.1.0"
+      }
+    },
+    "mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
+    },
+    "mime-db": {
+      "version": "1.35.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz",
+      "integrity": "sha512-JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg=="
+    },
+    "mime-types": {
+      "version": "2.1.19",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz",
+      "integrity": "sha512-P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==",
+      "requires": {
+        "mime-db": "1.35.0"
+      }
+    },
+    "mimic-fn": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+      "dev": true
+    },
+    "minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
+    },
+    "minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "requires": {
+        "brace-expansion": "1.1.11"
+      }
+    },
+    "minimist": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+      "dev": true
+    },
+    "mississippi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz",
+      "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==",
+      "dev": true,
+      "requires": {
+        "concat-stream": "1.6.2",
+        "duplexify": "3.6.0",
+        "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"
+      }
+    },
+    "mixin-deep": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
+      "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+      "dev": true,
+      "requires": {
+        "for-in": "1.0.2",
+        "is-extendable": "1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "2.0.4"
+          }
+        }
+      }
+    },
+    "mixin-object": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
+      "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
+      "dev": true,
+      "requires": {
+        "for-in": "0.1.8",
+        "is-extendable": "0.1.1"
+      },
+      "dependencies": {
+        "for-in": {
+          "version": "0.1.8",
+          "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
+          "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=",
+          "dev": true
+        }
+      }
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "dev": true,
+      "requires": {
+        "minimist": "0.0.8"
+      }
+    },
+    "moment": {
+      "version": "2.20.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz",
+      "integrity": "sha512-Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg=="
+    },
+    "moment-es6": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/moment-es6/-/moment-es6-1.0.0.tgz",
+      "integrity": "sha1-VS/PQF1iVlsKH+hObB5peseTMt8=",
+      "requires": {
+        "moment": "2.20.1"
+      }
+    },
+    "move-concurrently": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
+      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+      "dev": true,
+      "requires": {
+        "aproba": "1.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": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
+    "multicast-dns": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
+      "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
+      "dev": true,
+      "requires": {
+        "dns-packet": "1.3.1",
+        "thunky": "1.0.2"
+      }
+    },
+    "multicast-dns-service-types": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
+      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
+      "dev": true
+    },
+    "nan": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
+      "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
+      "dev": true,
+      "optional": true
+    },
+    "nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "dev": true,
+      "requires": {
+        "arr-diff": "4.0.0",
+        "array-unique": "0.3.2",
+        "define-property": "2.0.2",
+        "extend-shallow": "3.0.2",
+        "fragment-cache": "0.2.1",
+        "is-windows": "1.0.2",
+        "kind-of": "6.0.2",
+        "object.pick": "1.3.0",
+        "regex-not": "1.0.2",
+        "snapdragon": "0.8.2",
+        "to-regex": "3.0.2"
+      },
+      "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        }
+      }
+    },
+    "negotiator": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
+      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
+      "dev": true
+    },
+    "neo-async": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.5.1.tgz",
+      "integrity": "sha512-3KL3fvuRkZ7s4IFOMfztb7zJp3QaVWnBeGoJlgB38XnCRPj/0tLzzLG5IB8NYOHbJ8g8UGrgZv44GLDk6CxTxA==",
+      "dev": true
+    },
+    "next-tick": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw="
+    },
+    "ng2-charts": {
+      "version": "1.6.0",
+      "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.7.2"
+      },
+      "dependencies": {
+        "chart.js": {
+          "version": "2.7.2",
+          "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.7.2.tgz",
+          "integrity": "sha512-90wl3V9xRZ8tnMvMlpcW+0Yg13BelsGS9P9t0ClaDxv/hdypHDr/YAGf+728m11P5ljwyB0ZHfPKCapZFqSqYA==",
+          "requires": {
+            "chartjs-color": "2.2.0",
+            "moment": "2.20.1"
+          }
+        }
+      }
+    },
+    "no-case": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
+      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
+      "dev": true,
+      "requires": {
+        "lower-case": "1.1.4"
+      }
+    },
+    "node-ensure": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/node-ensure/-/node-ensure-0.0.0.tgz",
+      "integrity": "sha1-7K52QVDemYYexcgQ/V0Jaxg5Mqc="
+    },
+    "node-forge": {
+      "version": "0.7.5",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz",
+      "integrity": "sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==",
+      "dev": true
+    },
+    "node-gyp": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.7.0.tgz",
+      "integrity": "sha512-qDQE/Ft9xXP6zphwx4sD0t+VhwV7yFaloMpfbL2QnnDZcyaiakWlLdtFGGQfTAwpFHdpbRhRxVhIHN1OKAjgbg==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "fstream": "1.0.11",
+        "glob": "7.1.2",
+        "graceful-fs": "4.1.11",
+        "mkdirp": "0.5.1",
+        "nopt": "3.0.6",
+        "npmlog": "4.1.2",
+        "osenv": "0.1.5",
+        "request": "2.81.0",
+        "rimraf": "2.6.2",
+        "semver": "5.3.0",
+        "tar": "2.2.1",
+        "which": "1.3.1"
+      },
+      "dependencies": {
+        "nopt": {
+          "version": "3.0.6",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+          "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1.1.1"
+          }
+        },
+        "semver": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "node-libs-browser": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz",
+      "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==",
+      "dev": true,
+      "requires": {
+        "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.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.4",
+        "vm-browserify": "0.0.4"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+          "dev": true
+        }
+      }
+    },
+    "node-modules-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/node-modules-path/-/node-modules-path-1.0.1.tgz",
+      "integrity": "sha1-QAlrCM560OoUaAhjr0ScfHWl0cg=",
+      "dev": true
+    },
+    "node-sass": {
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.9.2.tgz",
+      "integrity": "sha512-LdxoJLZutx0aQXHtWIYwJKMj+9pTjneTcLWJgzf2XbGu0q5pRNqW5QvFCEdm3mc5rJOdru/mzln5d0EZLacf6g==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "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.2",
+        "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.10.0",
+        "node-gyp": "3.7.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"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true,
+          "optional": true
+        },
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true,
+          "optional": true
+        },
+        "aws-sign2": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+          "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+          "dev": true,
+          "optional": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "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"
+          }
+        },
+        "har-schema": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+          "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+          "dev": true,
+          "optional": true
+        },
+        "har-validator": {
+          "version": "5.0.3",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+          "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ajv": "5.5.2",
+            "har-schema": "2.0.0"
+          }
+        },
+        "http-signature": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+          "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0",
+            "jsprim": "1.4.1",
+            "sshpk": "1.14.2"
+          }
+        },
+        "performance-now": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+          "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+          "dev": true,
+          "optional": true
+        },
+        "request": {
+          "version": "2.87.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz",
+          "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aws-sign2": "0.7.0",
+            "aws4": "1.7.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.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.19",
+            "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"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "nopt": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+      "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+      "dev": true,
+      "requires": {
+        "abbrev": "1.1.1",
+        "osenv": "0.1.5"
+      }
+    },
+    "normalize-package-data": {
+      "version": "2.4.0",
+      "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==",
+      "dev": true,
+      "requires": {
+        "hosted-git-info": "2.7.1",
+        "is-builtin-module": "1.0.0",
+        "semver": "5.5.0",
+        "validate-npm-package-license": "3.0.4"
+      }
+    },
+    "normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "dev": true,
+      "requires": {
+        "remove-trailing-separator": "1.1.0"
+      }
+    },
+    "normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+      "dev": true
+    },
+    "npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "dev": true,
+      "requires": {
+        "path-key": "2.0.1"
+      }
+    },
+    "npmlog": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+      "dev": true,
+      "requires": {
+        "are-we-there-yet": "1.1.5",
+        "console-control-strings": "1.1.0",
+        "gauge": "2.7.4",
+        "set-blocking": "2.0.0"
+      }
+    },
+    "nth-check": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
+      "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=",
+      "dev": true,
+      "requires": {
+        "boolbase": "1.0.0"
+      }
+    },
+    "null-check": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz",
+      "integrity": "sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=",
+      "dev": true
+    },
+    "num2fraction": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
+      "dev": true
+    },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "dev": true
+    },
+    "oauth-sign": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
+      "dev": true
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true
+    },
+    "object-component": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz",
+      "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=",
+      "dev": true
+    },
+    "object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "dev": true,
+      "requires": {
+        "copy-descriptor": "0.1.1",
+        "define-property": "0.2.5",
+        "kind-of": "3.2.2"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "0.1.6"
+          }
+        }
+      }
+    },
+    "object-keys": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz",
+      "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==",
+      "dev": true
+    },
+    "object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "dev": true,
+      "requires": {
+        "isobject": "3.0.1"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        }
+      }
+    },
+    "object.omit": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
+      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
+      "dev": true,
+      "requires": {
+        "for-own": "0.1.5",
+        "is-extendable": "0.1.1"
+      }
+    },
+    "object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "dev": true,
+      "requires": {
+        "isobject": "3.0.1"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        }
+      }
+    },
+    "obuf": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
+      "dev": true
+    },
+    "on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "dev": true,
+      "requires": {
+        "ee-first": "1.1.1"
+      }
+    },
+    "on-headers": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz",
+      "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=",
+      "dev": true
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1.0.2"
+      }
+    },
+    "opn": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/opn/-/opn-5.1.0.tgz",
+      "integrity": "sha512-iPNl7SyM8L30Rm1sjGdLLheyHVw5YXVfi3SKWJzBI7efxRwHojfRFjwE/OLM6qp9xJYMgab8WicTU1cPoY+Hpg==",
+      "dev": true,
+      "requires": {
+        "is-wsl": "1.1.0"
+      }
+    },
+    "options": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz",
+      "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=",
+      "dev": true
+    },
+    "original": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/original/-/original-1.0.1.tgz",
+      "integrity": "sha512-IEvtB5vM5ULvwnqMxWBLxkS13JIEXbakizMSo3yoPNPCIWzg8TG3Usn/UhXoZFM/m+FuEA20KdzPSFq/0rS+UA==",
+      "dev": true,
+      "requires": {
+        "url-parse": "1.4.3"
+      }
+    },
+    "os-browserify": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
+      "dev": true
+    },
+    "os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "dev": true
+    },
+    "os-locale": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+      "dev": true,
+      "requires": {
+        "lcid": "1.0.0"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true
+    },
+    "osenv": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+      "dev": true,
+      "requires": {
+        "os-homedir": "1.0.2",
+        "os-tmpdir": "1.0.2"
+      }
+    },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "dev": true
+    },
+    "p-limit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "dev": true,
+      "requires": {
+        "p-try": "1.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dev": true,
+      "requires": {
+        "p-limit": "1.3.0"
+      }
+    },
+    "p-map": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
+      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
+      "dev": true
+    },
+    "p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "dev": true
+    },
+    "pako": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
+      "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==",
+      "dev": true
+    },
+    "parallel-transform": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
+      "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
+      "dev": true,
+      "requires": {
+        "cyclist": "0.2.2",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6"
+      }
+    },
+    "param-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
+      "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
+      "dev": true,
+      "requires": {
+        "no-case": "2.3.2"
+      }
+    },
+    "parse-asn1": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
+      "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
+      "dev": true,
+      "requires": {
+        "asn1.js": "4.10.1",
+        "browserify-aes": "1.2.0",
+        "create-hash": "1.2.0",
+        "evp_bytestokey": "1.0.3",
+        "pbkdf2": "3.0.16"
+      }
+    },
+    "parse-glob": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
+      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
+      "dev": true,
+      "requires": {
+        "glob-base": "0.3.0",
+        "is-dotfile": "1.0.3",
+        "is-extglob": "1.0.0",
+        "is-glob": "2.0.1"
+      }
+    },
+    "parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "dev": true,
+      "requires": {
+        "error-ex": "1.3.2"
+      }
+    },
+    "parse-passwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
+      "dev": true
+    },
+    "parsejson": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz",
+      "integrity": "sha1-q343WfIJ7OmUN5c/fQ8fZK4OZKs=",
+      "dev": true,
+      "requires": {
+        "better-assert": "1.0.2"
+      }
+    },
+    "parseqs": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
+      "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
+      "dev": true,
+      "requires": {
+        "better-assert": "1.0.2"
+      }
+    },
+    "parseuri": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz",
+      "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
+      "dev": true,
+      "requires": {
+        "better-assert": "1.0.2"
+      }
+    },
+    "parseurl": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
+      "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=",
+      "dev": true
+    },
+    "pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+      "dev": true
+    },
+    "path-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
+      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
+      "dev": true
+    },
+    "path-dirname": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+      "dev": true
+    },
+    "path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "dev": true
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
+      "dev": true
+    },
+    "path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
+      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
+      "dev": true
+    },
+    "path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
+      "dev": true
+    },
+    "path-type": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+      "dev": true,
+      "requires": {
+        "pify": "3.0.0"
+      }
+    },
+    "pbkdf2": {
+      "version": "3.0.16",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz",
+      "integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==",
+      "dev": true,
+      "requires": {
+        "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": {
+      "version": "1.5.404",
+      "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-1.5.404.tgz",
+      "integrity": "sha1-hYXGUWquIU1ZCXXo+ys8PzrxTO8=",
+      "requires": {
+        "node-ensure": "0.0.0"
+      }
+    },
+    "performance-now": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
+      "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
+      "dev": true,
+      "optional": true
+    },
+    "pify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+      "dev": true
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
+      "requires": {
+        "pinkie": "2.0.4"
+      }
+    },
+    "pkg-dir": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+      "dev": true,
+      "requires": {
+        "find-up": "2.1.0"
+      }
+    },
+    "portfinder": {
+      "version": "1.0.13",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.13.tgz",
+      "integrity": "sha1-uzLs2HwnEErm7kS1o8y/Drsa7ek=",
+      "dev": true,
+      "requires": {
+        "async": "1.5.2",
+        "debug": "2.6.9",
+        "mkdirp": "0.5.1"
+      },
+      "dependencies": {
+        "async": {
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+          "dev": true
+        }
+      }
+    },
+    "posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+      "dev": true
+    },
+    "postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "requires": {
+        "chalk": "2.4.1",
+        "source-map": "0.6.1",
+        "supports-color": "5.4.0"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        }
+      }
+    },
+    "postcss-import": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-11.1.0.tgz",
+      "integrity": "sha512-5l327iI75POonjxkXgdRCUS+AlzAdBx4pOvMEhTKTCjb1p8IEeVR9yx3cPbmN7LIWJLbfnIXxAhoB4jpD0c/Cw==",
+      "dev": true,
+      "requires": {
+        "postcss": "6.0.23",
+        "postcss-value-parser": "3.3.0",
+        "read-cache": "1.0.0",
+        "resolve": "1.8.1"
+      }
+    },
+    "postcss-load-config": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.0.0.tgz",
+      "integrity": "sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==",
+      "dev": true,
+      "requires": {
+        "cosmiconfig": "4.0.0",
+        "import-cwd": "2.1.0"
+      }
+    },
+    "postcss-loader": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.1.6.tgz",
+      "integrity": "sha512-hgiWSc13xVQAq25cVw80CH0l49ZKlAnU1hKPOdRrNj89bokRr/bZF2nT+hebPPF9c9xs8c3gw3Fr2nxtmXYnNg==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "1.1.0",
+        "postcss": "6.0.23",
+        "postcss-load-config": "2.0.0",
+        "schema-utils": "0.4.5"
+      }
+    },
+    "postcss-url": {
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/postcss-url/-/postcss-url-7.3.2.tgz",
+      "integrity": "sha512-QMV5mA+pCYZQcUEPQkmor9vcPQ2MT+Ipuu8qdi1gVxbNiIiErEGft+eny1ak19qALoBkccS5AHaCaCDzh7b9MA==",
+      "dev": true,
+      "requires": {
+        "mime": "1.6.0",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.1",
+        "postcss": "6.0.23",
+        "xxhashjs": "0.2.2"
+      }
+    },
+    "postcss-value-parser": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz",
+      "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=",
+      "dev": true
+    },
+    "preserve": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
+      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
+      "dev": true
+    },
+    "pretty-error": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz",
+      "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=",
+      "dev": true,
+      "requires": {
+        "renderkid": "2.0.1",
+        "utila": "0.4.0"
+      }
+    },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "dev": true
+    },
+    "process-nextick-args": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
+    },
+    "promise": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
+      "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "asap": "2.0.6"
+      }
+    },
+    "promise-inflight": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
+      "dev": true
+    },
+    "protractor": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/protractor/-/protractor-5.1.2.tgz",
+      "integrity": "sha1-myIXQXCaTGLVzVPGqt1UpxE36V8=",
+      "dev": true,
+      "requires": {
+        "@types/node": "6.0.115",
+        "@types/q": "0.0.32",
+        "@types/selenium-webdriver": "2.53.43",
+        "blocking-proxy": "0.0.5",
+        "chalk": "1.1.3",
+        "glob": "7.1.2",
+        "jasmine": "2.99.0",
+        "jasminewd2": "2.2.0",
+        "optimist": "0.6.1",
+        "q": "1.4.1",
+        "saucelabs": "1.3.0",
+        "selenium-webdriver": "3.0.1",
+        "source-map-support": "0.4.18",
+        "webdriver-js-extender": "1.0.0",
+        "webdriver-manager": "12.1.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        },
+        "aws-sign2": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+          "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "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": {
+          "version": "2.2.2",
+          "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
+          "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
+          "dev": true,
+          "requires": {
+            "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": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
+          "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
+          "dev": true,
+          "requires": {
+            "array-union": "1.0.2",
+            "arrify": "1.0.1",
+            "glob": "7.1.2",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
+          }
+        },
+        "har-schema": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+          "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+          "dev": true
+        },
+        "har-validator": {
+          "version": "5.0.3",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+          "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
+          "dev": true,
+          "requires": {
+            "ajv": "5.5.2",
+            "har-schema": "2.0.0"
+          }
+        },
+        "http-signature": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+          "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+          "dev": true,
+          "requires": {
+            "assert-plus": "1.0.0",
+            "jsprim": "1.4.1",
+            "sshpk": "1.14.2"
+          }
+        },
+        "optimist": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+          "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8",
+            "wordwrap": "0.0.3"
+          }
+        },
+        "performance-now": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+          "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+          "dev": true
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        },
+        "q": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz",
+          "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=",
+          "dev": true
+        },
+        "request": {
+          "version": "2.87.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz",
+          "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==",
+          "dev": true,
+          "requires": {
+            "aws-sign2": "0.7.0",
+            "aws4": "1.7.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.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.19",
+            "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"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        },
+        "webdriver-manager": {
+          "version": "12.1.0",
+          "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.1.0.tgz",
+          "integrity": "sha512-oEc5fmkpz6Yh6udhwir5m0eN5mgRPq9P/NU5YWuT3Up5slt6Zz+znhLU7q4+8rwCZz/Qq3Fgpr/4oao7NPCm2A==",
+          "dev": true,
+          "requires": {
+            "adm-zip": "0.4.11",
+            "chalk": "1.1.3",
+            "del": "2.2.2",
+            "glob": "7.1.2",
+            "ini": "1.3.5",
+            "minimist": "1.2.0",
+            "q": "1.4.1",
+            "request": "2.87.0",
+            "rimraf": "2.6.2",
+            "semver": "5.5.0",
+            "xml2js": "0.4.19"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+              "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+              "dev": true
+            }
+          }
+        }
+      }
+    },
+    "proxy-addr": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz",
+      "integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==",
+      "dev": true,
+      "requires": {
+        "forwarded": "0.1.2",
+        "ipaddr.js": "1.8.0"
+      }
+    },
+    "prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+      "dev": true
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
+      "dev": true
+    },
+    "public-encrypt": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz",
+      "integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.8",
+        "browserify-rsa": "4.0.1",
+        "create-hash": "1.2.0",
+        "parse-asn1": "5.1.1",
+        "randombytes": "2.0.6"
+      }
+    },
+    "pump": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "1.4.1",
+        "once": "1.4.0"
+      }
+    },
+    "pumpify": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+      "dev": true,
+      "requires": {
+        "duplexify": "3.6.0",
+        "inherits": "2.0.3",
+        "pump": "2.0.1"
+      }
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true
+    },
+    "qjobs": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
+      "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
+      "dev": true
+    },
+    "qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+    },
+    "querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+      "dev": true
+    },
+    "querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+      "dev": true
+    },
+    "querystringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.0.0.tgz",
+      "integrity": "sha512-eTPo5t/4bgaMNZxyjWx6N2a6AuE0mq51KWvpc7nU/MAqixcI6v6KrGUKES0HaomdnolQBBXU/++X6/QQ9KL4tw==",
+      "dev": true
+    },
+    "randomatic": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz",
+      "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==",
+      "dev": true,
+      "requires": {
+        "is-number": "4.0.0",
+        "kind-of": "6.0.2",
+        "math-random": "1.0.1"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        }
+      }
+    },
+    "randombytes": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
+      "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "dev": true,
+      "requires": {
+        "randombytes": "2.0.6",
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "range-parser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
+      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
+      "dev": true
+    },
+    "raphael": {
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/raphael/-/raphael-2.2.7.tgz",
+      "integrity": "sha1-IxsZFB+NCGmG2PrOtm+LVi7iyBA=",
+      "requires": {
+        "eve-raphael": "0.5.0"
+      }
+    },
+    "raw-body": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
+      "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
+      "dev": true,
+      "requires": {
+        "bytes": "3.0.0",
+        "http-errors": "1.6.2",
+        "iconv-lite": "0.4.19",
+        "unpipe": "1.0.0"
+      },
+      "dependencies": {
+        "depd": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
+          "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
+          "dev": true
+        },
+        "http-errors": {
+          "version": "1.6.2",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
+          "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
+          "dev": true,
+          "requires": {
+            "depd": "1.1.1",
+            "inherits": "2.0.3",
+            "setprototypeof": "1.0.3",
+            "statuses": "1.4.0"
+          }
+        },
+        "setprototypeof": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
+          "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=",
+          "dev": true
+        }
+      }
+    },
+    "raw-loader": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz",
+      "integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao=",
+      "dev": true
+    },
+    "read-cache": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
+      "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
+      "dev": true,
+      "requires": {
+        "pify": "2.3.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "read-pkg": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+      "dev": true,
+      "requires": {
+        "load-json-file": "1.1.0",
+        "normalize-package-data": "2.4.0",
+        "path-type": "1.1.0"
+      },
+      "dependencies": {
+        "path-type": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+          "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "read-pkg-up": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+      "dev": true,
+      "requires": {
+        "find-up": "1.1.2",
+        "read-pkg": "1.1.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+          "dev": true,
+          "requires": {
+            "path-exists": "2.1.0",
+            "pinkie-promise": "2.0.1"
+          }
+        },
+        "path-exists": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+          "dev": true,
+          "requires": {
+            "pinkie-promise": "2.0.1"
+          }
+        }
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "requires": {
+        "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": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
+      "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "minimatch": "3.0.4",
+        "readable-stream": "2.3.6",
+        "set-immediate-shim": "1.0.1"
+      }
+    },
+    "redent": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
+      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
+      "dev": true,
+      "requires": {
+        "indent-string": "2.1.0",
+        "strip-indent": "1.0.1"
+      }
+    },
+    "reflect-metadata": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.10.tgz",
+      "integrity": "sha1-tPg3BEFqytiZiMmxVjXUfgO5NEo="
+    },
+    "regenerate": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
+      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==",
+      "dev": true
+    },
+    "regenerator-runtime": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
+      "dev": true
+    },
+    "regex-cache": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
+      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
+      "dev": true,
+      "requires": {
+        "is-equal-shallow": "0.1.3"
+      }
+    },
+    "regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "3.0.2",
+        "safe-regex": "1.1.0"
+      }
+    },
+    "regexpu-core": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz",
+      "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
+      "dev": true,
+      "requires": {
+        "regenerate": "1.4.0",
+        "regjsgen": "0.2.0",
+        "regjsparser": "0.1.5"
+      }
+    },
+    "regjsgen": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
+      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
+      "dev": true
+    },
+    "regjsparser": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
+      "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
+      "dev": true,
+      "requires": {
+        "jsesc": "0.5.0"
+      }
+    },
+    "relateurl": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
+      "dev": true
+    },
+    "remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+      "dev": true
+    },
+    "renderkid": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.1.tgz",
+      "integrity": "sha1-iYyr/Ivt5Le5ETWj/9Mj5YwNsxk=",
+      "dev": true,
+      "requires": {
+        "css-select": "1.2.0",
+        "dom-converter": "0.1.4",
+        "htmlparser2": "3.3.0",
+        "strip-ansi": "3.0.1",
+        "utila": "0.3.3"
+      },
+      "dependencies": {
+        "utila": {
+          "version": "0.3.3",
+          "resolved": "https://registry.npmjs.org/utila/-/utila-0.3.3.tgz",
+          "integrity": "sha1-1+jn1+MJEHCSsF+NloiCTWM6QiY=",
+          "dev": true
+        }
+      }
+    },
+    "repeat-element": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
+      "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=",
+      "dev": true
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "dev": true
+    },
+    "repeating": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+      "dev": true,
+      "requires": {
+        "is-finite": "1.0.2"
+      }
+    },
+    "request": {
+      "version": "2.81.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
+      "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "aws-sign2": "0.6.0",
+        "aws4": "1.7.0",
+        "caseless": "0.12.0",
+        "combined-stream": "1.0.6",
+        "extend": "3.0.2",
+        "forever-agent": "0.6.1",
+        "form-data": "2.1.4",
+        "har-validator": "4.2.1",
+        "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.19",
+        "oauth-sign": "0.8.2",
+        "performance-now": "0.2.0",
+        "qs": "6.4.0",
+        "safe-buffer": "5.1.2",
+        "stringstream": "0.0.6",
+        "tough-cookie": "2.3.4",
+        "tunnel-agent": "0.6.0",
+        "uuid": "3.3.2"
+      },
+      "dependencies": {
+        "form-data": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+          "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asynckit": "0.4.0",
+            "combined-stream": "1.0.6",
+            "mime-types": "2.1.19"
+          }
+        },
+        "qs": {
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
+          "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true
+    },
+    "require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true
+    },
+    "require-main-filename": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+      "dev": true
+    },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
+      "dev": true
+    },
+    "resolve": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz",
+      "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==",
+      "dev": true,
+      "requires": {
+        "path-parse": "1.0.5"
+      }
+    },
+    "resolve-cwd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
+      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+      "dev": true,
+      "requires": {
+        "resolve-from": "3.0.0"
+      }
+    },
+    "resolve-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+      "dev": true
+    },
+    "resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+      "dev": true
+    },
+    "ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true
+    },
+    "right-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
+      "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
+      "dev": true,
+      "requires": {
+        "align-text": "0.1.4"
+      }
+    },
+    "rimraf": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.2"
+      }
+    },
+    "ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dev": true,
+      "requires": {
+        "hash-base": "3.0.4",
+        "inherits": "2.0.3"
+      }
+    },
+    "run-queue": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
+      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
+      "dev": true,
+      "requires": {
+        "aproba": "1.2.0"
+      }
+    },
+    "rxjs": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.0.0.tgz",
+      "integrity": "sha512-2MgLQr1zvks8+Kip4T6hcJdiBhV+SIvxguoWjhwtSpNPTp/5e09HJbgclCwR/nW0yWzhubM+6Q0prl8G5RuoBA==",
+      "requires": {
+        "tslib": "1.9.3"
+      }
+    },
+    "rxjs-compat": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/rxjs-compat/-/rxjs-compat-6.1.0.tgz",
+      "integrity": "sha512-x5L1KQy1RqDRpPadN5iDOx71TV9Wqmlmu6OOEn3tFFgaTCB0/N+Lmby/rZHgJ6JEPzzt0nD9Zv+kS53E5JIR5g=="
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "dev": true,
+      "requires": {
+        "ret": "0.1.15"
+      }
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "sass-graph": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
+      "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "glob": "7.1.2",
+        "lodash": "4.17.10",
+        "scss-tokenizer": "0.2.3",
+        "yargs": "7.1.0"
+      }
+    },
+    "sass-loader": {
+      "version": "6.0.7",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-6.0.7.tgz",
+      "integrity": "sha512-JoiyD00Yo1o61OJsoP2s2kb19L1/Y2p3QFcCdWdF6oomBGKVYuZyqHWemRBfQ2uGYsk+CH3eCguXNfpjzlcpaA==",
+      "dev": true,
+      "requires": {
+        "clone-deep": "2.0.2",
+        "loader-utils": "1.1.0",
+        "lodash.tail": "4.1.1",
+        "neo-async": "2.5.1",
+        "pify": "3.0.0"
+      }
+    },
+    "saucelabs": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.3.0.tgz",
+      "integrity": "sha1-0kDoAJ33+ocwbsRXimm6O1xCT+4=",
+      "dev": true,
+      "requires": {
+        "https-proxy-agent": "1.0.0"
+      }
+    },
+    "sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "dev": true
+    },
+    "schema-utils": {
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz",
+      "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==",
+      "dev": true,
+      "requires": {
+        "ajv": "6.5.2",
+        "ajv-keywords": "3.2.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.5.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.2.tgz",
+          "integrity": "sha512-hOs7GfvI6tUI1LfZddH82ky6mOMyTuY0mk7kE2pWpmhhUSkumzaTO5vbVwij39MdwPQWCV4Zv57Eo06NtL/GVA==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "2.0.1",
+            "fast-json-stable-stringify": "2.0.0",
+            "json-schema-traverse": "0.4.1",
+            "uri-js": "4.2.2"
+          }
+        },
+        "fast-deep-equal": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+          "dev": true
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        }
+      }
+    },
+    "scss-tokenizer": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
+      "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "js-base64": "2.4.8",
+        "source-map": "0.4.4"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "amdefine": "1.0.1"
+          }
+        }
+      }
+    },
+    "select-hose": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
+      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=",
+      "dev": true
+    },
+    "selenium-webdriver": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-3.0.1.tgz",
+      "integrity": "sha1-ot6l2kqX9mcuiefKcnbO+jZRR6c=",
+      "dev": true,
+      "requires": {
+        "adm-zip": "0.4.11",
+        "rimraf": "2.6.2",
+        "tmp": "0.0.30",
+        "xml2js": "0.4.19"
+      },
+      "dependencies": {
+        "tmp": {
+          "version": "0.0.30",
+          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz",
+          "integrity": "sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=",
+          "dev": true,
+          "requires": {
+            "os-tmpdir": "1.0.2"
+          }
+        }
+      }
+    },
+    "selfsigned": {
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.3.tgz",
+      "integrity": "sha512-vmZenZ+8Al3NLHkWnhBQ0x6BkML1eCP2xEi3JE+f3D9wW9fipD9NNJHYtE9XJM4TsPaHGZJIamrSI6MTg1dU2Q==",
+      "dev": true,
+      "requires": {
+        "node-forge": "0.7.5"
+      }
+    },
+    "semver": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
+      "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
+      "dev": true
+    },
+    "semver-dsl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/semver-dsl/-/semver-dsl-1.0.1.tgz",
+      "integrity": "sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=",
+      "dev": true,
+      "requires": {
+        "semver": "5.5.0"
+      }
+    },
+    "semver-intersect": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/semver-intersect/-/semver-intersect-1.3.1.tgz",
+      "integrity": "sha1-j6hKnhAovSOeRTDRo+GB5pjYhLo=",
+      "dev": true,
+      "requires": {
+        "semver": "5.5.0"
+      }
+    },
+    "send": {
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
+      "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "depd": "1.1.2",
+        "destroy": "1.0.4",
+        "encodeurl": "1.0.2",
+        "escape-html": "1.0.3",
+        "etag": "1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "1.6.3",
+        "mime": "1.4.1",
+        "ms": "2.0.0",
+        "on-finished": "2.3.0",
+        "range-parser": "1.2.0",
+        "statuses": "1.4.0"
+      },
+      "dependencies": {
+        "mime": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+          "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
+          "dev": true
+        }
+      }
+    },
+    "serialize-javascript": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.5.0.tgz",
+      "integrity": "sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==",
+      "dev": true
+    },
+    "serve-index": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
+      "dev": true,
+      "requires": {
+        "accepts": "1.3.5",
+        "batch": "0.6.1",
+        "debug": "2.6.9",
+        "escape-html": "1.0.3",
+        "http-errors": "1.6.3",
+        "mime-types": "2.1.19",
+        "parseurl": "1.3.2"
+      }
+    },
+    "serve-static": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
+      "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
+      "dev": true,
+      "requires": {
+        "encodeurl": "1.0.2",
+        "escape-html": "1.0.3",
+        "parseurl": "1.3.2",
+        "send": "0.16.2"
+      }
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
+    },
+    "set-immediate-shim": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
+      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
+      "dev": true
+    },
+    "set-value": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
+      "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "2.0.1",
+        "is-extendable": "0.1.1",
+        "is-plain-object": "2.0.4",
+        "split-string": "3.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "0.1.1"
+          }
+        }
+      }
+    },
+    "setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+      "dev": true
+    },
+    "setprototypeof": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+      "dev": true
+    },
+    "sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "shallow-clone": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz",
+      "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==",
+      "dev": true,
+      "requires": {
+        "is-extendable": "0.1.1",
+        "kind-of": "5.1.0",
+        "mixin-object": "2.0.1"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
+      }
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "dev": true
+    },
+    "silent-error": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/silent-error/-/silent-error-1.1.0.tgz",
+      "integrity": "sha1-IglwbxyFCp8dENDYQJGLRvJuG8k=",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9"
+      }
+    },
+    "slash": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+      "dev": true
+    },
+    "snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "dev": true,
+      "requires": {
+        "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.7",
+        "source-map-resolve": "0.5.2",
+        "use": "3.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "0.1.6"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "0.1.1"
+          }
+        }
+      }
+    },
+    "snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "dev": true,
+      "requires": {
+        "define-property": "1.0.0",
+        "isobject": "3.0.1",
+        "snapdragon-util": "3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "1.0.2"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        }
+      }
+    },
+    "snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "dev": true,
+      "requires": {
+        "kind-of": "3.2.2"
+      }
+    },
+    "sntp": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "hoek": "2.16.3"
+      }
+    },
+    "socket.io": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-1.7.3.tgz",
+      "integrity": "sha1-uK+cq6AJSeVo42nxMn6pvp6iRhs=",
+      "dev": true,
+      "requires": {
+        "debug": "2.3.3",
+        "engine.io": "1.8.3",
+        "has-binary": "0.1.7",
+        "object-assign": "4.1.0",
+        "socket.io-adapter": "0.5.0",
+        "socket.io-client": "1.7.3",
+        "socket.io-parser": "2.3.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
+          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.2"
+          }
+        },
+        "ms": {
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
+          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
+          "dev": true
+        },
+        "object-assign": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz",
+          "integrity": "sha1-ejs9DpgGPUP0wD8uiubNUahog6A=",
+          "dev": true
+        }
+      }
+    },
+    "socket.io-adapter": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz",
+      "integrity": "sha1-y21LuL7IHhB4uZZ3+c7QBGBmu4s=",
+      "dev": true,
+      "requires": {
+        "debug": "2.3.3",
+        "socket.io-parser": "2.3.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
+          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.2"
+          }
+        },
+        "ms": {
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
+          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
+          "dev": true
+        }
+      }
+    },
+    "socket.io-client": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.3.tgz",
+      "integrity": "sha1-sw6GqhDV7zVGYBwJzeR2Xjgdo3c=",
+      "dev": true,
+      "requires": {
+        "backo2": "1.0.2",
+        "component-bind": "1.0.0",
+        "component-emitter": "1.2.1",
+        "debug": "2.3.3",
+        "engine.io-client": "1.8.3",
+        "has-binary": "0.1.7",
+        "indexof": "0.0.1",
+        "object-component": "0.0.3",
+        "parseuri": "0.0.5",
+        "socket.io-parser": "2.3.1",
+        "to-array": "0.1.4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
+          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.2"
+          }
+        },
+        "ms": {
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
+          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
+          "dev": true
+        }
+      }
+    },
+    "socket.io-parser": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz",
+      "integrity": "sha1-3VMgJRA85Clpcya+/WQAX8/ltKA=",
+      "dev": true,
+      "requires": {
+        "component-emitter": "1.1.2",
+        "debug": "2.2.0",
+        "isarray": "0.0.1",
+        "json3": "3.3.2"
+      },
+      "dependencies": {
+        "component-emitter": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz",
+          "integrity": "sha1-KWWU8nU9qmOZbSrwjRWpURbJrsM=",
+          "dev": true
+        },
+        "debug": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.1"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+          "dev": true
+        }
+      }
+    },
+    "sockjs": {
+      "version": "0.3.19",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
+      "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
+      "dev": true,
+      "requires": {
+        "faye-websocket": "0.10.0",
+        "uuid": "3.3.2"
+      }
+    },
+    "sockjs-client": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.4.tgz",
+      "integrity": "sha1-W6vjhrd15M8U51IJEUUmVAFsixI=",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "eventsource": "0.1.6",
+        "faye-websocket": "0.11.1",
+        "inherits": "2.0.3",
+        "json3": "3.3.2",
+        "url-parse": "1.4.3"
+      },
+      "dependencies": {
+        "faye-websocket": {
+          "version": "0.11.1",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
+          "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
+          "dev": true,
+          "requires": {
+            "websocket-driver": "0.7.0"
+          }
+        }
+      }
+    },
+    "source-list-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz",
+      "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==",
+      "dev": true
+    },
+    "source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true
+    },
+    "source-map-resolve": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
+      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+      "dev": true,
+      "requires": {
+        "atob": "2.1.1",
+        "decode-uri-component": "0.2.0",
+        "resolve-url": "0.2.1",
+        "source-map-url": "0.4.0",
+        "urix": "0.1.0"
+      }
+    },
+    "source-map-support": {
+      "version": "0.4.18",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
+      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+      "dev": true,
+      "requires": {
+        "source-map": "0.5.7"
+      }
+    },
+    "source-map-url": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
+      "dev": true
+    },
+    "spdx-correct": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz",
+      "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==",
+      "dev": true,
+      "requires": {
+        "spdx-expression-parse": "3.0.0",
+        "spdx-license-ids": "3.0.0"
+      }
+    },
+    "spdx-exceptions": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz",
+      "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==",
+      "dev": true
+    },
+    "spdx-expression-parse": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "dev": true,
+      "requires": {
+        "spdx-exceptions": "2.1.0",
+        "spdx-license-ids": "3.0.0"
+      }
+    },
+    "spdx-license-ids": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz",
+      "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==",
+      "dev": true
+    },
+    "spdy": {
+      "version": "3.4.7",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-3.4.7.tgz",
+      "integrity": "sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw=",
+      "dev": true,
+      "requires": {
+        "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"
+      }
+    },
+    "spdy-transport": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-2.1.0.tgz",
+      "integrity": "sha512-bpUeGpZcmZ692rrTiqf9/2EUakI6/kXX1Rpe0ib/DyOzbiexVfXkw6GnvI9hVGvIwVaUhkaBojjCZwLNRGQg1g==",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "detect-node": "2.0.3",
+        "hpack.js": "2.1.6",
+        "obuf": "1.1.2",
+        "readable-stream": "2.3.6",
+        "safe-buffer": "5.1.2",
+        "wbuf": "1.7.3"
+      }
+    },
+    "split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "3.0.2"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "sshpk": {
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz",
+      "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=",
+      "dev": true,
+      "requires": {
+        "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"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        }
+      }
+    },
+    "ssri": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz",
+      "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "dev": true,
+      "requires": {
+        "define-property": "0.2.5",
+        "object-copy": "0.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "0.1.6"
+          }
+        }
+      }
+    },
+    "statuses": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
+      "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
+      "dev": true
+    },
+    "stdout-stream": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.0.tgz",
+      "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "readable-stream": "2.3.6"
+      }
+    },
+    "stream-browserify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
+      "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6"
+      }
+    },
+    "stream-each": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
+      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "1.4.1",
+        "stream-shift": "1.0.0"
+      }
+    },
+    "stream-http": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "dev": true,
+      "requires": {
+        "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": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
+      "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
+      "dev": true
+    },
+    "string-width": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "dev": true,
+      "requires": {
+        "code-point-at": "1.1.0",
+        "is-fullwidth-code-point": "1.0.0",
+        "strip-ansi": "3.0.1"
+      }
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "requires": {
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "stringstream": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz",
+      "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==",
+      "dev": true,
+      "optional": true
+    },
+    "strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "2.1.1"
+      }
+    },
+    "strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+      "dev": true,
+      "requires": {
+        "is-utf8": "0.2.1"
+      }
+    },
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+      "dev": true
+    },
+    "strip-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
+      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
+      "dev": true,
+      "requires": {
+        "get-stdin": "4.0.1"
+      }
+    },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "dev": true
+    },
+    "style-loader": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.19.1.tgz",
+      "integrity": "sha512-IRE+ijgojrygQi3rsqT0U4dd+UcPCqcVvauZpCnQrGAlEe+FUIyrK93bUDScamesjP08JlQNsFJU+KmPedP5Og==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "1.1.0",
+        "schema-utils": "0.3.0"
+      },
+      "dependencies": {
+        "schema-utils": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
+          "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
+          "dev": true,
+          "requires": {
+            "ajv": "5.5.2"
+          }
+        }
+      }
+    },
+    "stylus": {
+      "version": "0.54.5",
+      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz",
+      "integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=",
+      "dev": true,
+      "requires": {
+        "css-parse": "1.7.0",
+        "debug": "2.6.9",
+        "glob": "7.0.6",
+        "mkdirp": "0.5.1",
+        "sax": "0.5.8",
+        "source-map": "0.1.43"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.0.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
+          "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "sax": {
+          "version": "0.5.8",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz",
+          "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.1.43",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+          "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+          "dev": true,
+          "requires": {
+            "amdefine": "1.0.1"
+          }
+        }
+      }
+    },
+    "stylus-loader": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz",
+      "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "1.1.0",
+        "lodash.clonedeep": "4.5.0",
+        "when": "3.6.4"
+      },
+      "dependencies": {
+        "when": {
+          "version": "3.6.4",
+          "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz",
+          "integrity": "sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=",
+          "dev": true
+        }
+      }
+    },
+    "superagent": {
+      "version": "3.8.2",
+      "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.8.2.tgz",
+      "integrity": "sha512-gVH4QfYHcY3P0f/BZzavLreHW3T1v7hG9B+hpMQotGQqurOvhv87GcMCd6LWySmBuf+BDR44TQd0aISjVHLeNQ==",
+      "requires": {
+        "component-emitter": "1.2.1",
+        "cookiejar": "2.1.2",
+        "debug": "3.1.0",
+        "extend": "3.0.2",
+        "form-data": "2.3.2",
+        "formidable": "1.2.1",
+        "methods": "1.1.2",
+        "mime": "1.6.0",
+        "qs": "6.5.2",
+        "readable-stream": "2.3.6"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "supports-color": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+      "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+      "dev": true,
+      "requires": {
+        "has-flag": "2.0.0"
+      }
+    },
+    "symbol-observable": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
+      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
+    },
+    "systemjs": {
+      "version": "0.19.27",
+      "resolved": "https://registry.npmjs.org/systemjs/-/systemjs-0.19.27.tgz",
+      "integrity": "sha1-8XQNVlzmQ3GsDecHKk0eVHG6e6I=",
+      "requires": {
+        "when": "3.7.8"
+      }
+    },
+    "tapable": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz",
+      "integrity": "sha1-mTcqXJmb8t8WCvwNdL7U9HlIzSI=",
+      "dev": true
+    },
+    "tar": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "block-stream": "0.0.9",
+        "fstream": "1.0.11",
+        "inherits": "2.0.3"
+      }
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "through2": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+      "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "2.3.6",
+        "xtend": "4.0.1"
+      }
+    },
+    "thunky": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.2.tgz",
+      "integrity": "sha1-qGLgGOP7HqLsP85dVWBc9X8kc3E=",
+      "dev": true
+    },
+    "time-stamp": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-2.0.1.tgz",
+      "integrity": "sha512-KUnkvOWC3C+pEbwE/0u3CcmNpGCDqkYGYZOphe1QFxApYQkJ5g195TDBjgZch/zG6chU1NcabLwnM7BCpWAzTQ==",
+      "dev": true
+    },
+    "timers-browserify": {
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
+      "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
+      "dev": true,
+      "requires": {
+        "setimmediate": "1.0.5"
+      }
+    },
+    "tmp": {
+      "version": "0.0.31",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz",
+      "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=",
+      "dev": true,
+      "requires": {
+        "os-tmpdir": "1.0.2"
+      }
+    },
+    "to-array": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
+      "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=",
+      "dev": true
+    },
+    "to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+      "dev": true
+    },
+    "to-fast-properties": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+      "dev": true
+    },
+    "to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "dev": true,
+      "requires": {
+        "kind-of": "3.2.2"
+      }
+    },
+    "to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "dev": true,
+      "requires": {
+        "define-property": "2.0.2",
+        "extend-shallow": "3.0.2",
+        "regex-not": "1.0.2",
+        "safe-regex": "1.1.0"
+      }
+    },
+    "to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "requires": {
+        "is-number": "3.0.0",
+        "repeat-string": "1.6.1"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          }
+        }
+      }
+    },
+    "toposort": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz",
+      "integrity": "sha1-LmhELZ9k7HILjMieZEOsbKqVACk=",
+      "dev": true
+    },
+    "tough-cookie": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
+      "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
+      "dev": true,
+      "requires": {
+        "punycode": "1.4.1"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+          "dev": true
+        }
+      }
+    },
+    "tree-kill": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz",
+      "integrity": "sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==",
+      "dev": true
+    },
+    "trim-newlines": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
+      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
+      "dev": true
+    },
+    "trim-right": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+      "dev": true
+    },
+    "true-case-path": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.2.tgz",
+      "integrity": "sha1-fskRMJJHZsf1c74wIMNPj9/QDWI=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "glob": "6.0.4"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "6.0.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
+          "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        }
+      }
+    },
+    "ts-node": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-3.2.2.tgz",
+      "integrity": "sha1-u9KOOK9Kqj6WB2xGbhsiAZfBo84=",
+      "dev": true,
+      "requires": {
+        "arrify": "1.0.1",
+        "chalk": "2.2.2",
+        "diff": "3.5.0",
+        "make-error": "1.3.4",
+        "minimist": "1.2.0",
+        "mkdirp": "0.5.1",
+        "source-map-support": "0.4.18",
+        "tsconfig": "6.0.0",
+        "v8flags": "3.1.1",
+        "yn": "2.0.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
+    "tsconfig": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/tsconfig/-/tsconfig-6.0.0.tgz",
+      "integrity": "sha1-aw6DdgA9evGGT434+J3QBZ/80DI=",
+      "dev": true,
+      "requires": {
+        "strip-bom": "3.0.0",
+        "strip-json-comments": "2.0.1"
+      },
+      "dependencies": {
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        }
+      }
+    },
+    "tsickle": {
+      "version": "0.25.6",
+      "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.25.6.tgz",
+      "integrity": "sha1-tZXbFrI2chgk7u2ouyYjZbR+8zQ=",
+      "dev": true,
+      "requires": {
+        "minimist": "1.2.0",
+        "mkdirp": "0.5.1",
+        "source-map": "0.5.7",
+        "source-map-support": "0.4.18"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
+    "tslib": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
+      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
+    },
+    "tslint": {
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.7.0.tgz",
+      "integrity": "sha1-wl4NDJL6EgHCvDDoROCOaCtPNVI=",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "6.26.0",
+        "colors": "1.1.2",
+        "commander": "2.16.0",
+        "diff": "3.5.0",
+        "glob": "7.1.2",
+        "minimatch": "3.0.4",
+        "resolve": "1.8.1",
+        "semver": "5.5.0",
+        "tslib": "1.9.3",
+        "tsutils": "2.29.0"
+      }
+    },
+    "tsutils": {
+      "version": "2.29.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
+      "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
+      "dev": true,
+      "requires": {
+        "tslib": "1.9.3"
+      }
+    },
+    "tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+      "dev": true
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "dev": true,
+      "optional": true
+    },
+    "type-is": {
+      "version": "1.6.16",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
+      "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
+      "dev": true,
+      "requires": {
+        "media-typer": "0.3.0",
+        "mime-types": "2.1.19"
+      }
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
+    },
+    "typescript": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz",
+      "integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=",
+      "dev": true
+    },
+    "uglify-js": {
+      "version": "3.4.6",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.6.tgz",
+      "integrity": "sha512-O1D7L6WcOzS1qW2ehopEm4cWm5yA6bQBozlks8jO8ODxYCy4zv+bR/la4Lwp01tpkYGNonnpXvUpYtrvSu8Yzg==",
+      "dev": true,
+      "requires": {
+        "commander": "2.16.0",
+        "source-map": "0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "uglify-to-browserify": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
+      "dev": true,
+      "optional": true
+    },
+    "uglifyjs-webpack-plugin": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.7.tgz",
+      "integrity": "sha512-1VicfKhCYHLS8m1DCApqBhoulnASsEoJ/BvpUpP4zoNAPpKzdH+ghk0olGJMmwX2/jprK2j3hAHdUbczBSy2FA==",
+      "dev": true,
+      "requires": {
+        "cacache": "10.0.4",
+        "find-cache-dir": "1.0.0",
+        "schema-utils": "0.4.5",
+        "serialize-javascript": "1.5.0",
+        "source-map": "0.6.1",
+        "uglify-es": "3.3.9",
+        "webpack-sources": "1.1.0",
+        "worker-farm": "1.6.0"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.13.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz",
+          "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "uglify-es": {
+          "version": "3.3.9",
+          "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz",
+          "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
+          "dev": true,
+          "requires": {
+            "commander": "2.13.0",
+            "source-map": "0.6.1"
+          }
+        }
+      }
+    },
+    "ultron": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz",
+      "integrity": "sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po=",
+      "dev": true
+    },
+    "union-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
+      "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+      "dev": true,
+      "requires": {
+        "arr-union": "3.1.0",
+        "get-value": "2.0.6",
+        "is-extendable": "0.1.1",
+        "set-value": "0.4.3"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "0.1.1"
+          }
+        },
+        "set-value": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
+          "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "2.0.1",
+            "is-extendable": "0.1.1",
+            "is-plain-object": "2.0.4",
+            "to-object-path": "0.3.0"
+          }
+        }
+      }
+    },
+    "unique-filename": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz",
+      "integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=",
+      "dev": true,
+      "requires": {
+        "unique-slug": "2.0.0"
+      }
+    },
+    "unique-slug": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz",
+      "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=",
+      "dev": true,
+      "requires": {
+        "imurmurhash": "0.1.4"
+      }
+    },
+    "universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true
+    },
+    "unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "dev": true
+    },
+    "unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "dev": true,
+      "requires": {
+        "has-value": "0.3.1",
+        "isobject": "3.0.1"
+      },
+      "dependencies": {
+        "has-value": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+          "dev": true,
+          "requires": {
+            "get-value": "2.0.6",
+            "has-values": "0.1.4",
+            "isobject": "2.1.0"
+          },
+          "dependencies": {
+            "isobject": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+              "dev": true,
+              "requires": {
+                "isarray": "1.0.0"
+              }
+            }
+          }
+        },
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+          "dev": true
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        }
+      }
+    },
+    "upath": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
+      "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
+      "dev": true
+    },
+    "upper-case": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
+      "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
+      "dev": true
+    },
+    "uri-js": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "dev": true,
+      "requires": {
+        "punycode": "2.1.1"
+      }
+    },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+      "dev": true
+    },
+    "url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "dev": true,
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+          "dev": true
+        }
+      }
+    },
+    "url-loader": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.6.2.tgz",
+      "integrity": "sha512-h3qf9TNn53BpuXTTcpC+UehiRrl0Cv45Yr/xWayApjw6G8Bg2dGke7rIwDQ39piciWCWrC+WiqLjOh3SUp9n0Q==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "1.1.0",
+        "mime": "1.6.0",
+        "schema-utils": "0.3.0"
+      },
+      "dependencies": {
+        "schema-utils": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
+          "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
+          "dev": true,
+          "requires": {
+            "ajv": "5.5.2"
+          }
+        }
+      }
+    },
+    "url-parse": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.3.tgz",
+      "integrity": "sha512-rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw==",
+      "dev": true,
+      "requires": {
+        "querystringify": "2.0.0",
+        "requires-port": "1.0.0"
+      }
+    },
+    "use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "dev": true
+    },
+    "useragent": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz",
+      "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
+      "dev": true,
+      "requires": {
+        "lru-cache": "4.1.3",
+        "tmp": "0.0.31"
+      }
+    },
+    "util": {
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3"
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    },
+    "utila": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
+      "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=",
+      "dev": true
+    },
+    "utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+      "dev": true
+    },
+    "uuid": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
+      "dev": true
+    },
+    "v8flags": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.1.tgz",
+      "integrity": "sha512-iw/1ViSEaff8NJ3HLyEjawk/8hjJib3E7pvG4pddVXfUg1983s3VGsiClDjhK64MQVDGqc1Q8r18S4VKQZS9EQ==",
+      "dev": true,
+      "requires": {
+        "homedir-polyfill": "1.0.1"
+      }
+    },
+    "validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "requires": {
+        "spdx-correct": "3.0.0",
+        "spdx-expression-parse": "3.0.0"
+      }
+    },
+    "vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
+      "dev": true
+    },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "1.3.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        }
+      }
+    },
+    "vlq": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz",
+      "integrity": "sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==",
+      "dev": true
+    },
+    "vm-browserify": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+      "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
+      "dev": true,
+      "requires": {
+        "indexof": "0.0.1"
+      }
+    },
+    "void-elements": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
+      "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
+      "dev": true
+    },
+    "watchpack": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
+      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
+      "dev": true,
+      "requires": {
+        "chokidar": "2.0.4",
+        "graceful-fs": "4.1.11",
+        "neo-async": "2.5.1"
+      },
+      "dependencies": {
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+          "dev": true,
+          "requires": {
+            "micromatch": "3.1.10",
+            "normalize-path": "2.1.1"
+          }
+        },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+          "dev": true
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "1.1.0",
+            "array-unique": "0.3.2",
+            "extend-shallow": "2.0.1",
+            "fill-range": "4.0.0",
+            "isobject": "3.0.1",
+            "repeat-element": "1.1.2",
+            "snapdragon": "0.8.2",
+            "snapdragon-node": "2.1.1",
+            "split-string": "3.1.0",
+            "to-regex": "3.0.2"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "chokidar": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
+          "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+          "dev": true,
+          "requires": {
+            "anymatch": "2.0.0",
+            "async-each": "1.0.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.1.0",
+            "upath": "1.1.0"
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+          "dev": true,
+          "requires": {
+            "debug": "2.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": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "0.1.6"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            },
+            "is-accessor-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+              "dev": true,
+              "requires": {
+                "kind-of": "3.2.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "dev": true,
+                  "requires": {
+                    "is-buffer": "1.1.6"
+                  }
+                }
+              }
+            },
+            "is-data-descriptor": {
+              "version": "0.1.4",
+              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+              "dev": true,
+              "requires": {
+                "kind-of": "3.2.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "dev": true,
+                  "requires": {
+                    "is-buffer": "1.1.6"
+                  }
+                }
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+              "dev": true,
+              "requires": {
+                "is-accessor-descriptor": "0.1.6",
+                "is-data-descriptor": "0.1.4",
+                "kind-of": "5.1.0"
+              }
+            },
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+              "dev": true
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "dev": true,
+          "requires": {
+            "array-unique": "0.3.2",
+            "define-property": "1.0.0",
+            "expand-brackets": "2.1.4",
+            "extend-shallow": "2.0.1",
+            "fragment-cache": "0.2.1",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "1.0.2"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "2.0.1",
+            "is-number": "3.0.0",
+            "repeat-string": "1.6.1",
+            "to-regex-range": "2.1.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "dev": true,
+          "requires": {
+            "is-glob": "3.1.0",
+            "path-dirname": "1.0.2"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+              "dev": true,
+              "requires": {
+                "is-extglob": "2.1.1"
+              }
+            }
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
+          "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "2.1.1"
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.6"
+              }
+            }
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "4.0.0",
+            "array-unique": "0.3.2",
+            "braces": "2.3.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"
+          }
+        }
+      }
+    },
+    "wbuf": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+      "dev": true,
+      "requires": {
+        "minimalistic-assert": "1.0.1"
+      }
+    },
+    "web-animations-js": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/web-animations-js/-/web-animations-js-2.3.1.tgz",
+      "integrity": "sha1-Om2bwVGWN3qQ+OKAP6UmIWWwRRA="
+    },
+    "webdriver-js-extender": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/webdriver-js-extender/-/webdriver-js-extender-1.0.0.tgz",
+      "integrity": "sha1-gcUzqeM9W/tZe05j4s2yW1R3dRU=",
+      "dev": true,
+      "requires": {
+        "@types/selenium-webdriver": "2.53.43",
+        "selenium-webdriver": "2.53.3"
+      },
+      "dependencies": {
+        "adm-zip": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.4.tgz",
+          "integrity": "sha1-ph7VrmkFw66lizplfSUDMJEFJzY=",
+          "dev": true
+        },
+        "sax": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz",
+          "integrity": "sha1-VjsZx8HeiS4Jv8Ty/DDjwn8JUrk=",
+          "dev": true
+        },
+        "selenium-webdriver": {
+          "version": "2.53.3",
+          "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.53.3.tgz",
+          "integrity": "sha1-0p/1qVff8aG0ncRXdW5OS/vc4IU=",
+          "dev": true,
+          "requires": {
+            "adm-zip": "0.4.4",
+            "rimraf": "2.6.2",
+            "tmp": "0.0.24",
+            "ws": "1.1.2",
+            "xml2js": "0.4.4"
+          }
+        },
+        "tmp": {
+          "version": "0.0.24",
+          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.24.tgz",
+          "integrity": "sha1-1qXhmNFKmDXMby18PZ4wJCjIzxI=",
+          "dev": true
+        },
+        "xml2js": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
+          "integrity": "sha1-MREBAAMAiuGSQOuhdJe1fHKcVV0=",
+          "dev": true,
+          "requires": {
+            "sax": "0.6.1",
+            "xmlbuilder": "9.0.7"
+          }
+        }
+      }
+    },
+    "webpack": {
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.11.0.tgz",
+      "integrity": "sha512-3kOFejWqj5ISpJk4Qj/V7w98h9Vl52wak3CLiw/cDOfbVTq7FeoZ0SdoHHY9PYlHr50ZS42OfvzE2vB4nncKQg==",
+      "dev": true,
+      "requires": {
+        "acorn": "5.7.1",
+        "acorn-dynamic-import": "2.0.2",
+        "ajv": "6.5.2",
+        "ajv-keywords": "3.2.0",
+        "async": "2.6.1",
+        "enhanced-resolve": "3.4.1",
+        "escope": "3.6.0",
+        "interpret": "1.1.0",
+        "json-loader": "0.5.7",
+        "json5": "0.5.1",
+        "loader-runner": "2.3.0",
+        "loader-utils": "1.1.0",
+        "memory-fs": "0.4.1",
+        "mkdirp": "0.5.1",
+        "node-libs-browser": "2.1.0",
+        "source-map": "0.5.7",
+        "supports-color": "4.5.0",
+        "tapable": "0.2.8",
+        "uglifyjs-webpack-plugin": "0.4.6",
+        "watchpack": "1.6.0",
+        "webpack-sources": "1.1.0",
+        "yargs": "8.0.2"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.5.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.2.tgz",
+          "integrity": "sha512-hOs7GfvI6tUI1LfZddH82ky6mOMyTuY0mk7kE2pWpmhhUSkumzaTO5vbVwij39MdwPQWCV4Zv57Eo06NtL/GVA==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "2.0.1",
+            "fast-json-stable-stringify": "2.0.0",
+            "json-schema-traverse": "0.4.1",
+            "uri-js": "4.2.2"
+          }
+        },
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "camelcase": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+          "dev": true
+        },
+        "cliui": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+          "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+          "dev": true,
+          "requires": {
+            "center-align": "0.1.3",
+            "right-align": "0.1.3",
+            "wordwrap": "0.0.2"
+          }
+        },
+        "fast-deep-equal": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+          "dev": true
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
+        "load-json-file": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "parse-json": "2.2.0",
+            "pify": "2.3.0",
+            "strip-bom": "3.0.0"
+          }
+        },
+        "os-locale": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+          "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+          "dev": true,
+          "requires": {
+            "execa": "0.7.0",
+            "lcid": "1.0.0",
+            "mem": "1.1.0"
+          }
+        },
+        "path-type": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+          "dev": true,
+          "requires": {
+            "pify": "2.3.0"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        },
+        "read-pkg": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "2.0.0",
+            "normalize-package-data": "2.4.0",
+            "path-type": "2.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+          "dev": true,
+          "requires": {
+            "find-up": "2.1.0",
+            "read-pkg": "2.0.0"
+          }
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "2.0.0",
+            "strip-ansi": "4.0.0"
+          },
+          "dependencies": {
+            "is-fullwidth-code-point": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+              "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+              "dev": true
+            },
+            "strip-ansi": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "3.0.0"
+              }
+            }
+          }
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        },
+        "uglify-js": {
+          "version": "2.8.29",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
+          "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
+          "dev": true,
+          "requires": {
+            "source-map": "0.5.7",
+            "uglify-to-browserify": "1.0.2",
+            "yargs": "3.10.0"
+          },
+          "dependencies": {
+            "yargs": {
+              "version": "3.10.0",
+              "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+              "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+              "dev": true,
+              "requires": {
+                "camelcase": "1.2.1",
+                "cliui": "2.1.0",
+                "decamelize": "1.2.0",
+                "window-size": "0.1.0"
+              }
+            }
+          }
+        },
+        "uglifyjs-webpack-plugin": {
+          "version": "0.4.6",
+          "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz",
+          "integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=",
+          "dev": true,
+          "requires": {
+            "source-map": "0.5.7",
+            "uglify-js": "2.8.29",
+            "webpack-sources": "1.1.0"
+          }
+        },
+        "which-module": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+          "dev": true
+        },
+        "wordwrap": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+          "dev": true
+        },
+        "y18n": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+          "dev": true
+        },
+        "yargs": {
+          "version": "8.0.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
+          "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
+          "dev": true,
+          "requires": {
+            "camelcase": "4.1.0",
+            "cliui": "3.2.0",
+            "decamelize": "1.2.0",
+            "get-caller-file": "1.0.3",
+            "os-locale": "2.1.0",
+            "read-pkg-up": "2.0.0",
+            "require-directory": "2.1.1",
+            "require-main-filename": "1.0.1",
+            "set-blocking": "2.0.0",
+            "string-width": "2.1.1",
+            "which-module": "2.0.0",
+            "y18n": "3.2.1",
+            "yargs-parser": "7.0.0"
+          },
+          "dependencies": {
+            "camelcase": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+              "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+              "dev": true
+            },
+            "cliui": {
+              "version": "3.2.0",
+              "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+              "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+              "dev": true,
+              "requires": {
+                "string-width": "1.0.2",
+                "strip-ansi": "3.0.1",
+                "wrap-ansi": "2.1.0"
+              },
+              "dependencies": {
+                "string-width": {
+                  "version": "1.0.2",
+                  "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+                  "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+                  "dev": true,
+                  "requires": {
+                    "code-point-at": "1.1.0",
+                    "is-fullwidth-code-point": "1.0.0",
+                    "strip-ansi": "3.0.1"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "yargs-parser": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
+          "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
+          "dev": true,
+          "requires": {
+            "camelcase": "4.1.0"
+          },
+          "dependencies": {
+            "camelcase": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+              "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+              "dev": true
+            }
+          }
+        }
+      }
+    },
+    "webpack-core": {
+      "version": "0.6.9",
+      "resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz",
+      "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
+      "dev": true,
+      "requires": {
+        "source-list-map": "0.1.8",
+        "source-map": "0.4.4"
+      },
+      "dependencies": {
+        "source-list-map": {
+          "version": "0.1.8",
+          "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
+          "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+          "dev": true,
+          "requires": {
+            "amdefine": "1.0.1"
+          }
+        }
+      }
+    },
+    "webpack-dev-middleware": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz",
+      "integrity": "sha512-FCrqPy1yy/sN6U/SaEZcHKRXGlqU0DUaEBL45jkUYoB8foVb6wCnbIJ1HKIx+qUFTW+3JpVcCJCxZ8VATL4e+A==",
+      "dev": true,
+      "requires": {
+        "memory-fs": "0.4.1",
+        "mime": "1.6.0",
+        "path-is-absolute": "1.0.1",
+        "range-parser": "1.2.0",
+        "time-stamp": "2.0.1"
+      }
+    },
+    "webpack-dev-server": {
+      "version": "2.11.2",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-2.11.2.tgz",
+      "integrity": "sha512-zrPoX97bx47vZiAXfDrkw8pe9QjJ+lunQl3dypojyWwWr1M5I2h0VSrMPfTjopHQPRNn+NqfjcMmhoLcUJe2gA==",
+      "dev": true,
+      "requires": {
+        "ansi-html": "0.0.7",
+        "array-includes": "3.0.3",
+        "bonjour": "3.5.0",
+        "chokidar": "2.0.4",
+        "compression": "1.7.3",
+        "connect-history-api-fallback": "1.5.0",
+        "debug": "3.1.0",
+        "del": "3.0.0",
+        "express": "4.16.3",
+        "html-entities": "1.2.1",
+        "http-proxy-middleware": "0.17.4",
+        "import-local": "1.0.0",
+        "internal-ip": "1.2.0",
+        "ip": "1.1.5",
+        "killable": "1.0.0",
+        "loglevel": "1.6.1",
+        "opn": "5.1.0",
+        "portfinder": "1.0.13",
+        "selfsigned": "1.10.3",
+        "serve-index": "1.9.1",
+        "sockjs": "0.3.19",
+        "sockjs-client": "1.1.4",
+        "spdy": "3.4.7",
+        "strip-ansi": "3.0.1",
+        "supports-color": "5.4.0",
+        "webpack-dev-middleware": "1.12.2",
+        "yargs": "6.6.0"
+      },
+      "dependencies": {
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+          "dev": true,
+          "requires": {
+            "micromatch": "3.1.10",
+            "normalize-path": "2.1.1"
+          }
+        },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+          "dev": true
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "1.1.0",
+            "array-unique": "0.3.2",
+            "extend-shallow": "2.0.1",
+            "fill-range": "4.0.0",
+            "isobject": "3.0.1",
+            "repeat-element": "1.1.2",
+            "snapdragon": "0.8.2",
+            "snapdragon-node": "2.1.1",
+            "split-string": "3.1.0",
+            "to-regex": "3.0.2"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "camelcase": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+          "dev": true
+        },
+        "chokidar": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
+          "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+          "dev": true,
+          "requires": {
+            "anymatch": "2.0.0",
+            "async-each": "1.0.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.1.0",
+            "upath": "1.1.0"
+          }
+        },
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+          "dev": true,
+          "requires": {
+            "debug": "2.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": {
+              "version": "2.6.9",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+              "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+              "dev": true,
+              "requires": {
+                "ms": "2.0.0"
+              }
+            },
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "0.1.6"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            },
+            "is-accessor-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+              "dev": true,
+              "requires": {
+                "kind-of": "3.2.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "dev": true,
+                  "requires": {
+                    "is-buffer": "1.1.6"
+                  }
+                }
+              }
+            },
+            "is-data-descriptor": {
+              "version": "0.1.4",
+              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+              "dev": true,
+              "requires": {
+                "kind-of": "3.2.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "dev": true,
+                  "requires": {
+                    "is-buffer": "1.1.6"
+                  }
+                }
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+              "dev": true,
+              "requires": {
+                "is-accessor-descriptor": "0.1.6",
+                "is-data-descriptor": "0.1.4",
+                "kind-of": "5.1.0"
+              }
+            },
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+              "dev": true
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "dev": true,
+          "requires": {
+            "array-unique": "0.3.2",
+            "define-property": "1.0.0",
+            "expand-brackets": "2.1.4",
+            "extend-shallow": "2.0.1",
+            "fragment-cache": "0.2.1",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "1.0.2"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "2.0.1",
+            "is-number": "3.0.0",
+            "repeat-string": "1.6.1",
+            "to-regex-range": "2.1.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "dev": true,
+          "requires": {
+            "is-glob": "3.1.0",
+            "path-dirname": "1.0.2"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+              "dev": true,
+              "requires": {
+                "is-extglob": "2.1.1"
+              }
+            }
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
+          "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "2.1.1"
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.6"
+              }
+            }
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "4.0.0",
+            "array-unique": "0.3.2",
+            "braces": "2.3.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"
+          }
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        },
+        "y18n": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+          "dev": true
+        },
+        "yargs": {
+          "version": "6.6.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",
+          "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=",
+          "dev": true,
+          "requires": {
+            "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": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz",
+          "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=",
+          "dev": true,
+          "requires": {
+            "camelcase": "3.0.0"
+          }
+        }
+      }
+    },
+    "webpack-merge": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.4.tgz",
+      "integrity": "sha512-TmSe1HZKeOPey3oy1Ov2iS3guIZjWvMT2BBJDzzT5jScHTjVC3mpjJofgueEzaEd6ibhxRDD6MIblDr8tzh8iQ==",
+      "dev": true,
+      "requires": {
+        "lodash": "4.17.10"
+      }
+    },
+    "webpack-sources": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.1.0.tgz",
+      "integrity": "sha512-aqYp18kPphgoO5c/+NaUvEeACtZjMESmDChuD3NBciVpah3XpMEU9VAAtIaB1BsfJWWTSdv8Vv1m3T0aRk2dUw==",
+      "dev": true,
+      "requires": {
+        "source-list-map": "2.0.0",
+        "source-map": "0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "webpack-subresource-integrity": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.0.4.tgz",
+      "integrity": "sha1-j6yKfo61n8ahZ2ioXJ2U7n+dDts=",
+      "dev": true,
+      "requires": {
+        "webpack-core": "0.6.9"
+      }
+    },
+    "websocket-driver": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
+      "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
+      "dev": true,
+      "requires": {
+        "http-parser-js": "0.4.13",
+        "websocket-extensions": "0.1.3"
+      }
+    },
+    "websocket-extensions": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
+      "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
+      "dev": true
+    },
+    "when": {
+      "version": "3.7.8",
+      "resolved": "https://registry.npmjs.org/when/-/when-3.7.8.tgz",
+      "integrity": "sha1-xxMLan6gRpPoQs3J56Hyqjmjn4I="
+    },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "requires": {
+        "isexe": "2.0.0"
+      }
+    },
+    "which-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
+      "dev": true
+    },
+    "wide-align": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+      "dev": true,
+      "requires": {
+        "string-width": "1.0.2"
+      }
+    },
+    "window-size": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
+      "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
+      "dev": true
+    },
+    "wordwrap": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+      "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
+      "dev": true
+    },
+    "worker-farm": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz",
+      "integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
+      "dev": true,
+      "requires": {
+        "errno": "0.1.7"
+      }
+    },
+    "wrap-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+      "dev": true,
+      "requires": {
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "ws": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz",
+      "integrity": "sha1-iiRPoFJAHgjJiGz0SoUYnh/UBn8=",
+      "dev": true,
+      "requires": {
+        "options": "0.0.6",
+        "ultron": "1.0.2"
+      }
+    },
+    "wtf-8": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz",
+      "integrity": "sha1-OS2LotDxw00e4tYw8V0O+2jhBIo=",
+      "dev": true
+    },
+    "xml2js": {
+      "version": "0.4.19",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
+      "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
+      "dev": true,
+      "requires": {
+        "sax": "1.2.4",
+        "xmlbuilder": "9.0.7"
+      }
+    },
+    "xmlbuilder": {
+      "version": "9.0.7",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
+      "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
+      "dev": true
+    },
+    "xmlhttprequest-ssl": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz",
+      "integrity": "sha1-GFqIjATspGw+QHDZn3tJ3jUomS0=",
+      "dev": true
+    },
+    "xtend": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+      "dev": true
+    },
+    "xxhashjs": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/xxhashjs/-/xxhashjs-0.2.2.tgz",
+      "integrity": "sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==",
+      "dev": true,
+      "requires": {
+        "cuint": "0.2.2"
+      }
+    },
+    "y18n": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+      "dev": true
+    },
+    "yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+      "dev": true
+    },
+    "yargs": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
+      "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "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"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+          "dev": true,
+          "optional": true
+        },
+        "y18n": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "yargs-parser": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
+      "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "camelcase": "3.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "yeast": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
+      "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=",
+      "dev": true
+    },
+    "yn": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-2.0.0.tgz",
+      "integrity": "sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=",
+      "dev": true
+    },
+    "zone.js": {
+      "version": "0.8.14",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.14.tgz",
+      "integrity": "sha1-DE2ySxeCMidMy0P3jJnbfzZCts8="
+    }
+  }
+}
diff --git a/integration/base_ver_2_app/package.json b/integration/base_ver_2_app/package.json
index b2cf494417..8569b549c0 100644
--- a/integration/base_ver_2_app/package.json
+++ b/integration/base_ver_2_app/package.json
@@ -18,20 +18,23 @@
     "@alfresco/adf-core": "2.0.0",
     "@alfresco/adf-insights": "2.0.1",
     "@alfresco/adf-process-services": "2.0.0",
-    "@angular/animations": "5.0.0",
-    "@angular/cdk": "5.0.0-rc0",
-    "@angular/common": "5.0.0",
-    "@angular/compiler": "5.0.0",
-    "@angular/core": "5.0.0",
-    "@angular/flex-layout": "2.0.0-beta.10",
-    "@angular/forms": "5.0.0",
-    "@angular/http": "5.0.0",
-    "@angular/material": "5.0.0-rc0",
-    "@angular/platform-browser": "5.0.0",
-    "@angular/platform-browser-dynamic": "5.0.0",
-    "@angular/router": "5.0.0",
-    "@ngx-translate/core": "8.0.0",
-    "alfresco-js-api": "2.0.0",
+    "@angular/animations": "5.1.1",
+    "@angular/cdk": "5.1.1",
+    "@angular/common": "5.1.1",
+    "@angular/compiler": "5.1.1",
+    "@angular/core": "5.1.1",
+    "@angular/flex-layout": "2.0.0-beta.12",
+    "@angular/forms": "5.1.1",
+    "@angular/http": "5.1.1",
+    "@angular/material": "5.1.1",
+    "@angular/material-moment-adapter": "5.1.1",
+    "@angular/platform-browser": "5.1.1",
+    "@angular/platform-browser-dynamic": "5.1.1",
+    "@angular/router": "5.1.1",
+    "@mat-datetimepicker/core": "^2.0.1",
+    "@mat-datetimepicker/moment": "^2.0.1",
+    "@ngx-translate/core": "10.0.2",
+    "alfresco-js-api": "^2.5.0-d5acbab9993711f37b66351a6aaedf6fc72d1ce2",
     "chart.js": "2.5.0",
     "classlist.js": "1.1.20150312",
     "core-js": "2.4.1",
@@ -39,20 +42,21 @@
     "hammerjs": "2.0.8",
     "intl": "1.2.5",
     "minimatch": "3.0.4",
-    "moment": "2.15.2",
+    "moment": "2.20.1",
     "moment-es6": "1.0.0",
     "ng2-charts": "1.6.0",
     "pdfjs-dist": "1.5.404",
     "raphael": "2.2.7",
     "reflect-metadata": "0.1.10",
-    "rxjs": "5.5.2",
+    "rxjs": "6.0.0",
+    "rxjs-compat": "6.1.0",
     "web-animations-js": "2.3.1",
     "zone.js": "0.8.14"
   },
   "devDependencies": {
-    "@angular-devkit/core": "^0.2.0",
-    "@angular/cli": "1.5.0",
-    "@angular/compiler-cli": "5.0.0",
+    "@angular-devkit/core": "0.0.28",
+    "@angular/cli": "1.7.4",
+    "@angular/compiler-cli": "5.1.1",
     "@angular/language-service": "5.0.0",
     "@types/jasmine": "~2.5.53",
     "@types/jasminewd2": "~2.0.2",
@@ -70,6 +74,6 @@
     "rimraf": "^2.6.2",
     "ts-node": "~3.2.0",
     "tslint": "~5.7.0",
-    "typescript": "~2.4.2"
+    "typescript": "2.6.2"
   }
 }
diff --git a/integration/base_ver_2_app/src/main.ts b/integration/base_ver_2_app/src/main.ts
index 520bafd835..e4c32dc51b 100644
--- a/integration/base_ver_2_app/src/main.ts
+++ b/integration/base_ver_2_app/src/main.ts
@@ -3,11 +3,17 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
 import { AppModule } from './app/app.module';
 import { environment } from './environments/environment';
+import { PDFJSStatic } from 'pdfjs-dist';
+
+declare global {
+  const PDFJS: PDFJSStatic;
+}
 
 import 'hammerjs';
+import 'chart.js';
+import 'ng2-charts';
 
-import pdfjsLib from 'pdfjs-dist';
-pdfjsLib.PDFJS.workerSrc = 'pdf.worker.js';
+PDFJS.workerSrc = 'pdf.worker.js';
 
 if (environment.production) {
   enableProdMode();
diff --git a/integration/base_ver_2_app/src/tsconfig.app.json b/integration/base_ver_2_app/src/tsconfig.app.json
index ab31b96f59..832b32f701 100644
--- a/integration/base_ver_2_app/src/tsconfig.app.json
+++ b/integration/base_ver_2_app/src/tsconfig.app.json
@@ -6,30 +6,7 @@
     "rootDir": "..",
     "baseUrl": ".",
     "skipLibCheck": false,
-    "types": [],
-    "paths": {
-      "alfresco-js-api": [
-        "../node_modules/alfresco-js-api/dist/alfresco-js-api.js"
-      ],
-      "rxjs/*": [
-        "../node_modules/rxjs/*"
-      ],
-      "@angular/*": [
-        "../node_modules/@angular/*"
-      ],
-      "@alfresco/adf-core": [
-        "../../../lib/core"
-      ],
-      "@alfresco/adf-content-services": [
-        "../../../lib/content-services"
-      ],
-      "@alfresco/adf-process-services": [
-        "../../../lib/process-services"
-      ],
-      "@alfresco/adf-insights": [
-        "../../../lib/insights"
-      ]
-    }
+    "types": []
   },
   "exclude": [
     "test.ts",
diff --git a/integration/base_ver_2_app/src/tsconfig.spec.json b/integration/base_ver_2_app/src/tsconfig.spec.json
index 646bc0eff8..96a7fd62a8 100644
--- a/integration/base_ver_2_app/src/tsconfig.spec.json
+++ b/integration/base_ver_2_app/src/tsconfig.spec.json
@@ -6,30 +6,7 @@
     "rootDir": "..",
     "baseUrl": ".",
     "skipLibCheck": false,
-    "types": [],
-    "paths": {
-      "alfresco-js-api": [
-        "../node_modules/alfresco-js-api/dist/alfresco-js-api.js"
-      ],
-      "rxjs/*": [
-        "../node_modules/rxjs/*"
-      ],
-      "@angular/*": [
-        "../node_modules/@angular/*"
-      ],
-      "@alfresco/adf-core": [
-        "../../../lib/core"
-      ],
-      "@alfresco/adf-content-services": [
-        "../../../lib/content-services"
-      ],
-      "@alfresco/adf-process-services": [
-        "../../../lib/process-services"
-      ],
-      "@alfresco/adf-insights": [
-        "../../../lib/insights"
-      ]
-    }
+    "types": []
   },
   "exclude": [
     "test.ts",
diff --git a/lib/.gitignore b/lib/.gitignore
index 911c8f2d29..958d50df10 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -7,22 +7,22 @@ coverage
 dist
 
 content-services/**/*.js
-!content-services/karma-test-shim.js
+!content-services/karma.conf.js
 content-services/**/*.js.map
 content-services/**/*.d.ts
 
 process-services/**/*.js
-!process-services/karma-test-shim.js
+!process-services/karma.conf.js
 process-services/**/*.js.map
 process-services/**/*.d.ts
 
 core/**/*.js
-!core/karma-test-shim.js
+!core/karma.conf.js
 core/**/*.js.map
 core/**/*.d.ts
 
 insights/**/*.js
-!insights/karma-test-shim.js
+!insights/karma.conf.js
 insights/**/*.js.map
 insights/**/*.d.ts
 
diff --git a/lib/config/assets/license_header_add.txt b/lib/config/assets/license_header_add.txt
deleted file mode 100644
index 8560ebf1ab..0000000000
--- a/lib/config/assets/license_header_add.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-@license
-Copyright <%= moment().format('YYYY') %> 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.
diff --git a/lib/config/bundle-scss.js b/lib/config/bundle-scss.js
index 652510b020..325e306211 100644
--- a/lib/config/bundle-scss.js
+++ b/lib/config/bundle-scss.js
@@ -3,23 +3,17 @@ var writeFileSync = require('fs-extra').writeFileSync;
 var mkdirpSync = require('fs-extra').mkdirpSync;
 
  new Bundler().Bundle('./lib/core/styles/_index.scss', '**/*.scss').then(result => {
-    mkdirpSync('core');
     writeFileSync('./lib/dist/core/_theming.scss', result.bundledContent);
 });
 
  new Bundler().Bundle('./lib/insights/styles/_index.scss', '**/*.scss').then(result => {
-    mkdirpSync('insights');
     writeFileSync('./lib/dist/insights/_theming.scss', result.bundledContent);
 });
 
-
  new Bundler().Bundle('./lib/process-services/styles/_index.scss', '**/*.scss').then(result => {
-    mkdirpSync('process-services');
     writeFileSync('./lib/dist/process-services/_theming.scss', result.bundledContent);
 });
 
  new Bundler().Bundle('./lib/content-services/styles/_index.scss', '**/*.scss').then(result => {
-    mkdirpSync('content-services');
     writeFileSync('./lib/dist/content-services/_theming.scss', result.bundledContent);
 });
-
diff --git a/lib/config/custom-loaders/generateListComponent.js b/lib/config/custom-loaders/generateListComponent.js
deleted file mode 100644
index ddcdc83ebe..0000000000
--- a/lib/config/custom-loaders/generateListComponent.js
+++ /dev/null
@@ -1,155 +0,0 @@
-var path = require('path');
-var fs = require('fs');
-
-var erase = true;
-var readmeContent = null;
-var readmeFilePath = '';
-
-function isFileEmpty(fileContents) {
-    return fileContents.toString('utf8').trim() === '';
-}
-
-function writeFile(file, newValue) {
-    fs.writeFileSync(file, newValue, 'utf-8');
-}
-
-function readFile(file) {
-    return fs.readFileSync(file, 'utf8');
-}
-
-function eraseContentList() {
-    if (erase) {
-        erase = false;
-
-        var businessRegex = /(?:<!-- BUSINESS START-->)([\s\S]*?)(?:<!-- BUSINESS END-->)/;
-        var contentRegex = /(?:<!-- CONTENT START-->)([\s\S]*?)(?:<!-- CONTENT END-->)/;
-        var coreRegex = /(?:<!-- CORE START-->)([\s\S]*?)(?:<!-- CORE END-->)/;
-        var businessRegexDirective = /(?:<!-- BUSINESS DIRECTIVE START-->)([\s\S]*?)(?:<!-- BUSINESS DIRECTIVE END-->)/;
-        var contentRegexDirective = /(?:<!-- CONTENT DIRECTIVE START-->)([\s\S]*?)(?:<!-- CONTENT DIRECTIVE END-->)/;
-        var coreRegexDirective = /(?:<!-- CORE DIRECTIVE START-->)([\s\S]*?)(?:<!-- CORE DIRECTIVE END-->)/;
-        var servicessRegex = /(?:<!-- SERVICES START-->)([\s\S]*?)(?:<!-- SERVICES END-->)/;
-
-
-        readmeContent = readmeContent.replace(businessRegex, '<!-- BUSINESS START--><!-- BUSINESS END-->');
-        readmeContent = readmeContent.replace(contentRegex, '<!-- CONTENT START--><!-- CONTENT END-->');
-        readmeContent = readmeContent.replace(coreRegex, '<!-- CORE START--><!-- CORE END-->');
-
-        readmeContent = readmeContent.replace(businessRegexDirective, '<!-- BUSINESS DIRECTIVE START--><!-- BUSINESS DIRECTIVE END-->');
-        readmeContent = readmeContent.replace(contentRegexDirective, '<!-- CONTENT DIRECTIVE START--><!-- CONTENT DIRECTIVE END-->');
-        readmeContent = readmeContent.replace(coreRegexDirective, '<!-- CORE DIRECTIVE START--><!-- CORE DIRECTIVE END-->');
-
-        readmeContent = readmeContent.replace(servicessRegex, '<!-- SERVICES START--><!-- SERVICES END-->');
-
-        writeFile(readmeFilePath, readmeContent)
-    }
-}
-
-function generateListComponent(currentFileContent, webpackInstance) {
-    if (!isFileEmpty(currentFileContent)) {
-
-        var componentReg = /(@Component)(\s?)\((\s?){(\s?)((.|[\n\r])*)}(\s?)\)/gm;
-        var componentSection = componentReg.exec(currentFileContent);
-
-        if (componentSection) {
-
-            var selectorReg = /(adf)([a-zA-Z]|-)+((?!,)|(?! ))/g;
-            var selector = selectorReg.exec(componentSection[0]);
-
-                if (selector) {
-                    var rawPath = webpackInstance.resourcePath.replace(/\\/g, "/");
-                    var removeRoot = rawPath.substr(rawPath.indexOf('/ng2-components') + 16, rawPath.length);
-                    var url = removeRoot.substr(0, removeRoot.indexOf('src')) + 'README.md';
-
-                    var link = '- [' + selector[0] + '](' + url + ')';
-
-                    if (webpackInstance.resourcePath.match('ng2-alfresco-core')) {
-                        readmeContent = readmeContent.replace('<!-- CORE START-->', '<!-- CORE START-->\n' + link);
-                    } else if (webpackInstance.resourcePath.match('ng2-alfresco-')) {
-                        readmeContent = readmeContent.replace('<!-- CONTENT START-->', '<!-- CONTENT START-->\n' + link);
-                    } else if (webpackInstance.resourcePath.match('ng2-activiti-')) {
-                        readmeContent = readmeContent.replace('<!-- BUSINESS START-->', '<!-- BUSINESS START-->\n' + link);
-                    }
-                }
-            }
-
-
-
-        var directiveReg = /(@Directive)(\s?)\((\s?){(\s?)((.|[\r\n])*)}(\s?)\)/gm;
-        var directiveSection = directiveReg.exec(currentFileContent);
-
-        if (directiveSection) {
-            var selectorReg = /(adf)([a-zA-Z]|-)+((?!,)|(?! ))/g;
-            var selector = selectorReg.exec(directiveSection[0]);
-
-            if (selector) {
-                var selector = selector[0].replace("selector: '[", "").replace("']", '').replace("]", '').replace("selector: '", "").replace("'", '');
-
-                var rawPath = webpackInstance.resourcePath.replace(/\\/g, "/");
-                var removeRoot = rawPath.substr(rawPath.indexOf('/ng2-components') + 16, rawPath.length);
-                var url = removeRoot.substr(0, removeRoot.indexOf('src')) + 'README.md';
-
-                var link = '- [' + selector + '](' + url + ')';
-
-                if (webpackInstance.resourcePath.match('ng2-alfresco-core')) {
-                    readmeContent = readmeContent.replace('<!-- CORE DIRECTIVE START-->', '<!-- CORE DIRECTIVE START-->\n' + link);
-                }
-                //else if (webpackInstance.resourcePath.match('ng2-alfresco-')) {
-                //    readmeContent = readmeContent.replace('<!-- CONTENT DIRECTIVE START-->', '<!-- CONTENT DIRECTIVE START-->\n' + link);
-                //}
-                //else if (webpackInstance.resourcePath.match('ng2-activiti-')) {
-                //    readmeContent = readmeContent.replace('<!-- BUSINESS DIRECTIVE START-->', '<!-- BUSINESS DIRECTIVE START-->\n' + link);
-                //}
-            }
-        }
-
-        writeFile(readmeFilePath, readmeContent);
-
-        return true;
-    }
-}
-
-function generateListservices(currentFileContent, webpackInstance) {
-    if (!isFileEmpty(currentFileContent)) {
-
-        var servicesReg = /(@Injectable\(\))(([a-zA-Z ]|[\r\n])*)/gm;
-        var servicesSection = servicesReg.exec(currentFileContent);
-
-        if (servicesSection) {
-
-            var selectorReg = /([a-zA-Z])+Service/g;
-            var selector = selectorReg.exec(servicesSection[0]);
-
-            if (selector) {
-                var rawPath = webpackInstance.resourcePath.replace(/\\/g, "/");
-                var url = rawPath.substr(rawPath.indexOf('/ng2-components') + 16, rawPath.length);
-
-                var link = '- [' + selector[0] + '](' + url + ')';
-
-                readmeContent = readmeContent.replace('<!-- SERVICES START-->', '<!-- SERVICES START-->\n' + link);
-
-            }
-        }
-
-        writeFile(readmeFilePath, readmeContent);
-
-        return true;
-    }
-}
-
-module.exports = function (input, map) {
-    this.cacheable && this.cacheable();
-    var callback = this.async();
-
-    readmeFilePath = path.resolve(__dirname, '../../README.md');
-
-    if (!readmeContent) {
-        readmeContent = readFile(readmeFilePath);
-    }
-
-    if (readmeContent) {
-        eraseContentList();
-        generateListComponent(input, this);
-        generateListservices(input, this);
-    }
-    callback(null, input, map);
-}
diff --git a/lib/config/custom-loaders/license-check.js b/lib/config/custom-loaders/license-check.js
deleted file mode 100644
index 6a15ac03e2..0000000000
--- a/lib/config/custom-loaders/license-check.js
+++ /dev/null
@@ -1,67 +0,0 @@
-var path = require('path');
-var loaderUtils = require('loader-utils');
-var fs = require('fs');
-
-var licenseFileUtf8Store = undefined;
-
-function readLicenseHeaderFile(licenseFilePath) {
-    if (licenseFileUtf8Store) {
-        return licenseFileUtf8Store;
-    }
-
-    if (fs.existsSync(licenseFilePath)) {
-        licenseFileUtf8Store = fs.readFileSync(licenseFilePath, 'utf8').split(/\r?\n/);
-        return licenseFileUtf8Store;
-    }
-
-    throw new Error('The license header file path is wrong ' + licenseFilePath);
-}
-
-function isFileEmpty(fileContents) {
-    return fileContents.toString('utf8').trim() === '';
-}
-
-function readCurrentFile(fileContent) {
-    return fileContent.toString('utf8').split(/\r?\n/);
-}
-
-function isLicenseHeaderPresent(currentFileContent, licenseFilePath) {
-    if (!isFileEmpty(currentFileContent)) {
-        var currentFileUtf8 = readCurrentFile(currentFileContent),
-            licenseFileUtf8 = readLicenseHeaderFile(licenseFilePath);
-            skipStrict = 0;
-
-        if(currentFileUtf8[0] === '"use strict";' ) {
-            skipStrict = 1;
-        }
-
-        for (var i = skipStrict; i < licenseFileUtf8.length; i++) {
-            if (currentFileUtf8[i + skipStrict] !== licenseFileUtf8[i]) {
-                return false;
-            }
-        }
-    }
-    return true;
-}
-
-function report(hasHeader, emitter, filename) {
-  if (hasHeader) return;
-  emitter('Missing license header file : ' + filename);
-}
-
-function licenseCheck(webpackInstance, input, options) {
-    var isLicensePresent =  isLicenseHeaderPresent(input, options.licenseFile);
-
-    var emitter = options.emitErrors ? webpackInstance.emitError : webpackInstance.emitWarning;
-
-    report(isLicensePresent, emitter, webpackInstance.resourcePath);
-}
-
-module.exports = function(input, map) {
-  this.cacheable && this.cacheable();
-  var callback = this.async();
-
-  var options = loaderUtils.getOptions(this);
-  licenseCheck(this, input, options);
-  callback(null, input, map);
-};
diff --git a/lib/config/helpers.js b/lib/config/helpers.js
deleted file mode 100644
index a11fa771d6..0000000000
--- a/lib/config/helpers.js
+++ /dev/null
@@ -1,10 +0,0 @@
-var path = require('path');
-
-var _root = path.resolve(__dirname, '..');
-
-function root(args) {
-  args = Array.prototype.slice.call(arguments, 0);
-  return path.join.apply(path, [_root].concat(args));
-}
-
-exports.root = root;
diff --git a/lib/config/karma-test-shim.js b/lib/config/karma-test-shim.js
deleted file mode 100644
index cf2b75634a..0000000000
--- a/lib/config/karma-test-shim.js
+++ /dev/null
@@ -1,56 +0,0 @@
-Error.stackTraceLimit = Infinity;
-
-require('core-js/es6');
-require('core-js/es7/reflect');
-
-require('zone.js/dist/zone');
-require('zone.js/dist/long-stack-trace-zone');
-require('zone.js/dist/proxy');
-require('zone.js/dist/sync-test');
-require('zone.js/dist/jasmine-patch');
-require('zone.js/dist/async-test');
-require('zone.js/dist/fake-async-test');
-
-jasmine.DEFAULT_TIMEOUT_INTERVAL = 20000;
-
-var appContext = require.context(".", true, /.spec.ts/);appContext.keys().forEach(appContext);
-
-const TestBed = require('@angular/core/testing').TestBed;
-const browser = require('@angular/platform-browser-dynamic/testing');
-const NoopAnimationsModule = require('@angular/platform-browser/animations').NoopAnimationsModule;
-const CoreModule = require('../core').CoreModule;
-const AppConfigService = require('../core').AppConfigService;
-const AppConfigServiceMock = require('../core').AppConfigServiceMock;
-const TranslationService = require('../core').TranslationService;
-const TranslationMock = require('../core').TranslationMock;
-const TranslateModule = require('@ngx-translate/core').TranslateModule;
-const CommonModule = require('@angular/common').CommonModule;
-const FormsModule = require('@angular/forms').FormsModule;
-const ReactiveFormsModule = require('@angular/forms').ReactiveFormsModule;
-const AlfrescoApiService = require('../core').AlfrescoApiService;
-const AlfrescoApiServiceMock = require('../core').AlfrescoApiServiceMock;
-
-
-TestBed.initTestEnvironment(browser.BrowserDynamicTestingModule, browser.platformBrowserDynamicTesting());
-
-beforeEach(() => {
-    TestBed.configureTestingModule({
-        imports: [
-            NoopAnimationsModule,
-            CoreModule,
-            TranslateModule,
-            CommonModule,
-            FormsModule,
-            ReactiveFormsModule
-        ],
-        providers: [
-            {provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock},
-            {provide: AppConfigService, useClass: AppConfigServiceMock},
-            {provide: TranslationService, useClass: TranslationMock}
-        ]
-    });
-});
-
-afterEach(() => {
-    TestBed.resetTestingModule();
-});
diff --git a/lib/config/karma.conf-all.js b/lib/config/karma.conf-all.js
deleted file mode 100644
index b2d9c92d2a..0000000000
--- a/lib/config/karma.conf-all.js
+++ /dev/null
@@ -1,151 +0,0 @@
-const webpackCoverage = require('./webpack.coverage');
-const webpackTest = require('./webpack.test');
-
-module.exports = function (config) {
-    var _config = {
-        basePath: '../',
-
-        frameworks: ['jasmine-ajax', 'jasmine'],
-
-        files: [
-            {pattern: './node_modules/core-js/client/core.js', included: true, watched: false},
-            {pattern: './node_modules/tslib/tslib.js', included: true, watched: false},
-            {pattern: './node_modules/hammerjs/hammer.min.js', included: true, watched: false},
-            {pattern: './node_modules/hammerjs/hammer.min.js.map', included: false, watched: false},
-
-            // pdf-js
-            {pattern: './node_modules/pdfjs-dist/build/pdf.js', included: true, watched: false},
-            {pattern: './node_modules/pdfjs-dist/build/pdf.worker.js', included: true, watched: false},
-            {pattern: './node_modules/pdfjs-dist/web/pdf_viewer.js', included: true, watched: false},
-
-            {
-                pattern: './node_modules/@angular/material/prebuilt-themes/indigo-pink.css',
-                included: true,
-                watched: false
-            },
-
-            //diagrams
-            {pattern: './node_modules/chart.js/dist/Chart.js', included: true, watched: false},
-            {pattern: './node_modules/alfresco-js-api/dist/alfresco-js-api.min.js', included: true, watched: false},
-            {pattern: './node_modules/raphael/raphael.min.js', included: true, watched: false},
-            {pattern: './node_modules/moment/min/moment.min.js', included: true, watched: false},
-            {
-                pattern: './node_modules/ng2-charts/bundles/ng2-charts.umd.js',
-                included: false,
-                served: true,
-                watched: false
-            },
-
-            {pattern: './lib/core/i18n/**/en.json', included: false, served: true, watched: false},
-            {pattern: './lib/content-services/i18n/**/en.json', included: false, served: true, watched: false},
-            {pattern: './lib/process-services/i18n/**/en.json', included: false, served: true, watched: false},
-
-            {pattern: './lib/**/*.ts', included: false, served: true, watched: false},
-
-            {pattern: './lib/config/app.config.json', included: false, served: true, watched: false},
-            {pattern: './lib/core/viewer/assets/fake-test-file.pdf', included: false, served: true, watched: false},
-            {pattern: './lib/core/viewer/assets/fake-test-file.txt', included: false, served: true, watched: false},
-            {
-                pattern: './lib/core/viewer/assets/fake-test-password-file.pdf',
-                included: false,
-                served: true,
-                watched: false
-            },
-
-            {pattern: './lib/' + config.component + '/karma-test-shim.js', watched: false}
-        ],
-
-        webpack: (config.mode === 'coverage') ? webpackCoverage(config) : webpackTest(config),
-
-        webpackMiddleware: {
-            noInfo: true,
-            stats: {
-                chunks: false
-            }
-        },
-
-        port: 9876,
-
-        proxies: {
-            '/app.config.json': '/base/lib/config/app.config.json',
-            '/fake-test-file.pdf': '/base/lib/core/viewer/assets/fake-test-file.pdf',
-            '/fake-test-file.txt': '/base/lib/core/viewer/assets/fake-test-file.txt',
-            '/fake-test-password-file.pdf': '/base/lib/core/viewer/assets/fake-test-password-file.pdf'
-        },
-
-        // level of logging
-        // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
-        logLevel: config.LOG_DISABLE,
-
-        colors: true,
-
-        autoWatch: false,
-
-        browserDisconnectTimeout: 200000,
-        browserNoActivityTimeout: 2400000,
-        captureTimeout: 1200000,
-        browsers: ['Chrome'],
-        // browsers: ['ChromeHeadless'],
-
-        customLaunchers: {
-            ChromeHeadless: {
-                base: 'Chrome',
-                flags: [
-                    '--no-sandbox',
-                    '--headless',
-                    '--disable-gpu',
-                    '--remote-debugging-port=9222'
-                ]
-            }
-        },
-
-        // Karma plugins loaded
-        plugins: [
-            require('../../node_modules/karma-jasmine'),
-            require('../../node_modules/karma-coverage'),
-            require('../../node_modules/karma-sourcemap-loader'),
-            require('../../node_modules/karma-jasmine-ajax'),
-            require('../../node_modules/karma-chrome-launcher'),
-            require('../../node_modules/karma-webpack'),
-            require('../../node_modules/karma-jasmine-html-reporter'),
-            require('../../node_modules/karma-mocha-reporter')
-        ],
-
-        webpackServer: {
-            noInfo: true
-        },
-
-        // Coverage reporter generates the coverage
-        reporters: ['mocha', 'coverage', 'kjhtml'],
-
-        mochaReporter: {
-            ignoreSkipped: true
-        },
-
-        preprocessors: {
-            '**/karma-test-shim.js': ['webpack'],
-            '(core|content-services|process-services)/**/!(*spec|index|*mock|*model|*event).js': 'coverage'
-        },
-
-        coverageReporter: {
-            includeAllSources: true,
-            dir: './lib/coverage/' + config.component + '/',
-            subdir: 'report',
-            reporters: [
-                {type: 'text'},
-                {type: 'text-summary'},
-                {type: 'json', file: 'coverage-final.json'},
-                {type: 'html'},
-                {type: 'lcov'}
-            ]
-        }
-
-        // client: {
-        //     jasmine: {
-        //         random: true
-        //     }
-        // }
-    };
-
-    config.set(_config);
-};
diff --git a/lib/config/test-export.js b/lib/config/test-export.js
deleted file mode 100644
index e582d56acf..0000000000
--- a/lib/config/test-export.js
+++ /dev/null
@@ -1 +0,0 @@
-console.log('Start');
diff --git a/lib/config/webpack.build.js b/lib/config/webpack.build.js
deleted file mode 100644
index 464853f77a..0000000000
--- a/lib/config/webpack.build.js
+++ /dev/null
@@ -1,60 +0,0 @@
-const webpackMerge = require('webpack-merge');
-const UglifyJSPlugin = require('uglifyjs-webpack-plugin')
-const commonConfig = require('./webpack.common.js');
-const fs = require('fs');
-const webpack = require('webpack');
-const path = require('path');
-
-module.exports = webpackMerge(commonConfig, {
-
-    // require those dependencies but don't bundle them
-    externals: [
-        /^\@angular\//,
-        /^rxjs\//,
-        /^\@ngx-translate\//,
-        'moment',
-        'minimatch',
-        'raphael',
-        'ng2-charts',
-        'alfresco-js-api',
-        /^\@alfresco\//,
-        'content-services',
-        'process-services',
-        'core'
-    ],
-
-    output: {
-        filename: 'dist-webpack/[name]/bundles/adf-[name].js',
-        library: '[name]',
-        libraryTarget: 'umd',
-        chunkFilename: '[id].chunk.js'
-    },
-
-    entry: {
-        "core": "./core/index.ts",
-        "insights": "./insights/index.ts",
-        "content-services": "./content-services/index.ts",
-        "process-services": "./process-services/index.ts"
-    },
-
-    plugins: [
-
-        new UglifyJSPlugin({
-            sourceMap: true,
-            uglifyOptions: {
-                ie8: false,
-                ecma: 6,
-                output: {
-                    comments: false,
-                    beautify: false
-                },
-                warnings: false
-            }
-        }),
-
-        new webpack.BannerPlugin({
-            banner: fs.readFileSync(path.resolve(__dirname, './assets/license_header_add.txt'), 'utf8'),
-            entryOnly: true
-        })
-    ]
-});
diff --git a/lib/config/webpack.bundle-check.js b/lib/config/webpack.bundle-check.js
deleted file mode 100644
index 926b752a9c..0000000000
--- a/lib/config/webpack.bundle-check.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const webpackMerge = require('webpack-merge');
-const webpackBuild = require('./webpack.build.js');
-const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
-
-module.exports = webpackMerge(webpackBuild, {
-
-    plugins: [
-        new BundleAnalyzerPlugin()
-    ]
-});
diff --git a/lib/config/webpack.common.js b/lib/config/webpack.common.js
deleted file mode 100644
index 437bf8f52b..0000000000
--- a/lib/config/webpack.common.js
+++ /dev/null
@@ -1,178 +0,0 @@
-const webpack = require('webpack');
-const helpers = require('./helpers');
-const path = require('path');
-const CopyWebpackPlugin = require('copy-webpack-plugin');
-var HappyPack = require('happypack');
-const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
-
-const alfrescoLibs = [
-    'content-services',
-    'process-services',
-    'core',
-    'insights'
-];
-
-const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
-
-module.exports = {
-
-    devtool: 'source-map',
-
-    resolveLoader: {
-        alias: {
-            "file-multi-loader": path.resolve(__dirname, "./custom-loaders/file-loader-multi"),
-            "license-check": path.resolve(__dirname, "./custom-loaders/license-check")
-        }
-    },
-
-    resolve: {
-        alias: {
-            "@alfresco/adf-content-services": path.resolve(__dirname, '../content-services/'),
-            "@alfresco/adf-content-services$": path.resolve(__dirname, '../content-services/index.ts'),
-            "@alfresco/adf-process-services": path.resolve(__dirname, '../process-services/'),
-            "@alfresco/adf-process-services$": path.resolve(__dirname, '../process-services/index.ts'),
-            "@alfresco/adf-core": path.resolve(__dirname, '../core/'),
-            "@alfresco/adf-core$": path.resolve(__dirname, '../core/index.ts'),
-            "@alfresco/adf-insights": path.resolve(__dirname, '../insights/'),
-            "@alfresco/adf-insights": path.resolve(__dirname, '../insights/index.ts')
-        },
-        extensions: ['.ts', '.js', '.scss'],
-        modules: [helpers.root('../node_modules')]
-    },
-
-    module: {
-        rules: [
-            {
-                enforce: 'pre',
-                test: /\.js$/,
-                loader: 'source-map-loader',
-                exclude: [/node_modules/, /bundles/, /dist/, /demo/]
-            },
-            {
-                enforce: 'pre',
-                test: /\.ts$/,
-                use: 'source-map-loader',
-                exclude: [/node_modules/, /bundles/, /dist/, /demo/]
-            },
-            {
-                enforce: 'pre',
-                test: /\.ts$/,
-                loader: 'tslint-loader',
-                options: {
-                    configFile : helpers.root('tslint.json'),
-                    emitErrors: true,
-                    failOnHint: true,
-                    fix: true
-                },
-                exclude: [/node_modules/, /bundles/, /dist/, /demo/]
-            },
-            {
-                test: /\.ts$/,
-                loader: ['happypack/loader?id=ts', 'angular2-template-loader'],
-                exclude: [/node_modules/, /bundles/, /dist/, /demo/]
-            },
-            {
-                test: /\.html$/,
-                loader: 'html-loader',
-                exclude: [/node_modules/, /bundles/, /dist/, /demo/]
-            },
-            {
-                test: /\.css$/,
-                loader: ['happypack/loader?id=css'],
-                exclude: [/node_modules/, /bundles/, /dist/, /demo/]
-            },
-            {
-                test: /\.scss$/,
-                use: [{
-                    loader: "to-string-loader"
-                }, {
-                    loader: "raw-loader"
-                }, {
-                    loader: "sass-loader"
-                }]
-            },
-            {
-                enforce: 'pre',
-                test: /\.ts$/,
-                loader: 'license-check',
-                options: {
-                    emitErrors: true,
-                    licenseFile: path.resolve(__dirname, './assets/license_header.txt')
-                },
-                exclude: [/node_modules/, /bundles/, /dist/, /demo/, /rendering-queue.services.ts/]
-            },
-            {
-                test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)$/,
-                loader: 'file-multi-loader',
-                query: {
-                    name: '[name].[hash].[ext]',
-                    outputPath: (url, resourcePath)=> {
-                        return resourcePath.replace('assets/', 'bundles/assets/') + url;
-                    },
-                    publicPath: (url, resourcePath)=> {
-                        var component = resourcePath.substring(0, resourcePath.indexOf('/'));
-                        var path = resourcePath.replace(component, '');
-                        return path + url;
-                    }
-                }
-            }
-        ]
-    },
-
-    plugins: [
-        new ForkTsCheckerWebpackPlugin(),
-        new HappyPack({
-            id: 'ts',
-            threads: 4,
-            loaders: [
-                {
-                    path: 'ts-loader',
-                    query: {
-                        happyPackMode: true,
-                        "compilerOptions": {
-                            "outDir": "./",
-                            "declaration": true,
-                            "paths": {
-                            }
-                        }
-                    }
-                }
-            ]
-        }),
-
-        new HappyPack({
-            id: 'css',
-            threads: 4,
-            loaders: ['to-string-loader', 'css-loader' ]
-        }),
-
-        new CopyWebpackPlugin([
-            ... alfrescoLibs.map(lib => {
-                return {
-                    from: `lib/${lib}/i18n/`,
-                    to: `lib/${lib}/bundles/assets/adf-${lib}/i18n/`
-                }
-            })
-        ]),
-
-        new webpack.NoEmitOnErrorsPlugin(),
-
-        new webpack.ContextReplacementPlugin( /angular(\\|\/)core(\\|\/)/, path.resolve(__dirname, './src') ),
-
-        new webpack.DefinePlugin({
-            'process.env': {
-                'ENV': JSON.stringify(ENV)
-            }
-        }),
-        new webpack.LoaderOptionsPlugin({
-            htmlLoader: {
-                minimize: false // workaround for ng2
-            }
-        })
-    ],
-
-    node: {
-        fs: 'empty',
-        module: false
-    }
-};
diff --git a/lib/config/webpack.coverage.js b/lib/config/webpack.coverage.js
deleted file mode 100644
index 4632ecdad5..0000000000
--- a/lib/config/webpack.coverage.js
+++ /dev/null
@@ -1,36 +0,0 @@
-const webpack = require('webpack');
-const webpackMerge = require('webpack-merge');
-const commonConfig = require('./webpack.common.js');
-const helpers = require('./helpers');
-
-module.exports = function (config) {
-    return webpackMerge(commonConfig, {
-
-        devtool: 'inline-source-map',
-
-        module: {
-            rules: [
-                {
-                    test: /\.(txt|pdf)$/,
-                    loader: 'file-loader',
-                    query: {
-                        name: '[path][name].[ext]',
-                        outputPath: (url)=> {
-                        return url.replace('src', 'dist');
-                        }
-                    }
-                },
-                {
-                    enforce: 'post',
-                    test: /^(?!(.*spec|index|.*mock|.*model|.*event)).*\.ts?$/,
-                    loader: 'istanbul-instrumenter-loader',
-                    include: [helpers.root(config.component)],
-                    exclude: [
-                        /node_modules/,
-                        /test/
-                    ]
-                }
-            ]
-        }
-    });
-};
diff --git a/lib/config/webpack.doc.js b/lib/config/webpack.doc.js
deleted file mode 100644
index 2e6cea4585..0000000000
--- a/lib/config/webpack.doc.js
+++ /dev/null
@@ -1,23 +0,0 @@
-const helpers = require('./helpers');
-const webpackMerge = require('webpack-merge');
-const webpackBuild = require('./webpack.build');
-const path = require('path');
-
-module.exports = webpackMerge(webpackBuild, {
-
-    resolveLoader: {
-        alias: {
-            "generate-list-component-loader": path.resolve(__dirname, "./custom-loaders/generateListComponent")
-        }
-    },
-
-    module: {
-        rules: [
-            {
-                test: /\.ts/,
-                loader: 'generate-list-component-loader',
-                exclude: [/node_modules/, /bundles/, /dist/, /demo/]
-            }
-        ]
-    }
-});
diff --git a/lib/config/webpack.style.js b/lib/config/webpack.style.js
index 807c2da38d..5ff1824883 100644
--- a/lib/config/webpack.style.js
+++ b/lib/config/webpack.style.js
@@ -1,9 +1,12 @@
 const ExtractTextPlugin = require("extract-text-webpack-plugin");
 
-const extractScss = new ExtractTextPlugin('./lib/dist/core/prebuilt-themes/[name].css');
+const extractScss = new ExtractTextPlugin('./core/prebuilt-themes/[name].css');
+var path = require("path");
 
 module.exports = {
 
+    mode: 'production',
+
     entry: {
         'adf-blue-orange': './lib/core/styles/prebuilt/adf-blue-orange.scss',
         'adf-blue-purple': './lib/core/styles/prebuilt/adf-blue-purple.scss',
@@ -17,7 +20,9 @@ module.exports = {
     },
 
     output: {
-        filename: './dist/[name].js'
+        path: path.resolve(__dirname, '../dist/'),
+        filename: '[name].js',
+        publicPath: '/dist'
     },
 
     module: {
diff --git a/lib/config/webpack.test.js b/lib/config/webpack.test.js
deleted file mode 100644
index 364d4b5bf9..0000000000
--- a/lib/config/webpack.test.js
+++ /dev/null
@@ -1,24 +0,0 @@
-const webpackMerge = require('webpack-merge');
-const commonConfig = require('./webpack.common.js');
-
-module.exports = function (config) {
-    return webpackMerge(commonConfig, {
-
-        devtool: 'inline-source-map',
-
-        module: {
-            rules: [
-                {
-                    test: /\.(txt|pdf)$/,
-                    loader: 'file-loader',
-                    query: {
-                        name: '[path][name].[ext]',
-                        outputPath: (url)=> {
-                        return url.replace('src', 'dist');
-                        }
-                    }
-                }
-            ]
-        }
-    });
-};
diff --git a/lib/content-services/breadcrumb/breadcrumb.module.ts b/lib/content-services/breadcrumb/breadcrumb.module.ts
index 8ca9346de8..122518359a 100644
--- a/lib/content-services/breadcrumb/breadcrumb.module.ts
+++ b/lib/content-services/breadcrumb/breadcrumb.module.ts
@@ -18,16 +18,16 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { MaterialModule } from '../material.module';
-import { TranslateModule } from '@ngx-translate/core';
 
 import { BreadcrumbComponent } from './breadcrumb.component';
 import { DropdownBreadcrumbComponent } from './dropdown-breadcrumb.component';
+import { CoreModule } from '@alfresco/adf-core';
 
 @NgModule({
     imports: [
         CommonModule,
         MaterialModule,
-        TranslateModule
+        CoreModule.forChild()
     ],
     exports: [
         BreadcrumbComponent,
diff --git a/lib/content-services/content-metadata/components/content-metadata-card/content-metadata-card.component.html b/lib/content-services/content-metadata/components/content-metadata-card/content-metadata-card.component.html
index 09b8f90a12..d24d637fcb 100644
--- a/lib/content-services/content-metadata/components/content-metadata-card/content-metadata-card.component.html
+++ b/lib/content-services/content-metadata/components/content-metadata-card/content-metadata-card.component.html
@@ -1,10 +1,11 @@
 <mat-card *ngIf="node">
     <mat-card-content>
         <adf-content-metadata
+            [displayDefaultProperties]="displayDefaultProperties"
+            [expanded]="expanded"
             [node]="node"
             [displayEmpty]="displayEmpty"
             [editable]="editable"
-            [expanded]="expanded"
             [multi]="multi"
             [preset]="preset">
         </adf-content-metadata>
@@ -15,17 +16,17 @@
                 mat-icon-button
                 (click)="toggleEdit()"
                 [attr.title]="'CORE.METADATA.ACTIONS.EDIT' | translate"
-                data-automation-id="mata-data-card-toggle-edit">
+                data-automation-id="meta-data-card-toggle-edit">
                 <mat-icon>mode_edit</mat-icon>
             </button>
         </div>
-        <button mat-button (click)="toggleExpanded()" data-automation-id="mata-data-card-toggle-expand">
+        <button *ngIf="displayDefaultProperties" mat-button (click)="toggleExpanded()" data-automation-id="meta-data-card-toggle-expand">
             <ng-container *ngIf="!expanded">
-                <span data-automation-id="mata-data-card-toggle-expand-label">{{ 'ADF_VIEWER.SIDEBAR.METADATA.MORE_INFORMATION' | translate }}</span>
+                <span data-automation-id="meta-data-card-toggle-expand-label">{{ 'ADF_VIEWER.SIDEBAR.METADATA.MORE_INFORMATION' | translate }}</span>
                 <mat-icon>keyboard_arrow_down</mat-icon>
             </ng-container>
             <ng-container *ngIf="expanded">
-                <span data-automation-id="mata-data-card-toggle-expand-label">{{ 'ADF_VIEWER.SIDEBAR.METADATA.LESS_INFORMATION' | translate }}</span>
+                <span data-automation-id="meta-data-card-toggle-expand-label">{{ 'ADF_VIEWER.SIDEBAR.METADATA.LESS_INFORMATION' | translate }}</span>
                 <mat-icon>keyboard_arrow_up</mat-icon>
             </ng-container>
         </button>
diff --git a/lib/content-services/content-metadata/components/content-metadata-card/content-metadata-card.component.spec.ts b/lib/content-services/content-metadata/components/content-metadata-card/content-metadata-card.component.spec.ts
index 5313ac37fc..fb7b03bb7b 100644
--- a/lib/content-services/content-metadata/components/content-metadata-card/content-metadata-card.component.spec.ts
+++ b/lib/content-services/content-metadata/components/content-metadata-card/content-metadata-card.component.spec.ts
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-/*tslint:disable: ban*/
-
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { MinimalNodeEntryEntity } from 'alfresco-js-api';
@@ -62,6 +60,16 @@ describe('ContentMetadataCardComponent', () => {
         expect(component.displayEmpty).toBe(false);
     });
 
+    it('should show more information when no metadata properties are being displayed', () => {
+        component.displayDefaultProperties = false;
+        expect(component.expanded).toBe(!component.displayDefaultProperties);
+    });
+
+    it('should show less information when metadata properties are being displayed', () => {
+        component.displayDefaultProperties = true;
+        expect(component.expanded).toBe(!component.displayDefaultProperties);
+    });
+
     it('should pass through the node to the underlying component', () => {
         const contentMetadataComponent = fixture.debugElement.query(By.directive(ContentMetadataComponent)).componentInstance;
 
@@ -120,7 +128,7 @@ describe('ContentMetadataCardComponent', () => {
         component.node.allowableOperations = [PermissionsEnum.UPDATE];
         fixture.detectChanges();
 
-        const button = fixture.debugElement.query(By.css('[data-automation-id="mata-data-card-toggle-edit"]'));
+        const button = fixture.debugElement.query(By.css('[data-automation-id="meta-data-card-toggle-edit"]'));
         button.triggerEventHandler('click', {});
         fixture.detectChanges();
 
@@ -131,7 +139,7 @@ describe('ContentMetadataCardComponent', () => {
         component.expanded = true;
         fixture.detectChanges();
 
-        const button = fixture.debugElement.query(By.css('[data-automation-id="mata-data-card-toggle-expand"]'));
+        const button = fixture.debugElement.query(By.css('[data-automation-id="meta-data-card-toggle-expand"]'));
         button.triggerEventHandler('click', {});
         fixture.detectChanges();
 
@@ -142,7 +150,7 @@ describe('ContentMetadataCardComponent', () => {
         component.expanded = false;
         fixture.detectChanges();
 
-        const buttonLabel = fixture.debugElement.query(By.css('[data-automation-id="mata-data-card-toggle-expand-label"]'));
+        const buttonLabel = fixture.debugElement.query(By.css('[data-automation-id="meta-data-card-toggle-expand-label"]'));
 
         expect(buttonLabel.nativeElement.innerText.trim()).toBe('ADF_VIEWER.SIDEBAR.METADATA.MORE_INFORMATION');
     });
@@ -151,7 +159,7 @@ describe('ContentMetadataCardComponent', () => {
         component.expanded = true;
         fixture.detectChanges();
 
-        const buttonLabel = fixture.debugElement.query(By.css('[data-automation-id="mata-data-card-toggle-expand-label"]'));
+        const buttonLabel = fixture.debugElement.query(By.css('[data-automation-id="meta-data-card-toggle-expand-label"]'));
 
         expect(buttonLabel.nativeElement.innerText.trim()).toBe('ADF_VIEWER.SIDEBAR.METADATA.LESS_INFORMATION');
     });
@@ -160,7 +168,7 @@ describe('ContentMetadataCardComponent', () => {
         component.readOnly = true;
         fixture.detectChanges();
 
-        const button = fixture.debugElement.query(By.css('[data-automation-id="mata-data-card-toggle-edit"]'));
+        const button = fixture.debugElement.query(By.css('[data-automation-id="meta-data-card-toggle-edit"]'));
         expect(button).toBeNull();
     });
 
@@ -169,7 +177,7 @@ describe('ContentMetadataCardComponent', () => {
         component.node.allowableOperations = null;
         fixture.detectChanges();
 
-        const button = fixture.debugElement.query(By.css('[data-automation-id="mata-data-card-toggle-edit"]'));
+        const button = fixture.debugElement.query(By.css('[data-automation-id="meta-data-card-toggle-edit"]'));
         expect(button).toBeNull();
     });
 
@@ -178,7 +186,7 @@ describe('ContentMetadataCardComponent', () => {
         component.node.allowableOperations = [PermissionsEnum.UPDATE];
         fixture.detectChanges();
 
-        const button = fixture.debugElement.query(By.css('[data-automation-id="mata-data-card-toggle-edit"]'));
+        const button = fixture.debugElement.query(By.css('[data-automation-id="meta-data-card-toggle-edit"]'));
         expect(button).not.toBeNull();
     });
 });
diff --git a/lib/content-services/content-metadata/components/content-metadata-card/content-metadata-card.component.ts b/lib/content-services/content-metadata/components/content-metadata-card/content-metadata-card.component.ts
index ecf28c9ca7..7cb4c0b2ff 100644
--- a/lib/content-services/content-metadata/components/content-metadata-card/content-metadata-card.component.ts
+++ b/lib/content-services/content-metadata/components/content-metadata-card/content-metadata-card.component.ts
@@ -27,27 +27,60 @@ import { ContentService, PermissionsEnum } from '@alfresco/adf-core';
     host: { 'class': 'adf-content-metadata-card' }
 })
 export class ContentMetadataCardComponent {
+    /** (required) The node entity to fetch metadata about */
     @Input()
     node: MinimalNodeEntryEntity;
 
+    /** (optional) This flag displays/hides empty metadata
+     * fields.
+     */
     @Input()
     displayEmpty: boolean = false;
 
+    /** (required) Name of the metadata preset, which defines aspects
+     * and their properties.
+     */
     @Input()
     preset: string;
 
+    /** (optional) This flag sets the metadata in read only mode
+     * preventing changes.
+     */
     @Input()
     readOnly = false;
 
+    /** (optional) This flag allows the component to display more
+     * than one accordion at a time.
+     */
     @Input()
     multi = false;
 
+    private _displayDefaultProperties: boolean = true;
+
+    /** (optional) This flag displays/hides the metadata
+     * properties.
+     */
+    @Input()
+    set displayDefaultProperties(value: boolean) {
+        this._displayDefaultProperties = value;
+        this.onDisplayDefaultPropertiesChange();
+    }
+
+    get displayDefaultProperties(): boolean {
+        return this._displayDefaultProperties;
+    }
+
     editable: boolean = false;
-    expanded: boolean = false;
+
+    expanded: boolean;
 
     constructor(private contentService: ContentService) {
     }
 
+    onDisplayDefaultPropertiesChange(): void {
+        this.expanded = !this._displayDefaultProperties;
+    }
+
     toggleEdit(): void {
         this.editable = !this.editable;
     }
diff --git a/lib/content-services/content-metadata/components/content-metadata/content-metadata.component.html b/lib/content-services/content-metadata/components/content-metadata/content-metadata.component.html
index 2d5adcf647..996ea9f747 100644
--- a/lib/content-services/content-metadata/components/content-metadata/content-metadata.component.html
+++ b/lib/content-services/content-metadata/components/content-metadata/content-metadata.component.html
@@ -1,6 +1,10 @@
 <div class="adf-metadata-properties">
     <mat-accordion displayMode="flat" [multi]="multi">
-        <mat-expansion-panel [expanded]="!expanded" [hideToggle]="!expanded">
+        <mat-expansion-panel
+            *ngIf="displayDefaultProperties"
+            [expanded]="!expanded"
+            [hideToggle]="!expanded"
+            [attr.data-automation-id]="'adf-metadata-group-properties'" >
             <mat-expansion-panel-header>
                 <mat-panel-title>
                     {{ 'CORE.METADATA.BASIC.HEADER' | translate }}
@@ -16,8 +20,10 @@
 
         <ng-container *ngIf="expanded">
             <ng-container *ngIf="groupedProperties$ | async; else loading; let groupedProperties">
-                <div *ngFor="let group of groupedProperties" class="adf-metadata-grouped-properties-container">
-                    <mat-expansion-panel>
+                <div *ngFor="let group of groupedProperties; let first = first;" class="adf-metadata-grouped-properties-container">
+                    <mat-expansion-panel
+                    [attr.data-automation-id]="'adf-metadata-group-' + group.title"
+                    [expanded]="!displayDefaultProperties && first">
                         <mat-expansion-panel-header>
                             <mat-panel-title>
                                 {{ group.title | translate }}
@@ -30,6 +36,7 @@
                             [displayEmpty]="displayEmpty">
                         </adf-card-view>
                     </mat-expansion-panel>
+
                 </div>
             </ng-container>
             <ng-template #loading>
@@ -37,4 +44,4 @@
             </ng-template>
         </ng-container>
     </mat-accordion>
-</div>
\ No newline at end of file
+</div>
diff --git a/lib/content-services/content-metadata/components/content-metadata/content-metadata.component.spec.ts b/lib/content-services/content-metadata/components/content-metadata/content-metadata.component.spec.ts
index 5991333162..b4beb5c427 100644
--- a/lib/content-services/content-metadata/components/content-metadata/content-metadata.component.spec.ts
+++ b/lib/content-services/content-metadata/components/content-metadata/content-metadata.component.spec.ts
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-/*tslint:disable: ban*/
-
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { SimpleChange } from '@angular/core';
 import { By } from '@angular/platform-browser';
@@ -24,8 +22,7 @@ import { MinimalNodeEntryEntity } from 'alfresco-js-api';
 import { ContentMetadataComponent } from './content-metadata.component';
 import { ContentMetadataService } from '../../services/content-metadata.service';
 import { CardViewBaseItemModel, CardViewComponent, CardViewUpdateService, NodesApiService, LogService, setupTestBed } from '@alfresco/adf-core';
-import { ErrorObservable } from 'rxjs/observable/ErrorObservable';
-import { Observable } from 'rxjs/Observable';
+import { throwError, of } from 'rxjs';
 import { ContentTestingModule } from '../../../testing/content.testing.module';
 
 describe('ContentMetadataComponent', () => {
@@ -104,7 +101,7 @@ describe('ContentMetadataComponent', () => {
             const property = <CardViewBaseItemModel> { key: 'property-key', value: 'original-value' },
                 updateService: CardViewUpdateService = fixture.debugElement.injector.get(CardViewUpdateService),
                 nodesApiService: NodesApiService = TestBed.get(NodesApiService);
-            spyOn(nodesApiService, 'updateNode');
+            spyOn(nodesApiService, 'updateNode').and.callThrough();
 
             updateService.update(property, 'updated-value');
 
@@ -120,7 +117,7 @@ describe('ContentMetadataComponent', () => {
                 expectedNode = Object.assign({}, node, { name: 'some-modified-value' });
 
             spyOn(nodesApiService, 'updateNode').and.callFake(() => {
-                return Observable.of(expectedNode);
+                return of(expectedNode);
             });
 
             updateService.update(property, 'updated-value');
@@ -137,7 +134,7 @@ describe('ContentMetadataComponent', () => {
                 logService: LogService = TestBed.get(LogService);
 
             spyOn(nodesApiService, 'updateNode').and.callFake(() => {
-                return ErrorObservable.create(new Error('My bad'));
+                return throwError(new Error('My bad'));
             });
 
             updateService.update(property, 'updated-value');
@@ -168,7 +165,7 @@ describe('ContentMetadataComponent', () => {
             component.expanded = false;
             fixture.detectChanges();
             spyOn(contentMetadataService, 'getBasicProperties').and.callFake(() => {
-                return Observable.of(expectedProperties);
+                return of(expectedProperties);
             });
 
             component.ngOnChanges({ node: new SimpleChange(node, expectedNode, false) });
@@ -183,7 +180,7 @@ describe('ContentMetadataComponent', () => {
         it('should pass through the displayEmpty to the card view of basic properties', async(() => {
             component.displayEmpty = false;
             fixture.detectChanges();
-            spyOn(contentMetadataService, 'getBasicProperties').and.returnValue(Observable.of([]));
+            spyOn(contentMetadataService, 'getBasicProperties').and.returnValue(of([]));
 
             component.ngOnChanges({ node: new SimpleChange(node, expectedNode, false) });
 
@@ -207,7 +204,7 @@ describe('ContentMetadataComponent', () => {
             component.expanded = true;
             fixture.detectChanges();
             spyOn(contentMetadataService, 'getGroupedProperties').and.callFake(() => {
-                return Observable.of([{ properties: expectedProperties }]);
+                return of([{ properties: expectedProperties }]);
             });
 
             component.ngOnChanges({ node: new SimpleChange(node, expectedNode, false) });
@@ -223,7 +220,7 @@ describe('ContentMetadataComponent', () => {
             component.expanded = true;
             component.displayEmpty = false;
             fixture.detectChanges();
-            spyOn(contentMetadataService, 'getGroupedProperties').and.returnValue(Observable.of([{ properties: [] }]));
+            spyOn(contentMetadataService, 'getGroupedProperties').and.returnValue(of([{ properties: [] }]));
 
             component.ngOnChanges({ node: new SimpleChange(node, expectedNode, false) });
 
@@ -234,4 +231,26 @@ describe('ContentMetadataComponent', () => {
             });
         }));
     });
+
+    describe('Properties displaying', () => {
+        it('should hide metadata fields if displayDefaultProperties is set to false', () => {
+            component.displayDefaultProperties = false;
+            fixture.detectChanges();
+            const metadataContainer = fixture.debugElement.query(By.css('mat-expansion-panel[data-automation-id="adf-metadata-group-properties"]'));
+            fixture.detectChanges();
+            expect(metadataContainer).toBeNull();
+        });
+
+        it('should display metadata fields if displayDefaultProperties is set to true', () => {
+            component.displayDefaultProperties = true;
+            fixture.detectChanges();
+            const metadataContainer = fixture.debugElement.query(By.css('mat-expansion-panel[data-automation-id="adf-metadata-group-properties"]'));
+            fixture.detectChanges();
+            expect(metadataContainer).toBeDefined();
+        });
+
+        it('should have displayDefaultProperties input param as true by default', () => {
+            expect(component.displayDefaultProperties).toBe(true);
+        });
+    });
 });
diff --git a/lib/content-services/content-metadata/components/content-metadata/content-metadata.component.ts b/lib/content-services/content-metadata/components/content-metadata/content-metadata.component.ts
index 4e725856bc..f7932ce1f0 100644
--- a/lib/content-services/content-metadata/components/content-metadata/content-metadata.component.ts
+++ b/lib/content-services/content-metadata/components/content-metadata/content-metadata.component.ts
@@ -17,11 +17,11 @@
 
 import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewEncapsulation } from '@angular/core';
 import { MinimalNodeEntryEntity } from 'alfresco-js-api';
-import { Observable } from 'rxjs/Observable';
+import { Observable, Subscription } from 'rxjs';
 import { CardViewItem, NodesApiService, LogService, CardViewUpdateService, AlfrescoApiService } from '@alfresco/adf-core';
 import { ContentMetadataService } from '../../services/content-metadata.service';
 import { CardViewGroup } from '../../interfaces/content-metadata.interfaces';
-import { Subscription } from 'rxjs/Rx';
+import { switchMap } from 'rxjs/operators';
 
 @Component({
     selector: 'adf-content-metadata',
@@ -49,7 +49,7 @@ export class ContentMetadataComponent implements OnChanges, OnInit, OnDestroy {
     @Input()
     expanded: boolean = false;
 
-    /** The multi parameter of the underlying material expansion panel */
+    /** The multi parameter of the underlying material expansion panel, set to true to allow multi accordion to be expanded at the same time */
     @Input()
     multi = false;
 
@@ -57,6 +57,10 @@ export class ContentMetadataComponent implements OnChanges, OnInit, OnDestroy {
     @Input()
     preset: string;
 
+    /** Toggles whether the metadata properties should be shown */
+    @Input()
+    displayDefaultProperties: boolean = true;
+
     basicProperties$: Observable<CardViewItem[]>;
     groupedProperties$: Observable<CardViewGroup[]>;
     disposableNodeUpdate: Subscription;
@@ -71,7 +75,9 @@ export class ContentMetadataComponent implements OnChanges, OnInit, OnDestroy {
 
     ngOnInit() {
         this.disposableNodeUpdate =  this.cardViewUpdateService.itemUpdated$
-            .switchMap(this.saveNode.bind(this))
+            .pipe(
+                switchMap(this.saveNode.bind(this))
+            )
             .subscribe(
                 updatedNode => {
                     Object.assign(this.node, updatedNode);
diff --git a/lib/content-services/content-metadata/content-metadata.module.ts b/lib/content-services/content-metadata/content-metadata.module.ts
index 4be0a1aed3..b17c8b1e96 100644
--- a/lib/content-services/content-metadata/content-metadata.module.ts
+++ b/lib/content-services/content-metadata/content-metadata.module.ts
@@ -18,9 +18,8 @@
 import { CommonModule } from '@angular/common';
 import { FlexLayoutModule } from '@angular/flex-layout';
 import { NgModule } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
 import { MaterialModule } from '../material.module';
-import { CardViewModule } from '@alfresco/adf-core';
+import { CoreModule } from '@alfresco/adf-core';
 import { ContentMetadataComponent } from './components/content-metadata/content-metadata.component';
 import { ContentMetadataCardComponent } from './components/content-metadata-card/content-metadata-card.component';
 
@@ -28,9 +27,8 @@ import { ContentMetadataCardComponent } from './components/content-metadata-card
     imports: [
         CommonModule,
         MaterialModule,
-        TranslateModule,
         FlexLayoutModule,
-        CardViewModule
+        CoreModule.forChild()
     ],
     exports: [
         ContentMetadataComponent,
diff --git a/lib/content-services/content-metadata/services/config/aspect-oriented-config.service.ts b/lib/content-services/content-metadata/services/config/aspect-oriented-config.service.ts
index 3de9b02dc1..07bc7e3cd0 100644
--- a/lib/content-services/content-metadata/services/config/aspect-oriented-config.service.ts
+++ b/lib/content-services/content-metadata/services/config/aspect-oriented-config.service.ts
@@ -15,11 +15,9 @@
  * limitations under the License.
  */
 
-import { Injectable } from '@angular/core';
 import { ContentMetadataConfig, OrganisedPropertyGroup, PropertyGroupContainer } from '../../interfaces/content-metadata.interfaces';
 import { getGroup, getProperty } from './property-group-reader';
 
-@Injectable()
 export class AspectOrientedConfigService implements ContentMetadataConfig {
 
     constructor(private config: any) {}
diff --git a/lib/content-services/content-metadata/services/config/indifferent-config.service.ts b/lib/content-services/content-metadata/services/config/indifferent-config.service.ts
index de55bc285c..eac65429da 100644
--- a/lib/content-services/content-metadata/services/config/indifferent-config.service.ts
+++ b/lib/content-services/content-metadata/services/config/indifferent-config.service.ts
@@ -15,12 +15,10 @@
  * limitations under the License.
  */
 
-import { Injectable } from '@angular/core';
 import { ContentMetadataConfig, OrganisedPropertyGroup,
     PropertyGroupContainer
 } from '../../interfaces/content-metadata.interfaces';
 
-@Injectable()
 export class IndifferentConfigService implements ContentMetadataConfig {
 
     constructor(config: any) {}
diff --git a/lib/content-services/content-metadata/services/config/layout-oriented-config.service.ts b/lib/content-services/content-metadata/services/config/layout-oriented-config.service.ts
index 4098212307..d37003a691 100644
--- a/lib/content-services/content-metadata/services/config/layout-oriented-config.service.ts
+++ b/lib/content-services/content-metadata/services/config/layout-oriented-config.service.ts
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-import { Injectable } from '@angular/core';
 import {
     ContentMetadataConfig,
     LayoutOrientedConfigItem,
@@ -24,7 +23,6 @@ import {
 } from '../../interfaces/content-metadata.interfaces';
 import { getProperty } from './property-group-reader';
 
-@Injectable()
 export class LayoutOrientedConfigService implements ContentMetadataConfig {
 
     constructor(private config: any) {}
diff --git a/lib/content-services/content-metadata/services/content-metadata.service.ts b/lib/content-services/content-metadata/services/content-metadata.service.ts
index 91ef392f7f..27f715070b 100644
--- a/lib/content-services/content-metadata/services/content-metadata.service.ts
+++ b/lib/content-services/content-metadata/services/content-metadata.service.ts
@@ -18,12 +18,13 @@
 import { Injectable } from '@angular/core';
 import { MinimalNodeEntryEntity } from 'alfresco-js-api';
 import { BasicPropertiesService } from './basic-properties.service';
-import { Observable } from 'rxjs/Observable';
+import { Observable, of } from 'rxjs';
 import { PropertyGroupTranslatorService } from './property-groups-translator.service';
 import { CardViewItem } from '@alfresco/adf-core';
 import { CardViewGroup } from '../interfaces/content-metadata.interfaces';
 import { ContentMetadataConfigFactory } from './config/content-metadata-config.factory';
 import { PropertyDescriptorsService } from './property-descriptors.service';
+import { map } from 'rxjs/operators';
 
 @Injectable()
 export class ContentMetadataService {
@@ -35,11 +36,11 @@ export class ContentMetadataService {
     }
 
     getBasicProperties(node: MinimalNodeEntryEntity): Observable<CardViewItem[]> {
-        return Observable.of(this.basicPropertiesService.getProperties(node));
+        return of(this.basicPropertiesService.getProperties(node));
     }
 
     getGroupedProperties(node: MinimalNodeEntryEntity, presetName: string = 'default'): Observable<CardViewGroup[]> {
-        let groupedProperties = Observable.of([]);
+        let groupedProperties = of([]);
 
         if (node.aspectNames) {
             const config = this.contentMetadataConfigFactory.get(presetName),
@@ -48,9 +49,10 @@ export class ContentMetadataService {
                     .filter(groupName => config.isGroupAllowed(groupName));
 
             if (groupNames.length > 0) {
-                groupedProperties = this.propertyDescriptorsService.load(groupNames)
-                    .map(groups => config.reorganiseByConfig(groups))
-                    .map(groups => this.propertyGroupTranslatorService.translateToCardViewGroups(groups, node.properties));
+                groupedProperties = this.propertyDescriptorsService.load(groupNames).pipe(
+                    map(groups => config.reorganiseByConfig(groups)),
+                    map(groups => this.propertyGroupTranslatorService.translateToCardViewGroups(groups, node.properties))
+                );
             }
         }
 
diff --git a/lib/content-services/content-metadata/services/property-descriptors.service.spec.ts b/lib/content-services/content-metadata/services/property-descriptors.service.spec.ts
index 13a9f2f421..6fb194a970 100644
--- a/lib/content-services/content-metadata/services/property-descriptors.service.spec.ts
+++ b/lib/content-services/content-metadata/services/property-descriptors.service.spec.ts
@@ -18,7 +18,7 @@
 import { TestBed } from '@angular/core/testing';
 import { PropertyDescriptorsService } from './property-descriptors.service';
 import { AlfrescoApiService, setupTestBed } from '@alfresco/adf-core';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 import { ClassesApi } from 'alfresco-js-api';
 import { PropertyGroup } from '../interfaces/content-metadata.interfaces';
 import { ContentTestingModule } from '../../testing/content.testing.module';
@@ -73,7 +73,7 @@ describe('PropertyDescriptorLoaderService', () => {
         let counter = 0;
 
         spyOn(classesApi, 'getClass').and.callFake(() => {
-            return Observable.of(apiResponses[counter++]);
+            return of(apiResponses[counter++]);
         });
 
         service.load(['exif:exif', 'cm:content'])
diff --git a/lib/content-services/content-metadata/services/property-descriptors.service.ts b/lib/content-services/content-metadata/services/property-descriptors.service.ts
index ab706326f3..69a12d8406 100644
--- a/lib/content-services/content-metadata/services/property-descriptors.service.ts
+++ b/lib/content-services/content-metadata/services/property-descriptors.service.ts
@@ -17,10 +17,9 @@
 
 import { Injectable } from '@angular/core';
 import { AlfrescoApiService } from '@alfresco/adf-core';
-import { forkJoin } from 'rxjs/observable/forkJoin';
-import { Observable } from 'rxjs/Observable';
-import { defer } from 'rxjs/observable/defer';
+import { Observable, defer, forkJoin } from 'rxjs';
 import { PropertyGroup, PropertyGroupContainer } from '../interfaces/content-metadata.interfaces';
+import { map } from 'rxjs/operators';
 
 @Injectable()
 export class PropertyDescriptorsService {
@@ -32,8 +31,9 @@ export class PropertyDescriptorsService {
             .map(groupName => groupName.replace(':', '_'))
             .map(groupName => defer( () => this.alfrescoApiService.classesApi.getClass(groupName)) );
 
-        return forkJoin(groupFetchStreams)
-            .map(this.convertToObject);
+        return forkJoin(groupFetchStreams).pipe(
+            map(this.convertToObject)
+        );
     }
 
     private convertToObject(propertyGroupsArray: PropertyGroup[]): PropertyGroupContainer {
diff --git a/lib/content-services/content-node-selector/content-node-dialog.service.spec.ts b/lib/content-services/content-node-selector/content-node-dialog.service.spec.ts
index 53c2b90950..71aa1ea6c7 100644
--- a/lib/content-services/content-node-selector/content-node-dialog.service.spec.ts
+++ b/lib/content-services/content-node-selector/content-node-dialog.service.spec.ts
@@ -21,8 +21,7 @@ import { AppConfigService, SitesService, setupTestBed } from '@alfresco/adf-core
 import { DocumentListService } from '../document-list/services/document-list.service';
 import { ContentNodeDialogService } from './content-node-dialog.service';
 import { MatDialog } from '@angular/material';
-import { Observable } from 'rxjs/Observable';
-import { Subject } from 'rxjs/Subject';
+import { Subject, of } from 'rxjs';
 import { ContentTestingModule } from '../testing/content.testing.module';
 
 const fakeNode: MinimalNodeEntryEntity = <MinimalNodeEntryEntity> {
@@ -75,7 +74,7 @@ describe('ContentNodeDialogService', () => {
         afterOpenObservable = new Subject<any>();
         spyOnDialogOpen = spyOn(materialDialog, 'open').and.returnValue({
             afterOpen: () => afterOpenObservable,
-            afterClosed: () => Observable.of({}),
+            afterClosed: () => of({}),
             componentInstance: {
                 error: new Subject<any>()
             }
@@ -112,23 +111,23 @@ describe('ContentNodeDialogService', () => {
     });
 
     it('should be able to open the dialog using a folder id', fakeAsync(() => {
-        spyOn(documentListService, 'getFolderNode').and.returnValue(Observable.of(fakeNode));
+        spyOn(documentListService, 'getFolderNode').and.returnValue(of(fakeNode));
         service.openFileBrowseDialogByFolderId('fake-folder-id').subscribe();
         tick();
         expect(spyOnDialogOpen).toHaveBeenCalled();
     }));
 
     it('should be able to open the dialog for files using the first user site', fakeAsync(() => {
-        spyOn(sitesService, 'getSites').and.returnValue(Observable.of(fakeSiteList));
-        spyOn(documentListService, 'getFolderNode').and.returnValue(Observable.of(fakeNode));
+        spyOn(sitesService, 'getSites').and.returnValue(of(fakeSiteList));
+        spyOn(documentListService, 'getFolderNode').and.returnValue(of(fakeNode));
         service.openFileBrowseDialogBySite().subscribe();
         tick();
         expect(spyOnDialogOpen).toHaveBeenCalled();
     }));
 
     it('should be able to open the dialog for folder using the first user site', fakeAsync(() => {
-        spyOn(sitesService, 'getSites').and.returnValue(Observable.of(fakeSiteList));
-        spyOn(documentListService, 'getFolderNode').and.returnValue(Observable.of(fakeNode));
+        spyOn(sitesService, 'getSites').and.returnValue(of(fakeSiteList));
+        spyOn(documentListService, 'getFolderNode').and.returnValue(of(fakeNode));
         service.openFolderBrowseDialogBySite().subscribe();
         tick();
         expect(spyOnDialogOpen).toHaveBeenCalled();
diff --git a/lib/content-services/content-node-selector/content-node-dialog.service.ts b/lib/content-services/content-node-selector/content-node-dialog.service.ts
index 0105869c40..95a7e3cc54 100644
--- a/lib/content-services/content-node-selector/content-node-dialog.service.ts
+++ b/lib/content-services/content-node-selector/content-node-dialog.service.ts
@@ -18,8 +18,7 @@
 import { MatDialog } from '@angular/material';
 import { EventEmitter, Injectable, Output } from '@angular/core';
 import { ContentService } from '@alfresco/adf-core';
-import { Subject } from 'rxjs/Subject';
-import { Observable } from 'rxjs/Observable';
+import { Subject, Observable, throwError } from 'rxjs';
 import { ShareDataRow } from '../document-list/data/share-data-row.model';
 import { MinimalNodeEntryEntity, SitePaging } from 'alfresco-js-api';
 import { DataColumn, SitesService, TranslationService, PermissionsEnum } from '@alfresco/adf-core';
@@ -27,7 +26,7 @@ import { DocumentListService } from '../document-list/services/document-list.ser
 import { ContentNodeSelectorComponent } from './content-node-selector.component';
 import { ContentNodeSelectorComponentData } from './content-node-selector.component-data.interface';
 import { NodeLockDialogComponent } from '../dialogs/node-lock.dialog';
-import 'rxjs/operator/switchMap';
+import { switchMap } from 'rxjs/operators';
 
 @Injectable()
 export class ContentNodeDialogService {
@@ -49,9 +48,9 @@ export class ContentNodeDialogService {
      * @returns Information about the selected file(s)
      */
     openFileBrowseDialogByFolderId(folderNodeId: string): Observable<MinimalNodeEntryEntity[]> {
-        return this.documentListService.getFolderNode(folderNodeId).switchMap((node: MinimalNodeEntryEntity) => {
+        return this.documentListService.getFolderNode(folderNodeId).pipe(switchMap((node: MinimalNodeEntryEntity) => {
             return this.openUploadFileDialog('Choose', node);
-        });
+        }));
     }
 
     /**
@@ -85,9 +84,9 @@ export class ContentNodeDialogService {
      * @returns Information about the selected file(s)
      */
     openFileBrowseDialogBySite(): Observable<MinimalNodeEntryEntity[]> {
-        return this.siteService.getSites().switchMap((response: SitePaging) => {
+        return this.siteService.getSites().pipe(switchMap((response: SitePaging) => {
             return this.openFileBrowseDialogByFolderId(response.list.entries[0].entry.guid);
-        });
+        }));
     }
 
     /**
@@ -95,9 +94,9 @@ export class ContentNodeDialogService {
      * @returns Information about the selected folder(s)
      */
     openFolderBrowseDialogBySite(): Observable<MinimalNodeEntryEntity[]> {
-        return this.siteService.getSites().switchMap((response: SitePaging) => {
+        return this.siteService.getSites().pipe(switchMap((response: SitePaging) => {
             return this.openFolderBrowseDialogByFolderId(response.list.entries[0].entry.guid);
-        });
+        }));
     }
 
     /**
@@ -106,9 +105,9 @@ export class ContentNodeDialogService {
      * @returns Information about the selected folder(s)
      */
     openFolderBrowseDialogByFolderId(folderNodeId: string): Observable<MinimalNodeEntryEntity[]> {
-        return this.documentListService.getFolderNode(folderNodeId).switchMap((node: MinimalNodeEntryEntity) => {
+        return this.documentListService.getFolderNode(folderNodeId).pipe(switchMap((node: MinimalNodeEntryEntity) => {
             return this.openUploadFolderDialog('Choose', node);
-        });
+        }));
     }
 
     /**
@@ -143,7 +142,7 @@ export class ContentNodeDialogService {
             return select;
         } else {
             let errors = new Error(JSON.stringify({ error: { statusCode: 403 } }));
-            return Observable.throw(errors);
+            return throwError(errors);
         }
     }
 
diff --git a/lib/content-services/content-node-selector/content-node-selector-panel.component.scss b/lib/content-services/content-node-selector/content-node-selector-panel.component.scss
index 5ca1d76cc7..548af95230 100644
--- a/lib/content-services/content-node-selector/content-node-selector-panel.component.scss
+++ b/lib/content-services/content-node-selector/content-node-selector-panel.component.scss
@@ -31,7 +31,7 @@
                 }
             }
 
-            .mat-input-underline .mat-input-ripple {
+            .mat-form-field-underline .mat-form-field-ripple {
                 height: 1px;
                 transition: none;
             }
@@ -153,7 +153,7 @@
                             }
 
                             & .adf-name-location-cell-name {
-                                padding: 18px 0 2px 0;
+                                padding: 5px 0 2px 0;
                             }
 
                             &.adf-content-selector-modified-cell {
diff --git a/lib/content-services/content-node-selector/content-node-selector-panel.component.spec.ts b/lib/content-services/content-node-selector/content-node-selector-panel.component.spec.ts
index eed0cfb4eb..1991c98f24 100644
--- a/lib/content-services/content-node-selector/content-node-selector-panel.component.spec.ts
+++ b/lib/content-services/content-node-selector/content-node-selector-panel.component.spec.ts
@@ -20,8 +20,7 @@ import { async, fakeAsync, tick, ComponentFixture, TestBed } from '@angular/core
 import { By } from '@angular/platform-browser';
 import { MinimalNodeEntryEntity, SiteEntry, SitePaging } from 'alfresco-js-api';
 import { SearchService, SitesService, setupTestBed } from '@alfresco/adf-core';
-import { Observable } from 'rxjs/Observable';
-import { Observer } from 'rxjs/Observer';
+import { Observable, Observer, of, throwError } from 'rxjs';
 import { DropdownBreadcrumbComponent } from '../breadcrumb';
 import { ContentNodeSelectorPanelComponent } from './content-node-selector-panel.component';
 import { ContentNodeSelectorService } from './content-node-selector.service';
@@ -29,6 +28,7 @@ import { NodePaging } from 'alfresco-js-api';
 import { ContentTestingModule } from '../testing/content.testing.module';
 import { DocumentListService } from '../document-list/services/document-list.service';
 import { DocumentListComponent } from '../document-list/components/document-list.component';
+import { CustomResourcesService } from '../document-list/services/custom-resources.service';
 
 const ONE_FOLDER_RESULT = {
     list: {
@@ -119,9 +119,9 @@ describe('ContentNodeSelectorComponent', () => {
                 expectedDefaultFolderNode = <MinimalNodeEntryEntity> { path: { elements: [] } };
                 documentListService = TestBed.get(DocumentListService);
                 sitesService = TestBed.get(SitesService);
-                spyOn(documentListService, 'getFolderNode').and.returnValue(Observable.of(expectedDefaultFolderNode));
-                spyOn(documentListService, 'getFolder').and.returnValue(Observable.throw('No results for test'));
-                spyOn(sitesService, 'getSites').and.returnValue(Observable.of({ list: { entries: [] } }));
+                spyOn(documentListService, 'getFolderNode').and.returnValue(of(expectedDefaultFolderNode));
+                spyOn(documentListService, 'getFolder').and.returnValue(throwError('No results for test'));
+                spyOn(sitesService, 'getSites').and.returnValue(of({ list: { entries: [] } }));
                 spyOn(component.documentList, 'loadFolderNodesByFolderNodeId').and.returnValue(Promise.resolve());
                 component.currentFolderId = 'cat-girl-nuku-nuku';
                 fixture.detectChanges();
@@ -290,18 +290,19 @@ describe('ContentNodeSelectorComponent', () => {
                 const documentListService = TestBed.get(DocumentListService);
                 const expectedDefaultFolderNode = <MinimalNodeEntryEntity> { path: { elements: [] } };
 
-                spyOn(documentListService, 'getFolderNode').and.returnValue(Observable.of(expectedDefaultFolderNode));
+                spyOn(documentListService, 'getFolderNode').and.returnValue(of(expectedDefaultFolderNode));
                 spyOn(component.documentList, 'loadFolderNodesByFolderNodeId').and.returnValue(Promise.resolve());
 
                 const sitesService = TestBed.get(SitesService);
-                spyOn(sitesService, 'getSites').and.returnValue(Observable.of({ list: { entries: [] } }));
+                spyOn(sitesService, 'getSites').and.returnValue(of({ list: { entries: [] } }));
 
-                getCorrespondingNodeIdsSpy = spyOn(component.documentList, 'getCorrespondingNodeIds').and
+                const customResourcesService = TestBed.get(CustomResourcesService);
+                getCorrespondingNodeIdsSpy = spyOn(customResourcesService, 'getCorrespondingNodeIds').and
                     .callFake(id => {
                         if (id === '-sites-') {
-                            return Observable.of(['123456testId', '09876543testId']);
+                            return of(['123456testId', '09876543testId']);
                         }
-                        return Observable.of([id]);
+                        return of([id]);
                     });
 
                 component.currentFolderId = 'cat-girl-nuku-nuku';
@@ -350,7 +351,8 @@ describe('ContentNodeSelectorComponent', () => {
 
                 expect(cnSearchSpy).toHaveBeenCalled();
                 expect(cnSearchSpy.calls.count()).toBe(2);
-                expect(cnSearchSpy).toHaveBeenCalledWith('vegeta', '-sites-', 0, 25);
+                expect(cnSearchSpy).toHaveBeenCalledWith('vegeta', undefined, 0, 25);
+                expect(cnSearchSpy).toHaveBeenCalledWith('vegeta', '-sites-', 0, 25, ['123456testId', '09876543testId']);
             }));
 
             it('should call the content node selector\'s search with the right parameters on changing the site selectbox\'s value from a custom dropdown menu', fakeAsync(() => {
@@ -367,10 +369,21 @@ describe('ContentNodeSelectorComponent', () => {
 
                 expect(cnSearchSpy).toHaveBeenCalled();
                 expect(cnSearchSpy.calls.count()).toBe(2);
+                expect(cnSearchSpy).toHaveBeenCalledWith('vegeta', undefined, 0, 25);
                 expect(cnSearchSpy).toHaveBeenCalledWith('vegeta', '-sites-', 0, 25, ['123456testId', '09876543testId']);
             }));
 
-            it('should get the corresponding node ids before the search call on changing the site selectbox\'s value from a custom dropdown menu', fakeAsync(() => {
+            it('should get the corresponding node ids on search when a known alias is selected from dropdown', fakeAsync(() => {
+                typeToSearchBox('vegeta');
+
+                tick(debounceSearch);
+
+                component.siteChanged(<SiteEntry> { entry: { guid: '-sites-' } });
+                expect(getCorrespondingNodeIdsSpy.calls.count()).toBe(1, 'getCorrespondingNodeIdsSpy calls count should be one after the site changes to known alias \'-sites\-');
+                expect(getCorrespondingNodeIdsSpy.calls.mostRecent().args[0]).toEqual('-sites-');
+            }));
+
+            it('should get the corresponding node ids on search when a known alias is selected from CUSTOM dropdown', fakeAsync(() => {
                 component.dropdownSiteList = <SitePaging> { list: { entries: [<SiteEntry> { entry: { guid: '-sites-' } }, <SiteEntry> { entry: { guid: 'namek' } }] } };
                 fixture.detectChanges();
 
@@ -378,15 +391,37 @@ describe('ContentNodeSelectorComponent', () => {
 
                 tick(debounceSearch);
 
-                expect(getCorrespondingNodeIdsSpy.calls.count()).toBe(1, 'getCorrespondingNodeIdsSpy calls count should be one after only one search');
+                component.siteChanged(<SiteEntry> { entry: { guid: '-sites-' } });
+                expect(getCorrespondingNodeIdsSpy.calls.count()).toBe(1);
+                expect(getCorrespondingNodeIdsSpy.calls.mostRecent().args[0]).toEqual('-sites-');
+            }));
+
+            it('should NOT get the corresponding node ids on search when NOTHING is selected from dropdown', fakeAsync(() => {
+                component.dropdownSiteList = <SitePaging> { list: { entries: [<SiteEntry> { entry: { guid: '-sites-' } }, <SiteEntry> { entry: { guid: 'namek' } }] } };
+                fixture.detectChanges();
+
+                typeToSearchBox('vegeta');
+
+                tick(debounceSearch);
+
+                expect(getCorrespondingNodeIdsSpy.calls.count()).toBe(0, 'getCorrespondingNodeIdsSpy calls count should be 0 when no site is selected');
+            }));
+
+            it('should NOT get the corresponding node ids on search when NO known alias is selected from dropdown', fakeAsync(() => {
+                typeToSearchBox('vegeta');
+                tick(debounceSearch);
+
+                expect(getCorrespondingNodeIdsSpy.calls.count()).toBe(0, 'getCorrespondingNodeIdsSpy should not be called');
 
                 component.siteChanged(<SiteEntry> { entry: { guid: 'namek' } });
 
-                expect(getCorrespondingNodeIdsSpy.calls.count()).toBe(2, 'getCorrespondingNodeIdsSpy calls count should be two after the site change');
-                expect(getCorrespondingNodeIdsSpy.calls.allArgs()).toEqual([[undefined], ['namek']]);
+                expect(getCorrespondingNodeIdsSpy).not.toHaveBeenCalled();
             }));
 
-            it('should NOT get the corresponding node ids before the search call on changing the site selectbox\'s value from default dropdown menu', fakeAsync(() => {
+            it('should NOT get the corresponding node ids on search when NO known alias is selected from CUSTOM dropdown', fakeAsync(() => {
+                component.dropdownSiteList = <SitePaging> { list: { entries: [<SiteEntry> { entry: { guid: '-sites-' } }, <SiteEntry> { entry: { guid: 'namek' } }] } };
+                fixture.detectChanges();
+
                 typeToSearchBox('vegeta');
                 tick(debounceSearch);
 
@@ -659,7 +694,7 @@ describe('ContentNodeSelectorComponent', () => {
 
             beforeEach(() => {
                 const sitesService = TestBed.get(SitesService);
-                spyOn(sitesService, 'getSites').and.returnValue(Observable.of({ list: { entries: [] } }));
+                spyOn(sitesService, 'getSites').and.returnValue(of({ list: { entries: [] } }));
             });
 
             describe('in the case when isSelectionValid is a custom function for checking permissions,', () => {
diff --git a/lib/content-services/content-node-selector/content-node-selector-panel.component.ts b/lib/content-services/content-node-selector/content-node-selector-panel.component.ts
index c49cb30364..cf8f93f0a1 100644
--- a/lib/content-services/content-node-selector/content-node-selector-panel.component.ts
+++ b/lib/content-services/content-node-selector/content-node-selector-panel.component.ts
@@ -27,7 +27,8 @@ import { RowFilter } from '../document-list/data/row-filter.model';
 import { ImageResolver } from '../document-list/data/image-resolver.model';
 import { ContentNodeSelectorService } from './content-node-selector.service';
 import { debounceTime } from 'rxjs/operators';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
+import { BehaviorSubject } from 'rxjs';
+import { CustomResourcesService } from '../document-list/services/custom-resources.service';
 
 export type ValidationFunction = (entry: MinimalNodeEntryEntity) => boolean;
 
@@ -120,6 +121,7 @@ export class ContentNodeSelectorPanelComponent implements OnInit, PaginatedCompo
 
     constructor(private contentNodeSelectorService: ContentNodeSelectorService,
                 private apiService: AlfrescoApiService,
+                private customResourcesService: CustomResourcesService,
                 private preferences: UserPreferencesService) {
         this.searchInput.valueChanges
             .pipe(
@@ -255,8 +257,8 @@ export class ContentNodeSelectorPanelComponent implements OnInit, PaginatedCompo
     private querySearch(): void {
         this.loadingSearchResults = true;
 
-        if (this.dropdownSiteList) {
-            this.documentList.getCorrespondingNodeIds(this.siteId)
+        if (this.customResourcesService.hasCorrespondingNodeIds(this.siteId)) {
+            this.customResourcesService.getCorrespondingNodeIds(this.siteId)
                 .subscribe(nodeIds => {
                         this.contentNodeSelectorService.search(this.searchTerm, this.siteId, this.skipCount, this.pageSize, nodeIds)
                             .subscribe(this.showSearchResults.bind(this));
diff --git a/lib/content-services/content-node-selector/content-node-selector.component-data.interface.ts b/lib/content-services/content-node-selector/content-node-selector.component-data.interface.ts
index 58e71fd70d..353d12897a 100644
--- a/lib/content-services/content-node-selector/content-node-selector.component-data.interface.ts
+++ b/lib/content-services/content-node-selector/content-node-selector.component-data.interface.ts
@@ -16,7 +16,7 @@
  */
 
 import { MinimalNodeEntryEntity, SitePaging } from 'alfresco-js-api';
-import { Subject } from 'rxjs/Subject';
+import { Subject } from 'rxjs';
 
 export interface ContentNodeSelectorComponentData {
     title: string;
diff --git a/lib/content-services/content-node-selector/content-node-selector.component.spec.ts b/lib/content-services/content-node-selector/content-node-selector.component.spec.ts
index d1358625e4..b10a252881 100644
--- a/lib/content-services/content-node-selector/content-node-selector.component.spec.ts
+++ b/lib/content-services/content-node-selector/content-node-selector.component.spec.ts
@@ -23,7 +23,7 @@ import { ContentNodeSelectorComponent } from './content-node-selector.component'
 import { MinimalNodeEntryEntity } from 'alfresco-js-api';
 import { By } from '@angular/platform-browser';
 import { setupTestBed, SitesService } from '@alfresco/adf-core';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 import { ContentTestingModule } from '../testing/content.testing.module';
 import { DocumentListService } from '../document-list/services/document-list.service';
 import { DocumentListComponent } from '../document-list/components/document-list.component';
@@ -53,9 +53,9 @@ describe('ContentNodeSelectorDialogComponent', () => {
     beforeEach(() => {
         const documentListService: DocumentListService = TestBed.get(DocumentListService);
         const sitesService: SitesService = TestBed.get(SitesService);
-        spyOn(documentListService, 'getFolder').and.returnValue(Observable.of({ list: [] }));
-        spyOn(documentListService, 'getFolderNode').and.returnValue(Observable.of({}));
-        spyOn(sitesService, 'getSites').and.returnValue(Observable.of({ list: { entries: [] } }));
+        spyOn(documentListService, 'getFolder').and.returnValue(of({ list: [] }));
+        spyOn(documentListService, 'getFolderNode').and.returnValue(of({}));
+        spyOn(sitesService, 'getSites').and.returnValue(of({ list: { entries: [] } }));
 
         fixture = TestBed.createComponent(ContentNodeSelectorComponent);
         component = fixture.componentInstance;
@@ -88,7 +88,7 @@ describe('ContentNodeSelectorDialogComponent', () => {
             expect(documentList.componentInstance.currentFolderId).toBe('cat-girl-nuku-nuku');
         });
 
-        it('should pass through the injected rowFilter to the documentlist', (done) => {
+        xit('should pass through the injected rowFilter to the documentlist', (done) => {
             fixture.whenStable().then(() => {
                 let documentList = fixture.debugElement.query(By.directive(DocumentListComponent));
                 expect(documentList).not.toBeNull('Document list should be shown');
diff --git a/lib/content-services/content-node-selector/content-node-selector.module.ts b/lib/content-services/content-node-selector/content-node-selector.module.ts
index b1919a54c7..09074de241 100644
--- a/lib/content-services/content-node-selector/content-node-selector.module.ts
+++ b/lib/content-services/content-node-selector/content-node-selector.module.ts
@@ -19,15 +19,12 @@ import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MaterialModule } from '../material.module';
-import { TranslateModule } from '@ngx-translate/core';
 
 import { ContentNodeSelectorPanelComponent } from './content-node-selector-panel.component';
 import { ContentNodeSelectorComponent } from './content-node-selector.component';
-import { ContentNodeSelectorService } from './content-node-selector.service';
-import { ContentNodeDialogService } from './content-node-dialog.service';
 import { SitesDropdownModule } from '../site-dropdown/sites-dropdown.module';
 import { BreadcrumbModule } from '../breadcrumb/breadcrumb.module';
-import { PaginationModule, ToolbarModule, DirectiveModule, DataColumnModule, DataTableModule } from '@alfresco/adf-core';
+import { CoreModule } from '@alfresco/adf-core';
 import { DocumentListModule } from '../document-list/document-list.module';
 import { NameLocationCellComponent } from './name-location-cell/name-location-cell.component';
 
@@ -35,17 +32,12 @@ import { NameLocationCellComponent } from './name-location-cell/name-location-ce
     imports: [
         FormsModule,
         ReactiveFormsModule,
-        DirectiveModule,
+        CoreModule.forChild(),
         CommonModule,
         MaterialModule,
-        TranslateModule,
         SitesDropdownModule,
         BreadcrumbModule,
-        ToolbarModule,
-        DocumentListModule,
-        DataColumnModule,
-        DataTableModule,
-        PaginationModule
+        DocumentListModule
     ],
     exports: [
         ContentNodeSelectorPanelComponent,
@@ -53,16 +45,13 @@ import { NameLocationCellComponent } from './name-location-cell/name-location-ce
         ContentNodeSelectorComponent
     ],
     entryComponents: [
-        ContentNodeSelectorPanelComponent, ContentNodeSelectorComponent
+        ContentNodeSelectorPanelComponent,
+        ContentNodeSelectorComponent
     ],
     declarations: [
         ContentNodeSelectorPanelComponent,
         NameLocationCellComponent,
         ContentNodeSelectorComponent
-    ],
-    providers: [
-        ContentNodeSelectorService,
-        ContentNodeDialogService
     ]
 })
 export class ContentNodeSelectorModule {}
diff --git a/lib/content-services/content-node-selector/content-node-selector.service.ts b/lib/content-services/content-node-selector/content-node-selector.service.ts
index 1efd084ccb..76784306cb 100644
--- a/lib/content-services/content-node-selector/content-node-selector.service.ts
+++ b/lib/content-services/content-node-selector/content-node-selector.service.ts
@@ -18,7 +18,7 @@
 import { SearchService } from '@alfresco/adf-core';
 import { Injectable } from '@angular/core';
 import { NodePaging } from 'alfresco-js-api';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 
 /**
  * Internal service used by ContentNodeSelector component.
diff --git a/lib/content-services/content.module.ts b/lib/content-services/content.module.ts
index 6dd253dd5d..f827a9c00a 100644
--- a/lib/content-services/content.module.ts
+++ b/lib/content-services/content.module.ts
@@ -16,7 +16,7 @@
  */
 
 import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
+import { NgModule, ModuleWithProviders } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { CoreModule, TRANSLATION_PROVIDER } from '@alfresco/adf-core';
 
@@ -45,10 +45,86 @@ import { BasicPropertiesService } from './content-metadata/services/basic-proper
 import { PropertyGroupTranslatorService } from './content-metadata/services/property-groups-translator.service';
 import { SearchQueryBuilderService } from './search/search-query-builder.service';
 import { SearchFilterService } from './search/components/search-filter/search-filter.service';
+import { ContentNodeSelectorService } from './content-node-selector/content-node-selector.service';
+import { ContentNodeDialogService } from './content-node-selector/content-node-dialog.service';
+import { DocumentListService } from './document-list/services/document-list.service';
+import { FolderActionsService } from './document-list/services/folder-actions.service';
+import { DocumentActionsService } from './document-list/services/document-actions.service';
+import { NodeActionsService } from './document-list/services/node-actions.service';
+import { CustomResourcesService } from './document-list/services/custom-resources.service';
+import { NodePermissionDialogService } from './permission-manager/services/node-permission-dialog.service';
+import { NodePermissionService } from './permission-manager/services/node-permission.service';
+import { TagService } from './tag/services/tag.service';
+
+export function providers() {
+    return [
+        RatingService,
+        ContentMetadataService,
+        PropertyDescriptorsService,
+        ContentMetadataConfigFactory,
+        BasicPropertiesService,
+        PropertyGroupTranslatorService,
+        SearchQueryBuilderService,
+        SearchFilterService,
+        ContentNodeSelectorService,
+        ContentNodeDialogService,
+        DocumentListService,
+        FolderActionsService,
+        DocumentActionsService,
+        NodeActionsService,
+        CustomResourcesService,
+        NodePermissionDialogService,
+        NodePermissionService,
+        TagService
+    ];
+}
 
 @NgModule({
     imports: [
-        CoreModule,
+        CoreModule.forChild(),
+        SocialModule,
+        TagModule,
+        CommonModule,
+        WebScriptModule,
+        FormsModule,
+        ReactiveFormsModule,
+        DialogModule,
+        SearchModule,
+        DocumentListModule,
+        UploadModule,
+        MaterialModule,
+        SitesDropdownModule,
+        BreadcrumbModule,
+        ContentNodeSelectorModule,
+        ContentMetadataModule,
+        FolderDirectiveModule,
+        ContentDirectiveModule,
+        PermissionManagerModule,
+        VersionManagerModule
+    ],
+    exports: [
+        SocialModule,
+        TagModule,
+        WebScriptModule,
+        DocumentListModule,
+        UploadModule,
+        SearchModule,
+        SitesDropdownModule,
+        BreadcrumbModule,
+        ContentNodeSelectorModule,
+        ContentMetadataModule,
+        DialogModule,
+        FolderDirectiveModule,
+        ContentDirectiveModule,
+        PermissionManagerModule,
+        VersionManagerModule
+    ]
+})
+export class ContentModuleLazy {}
+
+@NgModule({
+    imports: [
+        CoreModule.forChild(),
         SocialModule,
         TagModule,
         CommonModule,
@@ -70,6 +146,7 @@ import { SearchFilterService } from './search/components/search-filter/search-fi
         VersionManagerModule
     ],
     providers: [
+        ...providers(),
         {
             provide: TRANSLATION_PROVIDER,
             multi: true,
@@ -77,18 +154,9 @@ import { SearchFilterService } from './search/components/search-filter/search-fi
                 name: 'adf-content-services',
                 source: 'assets/adf-content-services'
             }
-        },
-        RatingService,
-        ContentMetadataService,
-        PropertyDescriptorsService,
-        ContentMetadataConfigFactory,
-        BasicPropertiesService,
-        PropertyGroupTranslatorService,
-        SearchQueryBuilderService,
-        SearchFilterService
+        }
     ],
     exports: [
-        CoreModule,
         SocialModule,
         TagModule,
         WebScriptModule,
@@ -107,4 +175,26 @@ import { SearchFilterService } from './search/components/search-filter/search-fi
     ]
 })
 export class ContentModule {
+    static forRoot(): ModuleWithProviders {
+        return {
+            ngModule: ContentModule,
+            providers: [
+                ...providers(),
+                {
+                    provide: TRANSLATION_PROVIDER,
+                    multi: true,
+                    useValue: {
+                        name: 'adf-content-services',
+                        source: 'assets/adf-content-services'
+                    }
+                }
+            ]
+        };
+    }
+
+    static forChild(): ModuleWithProviders {
+        return {
+            ngModule: ContentModuleLazy
+        };
+    }
 }
diff --git a/lib/content-services/dialogs/confirm.dialog.ts b/lib/content-services/dialogs/confirm.dialog.ts
index 03cf894ed6..408c3ceedf 100644
--- a/lib/content-services/dialogs/confirm.dialog.ts
+++ b/lib/content-services/dialogs/confirm.dialog.ts
@@ -27,8 +27,8 @@ import { MAT_DIALOG_DATA } from '@angular/material';
         </mat-dialog-content>
         <mat-dialog-actions>
             <span class="spacer"></span>
-            <button mat-button [mat-dialog-close]="true">{{ yesLabel | translate }}</button>
-            <button mat-button color="primary" [mat-dialog-close]="false" cdkFocusInitial>{{ noLabel | translate }}</button>
+            <button id="adf-confirm-accept" mat-button color="primary" [mat-dialog-close]="true">{{ yesLabel | translate }}</button>
+            <button id="adf-confirm-cancel" mat-button [mat-dialog-close]="false" cdkFocusInitial>{{ noLabel | translate }}</button>
         </mat-dialog-actions>
     `,
     styles: [`
diff --git a/lib/content-services/dialogs/dialog.module.ts b/lib/content-services/dialogs/dialog.module.ts
index a07d6f4625..5d752b22c7 100644
--- a/lib/content-services/dialogs/dialog.module.ts
+++ b/lib/content-services/dialogs/dialog.module.ts
@@ -17,18 +17,15 @@
 
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { MaterialModule } from '../material.module';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { CoreModule } from '@alfresco/adf-core';
 
+import { MaterialModule } from '../material.module';
 import { DownloadZipDialogComponent } from './download-zip.dialog';
 import { FolderDialogComponent } from './folder.dialog';
 import { NodeLockDialogComponent } from './node-lock.dialog';
 import { ShareDialogComponent } from './share.dialog';
 import { ConfirmDialogComponent } from './confirm.dialog';
-
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { TranslateModule } from '@ngx-translate/core';
-
-import { FormModule } from '@alfresco/adf-core';
 import { MatDatetimepickerModule } from '@mat-datetimepicker/core';
 import { MatMomentDatetimeModule } from '@mat-datetimepicker/moment';
 
@@ -36,9 +33,8 @@ import { MatMomentDatetimeModule } from '@mat-datetimepicker/moment';
     imports: [
         CommonModule,
         MaterialModule,
-        TranslateModule,
+        CoreModule.forChild(),
         FormsModule,
-        FormModule,
         ReactiveFormsModule,
         MatMomentDatetimeModule,
         MatDatetimepickerModule
diff --git a/lib/content-services/dialogs/folder.dialog.html b/lib/content-services/dialogs/folder.dialog.html
index 465bdd2041..89368d2986 100644
--- a/lib/content-services/dialogs/folder.dialog.html
+++ b/lib/content-services/dialogs/folder.dialog.html
@@ -4,13 +4,13 @@
 
 <mat-dialog-content>
     <form [formGroup]="form" (submit)="submit()">
-        <mat-input-container class="adf-full-width">
+        <mat-form-field class="adf-full-width">
             <input
+                id="adf-folder-name-input"
                 placeholder="{{ 'CORE.FOLDER_DIALOG.FOLDER_NAME.LABEL' | translate }}"
                 matInput
                 required
-                [formControl]="form.controls['name']"
-            />
+                [formControl]="form.controls['name']"/>
 
             <mat-hint *ngIf="form.controls['name'].dirty">
                 <span *ngIf="form.controls['name'].errors?.required">
@@ -21,18 +21,19 @@
                     {{ form.controls['name'].errors?.message | translate }}
                 </span>
             </mat-hint>
-        </mat-input-container>
+        </mat-form-field>
 
         <br />
         <br />
 
-        <mat-input-container class="adf-full-width">
+        <mat-form-field class="adf-full-width">
             <textarea
+                id="adf-folder-description-input"
                 matInput
                 placeholder="{{ 'CORE.FOLDER_DIALOG.FOLDER_DESCRIPTION.LABEL' | translate }}"
                 rows="4"
                 [formControl]="form.controls['description']"></textarea>
-        </mat-input-container>
+        </mat-form-field>
     </form>
 </mat-dialog-content>
 
@@ -41,11 +42,13 @@
 
     <button
         mat-button
+        id="adf-folder-cancel-button"
         mat-dialog-close>
         {{ 'CORE.FOLDER_DIALOG.CANCEL_BUTTON.LABEL' | translate }}
     </button>
 
     <button class="adf-dialog-action-button"
+            id="adf-folder-create-button"
             mat-button
             (click)="submit()"
             [disabled]="!form.valid">
diff --git a/lib/content-services/dialogs/folder.dialog.spec.ts b/lib/content-services/dialogs/folder.dialog.spec.ts
index bc2610acfc..f912f89e19 100644
--- a/lib/content-services/dialogs/folder.dialog.spec.ts
+++ b/lib/content-services/dialogs/folder.dialog.spec.ts
@@ -20,7 +20,7 @@ import { async, ComponentFixture } from '@angular/core/testing';
 import { MatDialogRef } from '@angular/material';
 import { NodesApiService, setupTestBed } from '@alfresco/adf-core';
 import { FolderDialogComponent } from './folder.dialog';
-import { Observable } from 'rxjs/Observable';
+import { of, throwError } from 'rxjs';
 import { ContentTestingModule } from '../testing/content.testing.module';
 import { By } from '@angular/platform-browser';
 
@@ -86,7 +86,7 @@ describe('FolderDialogComponent', () => {
         });
 
         it('should submit updated values if form is valid', () => {
-            spyOn(nodesApi, 'updateNode').and.returnValue(Observable.of({}));
+            spyOn(nodesApi, 'updateNode').and.returnValue(of({}));
 
             component.form.controls['name'].setValue('folder-name-update');
             component.form.controls['description'].setValue('folder-description-update');
@@ -110,7 +110,7 @@ describe('FolderDialogComponent', () => {
                 data: 'folder-data'
             };
 
-            spyOn(nodesApi, 'updateNode').and.returnValue(Observable.of(folder));
+            spyOn(nodesApi, 'updateNode').and.returnValue(of(folder));
 
             component.submit();
 
@@ -121,7 +121,7 @@ describe('FolderDialogComponent', () => {
                 const folder = { data: 'folder-data' };
                 let expectedNode = null;
 
-                spyOn(nodesApi, 'updateNode').and.returnValue(Observable.of(folder));
+                spyOn(nodesApi, 'updateNode').and.returnValue(of(folder));
 
                 component.success.subscribe((node) => { expectedNode = node; });
                 component.submit();
@@ -144,7 +144,7 @@ describe('FolderDialogComponent', () => {
         });
 
         it('should not call dialog to close if submit fails', () => {
-            spyOn(nodesApi, 'updateNode').and.returnValue(Observable.throw('error'));
+            spyOn(nodesApi, 'updateNode').and.returnValue(throwError('error'));
             spyOn(component, 'handleError').and.callFake(val => val);
 
             component.submit();
@@ -183,7 +183,7 @@ describe('FolderDialogComponent', () => {
         });
 
         it('should submit updated values if form is valid', () => {
-            spyOn(nodesApi, 'createFolder').and.returnValue(Observable.of({}));
+            spyOn(nodesApi, 'createFolder').and.returnValue(of({}));
 
             component.form.controls['name'].setValue('folder-name-update');
             component.form.controls['description'].setValue('folder-description-update');
@@ -204,7 +204,7 @@ describe('FolderDialogComponent', () => {
         });
 
         it('should submit updated values if form is valid (with custom nodeType)', () => {
-                spyOn(nodesApi, 'createFolder').and.returnValue(Observable.of({}));
+                spyOn(nodesApi, 'createFolder').and.returnValue(of({}));
 
                 component.form.controls['name'].setValue('folder-name-update');
                 component.form.controls['description'].setValue('folder-description-update');
@@ -233,7 +233,7 @@ describe('FolderDialogComponent', () => {
             component.form.controls['name'].setValue('name');
             component.form.controls['description'].setValue('description');
 
-            spyOn(nodesApi, 'createFolder').and.returnValue(Observable.of(folder));
+            spyOn(nodesApi, 'createFolder').and.returnValue(of(folder));
 
             component.submit();
 
@@ -253,7 +253,7 @@ describe('FolderDialogComponent', () => {
         });
 
         it('should not call dialog to close if submit fails', () => {
-            spyOn(nodesApi, 'createFolder').and.returnValue(Observable.throw('error'));
+            spyOn(nodesApi, 'createFolder').and.returnValue(throwError('error'));
             spyOn(component, 'handleError').and.callFake(val => val);
 
             component.form.controls['name'].setValue('name');
@@ -276,7 +276,7 @@ describe('FolderDialogComponent', () => {
                     done();
                 });
 
-                spyOn(nodesApi, 'createFolder').and.returnValue(Observable.throw(error));
+                spyOn(nodesApi, 'createFolder').and.returnValue(throwError(error));
 
                 component.form.controls['name'].setValue('name');
                 component.form.controls['description'].setValue('description');
@@ -294,7 +294,7 @@ describe('FolderDialogComponent', () => {
                     done();
                 });
 
-                spyOn(nodesApi, 'createFolder').and.returnValue(Observable.throw(error));
+                spyOn(nodesApi, 'createFolder').and.returnValue(throwError(error));
 
                 component.form.controls['name'].setValue('name');
                 component.form.controls['description'].setValue('description');
diff --git a/lib/content-services/dialogs/folder.dialog.ts b/lib/content-services/dialogs/folder.dialog.ts
index d5406f3649..164ec8a78a 100644
--- a/lib/content-services/dialogs/folder.dialog.ts
+++ b/lib/content-services/dialogs/folder.dialog.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 
 import { Component, Inject, OnInit, Optional, EventEmitter, Output } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
diff --git a/lib/content-services/dialogs/share.dialog.spec.ts b/lib/content-services/dialogs/share.dialog.spec.ts
index 9b16d105d3..6a42ed2488 100644
--- a/lib/content-services/dialogs/share.dialog.spec.ts
+++ b/lib/content-services/dialogs/share.dialog.spec.ts
@@ -18,7 +18,7 @@
 import { async, TestBed } from '@angular/core/testing';
 import { ComponentFixture } from '@angular/core/testing';
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 import { ShareDialogComponent } from './share.dialog';
 import { ContentTestingModule } from '../testing/content.testing.module';
 import { SharedLinksApiService, setupTestBed } from '@alfresco/adf-core';
@@ -54,8 +54,8 @@ describe('ShareDialogComponent', () => {
 
         fixture.detectChanges();
 
-        spyCreate = spyOn(sharedLinksApiService, 'createSharedLinks').and.returnValue(Observable.of({ entry: { id: 'test-sharedId' } }));
-        spyDelete = spyOn(sharedLinksApiService, 'deleteSharedLink').and.returnValue(Observable.of({}));
+        spyCreate = spyOn(sharedLinksApiService, 'createSharedLinks').and.returnValue(of({ entry: { id: 'test-sharedId' } }));
+        spyDelete = spyOn(sharedLinksApiService, 'deleteSharedLink').and.returnValue(of({}));
     });
 
     it('should init the dialog with the file name and baseShareUrl', async(() => {
diff --git a/lib/content-services/directives/node-share.directive.spec.ts b/lib/content-services/directives/node-share.directive.spec.ts
index 116f921397..0b67ed4649 100644
--- a/lib/content-services/directives/node-share.directive.spec.ts
+++ b/lib/content-services/directives/node-share.directive.spec.ts
@@ -49,8 +49,7 @@ describe('NodeSharedDirective', () => {
                 TestComponent,
                 NodeSharedDirective
             ]
-        })
-            .compileComponents()
+        }).compileComponents()
             .then(() => {
                 fixture = TestBed.createComponent(TestComponent);
                 component = fixture.componentInstance;
diff --git a/lib/content-services/directives/node-share.directive.ts b/lib/content-services/directives/node-share.directive.ts
index 7ae5e55fe9..88fd5dfa6d 100644
--- a/lib/content-services/directives/node-share.directive.ts
+++ b/lib/content-services/directives/node-share.directive.ts
@@ -44,8 +44,7 @@ export class NodeSharedDirective implements OnChanges {
     }
 
     shareNode(node: MinimalNodeEntity) {
-        if (node.entry && node.entry.isFile) {
-            this.setDisableAttribute(true);
+        if (node && node.entry && node.entry.isFile) {
             this.dialog.open(ShareDialogComponent, {
                 width: '600px',
                 disableClose: true,
diff --git a/lib/content-services/document-list/components/content-action/content-action.component.ts b/lib/content-services/document-list/components/content-action/content-action.component.ts
index f7d1221241..48181617d2 100644
--- a/lib/content-services/document-list/components/content-action/content-action.component.ts
+++ b/lib/content-services/document-list/components/content-action/content-action.component.ts
@@ -24,7 +24,7 @@ import { DocumentActionsService } from '../../services/document-actions.service'
 import { FolderActionsService } from '../../services/folder-actions.service';
 import { ContentActionModel, ContentActionTarget } from './../../models/content-action.model';
 import { ContentActionListComponent } from './content-action-list.component';
-import { Subscription } from 'rxjs/Subscription';
+import { Subscription } from 'rxjs';
 
 @Component({
     selector: 'content-action',
diff --git a/lib/content-services/document-list/components/document-list.component.spec.ts b/lib/content-services/document-list/components/document-list.component.spec.ts
index e169a1c910..6b038961f7 100644
--- a/lib/content-services/document-list/components/document-list.component.spec.ts
+++ b/lib/content-services/document-list/components/document-list.component.spec.ts
@@ -19,8 +19,7 @@ import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange, TemplateRef, QueryList } from '@a
 import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
 import { AlfrescoApiService, DataColumnListComponent, DataColumnComponent } from '@alfresco/adf-core';
 import { DataColumn, DataTableComponent } from '@alfresco/adf-core';
-import { Observable } from 'rxjs/Observable';
-import { Subject } from 'rxjs/Subject';
+import { Subject, of, throwError } from 'rxjs';
 import { FileNode, FolderNode } from '../../mock';
 import {
     fakeNodeAnswerWithNOEntries,
@@ -249,7 +248,7 @@ describe('DocumentList', () => {
         documentList.folderNode = new NodeMinimal();
         documentList.folderNode.id = '1d26e465-dea3-42f3-b415-faa8364b9692';
 
-        spyOn(documentListService, 'getFolder').and.returnValue(Observable.of(fakeNodeAnswerWithNOEntries));
+        spyOn(documentListService, 'getFolder').and.returnValue(of(fakeNodeAnswerWithNOEntries));
 
         let disposableReady = documentList.ready.subscribe(() => {
             expect(element.querySelector('#adf-document-list-empty')).toBeDefined();
@@ -754,7 +753,7 @@ describe('DocumentList', () => {
     it('should display folder content from loadFolder on reload if folderNode defined', () => {
         documentList.folderNode = new NodeMinimal();
 
-        spyOn(documentList, 'loadFolderNodesByFolderNodeId').and.returnValue(Observable.of(''));
+        spyOn(documentList, 'loadFolderNodesByFolderNodeId').and.returnValue(Promise.resolve(''));
         spyOn(documentList, 'loadFolder').and.callThrough();
         documentList.reload();
         expect(documentList.loadFolder).toHaveBeenCalled();
@@ -953,7 +952,7 @@ describe('DocumentList', () => {
 
     it('should emit error when getFolderNode fails', (done) => {
         const error = { message: '{ "error": { "statusCode": 501 } }' };
-        spyOn(documentListService, 'getFolderNode').and.returnValue(Observable.throw(error));
+        spyOn(documentListService, 'getFolderNode').and.returnValue(throwError(error));
 
         let disposableError = documentList.error.subscribe(val => {
             expect(val).toBe(error);
@@ -966,7 +965,7 @@ describe('DocumentList', () => {
 
     it('should emit error when loadFolderNodesByFolderNodeId fails', (done) => {
         const error = { message: '{ "error": { "statusCode": 501 } }' };
-        spyOn(documentListService, 'getFolderNode').and.returnValue(Observable.of(fakeNodeWithCreatePermission));
+        spyOn(documentListService, 'getFolderNode').and.returnValue(of(fakeNodeWithCreatePermission));
         spyOn(documentList, 'loadFolderNodesByFolderNodeId').and.returnValue(Promise.reject(error));
 
         let disposableError = documentList.error.subscribe(val => {
@@ -980,7 +979,7 @@ describe('DocumentList', () => {
 
     it('should set no permission when getFolderNode fails with 403', (done) => {
         const error = { message: '{ "error": { "statusCode": 403 } }' };
-        spyOn(documentListService, 'getFolderNode').and.returnValue(Observable.throw(error));
+        spyOn(documentListService, 'getFolderNode').and.returnValue(throwError(error));
 
         let disposableError = documentList.error.subscribe(val => {
             expect(val).toBe(error);
@@ -1022,8 +1021,8 @@ describe('DocumentList', () => {
         documentList.folderNode = new NodeMinimal();
         documentList.folderNode.id = '1d26e465-dea3-42f3-b415-faa8364b9692';
 
-        spyOn(documentListService, 'getFolderNode').and.returnValue(Observable.of(fakeNodeWithNoPermission));
-        spyOn(documentListService, 'getFolder').and.returnValue(Observable.throw(error));
+        spyOn(documentListService, 'getFolderNode').and.returnValue(of(fakeNodeWithNoPermission));
+        spyOn(documentListService, 'getFolder').and.returnValue(throwError(error));
 
         documentList.loadFolder();
         let clickedFolderNode = new FolderNode('fake-folder-node');
@@ -1226,7 +1225,7 @@ describe('DocumentList', () => {
     });
 
     xit('should emit error when fetch recent fails on search call', (done) => {
-        spyOn(customResourcesService, 'loadFolderByNodeId').and.returnValue(Observable.throw('error'));
+        spyOn(customResourcesService, 'loadFolderByNodeId').and.returnValue(throwError('error'));
 
         let disposableError = documentList.error.subscribe(val => {
             expect(val).toBe('error');
diff --git a/lib/content-services/document-list/components/document-list.component.ts b/lib/content-services/document-list/components/document-list.component.ts
index 5487b830a0..db08e3458e 100644
--- a/lib/content-services/document-list/components/document-list.component.ts
+++ b/lib/content-services/document-list/components/document-list.component.ts
@@ -27,15 +27,9 @@ import {
 } from '@alfresco/adf-core';
 
 import { MinimalNodeEntity, MinimalNodeEntryEntity, NodePaging } from 'alfresco-js-api';
-
-import { Observable } from 'rxjs/Observable';
-import { Subject } from 'rxjs/Subject';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
-import { Subscription } from 'rxjs/Subscription';
-
+import { Subject, BehaviorSubject, Subscription, of } from 'rxjs';
 import { ShareDataRow } from './../data/share-data-row.model';
 import { ShareDataTableAdapter } from './../data/share-datatable-adapter';
-
 import { presetsDefaultModel } from '../models/preset.model';
 import { ContentActionModel } from './../models/content-action.model';
 import { PermissionStyleModel } from './../models/permissions-style.model';
@@ -416,7 +410,7 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
             if (changes.node && changes.node.currentValue) {
                 this.data.loadPage(changes.node.currentValue);
                 this.onDataReady(changes.node.currentValue);
-            } else if (changes.rowFilter) {
+            } else if (changes.rowFilter && changes.rowFilter.currentValue !== changes.rowFilter.previousValue) {
                 this.data.setFilter(changes.rowFilter.currentValue);
                 if (this.currentFolderId) {
                     this.loadFolderNodesByFolderNodeId(this.currentFolderId, this.pagination.getValue()).catch(err => this.error.emit(err));
@@ -446,7 +440,6 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
     }
 
     getNodeActions(node: MinimalNodeEntity | any): ContentActionModel[] {
-
         if (node && node.entry) {
             let target = null;
 
@@ -559,10 +552,10 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
             if (typeof action.handler === 'function') {
                 handlerSub = action.handler(node, this, action.permission);
             } else {
-                handlerSub = Observable.of(true);
+                handlerSub = of(true);
             }
 
-            if (typeof action.execute === 'function') {
+            if (typeof action.execute === 'function' && handlerSub) {
                 handlerSub.subscribe(() => {
                     action.execute(node);
                 });
@@ -820,22 +813,6 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
         this.pagination.value.skipCount = 0;
     }
 
-    // TODO: remove it from here
-    getCorrespondingNodeIds(nodeId: string): Observable<string[]> {
-        if (this.customResourcesService.isCustomSource(nodeId)) {
-            return this.customResourcesService.getCorrespondingNodeIds(nodeId, this.pagination.getValue());
-        } else if (nodeId) {
-            return new Observable(observer => {
-                this.documentListService.getFolderNode(nodeId, this.includeFields)
-                    .subscribe((node: MinimalNodeEntryEntity) => {
-                        observer.next([node.id]);
-                        observer.complete();
-                    });
-            });
-        }
-
-    }
-
     ngOnDestroy() {
         this.subscriptions.forEach(s => s.unsubscribe());
         this.subscriptions = [];
diff --git a/lib/content-services/document-list/data/share-datatable-adapter.ts b/lib/content-services/document-list/data/share-datatable-adapter.ts
index 59cf7a5613..f196150075 100644
--- a/lib/content-services/document-list/data/share-datatable-adapter.ts
+++ b/lib/content-services/document-list/data/share-datatable-adapter.ts
@@ -234,7 +234,15 @@ export class ShareDataTableAdapter implements DataTableAdapter {
         }
 
         if (merge) {
-            this.rows = this.rows.concat(rows);
+            let listPrunedDuplicate = rows.filter((elemntToFilter) => {
+                let isPresent = this.rows.find((currenRow: any) => {
+                    return currenRow.obj.entry.id === elemntToFilter.obj.entry.id;
+                });
+
+                return !isPresent;
+            });
+
+            this.rows = this.rows.concat(listPrunedDuplicate);
         } else {
             this.rows = rows;
         }
diff --git a/lib/content-services/document-list/document-list.module.ts b/lib/content-services/document-list/document-list.module.ts
index f089331d6c..6e493fc5cb 100644
--- a/lib/content-services/document-list/document-list.module.ts
+++ b/lib/content-services/document-list/document-list.module.ts
@@ -18,8 +18,7 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FlexLayoutModule } from '@angular/flex-layout';
-import { TranslateModule } from '@ngx-translate/core';
-import { DataTableModule, PaginationModule, ToolbarModule } from '@alfresco/adf-core';
+import { CoreModule } from '@alfresco/adf-core';
 
 import { MaterialModule } from '../material.module';
 import { UploadModule } from '../upload/upload.module';
@@ -33,22 +32,13 @@ import { DocumentListComponent } from './components/document-list.component';
 import { EmptyFolderContentDirective } from './components/empty-folder/empty-folder-content.directive';
 import { NoPermissionContentDirective } from './components/no-permission/no-permission-content.directive';
 
-import { DocumentActionsService } from './services/document-actions.service';
-import { DocumentListService } from './services/document-list.service';
-import { FolderActionsService } from './services/folder-actions.service';
-import { NodeActionsService } from './services/node-actions.service';
-import { CustomResourcesService } from './services/custom-resources.service';
-
 @NgModule({
     imports: [
-        ToolbarModule,
+        CoreModule.forChild(),
         CommonModule,
-        DataTableModule,
         FlexLayoutModule,
         MaterialModule,
-        UploadModule,
-        TranslateModule,
-        PaginationModule
+        UploadModule
     ],
     declarations: [
         DocumentListComponent,
@@ -59,13 +49,6 @@ import { CustomResourcesService } from './services/custom-resources.service';
         EmptyFolderContentDirective,
         NoPermissionContentDirective
     ],
-    providers: [
-        DocumentListService,
-        FolderActionsService,
-        DocumentActionsService,
-        NodeActionsService,
-        CustomResourcesService
-    ],
     exports: [
         DocumentListComponent,
         ContentColumnComponent,
diff --git a/lib/content-services/document-list/services/custom-resources.service.ts b/lib/content-services/document-list/services/custom-resources.service.ts
index fe5d870c8d..1cde8a171e 100644
--- a/lib/content-services/document-list/services/custom-resources.service.ts
+++ b/lib/content-services/document-list/services/custom-resources.service.ts
@@ -29,7 +29,8 @@ import {
     SearchRequest
 } from 'alfresco-js-api';
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable, from, of, throwError } from 'rxjs';
+import { catchError, map } from 'rxjs/operators';
 
 @Injectable()
 export class CustomResourcesService {
@@ -86,7 +87,7 @@ export class CustomResourcesService {
                         observer.error(err);
                         observer.complete();
                     });
-        }).catch(err => this.handleError(err));
+        }).pipe(catchError(err => this.handleError(err)));
     }
 
     /**
@@ -132,7 +133,7 @@ export class CustomResourcesService {
                         observer.error(err);
                         observer.complete();
                     });
-        }).catch(err => this.handleError(err));
+        }).pipe(catchError(err => this.handleError(err)));
     }
 
     /**
@@ -171,7 +172,7 @@ export class CustomResourcesService {
                         observer.error(err);
                         observer.complete();
                     });
-        }).catch(err => this.handleError(err));
+        }).pipe(catchError(err => this.handleError(err)));
     }
 
     /**
@@ -202,7 +203,7 @@ export class CustomResourcesService {
                         observer.error(err);
                         observer.complete();
                     });
-        }).catch(err => this.handleError(err));
+        }).pipe(catchError(err => this.handleError(err)));
     }
 
     /**
@@ -220,7 +221,8 @@ export class CustomResourcesService {
             skipCount: pagination.skipCount
         };
 
-        return Observable.fromPromise(this.apiService.nodesApi.getDeletedNodes(options)).catch(err => this.handleError(err));
+        return from(this.apiService.nodesApi.getDeletedNodes(options))
+            .pipe(catchError(err => this.handleError(err)));
 
     }
 
@@ -239,7 +241,8 @@ export class CustomResourcesService {
             skipCount: pagination.skipCount
         };
 
-        return Observable.fromPromise(this.apiService.sharedLinksApi.findSharedLinks(options)).catch(err => this.handleError(err));
+        return from(this.apiService.sharedLinksApi.findSharedLinks(options))
+            .pipe(catchError(err => this.handleError(err)));
     }
 
     /**
@@ -258,6 +261,17 @@ export class CustomResourcesService {
         return isCustomSources;
     }
 
+    isSupportedSource(folderId: string): boolean {
+        let isSupportedSources = false;
+        const sources = ['-my-', '-root-', '-shared-'];
+
+        if (sources.indexOf(folderId) > -1) {
+            isSupportedSources = true;
+        }
+
+        return isSupportedSources;
+    }
+
     /**
      * Gets a folder's contents.
      * @param nodeId ID of the target folder node
@@ -289,40 +303,35 @@ export class CustomResourcesService {
      * @param pagination Specifies how to paginate the results
      * @returns List of node IDs
      */
-    getCorrespondingNodeIds(nodeId: string, pagination: PaginationModel): Observable<string[]> {
-        if (nodeId === '-trashcan-') {
-            return Observable.fromPromise(this.apiService.nodesApi.getDeletedNodes()
-                .then(result => result.list.entries.map(node => node.entry.id)));
+    getCorrespondingNodeIds(nodeId: string, pagination: PaginationModel = {}): Observable<string[]> {
+        if (this.isCustomSource(nodeId)) {
 
-        } else if (nodeId === '-sharedlinks-') {
-            return Observable.fromPromise(this.apiService.sharedLinksApi.findSharedLinks()
-                .then(result => result.list.entries.map(node => node.entry.nodeId)));
+            return this.loadFolderByNodeId(nodeId, pagination, [])
+                .pipe(map(result => result.list.entries.map((node: any) => {
+                    if (nodeId === '-sharedlinks-') {
+                        return node.entry.nodeId;
 
-        } else if (nodeId === '-sites-') {
-            return Observable.fromPromise(this.apiService.sitesApi.getSites()
-                .then(result => result.list.entries.map(node => node.entry.guid)));
+                    } else if (nodeId === '-sites-' || nodeId === '-mysites-') {
+                        return node.entry.guid;
 
-        } else if (nodeId === '-mysites-') {
-            return Observable.fromPromise(this.apiService.peopleApi.getSiteMembership('-me-')
-                .then(result => result.list.entries.map(node => node.entry.guid)));
+                    } else if (nodeId === '-favorites-') {
+                        return node.entry.targetGuid;
+                    }
 
-        } else if (nodeId === '-favorites-') {
-            return Observable.fromPromise(this.apiService.favoritesApi.getFavorites('-me-')
-                .then(result => result.list.entries.map(node => node.entry.targetGuid)));
-
-        } else if (nodeId === '-recent-') {
-            return new Observable(observer => {
-                this.getRecentFiles('-me-', pagination)
-                    .subscribe((recentFiles) => {
-                        let recentFilesIdS = recentFiles.list.entries.map(node => node.entry.id);
-                        observer.next(recentFilesIdS);
-                        observer.complete();
-                    });
-            });
+                    return node.entry.id;
+                })));
 
+        } else if (nodeId) {
+            // cases when nodeId is '-my-', '-root-' or '-shared-'
+            return from(this.apiService.nodesApi.getNode(nodeId)
+                .then(node => [node.entry.id]));
         }
 
-        return Observable.of([]);
+        return of([]);
+    }
+
+    hasCorrespondingNodeIds(nodeId: string): boolean {
+        return this.isCustomSource(nodeId) || this.isSupportedSource(nodeId);
     }
 
     private getIncludesFields(includeFields: string[]): string[] {
@@ -331,9 +340,7 @@ export class CustomResourcesService {
     }
 
     private handleError(error: Response) {
-        // in a real world app, we may send the error to some remote logging infrastructure
-        // instead of just logging it to the console
         this.logService.error(error);
-        return Observable.throw(error || 'Server error');
+        return throwError(error || 'Server error');
     }
 }
diff --git a/lib/content-services/document-list/services/document-actions.service.spec.ts b/lib/content-services/document-list/services/document-actions.service.spec.ts
index c52b405328..e3082d03e1 100644
--- a/lib/content-services/document-list/services/document-actions.service.spec.ts
+++ b/lib/content-services/document-list/services/document-actions.service.spec.ts
@@ -23,7 +23,7 @@ import { ContentActionHandler } from '../models/content-action.model';
 import { DocumentActionsService } from './document-actions.service';
 import { DocumentListService } from './document-list.service';
 import { NodeActionsService } from './node-actions.service';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 
 describe('DocumentActionsService', () => {
 
@@ -103,7 +103,7 @@ describe('DocumentActionsService', () => {
     });
 
     it('should not delete the file node if there are no permissions', (done) => {
-        spyOn(documentListService, 'deleteNode').and.returnValue(Observable.of(true));
+        spyOn(documentListService, 'deleteNode').and.returnValue(of(true));
 
         service.permissionEvent.subscribe((permission) => {
             expect(permission).toBeDefined();
@@ -118,7 +118,7 @@ describe('DocumentActionsService', () => {
     });
 
     it('should call the error on the returned Observable if there are no permissions', (done) => {
-        spyOn(documentListService, 'deleteNode').and.returnValue(Observable.of(true));
+        spyOn(documentListService, 'deleteNode').and.returnValue(of(true));
 
         let file = new FileNode();
         const deleteObservable = service.getHandler('delete')(file);
@@ -132,7 +132,7 @@ describe('DocumentActionsService', () => {
     });
 
     it('should delete the file node if there is the delete permission', () => {
-        spyOn(documentListService, 'deleteNode').and.returnValue(Observable.of(true));
+        spyOn(documentListService, 'deleteNode').and.returnValue(of(true));
 
         let permission = 'delete';
         let file = new FileNode();
@@ -161,7 +161,7 @@ describe('DocumentActionsService', () => {
     });
 
     it('should delete the file node if there is the delete and others permission ', () => {
-        spyOn(documentListService, 'deleteNode').and.returnValue(Observable.of(true));
+        spyOn(documentListService, 'deleteNode').and.returnValue(of(true));
 
         let permission = 'delete';
         let file = new FileNode();
@@ -177,7 +177,7 @@ describe('DocumentActionsService', () => {
     });
 
     it('should delete file node', () => {
-        spyOn(documentListService, 'deleteNode').and.returnValue(Observable.of(true));
+        spyOn(documentListService, 'deleteNode').and.returnValue(of(true));
 
         let permission = 'delete';
         let file = new FileNode();
@@ -190,7 +190,7 @@ describe('DocumentActionsService', () => {
     });
 
     it('should support deletion only file node', () => {
-        spyOn(documentListService, 'deleteNode').and.returnValue(Observable.of(true));
+        spyOn(documentListService, 'deleteNode').and.returnValue(of(true));
 
         let folder = new FolderNode();
         service.getHandler('delete')(folder);
@@ -205,7 +205,7 @@ describe('DocumentActionsService', () => {
     });
 
     it('should require node id to delete', () => {
-        spyOn(documentListService, 'deleteNode').and.returnValue(Observable.of(true));
+        spyOn(documentListService, 'deleteNode').and.returnValue(of(true));
 
         let file = new FileNode();
         file.entry.id = null;
@@ -219,7 +219,7 @@ describe('DocumentActionsService', () => {
             expect(message).toEqual('CORE.DELETE_NODE.SINGULAR');
             done();
         });
-        spyOn(documentListService, 'deleteNode').and.returnValue(Observable.of(true));
+        spyOn(documentListService, 'deleteNode').and.returnValue(of(true));
 
         let target = jasmine.createSpyObj('obj', ['reload']);
         let permission = 'delete';
diff --git a/lib/content-services/document-list/services/document-actions.service.ts b/lib/content-services/document-list/services/document-actions.service.ts
index 246341aacd..bf5763a243 100644
--- a/lib/content-services/document-list/services/document-actions.service.ts
+++ b/lib/content-services/document-list/services/document-actions.service.ts
@@ -18,14 +18,12 @@
 import { ContentService, TranslationService } from '@alfresco/adf-core';
 import { Injectable } from '@angular/core';
 import { MinimalNodeEntity } from 'alfresco-js-api';
-import { Observable } from 'rxjs/Observable';
-import { Subject } from 'rxjs/Subject';
+import { Observable, Subject, throwError } from 'rxjs';
 import { ContentActionHandler } from '../models/content-action.model';
 import { PermissionModel } from '../models/permissions.model';
 import { DocumentListService } from './document-list.service';
 import { NodeActionsService } from './node-actions.service';
 import { ContentNodeDialogService } from '../../content-node-selector/content-node-dialog.service';
-import 'rxjs/add/observable/throw';
 
 @Injectable()
 export class DocumentActionsService {
@@ -138,7 +136,7 @@ export class DocumentActionsService {
                     action: 'delete',
                     permission: permission
                 }));
-                return Observable.throw(new Error('No permission to delete'));
+                return throwError(new Error('No permission to delete'));
             }
         }
     }
diff --git a/lib/content-services/document-list/services/document-list.service.spec.ts b/lib/content-services/document-list/services/document-list.service.spec.ts
index 2eecb1bb99..b7ac8102d7 100644
--- a/lib/content-services/document-list/services/document-list.service.spec.ts
+++ b/lib/content-services/document-list/services/document-list.service.spec.ts
@@ -16,7 +16,7 @@
  */
 
 import { AlfrescoApiServiceMock, AlfrescoApiService,
-    AppConfigService, StorageService, ContentService, setupTestBed, CoreModule } from '@alfresco/adf-core';
+    AppConfigService, StorageService, ContentService, setupTestBed, CoreModule, LogService, AppConfigServiceMock } from '@alfresco/adf-core';
 import { DocumentListService } from './document-list.service';
 
 declare let jasmine: any;
@@ -94,9 +94,10 @@ describe('DocumentListService', () => {
     });
 
     beforeEach(() => {
+        let logService = new LogService(new AppConfigServiceMock(null));
         let contentService = new ContentService(null, null, null, null);
         alfrescoApiService = new AlfrescoApiServiceMock(new AppConfigService(null), new StorageService());
-        service = new DocumentListService(null, contentService, alfrescoApiService, null, null);
+        service = new DocumentListService(null, contentService, alfrescoApiService, logService, null);
         jasmine.Ajax.install();
     });
 
@@ -161,7 +162,7 @@ describe('DocumentListService', () => {
     });
 
     it('should add the includeTypes in the request Node Children if required', () => {
-        let spyGetNodeInfo = spyOn(alfrescoApiService.getInstance().nodes, 'getNodeChildren');
+        let spyGetNodeInfo = spyOn(alfrescoApiService.getInstance().nodes, 'getNodeChildren').and.callThrough();
 
         service.getFolder('/fake-root/fake-name', {}, ['isLocked']);
 
@@ -173,7 +174,7 @@ describe('DocumentListService', () => {
     });
 
     it('should not add the includeTypes in the request Node Children if is duplicated', () => {
-        let spyGetNodeInfo = spyOn(alfrescoApiService.getInstance().nodes, 'getNodeChildren');
+        let spyGetNodeInfo = spyOn(alfrescoApiService.getInstance().nodes, 'getNodeChildren').and.callThrough();
 
         service.getFolder('/fake-root/fake-name', {}, ['allowableOperations']);
 
@@ -185,7 +186,7 @@ describe('DocumentListService', () => {
     });
 
     it('should add the includeTypes in the request getFolderNode if required', () => {
-        let spyGetNodeInfo = spyOn(alfrescoApiService.getInstance().nodes, 'getNodeInfo');
+        let spyGetNodeInfo = spyOn(alfrescoApiService.getInstance().nodes, 'getNodeInfo').and.callThrough();
 
         service.getFolderNode('test-id', ['isLocked']);
 
@@ -196,7 +197,7 @@ describe('DocumentListService', () => {
     });
 
     it('should not add the includeTypes in the request getFolderNode if is duplicated', () => {
-        let spyGetNodeInfo = spyOn(alfrescoApiService.getInstance().nodes, 'getNodeInfo');
+        let spyGetNodeInfo = spyOn(alfrescoApiService.getInstance().nodes, 'getNodeInfo').and.callThrough();
 
         service.getFolderNode('test-id', ['allowableOperations']);
 
diff --git a/lib/content-services/document-list/services/document-list.service.ts b/lib/content-services/document-list/services/document-list.service.ts
index 80c098bfca..30cadbcffe 100644
--- a/lib/content-services/document-list/services/document-list.service.ts
+++ b/lib/content-services/document-list/services/document-list.service.ts
@@ -22,8 +22,8 @@ import {
 
 import { Injectable } from '@angular/core';
 import { MinimalNodeEntity, MinimalNodeEntryEntity,  NodeEntry, NodePaging } from 'alfresco-js-api';
-import { Observable } from 'rxjs/Observable';
-import 'rxjs/add/observable/throw';
+import { Observable, from, throwError } from 'rxjs';
+import { catchError } from 'rxjs/operators';
 
 @Injectable()
 export class DocumentListService {
@@ -74,7 +74,7 @@ export class DocumentListService {
      * @returns Empty response when the operation is complete
      */
     deleteNode(nodeId: string): Observable<any> {
-        return Observable.fromPromise(this.apiService.getInstance().nodes.deleteNode(nodeId));
+        return from(this.apiService.getInstance().nodes.deleteNode(nodeId));
     }
 
     /**
@@ -85,8 +85,9 @@ export class DocumentListService {
      * @returns NodeEntry for the copied node
      */
     copyNode(nodeId: string, targetParentId: string) {
-        return Observable.fromPromise(this.apiService.getInstance().nodes.copyNode(nodeId, { targetParentId }))
-            .catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().nodes.copyNode(nodeId, { targetParentId })).pipe(
+            catchError(err => this.handleError(err))
+        );
     }
 
     /**
@@ -97,8 +98,9 @@ export class DocumentListService {
      * @returns NodeEntry for the moved node
      */
     moveNode(nodeId: string, targetParentId: string) {
-        return Observable.fromPromise(this.apiService.getInstance().nodes.moveNode(nodeId, { targetParentId }))
-            .catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().nodes.moveNode(nodeId, { targetParentId })).pipe(
+            catchError(err => this.handleError(err))
+        );
     }
 
     /**
@@ -108,9 +110,10 @@ export class DocumentListService {
      * @returns Details of the created folder node
      */
     createFolder(name: string, parentId: string): Observable<MinimalNodeEntity> {
-        let observable = Observable.fromPromise(this.apiService.getInstance().nodes.createFolder(name, '/', parentId));
-        observable.catch(err => this.handleError(err));
-        return observable;
+        return from(this.apiService.getInstance().nodes.createFolder(name, '/', parentId))
+            .pipe(
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -121,9 +124,10 @@ export class DocumentListService {
      * @returns Details of the folder
      */
     getFolder(folder: string, opts?: any, includeFields: string[] = []): Observable<NodePaging> {
-        return Observable.fromPromise(this.getNodesPromise(folder, opts, includeFields))
-            .map(res => <NodePaging> res)
-            .catch(err => this.handleError(err));
+        return from(this.getNodesPromise(folder, opts, includeFields))
+            .pipe(
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -162,7 +166,7 @@ export class DocumentListService {
             include: includeFieldsRequest
         };
 
-        return Observable.fromPromise(this.apiService.getInstance().nodes.getNodeInfo(nodeId, opts));
+        return from(this.apiService.getInstance().nodes.getNodeInfo(nodeId, opts));
     }
     /**
      * Get thumbnail URL for the given document node.
@@ -202,9 +206,7 @@ export class DocumentListService {
     }
 
     private handleError(error: any) {
-        // in a real world app, we may send the error to some remote logging infrastructure
-        // instead of just logging it to the console
         this.logService.error(error);
-        return Observable.throw(error || 'Server error');
+        return throwError(error || 'Server error');
     }
 }
diff --git a/lib/content-services/document-list/services/folder-actions.service.spec.ts b/lib/content-services/document-list/services/folder-actions.service.spec.ts
index 2def680c61..dff67a885e 100644
--- a/lib/content-services/document-list/services/folder-actions.service.spec.ts
+++ b/lib/content-services/document-list/services/folder-actions.service.spec.ts
@@ -17,7 +17,7 @@
 
 import { TestBed } from '@angular/core/testing';
 import { AlfrescoApiServiceMock, AppConfigService, StorageService, ContentService, setupTestBed, CoreModule, TranslationMock } from '@alfresco/adf-core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { FileNode, FolderNode } from '../../mock';
 import { ContentActionHandler } from '../models/content-action.model';
 import { DocumentListService } from './document-list.service';
diff --git a/lib/content-services/document-list/services/folder-actions.service.ts b/lib/content-services/document-list/services/folder-actions.service.ts
index 6203a776ec..2afd454175 100644
--- a/lib/content-services/document-list/services/folder-actions.service.ts
+++ b/lib/content-services/document-list/services/folder-actions.service.ts
@@ -18,13 +18,11 @@
 import { ContentService, TranslationService } from '@alfresco/adf-core';
 import { Injectable } from '@angular/core';
 import { MinimalNodeEntity } from 'alfresco-js-api';
-import { Observable } from 'rxjs/Observable';
-import { Subject } from 'rxjs/Subject';
+import { Observable, Subject, throwError } from 'rxjs';
 import { ContentActionHandler } from '../models/content-action.model';
 import { PermissionModel } from '../models/permissions.model';
 import { DocumentListService } from './document-list.service';
 import { NodeActionsService } from './node-actions.service';
-import 'rxjs/add/observable/throw';
 
 @Injectable()
 export class FolderActionsService {
@@ -135,7 +133,7 @@ export class FolderActionsService {
                 return handlerObservable;
             } else {
                 this.permissionEvent.next(new PermissionModel({type: 'folder', action: 'delete', permission: permission}));
-                return Observable.throw(new Error('No permission to delete'));
+                return throwError(new Error('No permission to delete'));
             }
         }
     }
diff --git a/lib/content-services/document-list/services/node-actions.service.spec.ts b/lib/content-services/document-list/services/node-actions.service.spec.ts
index cddb64cc86..b47ccea9ac 100644
--- a/lib/content-services/document-list/services/node-actions.service.spec.ts
+++ b/lib/content-services/document-list/services/node-actions.service.spec.ts
@@ -21,7 +21,7 @@ import { AppConfigService, setupTestBed, CoreModule } from '@alfresco/adf-core';
 import { DocumentListService } from './document-list.service';
 import { NodeActionsService } from './node-actions.service';
 import { ContentNodeDialogService } from '../../content-node-selector/content-node-dialog.service';
-import { Observable } from 'rxjs/Observable';
+import { of, throwError } from 'rxjs';
 import { MatDialogRef } from '@angular/material';
 import { DialogModule } from '../../dialogs/dialog.module';
 
@@ -65,8 +65,8 @@ describe('NodeActionsService', () => {
     });
 
     it('should be able to copy content', async(() => {
-        spyOn(documentListService, 'copyNode').and.returnValue(Observable.of('FAKE-OK'));
-        spyOn(contentDialogService, 'openCopyMoveDialog').and.returnValue(Observable.of([fakeNode]));
+        spyOn(documentListService, 'copyNode').and.returnValue(of('FAKE-OK'));
+        spyOn(contentDialogService, 'openCopyMoveDialog').and.returnValue(of([fakeNode]));
 
         service.copyContent(fakeNode, 'allowed').subscribe((value) => {
             expect(value).toBe('OPERATION.SUCCESS.CONTENT.COPY');
@@ -74,8 +74,8 @@ describe('NodeActionsService', () => {
     }));
 
     it('should be able to move content', async(() => {
-        spyOn(documentListService, 'moveNode').and.returnValue(Observable.of('FAKE-OK'));
-        spyOn(contentDialogService, 'openCopyMoveDialog').and.returnValue(Observable.of([fakeNode]));
+        spyOn(documentListService, 'moveNode').and.returnValue(of('FAKE-OK'));
+        spyOn(contentDialogService, 'openCopyMoveDialog').and.returnValue(of([fakeNode]));
 
         service.moveContent(fakeNode, 'allowed').subscribe((value) => {
             expect(value).toBe('OPERATION.SUCCESS.CONTENT.MOVE');
@@ -83,8 +83,8 @@ describe('NodeActionsService', () => {
     }));
 
     it('should be able to move folder', async(() => {
-        spyOn(documentListService, 'moveNode').and.returnValue(Observable.of('FAKE-OK'));
-        spyOn(contentDialogService, 'openCopyMoveDialog').and.returnValue(Observable.of([fakeNode]));
+        spyOn(documentListService, 'moveNode').and.returnValue(of('FAKE-OK'));
+        spyOn(contentDialogService, 'openCopyMoveDialog').and.returnValue(of([fakeNode]));
 
         service.moveFolder(fakeNode, 'allowed').subscribe((value) => {
             expect(value).toBe('OPERATION.SUCCESS.FOLDER.MOVE');
@@ -92,8 +92,8 @@ describe('NodeActionsService', () => {
     }));
 
     it('should be able to copy folder', async(() => {
-        spyOn(documentListService, 'copyNode').and.returnValue(Observable.of('FAKE-OK'));
-        spyOn(contentDialogService, 'openCopyMoveDialog').and.returnValue(Observable.of([fakeNode]));
+        spyOn(documentListService, 'copyNode').and.returnValue(of('FAKE-OK'));
+        spyOn(contentDialogService, 'openCopyMoveDialog').and.returnValue(of([fakeNode]));
 
         service.copyFolder(fakeNode, 'allowed').subscribe((value) => {
             expect(value).toBe('OPERATION.SUCCESS.FOLDER.COPY');
@@ -101,8 +101,8 @@ describe('NodeActionsService', () => {
     }));
 
     it('should be able to propagate the dialog error', async(() => {
-        spyOn(documentListService, 'copyNode').and.returnValue(Observable.throw('FAKE-KO'));
-        spyOn(contentDialogService, 'openCopyMoveDialog').and.returnValue(Observable.of([fakeNode]));
+        spyOn(documentListService, 'copyNode').and.returnValue(throwError('FAKE-KO'));
+        spyOn(contentDialogService, 'openCopyMoveDialog').and.returnValue(of([fakeNode]));
 
         service.copyFolder(fakeNode, '!allowed').subscribe((value) => {
         }, (error) => {
diff --git a/lib/content-services/document-list/services/node-actions.service.ts b/lib/content-services/document-list/services/node-actions.service.ts
index a4cc53cf64..425a41d59c 100644
--- a/lib/content-services/document-list/services/node-actions.service.ts
+++ b/lib/content-services/document-list/services/node-actions.service.ts
@@ -17,7 +17,7 @@
 
 import { Injectable, Output, EventEmitter } from '@angular/core';
 import { MinimalNodeEntryEntity, MinimalNodeEntity } from 'alfresco-js-api';
-import { Subject } from 'rxjs/Subject';
+import { Subject } from 'rxjs';
 import { AlfrescoApiService, ContentService } from '@alfresco/adf-core';
 import { MatDialog } from '@angular/material';
 
diff --git a/lib/content-services/folder-directive/folder-create.directive.spec.ts b/lib/content-services/folder-directive/folder-create.directive.spec.ts
index a7282533f9..3dcf3b8a64 100644
--- a/lib/content-services/folder-directive/folder-create.directive.spec.ts
+++ b/lib/content-services/folder-directive/folder-create.directive.spec.ts
@@ -19,12 +19,11 @@ import { Component } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatDialog } from '@angular/material';
 import { By } from '@angular/platform-browser';
-import { Observable } from 'rxjs/Observable';
+import { Subject, of } from 'rxjs';
 import { FolderDialogComponent } from '../dialogs/folder.dialog';
 
 import { ContentService, setupTestBed, CoreModule } from '@alfresco/adf-core';
 import { FolderCreateDirective } from './folder-create.directive';
-import { Subject } from 'rxjs/Subject';
 import { MinimalNodeEntryEntity } from 'alfresco-js-api';
 
 @Component({
@@ -89,7 +88,7 @@ describe('FolderCreateDirective', () => {
         node = { entry: { id: 'nodeId' } };
 
         dialogRefMock = {
-            afterClosed: val =>  Observable.of(val),
+            afterClosed: val =>  of(val),
             componentInstance: {
                 error: new Subject<any>(),
                 success: new Subject<MinimalNodeEntryEntity>()
@@ -108,7 +107,7 @@ describe('FolderCreateDirective', () => {
         });
 
         xit('should emit folderCreate event when input value is not undefined', (done) => {
-            spyOn(dialogRefMock, 'afterClosed').and.returnValue(Observable.of(node));
+            spyOn(dialogRefMock, 'afterClosed').and.returnValue(of(node));
             spyOn(contentService.folderCreate, 'next');
 
             contentService.folderCreate.subscribe((val) => {
@@ -124,7 +123,7 @@ describe('FolderCreateDirective', () => {
         });
 
         it('should not emit folderCreate event when input value is undefined', () => {
-            spyOn(dialogRefMock, 'afterClosed').and.returnValue(Observable.of(null));
+            spyOn(dialogRefMock, 'afterClosed').and.returnValue(of(null));
             spyOn(contentService.folderCreate, 'next');
 
             fixture.detectChanges();
diff --git a/lib/content-services/folder-directive/folder-edit.directive.spec.ts b/lib/content-services/folder-directive/folder-edit.directive.spec.ts
index 02c381f5df..a119cbda3d 100644
--- a/lib/content-services/folder-directive/folder-edit.directive.spec.ts
+++ b/lib/content-services/folder-directive/folder-edit.directive.spec.ts
@@ -19,12 +19,11 @@ import { Component } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatDialog } from '@angular/material';
 import { By } from '@angular/platform-browser';
-import { Observable } from 'rxjs/Observable';
+import { Subject, of } from 'rxjs';
 
 import { ContentService, setupTestBed, CoreModule } from '@alfresco/adf-core';
 import { FolderEditDirective } from './folder-edit.directive';
 import { MinimalNodeEntryEntity } from 'alfresco-js-api';
-import { Subject } from 'rxjs/Subject';
 
 @Component({
     template: '<div [adf-edit-folder]="folder" (success)="success($event)" title="edit-title"></div>'
@@ -72,7 +71,7 @@ describe('FolderEditDirective', () => {
         node = { entry: { id: 'folderId' } };
 
         dialogRefMock = {
-            afterClosed: val =>  Observable.of(val),
+            afterClosed: val =>  of(val),
             componentInstance: {
                 error: new Subject<any>(),
                 success: new Subject<MinimalNodeEntryEntity>()
@@ -83,7 +82,7 @@ describe('FolderEditDirective', () => {
     });
 
     xit('should emit folderEdit event when input value is not undefined', (done) => {
-        spyOn(dialogRefMock, 'afterClosed').and.returnValue(Observable.of(node));
+        spyOn(dialogRefMock, 'afterClosed').and.returnValue(of(node));
 
         contentService.folderEdit.subscribe((val) => {
             expect(val).toBe(node);
@@ -95,7 +94,7 @@ describe('FolderEditDirective', () => {
     });
 
     it('should not emit folderEdit event when input value is undefined', () => {
-        spyOn(dialogRefMock, 'afterClosed').and.returnValue(Observable.of(null));
+        spyOn(dialogRefMock, 'afterClosed').and.returnValue(of(null));
         spyOn(contentService.folderEdit, 'next');
 
         fixture.detectChanges();
diff --git a/lib/content-services/i18n/de.json b/lib/content-services/i18n/de.json
index 1692f4cbaf..e7136819b9 100644
--- a/lib/content-services/i18n/de.json
+++ b/lib/content-services/i18n/de.json
@@ -283,7 +283,8 @@
       "EVERYONE": "JEDER"
     },
     "ERROR": {
-      "DUPLICATE-PERMISSION": "Mindestens eine der von Ihnen bestimmten Berechtigungen ist bereits vorhanden: {{list}}"
+      "DUPLICATE-PERMISSION": "Mindestens eine der von Ihnen bestimmten Berechtigungen ist bereits vorhanden: {{list}}",
+      "NOT-ALLOWED": "Sie sind nicht zum Ändern von Berechtigungen berechtigt."
     }
   }
 }
\ No newline at end of file
diff --git a/lib/content-services/i18n/en.json b/lib/content-services/i18n/en.json
index 4b7b9d49b4..932e5ccee8 100644
--- a/lib/content-services/i18n/en.json
+++ b/lib/content-services/i18n/en.json
@@ -283,7 +283,8 @@
       "EVERYONE" : "EVERYONE"
     },
     "ERROR": {
-      "DUPLICATE-PERMISSION": "One or more of the permissions you have set is already present : {{list}}"
+      "DUPLICATE-PERMISSION": "One or more of the permissions you have set is already present : {{list}}",
+      "NOT-ALLOWED": "You are not allowed to change permissions"
     }
   }
 }
diff --git a/lib/content-services/i18n/es.json b/lib/content-services/i18n/es.json
index 5f064bd3db..1fb1a75ac3 100644
--- a/lib/content-services/i18n/es.json
+++ b/lib/content-services/i18n/es.json
@@ -283,7 +283,8 @@
       "EVERYONE": "Todos"
     },
     "ERROR": {
-      "DUPLICATE-PERMISSION": "Uno o más de los permisos que ha establecido ya existe: {{list}}"
+      "DUPLICATE-PERMISSION": "Uno o más de los permisos que ha establecido ya existe: {{list}}",
+      "NOT-ALLOWED": "No puede cambiar los permisos"
     }
   }
 }
\ No newline at end of file
diff --git a/lib/content-services/i18n/fr.json b/lib/content-services/i18n/fr.json
index a187d9989d..7da115ebb4 100644
--- a/lib/content-services/i18n/fr.json
+++ b/lib/content-services/i18n/fr.json
@@ -283,7 +283,8 @@
       "EVERYONE": "Tout le monde"
     },
     "ERROR": {
-      "DUPLICATE-PERMISSION": "Un ou plusieurs droits d'accès définis existent déjà : {{list}}"
+      "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"
     }
   }
 }
\ No newline at end of file
diff --git a/lib/content-services/i18n/it.json b/lib/content-services/i18n/it.json
index a26feb3f31..0fd46bf4dc 100644
--- a/lib/content-services/i18n/it.json
+++ b/lib/content-services/i18n/it.json
@@ -283,7 +283,8 @@
       "EVERYONE": "Tutti"
     },
     "ERROR": {
-      "DUPLICATE-PERMISSION": "Uno o più autorizzazioni impostate sono già presenti: {{list}}"
+      "DUPLICATE-PERMISSION": "Uno o più autorizzazioni impostate sono già presenti: {{list}}",
+      "NOT-ALLOWED": "Non è consentito modificare le autorizzazioni"
     }
   }
 }
\ No newline at end of file
diff --git a/lib/content-services/i18n/ja.json b/lib/content-services/i18n/ja.json
index a1274aee5a..0811fb7fcb 100644
--- a/lib/content-services/i18n/ja.json
+++ b/lib/content-services/i18n/ja.json
@@ -283,7 +283,8 @@
       "EVERYONE": "全員"
     },
     "ERROR": {
-      "DUPLICATE-PERMISSION": "設定済みの権限が既にあります: {{list}}"
+      "DUPLICATE-PERMISSION": "設定済みの権限が既にあります: {{list}}",
+      "NOT-ALLOWED": "権限を変更することはできません"
     }
   }
 }
\ No newline at end of file
diff --git a/lib/content-services/i18n/nb.json b/lib/content-services/i18n/nb.json
index a5229cc979..ac873b19d2 100644
--- a/lib/content-services/i18n/nb.json
+++ b/lib/content-services/i18n/nb.json
@@ -283,7 +283,8 @@
       "EVERYONE": "Alle"
     },
     "ERROR": {
-      "DUPLICATE-PERMISSION": "Én eller flere av tillatelsene du har angitt, er allerede til stede: {{list}}"
+      "DUPLICATE-PERMISSION": "Én eller flere av tillatelsene du har angitt, er allerede til stede: {{list}}",
+      "NOT-ALLOWED": "Du har ikke lov til å endre tillatelser"
     }
   }
 }
\ No newline at end of file
diff --git a/lib/content-services/i18n/nl.json b/lib/content-services/i18n/nl.json
index 72277811c9..2751c72cb8 100644
--- a/lib/content-services/i18n/nl.json
+++ b/lib/content-services/i18n/nl.json
@@ -283,7 +283,8 @@
       "EVERYONE": "Iedereen"
     },
     "ERROR": {
-      "DUPLICATE-PERMISSION": "Een of meerdere machtigingen die u hebt ingesteld zijn al aanwezig: {{list}}"
+      "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"
     }
   }
 }
\ No newline at end of file
diff --git a/lib/content-services/i18n/pt-BR.json b/lib/content-services/i18n/pt-BR.json
index e86538edfa..098d169f54 100644
--- a/lib/content-services/i18n/pt-BR.json
+++ b/lib/content-services/i18n/pt-BR.json
@@ -283,7 +283,8 @@
       "EVERYONE": "Todos"
     },
     "ERROR": {
-      "DUPLICATE-PERMISSION": "Uma ou mais permissões definidas já está presente: {{list}}"
+      "DUPLICATE-PERMISSION": "Uma ou mais permissões definidas já está presente: {{list}}",
+      "NOT-ALLOWED": "Você não pode alterar permissões"
     }
   }
 }
\ No newline at end of file
diff --git a/lib/content-services/i18n/ru.json b/lib/content-services/i18n/ru.json
index 9eda237f9c..ec5cf398af 100644
--- a/lib/content-services/i18n/ru.json
+++ b/lib/content-services/i18n/ru.json
@@ -283,7 +283,8 @@
       "EVERYONE": "Вcе"
     },
     "ERROR": {
-      "DUPLICATE-PERMISSION": "Одно или несколько установленных вами разрешений уже присутствует: {{list}}"
+      "DUPLICATE-PERMISSION": "Одно или несколько установленных вами разрешений уже присутствует: {{list}}",
+      "NOT-ALLOWED": "У вас нет прав на изменение разрешений"
     }
   }
 }
\ No newline at end of file
diff --git a/lib/content-services/i18n/zh-CN.json b/lib/content-services/i18n/zh-CN.json
index 856f589ddc..8c0b1d5b12 100644
--- a/lib/content-services/i18n/zh-CN.json
+++ b/lib/content-services/i18n/zh-CN.json
@@ -283,7 +283,8 @@
       "EVERYONE": "任何人"
     },
     "ERROR": {
-      "DUPLICATE-PERMISSION": "您所设置的一个或多个权限已经存在：{{list}}"
+      "DUPLICATE-PERMISSION": "您所设置的一个或多个权限已经存在：{{list}}",
+      "NOT-ALLOWED": "不允许更改权限"
     }
   }
 }
\ No newline at end of file
diff --git a/lib/content-services/karma-test-shim.js b/lib/content-services/karma-test-shim.js
deleted file mode 100644
index 2da62e2cc0..0000000000
--- a/lib/content-services/karma-test-shim.js
+++ /dev/null
@@ -1,25 +0,0 @@
-Error.stackTraceLimit = Infinity;
-
-require('core-js/es6');
-require('core-js/es7/reflect');
-
-require('zone.js/dist/zone');
-require('zone.js/dist/long-stack-trace-zone');
-require('zone.js/dist/proxy');
-require('zone.js/dist/sync-test');
-require('zone.js/dist/jasmine-patch');
-require('zone.js/dist/async-test');
-require('zone.js/dist/fake-async-test');
-
-jasmine.DEFAULT_TIMEOUT_INTERVAL = 20000;
-
-var appContext = require.context(".", true, /.spec.ts/);
-appContext.keys().forEach(appContext);
-
-const TestBed = require('@angular/core/testing').TestBed;
-const browser = require('@angular/platform-browser-dynamic/testing');
-
-TestBed.initTestEnvironment(
-    browser.BrowserDynamicTestingModule,
-    browser.platformBrowserDynamicTesting()
-);
diff --git a/lib/content-services/karma.conf.js b/lib/content-services/karma.conf.js
new file mode 100644
index 0000000000..43ba16540a
--- /dev/null
+++ b/lib/content-services/karma.conf.js
@@ -0,0 +1,92 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/config/configuration-file.html
+
+module.exports = function (config) {
+    config.set({
+        basePath: '',
+
+        files: [
+            {pattern: '../../node_modules/core-js/client/core.js', included: true, watched: false},
+            {pattern: '../../node_modules/tslib/tslib.js', included: true, watched: false},
+            {pattern: '../../node_modules/hammerjs/hammer.min.js', included: true, watched: false},
+            {pattern: '../../node_modules/hammerjs/hammer.min.js.map', included: false, watched: false},
+
+            // pdf-js
+            {pattern: '../../node_modules/pdfjs-dist/build/pdf.js', included: true, watched: false},
+            {pattern: '../../node_modules/pdfjs-dist/build/pdf.worker.js', included: true, watched: false},
+            {pattern: '../../node_modules/pdfjs-dist/web/pdf_viewer.js', included: true, watched: false},
+
+            {
+                pattern: '../../node_modules/@angular/material/prebuilt-themes/indigo-pink.css',
+                included: true,
+                watched: false
+            },
+
+            {pattern: '../../node_modules/alfresco-js-api/dist/alfresco-js-api.min.js', included: true, watched: false},
+            {pattern: '../../node_modules/moment/min/moment.min.js', included: true, watched: false},
+
+            {pattern: './i18n/**/en.json', included: false, served: true, watched: false},
+
+            {pattern: './**/*.ts', included: false, served: true, watched: false},
+
+            {pattern: './app.config.json', included: false, served: true, watched: false},
+        ],
+
+        frameworks: ['jasmine-ajax', 'jasmine', '@angular-devkit/build-angular'],
+
+        proxies: {
+            '/base/assets/' :'/base/assets/',
+            '/assets/adf-content-services/i18n/en.json': '/base/i18n/en.json',
+            '/app.config.json': '/base/app.config.json'
+        },
+
+        plugins: [
+            require('karma-jasmine-ajax'),
+            require('karma-jasmine'),
+            require('karma-chrome-launcher'),
+            require('karma-jasmine-html-reporter'),
+            require('karma-coverage-istanbul-reporter'),
+            require('@angular-devkit/build-angular/plugins/karma'),
+            require('karma-mocha-reporter')
+        ],
+        client: {
+            clearContext: false // leave Jasmine Spec Runner output visible in browser
+        },
+        coverageIstanbulReporter: {
+            dir: './lib/coverage/content-services/',
+            reports: ['html', 'lcovonly'],
+            fixWebpackSourcePaths: true
+        },
+
+        // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+        logLevel: config.LOG_DEBUG,
+
+        colors: true,
+
+        autoWatch: false,
+
+        browserDisconnectTimeout: 200000,
+        browserNoActivityTimeout: 2400000,
+        captureTimeout: 1200000,
+
+        customLaunchers: {
+            ChromeHeadless: {
+                base: 'Chrome',
+                flags: [
+                    '--no-sandbox',
+                    '--headless',
+                    '--disable-gpu',
+                    '--remote-debugging-port=9222'
+                ]
+            }
+        },
+
+        reporters: ['mocha', 'kjhtml'],
+        port: 9876,
+        colors: true,
+        logLevel: config.LOG_INFO,
+        autoWatch: true,
+        browsers: ['Chrome'],
+        singleRun: false
+    });
+};
diff --git a/lib/content-services/mock/document-list.service.mock.ts b/lib/content-services/mock/document-list.service.mock.ts
index aedc992a2c..c09028a023 100644
--- a/lib/content-services/mock/document-list.service.mock.ts
+++ b/lib/content-services/mock/document-list.service.mock.ts
@@ -19,7 +19,7 @@ import {
     AlfrescoApiService, AuthenticationService, ContentService,
     SettingsService, LogService, ThumbnailService
 } from '@alfresco/adf-core';
-import { Observable } from 'rxjs/Observable';
+import { Observable, throwError } from 'rxjs';
 import { NodePaging, DocumentListService } from '../document-list';
 import { PageNode } from './document-library.model.mock';
 
@@ -40,7 +40,7 @@ export class DocumentListServiceMock extends DocumentListService {
 
     getFolder(folder: string) {
         if (this.getFolderReject) {
-            return Observable.throw(this.getFolderRejectError);
+            return throwError(this.getFolderRejectError);
         }
         return Observable.create(observer => {
             observer.next(this.getFolderResult);
diff --git a/lib/content-services/ng-package.json b/lib/content-services/ng-package.json
index aa14e21874..95379c51f5 100644
--- a/lib/content-services/ng-package.json
+++ b/lib/content-services/ng-package.json
@@ -1,12 +1,10 @@
 {
   "$schema": "./node_modules/ng-packagr/ng-package.schema.json",
-  "whitelistedNonPeerDependencies": [ "." ],
   "workingDirectory" : "./ng_work",
   "src": "../content-services/",
   "dest": "../dist/content-services/",
   "lib": {
     "languageLevel": [ "dom", "es2016" ],
-    "licensePath": "../config/assets/license_header_add.txt",
     "comments" : "none",
     "entryFile": "./public-api.ts",
     "flatModuleFile": "adf-content-services",
diff --git a/lib/content-services/package.json b/lib/content-services/package.json
index 0e08ce2199..f54fa00a73 100644
--- a/lib/content-services/package.json
+++ b/lib/content-services/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@alfresco/adf-content-services",
   "description": "Alfresco ADF content services",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "author": "Alfresco Software, Ltd.",
   "main": "bundles/adf-content-services.js",
   "repository": {
@@ -11,37 +11,28 @@
   "bugs": {
     "url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
   },
-  "dependencies": {
-    "@angular/animations": "5.1.1",
-    "@angular/cdk": "5.0.1",
-    "@angular/common": "5.1.1",
-    "@angular/compiler": "5.1.1",
-    "@angular/core": "5.1.1",
-    "@angular/flex-layout": "2.0.0-beta.12",
-    "@angular/forms": "5.1.1",
-    "@angular/http": "5.1.1",
-    "@angular/material": "5.0.1",
-    "@angular/material-moment-adapter": "5.0.1",
-    "@angular/platform-browser": "5.1.1",
-    "@angular/platform-browser-dynamic": "5.1.1",
-    "@angular/router": "5.1.1",
-    "@ngx-translate/core": "9.1.1",
-    "alfresco-js-api": "2.4.0",
-    "@alfresco/adf-core": "2.4.0",
-    "chart.js": "2.5.0",
-    "core-js": "2.4.1",
+  "peerDependencies": {
+    "@angular/animations": ">=5.1.1",
+    "@angular/cdk": ">=5.1.1",
+    "@angular/common": ">=5.1.1",
+    "@angular/compiler": ">=5.1.1",
+    "@angular/core": ">=5.1.1",
+    "@angular/flex-layout": ">=5.1.1",
+    "@angular/forms": ">=5.1.1",
+    "@angular/http": ">=5.1.1",
+    "@angular/material": ">=5.1.1",
+    "@angular/material-moment-adapter": ">=5.1.1",
+    "@angular/platform-browser": ">=5.1.1",
+    "@angular/platform-browser-dynamic": ">=5.1.1",
+    "@angular/router": ">=5.1.1",
+    "alfresco-js-api": "2.5.0",
+    "rxjs": ">=6.2.2",
+    "@alfresco/adf-core": "2.5.0",
+    "@ngx-translate/core": "^10.0.2",
     "hammerjs": "2.0.8",
-    "minimatch": "3.0.4",
-    "moment": "2.20.1",
-    "ng2-charts": "1.6.0",
-    "pdfjs-dist": "1.5.404",
-    "raphael": "2.2.7",
+    "moment": "^2.22.2",
     "reflect-metadata": "0.1.10",
-    "rxjs": "5.5.2",
-    "systemjs": "0.19.27",
-    "zone.js": "0.8.14"
-  },
-  "devDependencies": {
+    "zone.js": "^0.8.26"
   },
   "keywords": [
     "content-services",
diff --git a/lib/content-services/permission-manager/components/add-permission/add-permission-dialog-data.interface.ts b/lib/content-services/permission-manager/components/add-permission/add-permission-dialog-data.interface.ts
index 37282feb84..ea447103b9 100644
--- a/lib/content-services/permission-manager/components/add-permission/add-permission-dialog-data.interface.ts
+++ b/lib/content-services/permission-manager/components/add-permission/add-permission-dialog-data.interface.ts
@@ -16,7 +16,7 @@
  */
 
 import { MinimalNodeEntity } from 'alfresco-js-api';
-import { Subject } from 'rxjs/Subject';
+import { Subject } from 'rxjs';
 
 export interface AddPermissionDialogData {
     title?: string;
diff --git a/lib/content-services/permission-manager/components/add-permission/add-permission-dialog.component.spec.ts b/lib/content-services/permission-manager/components/add-permission/add-permission-dialog.component.spec.ts
index b523e751d4..963cec9844 100644
--- a/lib/content-services/permission-manager/components/add-permission/add-permission-dialog.component.spec.ts
+++ b/lib/content-services/permission-manager/components/add-permission/add-permission-dialog.component.spec.ts
@@ -23,7 +23,7 @@ import { By } from '@angular/platform-browser';
 import { setupTestBed } from '@alfresco/adf-core';
 import { AddPermissionDialogComponent } from './add-permission-dialog.component';
 import { MinimalNodeEntity } from 'alfresco-js-api';
-import { Subject } from 'rxjs/Subject';
+import { Subject } from 'rxjs';
 import { AddPermissionDialogData } from './add-permission-dialog-data.interface';
 import { fakeAuthorityResults } from '../../../mock/add-permission.component.mock';
 import { AddPermissionPanelComponent } from './add-permission-panel.component';
diff --git a/lib/content-services/permission-manager/components/add-permission/add-permission-panel.component.spec.ts b/lib/content-services/permission-manager/components/add-permission/add-permission-panel.component.spec.ts
index 638f9b0479..3495628b30 100644
--- a/lib/content-services/permission-manager/components/add-permission/add-permission-panel.component.spec.ts
+++ b/lib/content-services/permission-manager/components/add-permission/add-permission-panel.component.spec.ts
@@ -19,7 +19,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { AddPermissionPanelComponent } from './add-permission-panel.component';
 import { By } from '@angular/platform-browser';
 import { SearchService, setupTestBed, SearchConfigurationService } from '@alfresco/adf-core';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 import { fakeAuthorityListResult } from '../../../mock/add-permission.component.mock';
 import { ContentTestingModule } from '../../../testing/content.testing.module';
 import { DebugElement } from '@angular/core';
@@ -63,7 +63,7 @@ describe('AddPermissionPanelComponent', () => {
 
     it('should show search results when user types something', async(() => {
         searchApiService = fixture.componentRef.injector.get(SearchService);
-        spyOn(searchApiService, 'search').and.returnValue(Observable.of(fakeAuthorityListResult));
+        spyOn(searchApiService, 'search').and.returnValue(of(fakeAuthorityListResult));
         expect(element.querySelector('#adf-add-permission-type-search')).not.toBeNull();
         expect(element.querySelector('#searchInput')).not.toBeNull();
         typeWordIntoSearchInput('a');
@@ -77,7 +77,7 @@ describe('AddPermissionPanelComponent', () => {
 
     it('should emit a select event with the selected items when an item is clicked', async(() => {
         searchApiService = fixture.componentRef.injector.get(SearchService);
-        spyOn(searchApiService, 'search').and.returnValue(Observable.of(fakeAuthorityListResult));
+        spyOn(searchApiService, 'search').and.returnValue(of(fakeAuthorityListResult));
         component.select.subscribe((items) => {
             expect(items).not.toBeNull();
             expect(items[0].entry.id).toBeDefined();
@@ -97,7 +97,7 @@ describe('AddPermissionPanelComponent', () => {
 
     it('should show the icon related on the nodeType', async(() => {
         searchApiService = fixture.componentRef.injector.get(SearchService);
-        spyOn(searchApiService, 'search').and.returnValue(Observable.of(fakeAuthorityListResult));
+        spyOn(searchApiService, 'search').and.returnValue(of(fakeAuthorityListResult));
         expect(element.querySelector('#adf-add-permission-type-search')).not.toBeNull();
         expect(element.querySelector('#searchInput')).not.toBeNull();
         typeWordIntoSearchInput('a');
@@ -114,7 +114,7 @@ describe('AddPermissionPanelComponent', () => {
 
     it('should clear the search when user delete the search input field', async(() => {
         searchApiService = fixture.componentRef.injector.get(SearchService);
-        spyOn(searchApiService, 'search').and.returnValue(Observable.of(fakeAuthorityListResult));
+        spyOn(searchApiService, 'search').and.returnValue(of(fakeAuthorityListResult));
         expect(element.querySelector('#adf-add-permission-type-search')).not.toBeNull();
         expect(element.querySelector('#searchInput')).not.toBeNull();
         typeWordIntoSearchInput('a');
@@ -135,7 +135,7 @@ describe('AddPermissionPanelComponent', () => {
 
     it('should remove element from selection when is clicked and already selected', async(() => {
         searchApiService = fixture.componentRef.injector.get(SearchService);
-        spyOn(searchApiService, 'search').and.returnValue(Observable.of(fakeAuthorityListResult));
+        spyOn(searchApiService, 'search').and.returnValue(of(fakeAuthorityListResult));
         component.selectedItems.push(fakeAuthorityListResult.list.entries[0]);
         component.select.subscribe((items) => {
             expect(items).not.toBeNull();
@@ -155,7 +155,7 @@ describe('AddPermissionPanelComponent', () => {
 
     it('should always show as extra result the everyone group', async(() => {
         searchApiService = fixture.componentRef.injector.get(SearchService);
-        spyOn(searchApiService, 'search').and.returnValue(Observable.of(fakeAuthorityListResult));
+        spyOn(searchApiService, 'search').and.returnValue(of(fakeAuthorityListResult));
         component.selectedItems.push(fakeAuthorityListResult.list.entries[0]);
 
         typeWordIntoSearchInput('a');
@@ -174,7 +174,7 @@ describe('AddPermissionPanelComponent', () => {
 
     it('should show everyone group when search return no result', async(() => {
         searchApiService = fixture.componentRef.injector.get(SearchService);
-        spyOn(searchApiService, 'search').and.returnValue(Observable.of({ list: { entries: [] } }));
+        spyOn(searchApiService, 'search').and.returnValue(of({ list: { entries: [] } }));
         component.selectedItems.push(fakeAuthorityListResult.list.entries[0]);
 
         typeWordIntoSearchInput('a');
diff --git a/lib/content-services/permission-manager/components/add-permission/add-permission.component.html b/lib/content-services/permission-manager/components/add-permission/add-permission.component.html
index 99d3792e9d..3400e9c2b5 100644
--- a/lib/content-services/permission-manager/components/add-permission/add-permission.component.html
+++ b/lib/content-services/permission-manager/components/add-permission/add-permission.component.html
@@ -5,7 +5,7 @@
    <button mat-button
           id="adf-add-permission-action-button"
           class="adf-permission-action"
-          [disabled]="selectedItems?.length === 0"
+          [disabled]="!isAddEnabled()"
           (click)="applySelection()">
      {{'PERMISSION_MANAGER.ADD-PERMISSION.ADD-ACTION' | translate}}
     </button>
diff --git a/lib/content-services/permission-manager/components/add-permission/add-permission.component.spec.ts b/lib/content-services/permission-manager/components/add-permission/add-permission.component.spec.ts
index 71c3f28321..6ed549e30c 100644
--- a/lib/content-services/permission-manager/components/add-permission/add-permission.component.spec.ts
+++ b/lib/content-services/permission-manager/components/add-permission/add-permission.component.spec.ts
@@ -19,8 +19,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { AddPermissionComponent } from './add-permission.component';
 import { AddPermissionPanelComponent } from './add-permission-panel.component';
 import { By } from '@angular/platform-browser';
-import { setupTestBed } from '@alfresco/adf-core';
-import { Observable } from 'rxjs/Observable';
+import { setupTestBed, NodesApiService } from '@alfresco/adf-core';
+import { of, throwError } from 'rxjs';
 import { fakeAuthorityResults } from '../../../mock/add-permission.component.mock';
 import { ContentTestingModule } from '../../../testing/content.testing.module';
 import { NodePermissionService } from '../../services/node-permission.service';
@@ -30,6 +30,7 @@ describe('AddPermissionComponent', () => {
     let fixture: ComponentFixture<AddPermissionComponent>;
     let element: HTMLElement;
     let nodePermissionService: NodePermissionService;
+    let nodeApiService: NodesApiService;
 
     setupTestBed({
         imports: [
@@ -38,6 +39,8 @@ describe('AddPermissionComponent', () => {
     });
 
     beforeEach(() => {
+        nodeApiService  = TestBed.get(NodesApiService);
+        spyOn(nodeApiService, 'getNode').and.returnValue(of({ id: 'fake-node', allowableOperations: ['updatePermissions']}));
         fixture = TestBed.createComponent(AddPermissionComponent);
         element = fixture.nativeElement;
         nodePermissionService = TestBed.get(NodePermissionService);
@@ -67,12 +70,24 @@ describe('AddPermissionComponent', () => {
         });
     }));
 
-    it('should emit a success event when the node is updated', async(() => {
+    it('should NOT enable the ADD button when a selection is sent but the user does not have the permissions', async(() => {
+        const addPermissionPanelComponent: AddPermissionPanelComponent = fixture.debugElement.query(By.directive(AddPermissionPanelComponent)).componentInstance;
+        addPermissionPanelComponent.select.emit(fakeAuthorityResults);
+        fixture.componentInstance.currentNode = {id: 'fake-node-id'};
+        fixture.whenStable().then(() => {
+            fixture.detectChanges();
+            const addButton: HTMLButtonElement = <HTMLButtonElement> element.querySelector('#adf-add-permission-action-button');
+            expect(addButton.disabled).toBeTruthy();
+        });
+    }));
+
+    it('should emit a success event when the node is updated', (done) => {
         fixture.componentInstance.selectedItems = fakeAuthorityResults;
-        spyOn(nodePermissionService, 'updateNodePermissions').and.returnValue(Observable.of({ id: 'fake-node-id'}));
+        spyOn(nodePermissionService, 'updateNodePermissions').and.returnValue(of({ id: 'fake-node-id'}));
 
         fixture.componentInstance.success.subscribe((node) => {
             expect(node.id).toBe('fake-node-id');
+            done();
         });
 
         fixture.detectChanges();
@@ -81,14 +96,25 @@ describe('AddPermissionComponent', () => {
             const addButton: HTMLButtonElement = <HTMLButtonElement> element.querySelector('#adf-add-permission-action-button');
             addButton.click();
         });
-    }));
+    });
 
-    it('should emit an error event when the node update fail', async(() => {
+    it('should NOT emit a success event when the user does not have permission to update the node', () => {
         fixture.componentInstance.selectedItems = fakeAuthorityResults;
-        spyOn(nodePermissionService, 'updateNodePermissions').and.returnValue(Observable.throw({ error: 'errored'}));
+        fixture.componentInstance.currentNode = { id: 'fake-node-id' };
+        spyOn(nodePermissionService, 'updateNodePermissions').and.returnValue(of({ id: 'fake-node-id' }));
+
+        let spySuccess = spyOn(fixture.componentInstance, 'success');
+        fixture.componentInstance.applySelection();
+        expect(spySuccess).not.toHaveBeenCalled();
+    });
+
+    it('should emit an error event when the node update fail', (done) => {
+        fixture.componentInstance.selectedItems = fakeAuthorityResults;
+        spyOn(nodePermissionService, 'updateNodePermissions').and.returnValue(throwError({ error: 'errored'}));
 
         fixture.componentInstance.error.subscribe((error) => {
             expect(error.error).toBe('errored');
+            done();
         });
 
         fixture.detectChanges();
@@ -97,6 +123,6 @@ describe('AddPermissionComponent', () => {
             const addButton: HTMLButtonElement = <HTMLButtonElement> element.querySelector('#adf-add-permission-action-button');
             addButton.click();
         });
-    }));
+    });
 
 });
diff --git a/lib/content-services/permission-manager/components/add-permission/add-permission.component.ts b/lib/content-services/permission-manager/components/add-permission/add-permission.component.ts
index f5e60bd87f..1fae58ecad 100644
--- a/lib/content-services/permission-manager/components/add-permission/add-permission.component.ts
+++ b/lib/content-services/permission-manager/components/add-permission/add-permission.component.ts
@@ -18,6 +18,7 @@
 import { Component, ViewEncapsulation, EventEmitter, Input, Output } from '@angular/core';
 import { MinimalNodeEntity, MinimalNodeEntryEntity } from 'alfresco-js-api';
 import { NodePermissionService } from '../../services/node-permission.service';
+import { NodesApiService, ContentService, PermissionsEnum } from '@alfresco/adf-core';
 
 @Component({
     selector: 'adf-add-permission',
@@ -43,22 +44,32 @@ export class AddPermissionComponent {
     currentNode: MinimalNodeEntryEntity;
     currentNodeRoles: string[];
 
-    constructor(private nodePermissionService: NodePermissionService) {
+    constructor(private nodePermissionService: NodePermissionService,
+                private nodeApiService: NodesApiService,
+                private contentService: ContentService) {
+        this.nodeApiService.getNode(this.nodeId).subscribe((node) => this.currentNode = node);
     }
 
     onSelect(selection: MinimalNodeEntity[]) {
         this.selectedItems = selection;
     }
 
+    isAddEnabled(): boolean {
+        return this.contentService.hasPermission(this.currentNode, PermissionsEnum.UPDATEPERMISSIONS) &&
+                this.selectedItems.length !== 0;
+    }
+
     applySelection() {
-        this.nodePermissionService.updateNodePermissions(this.nodeId, this.selectedItems)
-            .subscribe(
-                (node) => {
-                    this.success.emit(node);
-                },
-                (error) => {
-                    this.error.emit(error);
-                });
+        if (this.contentService.hasPermission(this.currentNode, PermissionsEnum.UPDATEPERMISSIONS)) {
+            this.nodePermissionService.updateNodePermissions(this.nodeId, this.selectedItems)
+                .subscribe(
+                    (node) => {
+                        this.success.emit(node);
+                    },
+                    (error) => {
+                        this.error.emit(error);
+                    });
+        }
     }
 
 }
diff --git a/lib/content-services/permission-manager/components/inherited-button.directive.spec.ts b/lib/content-services/permission-manager/components/inherited-button.directive.spec.ts
index 4828b39779..cf7f2f4942 100644
--- a/lib/content-services/permission-manager/components/inherited-button.directive.spec.ts
+++ b/lib/content-services/permission-manager/components/inherited-button.directive.spec.ts
@@ -19,10 +19,11 @@ import { SimpleInheritedPermissionTestComponent } from '../../mock/inherited-per
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { InheritPermissionDirective } from './inherited-button.directive';
 import { NodesApiService, setupTestBed, CoreModule } from '@alfresco/adf-core';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 
-const fakeNodeWithInherit: any = { id: 'fake-id', permissions : {isInheritanceEnabled : true}};
-const fakeNodeNoInherit: any = { id: 'fake-id', permissions : {isInheritanceEnabled : false}};
+const fakeNodeWithInherit: any = { id: 'fake-id', permissions : {isInheritanceEnabled : true}, allowableOperations: ['updatePermissions']};
+const fakeNodeNoInherit: any = { id: 'fake-id', permissions : {isInheritanceEnabled : false}, allowableOperations: ['updatePermissions']};
+const fakeNodeWithInheritNoPermission: any = { id: 'fake-id', permissions : {isInheritanceEnabled : true}};
 
 describe('InheritPermissionDirective', () => {
 
@@ -55,12 +56,12 @@ describe('InheritPermissionDirective', () => {
     }));
 
     it('should be able to add inherited permission', async(() => {
-        spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeNoInherit));
+        spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeNoInherit));
         spyOn(nodeService, 'updateNode').and.callFake((nodeId, nodeBody) => {
             if (nodeBody.permissions.isInheritanceEnabled) {
-                return Observable.of(fakeNodeWithInherit);
+                return of(fakeNodeWithInherit);
             } else {
-                return Observable.of(fakeNodeNoInherit);
+                return of(fakeNodeNoInherit);
             }
         });
         fixture.detectChanges();
@@ -75,12 +76,12 @@ describe('InheritPermissionDirective', () => {
     }));
 
     it('should be able to remove inherited permission', async(() => {
-        spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeWithInherit));
+        spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeWithInherit));
         spyOn(nodeService, 'updateNode').and.callFake((nodeId, nodeBody) => {
             if (nodeBody.permissions.isInheritanceEnabled) {
-                return Observable.of(fakeNodeWithInherit);
+                return of(fakeNodeWithInherit);
             } else {
-                return Observable.of(fakeNodeNoInherit);
+                return of(fakeNodeNoInherit);
             }
         });
         component.updatedNode = true;
@@ -95,4 +96,19 @@ describe('InheritPermissionDirective', () => {
         });
     }));
 
+    it('should not update the node when node has no permission', async(() => {
+        spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeWithInheritNoPermission));
+        let spyUpdateNode = spyOn(nodeService, 'updateNode');
+        component.updatedNode = true;
+        fixture.detectChanges();
+        const buttonPermission: HTMLButtonElement = <HTMLButtonElement> element.querySelector('#sample-button-permission');
+        expect(buttonPermission).not.toBeNull();
+        expect(element.querySelector('#update-notification')).not.toBeNull();
+        buttonPermission.click();
+        fixture.detectChanges();
+        fixture.whenStable().then(() => {
+            expect(spyUpdateNode).not.toHaveBeenCalled();
+        });
+    }));
+
 });
diff --git a/lib/content-services/permission-manager/components/inherited-button.directive.ts b/lib/content-services/permission-manager/components/inherited-button.directive.ts
index 9bc1c3faa9..12d4adbb71 100644
--- a/lib/content-services/permission-manager/components/inherited-button.directive.ts
+++ b/lib/content-services/permission-manager/components/inherited-button.directive.ts
@@ -17,7 +17,7 @@
 
 /* tslint:disable:no-input-rename  */
 import { Directive, Input, Output, EventEmitter } from '@angular/core';
-import { NodesApiService } from '@alfresco/adf-core';
+import { NodesApiService, ContentService, PermissionsEnum } from '@alfresco/adf-core';
 import { MinimalNodeEntryEntity } from 'alfresco-js-api';
 
 @Directive({
@@ -38,15 +38,20 @@ export class InheritPermissionDirective {
     @Output()
     error: EventEmitter<any> = new EventEmitter<any>();
 
-    constructor(private nodeService: NodesApiService) {
+    constructor(private nodeService: NodesApiService,
+                private contentService: ContentService) {
     }
 
     onInheritPermissionClicked() {
         this.nodeService.getNode(this.nodeId).subscribe((node: MinimalNodeEntryEntity) => {
-            const nodeBody = { permissions: { isInheritanceEnabled: !node.permissions.isInheritanceEnabled } };
-            this.nodeService.updateNode(this.nodeId, nodeBody, { include: ['permissions'] }).subscribe((nodeUpdated: MinimalNodeEntryEntity) => {
-                this.updated.emit(nodeUpdated);
-            }, (error) => this.error.emit(error));
+            if (this.contentService.hasPermission(node, PermissionsEnum.UPDATEPERMISSIONS)) {
+                const nodeBody = { permissions: { isInheritanceEnabled: !node.permissions.isInheritanceEnabled } };
+                this.nodeService.updateNode(this.nodeId, nodeBody, { include: ['permissions'] }).subscribe((nodeUpdated: MinimalNodeEntryEntity) => {
+                    this.updated.emit(nodeUpdated);
+                }, (error) => this.error.emit(error));
+            } else {
+                this.error.emit('PERMISSION_MANAGER.ERROR.NOT-ALLOWED');
+            }
         });
     }
 
diff --git a/lib/content-services/permission-manager/components/permission-list/permission-list.component.spec.ts b/lib/content-services/permission-manager/components/permission-list/permission-list.component.spec.ts
index 3666623f2e..1475f00738 100644
--- a/lib/content-services/permission-manager/components/permission-list/permission-list.component.spec.ts
+++ b/lib/content-services/permission-manager/components/permission-list/permission-list.component.spec.ts
@@ -19,7 +19,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { PermissionListComponent } from './permission-list.component';
 import { By } from '@angular/platform-browser';
 import { NodesApiService, SearchService, setupTestBed } from '@alfresco/adf-core';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 import { NodePermissionService } from '../../services/node-permission.service';
 import { fakeNodeWithPermissions,
          fakeNodeInheritedOnly,
@@ -57,16 +57,16 @@ describe('PermissionDisplayComponent', () => {
     });
 
     it('should be able to render the component', () => {
-        spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeWithOnlyLocally));
-        spyOn(nodePermissionService, 'getNodeRoles').and.returnValue(Observable.of([]));
+        spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeWithOnlyLocally));
+        spyOn(nodePermissionService, 'getNodeRoles').and.returnValue(of([]));
         fixture.detectChanges();
         expect(element.querySelector('#adf-permission-display-container')).not.toBeNull();
     });
 
     it('should render default empty template when no permissions', () => {
         component.nodeId = 'fake-node-id';
-        spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeWithoutPermissions));
-        spyOn(searchApiService, 'searchByQueryBody').and.returnValue(Observable.of(fakeEmptyResponse));
+        spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeWithoutPermissions));
+        spyOn(searchApiService, 'searchByQueryBody').and.returnValue(of(fakeEmptyResponse));
         fixture.detectChanges();
 
         expect(element.querySelector('#adf-no-permissions-template')).not.toBeNull();
@@ -75,8 +75,8 @@ describe('PermissionDisplayComponent', () => {
 
     it('should show the node permissions', () => {
         component.nodeId = 'fake-node-id';
-        spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeWithPermissions));
-        spyOn(searchApiService, 'searchByQueryBody').and.returnValue(Observable.of(fakeEmptyResponse));
+        spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeWithPermissions));
+        spyOn(searchApiService, 'searchByQueryBody').and.returnValue(of(fakeEmptyResponse));
         fixture.detectChanges();
         expect(element.querySelector('#adf-permission-display-container')).not.toBeNull();
         expect(element.querySelectorAll('.adf-datatable-row').length).toBe(4);
@@ -84,8 +84,8 @@ describe('PermissionDisplayComponent', () => {
 
     it('should show inherited label for inherited permissions', () => {
         component.nodeId = 'fake-node-id';
-        spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeInheritedOnly));
-        spyOn(searchApiService, 'searchByQueryBody').and.returnValue(Observable.of(fakeEmptyResponse));
+        spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeInheritedOnly));
+        spyOn(searchApiService, 'searchByQueryBody').and.returnValue(of(fakeEmptyResponse));
         fixture.detectChanges();
         expect(element.querySelector('#adf-permission-display-container')).not.toBeNull();
         expect(element.querySelector('#adf-permission-inherited-label')).toBeDefined();
@@ -96,9 +96,9 @@ describe('PermissionDisplayComponent', () => {
 
         it('should show locally set label for locally set permissions',  () => {
             component.nodeId = 'fake-node-id';
-            spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeWithOnlyLocally));
-            spyOn(nodePermissionService, 'getGroupMemeberByGroupName').and.returnValue(Observable.of(fakeSiteRoles));
-            spyOn(searchApiService, 'searchByQueryBody').and.returnValue(Observable.of(fakeSiteNodeResponse));
+            spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeWithOnlyLocally));
+            spyOn(nodePermissionService, 'getGroupMemeberByGroupName').and.returnValue(of(fakeSiteRoles));
+            spyOn(searchApiService, 'searchByQueryBody').and.returnValue(of(fakeSiteNodeResponse));
             fixture.detectChanges();
             expect(element.querySelector('#adf-permission-display-container')).not.toBeNull();
             expect(element.querySelector('#adf-permission-locallyset-label')).toBeDefined();
@@ -107,9 +107,9 @@ describe('PermissionDisplayComponent', () => {
 
         it('should show a dropdown with the possible roles',  async(() => {
             component.nodeId = 'fake-node-id';
-            spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeWithOnlyLocally));
-            spyOn(nodePermissionService, 'getGroupMemeberByGroupName').and.returnValue(Observable.of(fakeSiteRoles));
-            spyOn(searchApiService, 'searchByQueryBody').and.returnValue(Observable.of(fakeSiteNodeResponse));
+            spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeWithOnlyLocally));
+            spyOn(nodePermissionService, 'getGroupMemeberByGroupName').and.returnValue(of(fakeSiteRoles));
+            spyOn(searchApiService, 'searchByQueryBody').and.returnValue(of(fakeSiteNodeResponse));
             fixture.detectChanges();
             fixture.whenStable().then(() => {
                 fixture.detectChanges();
@@ -133,8 +133,8 @@ describe('PermissionDisplayComponent', () => {
 
         it('should show the settable roles if the node is not in any site',  async(() => {
             component.nodeId = 'fake-node-id';
-            spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeWithOnlyLocally));
-            spyOn(searchApiService, 'searchByQueryBody').and.returnValue(Observable.of(fakeEmptyResponse));
+            spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeWithOnlyLocally));
+            spyOn(searchApiService, 'searchByQueryBody').and.returnValue(of(fakeEmptyResponse));
             fixture.detectChanges();
             fixture.whenStable().then(() => {
                 fixture.detectChanges();
@@ -159,9 +159,9 @@ describe('PermissionDisplayComponent', () => {
 
         it('should update the role when another value is chosen',  async(() => {
             component.nodeId = 'fake-node-id';
-            spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeWithOnlyLocally));
-            spyOn(nodeService, 'updateNode').and.returnValue(Observable.of({id: 'fake-updated-node'}));
-            spyOn(searchApiService, 'searchByQueryBody').and.returnValue(Observable.of(fakeEmptyResponse));
+            spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeWithOnlyLocally));
+            spyOn(nodeService, 'updateNode').and.returnValue(of({id: 'fake-updated-node'}));
+            spyOn(searchApiService, 'searchByQueryBody').and.returnValue(of(fakeEmptyResponse));
             component.update.subscribe((updatedPermission) => {
                 expect(updatedPermission).not.toBeNull();
                 expect(updatedPermission.name).toBe('Editor');
diff --git a/lib/content-services/permission-manager/permission-manager.module.ts b/lib/content-services/permission-manager/permission-manager.module.ts
index b64538de7e..0481cd0a22 100644
--- a/lib/content-services/permission-manager/permission-manager.module.ts
+++ b/lib/content-services/permission-manager/permission-manager.module.ts
@@ -18,28 +18,23 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { TranslateModule } from '@ngx-translate/core';
 import { MaterialModule } from '../material.module';
 import { PermissionListComponent } from './components/permission-list/permission-list.component';
 import { AddPermissionComponent } from './components/add-permission/add-permission.component';
 import { AddPermissionDialogComponent } from './components/add-permission/add-permission-dialog.component';
-import { DataTableModule, DataColumnModule } from '@alfresco/adf-core';
+import { CoreModule } from '@alfresco/adf-core';
 import { InheritPermissionDirective } from './components/inherited-button.directive';
-import { NodePermissionService } from './services/node-permission.service';
 import { NoPermissionTemplateComponent } from './components/permission-list/no-permission.component';
-import { NodePermissionDialogService } from './services/node-permission-dialog.service';
 import { AddPermissionPanelComponent } from './components/add-permission/add-permission-panel.component';
 import { SearchModule } from '../search/search.module';
 
 @NgModule({
     imports: [
+        CoreModule.forChild(),
         CommonModule,
         FormsModule,
         ReactiveFormsModule,
         MaterialModule,
-        TranslateModule,
-        DataTableModule,
-        DataColumnModule,
         SearchModule
     ],
     declarations: [
@@ -50,11 +45,11 @@ import { SearchModule } from '../search/search.module';
         AddPermissionComponent,
         AddPermissionDialogComponent
     ],
-    providers: [
-        NodePermissionDialogService,
-        NodePermissionService
+    entryComponents: [
+        AddPermissionPanelComponent,
+        AddPermissionComponent,
+        AddPermissionDialogComponent
     ],
-    entryComponents: [ AddPermissionPanelComponent, AddPermissionComponent, AddPermissionDialogComponent ],
     exports: [
         PermissionListComponent,
         NoPermissionTemplateComponent,
diff --git a/lib/content-services/permission-manager/services/node-permission-dialog.service.spec.ts b/lib/content-services/permission-manager/services/node-permission-dialog.service.spec.ts
index afcd3b7c17..a9b310cf98 100644
--- a/lib/content-services/permission-manager/services/node-permission-dialog.service.spec.ts
+++ b/lib/content-services/permission-manager/services/node-permission-dialog.service.spec.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { TestBed, async } from '@angular/core/testing';
-import { AppConfigService, setupTestBed } from '@alfresco/adf-core';
+import { TestBed } from '@angular/core/testing';
+import { AppConfigService, setupTestBed, ContentService } from '@alfresco/adf-core';
 import { NodePermissionDialogService } from './node-permission-dialog.service';
 import { MatDialog } from '@angular/material';
-import { Observable } from 'rxjs/Observable';
-import { Subject } from 'rxjs/Subject';
+import { Subject, of, throwError } from 'rxjs';
 import { ContentTestingModule } from '../../testing/content.testing.module';
 import { NodePermissionService } from './node-permission.service';
+import { Node } from 'alfresco-js-api';
 
 describe('NodePermissionDialogService', () => {
 
@@ -31,6 +31,7 @@ describe('NodePermissionDialogService', () => {
     let spyOnDialogOpen: jasmine.Spy;
     let afterOpenObservable: Subject<any>;
     let nodePermissionService: NodePermissionService;
+    let contentService: ContentService;
 
     setupTestBed({
         imports: [ContentTestingModule],
@@ -44,9 +45,10 @@ describe('NodePermissionDialogService', () => {
         materialDialog = TestBed.get(MatDialog);
         afterOpenObservable = new Subject<any>();
         nodePermissionService = TestBed.get(NodePermissionService);
+        contentService = TestBed.get(ContentService);
         spyOnDialogOpen = spyOn(materialDialog, 'open').and.returnValue({
             afterOpen: () => afterOpenObservable,
-            afterClosed: () => Observable.of({}),
+            afterClosed: () => of({}),
             componentInstance: {
                 error: new Subject<any>()
             }
@@ -57,27 +59,65 @@ describe('NodePermissionDialogService', () => {
         expect(service).not.toBeNull();
     });
 
-    it('should be able to open the dialog showing node permissions', () => {
-        service.openAddPermissionDialog('fake-node-id', 'fake-title');
-        expect(spyOnDialogOpen).toHaveBeenCalled();
+    describe('when node has permission to update permissions', () => {
+
+        let fakePermissionNode = {};
+
+        beforeEach(() => {
+            fakePermissionNode = <Node> { id: 'fake-permission-node', allowableOperations: ['updatePermissions']};
+        });
+
+        it('should be able to open the dialog showing node permissions', () => {
+            service.openAddPermissionDialog(fakePermissionNode, 'fake-title');
+            expect(spyOnDialogOpen).toHaveBeenCalled();
+        });
+
+        it('should return the updated node', (done) => {
+            spyOn(nodePermissionService, 'updateNodePermissions').and.returnValue(of({id : 'fake-node-updated'}));
+            spyOn(service, 'openAddPermissionDialog').and.returnValue(of({}));
+            spyOn(contentService, 'getNode').and.returnValue(of(fakePermissionNode));
+            service.updateNodePermissionByDialog('fake-node-id', 'fake-title').subscribe((node) => {
+                expect(node.id).toBe('fake-node-updated');
+                done();
+            });
+        });
+
+        it('should throw an error if the update of the node fails', (done) => {
+            spyOn(nodePermissionService, 'updateNodePermissions').and.returnValue(throwError({error : 'error'}));
+            spyOn(service, 'openAddPermissionDialog').and.returnValue(of({}));
+            spyOn(contentService, 'getNode').and.returnValue(of(fakePermissionNode));
+            service.updateNodePermissionByDialog('fake-node-id', 'fake-title').subscribe(() => {
+                throwError('This call should fail');
+            }, (error) => {
+                expect(error.error).toBe('error');
+                done();
+            });
+        });
     });
 
-    it('should throw an error if the update of the node fails', async(() => {
-        spyOn(nodePermissionService, 'updateNodePermissions').and.returnValue(Observable.throw({error : 'error'}));
-        spyOn(service, 'openAddPermissionDialog').and.returnValue(Observable.of({}));
-        service.updateNodePermissionByDialog('fake-node-id', 'fake-title').subscribe(() => {
-            Observable.throw('This call should fail');
-        }, (error) => {
-            expect(error.error).toBe('error');
-        });
-    }));
+    describe('when node does not have permission to update permissions', () => {
 
-    it('should return the updated node', async(() => {
-        spyOn(nodePermissionService, 'updateNodePermissions').and.returnValue(Observable.of({id : 'fake-node'}));
-        spyOn(service, 'openAddPermissionDialog').and.returnValue(Observable.of({}));
-        service.updateNodePermissionByDialog('fake-node-id', 'fake-title').subscribe((node) => {
-            expect(node.id).toBe('fake-node');
-        });
-    }));
+        let fakeForbiddenNode = {};
 
+        beforeEach(() => {
+            fakeForbiddenNode = <Node> { id: 'fake-permission-node', allowableOperations: ['update']};
+        });
+
+        it('should not be able to open the dialog showing node permissions', () => {
+            service.openAddPermissionDialog(fakeForbiddenNode, 'fake-title');
+            expect(spyOnDialogOpen).not.toHaveBeenCalled();
+        });
+
+        it('should return the updated node', (done) => {
+            spyOn(contentService, 'getNode').and.returnValue(of(fakeForbiddenNode));
+            service.updateNodePermissionByDialog('fake-node-id', 'fake-title').subscribe((node) => {
+                throwError('This call should fail');
+            },
+            (error) => {
+                expect(error.message).toBe('PERMISSION_MANAGER.ERROR.NOT-ALLOWED');
+                done();
+            });
+        });
+
+    });
 });
diff --git a/lib/content-services/permission-manager/services/node-permission-dialog.service.ts b/lib/content-services/permission-manager/services/node-permission-dialog.service.ts
index fa6de27a9b..043ac1506b 100644
--- a/lib/content-services/permission-manager/services/node-permission-dialog.service.ts
+++ b/lib/content-services/permission-manager/services/node-permission-dialog.service.ts
@@ -17,18 +17,20 @@
 
 import { MatDialog } from '@angular/material';
 import { Injectable } from '@angular/core';
-import { Subject } from 'rxjs/Subject';
-import { Observable } from 'rxjs/Observable';
+import { Subject, Observable, throwError } from 'rxjs';
 import { AddPermissionDialogComponent } from '../components/add-permission/add-permission-dialog.component';
 import { AddPermissionDialogData } from '../components/add-permission/add-permission-dialog-data.interface';
-import { MinimalNodeEntity, MinimalNodeEntryEntity } from 'alfresco-js-api';
+import { MinimalNodeEntity, MinimalNodeEntryEntity, Node } from 'alfresco-js-api';
 import { NodePermissionService } from './node-permission.service';
+import { ContentService, PermissionsEnum } from '@alfresco/adf-core';
+import { switchMap } from 'rxjs/operators';
 
 @Injectable()
 export class NodePermissionDialogService {
 
     constructor(private dialog: MatDialog,
-                private nodePermissionService: NodePermissionService) {
+                private nodePermissionService: NodePermissionService,
+                private contentService: ContentService) {
     }
 
     /**
@@ -37,21 +39,27 @@ export class NodePermissionDialogService {
      * @param title Dialog title
      * @returns Node with updated permissions
      */
-    openAddPermissionDialog(nodeId: string, title?: string): Observable<MinimalNodeEntity[]> {
-        const confirm = new Subject<MinimalNodeEntity[]>();
+    openAddPermissionDialog(node: Node, title?: string): Observable<MinimalNodeEntity[]> {
+        if (this.contentService.hasPermission(node, PermissionsEnum.UPDATEPERMISSIONS)) {
+            const confirm = new Subject<MinimalNodeEntity[]>();
 
-        confirm.subscribe({
-            complete: this.close.bind(this)
-        });
+            confirm.subscribe({
+                complete: this.close.bind(this)
+            });
 
-        const data: AddPermissionDialogData = {
-            nodeId: nodeId,
-            title: title,
-            confirm : confirm
-        };
+            const data: AddPermissionDialogData = {
+                nodeId: node.id,
+                title: title,
+                confirm: confirm
+            };
 
-        this.openDialog(data, 'adf-add-permission-dialog', '630px');
-        return confirm;
+            this.openDialog(data, 'adf-add-permission-dialog', '630px');
+            return confirm;
+        } else {
+            let errors = new Error(JSON.stringify({ error: { statusCode: 403 } }));
+            errors.message = 'PERMISSION_MANAGER.ERROR.NOT-ALLOWED';
+            return throwError(errors);
+        }
     }
 
     private openDialog(data: any, currentPanelClass: string, chosenWidth: string) {
@@ -72,8 +80,16 @@ export class NodePermissionDialogService {
      * @returns Node with updated permissions
      */
     updateNodePermissionByDialog(nodeId?: string, title?: string): Observable<MinimalNodeEntryEntity> {
-        return this.openAddPermissionDialog(nodeId, title).switchMap((selection) => {
-            return this.nodePermissionService.updateNodePermissions(nodeId, selection);
-        });
+        return this.contentService.getNode(nodeId, { include: ['allowableOperations'] })
+            .pipe(
+                switchMap(node => {
+                    return this.openAddPermissionDialog(node.entry, title)
+                        .pipe(
+                            switchMap(selection => {
+                                return this.nodePermissionService.updateNodePermissions(nodeId, selection);
+                            })
+                        );
+                })
+            );
     }
 }
diff --git a/lib/content-services/permission-manager/services/node-permission.service.spec.ts b/lib/content-services/permission-manager/services/node-permission.service.spec.ts
index 690f444891..c2d7f9d4fb 100644
--- a/lib/content-services/permission-manager/services/node-permission.service.spec.ts
+++ b/lib/content-services/permission-manager/services/node-permission.service.spec.ts
@@ -19,7 +19,7 @@ import { async, TestBed } from '@angular/core/testing';
 import { NodePermissionService } from './node-permission.service';
 import { SearchService, NodesApiService, setupTestBed, CoreModule } from '@alfresco/adf-core';
 import { MinimalNodeEntryEntity, PermissionElement } from 'alfresco-js-api';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 import { fakeEmptyResponse, fakeNodeWithOnlyLocally, fakeSiteRoles, fakeSiteNodeResponse,
          fakeNodeToRemovePermission, fakeNodeWithoutPermissions } from '../../mock/permission-list.component.mock';
 import { fakeAuthorityResults } from '../../mock/add-permission.component.mock';
@@ -55,12 +55,12 @@ describe('NodePermissionService', () => {
         let fakeNode: MinimalNodeEntryEntity = {};
         fakeNode.id = 'fake-updated-node';
         fakeNode.permissions = nodeBody.permissions;
-        return Observable.of(fakeNode);
+        return of(fakeNode);
     }
 
     it('should return a list of roles taken from the site groups', async(() => {
-        spyOn(searchApiService, 'searchByQueryBody').and.returnValue(Observable.of(fakeSiteNodeResponse));
-        spyOn(service, 'getGroupMemeberByGroupName').and.returnValue(Observable.of(fakeSiteRoles));
+        spyOn(searchApiService, 'searchByQueryBody').and.returnValue(of(fakeSiteNodeResponse));
+        spyOn(service, 'getGroupMemeberByGroupName').and.returnValue(of(fakeSiteRoles));
 
         service.getNodeRoles(fakeNodeWithOnlyLocally).subscribe((roleArray: string[]) => {
             expect(roleArray).not.toBeNull();
@@ -70,7 +70,7 @@ describe('NodePermissionService', () => {
     }));
 
     it('should return a list of settable if node has no site', async(() => {
-        spyOn(searchApiService, 'searchByQueryBody').and.returnValue(Observable.of(fakeEmptyResponse));
+        spyOn(searchApiService, 'searchByQueryBody').and.returnValue(of(fakeEmptyResponse));
 
         service.getNodeRoles(fakeNodeWithOnlyLocally).subscribe((roleArray: string[]) => {
             expect(roleArray).not.toBeNull();
@@ -119,10 +119,10 @@ describe('NodePermissionService', () => {
 
     it('should be able to update locally set permissions on the node by node id', async(() => {
         const fakeNodeCopy = JSON.parse(JSON.stringify(fakeNodeWithOnlyLocally));
-        spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeCopy));
+        spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeCopy));
         spyOn(nodeService, 'updateNode').and.callFake((nodeId, permissionBody) => returnUpdatedNode(nodeId, permissionBody));
-        spyOn(searchApiService, 'searchByQueryBody').and.returnValue(Observable.of(fakeSiteNodeResponse));
-        spyOn(service, 'getGroupMemeberByGroupName').and.returnValue(Observable.of(fakeSiteRoles));
+        spyOn(searchApiService, 'searchByQueryBody').and.returnValue(of(fakeSiteNodeResponse));
+        spyOn(service, 'getGroupMemeberByGroupName').and.returnValue(of(fakeSiteRoles));
 
         service.updateNodePermissions('fake-node-id', fakeAuthorityResults).subscribe((node: MinimalNodeEntryEntity) => {
             expect(node).not.toBeNull();
diff --git a/lib/content-services/permission-manager/services/node-permission.service.ts b/lib/content-services/permission-manager/services/node-permission.service.ts
index 4fd5c9f98e..2a43b819c3 100644
--- a/lib/content-services/permission-manager/services/node-permission.service.ts
+++ b/lib/content-services/permission-manager/services/node-permission.service.ts
@@ -16,12 +16,10 @@
  */
 
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable, of, from, throwError } from 'rxjs';
 import { AlfrescoApiService, SearchService, NodesApiService, TranslationService } from '@alfresco/adf-core';
 import { QueryBody, MinimalNodeEntryEntity, MinimalNodeEntity, PathElement, GroupMemberEntry, GroupsPaging, GroupMemberPaging, PermissionElement } from 'alfresco-js-api';
-import 'rxjs/add/operator/switchMap';
-import { of } from 'rxjs/observable/of';
-import { switchMap } from 'rxjs/operators';
+import { switchMap, map } from 'rxjs/operators';
 
 @Injectable()
 export class NodePermissionService {
@@ -40,14 +38,16 @@ export class NodePermissionService {
     getNodeRoles(node: MinimalNodeEntryEntity): Observable<string[]> {
         const retrieveSiteQueryBody: QueryBody = this.buildRetrieveSiteQueryBody(node.path.elements);
         return this.searchApiService.searchByQueryBody(retrieveSiteQueryBody)
-            .switchMap((siteNodeList: any) => {
-                if ( siteNodeList.list.entries.length > 0 ) {
-                    let siteName = siteNodeList.list.entries[0].entry.name;
-                    return this.getGroupMembersBySiteName(siteName);
-                } else {
-                    return Observable.of(node.permissions.settable);
-                }
-            });
+            .pipe(
+                switchMap((siteNodeList: any) => {
+                    if ( siteNodeList.list.entries.length > 0 ) {
+                        let siteName = siteNodeList.list.entries[0].entry.name;
+                        return this.getGroupMembersBySiteName(siteName);
+                    } else {
+                        return of(node.permissions.settable);
+                    }
+                })
+            );
     }
 
     /**
@@ -86,7 +86,7 @@ export class NodePermissionService {
         if (duplicatedPermissions.length > 0) {
             const list = duplicatedPermissions.map((permission) => 'authority -> ' + permission.authorityId + ' / role -> ' + permission.name).join(', ');
             const duplicatePermissionMessage: string = this.translation.instant('PERMISSION_MANAGER.ERROR.DUPLICATE-PERMISSION',  {list});
-            return Observable.throw(duplicatePermissionMessage);
+            return throwError(duplicatePermissionMessage);
         }
         permissionBody.permissions.locallySet = node.permissions.locallySet ? node.permissions.locallySet.concat(permissionList) : permissionList;
         return this.nodeService.updateNode(node.id, permissionBody);
@@ -137,13 +137,15 @@ export class NodePermissionService {
     private getGroupMembersBySiteName(siteName: string): Observable<string[]> {
         const groupName = 'GROUP_site_' + siteName;
         return this.getGroupMemeberByGroupName(groupName)
-            .map((res: GroupsPaging) => {
-                let displayResult: string[] = [];
-                res.list.entries.forEach((member: GroupMemberEntry) => {
-                    displayResult.push(this.formattedRoleName(member.entry.displayName, 'site_' + siteName));
-                });
-                return displayResult;
-            });
+            .pipe(
+                map((res: GroupsPaging) => {
+                    let displayResult: string[] = [];
+                    res.list.entries.forEach((member: GroupMemberEntry) => {
+                        displayResult.push(this.formattedRoleName(member.entry.displayName, 'site_' + siteName));
+                    });
+                    return displayResult;
+                })
+            );
     }
 
     /**
@@ -153,7 +155,7 @@ export class NodePermissionService {
      * @returns List of members
      */
     getGroupMemeberByGroupName(groupName: string, opts?: any): Observable<GroupMemberPaging> {
-        return Observable.fromPromise(this.apiService.groupsApi.getGroupMembers(groupName, opts));
+        return from<GroupMemberPaging>(this.apiService.groupsApi.getGroupMembers(groupName, opts));
     }
 
     private formattedRoleName(displayName, siteName): string {
diff --git a/lib/content-services/search/components/search-chip-list/search-chip-list.component.html b/lib/content-services/search/components/search-chip-list/search-chip-list.component.html
index c125531d05..9245fc3db0 100644
--- a/lib/content-services/search/components/search-chip-list/search-chip-list.component.html
+++ b/lib/content-services/search/components/search-chip-list/search-chip-list.component.html
@@ -1,19 +1,19 @@
 <mat-chip-list>
-    <ng-container *ngIf="searchFilter && searchFilter.selectedFacetQueries">
+    <ng-container *ngIf="searchFilter && searchFilter.selectedFacetQueries.length">
         <mat-chip
-            *ngFor="let label of searchFilter.selectedFacetQueries"
+            *ngFor="let query of searchFilter.selectedFacetQueries"
             [removable]="true"
-            (remove)="searchFilter.unselectFacetQuery(label)">
-            {{ label | translate }}
+            (removed)="searchFilter.unselectFacetQuery(query)">
+            {{ query.label | translate }}
             <mat-icon matChipRemove>cancel</mat-icon>
         </mat-chip>
     </ng-container>
-    <ng-container *ngIf="searchFilter && searchFilter.selectedBuckets">
+    <ng-container *ngIf="searchFilter && searchFilter.selectedBuckets.length">
         <mat-chip
-            *ngFor="let bucket of searchFilter.selectedBuckets"
+            *ngFor="let selection of searchFilter.selectedBuckets"
             [removable]="true"
-            (remove)="searchFilter.unselectFacetBucket(bucket)">
-            {{ (bucket.display || bucket.label) | translate }}
+            (removed)="searchFilter.unselectFacetBucket(selection.field, selection.bucket)">
+            {{ (selection.bucket.display || selection.bucket.label) | translate }}
             <mat-icon matChipRemove>cancel</mat-icon>
         </mat-chip>
     </ng-container>
diff --git a/lib/content-services/search/components/search-chip-list/search-chip-list.component.spec.ts b/lib/content-services/search/components/search-chip-list/search-chip-list.component.spec.ts
new file mode 100644
index 0000000000..11adf18799
--- /dev/null
+++ b/lib/content-services/search/components/search-chip-list/search-chip-list.component.spec.ts
@@ -0,0 +1,70 @@
+/*!
+ * @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 { Component } from '@angular/core';
+import { setupTestBed, CoreModule } from '@alfresco/adf-core';
+import { TestBed } from '@angular/core/testing';
+import { SearchModule } from '../../search.module';
+
+@Component({
+    selector: 'adf-test-component',
+    template: `
+        <adf-search-chip-list [searchFilter]="searchFilter"></adf-search-chip-list>
+    `
+})
+class TestComponent {
+
+    searchFilter = {
+        selectedFacetQueries : [],
+        selectedBuckets: [],
+        unselectFacetQuery() {},
+        unselectFacetBucket() {}
+    };
+}
+
+describe('SearchChipListComponent', () => {
+
+    setupTestBed({
+        imports: [
+            CoreModule.forRoot(),
+            SearchModule
+        ],
+        declarations: [
+            TestComponent
+        ]
+    });
+
+    xit('should remove items from the search filter', () => {
+        const fixture = TestBed.createComponent(TestComponent);
+        const component: TestComponent = fixture.componentInstance;
+
+        spyOn(component.searchFilter, 'unselectFacetQuery').and.stub();
+
+        component.searchFilter.selectedFacetQueries = [{ id: 1 }, { id: 2 }];
+
+        fixture.detectChanges();
+
+        const closeButtons = fixture.debugElement.nativeElement.querySelectorAll('.mat-chip-remove');
+        expect(closeButtons.length).toBe(2);
+
+        closeButtons[0].click();
+        fixture.detectChanges();
+
+        expect(component.searchFilter.unselectFacetQuery).toHaveBeenCalledWith({ id: 1 });
+    });
+
+});
diff --git a/lib/content-services/search/components/search-control.component.html b/lib/content-services/search/components/search-control.component.html
index 2c9962418f..ebe0c2a99a 100644
--- a/lib/content-services/search/components/search-control.component.html
+++ b/lib/content-services/search/components/search-control.component.html
@@ -1,28 +1,30 @@
 <div class="adf-search-container">
-    <div *ngIf="isLoggedIn()" [@transitionMessages]="subscriptAnimationState" (@transitionMessages.done)="applySearchFocus($event)">
+    <div *ngIf="isLoggedIn()" [@transitionMessages]="subscriptAnimationState"
+         (@transitionMessages.done)="applySearchFocus($event)">
         <button mat-icon-button
-            *ngIf="expandable"
-            id="adf-search-button"
-            class="adf-search-button"
-            [title]="'SEARCH.BUTTON.TOOLTIP' | translate"
-            (click)="toggleSearchBar($event)"
-            (keyup.enter)="toggleSearchBar($event)">
+                *ngIf="expandable"
+                id="adf-search-button"
+                class="adf-search-button"
+                [title]="'SEARCH.BUTTON.TOOLTIP' | translate"
+                (click)="toggleSearchBar()"
+                (keyup.enter)="toggleSearchBar()">
             <mat-icon [attr.aria-label]="'SEARCH.BUTTON.ARIA-LABEL' | translate">search</mat-icon>
         </button>
         <mat-form-field class="adf-input-form-field-divider">
-            <input matInput #searchInput
-                [attr.aria-label]="'SEARCH.INPUT.ARIA-LABEL' | translate"
-                [type]="inputType"
-                [autocomplete]="getAutoComplete()"
-                id="adf-control-input"
-                [(ngModel)]="searchTerm"
-                (focus)="activateToolbar($event)"
-                (blur)="onBlur($event)"
-                (keyup.escape)="toggleSearchBar()"
-                (keyup.arrowdown)="selectFirstResult()"
-                (ngModelChange)="inputChange($event)"
-                [searchAutocomplete]="auto"
-                (keyup.enter)="searchSubmit($event)">
+            <input matInput
+                   #searchInput
+                   [attr.aria-label]="'SEARCH.INPUT.ARIA-LABEL' | translate"
+                   [attr.type]="inputType"
+                   [autocomplete]="getAutoComplete()"
+                   id="adf-control-input"
+                   [(ngModel)]="searchTerm"
+                   (focus)="activateToolbar()"
+                   (blur)="onBlur($event)"
+                   (keyup.escape)="toggleSearchBar()"
+                   (keyup.arrowdown)="selectFirstResult()"
+                   (ngModelChange)="inputChange($event)"
+                   [searchAutocomplete]="auto"
+                   (keyup.enter)="searchSubmit($event)">
         </mat-form-field>
     </div>
 </div>
@@ -49,7 +51,7 @@
                 (touchend)="elementClicked(item)">
                 <!-- This is a comment -->
                 <mat-icon mat-list-icon>
-                    <img [src]="getMimeTypeIcon(item)" />
+                    <img [src]="getMimeTypeIcon(item)"/>
                 </mat-icon>
                 <h4 mat-line id="result_name_{{idx}}"
                     *ngIf="highlight; else elseBlock"
@@ -58,19 +60,21 @@
                     {{ item?.entry.name }}
                 </h4>
                 <ng-template #elseBlock>
-                    <h4 class="adf-search-fixed-text" mat-line id="result_name_{{idx}}" [innerHtml]="item.entry.name"></h4>
+                    <h4 class="adf-search-fixed-text" mat-line id="result_name_{{idx}}"
+                        [innerHtml]="item.entry.name"></h4>
                 </ng-template>
                 <p mat-line class="adf-search-fixed-text"> {{item?.entry.createdByUser.displayName}} </p>
             </mat-list-item>
             <mat-list-item id="search_no_result"
-                data-automation-id="search_no_result_found"
-                *ngIf="data?.list?.entries.length === 0">
+                           data-automation-id="search_no_result_found"
+                           *ngIf="data?.list?.entries.length === 0">
                 <ng-content
                     selector="adf-empty-search-result"
                     *ngIf="isNoSearchTemplatePresent() else defaultNoResult">
                 </ng-content>
                 <ng-template #defaultNoResult>
-                    <p mat-line class="adf-search-fixed-text">{{ 'SEARCH.RESULTS.NONE' | translate:{searchTerm: searchTerm} }}</p>
+                    <p mat-line class="adf-search-fixed-text">{{ 'SEARCH.RESULTS.NONE' | translate:{searchTerm:
+                        searchTerm} }}</p>
                 </ng-template>
             </mat-list-item>
         </mat-list>
diff --git a/lib/content-services/search/components/search-control.component.scss b/lib/content-services/search/components/search-control.component.scss
index da3cf3ee1b..0e5fb8a693 100644
--- a/lib/content-services/search/components/search-control.component.scss
+++ b/lib/content-services/search/components/search-control.component.scss
@@ -4,6 +4,8 @@
     $primary: map-get($theme, primary);
     $accent: map-get($theme, accent);
     $mat-menu-border-radius: 2px !default;
+    $mat-menu-overlay-min-width: 112px !default;   // 56 * 2
+    $mat-menu-overlay-max-width: 280px !default;   // 56 * 5
 
     .adf-search-container {
         overflow: hidden !important;
@@ -33,7 +35,13 @@
         }
 
         &-search-result-autocomplete {
-            @include mat-menu-base(2);
+            @include mat-overridable-elevation(2);
+
+            min-width: $mat-menu-overlay-min-width;
+            max-width: $mat-menu-overlay-max-width;
+            overflow: auto;
+            -webkit-overflow-scrolling: touch;
+
             transform-origin: top left;
             transform:translateX(-40px);
             position: absolute;
diff --git a/lib/content-services/search/components/search-control.component.spec.ts b/lib/content-services/search/components/search-control.component.spec.ts
index 13f2630e6d..81c8cfb975 100644
--- a/lib/content-services/search/components/search-control.component.spec.ts
+++ b/lib/content-services/search/components/search-control.component.spec.ts
@@ -25,7 +25,7 @@ import { SearchControlComponent } from './search-control.component';
 import { SearchTriggerDirective } from './search-trigger.directive';
 import { SearchComponent } from './search.component';
 import { EmptySearchResultComponent } from './empty-search-result.component';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
 @Component({
@@ -94,7 +94,7 @@ describe('SearchControlComponent', () => {
         component = fixture.componentInstance;
         element = fixture.nativeElement;
 
-        searchServiceSpy = spyOn(searchService, 'search').and.returnValue(Observable.of(''));
+        searchServiceSpy = spyOn(searchService, 'search').and.returnValue(of(''));
     });
 
     afterEach(() => {
@@ -117,7 +117,7 @@ describe('SearchControlComponent', () => {
 
         it('should emit searchChange when search term input changed', (done) => {
             searchServiceSpy.and.returnValue(
-                Observable.of({ entry: { list: [] } })
+                of({ entry: { list: [] } })
             );
 
             let searchDisposable = component.searchChange.subscribe(value => {
@@ -133,7 +133,7 @@ describe('SearchControlComponent', () => {
         it('should update FAYT search when user inputs a valid term', (done) => {
             typeWordIntoSearchInput('customSearchTerm');
             spyOn(component, 'isSearchBarActive').and.returnValue(true);
-            searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
+            searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
 
             fixture.detectChanges();
             fixture.whenStable().then(() => {
@@ -148,7 +148,7 @@ describe('SearchControlComponent', () => {
         it('should NOT update FAYT term when user inputs an empty string as search term ', (done) => {
             typeWordIntoSearchInput('');
             spyOn(component, 'isSearchBarActive').and.returnValue(true);
-            searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
+            searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
 
             fixture.detectChanges();
             fixture.whenStable().then(() => {
@@ -159,7 +159,7 @@ describe('SearchControlComponent', () => {
         });
 
         it('should still fire an event when user inputs a search term less than 3 characters', (done) => {
-            searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
+            searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
 
             let searchDisposable = component.searchChange.subscribe(value => {
                 expect(value).toBe('cu');
@@ -195,14 +195,14 @@ describe('SearchControlComponent', () => {
 
         it('should display a text input field by default', async(() => {
             fixture.detectChanges();
-            expect(element.querySelectorAll('input[type="text"]').length).toBe(1);
+            expect(element.querySelectorAll('#adf-control-input').length).toBe(1);
             expect(element.querySelector('#adf-control-input')).toBeDefined();
             expect(element.querySelector('#adf-control-input')).not.toBeNull();
         }));
 
         it('should set browser autocomplete to off by default', async(() => {
             fixture.detectChanges();
-            let attr = element.querySelectorAll('input[type="text"]')[0].getAttribute('autocomplete');
+            let attr = element.querySelector('#adf-control-input').getAttribute('autocomplete');
             expect(attr).toBe('off');
         }));
 
@@ -215,7 +215,7 @@ describe('SearchControlComponent', () => {
         it('should set browser autocomplete to on when configured', async(() => {
             component.autocomplete = true;
             fixture.detectChanges();
-            expect(element.querySelectorAll('input[type="text"]')[0].getAttribute('autocomplete')).toBe('on');
+            expect(element.querySelector('#adf-control-input').getAttribute('autocomplete')).toBe('on');
         }));
 
         xit('should fire a search when a enter key is pressed', (done) => {
@@ -226,7 +226,7 @@ describe('SearchControlComponent', () => {
             });
 
             spyOn(component, 'isSearchBarActive').and.returnValue(true);
-            searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
+            searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
 
             fixture.detectChanges();
             let inputDebugElement = debugElement.query(By.css('#adf-control-input'));
@@ -246,7 +246,7 @@ describe('SearchControlComponent', () => {
 
         it('should make autocomplete list control visible when search box has focus and there is a search result', (done) => {
             spyOn(component, 'isSearchBarActive').and.returnValue(true);
-            searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
+            searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
             fixture.detectChanges();
 
             typeWordIntoSearchInput('TEST');
@@ -261,7 +261,7 @@ describe('SearchControlComponent', () => {
 
         it('should show autocomplete list noe results when search box has focus and there is search result with length 0', (done) => {
             spyOn(component, 'isSearchBarActive').and.returnValue(true);
-            searchServiceSpy.and.returnValue(Observable.of(noResult));
+            searchServiceSpy.and.returnValue(of(noResult));
             fixture.detectChanges();
 
             typeWordIntoSearchInput('NO RES');
@@ -276,7 +276,7 @@ describe('SearchControlComponent', () => {
 
         it('should hide autocomplete list results when the search box loses focus', (done) => {
             spyOn(component, 'isSearchBarActive').and.returnValue(true);
-            searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
+            searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
             fixture.detectChanges();
 
             let inputDebugElement = debugElement.query(By.css('#adf-control-input'));
@@ -297,7 +297,7 @@ describe('SearchControlComponent', () => {
 
         it('should keep autocomplete list control visible when user tabs into results', (done) => {
             spyOn(component, 'isSearchBarActive').and.returnValue(true);
-            searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
+            searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
             fixture.detectChanges();
 
             let inputDebugElement = debugElement.query(By.css('#adf-control-input'));
@@ -318,7 +318,7 @@ describe('SearchControlComponent', () => {
 
         it('should close the autocomplete when user press ESCAPE', (done) => {
             spyOn(component, 'isSearchBarActive').and.returnValue(true);
-            searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
+            searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
             fixture.detectChanges();
 
             let inputDebugElement = debugElement.query(By.css('#adf-control-input'));
@@ -342,7 +342,7 @@ describe('SearchControlComponent', () => {
 
         it('should close the autocomplete when user press ENTER on input', (done) => {
             spyOn(component, 'isSearchBarActive').and.returnValue(true);
-            searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
+            searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
             fixture.detectChanges();
 
             let inputDebugElement = debugElement.query(By.css('#adf-control-input'));
@@ -366,7 +366,7 @@ describe('SearchControlComponent', () => {
 
         it('should focus input element when autocomplete list is cancelled', (done) => {
             spyOn(component, 'isSearchBarActive').and.returnValue(true);
-            searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
+            searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
             fixture.detectChanges();
 
             let inputDebugElement = debugElement.query(By.css('#adf-control-input'));
@@ -383,7 +383,7 @@ describe('SearchControlComponent', () => {
         });
 
         it('should NOT display a autocomplete list control when configured not to', (done) => {
-            searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
+            searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
             component.liveSearchEnabled = false;
             fixture.detectChanges();
 
@@ -396,7 +396,7 @@ describe('SearchControlComponent', () => {
         });
 
         xit('should select the first item on autocomplete list when ARROW DOWN is pressed on input', (done) => {
-            searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
+            searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
             fixture.detectChanges();
             typeWordIntoSearchInput('TEST');
             let inputDebugElement = debugElement.query(By.css('#adf-control-input'));
@@ -413,7 +413,7 @@ describe('SearchControlComponent', () => {
         });
 
         xit('should select the second item on autocomplete list when ARROW DOWN is pressed on list', (done) => {
-            searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
+            searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
             fixture.detectChanges();
             let inputDebugElement = debugElement.query(By.css('#adf-control-input'));
             typeWordIntoSearchInput('TEST');
@@ -435,7 +435,7 @@ describe('SearchControlComponent', () => {
         });
 
         xit('should focus the input search when ARROW UP is pressed on the first list item', (done) => {
-            searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
+            searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
             fixture.detectChanges();
             let inputDebugElement = debugElement.query(By.css('#adf-control-input'));
             typeWordIntoSearchInput('TEST');
@@ -578,7 +578,7 @@ describe('SearchControlComponent', () => {
 
         it('should emit a option clicked event when item is clicked', (done) => {
             spyOn(component, 'isSearchBarActive').and.returnValue(true);
-            searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
+            searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
             let clickDisposable = component.optionClicked.subscribe((item) => {
                 expect(item.entry.id).toBe('123');
                 clickDisposable.unsubscribe();
@@ -596,7 +596,7 @@ describe('SearchControlComponent', () => {
 
         it('should set deactivate the search after element is clicked', (done) => {
             spyOn(component, 'isSearchBarActive').and.returnValue(true);
-            searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
+            searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
             let clickDisposable = component.optionClicked.subscribe((item) => {
                 expect(component.subscriptAnimationState).toBe('inactive');
                 clickDisposable.unsubscribe();
@@ -615,7 +615,7 @@ describe('SearchControlComponent', () => {
 
         it('should NOT reset the search term after element is clicked', (done) => {
             spyOn(component, 'isSearchBarActive').and.returnValue(true);
-            searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
+            searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
             let clickDisposable = component.optionClicked.subscribe((item) => {
                 expect(component.searchTerm).not.toBeFalsy();
                 expect(component.searchTerm).toBe('TEST');
@@ -646,7 +646,7 @@ describe('SearchControlComponent', () => {
             const noResultCustomMessage = 'BANDI IS NOTHING';
             spyOn(componentCustom.searchComponent, 'isSearchBarActive').and.returnValue(true);
             componentCustom.setCustomMessageForNoResult(noResultCustomMessage);
-            searchServiceSpy.and.returnValue(Observable.of(noResult));
+            searchServiceSpy.and.returnValue(of(noResult));
             fixtureCustom.detectChanges();
 
             let inputDebugElement = fixtureCustom.debugElement.query(By.css('#adf-control-input'));
diff --git a/lib/content-services/search/components/search-control.component.ts b/lib/content-services/search/components/search-control.component.ts
index b635a461fe..a288d22c8d 100644
--- a/lib/content-services/search/components/search-control.component.ts
+++ b/lib/content-services/search/components/search-control.component.ts
@@ -20,12 +20,11 @@ import { animate, state, style, transition, trigger } from '@angular/animations'
 import { Component, EventEmitter, Input, OnDestroy, OnInit, Output,
          QueryList, ViewEncapsulation, ViewChild, ViewChildren, ElementRef, TemplateRef, ContentChild } from '@angular/core';
 import { MinimalNodeEntity, QueryBody } from 'alfresco-js-api';
-import { Observable } from 'rxjs/Observable';
-import { Subject } from 'rxjs/Subject';
+import { Observable, Subject } from 'rxjs';
 import { SearchComponent } from './search.component';
 import { MatListItem } from '@angular/material';
 import { EmptySearchResultComponent } from './empty-search-result.component';
-import { debounceTime } from 'rxjs/operators';
+import { debounceTime, filter } from 'rxjs/operators';
 
 @Component({
     selector: 'adf-search-control',
@@ -245,11 +244,16 @@ export class SearchControlComponent implements OnInit, OnDestroy {
     }
 
     private setupFocusEventHandlers() {
-        let focusEvents: Observable<FocusEvent> = this.focusSubject.asObservable()
-            .debounceTime(50);
-        focusEvents.filter(($event: any) => {
-            return this.isSearchBarActive() && ($event.type === 'blur' || $event.type === 'focusout');
-        }).subscribe(() => {
+        const focusEvents: Observable<FocusEvent> = this.focusSubject
+            .asObservable()
+            .pipe(
+                debounceTime(50),
+                filter(($event: any) => {
+                    return this.isSearchBarActive() && ($event.type === 'blur' || $event.type === 'focusout');
+                })
+            );
+
+        focusEvents.subscribe(() => {
             this.toggleSearchBar();
         });
     }
diff --git a/lib/content-services/search/components/search-date-range/search-date-range.component.html b/lib/content-services/search/components/search-date-range/search-date-range.component.html
index f4c2321dc8..a833b68da3 100644
--- a/lib/content-services/search/components/search-date-range/search-date-range.component.html
+++ b/lib/content-services/search/components/search-date-range/search-date-range.component.html
@@ -1,25 +1,25 @@
 <form [formGroup]="form" novalidate (ngSubmit)="apply(form.value, form.valid)">
     <mat-form-field>
-        <input matInput [formControl]="from" [errorStateMatcher]="matcher"
+        <input matInput
+                (input)="forcePlaceholder($event)"
+                [formControl]="from"
+                [errorStateMatcher]="matcher"
                 placeholder="{{ 'SEARCH.FILTER.RANGE.FROM-DATE' | translate }}"
                 [matDatepicker]="fromDatepicker"
                 [max]="maxDate"
                 (focusout)="onChangedHandler($event, from)">
         <mat-datepicker-toggle matSuffix [for]="fromDatepicker"></mat-datepicker-toggle>
         <mat-datepicker #fromDatepicker></mat-datepicker>
-        <mat-error *ngIf="from.hasError('required') && !hasParseError(from)">
-            {{ 'SEARCH.FILTER.VALIDATION.REQUIRED-VALUE' | translate }}
-        </mat-error>
-        <mat-error *ngIf="from.hasError('matDatepickerMax')">
-            {{ 'SEARCH.FILTER.VALIDATION.BEYOND-MAX-DATE' | translate }}
-        </mat-error>
-        <mat-error *ngIf="hasParseError(from)">
-            {{ 'SEARCH.FILTER.VALIDATION.INVALID-DATE' | translate: { requiredFormat: datePickerDateFormat } }}
+        <mat-error *ngIf="from.invalid">
+            {{ getFromValidationMessage() | translate: { requiredFormat: datePickerDateFormat } }}
         </mat-error>
     </mat-form-field>
 
     <mat-form-field>
-        <input matInput [formControl]="to" [errorStateMatcher]="matcher"
+        <input matInput
+                (input)="forcePlaceholder($event)"
+                [formControl]="to"
+                [errorStateMatcher]="matcher"
                 placeholder="{{ 'SEARCH.FILTER.RANGE.TO-DATE' | translate }}"
                 [matDatepicker]="toDatepicker"
                 [min]="from.value"
@@ -27,17 +27,8 @@
                 (focusout)="onChangedHandler($event, to)">
         <mat-datepicker-toggle matSuffix [for]="toDatepicker"></mat-datepicker-toggle>
         <mat-datepicker #toDatepicker></mat-datepicker>
-        <mat-error *ngIf="to.hasError('required') && !hasParseError(to)">
-                {{ 'SEARCH.FILTER.VALIDATION.REQUIRED-VALUE' | translate }}
-        </mat-error>
-        <mat-error *ngIf="to.hasError('matDatepickerMin')">
-                {{ 'SEARCH.FILTER.VALIDATION.NO-DAYS' | translate }}
-        </mat-error>
-        <mat-error *ngIf="to.hasError('matDatepickerMax')">
-            {{ 'SEARCH.FILTER.VALIDATION.BEYOND-MAX-DATE' | translate }}
-        </mat-error>
-        <mat-error *ngIf="hasParseError(to)">
-            {{ 'SEARCH.FILTER.VALIDATION.INVALID-DATE' | translate: { requiredFormat: datePickerDateFormat } }}
+        <mat-error *ngIf="to.invalid">
+            {{ getToValidationMessage() | translate: { requiredFormat: datePickerDateFormat } }}
         </mat-error>
     </mat-form-field>
 
diff --git a/lib/content-services/search/components/search-date-range/search-date-range.component.spec.ts b/lib/content-services/search/components/search-date-range/search-date-range.component.spec.ts
index 4ba0ff5f2e..28a0c48e49 100644
--- a/lib/content-services/search/components/search-date-range/search-date-range.component.spec.ts
+++ b/lib/content-services/search/components/search-date-range/search-date-range.component.spec.ts
@@ -16,7 +16,7 @@
  */
 
 import { SearchDateRangeComponent } from './search-date-range.component';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ContentTestingModule } from '../../../testing/content.testing.module';
 import { setupTestBed, MomentDateAdapter } from '@alfresco/adf-core';
@@ -44,7 +44,7 @@ describe('SearchDateRangeComponent', () => {
             const userPreferences = {
                 userPreferenceStatus: { LOCALE: localeFixture },
                 select: (property) => {
-                    return Observable.of(userPreferences.userPreferenceStatus[property]);
+                    return of(userPreferences.userPreferenceStatus[property]);
                 }
             };
             return userPreferences;
@@ -173,7 +173,7 @@ describe('SearchDateRangeComponent', () => {
 
             translateService = TestBed.get(TranslateService);
             translationSpy = spyOn(translateService, 'get').and.callFake((key) => {
-                return Observable.of(key);
+                return of(key);
             });
 
             component.settings = { 'dateFormat': dateFormatFixture, field: 'cm:created' };
@@ -184,7 +184,7 @@ describe('SearchDateRangeComponent', () => {
             fixture.destroy();
         });
 
-        it('should display the required format when input date is invalid', () => {
+        xit('should display the required format when input date is invalid', () => {
             const inputEl = fixture.debugElement.query(By.css('input')).nativeElement;
 
             inputEl.value = 'invalid-date';
diff --git a/lib/content-services/search/components/search-date-range/search-date-range.component.ts b/lib/content-services/search/components/search-date-range/search-date-range.component.ts
index 9fd23fd46a..5254b20d52 100644
--- a/lib/content-services/search/components/search-date-range/search-date-range.component.ts
+++ b/lib/content-services/search/components/search-date-range/search-date-range.component.ts
@@ -60,6 +60,21 @@ export class SearchDateRangeComponent implements SearchWidget, OnInit {
                 private userPreferencesService: UserPreferencesService) {
     }
 
+    getFromValidationMessage(): string {
+        return this.from.hasError('matDatepickerParse') ? 'SEARCH.FILTER.VALIDATION.INVALID-DATE' :
+            this.from.hasError('matDatepickerMax') ? 'SEARCH.FILTER.VALIDATION.BEYOND-MAX-DATE' :
+            this.from.hasError('required') ? 'SEARCH.FILTER.VALIDATION.REQUIRED-VALUE' :
+            '';
+    }
+
+    getToValidationMessage(): string {
+        return this.to.hasError('matDatepickerParse') ? 'SEARCH.FILTER.VALIDATION.INVALID-DATE' :
+            this.to.hasError('matDatepickerMin') ? 'SEARCH.FILTER.VALIDATION.NO-DAYS' :
+            this.to.hasError('matDatepickerMax') ? 'SEARCH.FILTER.VALIDATION.BEYOND-MAX-DATE' :
+            this.to.hasError('required') ? 'SEARCH.FILTER.VALIDATION.REQUIRED-VALUE' :
+            '';
+    }
+
     ngOnInit() {
         if (this.settings) {
             this.datePickerDateFormat = this.settings.dateFormat || DEFAULT_FORMAT_DATE;
@@ -107,13 +122,17 @@ export class SearchDateRangeComponent implements SearchWidget, OnInit {
         }
     }
 
-    onChangedHandler(event: any, formControl) {
+    onChangedHandler(event: any, formControl: FormControl) {
         const inputValue = event.srcElement.value;
 
         if (inputValue) {
             const formatDate = this.dateAdapter.parse(inputValue, this.datePickerDateFormat);
             if (formatDate && formatDate.isValid()) {
                 formControl.setValue(formatDate);
+            } else {
+                formControl.setErrors({
+                    'matDatepickerParse': true
+                });
             }
         }
     }
@@ -123,7 +142,8 @@ export class SearchDateRangeComponent implements SearchWidget, OnInit {
         moment.locale(locale);
     }
 
-    hasParseError(formControl) {
-        return formControl.hasError('matDatepickerParse') && formControl.getError('matDatepickerParse').text;
+    forcePlaceholder(event: any) {
+        event.srcElement.click();
     }
+
 }
diff --git a/lib/content-services/search/components/search-filter/models/response-facet-query-list.model.ts b/lib/content-services/search/components/search-filter/models/response-facet-query-list.model.ts
index 6dfad9a7be..2cba2d45c7 100644
--- a/lib/content-services/search/components/search-filter/models/response-facet-query-list.model.ts
+++ b/lib/content-services/search/components/search-filter/models/response-facet-query-list.model.ts
@@ -15,23 +15,20 @@
  * limitations under the License.
  */
 
-import { ResponseFacetQuery } from '../../../facet-query.interface';
+import { FacetQuery } from '../../../facet-query.interface';
 import { SearchFilterList } from './search-filter-list.model';
 
-export class ResponseFacetQueryList extends SearchFilterList<ResponseFacetQuery> {
-    constructor(items: ResponseFacetQuery[] = [], pageSize: number = 5) {
+export class ResponseFacetQueryList extends SearchFilterList<FacetQuery> {
+    constructor(items: FacetQuery[] = [], pageSize: number = 5) {
         super(
             items
                 .filter(item => {
                     return item.count > 0;
-                })
-                .map(item => {
-                    return <ResponseFacetQuery> { ...item };
                 }),
             pageSize
         );
 
-        this.filter = (query: ResponseFacetQuery) => {
+        this.filter = (query: FacetQuery) => {
             if (this.filterText && query.label) {
                 const pattern = (this.filterText || '').toLowerCase();
                 const label = query.label.toLowerCase();
diff --git a/lib/content-services/search/components/search-filter/models/search-filter-list.model.ts b/lib/content-services/search/components/search-filter/models/search-filter-list.model.ts
index 17601b0c59..de376fe7f9 100644
--- a/lib/content-services/search/components/search-filter/models/search-filter-list.model.ts
+++ b/lib/content-services/search/components/search-filter/models/search-filter-list.model.ts
@@ -15,14 +15,16 @@
  * limitations under the License.
  */
 
+const DEFAULT_PAGE_SIZE = 5;
+
 export class SearchFilterList<T> implements Iterable<T> {
 
     private filteredItems: T[] = [];
     private _filterText: string = '';
 
     items: T[] = [];
-    pageSize: number = 5;
-    currentPageSize: number = 5;
+    pageSize: number = DEFAULT_PAGE_SIZE;
+    currentPageSize: number = DEFAULT_PAGE_SIZE;
 
     get filterText(): string {
         return this._filterText;
@@ -78,11 +80,11 @@ export class SearchFilterList<T> implements Iterable<T> {
         return this.pageSize >= this.filteredItems.length;
     }
 
-    constructor(items: T[] = [], pageSize: number = 5) {
+    constructor(items: T[] = [], pageSize?: number) {
         this.items = items;
         this.filteredItems = items;
-        this.pageSize = pageSize;
-        this.currentPageSize = pageSize;
+        this.pageSize = pageSize || DEFAULT_PAGE_SIZE;
+        this.currentPageSize = pageSize || DEFAULT_PAGE_SIZE;
     }
 
     /** Display more items. */
diff --git a/lib/content-services/search/components/search-filter/search-filter.component.html b/lib/content-services/search/components/search-filter/search-filter.component.html
index 82d3f566d4..e233d0f1c9 100644
--- a/lib/content-services/search/components/search-filter/search-filter.component.html
+++ b/lib/content-services/search/components/search-filter/search-filter.component.html
@@ -2,9 +2,8 @@
 
     <mat-expansion-panel
         *ngFor="let category of queryBuilder.categories"
-        [expanded]="category.expanded"
-        (opened)="onCategoryExpanded(category)"
-        (closed)="onCategoryCollapsed(category)">
+        [attr.data-automation-id]="'expansion-panel-'+category.name"
+        [(expanded)]="category.expanded">
         <mat-expansion-panel-header>
             <mat-panel-title>
                 {{ category.name | translate }}
@@ -17,115 +16,119 @@
         </adf-search-widget-container>
     </mat-expansion-panel>
 
-    <mat-expansion-panel *ngIf="isFacetQueriesDefined" [expanded]="facetQueriesExpanded">
-        <mat-expansion-panel-header>
-            <mat-panel-title>{{ facetQueriesLabel | translate }}</mat-panel-title>
-        </mat-expansion-panel-header>
-        <div class="facet-result-filter">
-            <mat-form-field>
-                <input
-                    matInput
-                    placeholder="{{ 'SEARCH.FILTER.ACTIONS.FILTER-CATEGORY' | translate }}"
-                    [(ngModel)]="responseFacetQueries.filterText">
-                <button *ngIf="responseFacetQueries.filterText"
-                    mat-button matSuffix mat-icon-button
-                    (click)="responseFacetQueries.filterText = ''">
-                    <mat-icon>close</mat-icon>
+    <ng-container *ngIf="responseFacetQueries">
+        <mat-expansion-panel [expanded]="facetQueriesExpanded" [attr.data-automation-id]="'expansion-panel-'+facetQueriesLabel">
+            <mat-expansion-panel-header>
+                <mat-panel-title>{{ facetQueriesLabel | translate }}</mat-panel-title>
+            </mat-expansion-panel-header>
+            <div class="facet-result-filter">
+                <mat-form-field>
+                    <input
+                        matInput
+                        placeholder="{{ 'SEARCH.FILTER.ACTIONS.FILTER-CATEGORY' | translate }}"
+                        [attr.data-automation-id]="'facet-result-filter-'+facetQueriesLabel"
+                        [(ngModel)]="responseFacetQueries.filterText">
+                    <button *ngIf="responseFacetQueries.filterText"
+                        mat-button matSuffix mat-icon-button
+                        (click)="responseFacetQueries.filterText = ''">
+                        <mat-icon>close</mat-icon>
+                    </button>
+                </mat-form-field>
+            </div>
+            <div class="checklist">
+                <ng-container *ngFor="let query of responseFacetQueries">
+                    <mat-checkbox
+                        [checked]="query.checked"
+                        [attr.data-automation-id]="'checkbox-'+facetQueriesLabel+'-'+query.label"
+                        (change)="onToggleFacetQuery($event, query)">
+                        {{ query.label }} ({{ query.count }})
+                    </mat-checkbox>
+                </ng-container>
+            </div>
+            <div class="facet-buttons">
+                <button mat-icon-button
+                    *ngIf="canResetSelectedQueries"
+                    title="{{ 'SEARCH.FILTER.ACTIONS.CLEAR-ALL' | translate }}"
+                    (click)="resetSelectedQueries()">
+                    <mat-icon>clear</mat-icon>
                 </button>
-            </mat-form-field>
-        </div>
-        <div class="checklist">
-            <ng-container *ngFor="let query of responseFacetQueries">
+                <button mat-icon-button
+                    *ngIf="responseFacetQueries.canShowLessItems"
+                    title="{{ 'SEARCH.FILTER.ACTIONS.SHOW-LESS' | translate }}"
+                    (click)="responseFacetQueries.showLessItems()">
+                    <mat-icon>keyboard_arrow_up</mat-icon>
+                </button>
+                <button mat-icon-button
+                    *ngIf="responseFacetQueries.canShowMoreItems"
+                    title="{{ 'SEARCH.FILTER.ACTIONS.SHOW-MORE' | translate }}"
+                    (click)="responseFacetQueries.showMoreItems()">
+                    <mat-icon>keyboard_arrow_down</mat-icon>
+                </button>
+            </div>
+        </mat-expansion-panel>
+    </ng-container>
+
+    <ng-container *ngIf="responseFacetFields">
+        <mat-expansion-panel [attr.data-automation-id]="'expansion-panel-'+field.label" *ngFor="let field of responseFacetFields"
+                             [expanded]="facetFieldsExpanded">
+            <mat-expansion-panel-header>
+                <mat-panel-title>{{ field.label }}</mat-panel-title>
+            </mat-expansion-panel-header>
+
+            <div class="facet-result-filter">
+                <mat-form-field>
+                    <input
+                        matInput
+                        placeholder="{{ 'SEARCH.FILTER.ACTIONS.FILTER-CATEGORY' | translate }}"
+                        [attr.data-automation-id]="'facet-result-filter-'+field.label"
+                        [(ngModel)]="field.buckets.filterText">
+                    <button *ngIf="field.buckets.filterText"
+                        mat-button matSuffix mat-icon-button
+                        (click)="field.buckets.filterText = ''">
+                        <mat-icon>close</mat-icon>
+                    </button>
+                </mat-form-field>
+            </div>
+
+            <div class="checklist">
                 <mat-checkbox
-                    [checked]="query.$checked"
-                    (change)="onFacetQueryToggle($event, query)">
-                    {{ query.label }} ({{ query.count }})
+                    *ngFor="let bucket of field.buckets"
+                    [checked]="bucket.checked"
+                    [attr.data-automation-id]="'checkbox-'+field.label+'-'+(bucket.display || bucket.label)"
+                    (change)="onToggleBucket($event, field, bucket)">
+                    {{ bucket.display || bucket.label }} <span *ngIf="bucket.count!==null">(</span>{{ bucket.count }}<span *ngIf="bucket.count!==null">)</span>
                 </mat-checkbox>
-            </ng-container>
-        </div>
-        <div class="facet-buttons">
-            <button mat-icon-button
-                *ngIf="canResetSelectedQueries()"
-                title="{{ 'SEARCH.FILTER.ACTIONS.CLEAR-ALL' | translate }}"
-                (click)="resetSelectedQueries()">
-                <mat-icon>clear</mat-icon>
-            </button>
-            <button mat-icon-button
-                *ngIf="responseFacetQueries.canShowLessItems"
-                title="{{ 'SEARCH.FILTER.ACTIONS.SHOW-LESS' | translate }}"
-                (click)="responseFacetQueries.showLessItems()">
-                <mat-icon>keyboard_arrow_up</mat-icon>
-            </button>
-            <button mat-icon-button
-                *ngIf="responseFacetQueries.canShowMoreItems"
-                title="{{ 'SEARCH.FILTER.ACTIONS.SHOW-MORE' | translate }}"
-                (click)="responseFacetQueries.showMoreItems()">
-                <mat-icon>keyboard_arrow_down</mat-icon>
-            </button>
-        </div>
-    </mat-expansion-panel>
+            </div>
 
-    <mat-expansion-panel
-        *ngFor="let field of responseFacetFields"
-        [expanded]="field.expanded"
-        (opened)="onFacetFieldExpanded(field)"
-        (closed)="onFacetFieldCollapsed(field)">
-        <mat-expansion-panel-header>
-            <mat-panel-title>{{ field.label }}</mat-panel-title>
-        </mat-expansion-panel-header>
-
-        <div class="facet-result-filter">
-            <mat-form-field>
-                <input
-                    matInput
-                    placeholder="{{ 'SEARCH.FILTER.ACTIONS.FILTER-CATEGORY' | translate }}"
-                    [(ngModel)]="field.buckets.filterText">
-                <button *ngIf="field.buckets.filterText"
-                    mat-button matSuffix mat-icon-button
-                    (click)="field.buckets.filterText = ''">
-                    <mat-icon>close</mat-icon>
+            <div class="facet-buttons" *ngIf="field.buckets.fitsPage">
+                <button *ngIf="canResetSelectedBuckets(field)"
+                    mat-button
+                    color="primary"
+                    (click)="resetSelectedBuckets(field)">
+                    {{ 'SEARCH.FILTER.ACTIONS.CLEAR-ALL' | translate }}
                 </button>
-            </mat-form-field>
-        </div>
-
-        <div class="checklist">
-            <mat-checkbox
-                *ngFor="let bucket of field.buckets"
-                [checked]="bucket.$checked"
-                (change)="onFacetToggle($event, field, bucket)">
-                {{ bucket.display || bucket.label }} ({{ bucket.count }})
-            </mat-checkbox>
-        </div>
-
-        <div class="facet-buttons" *ngIf="field.buckets.fitsPage">
-            <button *ngIf="canResetSelectedBuckets(field)"
-                mat-button
-                color="primary"
-                (click)="resetSelectedBuckets(field)">
-                {{ 'SEARCH.FILTER.ACTIONS.CLEAR-ALL' | translate }}
-            </button>
-        </div>
-
-        <div class="facet-buttons" *ngIf="!field.buckets.fitsPage">
-            <button mat-icon-button
-                *ngIf="canResetSelectedBuckets(field)"
-                title="{{ 'SEARCH.FILTER.ACTIONS.CLEAR-ALL' | translate }}"
-                (click)="resetSelectedBuckets(field)">
-                <mat-icon>clear</mat-icon>
-            </button>
-            <button mat-icon-button
-                *ngIf="field.buckets.canShowLessItems"
-                (click)="field.buckets.showLessItems()"
-                title="{{ 'SEARCH.FILTER.ACTIONS.SHOW-LESS' | translate }}">
-                <mat-icon>keyboard_arrow_up</mat-icon>
-            </button>
-            <button mat-icon-button
-                *ngIf="field.buckets.canShowMoreItems"
-                (click)="field.buckets.showMoreItems()"
-                title="{{ 'SEARCH.FILTER.ACTIONS.SHOW-MORE' | translate }}">
-                <mat-icon>keyboard_arrow_down</mat-icon>
-            </button>
-        </div>
-    </mat-expansion-panel>
+            </div>
 
+            <div class="facet-buttons" *ngIf="!field.buckets.fitsPage">
+                <button mat-icon-button
+                    *ngIf="canResetSelectedBuckets(field)"
+                    title="{{ 'SEARCH.FILTER.ACTIONS.CLEAR-ALL' | translate }}"
+                    (click)="resetSelectedBuckets(field)">
+                    <mat-icon>clear</mat-icon>
+                </button>
+                <button mat-icon-button
+                    *ngIf="field.buckets.canShowLessItems"
+                    (click)="field.buckets.showLessItems()"
+                    title="{{ 'SEARCH.FILTER.ACTIONS.SHOW-LESS' | translate }}">
+                    <mat-icon>keyboard_arrow_up</mat-icon>
+                </button>
+                <button mat-icon-button
+                    *ngIf="field.buckets.canShowMoreItems"
+                    (click)="field.buckets.showMoreItems()"
+                    title="{{ 'SEARCH.FILTER.ACTIONS.SHOW-MORE' | translate }}">
+                    <mat-icon>keyboard_arrow_down</mat-icon>
+                </button>
+            </div>
+        </mat-expansion-panel>
+    </ng-container>
 </mat-accordion>
diff --git a/lib/content-services/search/components/search-filter/search-filter.component.spec.ts b/lib/content-services/search/components/search-filter/search-filter.component.spec.ts
index b10334aa8a..f8ac696f0f 100644
--- a/lib/content-services/search/components/search-filter/search-filter.component.spec.ts
+++ b/lib/content-services/search/components/search-filter/search-filter.component.spec.ts
@@ -17,15 +17,15 @@
 
 import { SearchFilterComponent } from './search-filter.component';
 import { SearchQueryBuilderService } from '../../search-query-builder.service';
-import { SearchConfiguration } from '../../search-configuration.interface';
 import { AppConfigService, TranslationMock } from '@alfresco/adf-core';
-import { Subject } from 'rxjs/Subject';
-import { ResponseFacetQueryList } from './models/response-facet-query-list.model';
-import { ResponseFacetField } from '../../response-facet-field.interface';
-import { SearchFilterList } from './models/search-filter-list.model';
+import { Subject } from 'rxjs';
 import { FacetFieldBucket } from '../../facet-field-bucket.interface';
+import { FacetQuery } from '../../facet-query.interface';
+import { FacetField } from '../../facet-field.interface';
+import { SearchFilterList } from './models/search-filter-list.model';
+import { ResponseFacetQueryList } from './models/response-facet-query-list.model';
 
-describe('SearchSettingsComponent', () => {
+describe('SearchFilterComponent', () => {
 
     let component: SearchFilterComponent;
     let queryBuilder: SearchQueryBuilderService;
@@ -52,150 +52,62 @@ describe('SearchSettingsComponent', () => {
         expect(component.onDataLoaded).toHaveBeenCalledWith(data);
     });
 
-    it('should update category model on expand', () => {
-        const category: any = { expanded: false };
-
-        component.onCategoryExpanded(category);
-
-        expect(category.expanded).toBeTruthy();
-    });
-
-    it('should update category model on collapse', () => {
-        const category: any = { expanded: true };
-
-        component.onCategoryCollapsed(category);
-
-        expect(category.expanded).toBeFalsy();
-    });
-
-    it('should update facet field model on expand', () => {
-        const field: any = { expanded: false };
-
-        component.onFacetFieldExpanded(field);
-
-        expect(field.expanded).toBeTruthy();
-    });
-
-    it('should update facet field model on collapse', () => {
-        const field: any = { expanded: true };
-
-        component.onFacetFieldCollapsed(field);
-
-        expect(field.expanded).toBeFalsy();
-    });
-
     it('should update bucket model and query builder on facet toggle', () => {
         spyOn(queryBuilder, 'update').and.stub();
+        spyOn(queryBuilder, 'addUserFacetBucket').and.callThrough();
 
         const event: any = { checked: true };
-        const field: any = {};
-        const bucket: any = { $checked: false, filterQuery: 'q1' };
+        const field: FacetField = { field: 'f1', label: 'f1' };
+        const bucket: FacetFieldBucket = { checked: false, filterQuery: 'q1', label: 'q1', count: 1 };
 
-        component.onFacetToggle(event, field, bucket);
-
-        expect(component.selectedBuckets.length).toBe(1);
-        expect(component.selectedBuckets[0]).toEqual(bucket);
-
-        expect(queryBuilder.filterQueries.length).toBe(1);
-        expect(queryBuilder.filterQueries[0].query).toBe('q1');
+        component.onToggleBucket(event, field, bucket);
 
+        expect(bucket.checked).toBeTruthy();
+        expect(queryBuilder.addUserFacetBucket).toHaveBeenCalledWith(field, bucket);
         expect(queryBuilder.update).toHaveBeenCalled();
     });
 
     it('should update bucket model and query builder on facet un-toggle', () => {
         spyOn(queryBuilder, 'update').and.stub();
+        spyOn(queryBuilder, 'removeUserFacetBucket').and.callThrough();
 
         const event: any = { checked: false };
-        const field: any = { label: 'f1' };
-        const bucket: any = { $checked: true, filterQuery: 'q1', $field: 'f1', label: 'b1' };
+        const field: FacetField = { field: 'f1', label: 'f1' };
+        const bucket: FacetFieldBucket = { checked: true, filterQuery: 'q1', label: 'q1', count: 1 };
 
-        component.selectedBuckets.push(bucket);
-        queryBuilder.addFilterQuery(bucket.filterQuery);
-
-        component.onFacetToggle(event, field, bucket);
-
-        expect(bucket.$checked).toBeFalsy();
-        expect(component.selectedBuckets.length).toBe(0);
-        expect(queryBuilder.filterQueries.length).toBe(0);
+        component.onToggleBucket(event, field, bucket);
 
+        expect(queryBuilder.removeUserFacetBucket).toHaveBeenCalledWith(field, bucket);
         expect(queryBuilder.update).toHaveBeenCalled();
     });
 
     it('should unselect facet query and update builder', () => {
-        const translationMock = new TranslationMock();
-        const config: SearchConfiguration = {
-            categories: [],
-            facetQueries: {
-                queries: [
-                    { label: 'q1', query: 'query1' }
-                ]
-            }
-        };
-        appConfig.config.search = config;
-        queryBuilder = new SearchQueryBuilderService(appConfig, null);
-        component = new SearchFilterComponent(queryBuilder, null, translationMock);
-
         spyOn(queryBuilder, 'update').and.stub();
-        queryBuilder.filterQueries = [{ query: 'query1' }];
-        component.selectedFacetQueries = ['q1'];
+        spyOn(queryBuilder, 'removeUserFacetQuery').and.callThrough();
 
-        component.unselectFacetQuery('q1');
+        const event: any = { checked: false };
+        const query: FacetQuery = { checked: true, label: 'q1', query: 'query1' };
 
-        expect(component.selectedFacetQueries.length).toBe(0);
-        expect(queryBuilder.filterQueries.length).toBe(0);
+        component.onToggleFacetQuery(event, query);
 
+        expect(query.checked).toBeFalsy();
+        expect(queryBuilder.removeUserFacetQuery).toHaveBeenCalledWith(query);
         expect(queryBuilder.update).toHaveBeenCalled();
     });
 
-    it('should unselect facet bucket and update builder', () => {
-        spyOn(queryBuilder, 'update').and.stub();
-
-        const bucket: any = { $checked: true, filterQuery: 'q1', $field: 'f1', label: 'b1' };
-        component.selectedBuckets.push(bucket);
-        queryBuilder.filterQueries.push({ query: 'q1' });
-
-        component.unselectFacetBucket(bucket);
-
-        expect(component.selectedBuckets.length).toBe(0);
-        expect(queryBuilder.filterQueries.length).toBe(0);
-
-        expect(queryBuilder.update).toHaveBeenCalled();
-    });
-
-    it('should allow facetQueries when defined in configuration', () => {
-        component.queryBuilder.config = {
-            categories: [],
-            facetQueries: {
-                queries: [
-                    { label: 'q1', query: 'query1' }
-                ]
-            }
-        };
-
-        expect(component.isFacetQueriesDefined).toBe(true);
-    });
-
-    it('should not allow facetQueries when not defined in configuration', () => {
-        component.queryBuilder.config = {
-            categories: []
-        };
-
-        expect(component.isFacetQueriesDefined).toBe(false);
-    });
-
-    it('should not allow facetQueries when queries are not defined in configuration', () => {
-        component.queryBuilder.config = {
-            categories: [],
-            facetQueries: {
-                queries: []
-            }
-        };
-
-        expect(component.isFacetQueriesDefined).toBe(false);
-    });
-
     it('should fetch facet queries from response payload', () => {
-        component.responseFacetQueries = new ResponseFacetQueryList();
+        component.responseFacetQueries = null;
+
+        queryBuilder.config = {
+            categories: [],
+            facetQueries: {
+                queries: [
+                    { label: 'q1', query: 'query1' },
+                    { label: 'q2', query: 'query2' }
+                ]
+            }
+        };
+
         const queries = [
             { label: 'q1', query: 'query1', count: 1 },
             { label: 'q2', query: 'query2', count: 1 }
@@ -214,8 +126,51 @@ describe('SearchSettingsComponent', () => {
         expect(component.responseFacetQueries.items).toEqual(queries);
     });
 
+    it('should preserve order after response processing', () => {
+        component.responseFacetQueries = null;
+
+        queryBuilder.config = {
+            categories: [],
+            facetQueries: {
+                queries: [
+                    { label: 'q1', query: 'query1' },
+                    { label: 'q2', query: 'query2' },
+                    { label: 'q3', query: 'query3' }
+                ]
+            }
+        };
+
+        const queries = [
+            { label: 'q2', query: 'query2', count: 1 },
+            { label: 'q1', query: 'query1', count: 1 },
+            { label: 'q3', query: 'query3', count: 1 }
+
+        ];
+        const data = {
+            list: {
+                context: {
+                    facetQueries: queries
+                }
+            }
+        };
+
+        component.onDataLoaded(data);
+
+        expect(component.responseFacetQueries.length).toBe(3);
+        expect(component.responseFacetQueries.items[0].label).toBe('q1');
+        expect(component.responseFacetQueries.items[1].label).toBe('q2');
+        expect(component.responseFacetQueries.items[2].label).toBe('q3');
+    });
+
     it('should not fetch facet queries from response payload', () => {
-        component.responseFacetQueries = new ResponseFacetQueryList();
+        component.responseFacetQueries = null;
+
+        queryBuilder.config = {
+            categories: [],
+            facetQueries: {
+                queries: []
+            }
+        };
 
         const data = {
             list: {
@@ -227,57 +182,22 @@ describe('SearchSettingsComponent', () => {
 
         component.onDataLoaded(data);
 
-        expect(component.responseFacetQueries.length).toBe(0);
-    });
-
-    it('should restore checked state for new response facet queries', () => {
-        component.selectedFacetQueries = ['q3'];
-        component.responseFacetQueries = new ResponseFacetQueryList();
-
-        const queries = [
-            { label: 'q1', query: 'query1', count: 1 },
-            { label: 'q2', query: 'query2', count: 1 }
-        ];
-        const data = {
-            list: {
-                context: {
-                    facetQueries: queries
-                }
-            }
-        };
-
-        component.onDataLoaded(data);
-
-        expect(component.responseFacetQueries.length).toBe(2);
-        expect((<any> component.responseFacetQueries.items[0]).$checked).toBeFalsy();
-        expect((<any> component.responseFacetQueries.items[1]).$checked).toBeFalsy();
-    });
-
-    it('should not restore checked state for new response facet queries', () => {
-        component.selectedFacetQueries = ['q2'];
-        component.responseFacetQueries = new ResponseFacetQueryList();
-
-        const queries = [
-            { label: 'q1', query: 'query1', count: 1 },
-            { label: 'q2', query: 'query2', count: 1 }
-        ];
-        const data = {
-            list: {
-                context: {
-                    facetQueries: queries
-                }
-            }
-        };
-
-        component.onDataLoaded(data);
-
-        expect(component.responseFacetQueries.length).toBe(2);
-        expect((<any> component.responseFacetQueries.items[0]).$checked).toBeFalsy();
-        expect((<any> component.responseFacetQueries.items[1]).$checked).toBeTruthy();
+        expect(component.responseFacetQueries).toBeNull();
     });
 
     it('should fetch facet fields from response payload', () => {
-        component.responseFacetFields = [];
+        component.responseFacetFields = null;
+
+        queryBuilder.config = {
+            categories: [],
+            facetFields: { fields: [
+                { label: 'f1', field: 'f1' },
+                { label: 'f2', field: 'f2' }
+            ]},
+            facetQueries: {
+                queries: []
+            }
+        };
 
         const fields: any = [
             { label: 'f1', buckets: [] },
@@ -293,95 +213,215 @@ describe('SearchSettingsComponent', () => {
 
         component.onDataLoaded(data);
 
-        expect(component.responseFacetFields).toEqual(fields);
+        expect(component.responseFacetFields.length).toEqual(2);
     });
 
-    it('should restore expanded state for new response facet fields', () => {
-        component.responseFacetFields = <any> [
-            { label: 'f1', buckets: [] },
-            { label: 'f2', buckets: [], expanded: true }
-        ];
+    it('should fetch facet fields from response payload and show the bucket values', () => {
+        component.responseFacetFields = null;
 
-        const fields = [
-            { label: 'f1', buckets: [] },
+        queryBuilder.config = {
+            categories: [],
+            facetFields: { fields: [
+                { label: 'f1', field: 'f1' },
+                { label: 'f2', field: 'f2' }
+            ]},
+            facetQueries: {
+                queries: []
+            }
+        };
+
+        const serverResponseFields: any = [
+            {
+                label: 'f1',
+                buckets: [
+                    { label: 'b1', count: 10 },
+                    { label: 'b2', count: 1 }
+                ]
+            },
             { label: 'f2', buckets: [] }
         ];
         const data = {
             list: {
                 context: {
-                    facetsFields: fields
+                    facetsFields: serverResponseFields
                 }
             }
         };
 
         component.onDataLoaded(data);
 
-        expect(component.responseFacetFields.length).toBe(2);
-        expect(component.responseFacetFields[0].expanded).toBeFalsy();
-        expect(component.responseFacetFields[1].expanded).toBeTruthy();
+        expect(component.responseFacetFields[0].buckets.items[0].count).toEqual(10);
+        expect(component.responseFacetFields[0].buckets.items[1].count).toEqual(1);
     });
 
-    it('should restore checked buckets for new response facet fields', () => {
-        const bucket1 = { label: 'b1', $field: 'f1', count: 1, filterQuery: 'q1' };
-        const bucket2 = { label: 'b2', $field: 'f2', count: 1, filterQuery: 'q2' };
+    it('should fetch facet fields from response payload and update the existing bucket values', () => {
+        queryBuilder.config = {
+            categories: [],
+            facetFields: { fields: [
+                { label: 'f1', field: 'f1' },
+                { label: 'f2', field: 'f2' }
+            ]},
+            facetQueries: {
+                queries: []
+            }
+        };
 
-        component.selectedBuckets = [bucket2];
-        component.responseFacetFields = <any> [
+        const initialFields: any = [
+            { label: 'f1', buckets: { items: [{ label: 'b1', count: 10, filterQuery: 'filter' }, { label: 'b2', count: 1 }]} },
             { label: 'f2', buckets: [] }
         ];
+        component.responseFacetFields = initialFields;
 
+        expect(component.responseFacetFields[0].buckets.items[0].count).toEqual(10);
+        expect(component.responseFacetFields[0].buckets.items[1].count).toEqual(1);
+
+        const serverResponseFields: any = [
+            { label: 'f1', buckets: [{ label: 'b1', count: 6, filterQuery: 'filter' }, { label: 'b2', count: 0 }] },
+            { label: 'f2', buckets: [] }
+        ];
         const data = {
             list: {
                 context: {
-                    facetsFields: [
-                        { label: 'f1', buckets: [bucket1] },
-                        { label: 'f2', buckets: [bucket2] }
-                    ]
+                    facetsFields: serverResponseFields
                 }
             }
         };
 
         component.onDataLoaded(data);
 
-        expect(component.responseFacetFields.length).toBe(2);
-        expect(component.responseFacetFields[0].buckets.items[0].$checked).toBeFalsy();
-        expect(component.responseFacetFields[1].buckets.items[0].$checked).toBeTruthy();
+        expect(component.responseFacetFields[0].buckets.items[0].count).toEqual(6);
+        expect(component.responseFacetFields[0].buckets.items[1].count).toEqual(0);
     });
 
-    it('should reset queries and fields on empty response payload', () => {
-        component.responseFacetQueries = new ResponseFacetQueryList([<any> {}, <any> {}]);
-        component.responseFacetFields = [<any> {}, <any> {}];
-
-        const data = {
-            list: {
-                context: {
-                    facetQueries: null,
-                    facetsFields: null
-                }
+    it('should fetch facet fields from response payload and show the already checked items', () => {
+        spyOn(queryBuilder, 'execute').and.stub();
+        queryBuilder.config = {
+            categories: [],
+            facetFields: { fields: [
+                { label: 'f1', field: 'f1' },
+                { label: 'f2', field: 'f2' }
+            ]},
+            facetQueries: {
+                queries: []
             }
         };
 
+        component.responseFacetFields = <any> [
+            { label: 'f1', field: 'f1', buckets: {items: [
+                { label: 'b1', count: 10, filterQuery: 'filter', checked: true },
+                { label: 'b2', count: 1, filterQuery: 'filter2' }] }},
+            { label: 'f2', field: 'f2', buckets: {items: [] }}
+        ];
+        component.queryBuilder.addUserFacetBucket({ label: 'f1', field: 'f1' }, component.responseFacetFields[0].buckets.items[0]);
+
+        const serverResponseFields: any = [
+            { label: 'f1', field: 'f1', buckets: [
+                { label: 'b1', count: 6, filterQuery: 'filter' },
+                { label: 'b2', count: 1, filterQuery: 'filter2' }] },
+            { label: 'f2', field: 'f2', buckets: [] }
+        ];
+        const data = {
+            list: {
+                context: {
+                    facetsFields: serverResponseFields
+                }
+            }
+        };
+        component.selectFacetBucket({ field: 'f1', label: 'f1' }, component.responseFacetFields[0].buckets.items[1]);
+        component.onDataLoaded(data);
+        expect(component.responseFacetFields.length).toEqual(2);
+        expect(component.responseFacetFields[0].buckets.items[0].checked).toEqual(true, 'should show the already checked item');
+    });
+
+    it('should fetch facet fields from response payload and show the newly checked items', () => {
+        spyOn(queryBuilder, 'execute').and.stub();
+        queryBuilder.config = {
+            categories: [],
+            facetFields: { fields: [
+                { label: 'f1', field: 'f1' },
+                { label: 'f2', field: 'f2' }
+            ]},
+            facetQueries: {
+                queries: []
+            }
+        };
+
+        component.responseFacetFields = <any> [
+            { label: 'f1', field: 'f1', buckets: {items: [
+                        { label: 'b1', count: 10, filterQuery: 'filter', checked: true },
+                        { label: 'b2', count: 1, filterQuery: 'filter2' }] }},
+            { label: 'f2', field: 'f2', buckets: {items: [] }}
+        ];
+        component.queryBuilder.addUserFacetBucket({ label: 'f1', field: 'f1' }, component.responseFacetFields[0].buckets.items[0]);
+
+        const serverResponseFields: any = [
+            { label: 'f1', field: 'f1', buckets: [
+                    { label: 'b1', count: 6, filterQuery: 'filter' },
+                    { label: 'b2', count: 1, filterQuery: 'filter2' }] },
+            { label: 'f2', field: 'f2', buckets: [] }
+        ];
+        const data = {
+            list: {
+                context: {
+                    facetsFields: serverResponseFields
+                }
+            }
+        };
+        component.selectFacetBucket({ label: 'f1', field: 'f1' }, component.responseFacetFields[0].buckets.items[1]);
+        component.onDataLoaded(data);
+        expect(component.responseFacetFields.length).toEqual(2);
+        expect(component.responseFacetFields[0].buckets.items[1].checked).toEqual(true, 'should show the newly checked item');
+    });
+
+    it('should show buckets with 0 values when there are no facet fields on the response payload', () => {
+        spyOn(queryBuilder, 'execute').and.stub();
+        queryBuilder.config = {
+            categories: [],
+            facetFields: { fields: [
+                { label: 'f1', field: 'f1' },
+                { label: 'f2', field: 'f2' }
+            ]},
+            facetQueries: {
+                queries: []
+            }
+        };
+
+        component.responseFacetFields = <any> [
+            { label: 'f1', field: 'f1', buckets: {items: [
+                        { label: 'b1', count: 10, filterQuery: 'filter', checked: true },
+                        { label: 'b2', count: 1, filterQuery: 'filter2' }] }},
+            { label: 'f2', field: 'f2', buckets: {items: [] }}
+        ];
+        component.queryBuilder.addUserFacetBucket({ label: 'f1', field: 'f1' }, component.responseFacetFields[0].buckets.items[0]);
+        const data = {
+            list: {
+                context: {}
+            }
+        };
+        component.selectFacetBucket({ label: 'f1', field: 'f1' }, component.responseFacetFields[0].buckets.items[1]);
         component.onDataLoaded(data);
 
-        expect(component.responseFacetQueries.length).toBe(0);
-        expect(component.responseFacetFields.length).toBe(0);
+        expect(component.responseFacetFields[0].buckets.items[0].count).toEqual(0);
+        expect(component.responseFacetFields[0].buckets.items[1].count).toEqual(0);
     });
 
     it('should update query builder only when has bucket to unselect', () => {
         spyOn(queryBuilder, 'update').and.stub();
 
-        component.unselectFacetBucket(null);
+        const field: FacetField = { field: 'f1', label: 'f1' };
+        component.onToggleBucket(<any> { checked: true }, field, null);
 
         expect(queryBuilder.update).not.toHaveBeenCalled();
     });
 
     it('should allow to to reset selected buckets', () => {
         const buckets: FacetFieldBucket[] = [
-            { label: 'bucket1', $checked: true, count: 1, filterQuery: 'q1' },
-            { label: 'bucket2', $checked: false, count: 1, filterQuery: 'q2' }
+            { label: 'bucket1', checked: true, count: 1, filterQuery: 'q1' },
+            { label: 'bucket2', checked: false, count: 1, filterQuery: 'q2' }
         ];
 
-        const field: ResponseFacetField = {
+        const field: FacetField = {
+            field: 'f1',
             label: 'field1',
             buckets: new SearchFilterList<FacetFieldBucket>(buckets)
         };
@@ -391,11 +431,12 @@ describe('SearchSettingsComponent', () => {
 
     it('should not allow to reset selected buckets', () => {
         const buckets: FacetFieldBucket[] = [
-            { label: 'bucket1', $checked: false, count: 1, filterQuery: 'q1' },
-            { label: 'bucket2', $checked: false, count: 1, filterQuery: 'q2' }
+            { label: 'bucket1', checked: false, count: 1, filterQuery: 'q1' },
+            { label: 'bucket2', checked: false, count: 1, filterQuery: 'q2' }
         ];
 
-        const field: ResponseFacetField = {
+        const field: FacetField = {
+            field: 'f1',
             label: 'field1',
             buckets: new SearchFilterList<FacetFieldBucket>(buckets)
         };
@@ -404,71 +445,59 @@ describe('SearchSettingsComponent', () => {
     });
 
     it('should reset selected buckets', () => {
+        spyOn(queryBuilder, 'execute').and.stub();
         const buckets: FacetFieldBucket[] = [
-            { label: 'bucket1', $checked: false, count: 1, filterQuery: 'q1', $field: 'field1' },
-            { label: 'bucket2', $checked: true, count: 1, filterQuery: 'q2', $field: 'field1' }
+            { label: 'bucket1', checked: false, count: 1, filterQuery: 'q1' },
+            { label: 'bucket2', checked: true, count: 1, filterQuery: 'q2' }
         ];
 
-        const field: ResponseFacetField = {
+        const field: FacetField = {
+            field: 'f1',
             label: 'field1',
             buckets: new SearchFilterList<FacetFieldBucket>(buckets)
         };
 
-        component.selectedBuckets = [buckets[1]];
         component.resetSelectedBuckets(field);
 
-        expect(buckets[0].$checked).toBeFalsy();
-        expect(buckets[1].$checked).toBeFalsy();
-        expect(component.selectedBuckets.length).toBe(0);
+        expect(buckets[0].checked).toBeFalsy();
+        expect(buckets[1].checked).toBeFalsy();
     });
 
     it('should update query builder upon resetting buckets', () => {
         spyOn(queryBuilder, 'update').and.stub();
 
         const buckets: FacetFieldBucket[] = [
-            { label: 'bucket1', $checked: false, count: 1, filterQuery: 'q1', $field: 'field1' },
-            { label: 'bucket2', $checked: true, count: 1, filterQuery: 'q2', $field: 'field1' }
+            { label: 'bucket1', checked: false, count: 1, filterQuery: 'q1' },
+            { label: 'bucket2', checked: true, count: 1, filterQuery: 'q2' }
         ];
 
-        const field: ResponseFacetField = {
+        const field: FacetField = {
+            field: 'f1',
             label: 'field1',
             buckets: new SearchFilterList<FacetFieldBucket>(buckets)
         };
 
-        component.selectedBuckets = [buckets[1]];
         component.resetSelectedBuckets(field);
-
         expect(queryBuilder.update).toHaveBeenCalled();
     });
 
-    it('should allow to reset selected queries', () => {
-        component.selectedFacetQueries = ['q1', 'q2'];
-        expect(component.canResetSelectedQueries()).toBeTruthy();
-    });
-
-    it('should not allow to reset selected queries when nothing selected', () => {
-        component.selectedFacetQueries = [];
-        expect(component.canResetSelectedQueries()).toBeFalsy();
-    });
-
-    it('should reset selected queries', () => {
-        const methodSpy = spyOn(component, 'unselectFacetQuery').and.stub();
-
-        component.selectedFacetQueries = ['q1', 'q2'];
-        component.resetSelectedQueries();
-
-        expect(methodSpy.calls.count()).toBe(2);
-        expect(methodSpy.calls.argsFor(0)).toEqual(['q1', false]);
-        expect(methodSpy.calls.argsFor(1)).toEqual(['q2', false]);
-    });
-
     it('should update query builder upon resetting selected queries', () => {
         spyOn(queryBuilder, 'update').and.stub();
+        spyOn(queryBuilder, 'removeUserFacetQuery').and.callThrough();
 
-        component.selectedFacetQueries = ['q1', 'q2'];
+        component.canResetSelectedQueries = true;
+        component.responseFacetQueries = new ResponseFacetQueryList([
+            { label: 'q1', query: 'q1', checked: true, count: 1 },
+            { label: 'q2', query: 'q2', checked: false, count: 1 },
+            { label: 'q3', query: 'q3', checked: true, count: 1 }
+        ]);
         component.resetSelectedQueries();
 
+        expect(queryBuilder.removeUserFacetQuery).toHaveBeenCalledTimes(3);
         expect(queryBuilder.update).toHaveBeenCalled();
-    });
 
+        for (let entry of component.responseFacetQueries.items) {
+            expect(entry.checked).toBeFalsy();
+        }
+    });
 });
diff --git a/lib/content-services/search/components/search-filter/search-filter.component.ts b/lib/content-services/search/components/search-filter/search-filter.component.ts
index a93cd6a91f..fc47c1a05f 100644
--- a/lib/content-services/search/components/search-filter/search-filter.component.ts
+++ b/lib/content-services/search/components/search-filter/search-filter.component.ts
@@ -19,12 +19,12 @@ import { Component, ViewEncapsulation, OnInit, OnDestroy } from '@angular/core';
 import { MatCheckboxChange } from '@angular/material';
 import { SearchService, TranslationService } from '@alfresco/adf-core';
 import { SearchQueryBuilderService } from '../../search-query-builder.service';
-import { ResponseFacetField } from '../../response-facet-field.interface';
 import { FacetFieldBucket } from '../../facet-field-bucket.interface';
-import { SearchCategory } from '../../search-category.interface';
-import { ResponseFacetQuery } from '../../response-facet-query.interface';
 import { ResponseFacetQueryList } from './models/response-facet-query-list.model';
+import { FacetQuery } from '../../facet-query.interface';
+import { FacetField } from '../../facet-field.interface';
 import { SearchFilterList } from './models/search-filter-list.model';
+import { takeWhile } from 'rxjs/operators';
 
 @Component({
     selector: 'adf-search-filter',
@@ -38,38 +38,42 @@ export class SearchFilterComponent implements OnInit, OnDestroy {
     private DEFAULT_PAGE_SIZE = 5;
 
     isAlive = true;
-    selectedFacetQueries: string[] = [];
-    selectedBuckets: FacetFieldBucket[] = [];
-    responseFacetQueries: ResponseFacetQueryList;
-    responseFacetFields: ResponseFacetField[] = [];
+    responseFacetQueries: ResponseFacetQueryList = null;
+    responseFacetFields: FacetField[] = null;
 
+    private facetQueriesPageSize = this.DEFAULT_PAGE_SIZE;
     facetQueriesLabel: string = 'Facet Queries';
-    facetQueriesPageSize = this.DEFAULT_PAGE_SIZE;
     facetQueriesExpanded = false;
+    facetFieldsExpanded = false;
+    canResetSelectedQueries = false;
+
+    selectedFacetQueries: Array<FacetQuery> = [];
+    selectedBuckets: Array<{ field: FacetField, bucket: FacetFieldBucket }> = [];
 
     constructor(public queryBuilder: SearchQueryBuilderService,
                 private searchService: SearchService,
                 private translationService: TranslationService) {
-        this.responseFacetQueries = new ResponseFacetQueryList();
-
         if (queryBuilder.config && queryBuilder.config.facetQueries) {
             this.facetQueriesLabel = queryBuilder.config.facetQueries.label || 'Facet Queries';
             this.facetQueriesPageSize = queryBuilder.config.facetQueries.pageSize || this.DEFAULT_PAGE_SIZE;
             this.facetQueriesExpanded = queryBuilder.config.facetQueries.expanded;
         }
+        if (queryBuilder.config && queryBuilder.config.facetFields) {
+            this.facetFieldsExpanded = queryBuilder.config.facetFields.expanded;
+        }
 
-        this.queryBuilder.updated
-            .takeWhile(() => this.isAlive)
-            .subscribe(query => {
+        this.queryBuilder.updated.pipe(
+            takeWhile(() => this.isAlive)
+        ).subscribe(() => {
             this.queryBuilder.execute();
         });
     }
 
     ngOnInit() {
         if (this.queryBuilder) {
-            this.queryBuilder.executed
-                .takeWhile(() => this.isAlive)
-                .subscribe(data => {
+            this.queryBuilder.executed.pipe(
+                takeWhile(() => this.isAlive)
+            ).subscribe((data) => {
                 this.onDataLoaded(data);
                 this.searchService.dataLoaded.next(data);
             });
@@ -77,128 +81,120 @@ export class SearchFilterComponent implements OnInit, OnDestroy {
     }
 
     ngOnDestroy() {
-       this.isAlive = false;
+        this.isAlive = false;
     }
 
-    get isFacetQueriesDefined() {
-        return this.queryBuilder.hasFacetQueries;
-    }
-
-    onCategoryExpanded(category: SearchCategory) {
-        category.expanded = true;
-    }
-
-    onCategoryCollapsed(category: SearchCategory) {
-        category.expanded = false;
-    }
-
-    onFacetFieldExpanded(field: ResponseFacetField) {
-        field.expanded = true;
-    }
-
-    onFacetFieldCollapsed(field: ResponseFacetField) {
-        field.expanded = false;
-    }
-
-    onFacetQueryToggle(event: MatCheckboxChange, query: ResponseFacetQuery) {
-        const facetQuery = this.queryBuilder.getFacetQuery(query.label);
-
-        if (event.checked) {
-            query.$checked = true;
-            this.selectedFacetQueries.push(facetQuery.label);
-
-            if (facetQuery) {
-                this.queryBuilder.addFilterQuery(facetQuery.query);
-            }
-        } else {
-            query.$checked = false;
-            this.selectedFacetQueries = this.selectedFacetQueries.filter(selectedQuery => selectedQuery !== query.label);
-
-            if (facetQuery) {
-                this.queryBuilder.removeFilterQuery(facetQuery.query);
+    onToggleFacetQuery(event: MatCheckboxChange, facetQuery: FacetQuery) {
+        if (event && facetQuery) {
+            if (event.checked) {
+                this.selectFacetQuery(facetQuery);
+            } else {
+                this.unselectFacetQuery(facetQuery);
             }
         }
-
-        this.queryBuilder.update();
     }
 
-    onFacetToggle(event: MatCheckboxChange, field: ResponseFacetField, bucket: FacetFieldBucket) {
-        if (event.checked) {
-            bucket.$checked = true;
-            this.selectedBuckets.push({ ...bucket });
-            this.queryBuilder.addFilterQuery(bucket.filterQuery);
-        } else {
-            bucket.$checked = false;
-            const idx = this.selectedBuckets.findIndex(
-                b => b.$field === bucket.$field && b.label === bucket.label
-            );
-
-            if (idx >= 0) {
-                this.selectedBuckets.splice(idx, 1);
-            }
-            this.queryBuilder.removeFilterQuery(bucket.filterQuery);
-        }
-
-        this.queryBuilder.update();
-    }
-
-    unselectFacetQuery(label: string, reloadQuery: boolean = true) {
-        const facetQuery = this.queryBuilder.getFacetQuery(label);
-        if (facetQuery) {
-            this.queryBuilder.removeFilterQuery(facetQuery.query);
-        }
-
-        this.selectedFacetQueries = this.selectedFacetQueries.filter(selectedQuery => selectedQuery !== label);
-
-        if (reloadQuery) {
+    selectFacetQuery(query: FacetQuery) {
+        if (query) {
+            query.checked = true;
+            this.queryBuilder.addUserFacetQuery(query);
+            this.updateSelectedFields();
             this.queryBuilder.update();
         }
     }
 
-    unselectFacetBucket(bucket: FacetFieldBucket, reloadQuery: boolean = true) {
-        if (bucket) {
-            const idx = this.selectedBuckets.findIndex(
-                selectedBucket => selectedBucket.$field === bucket.$field && selectedBucket.label === bucket.label
-            );
+    unselectFacetQuery(query: FacetQuery) {
+        if (query) {
+            query.checked = false;
+            this.queryBuilder.removeUserFacetQuery(query);
+            this.updateSelectedFields();
+            this.queryBuilder.update();
+        }
+    }
 
-            if (idx >= 0) {
-                this.selectedBuckets.splice(idx, 1);
+    private updateSelectedBuckets() {
+        if (this.responseFacetFields) {
+            this.selectedBuckets = [];
+            for (let field of this.responseFacetFields) {
+                if (field.buckets) {
+                    this.selectedBuckets.push(
+                        ...this.queryBuilder.getUserFacetBuckets(field.field)
+                            .filter(bucket => bucket.checked)
+                            .map(bucket => {
+                                return { field, bucket };
+                            })
+                    );
+                }
             }
-            this.queryBuilder.removeFilterQuery(bucket.filterQuery);
+        } else {
+            this.selectedBuckets = [];
+        }
+    }
 
-            bucket.$checked = false;
+    private updateSelectedFields() {
+        if (this.responseFacetQueries) {
+            this.selectedFacetQueries = this.responseFacetQueries.items.filter(item => item.checked);
+            this.canResetSelectedQueries = this.selectedFacetQueries.length > 0;
+        } else {
+            this.selectedFacetQueries = [];
+            this.canResetSelectedQueries = false;
+        }
+    }
 
-            if (reloadQuery) {
-                this.queryBuilder.update();
+    onToggleBucket(event: MatCheckboxChange, field: FacetField, bucket: FacetFieldBucket) {
+        if (event && bucket) {
+            if (event.checked) {
+                this.selectFacetBucket(field, bucket);
+            } else {
+                this.unselectFacetBucket(field, bucket);
             }
         }
     }
 
-    canResetSelectedQueries(): boolean {
-        return this.selectedFacetQueries && this.selectedFacetQueries.length > 0;
+    selectFacetBucket(field: FacetField, bucket: FacetFieldBucket) {
+        if (bucket) {
+            bucket.checked = true;
+            this.queryBuilder.addUserFacetBucket(field, bucket);
+            this.updateSelectedBuckets();
+            this.queryBuilder.update();
+        }
+    }
+
+    unselectFacetBucket(field: FacetField, bucket: FacetFieldBucket) {
+        if (bucket) {
+            bucket.checked = false;
+            this.queryBuilder.removeUserFacetBucket(field, bucket);
+            this.updateSelectedBuckets();
+            this.queryBuilder.update();
+        }
     }
 
     resetSelectedQueries() {
-        if (this.canResetSelectedQueries()) {
-            this.selectedFacetQueries.forEach(query => {
-                this.unselectFacetQuery(query, false);
-            });
+        if (this.canResetSelectedQueries) {
+            for (let query of this.responseFacetQueries.items) {
+                query.checked = false;
+                this.queryBuilder.removeUserFacetQuery(query);
+            }
+            this.selectedFacetQueries = [];
+            this.canResetSelectedQueries = false;
             this.queryBuilder.update();
         }
     }
 
-    canResetSelectedBuckets(field: ResponseFacetField): boolean {
+    canResetSelectedBuckets(field: FacetField): boolean {
         if (field && field.buckets) {
-            return field.buckets.items.some(bucket => bucket.$checked);
+            return field.buckets.items.some(bucket => bucket.checked);
         }
         return false;
     }
 
-    resetSelectedBuckets(field: ResponseFacetField) {
+    resetSelectedBuckets(field: FacetField) {
         if (field && field.buckets) {
-            field.buckets.items.forEach(bucket => {
-                this.unselectFacetBucket(bucket, false);
-            });
+            for (let bucket of field.buckets.items) {
+                bucket.checked = false;
+                this.queryBuilder.removeUserFacetBucket(field, bucket);
+            }
+            this.updateSelectedBuckets();
             this.queryBuilder.update();
         }
     }
@@ -207,64 +203,120 @@ export class SearchFilterComponent implements OnInit, OnDestroy {
         const context = data.list.context;
 
         if (context) {
-            const facetQueries = (context.facetQueries || []).map(query => {
-                query.label = this.translationService.instant(query.label);
-                query.$checked = this.selectedFacetQueries.includes(query.label);
-                return query;
-            });
+            this.parseFacetFields(context);
+            this.parseFacetQueries(context);
+        } else {
+            this.responseFacetQueries = null;
+            this.responseFacetFields = null;
+        }
+    }
 
-            this.responseFacetQueries = new ResponseFacetQueryList(facetQueries, this.facetQueriesPageSize);
+    private parseFacetFields(context: any) {
+        const configFacetFields = this.queryBuilder.config.facetFields && this.queryBuilder.config.facetFields.fields || [];
 
-            const expandedFields = this.responseFacetFields
-                .filter(field => field.expanded)
-                .map(field => field.label);
+        const bkpResponseFacetFields =  [...this.responseFacetFields || []];
+        this.responseFacetFields = configFacetFields
+            .map(field => {
 
-            this.responseFacetFields = (context.facetsFields || []).map(
-                field => {
-                    const settings = this.queryBuilder.getFacetField(field.label);
+                const bkpField = bkpResponseFacetFields.find(item => item.field === field.field);
 
-                    let fallbackPageSize = this.DEFAULT_PAGE_SIZE;
-                    if (settings && settings.pageSize) {
-                        fallbackPageSize = settings.pageSize;
-                    }
+                let bkpBuckets = (bkpField && bkpField.buckets.items || [])
+                    .map(bucket => {
+                        const currentlySelected = this.selectedBuckets.find(facetBucket => facetBucket.bucket.label === bucket.label);
+                        bucket.count = (currentlySelected ? 0 : null);
 
-                    field.label = this.translationService.instant(field.label);
-                    field.pageSize = field.pageSize || fallbackPageSize;
-                    field.currentPageSize = field.pageSize;
-                    field.expanded = expandedFields.includes(field.label);
-
-                    const buckets = (field.buckets || []).map(bucket => {
-                        bucket.$field = field.label;
-                        bucket.$checked = false;
-                        bucket.display = this.translationService.instant(bucket.display);
-                        bucket.label = this.translationService.instant(bucket.label);
-
-                        const previousBucket = this.selectedBuckets.find(
-                            selectedBucket => selectedBucket.$field === bucket.$field && selectedBucket.label === bucket.label
-                        );
-                        if (previousBucket) {
-                           bucket.$checked = true;
-                        }
                         return bucket;
                     });
 
-                    const bucketList = new SearchFilterList<FacetFieldBucket>(buckets, field.pageSize);
-                    bucketList.filter = (bucket: FacetFieldBucket): boolean => {
-                        if (bucket && bucketList.filterText) {
-                            const pattern = (bucketList.filterText || '').toLowerCase();
-                            const label = (bucket.display || bucket.label || '').toLowerCase();
-                            return label.startsWith(pattern);
-                        }
-                        return true;
-                    };
+                let responseField = (context.facetsFields || []).find(response => response.label === field.label);
 
-                    field.buckets = bucketList;
-                    return field;
+                if (!responseField && bkpBuckets.length) {
+                    responseField = { buckets: [...bkpBuckets] };
                 }
-            );
-        } else {
-            this.responseFacetQueries = new ResponseFacetQueryList([], this.facetQueriesPageSize);
-            this.responseFacetFields = [];
+
+                if (responseField && this.selectedBuckets.length) {
+                    responseField.buckets = bkpBuckets.map(bkpBucket => {
+                        const responseBucket = responseField.buckets.find(respBucket => respBucket.label === bkpBucket.label);
+
+                        if (responseBucket) {
+                            bkpBucket.count = responseBucket.count;
+                        }
+                        return bkpBucket;
+                    });
+                }
+
+                const buckets: FacetFieldBucket[] = ((responseField && responseField.buckets) || []).map(bucket => {
+                    const selectedBucket = this.selectedBuckets.find(facetBucket =>
+                        facetBucket.bucket.label === bucket.label && facetBucket.field.field === field.field);
+
+                    return <FacetFieldBucket> {
+                        ...bucket,
+                        checked: !!selectedBucket,
+                        display: this.translationService.instant(bucket.display),
+                        label: this.translationService.instant(bucket.label)
+                    };
+                });
+                const bucketList = new SearchFilterList<FacetFieldBucket>(buckets, field.pageSize);
+                bucketList.filter = (bucket: FacetFieldBucket): boolean => {
+                    if (bucket && bucketList.filterText) {
+                        const pattern = (bucketList.filterText || '').toLowerCase();
+                        const label = (bucket.display || bucket.label || '').toLowerCase();
+                        return label.startsWith(pattern);
+                    }
+                    return true;
+                };
+                return {
+                    ...field,
+                    label: this.translationService.instant(field.label),
+                    pageSize: field.pageSize | this.DEFAULT_PAGE_SIZE,
+                    currentPageSize: field.pageSize | this.DEFAULT_PAGE_SIZE,
+                    buckets: bucketList
+                };
+            });
+    }
+
+    private parseFacetQueries(context: any) {
+        const responseQueries = this.getFacetQueryMap(context);
+        if (this.queryBuilder.config.facetQueries) {
+            const bkpResponseFacetQueries =  Object.assign({}, this.responseFacetQueries);
+            const facetQueries = (this.queryBuilder.config.facetQueries.queries || [])
+                .map(query => {
+
+                    const queryResult = responseQueries[query.label];
+                    const bkpQuery = (bkpResponseFacetQueries.items || []).find(item => item.label === query.label);
+
+                    if (bkpQuery) {
+                        bkpQuery.count = queryResult.count;
+                        return bkpQuery;
+                    }
+                    return <FacetQuery> {
+                        ...query,
+                        label: this.translationService.instant(query.label),
+                        count: queryResult.count
+                    };
+                });
+
+            if (facetQueries.length > 0) {
+                if (this.responseFacetQueries) {
+                    this.responseFacetQueries.items = facetQueries;
+
+                } else {
+                    this.responseFacetQueries = new ResponseFacetQueryList(facetQueries, this.facetQueriesPageSize);
+                }
+
+            } else {
+                this.responseFacetQueries = null;
+            }
         }
     }
+
+    private getFacetQueryMap(context: any): { [key: string]: any } {
+        const result = {};
+
+        (context.facetQueries || []).forEach(query => {
+            result[query.label] = query;
+        });
+
+        return result;
+    }
 }
diff --git a/lib/content-services/search/components/search-number-range/search-number-range.component.html b/lib/content-services/search/components/search-number-range/search-number-range.component.html
index a6f47f8688..a747d767e2 100644
--- a/lib/content-services/search/components/search-number-range/search-number-range.component.html
+++ b/lib/content-services/search/components/search-number-range/search-number-range.component.html
@@ -5,7 +5,7 @@
             matInput [formControl]="from" [errorStateMatcher]="matcher"
             placeholder="{{ 'SEARCH.FILTER.RANGE.FROM' | translate }}"
             autocomplete="off">
-        <mat-error *ngIf="from.hasError('pattern')">
+        <mat-error *ngIf="from.hasError('pattern') || from.hasError('min')">
             {{ 'SEARCH.FILTER.VALIDATION.INVALID-FORMAT' | translate }}
         </mat-error>
         <mat-error *ngIf="from.hasError('required')">
@@ -18,7 +18,7 @@
             matInput [formControl]="to" [errorStateMatcher]="matcher"
             placeholder="{{ 'SEARCH.FILTER.RANGE.TO' | translate }}"
             autocomplete="off">
-        <mat-error *ngIf="to.hasError('pattern')">
+        <mat-error *ngIf="to.hasError('pattern') || to.hasError('min')">
             {{ 'SEARCH.FILTER.VALIDATION.INVALID-FORMAT' | translate }}
         </mat-error>
         <mat-error *ngIf="to.hasError('required')">
diff --git a/lib/content-services/search/components/search-number-range/search-number-range.component.spec.ts b/lib/content-services/search/components/search-number-range/search-number-range.component.spec.ts
index defa51af13..68399f33f7 100644
--- a/lib/content-services/search/components/search-number-range/search-number-range.component.spec.ts
+++ b/lib/content-services/search/components/search-number-range/search-number-range.component.spec.ts
@@ -160,4 +160,10 @@ describe('SearchNumberRangeComponent', () => {
         component.from = new FormControl(123, component.validators);
         expect(component.from.hasError('required')).toBe(false);
     });
+
+    it('should throw error if "from" value is a negative value', () => {
+        component.ngOnInit();
+        component.from = new FormControl(-100, component.validators);
+        expect(component.from.hasError('min')).toBe(true);
+    });
 });
diff --git a/lib/content-services/search/components/search-number-range/search-number-range.component.ts b/lib/content-services/search/components/search-number-range/search-number-range.component.ts
index c6f754a2c0..1c79cccdc1 100644
--- a/lib/content-services/search/components/search-number-range/search-number-range.component.ts
+++ b/lib/content-services/search/components/search-number-range/search-number-range.component.ts
@@ -55,7 +55,8 @@ export class SearchNumberRangeComponent implements SearchWidget, OnInit {
 
         this.validators = Validators.compose([
             Validators.required,
-            Validators.pattern(/^-?(0|[1-9]\d*)?$/)
+            Validators.pattern(/^-?(0|[1-9]\d*)?$/),
+            Validators.min(0)
         ]);
 
         this.from = new FormControl('', this.validators);
@@ -78,9 +79,8 @@ export class SearchNumberRangeComponent implements SearchWidget, OnInit {
             map.set('TO', model.to);
 
             const value = this.formatString(this.format, map);
-            const query = `${this.field}:${value}`;
 
-            this.context.queryFragments[this.id] = query;
+            this.context.queryFragments[this.id] = `${this.field}:${value}`;
             this.context.update();
         }
     }
diff --git a/lib/content-services/search/components/search-text/search-text.component.scss b/lib/content-services/search/components/search-text/search-text.component.scss
index 62a8a84b85..d0c6106ed9 100644
--- a/lib/content-services/search/components/search-text/search-text.component.scss
+++ b/lib/content-services/search/components/search-text/search-text.component.scss
@@ -1,5 +1,5 @@
 .adf-search-text {
-    .mat-input-container {
+    .mat-form-field {
         width: 100%
     }
 }
diff --git a/lib/content-services/search/components/search-trigger.directive.ts b/lib/content-services/search/components/search-trigger.directive.ts
index f27f3cb892..7d273aa953 100644
--- a/lib/content-services/search/components/search-trigger.directive.ts
+++ b/lib/content-services/search/components/search-trigger.directive.ts
@@ -30,13 +30,10 @@ import {
     Optional
 } from '@angular/core';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
-import { DOCUMENT } from '@angular/platform-browser';
-import { Observable } from 'rxjs/Observable';
-import { fromEvent } from 'rxjs/observable/fromEvent';
-import { merge } from 'rxjs/observable/merge';
-import { Subject } from 'rxjs/Subject';
-import { Subscription } from 'rxjs/Subscription';
+import { DOCUMENT } from '@angular/common';
+import { Observable, Subject, Subscription, merge, of, fromEvent } from 'rxjs';
 import { SearchComponent } from './search.component';
+import { filter, switchMap } from 'rxjs/operators';
 
 export const SEARCH_AUTOCOMPLETE_VALUE_ACCESSOR: any = {
     provide: NG_VALUE_ACCESSOR,
@@ -48,10 +45,9 @@ export const SEARCH_AUTOCOMPLETE_VALUE_ACCESSOR: any = {
     selector: `input[searchAutocomplete], textarea[searchAutocomplete]`,
     host: {
         'role': 'combobox',
-        'autocomplete': 'off',
+        '[attr.autocomplete]': 'autocomplete',
         'aria-autocomplete': 'list',
         '[attr.aria-expanded]': 'panelOpen.toString()',
-        '[attr.aria-owns]': 'autocomplete?.id',
         '(blur)': 'onTouched()',
         '(input)': 'handleInput($event)',
         '(keydown)': 'handleKeydown($event)'
@@ -63,6 +59,9 @@ export class SearchTriggerDirective implements ControlValueAccessor, OnDestroy {
     @Input('searchAutocomplete')
     searchPanel: SearchComponent;
 
+    @Input()
+    autocomplete: string = 'off';
+
     private _panelOpen: boolean = false;
     private closingActionsSubscription: Subscription;
     private escapeEventStream = new Subject<void>();
@@ -114,17 +113,18 @@ export class SearchTriggerDirective implements ControlValueAccessor, OnDestroy {
 
     private get outsideClickStream(): Observable<any> {
         if (!this.document) {
-            return Observable.of(null);
+            return of(null);
         }
 
         return merge(
             fromEvent(this.document, 'click'),
             fromEvent(this.document, 'touchend')
-        ).filter((event: MouseEvent | TouchEvent) => {
-            const clickTarget = event.target as HTMLElement;
-            return this._panelOpen &&
-                clickTarget !== this.element.nativeElement;
-        });
+        ).pipe(
+            filter((event: MouseEvent | TouchEvent) => {
+                const clickTarget = event.target as HTMLElement;
+                return this._panelOpen && clickTarget !== this.element.nativeElement;
+            })
+        );
     }
 
     writeValue(value: any): void {
@@ -186,10 +186,12 @@ export class SearchTriggerDirective implements ControlValueAccessor, OnDestroy {
         const optionChanges = this.searchPanel.keyPressedStream.asObservable();
 
         return merge(firstStable, optionChanges)
-            .switchMap(() => {
-                this.searchPanel.setVisibility();
-                return this.panelClosingActions;
-            })
+            .pipe(
+                switchMap(() => {
+                    this.searchPanel.setVisibility();
+                    return this.panelClosingActions;
+                })
+            )
             .subscribe(event => this.setValueAndClose(event));
     }
 
diff --git a/lib/content-services/search/components/search.component.spec.ts b/lib/content-services/search/components/search.component.spec.ts
index 945a70781e..636c8a1860 100644
--- a/lib/content-services/search/components/search.component.spec.ts
+++ b/lib/content-services/search/components/search.component.spec.ts
@@ -19,18 +19,18 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { SearchService, setupTestBed, CoreModule } from '@alfresco/adf-core';
 import { QueryBody } from 'alfresco-js-api';
 import { differentResult, folderResult, result, SimpleSearchTestComponent } from '../../mock';
-import { Observable } from 'rxjs/Observable';
+import { Observable, of, throwError } from 'rxjs';
 import { SearchModule } from '../search.module';
 
 function fakeNodeResultSearch(searchNode: QueryBody): Observable<any> {
     if (searchNode && searchNode.query.query === 'FAKE_SEARCH_EXMPL') {
-        return Observable.of(differentResult);
+        return of(differentResult);
     }
     if (searchNode && searchNode.filterQueries.length === 1 &&
         searchNode.filterQueries[0].query === "TYPE:'cm:folder'") {
-        return Observable.of(folderResult);
+        return of(folderResult);
     }
-    return Observable.of(result);
+    return of(result);
 }
 
 describe('SearchComponent', () => {
@@ -58,8 +58,8 @@ describe('SearchComponent', () => {
 
         it('should clear results straight away when a new search term is entered', (done) => {
             spyOn(searchService, 'search').and.returnValues(
-                Observable.of(result),
-                Observable.of(differentResult)
+                of(result),
+                of(differentResult)
             );
 
             component.setSearchWordTo('searchTerm');
@@ -80,8 +80,7 @@ describe('SearchComponent', () => {
         });
 
         it('should display the returned search results', (done) => {
-            spyOn(searchService, 'search')
-                .and.returnValue(Observable.of(result));
+            spyOn(searchService, 'search').and.returnValue(of(result));
 
             component.setSearchWordTo('searchTerm');
             fixture.detectChanges();
@@ -95,7 +94,7 @@ describe('SearchComponent', () => {
 
         it('should emit error event when search call fail', (done) => {
             spyOn(searchService, 'search')
-                .and.returnValue(Observable.throw({ status: 402 }));
+                .and.returnValue(throwError({ status: 402 }));
             component.setSearchWordTo('searchTerm');
             fixture.detectChanges();
             fixture.whenStable().then(() => {
@@ -108,8 +107,8 @@ describe('SearchComponent', () => {
 
         it('should be able to hide the result panel', (done) => {
             spyOn(searchService, 'search').and.returnValues(
-                Observable.of(result),
-                Observable.of(differentResult)
+                of(result),
+                of(differentResult)
             );
 
             component.setSearchWordTo('searchTerm');
@@ -156,8 +155,8 @@ describe('SearchComponent', () => {
             });
         });
 
-        it('should perform a search with a defaultNode if no searchnode is given', (done) => {
-            spyOn(searchService, 'search').and.returnValue(Observable.of(result));
+        it('should perform a search with a defaultNode if no search node is given', (done) => {
+            spyOn(searchService, 'search').and.returnValue(of(result));
             component.setSearchWordTo('searchTerm');
             fixture.detectChanges();
             fixture.whenStable().then(() => {
diff --git a/lib/content-services/search/components/search.component.ts b/lib/content-services/search/components/search.component.ts
index c515779e91..5db3475c16 100644
--- a/lib/content-services/search/components/search.component.ts
+++ b/lib/content-services/search/components/search.component.ts
@@ -30,7 +30,8 @@ import {
     ViewEncapsulation
 } from '@angular/core';
 import { NodePaging, QueryBody } from 'alfresco-js-api';
-import { Subject } from 'rxjs/Subject';
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
 
 @Component({
     selector: 'adf-search',
@@ -110,7 +111,9 @@ export class SearchComponent implements AfterContentInit, OnChanges {
     constructor(private searchService: SearchService,
                 private _elementRef: ElementRef) {
         this.keyPressedStream.asObservable()
-            .debounceTime(200)
+            .pipe(
+                debounceTime(200)
+            )
             .subscribe((searchedWord: string) => {
                 this.loadSearchResults(searchedWord);
             });
diff --git a/lib/content-services/search/facet-field-bucket.interface.ts b/lib/content-services/search/facet-field-bucket.interface.ts
index 47bcab9fcd..3de44c76d8 100644
--- a/lib/content-services/search/facet-field-bucket.interface.ts
+++ b/lib/content-services/search/facet-field-bucket.interface.ts
@@ -21,6 +21,7 @@ export interface FacetFieldBucket {
     label: string;
     filterQuery: string;
 
-    $checked?: boolean;
-    $field?: string;
+    checked?: boolean;
+    field?: string;
+
 }
diff --git a/lib/content-services/search/facet-field.interface.ts b/lib/content-services/search/facet-field.interface.ts
index 96f19b11b5..cc50641bc6 100644
--- a/lib/content-services/search/facet-field.interface.ts
+++ b/lib/content-services/search/facet-field.interface.ts
@@ -15,6 +15,9 @@
  * limitations under the License.
  */
 
+import { SearchFilterList } from './components/search-filter/models/search-filter-list.model';
+import { FacetFieldBucket } from './facet-field-bucket.interface';
+
 export interface FacetField {
     field: string;
     label: string;
@@ -23,6 +26,8 @@ export interface FacetField {
     offset?: number;
     prefix?: string;
 
+    buckets?: SearchFilterList<FacetFieldBucket>;
     pageSize?: number;
-    $checked?: boolean;
+    currentPageSize?: number;
+    checked?: boolean;
 }
diff --git a/lib/content-services/search/facet-query.interface.ts b/lib/content-services/search/facet-query.interface.ts
index e810f2d4d3..9b7a15210f 100644
--- a/lib/content-services/search/facet-query.interface.ts
+++ b/lib/content-services/search/facet-query.interface.ts
@@ -16,12 +16,9 @@
  */
 
 export interface FacetQuery {
-    query: string;
     label: string;
-}
+    query: string;
 
-export interface ResponseFacetQuery {
-    label?: string;
-    filterQuery?: string;
+    checked?: boolean;
     count?: number;
 }
diff --git a/lib/content-services/search/public-api.ts b/lib/content-services/search/public-api.ts
index df82cba669..7cfac7882b 100644
--- a/lib/content-services/search/public-api.ts
+++ b/lib/content-services/search/public-api.ts
@@ -19,8 +19,6 @@ export { FacetFieldBucket } from './facet-field-bucket.interface';
 export { FacetField } from './facet-field.interface';
 export { FacetQuery } from './facet-query.interface';
 export { FilterQuery } from './filter-query.interface';
-export { ResponseFacetField } from './response-facet-field.interface';
-export { ResponseFacetQuery } from './response-facet-query.interface';
 export { SearchCategory } from './search-category.interface';
 export { SearchWidgetSettings } from './search-widget-settings.interface';
 export { SearchWidget } from './search-widget.interface';
@@ -33,6 +31,7 @@ export * from './components/search-control.component';
 export * from './components/search-trigger.directive';
 export * from './components/empty-search-result.component';
 export * from './components/search-filter/search-filter.component';
+export * from './components/search-filter/search-filter.service';
 export * from './components/search-chip-list/search-chip-list.component';
 export * from './components/search-sorting-picker/search-sorting-picker.component';
 
diff --git a/lib/content-services/search/search-configuration.interface.ts b/lib/content-services/search/search-configuration.interface.ts
index 8a20ceb7e7..22ff951d5d 100644
--- a/lib/content-services/search/search-configuration.interface.ts
+++ b/lib/content-services/search/search-configuration.interface.ts
@@ -32,7 +32,10 @@ export interface SearchConfiguration {
         expanded?: boolean;
         queries: Array<FacetQuery>;
     };
-    facetFields?: Array<FacetField>;
+    facetFields?: {
+        expanded?: boolean;
+        fields: Array<FacetField>;
+    };
     sorting?: {
         options: Array<SearchSortingDefinition>;
         defaults: Array<SearchSortingDefinition>;
diff --git a/lib/content-services/search/search-query-builder.service.spec.ts b/lib/content-services/search/search-query-builder.service.spec.ts
index 40fb0964f7..0a1727f370 100644
--- a/lib/content-services/search/search-query-builder.service.spec.ts
+++ b/lib/content-services/search/search-query-builder.service.spec.ts
@@ -18,6 +18,7 @@
 import { SearchQueryBuilderService } from './search-query-builder.service';
 import { SearchConfiguration } from './search-configuration.interface';
 import { AppConfigService } from '@alfresco/adf-core';
+import { FacetField } from './facet-field.interface';
 
 describe('SearchQueryBuilder', () => {
 
@@ -189,10 +190,10 @@ describe('SearchQueryBuilder', () => {
     it('should fetch facet from the config by label', () => {
         const config: SearchConfiguration = {
             categories: [],
-            facetFields: [
+            facetFields: { 'fields': [
                 { 'field': 'content.mimetype', 'mincount': 1, 'label': 'Type' },
                 { 'field': 'content.size', 'mincount': 1, 'label': 'Size' }
-            ]
+            ]}
         };
         const builder = new SearchQueryBuilderService(buildConfig(config), null);
         const field = builder.getFacetField('Size');
@@ -204,15 +205,15 @@ describe('SearchQueryBuilder', () => {
     it('should not fetch facet from the config by label', () => {
         const config: SearchConfiguration = {
             categories: [],
-            facetFields: [
+            facetFields: { 'fields': [
                 { 'field': 'content.mimetype', 'mincount': 1, 'label': 'Type' },
                 { 'field': 'content.size', 'mincount': 1, 'label': 'Size' }
-            ]
+            ]}
         };
         const builder = new SearchQueryBuilderService(buildConfig(config), null);
         const field = builder.getFacetField('Missing');
 
-        expect(field).toBeUndefined();
+        expect(field).toBeFalsy();
     });
 
     xit('should build query and raise an event on update', async () => {
@@ -358,16 +359,16 @@ describe('SearchQueryBuilder', () => {
             categories: [
                 <any> { id: 'cat1', enabled: true }
             ],
-            facetFields: [
+            facetFields: { fields: [
                 { field: 'field1', label: 'field1', mincount: 1, limit: null, offset: 0, prefix: null },
                 { field: 'field2', label: 'field2', mincount: 1, limit: null, offset: 0, prefix: null }
-            ]
+            ]}
         };
         const builder = new SearchQueryBuilderService(buildConfig(config), null);
         builder.queryFragments['cat1'] = 'cm:name:test';
 
         const compiled = builder.buildQuery();
-        expect(compiled.facetFields.facets).toEqual(jasmine.objectContaining(config.facetFields));
+        expect(compiled.facetFields.facets).toEqual(jasmine.objectContaining(config.facetFields.fields));
     });
 
     it('should build query with sorting', () => {
@@ -420,4 +421,43 @@ describe('SearchQueryBuilder', () => {
         expect(compiled.query.query).toBe('(my query) AND (cm:name:test)');
     });
 
+    it('should group facet buckets by field', () => {
+        const field1: FacetField = {
+            field: 'f1',
+            label: 'f1'
+        };
+
+        const field1buckets = [
+            { checked: true, filterQuery: 'f1-q1', label: 'f1-q1', count: 1 },
+            { checked: true, filterQuery: 'f1-q2', label: 'f1-q2', count: 1 }
+        ];
+
+        const field2: FacetField = {
+            field: 'f2',
+            label: 'f2'
+        };
+
+        const field2buckets = [
+            { checked: true, filterQuery: 'f2-q1', label: 'f2-q1', count: 1 },
+            { checked: true, filterQuery: 'f2-q2', label: 'f2-q2', count: 1 }
+        ];
+
+        const config: SearchConfiguration = {
+            categories: [
+                <any> { id: 'cat1', enabled: true }
+            ]
+        };
+        const builder = new SearchQueryBuilderService(buildConfig(config), null);
+
+        builder.addUserFacetBucket(field1, field1buckets[0]);
+        builder.addUserFacetBucket(field1, field1buckets[1]);
+        builder.addUserFacetBucket(field2, field2buckets[0]);
+        builder.addUserFacetBucket(field2, field2buckets[1]);
+
+        const compiledQuery = builder.buildQuery();
+        const expectedResult = '(f1-q1 OR f1-q2) AND (f2-q1 OR f2-q2)';
+
+        expect(compiledQuery.query.query).toBe(expectedResult);
+    });
+
 });
diff --git a/lib/content-services/search/search-query-builder.service.ts b/lib/content-services/search/search-query-builder.service.ts
index 5a260ccade..41306c6795 100644
--- a/lib/content-services/search/search-query-builder.service.ts
+++ b/lib/content-services/search/search-query-builder.service.ts
@@ -16,7 +16,7 @@
  */
 
 import { Injectable } from '@angular/core';
-import { Subject } from 'rxjs/Subject';
+import { Subject } from 'rxjs';
 import { AlfrescoApiService, AppConfigService } from '@alfresco/adf-core';
 import { QueryBody, RequestFacetFields, RequestFacetField, RequestSortDefinitionInner } from 'alfresco-js-api';
 import { SearchCategory } from './search-category.interface';
@@ -26,6 +26,7 @@ import { SearchConfiguration } from './search-configuration.interface';
 import { FacetQuery } from './facet-query.interface';
 import { SearchSortingDefinition } from './search-sorting-definition.interface';
 import { FacetField } from './facet-field.interface';
+import { FacetFieldBucket } from './facet-field-bucket.interface';
 
 @Injectable()
 export class SearchQueryBuilderService {
@@ -41,6 +42,9 @@ export class SearchQueryBuilderService {
     paging: { maxItems?: number; skipCount?: number } = null;
     sorting: Array<SearchSortingDefinition> = [];
 
+    protected userFacetQueries: FacetQuery[] = [];
+    protected userFacetBuckets: { [key: string]: Array<FacetFieldBucket> } = {};
+
     get userQuery(): string {
         return this._userQuery;
     }
@@ -55,30 +59,65 @@ export class SearchQueryBuilderService {
     // TODO: to be supported in future iterations
     ranges: { [id: string]: SearchRange } = {};
 
-    constructor(appConfig: AppConfigService, private alfrescoApiService: AlfrescoApiService) {
-        this.config = appConfig.get<SearchConfiguration>('search');
+    constructor(private appConfig: AppConfigService, private alfrescoApiService: AlfrescoApiService) {
         this.resetToDefaults();
     }
 
     resetToDefaults() {
-        if (this.config) {
-            this.categories =
-                (this.config.categories || [])
-                    .filter(category => category.enabled)
-                    .map(category => { return { ...category }; });
-
-            this.filterQueries =
-                (this.config.filterQueries || [])
-                    .map(query => { return {...query}; });
-
+        const template = this.appConfig.get<SearchConfiguration>('search');
+        if (template) {
+            this.config = JSON.parse(JSON.stringify(template));
+            this.categories = (this.config.categories || []).filter(category => category.enabled);
+            this.filterQueries = this.config.filterQueries || [];
+            this.userFacetBuckets = {};
+            this.userFacetQueries = [];
             if (this.config.sorting) {
-                this.sorting =
-                    (this.config.sorting.defaults || [])
-                        .map(sorting => { return { ...sorting }; });
+                this.sorting = this.config.sorting.defaults || [];
             }
         }
     }
 
+    addUserFacetQuery(query: FacetQuery) {
+        if (query) {
+            const existing = this.userFacetQueries.find(facetQuery => facetQuery.label === query.label);
+            if (existing) {
+                existing.query = query.query;
+            } else {
+                this.userFacetQueries.push({ ...query });
+            }
+        }
+    }
+
+    removeUserFacetQuery(query: FacetQuery) {
+        if (query) {
+            this.userFacetQueries = this.userFacetQueries
+                .filter(facetQuery => facetQuery.label !== query.label);
+        }
+    }
+
+    addUserFacetBucket(field: FacetField, bucket: FacetFieldBucket) {
+        if (field && field.field && bucket) {
+            const buckets = this.userFacetBuckets[field.field] || [];
+            const existing = buckets.find(facetBucket => facetBucket.label === bucket.label);
+            if (!existing) {
+                buckets.push(bucket);
+            }
+            this.userFacetBuckets[field.field] = buckets;
+        }
+    }
+
+    getUserFacetBuckets(field: string) {
+        return this.userFacetBuckets[field] || [];
+    }
+
+    removeUserFacetBucket(field: FacetField, bucket: FacetFieldBucket) {
+        if (field && field.field && bucket) {
+            const buckets = this.userFacetBuckets[field.field] || [];
+            this.userFacetBuckets[field.field] = buckets
+                .filter(facetBucket => facetBucket.label !== bucket.label);
+        }
+    }
+
     addFilterQuery(query: string): void {
         if (query) {
             const existing = this.filterQueries.find(filterQuery => filterQuery.query === query);
@@ -97,15 +136,21 @@ export class SearchQueryBuilderService {
 
     getFacetQuery(label: string): FacetQuery {
         if (label && this.hasFacetQueries) {
-            return this.config.facetQueries.queries.find(query => query.label === label);
+            const result = this.config.facetQueries.queries.find(query => query.label === label);
+            if (result) {
+                return { ...result };
+            }
         }
         return null;
     }
 
     getFacetField(label: string): FacetField {
         if (label) {
-            const fields = this.config.facetFields || [];
-            return fields.find(field => field.label === label);
+            const fields = this.config.facetFields.fields || [];
+            const result = fields.find(field => field.label === label);
+            if (result) {
+                return { ...result };
+            }
         }
         return null;
     }
@@ -117,8 +162,10 @@ export class SearchQueryBuilderService {
 
     async execute() {
         const query = this.buildQuery();
-        const data = await this.alfrescoApiService.searchApi.search(query);
-        this.executed.next(data);
+        if (query) {
+            const data = await this.alfrescoApiService.searchApi.search(query);
+            this.executed.next(data);
+        }
     }
 
     buildQuery(): QueryBody {
@@ -183,7 +230,7 @@ export class SearchQueryBuilderService {
         return false;
     }
 
-    private get sort(): RequestSortDefinitionInner[] {
+    protected get sort(): RequestSortDefinitionInner[] {
         return this.sorting.map(def => {
             return {
                 type: def.type,
@@ -193,7 +240,7 @@ export class SearchQueryBuilderService {
         });
     }
 
-    private get facetQueries(): FacetQuery[] {
+    protected get facetQueries(): FacetQuery[] {
         if (this.hasFacetQueries) {
             return this.config.facetQueries.queries.map(query => {
                 return <FacetQuery> { ...query };
@@ -203,7 +250,7 @@ export class SearchQueryBuilderService {
         return null;
     }
 
-    private getFinalQuery(): string {
+    protected getFinalQuery(): string {
         let query = '';
 
         this.categories.forEach(facet => {
@@ -216,15 +263,36 @@ export class SearchQueryBuilderService {
             }
         });
 
-        const result = [this.userQuery, query]
+        let result = [this.userQuery, query]
             .filter(entry => entry)
             .join(' AND ');
 
+        if (this.userFacetQueries && this.userFacetQueries.length > 0) {
+            const combined = this.userFacetQueries
+                .map(userQuery => userQuery.query)
+                .join(' OR ');
+            result += ` AND (${combined})`;
+        }
+
+        if (this.userFacetBuckets) {
+            Object.keys(this.userFacetBuckets).forEach(key => {
+                const subQuery = (this.userFacetBuckets[key] || [])
+                    .map(bucket => bucket.filterQuery)
+                    .join(' OR ');
+                if (subQuery) {
+                    if (result.length > 0) {
+                        result += ' AND ';
+                    }
+                    result += `(${subQuery})`;
+                }
+            });
+        }
+
         return result;
     }
 
-    private get facetFields(): RequestFacetFields {
-        const facetFields = this.config.facetFields;
+    protected get facetFields(): RequestFacetFields {
+        const facetFields = this.config.facetFields && this.config.facetFields.fields;
 
         if (facetFields && facetFields.length > 0) {
             return {
diff --git a/lib/content-services/search/search.module.ts b/lib/content-services/search/search.module.ts
index 6e3f210f37..86fc662315 100644
--- a/lib/content-services/search/search.module.ts
+++ b/lib/content-services/search/search.module.ts
@@ -18,10 +18,9 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { TranslateModule } from '@ngx-translate/core';
 import { MaterialModule } from '../material.module';
 
-import { PipeModule, CoreModule } from '@alfresco/adf-core';
+import { CoreModule } from '@alfresco/adf-core';
 
 import { SearchTriggerDirective } from './components/search-trigger.directive';
 
@@ -50,13 +49,11 @@ export const ALFRESCO_SEARCH_DIRECTIVES: any[] = [
 
 @NgModule({
     imports: [
-        CoreModule,
         CommonModule,
         FormsModule,
         ReactiveFormsModule,
         MaterialModule,
-        PipeModule,
-        TranslateModule
+        CoreModule.forChild()
     ],
     declarations: [
         ...ALFRESCO_SEARCH_DIRECTIVES,
diff --git a/lib/content-services/site-dropdown/sites-dropdown.component.scss b/lib/content-services/site-dropdown/sites-dropdown.component.scss
index e40b3adf27..1312bf38a3 100644
--- a/lib/content-services/site-dropdown/sites-dropdown.component.scss
+++ b/lib/content-services/site-dropdown/sites-dropdown.component.scss
@@ -1,6 +1,6 @@
 .adf-sites-dropdown {
     &.full-width {
-        .mat-input-container {
+        .mat-form-field {
             width: 100%;
         }
     }
diff --git a/lib/content-services/site-dropdown/sites-dropdown.component.spec.ts b/lib/content-services/site-dropdown/sites-dropdown.component.spec.ts
index 564dd81558..b8233a0967 100644
--- a/lib/content-services/site-dropdown/sites-dropdown.component.spec.ts
+++ b/lib/content-services/site-dropdown/sites-dropdown.component.spec.ts
@@ -20,7 +20,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { DropdownSitesComponent, Relations } from './sites-dropdown.component';
 import { SitesService, setupTestBed, CoreModule, AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-core';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
 describe('DropdownSitesComponent', () => {
@@ -50,7 +50,7 @@ describe('DropdownSitesComponent', () => {
 
             beforeEach(async(() => {
                 siteService = TestBed.get(SitesService);
-                spyOn(siteService, 'getSites').and.returnValue(Observable.of({
+                spyOn(siteService, 'getSites').and.returnValue(of({
                     'list': {
                         'pagination': {
                             'count': 2,
@@ -119,7 +119,7 @@ describe('DropdownSitesComponent', () => {
                     let options: any = debug.queryAll(By.css('mat-option'));
                     expect(options[0].nativeElement.innerText).toContain('DROPDOWN.MY_FILES_OPTION');
                 });
-            });
+            }));
 
             it('should hide the "My files" option if the developer desires that way', async(() => {
                 component.hideMyFiles = true;
@@ -243,7 +243,7 @@ describe('DropdownSitesComponent', () => {
 
             beforeEach(async(() => {
                 siteService = TestBed.get(SitesService);
-                spyOn(siteService, 'getSites').and.returnValue(Observable.of({
+                spyOn(siteService, 'getSites').and.returnValue(of({
                     'list': {
                         'entries': [{
                             'entry': {
@@ -372,7 +372,7 @@ describe('DropdownSitesComponent', () => {
             afterEach(async(() => {
                 fixture.destroy();
                 TestBed.resetTestingModule();
-            });
+            }));
 
             describe('No relations', () => {
 
diff --git a/lib/content-services/site-dropdown/sites-dropdown.module.ts b/lib/content-services/site-dropdown/sites-dropdown.module.ts
index cac757251d..ab1734fd11 100644
--- a/lib/content-services/site-dropdown/sites-dropdown.module.ts
+++ b/lib/content-services/site-dropdown/sites-dropdown.module.ts
@@ -18,18 +18,18 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { MaterialModule } from '../material.module';
-import { TranslateModule } from '@ngx-translate/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 
 import { DropdownSitesComponent } from './sites-dropdown.component';
+import { CoreModule } from '@alfresco/adf-core';
 
 @NgModule({
     imports: [
         CommonModule,
         MaterialModule,
-        TranslateModule,
         FormsModule,
-        ReactiveFormsModule
+        ReactiveFormsModule,
+        CoreModule.forChild()
     ],
     exports: [
         DropdownSitesComponent
diff --git a/lib/content-services/social/like.component.spec.ts b/lib/content-services/social/like.component.spec.ts
index 8edb86234e..d108ef0202 100644
--- a/lib/content-services/social/like.component.spec.ts
+++ b/lib/content-services/social/like.component.spec.ts
@@ -19,7 +19,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { LikeComponent } from './like.component';
 import { setupTestBed } from '../../core/testing';
 import { ContentTestingModule } from '../testing/content.testing.module';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 import { RatingService } from './services/rating.service';
 
 describe('Like component', () => {
@@ -36,7 +36,7 @@ describe('Like component', () => {
     beforeEach(async(() => {
         service = TestBed.get(RatingService);
 
-        spyOn(service, 'getRating').and.returnValue(Observable.of({
+        spyOn(service, 'getRating').and.returnValue(of({
             entry: {
                 id: 'likes',
                 aggregate: { numberOfRatings: 2 }
@@ -60,7 +60,7 @@ describe('Like component', () => {
     }));
 
     it('should increase the number of likes when clicked', async(() => {
-        spyOn(service, 'postRating').and.returnValue(Observable.of({
+        spyOn(service, 'postRating').and.returnValue(of({
             entry: {
                 id: 'likes',
                 aggregate: { numberOfRatings: 3 }
@@ -77,7 +77,7 @@ describe('Like component', () => {
     }));
 
     it('should decrease the number of likes when clicked and is already liked', async(() => {
-        spyOn(service, 'deleteRating').and.returnValue(Observable.of('');
+        spyOn(service, 'deleteRating').and.returnValue(of(''));
 
         component.isLike = true;
 
diff --git a/lib/content-services/social/rating.component.spec.ts b/lib/content-services/social/rating.component.spec.ts
index 812f20ea15..e78f0e917b 100644
--- a/lib/content-services/social/rating.component.spec.ts
+++ b/lib/content-services/social/rating.component.spec.ts
@@ -19,7 +19,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { RatingComponent } from './rating.component';
 import { setupTestBed } from '../../core/testing';
 import { ContentTestingModule } from '../testing/content.testing.module';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 import { RatingService } from './services/rating.service';
 
 describe('Rating component', () => {
@@ -51,7 +51,7 @@ describe('Rating component', () => {
     describe('Rendering tests', () => {
 
         it('should rating component should be present', (done) => {
-            spyOn(service, 'getRating').and.returnValue(Observable.of({
+            spyOn(service, 'getRating').and.returnValue(of({
                 entry: {
                     id: 'fiveStar',
                     aggregate: {
@@ -70,7 +70,7 @@ describe('Rating component', () => {
         });
 
         it('should the star rating filled with the right grey/colored star', (done) => {
-            spyOn(service, 'getRating').and.returnValue(Observable.of({
+            spyOn(service, 'getRating').and.returnValue(of({
                 entry: {
                     id: 'fiveStar',
                     aggregate: {
@@ -92,7 +92,7 @@ describe('Rating component', () => {
         });
 
         it('should click on a star change your vote', (done) => {
-            spyOn(service, 'getRating').and.returnValue(Observable.of({
+            spyOn(service, 'getRating').and.returnValue(of({
                 'entry': {
                     myRating: 1,
                     'ratedAt': '2017-04-06T14:34:28.061+0000',
@@ -101,7 +101,7 @@ describe('Rating component', () => {
                 }
             }));
 
-            spyOn(service, 'postRating').and.returnValue(Observable.of({
+            spyOn(service, 'postRating').and.returnValue(of({
                 'entry': {
                     'myRating': 3,
                     'ratedAt': '2017-04-06T14:36:40.731+0000',
diff --git a/lib/content-services/social/services/rating.service.ts b/lib/content-services/social/services/rating.service.ts
index 37e54016ea..f24993bbb1 100644
--- a/lib/content-services/social/services/rating.service.ts
+++ b/lib/content-services/social/services/rating.service.ts
@@ -19,8 +19,8 @@ import { AlfrescoApiService } from '@alfresco/adf-core';
 import { Injectable } from '@angular/core';
 import { Response } from '@angular/http';
 import { RatingBody } from 'alfresco-js-api';
-import { Observable } from 'rxjs/Observable';
-import 'rxjs/add/observable/throw';
+import { from, throwError } from 'rxjs';
+import { catchError } from 'rxjs/operators';
 
 @Injectable()
 export class RatingService {
@@ -35,9 +35,10 @@ export class RatingService {
      * @returns The rating value
      */
     getRating(nodeId: string, ratingType: any): any {
-        return Observable.fromPromise(this.apiService.getInstance().core.ratingsApi.getRating(nodeId, ratingType))
-            .map(res => res)
-            .catch(this.handleError);
+        return from(this.apiService.getInstance().core.ratingsApi.getRating(nodeId, ratingType))
+            .pipe(
+                catchError(this.handleError)
+            );
     }
 
     /**
@@ -52,9 +53,10 @@ export class RatingService {
             'id': ratingType,
             'myRating': vote
         };
-        return Observable.fromPromise(this.apiService.getInstance().core.ratingsApi.rate(nodeId, ratingBody))
-            .map(res => res)
-            .catch(this.handleError);
+        return from(this.apiService.getInstance().core.ratingsApi.rate(nodeId, ratingBody))
+            .pipe(
+                catchError(this.handleError)
+            );
     }
 
     /**
@@ -64,13 +66,14 @@ export class RatingService {
      * @returns Null response indicating that the operation is complete
      */
     deleteRating(nodeId: string, ratingType: any): any {
-        return Observable.fromPromise(this.apiService.getInstance().core.ratingsApi.removeRating(nodeId, ratingType))
-            .map(res => res)
-            .catch(this.handleError);
+        return from(this.apiService.getInstance().core.ratingsApi.removeRating(nodeId, ratingType))
+            .pipe(
+                catchError(this.handleError)
+            );
     }
 
     private handleError(error: Response): any {
         console.error(error);
-        return Observable.throw(error || 'Server error');
+        return throwError(error || 'Server error');
     }
 }
diff --git a/lib/content-services/tag/services/tag.service.ts b/lib/content-services/tag/services/tag.service.ts
index 0c18df6f0e..77594a8e09 100644
--- a/lib/content-services/tag/services/tag.service.ts
+++ b/lib/content-services/tag/services/tag.service.ts
@@ -17,8 +17,9 @@
 
 import { AlfrescoApiService, LogService } from '@alfresco/adf-core';
 import { EventEmitter, Injectable, Output } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
-import 'rxjs/add/observable/throw';
+import { Observable, from, throwError } from 'rxjs';
+import { catchError } from 'rxjs/operators';
+import { TagPaging } from 'alfresco-js-api';
 
 @Injectable()
 export class TagService {
@@ -37,17 +38,18 @@ export class TagService {
      * @returns TagPaging object (defined in JSAPI) containing the tags
      */
     getTagsByNodeId(nodeId: string): any {
-        return Observable.fromPromise(this.apiService.getInstance().core.tagsApi.getNodeTags(nodeId))
-            .catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().core.tagsApi.getNodeTags(nodeId)).pipe(
+            catchError(err => this.handleError(err))
+        );
     }
 
     /**
      * Gets a list of all the tags already defined in the repository.
      * @returns TagPaging object (defined in JSAPI) containing the tags
      */
-    getAllTheTags() {
-        return Observable.fromPromise(this.apiService.getInstance().core.tagsApi.getTags())
-            .catch(err => this.handleError(err));
+    getAllTheTags(): Observable<TagPaging> {
+        return from(this.apiService.getInstance().core.tagsApi.getTags())
+            .pipe(catchError(err => this.handleError(err)));
     }
 
     /**
@@ -57,11 +59,11 @@ export class TagService {
      * @returns TagEntry object (defined in JSAPI) with details of the new tag
      */
     addTag(nodeId: string, tagName: string): any {
-        let alfrescoApi: any = this.apiService.getInstance();
-        let tagBody = new alfrescoApi.core.TagBody();
+        const alfrescoApi: any = this.apiService.getInstance();
+        const tagBody = new alfrescoApi.core.TagBody();
         tagBody.tag = tagName;
 
-        let promiseAdd = Observable.fromPromise(this.apiService.getInstance().core.tagsApi.addTag(nodeId, tagBody));
+        let promiseAdd = from(this.apiService.getInstance().core.tagsApi.addTag(nodeId, tagBody));
 
         promiseAdd.subscribe((data) => {
             this.refresh.emit(data);
@@ -79,7 +81,7 @@ export class TagService {
      * @returns Null object when the operation completes
      */
     removeTag(nodeId: string, tag: string): any {
-        let promiseRemove = Observable.fromPromise(this.apiService.getInstance().core.tagsApi.removeTag(nodeId, tag));
+        const promiseRemove = from(this.apiService.getInstance().core.tagsApi.removeTag(nodeId, tag));
 
         promiseRemove.subscribe((data) => {
             this.refresh.emit(data);
@@ -92,6 +94,6 @@ export class TagService {
 
     private handleError(error: any) {
         this.logService.error(error);
-        return Observable.throw(error || 'Server error');
+        return throwError(error || 'Server error');
     }
 }
diff --git a/lib/content-services/tag/tag-actions.component.html b/lib/content-services/tag/tag-actions.component.html
index 20df0864e1..a35772a505 100644
--- a/lib/content-services/tag/tag-actions.component.html
+++ b/lib/content-services/tag/tag-actions.component.html
@@ -1,7 +1,7 @@
 <mat-list>
     <mat-list-item *ngFor="let currentEntry of tagsEntries; let idx = index">
-        <div class="adf-tag-actions-container" id="tag_delete_{{idx}}" (click)="removeTag(currentEntry.entry.id)">
-            <div class="adf-tag-actions-delete-text" id="tag_name_{{idx}}">
+        <div class="adf-tag-actions-container" id="tag_delete_{{currentEntry.entry.tag}}" (click)="removeTag(currentEntry.entry.id)">
+            <div class="adf-tag-actions-delete-text" id="tag_name_{{currentEntry.entry.tag}}">
                 {{currentEntry.entry.tag}}
             </div>
             <mat-icon class="adf-tag-actions-delete-icon">delete</mat-icon>
diff --git a/lib/content-services/tag/tag-actions.component.spec.ts b/lib/content-services/tag/tag-actions.component.spec.ts
index c624975edf..1cf8adcfd9 100644
--- a/lib/content-services/tag/tag-actions.component.spec.ts
+++ b/lib/content-services/tag/tag-actions.component.spec.ts
@@ -80,13 +80,13 @@ describe('TagActionsComponent', () => {
             component.result.subscribe(() => {
                 fixture.detectChanges();
 
-                expect(element.querySelector('#tag_name_0').innerHTML.trim()).toBe('test1');
-                expect(element.querySelector('#tag_name_1').innerHTML.trim()).toBe('test2');
-                expect(element.querySelector('#tag_name_2').innerHTML.trim()).toBe('test3');
+                expect(element.querySelector('#tag_name_test1').innerHTML.trim()).toBe('test1');
+                expect(element.querySelector('#tag_name_test2').innerHTML.trim()).toBe('test2');
+                expect(element.querySelector('#tag_name_test3').innerHTML.trim()).toBe('test3');
 
-                expect(element.querySelector('#tag_delete_0')).not.toBe(null);
-                expect(element.querySelector('#tag_delete_1')).not.toBe(null);
-                expect(element.querySelector('#tag_delete_2')).not.toBe(null);
+                expect(element.querySelector('#tag_delete_test1')).not.toBe(null);
+                expect(element.querySelector('#tag_delete_test2')).not.toBe(null);
+                expect(element.querySelector('#tag_delete_test3')).not.toBe(null);
 
                 done();
             });
@@ -106,7 +106,7 @@ describe('TagActionsComponent', () => {
             component.result.subscribe(() => {
                 fixture.detectChanges();
 
-                let deleteButton: any = element.querySelector('#tag_delete_0');
+                let deleteButton: any = element.querySelector('#tag_delete_test1');
                 deleteButton.click();
 
                 expect(jasmine.Ajax.requests.at(1).url)
diff --git a/lib/content-services/tag/tag-actions.component.ts b/lib/content-services/tag/tag-actions.component.ts
index 9ac307a763..64d566977d 100644
--- a/lib/content-services/tag/tag-actions.component.ts
+++ b/lib/content-services/tag/tag-actions.component.ts
@@ -18,7 +18,7 @@
 import { TranslationService } from '@alfresco/adf-core';
 import { Component, EventEmitter, Input, OnChanges, Output, ViewEncapsulation, OnDestroy, OnInit } from '@angular/core';
 import { TagService } from './services/tag.service';
-import { Subscription } from 'rxjs/Subscription';
+import { Subscription } from 'rxjs';
 
 /**
  *
diff --git a/lib/content-services/tag/tag-list.component.spec.ts b/lib/content-services/tag/tag-list.component.spec.ts
index bcad879590..4aa838669e 100644
--- a/lib/content-services/tag/tag-list.component.spec.ts
+++ b/lib/content-services/tag/tag-list.component.spec.ts
@@ -19,7 +19,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { AppConfigService, setupTestBed } from '@alfresco/adf-core';
 import { TagService } from './services/tag.service';
 import { TagListComponent } from '././tag-list.component';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 import { ContentTestingModule } from '../testing/content.testing.module';
 
 describe('TagList', () => {
@@ -55,7 +55,7 @@ describe('TagList', () => {
         appConfig.config.ecmHost = 'http://localhost:9876/ecm';
 
         tagService = TestBed.get(TagService);
-        spyOn(tagService, 'getAllTheTags').and.returnValue(Observable.of(dataTag));
+        spyOn(tagService, 'getAllTheTags').and.returnValue(of(dataTag));
 
         fixture = TestBed.createComponent(TagListComponent);
 
diff --git a/lib/content-services/tag/tag-list.component.ts b/lib/content-services/tag/tag-list.component.ts
index de041f68dc..69c86e7207 100644
--- a/lib/content-services/tag/tag-list.component.ts
+++ b/lib/content-services/tag/tag-list.component.ts
@@ -52,7 +52,7 @@ export class TagListComponent implements OnInit {
     }
 
     refreshTag() {
-        this.tagService.getAllTheTags().subscribe((data) => {
+        this.tagService.getAllTheTags().subscribe((data: any) => {
             this.tagsEntries = data.list.entries;
             this.result.emit(this.tagsEntries);
         });
diff --git a/lib/content-services/tag/tag-node-list.component.html b/lib/content-services/tag/tag-node-list.component.html
index 60bec1d61b..6c1d57f305 100644
--- a/lib/content-services/tag/tag-node-list.component.html
+++ b/lib/content-services/tag/tag-node-list.component.html
@@ -1,7 +1,7 @@
 <mat-chip-list>
     <mat-chip class="adf-tag-chips adf-primary-background-color" *ngFor="let currentEntry of tagsEntries; let idx = index">
         <span id="tag_name_{{idx}}">{{currentEntry.entry.tag}}</span>
-        <button class="adf-tag-chips-delete" id="tag_delete_{{idx}}" type="button" (click)="removeTag(currentEntry.entry.id)">
+        <button class="adf-tag-chips-delete" id="tag_chips_delete_{{currentEntry.entry.tag}}" type="button" (click)="removeTag(currentEntry.entry.id)">
             <mat-icon class="adf-tag-chips-delete-icon adf-primary-contrast-text-color" matChipRemove>cancel</mat-icon>
         </button>
     </mat-chip>
diff --git a/lib/content-services/tag/tag-node-list.component.spec.ts b/lib/content-services/tag/tag-node-list.component.spec.ts
index 0590287eaf..89fcfe7672 100644
--- a/lib/content-services/tag/tag-node-list.component.spec.ts
+++ b/lib/content-services/tag/tag-node-list.component.spec.ts
@@ -19,7 +19,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { AppConfigService, setupTestBed } from '@alfresco/adf-core';
 import { TagNodeListComponent } from './tag-node-list.component';
 import { TagService } from './services/tag.service';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 import { ContentTestingModule } from '../testing/content.testing.module';
 
 describe('TagNodeList', () => {
@@ -57,7 +57,7 @@ describe('TagNodeList', () => {
         fixture = TestBed.createComponent(TagNodeListComponent);
 
         tagService = TestBed.get(TagService);
-        spyOn(tagService, 'getTagsByNodeId').and.returnValue(Observable.of(dataTag));
+        spyOn(tagService, 'getTagsByNodeId').and.returnValue(of(dataTag));
 
         element = fixture.nativeElement;
         component = fixture.componentInstance;
@@ -76,9 +76,9 @@ describe('TagNodeList', () => {
                 expect(element.querySelector('#tag_name_1').innerHTML).toBe('test2');
                 expect(element.querySelector('#tag_name_2').innerHTML).toBe('test3');
 
-                expect(element.querySelector('#tag_delete_0')).not.toBe(null);
-                expect(element.querySelector('#tag_delete_1')).not.toBe(null);
-                expect(element.querySelector('#tag_delete_2')).not.toBe(null);
+                expect(element.querySelector('#tag_chips_delete_test1')).not.toBe(null);
+                expect(element.querySelector('#tag_chips_delete_test2')).not.toBe(null);
+                expect(element.querySelector('#tag_chips_delete_test3')).not.toBe(null);
 
                 done();
             });
@@ -89,12 +89,12 @@ describe('TagNodeList', () => {
         it('Tag list click on delete button should delete the tag', (done) => {
             component.nodeId = 'fake-node-id';
 
-            spyOn(tagService, 'removeTag').and.returnValue(Observable.of(true));
+            spyOn(tagService, 'removeTag').and.returnValue(of(true));
 
             component.results.subscribe(() => {
                 fixture.detectChanges();
 
-                let deleteButton: any = element.querySelector('#tag_delete_0');
+                let deleteButton: any = element.querySelector('#tag_chips_delete_test1');
                 deleteButton.click();
 
                 expect(tagService.removeTag).toHaveBeenCalledWith('fake-node-id', '0ee933fa-57fc-4587-8a77-b787e814f1d2');
diff --git a/lib/content-services/tag/tag.module.ts b/lib/content-services/tag/tag.module.ts
index 7b6e8e8ffe..190bd64d9e 100644
--- a/lib/content-services/tag/tag.module.ts
+++ b/lib/content-services/tag/tag.module.ts
@@ -18,21 +18,20 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { TranslateModule } from '@ngx-translate/core';
 
 import { MaterialModule } from '../material.module';
 import { TagActionsComponent } from './tag-actions.component';
 import { TagListComponent } from './tag-list.component';
 import { TagNodeListComponent } from './tag-node-list.component';
-import { TagService } from './services/tag.service';
+import { CoreModule } from '@alfresco/adf-core';
 
 @NgModule({
     imports: [
         CommonModule,
         MaterialModule,
-        TranslateModule,
         FormsModule,
-        ReactiveFormsModule
+        ReactiveFormsModule,
+        CoreModule.forChild()
     ],
     exports: [
         TagActionsComponent,
@@ -43,9 +42,6 @@ import { TagService } from './services/tag.service';
         TagActionsComponent,
         TagListComponent,
         TagNodeListComponent
-    ],
-    providers: [
-        TagService
     ]
 })
 export class TagModule {}
diff --git a/lib/content-services/test.ts b/lib/content-services/test.ts
new file mode 100644
index 0000000000..c5fc266442
--- /dev/null
+++ b/lib/content-services/test.ts
@@ -0,0 +1,41 @@
+/*!
+ * @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 'core-js/es7/reflect';
+import 'zone.js/dist/zone';
+import 'zone.js/dist/zone-testing';
+import { getTestBed } from '@angular/core/testing';
+import {
+    BrowserDynamicTestingModule,
+    platformBrowserDynamicTesting
+} from '@angular/platform-browser-dynamic/testing';
+import pdfjsLib = require('pdfjs-dist');
+
+declare const require: any;
+
+// First, initialize the Angular testing environment.
+getTestBed().initTestEnvironment(
+    BrowserDynamicTestingModule,
+    platformBrowserDynamicTesting()
+);
+
+pdfjsLib.PDFJS.workerSrc = 'base/pdfjs-dist/build/pdf.worker.js';
+
+// Then we find all the tests.
+const context = require.context('./', true, /\.spec\.ts$/);
+// And load the modules.
+context.keys().map(context);
diff --git a/lib/content-services/testing/content.testing.module.ts b/lib/content-services/testing/content.testing.module.ts
index 0c9f664f6d..e80a371033 100644
--- a/lib/content-services/testing/content.testing.module.ts
+++ b/lib/content-services/testing/content.testing.module.ts
@@ -36,7 +36,7 @@ import { ContentModule } from '../content.module';
         NoopAnimationsModule,
         RouterTestingModule,
         CoreModule.forRoot(),
-        ContentModule
+        ContentModule.forRoot()
     ],
     providers: [
         { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock },
diff --git a/lib/content-services/upload/components/base-upload/upload-base.ts b/lib/content-services/upload/components/base-upload/upload-base.ts
index f94550b35b..c1abe723a7 100644
--- a/lib/content-services/upload/components/base-upload/upload-base.ts
+++ b/lib/content-services/upload/components/base-upload/upload-base.ts
@@ -18,7 +18,7 @@
 import { FileModel, FileInfo } from '@alfresco/adf-core';
 import { EventEmitter, Input, Output, OnInit, OnDestroy, NgZone } from '@angular/core';
 import { UploadService, TranslationService } from '@alfresco/adf-core';
-import { Subscription } from 'rxjs/Rx';
+import { Subscription } from 'rxjs';
 import { UploadFilesEvent } from '../upload-files.event';
 
 export abstract class UploadBase implements OnInit, OnDestroy {
diff --git a/lib/content-services/upload/components/file-uploading-dialog.component.html b/lib/content-services/upload/components/file-uploading-dialog.component.html
index 75ecf8af08..bcbae93fc0 100644
--- a/lib/content-services/upload/components/file-uploading-dialog.component.html
+++ b/lib/content-services/upload/components/file-uploading-dialog.component.html
@@ -1,5 +1,6 @@
 <div *ngIf="isDialogActive"
      class="upload-dialog"
+     id="upload-dialog"
      [class.upload-dialog--minimized]="isDialogMinimized"
      [class.upload-dialog--position-left]="position === 'left'"
      [class.upload-dialog--position-right]="position === 'right'">
@@ -45,8 +46,7 @@
         </span>
     </header>
 
-    <section
-        class="upload-dialog__info"
+    <section class="upload-dialog__info"
         *ngIf="totalErrors">
         {{
             (totalErrors > 1
@@ -56,11 +56,9 @@
         }}
     </section>
 
-    <section
-        class="upload-dialog__content"
+    <section class="upload-dialog__content"
         [class.upload-dialog--padding]="isConfirmation">
         <adf-file-uploading-list
-            (error)="onError($event)"
             [class.upload-dialog--hide]="isConfirmation"
             #uploadList
             [files]="filesUploadingList">
@@ -86,10 +84,10 @@
         </div>
     </section>
 
-    <footer
-        class="upload-dialog__actions"
-        [class.upload-dialog--hide]="isConfirmation">
+    <footer class="upload-dialog__actions"
+            *ngIf="!isConfirmation">
         <button
+            id="adf-upload-dialog-cancel-all"
             color="primary"
             mat-button
             *ngIf="!uploadList.isUploadCompleted() && !uploadList.isUploadCancelled()"
@@ -98,18 +96,19 @@
         </button>
 
         <button
+            id="adf-upload-dialog-close"
             *ngIf="uploadList.isUploadCompleted() || uploadList.isUploadCancelled()"
             mat-button
             color="primary"
-            (click)="close($event)">
+            (click)="close()">
             {{ 'ADF_FILE_UPLOAD.BUTTON.CLOSE' | translate }}
         </button>
     </footer>
 
-    <footer
-        class="upload-dialog__actions"
-        [class.upload-dialog--hide]="!isConfirmation">
+    <footer class="upload-dialog__actions"
+            *ngIf="isConfirmation">
         <button
+            id="adf-upload-dialog-cancel"
             color="secondary"
             mat-button
             (click)="cancelAllUploads()">
@@ -117,6 +116,7 @@
         </button>
 
         <button
+            id="adf-upload-dialog-confirm"
             mat-button
             color="primary"
             (click)="toggleConfirmation()">
diff --git a/lib/content-services/upload/components/file-uploading-dialog.component.ts b/lib/content-services/upload/components/file-uploading-dialog.component.ts
index 3c0a9a7ec8..adf41cb7c5 100644
--- a/lib/content-services/upload/components/file-uploading-dialog.component.ts
+++ b/lib/content-services/upload/components/file-uploading-dialog.component.ts
@@ -20,10 +20,8 @@ import {
     FileUploadErrorEvent, FileUploadStatus, UploadService
 } from '@alfresco/adf-core';
 import { ChangeDetectorRef, Component, Input, Output, EventEmitter, OnDestroy, OnInit, ViewChild } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
-import { Subscription } from 'rxjs/Subscription';
+import { Subscription, merge } from 'rxjs';
 import { FileUploadingListComponent } from './file-uploading-list.component';
-import 'rxjs/add/observable/merge';
 
 // @deprecated file-uploading-dialog TODO remove in 3.0.0
 @Component({
@@ -69,8 +67,7 @@ export class FileUploadingDialogComponent implements OnInit, OnDestroy {
                 }
             });
 
-        this.counterSubscription = Observable
-            .merge(
+        this.counterSubscription = merge(
                 this.uploadService.fileUploadComplete,
                 this.uploadService.fileUploadDeleted
             )
diff --git a/lib/content-services/upload/components/file-uploading-list-row.component.html b/lib/content-services/upload/components/file-uploading-list-row.component.html
index 4253c4a6e5..f286a4b988 100644
--- a/lib/content-services/upload/components/file-uploading-list-row.component.html
+++ b/lib/content-services/upload/components/file-uploading-list-row.component.html
@@ -64,8 +64,7 @@
 
     <div
         *ngIf="file.status === FileUploadStatus.Error"
-        class="adf-file-uploading-row__block adf-file-uploading-row__status--error"
-        title="{{ file.response }}">
+        class="adf-file-uploading-row__block adf-file-uploading-row__status--error">
         <mat-icon mat-list-icon>
             report_problem
         </mat-icon>
@@ -78,4 +77,4 @@
         class="adf-file-uploading-row__block adf-file-uploading-row__status--cancelled">
         {{ 'ADF_FILE_UPLOAD.STATUS.FILE_CANCELED_STATUS' | translate }}
     </div>
-<div>
\ No newline at end of file
+<div>
diff --git a/lib/content-services/upload/components/file-uploading-list.component.spec.ts b/lib/content-services/upload/components/file-uploading-list.component.spec.ts
index 0704e0ecfe..78a5b8612b 100644
--- a/lib/content-services/upload/components/file-uploading-list.component.spec.ts
+++ b/lib/content-services/upload/components/file-uploading-list.component.spec.ts
@@ -19,7 +19,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { TranslationService, FileUploadStatus, NodesApiService, UploadService,
     setupTestBed, CoreModule, AlfrescoApiService, AlfrescoApiServiceMock
 } from '@alfresco/adf-core';
-import { Observable } from 'rxjs/Observable';
+import { of, throwError } from 'rxjs';
 import { UploadModule } from '../upload.module';
 import { FileUploadingListComponent } from './file-uploading-list.component';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -57,7 +57,7 @@ describe('FileUploadingListComponent', () => {
         fixture = TestBed.createComponent(FileUploadingListComponent);
         component = fixture.componentInstance;
 
-        spyOn(translateService, 'get').and.returnValue(Observable.of('some error message'));
+        spyOn(translateService, 'get').and.returnValue(of('some error message'));
         spyOn(uploadService, 'cancelUpload');
     });
 
@@ -71,7 +71,7 @@ describe('FileUploadingListComponent', () => {
 
     describe('removeFile()', () => {
         it('should change file status when api returns success', () => {
-            spyOn(nodesApiService, 'deleteNode').and.returnValue(Observable.of(file));
+            spyOn(nodesApiService, 'deleteNode').and.returnValue(of(file));
 
             component.removeFile(file);
             fixture.detectChanges();
@@ -80,7 +80,7 @@ describe('FileUploadingListComponent', () => {
         });
 
         it('should change file status when api returns error', () => {
-            spyOn(nodesApiService, 'deleteNode').and.returnValue(Observable.throw(file));
+            spyOn(nodesApiService, 'deleteNode').and.returnValue(throwError(file));
 
             component.removeFile(file);
             fixture.detectChanges();
@@ -89,7 +89,7 @@ describe('FileUploadingListComponent', () => {
         });
 
         it('should call uploadService on error', () => {
-            spyOn(nodesApiService, 'deleteNode').and.returnValue(Observable.throw(file));
+            spyOn(nodesApiService, 'deleteNode').and.returnValue(throwError(file));
 
             component.removeFile(file);
             fixture.detectChanges();
@@ -98,7 +98,7 @@ describe('FileUploadingListComponent', () => {
         });
 
         it('should call uploadService on success', () => {
-            spyOn(nodesApiService, 'deleteNode').and.returnValue(Observable.of(file));
+            spyOn(nodesApiService, 'deleteNode').and.returnValue(of(file));
 
             component.removeFile(file);
             fixture.detectChanges();
@@ -109,7 +109,7 @@ describe('FileUploadingListComponent', () => {
         describe('Events', () => {
 
             it('should throw an error event if delete file goes wrong', (done) => {
-                spyOn(nodesApiService, 'deleteNode').and.returnValue(Observable.throw(file));
+                spyOn(nodesApiService, 'deleteNode').and.returnValue(throwError(file));
 
                 component.error.subscribe(() => {
                     done();
@@ -153,7 +153,7 @@ describe('FileUploadingListComponent', () => {
         });
 
         it('should call deleteNode when there are completed uploads', () => {
-            spyOn(nodesApiService, 'deleteNode').and.returnValue(Observable.of({}));
+            spyOn(nodesApiService, 'deleteNode').and.returnValue(of({}));
 
             component.files[0].status = FileUploadStatus.Complete;
             component.cancelAllFiles();
@@ -162,7 +162,7 @@ describe('FileUploadingListComponent', () => {
         });
 
         it('should call uploadService when there are uploading files', () => {
-            spyOn(nodesApiService, 'deleteNode').and.returnValue(Observable.of({}));
+            spyOn(nodesApiService, 'deleteNode').and.returnValue(of({}));
 
             component.files[0].status = FileUploadStatus.Progress;
             component.cancelAllFiles();
diff --git a/lib/content-services/upload/components/file-uploading-list.component.ts b/lib/content-services/upload/components/file-uploading-list.component.ts
index 6fc8903d7f..6c43ccb2f9 100644
--- a/lib/content-services/upload/components/file-uploading-list.component.ts
+++ b/lib/content-services/upload/components/file-uploading-list.component.ts
@@ -17,7 +17,8 @@
 
 import { FileModel, FileUploadStatus, NodesApiService, TranslationService, UploadService } from '@alfresco/adf-core';
 import { Component, ContentChild, Input, Output, TemplateRef, EventEmitter } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable, forkJoin, of } from 'rxjs';
+import { map, catchError } from 'rxjs/operators';
 
 @Component({
     selector: 'adf-file-uploading-list',
@@ -77,7 +78,7 @@ export class FileUploadingListComponent {
             .filter((file) => file.status === FileUploadStatus.Complete)
             .map((file) => this.deleteNode(file));
 
-        Observable.forkJoin(...deletedFiles)
+        forkJoin(...deletedFiles)
             .subscribe((files: FileModel[]) => {
                 const errors = files
                     .filter((file) => file.status === FileUploadStatus.Error);
@@ -122,14 +123,16 @@ export class FileUploadingListComponent {
 
         return this.nodesApi
             .deleteNode(id, { permanent: true })
-            .map(() => {
-                file.status = FileUploadStatus.Deleted;
-                return file;
-            })
-            .catch((error) => {
-                file.status = FileUploadStatus.Error;
-                return Observable.of(file);
-            });
+            .pipe(
+                map(() => {
+                    file.status = FileUploadStatus.Deleted;
+                    return file;
+                }),
+                catchError(() => {
+                    file.status = FileUploadStatus.Error;
+                    return of(file);
+                })
+            );
     }
 
     private notifyError(...files: FileModel[]) {
diff --git a/lib/content-services/upload/components/upload-button.component.spec.ts b/lib/content-services/upload/components/upload-button.component.spec.ts
index fa8b45b0ac..2b16adc22d 100644
--- a/lib/content-services/upload/components/upload-button.component.spec.ts
+++ b/lib/content-services/upload/components/upload-button.component.spec.ts
@@ -18,7 +18,7 @@
 import { SimpleChange } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ContentService, UploadService, TranslationService, setupTestBed, CoreModule } from '@alfresco/adf-core';
-import { Observable } from 'rxjs/Observable';
+import { of, throwError } from 'rxjs';
 import { UploadButtonComponent } from './upload-button.component';
 import { TranslationMock } from '@alfresco/adf-core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -120,7 +120,7 @@ describe('UploadButtonComponent', () => {
         component.rootFolderId = '-root-';
         component.success = null;
 
-        spyOn(contentService, 'getNode').and.returnValue(Observable.of(fakeFolderNodeWithPermission));
+        spyOn(contentService, 'getNode').and.returnValue(of(fakeFolderNodeWithPermission));
 
         component.ngOnChanges({ rootFolderId: new SimpleChange(null, component.rootFolderId, true) });
         uploadService.uploadFilesInTheQueue = jasmine.createSpy('uploadFilesInTheQueue');
@@ -135,7 +135,7 @@ describe('UploadButtonComponent', () => {
         component.rootFolderId = '-my-';
         component.success = null;
 
-        spyOn(contentService, 'getNode').and.returnValue(Observable.of(fakeFolderNodeWithPermission));
+        spyOn(contentService, 'getNode').and.returnValue(of(fakeFolderNodeWithPermission));
         component.ngOnChanges({ rootFolderId: new SimpleChange(null, component.rootFolderId, true) });
 
         uploadService.uploadFilesInTheQueue = jasmine.createSpy('uploadFilesInTheQueue');
@@ -161,8 +161,8 @@ describe('UploadButtonComponent', () => {
     it('should create a folder and emit an File uploaded event', (done) => {
         component.rootFolderId = '-my-';
 
-        spyOn(contentService, 'createFolder').and.returnValue(Observable.of(true));
-        spyOn(contentService, 'getNode').and.returnValue(Observable.of(fakeFolderNodeWithPermission));
+        spyOn(contentService, 'createFolder').and.returnValue(of(true));
+        spyOn(contentService, 'getNode').and.returnValue(of(fakeFolderNodeWithPermission));
 
         component.ngOnChanges({ rootFolderId: new SimpleChange(null, component.rootFolderId, true) });
         fixture.detectChanges();
@@ -353,7 +353,7 @@ describe('UploadButtonComponent', () => {
         it('should not call uploadFiles for node without permission', () => {
             component.rootFolderId = 'nodeId';
 
-            spyOn(contentService, 'getNode').and.returnValue(Observable.of(fakeNodeWithNoPermission));
+            spyOn(contentService, 'getNode').and.returnValue(of(fakeNodeWithNoPermission));
             component.ngOnChanges({ rootFolderId: new SimpleChange(null, component.rootFolderId, true) });
 
             uploadService.uploadFilesInTheQueue = jasmine.createSpy('uploadFilesInTheQueue');
@@ -367,7 +367,7 @@ describe('UploadButtonComponent', () => {
         it('should not call uploadFiles when getNode fails', () => {
             component.rootFolderId = 'nodeId';
 
-            spyOn(contentService, 'getNode').and.returnValue(Observable.throw('error'));
+            spyOn(contentService, 'getNode').and.returnValue(throwError('error'));
             component.ngOnChanges({ rootFolderId: new SimpleChange(null, component.rootFolderId, true) });
 
             uploadService.uploadFilesInTheQueue = jasmine.createSpy('uploadFilesInTheQueue');
@@ -381,7 +381,7 @@ describe('UploadButtonComponent', () => {
         it('should emit an error message when getNode fails', (done) => {
             component.rootFolderId = 'nodeId';
 
-            spyOn(contentService, 'getNode').and.returnValue(Observable.throw('error'));
+            spyOn(contentService, 'getNode').and.returnValue(throwError('error'));
 
             component.error.subscribe((value) => {
                 expect(value).toBe('error');
@@ -399,7 +399,7 @@ describe('UploadButtonComponent', () => {
 
             fakeNodeWithNoPermission.entry.allowableOperations = ['other'];
 
-            spyOn(contentService, 'getNode').and.returnValue(Observable.of(fakeNodeWithNoPermission));
+            spyOn(contentService, 'getNode').and.returnValue(of(fakeNodeWithNoPermission));
             component.ngOnChanges({ rootFolderId: new SimpleChange(null, component.rootFolderId, true) });
 
             uploadService.uploadFilesInTheQueue = jasmine.createSpy('uploadFilesInTheQueue');
@@ -413,7 +413,7 @@ describe('UploadButtonComponent', () => {
         it('should call uploadFiles when node has CREATE', () => {
             component.rootFolderId = 'nodeId';
 
-            spyOn(contentService, 'getNode').and.returnValue(Observable.of(fakeFolderNodeWithPermission));
+            spyOn(contentService, 'getNode').and.returnValue(of(fakeFolderNodeWithPermission));
             component.ngOnChanges({ rootFolderId: new SimpleChange(null, component.rootFolderId, true) });
 
             uploadService.uploadFilesInTheQueue = jasmine.createSpy('uploadFilesInTheQueue');
diff --git a/lib/content-services/upload/components/upload-button.component.ts b/lib/content-services/upload/components/upload-button.component.ts
index 4fbc19044e..d101b716f1 100644
--- a/lib/content-services/upload/components/upload-button.component.ts
+++ b/lib/content-services/upload/components/upload-button.component.ts
@@ -24,9 +24,8 @@ import {
     OnChanges, OnInit, Output, SimpleChanges, ViewEncapsulation, NgZone
 } from '@angular/core';
 import { MinimalNodeEntryEntity } from 'alfresco-js-api';
-import { Subject } from 'rxjs/Subject';
+import { Subject } from 'rxjs';
 import { PermissionModel } from '../../document-list/models/permissions.model';
-import 'rxjs/add/observable/throw';
 import { UploadBase } from './base-upload/upload-base';
 
 @Component({
diff --git a/lib/content-services/upload/components/upload-drag-area.component.spec.ts b/lib/content-services/upload/components/upload-drag-area.component.spec.ts
index 4452476825..901cd350d8 100644
--- a/lib/content-services/upload/components/upload-drag-area.component.spec.ts
+++ b/lib/content-services/upload/components/upload-drag-area.component.spec.ts
@@ -27,7 +27,7 @@ import {
 
 import { FileDraggableDirective } from '../directives/file-draggable.directive';
 import { UploadDragAreaComponent } from './upload-drag-area.component';
-import { Observable } from 'rxjs/Observable';
+import { throwError } from 'rxjs';
 
 function getFakeShareDataRow(allowableOperations = ['delete', 'update', 'create']) {
     return {
@@ -367,7 +367,36 @@ describe('UploadDragAreaComponent', () => {
 
             addToQueueSpy.and.callFake((fileList) => {
                 expect(fileList.name).toBe('file');
-                expect(fileList.options.path).toBe('/pippo');
+                expect(fileList.options.path).toBe('pippo/');
+            });
+
+            let fakeCustomEvent: CustomEvent = new CustomEvent('CustomEvent', {
+                detail: {
+                    data: getFakeShareDataRow(),
+                    files: [fakeItem]
+                }
+            });
+
+            component.onUploadFiles(fakeCustomEvent);
+        }));
+
+        it('should upload a folder to a specific target folder when dropped onto one', async(() => {
+
+            let fakeItem = {
+                fullPath: '/folder-fake/file-fake.png',
+                isDirectory: false,
+                isFile: true,
+                name: 'file-fake.png',
+                relativeFolder: '/super',
+                file: (callbackFile) => {
+                    let fileFake = new File(['fakefake'], 'file-fake.png', { type: 'image/png' });
+                    callbackFile(fileFake);
+                }
+            };
+
+            addToQueueSpy.and.callFake((fileList) => {
+                expect(fileList.name).toBe('file');
+                expect(fileList.options.path).toBe('pippo/super');
             });
 
             let fakeCustomEvent: CustomEvent = new CustomEvent('CustomEvent', {
@@ -428,7 +457,7 @@ describe('UploadDragAreaComponent', () => {
             };
 
             fixture.detectChanges();
-            spyOn(uploadService, 'fileUploadError').and.returnValue(Observable.throw(new Error()));
+            spyOn(uploadService, 'fileUploadError').and.returnValue(throwError(new Error()));
 
             component.error.subscribe((error) => {
                 expect(error).not.toBeNull();
diff --git a/lib/content-services/upload/components/upload-drag-area.component.ts b/lib/content-services/upload/components/upload-drag-area.component.ts
index fc14ae112b..421b7a556d 100644
--- a/lib/content-services/upload/components/upload-drag-area.component.ts
+++ b/lib/content-services/upload/components/upload-drag-area.component.ts
@@ -121,7 +121,7 @@ export class UploadDragAreaComponent extends UploadBase implements NodePermissio
             let fileInfo: FileInfo[] = event.detail.files;
             if (this.isTargetNodeFolder(event)) {
                 const destinationFolderName = event.detail.data.obj.entry.name;
-                fileInfo.map((file) => file.relativeFolder = file.relativeFolder.concat(destinationFolderName));
+                fileInfo.map((file) => file.relativeFolder = destinationFolderName ? destinationFolderName.concat(file.relativeFolder) : file.relativeFolder);
             }
             if (fileInfo && fileInfo.length > 0) {
                 this.uploadFilesInfo(fileInfo);
diff --git a/lib/content-services/upload/upload.module.ts b/lib/content-services/upload/upload.module.ts
index ef235238ba..aebb09eb81 100644
--- a/lib/content-services/upload/upload.module.ts
+++ b/lib/content-services/upload/upload.module.ts
@@ -17,7 +17,6 @@
 
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
 
 import { MaterialModule } from '../material.module';
 import { FileUploadingDialogComponent } from './components/file-uploading-dialog.component';
@@ -27,15 +26,14 @@ import { UploadButtonComponent } from './components/upload-button.component';
 import { UploadVersionButtonComponent } from './components/upload-version-button.component';
 import { UploadDragAreaComponent } from './components/upload-drag-area.component';
 
-import { PipeModule } from '@alfresco/adf-core';
+import { CoreModule } from '@alfresco/adf-core';
 import { FileDraggableDirective } from './directives/file-draggable.directive';
 
 @NgModule({
     imports: [
+        CoreModule.forChild(),
         CommonModule,
-        MaterialModule,
-        TranslateModule,
-        PipeModule
+        MaterialModule
     ],
     declarations: [
         FileDraggableDirective,
diff --git a/lib/content-services/version-manager/version-list.component.html b/lib/content-services/version-manager/version-list.component.html
index a1f8bf0bf5..0f6ac19452 100644
--- a/lib/content-services/version-manager/version-list.component.html
+++ b/lib/content-services/version-manager/version-list.component.html
@@ -1,39 +1,40 @@
 <mat-list class="adf-version-list" *ngIf="!isLoading; else loading_template">
     <mat-list-item *ngFor="let version of versions; let idx = index">
         <mat-icon mat-list-icon>insert_drive_file</mat-icon>
-        <h4 mat-line class="adf-version-list-item-name">{{version.entry.name}}</h4>
+        <h4 mat-line class="adf-version-list-item-name" [id]="'adf-version-list-item-name-' + version.entry.id" >{{version.entry.name}}</h4>
         <p mat-line>
-            <span class="adf-version-list-item-version">{{version.entry.id}}</span> -
-            <span class="adf-version-list-item-date">{{version.entry.modifiedAt | date}}</span>
+            <span class="adf-version-list-item-version"  [id]="'adf-version-list-item-version-' + version.entry.id" >{{version.entry.id}}</span> -
+            <span class="adf-version-list-item-date"     [id]="'adf-version-list-item-date-' + version.entry.id" >{{version.entry.modifiedAt | date}}</span>
         </p>
-        <p mat-line class="adf-version-list-item-comment" *ngIf="showComments">{{version.entry.versionComment}}</p>
+        <p mat-line [id]="'adf-version-list-item-comment-'+ version.entry.id" class="adf-version-list-item-comment"
+           *ngIf="showComments">{{version.entry.versionComment}}</p>
 
         <div *ngIf="showActions">
-            <mat-menu [id]="'adf-version-list-action-menu-'+idx"
+            <mat-menu [id]="'adf-version-list-action-menu-'+version.entry.id"
                       #versionMenu="matMenu" yPosition="below" xPosition="before">
                 <button
-                    [id]="'adf-version-list-action-restore-'+idx"
+                    [id]="'adf-version-list-action-restore-'+version.entry.id"
                     [disabled]="!canUpdate()"
                     mat-menu-item
                     (click)="restore(version.entry.id)">
                     {{ 'ADF_VERSION_LIST.ACTIONS.RESTORE' | translate }}
                 </button>
                 <button *ngIf="allowDownload"
-                        [id]="'adf-version-list-action-download-'+idx"
+                        [id]="'adf-version-list-action-download-'+version.entry.id"
                         mat-menu-item
                         (click)="downloadVersion(version.entry.id)">
                     {{ 'ADF_VERSION_LIST.ACTIONS.DOWNLOAD' | translate }}
                 </button>
                 <button
                     [disabled]="!canDelete()"
-                    [id]="'adf-version-list-action-delete-'+idx"
+                    [id]="'adf-version-list-action-delete-'+version.entry.id"
                     (click)="deleteVersion(version.entry.id)"
                     mat-menu-item>
                     {{ 'ADF_VERSION_LIST.ACTIONS.DELETE' | translate }}
                 </button>
             </mat-menu>
 
-            <button mat-icon-button [matMenuTriggerFor]="versionMenu" [id]="'adf-version-list-action-menu-button-'+idx">
+            <button mat-icon-button [matMenuTriggerFor]="versionMenu" [id]="'adf-version-list-action-menu-button-'+version.entry.id">
                 <mat-icon>more_vert</mat-icon>
             </button>
         </div>
diff --git a/lib/content-services/version-manager/version-list.component.spec.ts b/lib/content-services/version-manager/version-list.component.spec.ts
index ee22e63978..19af05ea63 100644
--- a/lib/content-services/version-manager/version-list.component.spec.ts
+++ b/lib/content-services/version-manager/version-list.component.spec.ts
@@ -21,7 +21,7 @@ import { By } from '@angular/platform-browser';
 import { VersionListComponent } from './version-list.component';
 import { AlfrescoApiService, setupTestBed, CoreModule, AlfrescoApiServiceMock } from '@alfresco/adf-core';
 import { MatDialog } from '@angular/material';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
 describe('VersionListComponent', () => {
@@ -33,6 +33,15 @@ describe('VersionListComponent', () => {
     const nodeId = 'test-id';
     const versionId = '1.0';
 
+    const versionTest = [
+        {
+            entry: { name: 'test-file-name', id: '1.0', versionComment: 'test-version-comment' }
+        },
+        {
+            entry: { name: 'test-file-name-two', id: '1.0', versionComment: 'test-version-comment' }
+        }
+    ];
+
     setupTestBed({
         imports: [
             CoreModule.forRoot(),
@@ -64,9 +73,12 @@ describe('VersionListComponent', () => {
     });
 
     it('should raise confirmation dialog on delete', () => {
+        fixture.detectChanges();
+        component.versions = versionTest;
+
         spyOn(dialog, 'open').and.returnValue({
             afterClosed() {
-                return Observable.of(false);
+                return of(false);
             }
         });
 
@@ -76,10 +88,11 @@ describe('VersionListComponent', () => {
     });
 
     it('should delete the version if user confirms', () => {
-        spyOn(alfrescoApiService.versionsApi, 'listVersionHistory').and.returnValue(Promise.resolve({ list: { entries: [] } }));
+        fixture.detectChanges();
+        component.versions = versionTest;
         spyOn(dialog, 'open').and.returnValue({
             afterClosed() {
-                return Observable.of(true);
+                return of(true);
             }
         });
 
@@ -92,9 +105,11 @@ describe('VersionListComponent', () => {
     });
 
     it('should not delete version if user rejects', () => {
+        component.versions = versionTest;
+
         spyOn(dialog, 'open').and.returnValue({
             afterClosed() {
-                return Observable.of(false);
+                return of(false);
             }
         });
 
@@ -106,21 +121,21 @@ describe('VersionListComponent', () => {
         expect(alfrescoApiService.versionsApi.deleteVersion).not.toHaveBeenCalled();
     });
 
-    it('should reload and raise version-deleted DOM event', (done) => {
+    it('should reload and raise deleted event', (done) => {
         spyOn(component, 'loadVersionHistory').and.stub();
-        fixture.nativeElement.addEventListener('version-deleted', () => {
+        component.deleted.subscribe(() => {
             expect(component.loadVersionHistory).toHaveBeenCalled();
             done();
         });
         fixture.detectChanges();
-        component.onVersionDeleted();
+        component.onVersionDeleted({});
     });
 
     describe('Version history fetching', () => {
 
         it('should use loading bar', () => {
             spyOn(alfrescoApiService.versionsApi, 'listVersionHistory').and
-                .callFake(() => Promise.resolve({ list: { entries: [] } }));
+                .callFake(() => Promise.resolve({ list: { entries: versionTest } }));
 
             let loadingProgressBar = fixture.debugElement.query(By.css('[data-automation-id="version-history-loading-bar"]'));
             expect(loadingProgressBar).toBeNull();
@@ -134,7 +149,7 @@ describe('VersionListComponent', () => {
 
         it('should load the versions for a given id', () => {
             spyOn(alfrescoApiService.versionsApi, 'listVersionHistory').and
-                .callFake(() => Promise.resolve({ list: { entries: [] } }));
+                .callFake(() => Promise.resolve({ list: { entries: versionTest } }));
 
             component.ngOnChanges();
             fixture.detectChanges();
@@ -241,12 +256,12 @@ describe('VersionListComponent', () => {
 
         it('should reload and raise version-restored DOM event', (done) => {
             spyOn(component, 'loadVersionHistory').and.stub();
-            fixture.nativeElement.addEventListener('version-restored', () => {
+            component.restored.subscribe(() => {
                 expect(component.loadVersionHistory).toHaveBeenCalled();
                 done();
             });
             fixture.detectChanges();
-            component.onVersionRestored();
+            component.onVersionRestored({});
         });
 
         it('should restore version only when restore allowed', () => {
@@ -258,8 +273,8 @@ describe('VersionListComponent', () => {
 
         it('should load the versions for a given id', () => {
             fixture.detectChanges();
-            spyOn(alfrescoApiService.versionsApi, 'listVersionHistory').and
-                .callFake(() => Promise.resolve({ list: { entries: [] } }));
+            component.versions = versionTest;
+
             const spyOnRevertVersion = spyOn(alfrescoApiService.versionsApi, 'revertVersion').and
                 .callFake(() => Promise.resolve(
                     { entry: { name: 'test-file-name', id: '1.0', versionComment: 'test-version-comment' } }));
@@ -271,8 +286,10 @@ describe('VersionListComponent', () => {
 
         it('should reload the version list after a version restore', (done) => {
             fixture.detectChanges();
+            component.versions = versionTest;
+
             const spyOnListVersionHistory = spyOn(alfrescoApiService.versionsApi, 'listVersionHistory').and
-                .callFake(() => Promise.resolve({ list: { entries: [] } }));
+                .callFake(() => Promise.resolve({ list: { entries: versionTest } }));
             spyOn(alfrescoApiService.versionsApi, 'revertVersion').and.callFake(() => Promise.resolve());
 
             component.restore(versionId);
@@ -307,12 +324,14 @@ describe('VersionListComponent', () => {
             });
 
             it('should show Actions if showActions is true', (done) => {
+                component.versions = versionTest;
+
                 component.showActions = true;
                 fixture.detectChanges();
 
                 fixture.whenStable().then(() => {
                     fixture.detectChanges();
-                    let menuButton = fixture.debugElement.query(By.css('#adf-version-list-action-menu-button-0'));
+                    let menuButton = fixture.nativeElement.querySelector('[id="adf-version-list-action-menu-button-1.0"]');
 
                     expect(menuButton).not.toBeNull();
                     done();
@@ -325,7 +344,7 @@ describe('VersionListComponent', () => {
 
                 fixture.whenStable().then(() => {
                     fixture.detectChanges();
-                    let menuButton = fixture.debugElement.query(By.css('#adf-version-list-action-menu-button-0'));
+                    let menuButton = fixture.nativeElement.querySelector('[id="adf-version-list-action-menu-button-1.0"]');
 
                     expect(menuButton).toBeNull();
                     done();
@@ -342,6 +361,9 @@ describe('VersionListComponent', () => {
                     return Promise.resolve({
                         list: {
                             entries: [
+                                {
+                                    entry: { name: 'test-file-two', id: '1.1', versionComment: 'test-version-comment' }
+                                },
                                 {
                                     entry: { name: 'test-file-name', id: '1.0', versionComment: 'test-version-comment' }
                                 }
@@ -356,12 +378,12 @@ describe('VersionListComponent', () => {
             it('should disable delete action if is not allowed', (done) => {
                 fixture.whenStable().then(() => {
                     fixture.detectChanges();
-                    let menuButton = fixture.debugElement.query(By.css('#adf-version-list-action-menu-button-0'));
-                    menuButton.nativeElement.click();
+                    let menuButton = fixture.nativeElement.querySelector('[id="adf-version-list-action-menu-button-1.1"]');
+                    menuButton.click();
 
-                    let deleteButton = fixture.debugElement.query(By.css('#adf-version-list-action-delete-0'));
+                    let deleteButton: any = document.querySelector('[id="adf-version-list-action-delete-1.1"]');
 
-                    expect(deleteButton.nativeElement.disabled).toBe(true);
+                    expect(deleteButton.disabled).toBe(true);
                     done();
                 });
             });
@@ -369,12 +391,12 @@ describe('VersionListComponent', () => {
             it('should disable restore action if is not allowed', (done) => {
                 fixture.whenStable().then(() => {
                     fixture.detectChanges();
-                    let menuButton = fixture.debugElement.query(By.css('#adf-version-list-action-menu-button-0'));
-                    menuButton.nativeElement.click();
+                    let menuButton = fixture.nativeElement.querySelector('[id="adf-version-list-action-menu-button-1.1"]');
+                    menuButton.click();
 
-                    let restoreButton = fixture.debugElement.query(By.css('#adf-version-list-action-restore-0'));
+                    let restoreButton: any = document.querySelector('[id="adf-version-list-action-restore-1.1"]');
 
-                    expect(restoreButton.nativeElement.disabled).toBe(true);
+                    expect(restoreButton.disabled).toBe(true);
                     done();
                 });
             });
@@ -389,6 +411,9 @@ describe('VersionListComponent', () => {
                     return Promise.resolve({
                         list: {
                             entries: [
+                                {
+                                    entry: { name: 'test-file-name', id: '1.1', versionComment: 'test-version-comment' }
+                                },
                                 {
                                     entry: { name: 'test-file-name', id: '1.0', versionComment: 'test-version-comment' }
                                 }
@@ -403,12 +428,12 @@ describe('VersionListComponent', () => {
             it('should enable delete action if is allowed', (done) => {
                 fixture.whenStable().then(() => {
                     fixture.detectChanges();
-                    let menuButton = fixture.debugElement.query(By.css('#adf-version-list-action-menu-button-0'));
-                    menuButton.nativeElement.click();
+                    let menuButton = fixture.nativeElement.querySelector('[id="adf-version-list-action-menu-button-1.1"]');
+                    menuButton.click();
 
-                    let deleteButton = fixture.debugElement.query(By.css('#adf-version-list-action-delete-0'));
+                    let deleteButton: any = document.querySelector('[id="adf-version-list-action-delete-1.1"]');
 
-                    expect(deleteButton.nativeElement.disabled).toBe(false);
+                    expect(deleteButton.disabled).toBe(false);
                     done();
                 });
             });
@@ -416,12 +441,12 @@ describe('VersionListComponent', () => {
             it('should enable restore action if is allowed', (done) => {
                 fixture.whenStable().then(() => {
                     fixture.detectChanges();
-                    let menuButton = fixture.debugElement.query(By.css('#adf-version-list-action-menu-button-0'));
-                    menuButton.nativeElement.click();
+                    let menuButton = fixture.nativeElement.querySelector('[id="adf-version-list-action-menu-button-1.1"]');
+                    menuButton.click();
 
-                    let restoreButton = fixture.debugElement.query(By.css('#adf-version-list-action-restore-0'));
+                    let restoreButton: any = document.querySelector('[id="adf-version-list-action-restore-1.1"]');
 
-                    expect(restoreButton.nativeElement.disabled).toBe(false);
+                    expect(restoreButton.disabled).toBe(false);
                     done();
                 });
             });
diff --git a/lib/content-services/version-manager/version-list.component.ts b/lib/content-services/version-manager/version-list.component.ts
index 46f88489f4..752ab1d525 100644
--- a/lib/content-services/version-manager/version-list.component.ts
+++ b/lib/content-services/version-manager/version-list.component.ts
@@ -16,7 +16,7 @@
  */
 
 import { AlfrescoApiService, ContentService } from '@alfresco/adf-core';
-import { Component, Input, OnChanges, ViewEncapsulation, ElementRef } from '@angular/core';
+import { Component, Input, OnChanges, ViewEncapsulation, EventEmitter, Output } from '@angular/core';
 import { VersionsApi, MinimalNodeEntryEntity, VersionEntry } from 'alfresco-js-api';
 import { MatDialog } from '@angular/material';
 import { ConfirmDialogComponent } from '../dialogs/confirm.dialog';
@@ -56,10 +56,17 @@ export class VersionListComponent implements OnChanges {
     @Input()
     showActions = true;
 
+    /** Emitted when a version is restored */
+    @Output()
+    restored: EventEmitter<MinimalNodeEntryEntity> = new EventEmitter<MinimalNodeEntryEntity>();
+
+    /** Emitted when a version is deleted */
+    @Output()
+    deleted: EventEmitter<MinimalNodeEntryEntity> = new EventEmitter<MinimalNodeEntryEntity>();
+
     constructor(private alfrescoApi: AlfrescoApiService,
                 private contentService: ContentService,
-                private dialog: MatDialog,
-                private el: ElementRef) {
+                private dialog: MatDialog) {
         this.versionsApi = this.alfrescoApi.versionsApi;
     }
 
@@ -68,18 +75,18 @@ export class VersionListComponent implements OnChanges {
     }
 
     canUpdate(): boolean {
-        return this.contentService.hasPermission(this.node, 'update');
+        return this.contentService.hasPermission(this.node, 'update') && this.versions.length > 1;
     }
 
     canDelete(): boolean {
-        return this.contentService.hasPermission(this.node, 'delete');
+        return this.contentService.hasPermission(this.node, 'delete') && this.versions.length > 1;
     }
 
     restore(versionId) {
         if (this.canUpdate()) {
             this.versionsApi
                 .revertVersion(this.node.id, versionId, { majorVersion: true, comment: '' })
-                .then(() => this.onVersionRestored());
+                .then(() => this.onVersionRestored(this.node));
         }
     }
 
@@ -114,24 +121,20 @@ export class VersionListComponent implements OnChanges {
                 if (result === true) {
                     this.alfrescoApi.versionsApi
                         .deleteVersion(this.node.id, versionId)
-                        .then(() => this.onVersionDeleted());
+                        .then(() => this.onVersionDeleted(this.node));
                 }
             });
         }
     }
 
-    onVersionDeleted() {
+    onVersionDeleted(node: any) {
         this.loadVersionHistory();
-
-        const event = new CustomEvent('version-deleted', { bubbles: true });
-        this.el.nativeElement.dispatchEvent(event);
+        this.deleted.emit(node);
     }
 
-    onVersionRestored() {
+    onVersionRestored(node: any) {
         this.loadVersionHistory();
-
-        const event = new CustomEvent('version-restored', { bubbles: true });
-        this.el.nativeElement.dispatchEvent(event);
+        this.restored.emit(node);
     }
 
     private getVersionContentUrl(nodeId: string, versionId: string, attachment?: boolean) {
diff --git a/lib/content-services/version-manager/version-manager.component.html b/lib/content-services/version-manager/version-manager.component.html
index d84f1f84ff..a0c541430a 100644
--- a/lib/content-services/version-manager/version-manager.component.html
+++ b/lib/content-services/version-manager/version-manager.component.html
@@ -1,6 +1,6 @@
 <div class="adf-new-version-container">
-    <div class="adf-new-version-uploader-container" fxLayout="row" fxLayoutAlign="end center" [@uploadToggle]="uploadState">
-        <table class="adf-version-upload">
+    <div class="adf-new-version-uploader-container" id="adf-new-version-uploader-container" fxLayout="row" fxLayoutAlign="end center" [@uploadToggle]="uploadState">
+        <table class="adf-version-upload" *ngIf="uploadState !== 'close'">
             <tr>
                 <td>
                     <adf-version-upload
@@ -8,7 +8,7 @@
                         [node]="node"
                         (success)="onUploadSuccess($event)"
                         (cancel)="onUploadCancel()"
-                        (error)="uploadError.emit($event)">
+                        (error)="onUploadError($event)">
                     </adf-version-upload>
                 </td>
             </tr>
@@ -27,11 +27,14 @@
                 </button>
             </div>
             <div>
+
                 <adf-version-list
                     #versionList
                     [node]="node"
                     [allowDownload]="allowDownload"
-                    [showComments]="showComments">
+                    [showComments]="showComments"
+                    (deleted)="refresh($event)"
+                    (restored)="refresh($event)">
                 </adf-version-list>
             </div>
         </div>
diff --git a/lib/content-services/version-manager/version-manager.component.scss b/lib/content-services/version-manager/version-manager.component.scss
index 18798e68f8..e74ec2c162 100644
--- a/lib/content-services/version-manager/version-manager.component.scss
+++ b/lib/content-services/version-manager/version-manager.component.scss
@@ -14,7 +14,7 @@
 
     float: left;
     position: relative;
-    visibility: hidden;
+    display: hidden;
 }
 
 .adf-new-version-container {
diff --git a/lib/content-services/version-manager/version-manager.component.spec.ts b/lib/content-services/version-manager/version-manager.component.spec.ts
index 48edd9122e..7701dcf99f 100644
--- a/lib/content-services/version-manager/version-manager.component.spec.ts
+++ b/lib/content-services/version-manager/version-manager.component.spec.ts
@@ -102,7 +102,7 @@ describe('VersionManagerComponent', () => {
 
         const emittedData = { value: { entry: node }};
         component.uploadSuccess.subscribe(event => {
-            expect(event).toBe(emittedData);
+            expect(event).toBe(node);
         });
         component.onUploadSuccess(emittedData);
     }));
diff --git a/lib/content-services/version-manager/version-manager.component.ts b/lib/content-services/version-manager/version-manager.component.ts
index 4739c718e3..633ddb5f26 100644
--- a/lib/content-services/version-manager/version-manager.component.ts
+++ b/lib/content-services/version-manager/version-manager.component.ts
@@ -57,11 +57,11 @@ export class VersionManagerComponent {
 
     /** Emitted when a file is uploaded successfully. */
     @Output()
-    uploadSuccess = new EventEmitter();
+    uploadSuccess: EventEmitter<MinimalNodeEntryEntity> = new EventEmitter<MinimalNodeEntryEntity>();
 
     /** Emitted when an error occurs during upload. */
     @Output()
-    uploadError = new EventEmitter();
+    uploadError: EventEmitter<MinimalNodeEntryEntity> = new EventEmitter<MinimalNodeEntryEntity>();
 
     @ViewChild('versionList')
     versionListComponent: VersionListComponent;
@@ -73,13 +73,24 @@ export class VersionManagerComponent {
                 private alfrescoApiService: AlfrescoApiService) {
     }
 
-    onUploadSuccess(event) {
+    refresh(node: MinimalNodeEntryEntity) {
+        this.alfrescoApiService.nodeUpdated.next(node);
+        this.versionListComponent.loadVersionHistory();
+        this.uploadSuccess.emit(node);
+        this.uploadState = 'close';
+    }
+
+    onUploadSuccess(event: any) {
         this.alfrescoApiService.nodeUpdated.next(event.value.entry);
         this.versionListComponent.loadVersionHistory();
-        this.uploadSuccess.emit(event);
+        this.uploadSuccess.emit(event.value.entry);
         this.uploadState = 'close';
     }
 
+    onUploadError(event: any) {
+        this.uploadError.emit(event);
+    }
+
     onUploadCancel() {
         this.uploadState = 'close';
     }
diff --git a/lib/content-services/version-manager/version-manager.module.ts b/lib/content-services/version-manager/version-manager.module.ts
index 826fbf75ee..3c6b8c5ee8 100644
--- a/lib/content-services/version-manager/version-manager.module.ts
+++ b/lib/content-services/version-manager/version-manager.module.ts
@@ -19,18 +19,18 @@ import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { NgModule } from '@angular/core';
 import { MaterialModule } from '../material.module';
-import { TranslateModule } from '@ngx-translate/core';
 
 import { VersionUploadComponent } from './version-upload.component';
 import { VersionManagerComponent } from './version-manager.component';
 import { VersionListComponent } from './version-list.component';
 import { UploadModule } from '../upload/upload.module';
+import { CoreModule } from '@alfresco/adf-core';
 
 @NgModule({
     imports: [
         CommonModule,
         MaterialModule,
-        TranslateModule,
+        CoreModule.forChild(),
         UploadModule,
         FormsModule
     ],
@@ -44,7 +44,6 @@ import { UploadModule } from '../upload/upload.module';
         VersionUploadComponent,
         VersionManagerComponent,
         VersionListComponent
-    ],
-    providers: []
+    ]
 })
 export class VersionManagerModule {}
diff --git a/lib/content-services/version-manager/version-upload.component.html b/lib/content-services/version-manager/version-upload.component.html
index 5b966eb995..ccda47b6cd 100644
--- a/lib/content-services/version-manager/version-upload.component.html
+++ b/lib/content-services/version-manager/version-upload.component.html
@@ -1,16 +1,16 @@
 <div class="adf-new-version-max-width">
     <mat-radio-group class="adf-new-version-radio-group" [(ngModel)]="semanticVersion">
-        <mat-radio-button class="adf-new-version-radio-button" [value]="'minor'">{{
+        <mat-radio-button class="adf-new-version-radio-button" id="adf-new-version-minor"[value]="'minor'">{{
             'ADF_VERSION_LIST.ACTIONS.UPLOAD.MINOR' |
             translate }}
         </mat-radio-button>
-        <mat-radio-button class="adf-new-version-radio-button" [value]="'major'">{{
+        <mat-radio-button class="adf-new-version-radio-button" id="adf-new-version-major" [value]="'major'">{{
             'ADF_VERSION_LIST.ACTIONS.UPLOAD.MAJOR' |
             translate }}
         </mat-radio-button>
     </mat-radio-group>
     <mat-form-field class="adf-new-version-max-width">
-                    <textarea matInput [(ngModel)]="comment" class="adf-new-version-text-area"
+                    <textarea matInput [(ngModel)]="comment" class="adf-new-version-text-area" id="adf-new-version-text-area"
                               placeholder="{{ 'ADF_VERSION_LIST.ACTIONS.UPLOAD.COMMENT' | translate }}"></textarea>
     </mat-form-field>
 
@@ -29,7 +29,7 @@
         (success)="success.emit($event)"
         (error)="error.emit($event)">
     </adf-upload-version-button>
-    <button mat-raised-button (click)="cancelUpload()">{{
+    <button mat-raised-button (click)="cancelUpload()" id="adf-new-version-cancel"  >{{
         'ADF_VERSION_LIST.ACTIONS.UPLOAD.CANCEL'| translate }}
     </button>
 </div>
diff --git a/lib/content-services/webscript/webscript.module.ts b/lib/content-services/webscript/webscript.module.ts
index b6ebbdb6a5..72229fda0c 100644
--- a/lib/content-services/webscript/webscript.module.ts
+++ b/lib/content-services/webscript/webscript.module.ts
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 
-import { DataTableModule, PipeModule } from '@alfresco/adf-core';
+import { CoreModule } from '@alfresco/adf-core';
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
 
 import { MaterialModule } from '../material.module';
 import { WebscriptComponent } from './webscript.component';
@@ -26,10 +25,8 @@ import { WebscriptComponent } from './webscript.component';
 @NgModule({
     imports: [
         CommonModule,
-        PipeModule,
         MaterialModule,
-        DataTableModule,
-        TranslateModule
+        CoreModule.forChild()
     ],
     exports: [
         WebscriptComponent
diff --git a/lib/core/about/about.component.ts b/lib/core/about/about.component.ts
index 00c9b30ccc..a37b39f77d 100644
--- a/lib/core/about/about.component.ts
+++ b/lib/core/about/about.component.ts
@@ -16,7 +16,7 @@
  */
 
 import { Component, OnInit, ViewEncapsulation } from '@angular/core';
-import { Http } from '@angular/http';
+import { HttpClient } from '@angular/common/http';
 import { AuthenticationService } from '../services/authentication.service';
 import { BpmProductVersionModel, EcmProductVersionModel } from '../models/product-version.model';
 import { DiscoveryApiService } from '../services/discovery-api.service';
@@ -43,7 +43,7 @@ export class AboutComponent implements OnInit {
     ecmVersion: EcmProductVersionModel = null;
     bpmVersion: BpmProductVersionModel = null;
 
-    constructor(private http: Http,
+    constructor(private http: HttpClient,
                 private appConfig: AppConfigService,
                 private authService: AuthenticationService,
                 private discovery: DiscoveryApiService) {
@@ -90,10 +90,10 @@ export class AboutComponent implements OnInit {
             });
         }
 
-        this.http.get('/versions.json?' + new Date()).subscribe(response => {
+        this.http.get('/versions.json?' + new Date()).subscribe((response: any) => {
             const regexp = new RegExp('^(@alfresco)');
 
-            const alfrescoPackages = Object.keys(response.json().dependencies).filter((val) => {
+            const alfrescoPackages = Object.keys(response.dependencies).filter((val) => {
                 return regexp.test(val);
             });
 
@@ -101,7 +101,7 @@ export class AboutComponent implements OnInit {
             alfrescoPackages.forEach((val) => {
                 alfrescoPackagesTableRepresentation.push({
                     name: val,
-                    version: response.json().dependencies[val].version
+                    version: response.dependencies[val].version
                 });
             });
 
diff --git a/lib/core/about/about.module.ts b/lib/core/about/about.module.ts
index 17cfa33210..9f87dc2ef8 100644
--- a/lib/core/about/about.module.ts
+++ b/lib/core/about/about.module.ts
@@ -27,7 +27,7 @@ import { DataColumnModule } from '../data-column/data-column.module';
     imports: [
         CommonModule,
         MaterialModule,
-        TranslateModule,
+        TranslateModule.forChild(),
         DataTableModule,
         DataColumnModule
     ],
diff --git a/lib/core/app-config/app-config.module.ts b/lib/core/app-config/app-config.module.ts
index cab0c81744..3ce8477dd3 100644
--- a/lib/core/app-config/app-config.module.ts
+++ b/lib/core/app-config/app-config.module.ts
@@ -17,7 +17,6 @@
 
 import { HttpClientModule } from '@angular/common/http';
 import { NgModule } from '@angular/core';
-import { AppConfigService } from './app-config.service';
 import { AppConfigPipe } from './app-config.pipe';
 
 @NgModule({
@@ -27,9 +26,6 @@ import { AppConfigPipe } from './app-config.pipe';
     declarations: [
         AppConfigPipe
     ],
-    providers: [
-        AppConfigService
-    ],
     exports: [
         AppConfigPipe
     ]
diff --git a/lib/core/app-config/app-config.service.ts b/lib/core/app-config/app-config.service.ts
index fc1088720d..9b8f2c6cc5 100644
--- a/lib/core/app-config/app-config.service.ts
+++ b/lib/core/app-config/app-config.service.ts
@@ -18,8 +18,8 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { ObjectUtils } from '../utils/object-utils';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
-import { Observable } from 'rxjs/Observable';
+import { Observable, Subject } from 'rxjs';
+import { map, distinctUntilChanged } from 'rxjs/operators';
 
 export enum AppConfigValues {
     APP_CONFIG_LANGUAGES_KEY = 'languages',
@@ -49,11 +49,11 @@ export class AppConfigService {
         alfrescoRepositoryName: 'alfresco-1'
     };
 
-    private onLoadSubject: BehaviorSubject<any>;
+    private onLoadSubject: Subject<any>;
     onLoad: Observable<any>;
 
     constructor(private http: HttpClient) {
-        this.onLoadSubject = new BehaviorSubject(this.config);
+        this.onLoadSubject = new Subject();
         this.onLoad = this.onLoadSubject.asObservable();
     }
 
@@ -63,7 +63,11 @@ export class AppConfigService {
      * @returns Property value, when loaded
      */
     select(property: string): Observable<any> {
-        return this.onLoadSubject.map((config) => config[property]).distinctUntilChanged();
+        return this.onLoadSubject
+            .pipe(
+                map((config) => config[property]),
+                distinctUntilChanged()
+            );
     }
 
     /**
@@ -75,12 +79,12 @@ export class AppConfigService {
     get<T>(key: string, defaultValue?: T): T {
         let result: any = ObjectUtils.getValue(this.config, key);
         if (typeof result === 'string') {
-            const map = new Map<string, string>();
-            map.set('hostname', this.getLocationHostname());
-            map.set(':port', this.getLocationPort(':'));
-            map.set('port', this.getLocationPort());
-            map.set('protocol', this.getLocationProtocol());
-            result = this.formatString(result, map);
+            const keywords = new Map<string, string>();
+            keywords.set('hostname', this.getLocationHostname());
+            keywords.set(':port', this.getLocationPort(':'));
+            keywords.set('port', this.getLocationPort());
+            keywords.set('protocol', this.getLocationProtocol());
+            result = this.formatString(result, keywords);
         }
         if (result === undefined) {
             return defaultValue;
@@ -131,10 +135,10 @@ export class AppConfigService {
         });
     }
 
-    private formatString(str: string, map: Map<string, string>): string {
+    private formatString(str: string, keywords: Map<string, string>): string {
         let result = str;
 
-        map.forEach((value, key) => {
+        keywords.forEach((value, key) => {
             const expr = new RegExp('{' + key + '}', 'gm');
             result = result.replace(expr, value);
         });
diff --git a/lib/core/app-config/schema.json b/lib/core/app-config/schema.json
index 6d9eef4483..40c65baf1c 100644
--- a/lib/core/app-config/schema.json
+++ b/lib/core/app-config/schema.json
@@ -318,6 +318,56 @@
                     "description": "File exclusions",
                     "type": "array",
                     "items": { "type": "string" }
+                },
+                "match-options": {
+                  "description": "Minimatch plugin option that will be applied for the check. By default all the options are false",
+                  "type": "object",
+                  "properties": {
+                    "debug": {
+                      "description": "Dump a ton of stuff to stderr",
+                      "type": ["boolean", "null"]
+                    },
+                    "nobrace": {
+                      "description": "Do not expand {a,b} and {1..3} brace sets.",
+                      "type": ["boolean", "null"]
+                    },
+                    "noglobstar": {
+                      "description": "Disable ** matching against multiple folder names.",
+                      "type": ["boolean", "null"]
+                    },
+                    "dot": {
+                      "description": "Allow patterns to match filenames starting with a period, even if the pattern does not explicitly have a period in that spot.",
+                      "type": ["boolean", "null"]
+                    },
+                    "noext": {
+                      "description": "Disable 'extglob' style patterns like +(a|b).",
+                      "type": ["boolean", "null"]
+                    },
+                    "nocase": {
+                      "description": "Perform a case-insensitive match.",
+                      "type": ["boolean", "null"]
+                    },
+                    "nonull": {
+                      "description": "When a match is not found by minimatch.match, return a list containing the pattern itself if this option is set. When not set, an empty list is returned if there are no matches.",
+                      "type": ["boolean", "null"]
+                    },
+                    "matchBase": {
+                      "description": "If set, then patterns without slashes will be matched against the basename of the path if it contains slashes.",
+                      "type": ["boolean", "null"]
+                    },
+                    "nocomment": {
+                      "description": "Suppress the behavior of treating # at the start of a pattern as a comment.",
+                      "type": ["boolean", "null"]
+                    },
+                    "nonegate": {
+                      "description": "Suppress the behavior of treating a leading ! character as negation.",
+                      "type": ["boolean", "null"]
+                    },
+                    "flipNegate": {
+                      "description": "Returns from negate expressions the same as if they were not negated.",
+                      "type": ["boolean", "null"]
+                    }
+                  }
                 }
             }
         },
@@ -518,37 +568,48 @@
               }
             },
             "facetFields": {
-              "type": "array",
-              "minItems": 1,
-              "items": {
-                "type": "object",
-                "required": [ "field", "mincount", "label" ],
-                "properties": {
-                  "field": {
-                    "type": "string",
-                    "description": "This specifies the facet field."
-                  },
-                  "mincount": {
-                    "type": "number",
-                    "description": "This specifies the minimum count required for a facet field to be included in the response. The default value is 1."
-                  },
-                  "label": {
-                    "type": "string",
-                    "description": "This specifies the label to include in place of the facet field."
-                  },
-                  "prefix": {
-                    "type": "string",
-                    "description": "This restricts the possible constraints to only indexed values with a specified prefix."
-                  },
-                  "limit": {
-                    "type": "number",
-                    "description": "Maximum number of results"
-                  },
-                  "pageSize": {
-                    "type": "number",
-                    "description": "Display page size"
-                  },
-                  "offset": { "type": "integer" }
+              "type": "object",
+              "required": ["fields"],
+              "properties": {
+                "expanded": {
+                  "description": "Toggles expanded state of the facet field",
+                  "type": "boolean"
+                },
+                "fields": {
+                  "description": "List of custom facet fields",
+                  "type": "array",
+                  "minItems": 1,
+                  "items": {
+                    "type": "object",
+                    "required": [ "field", "mincount", "label" ],
+                    "properties": {
+                      "field": {
+                        "type": "string",
+                        "description": "This specifies the facet field."
+                      },
+                      "mincount": {
+                        "type": "number",
+                        "description": "This specifies the minimum count required for a facet field to be included in the response. The default value is 1."
+                      },
+                      "label": {
+                        "type": "string",
+                        "description": "This specifies the label to include in place of the facet field."
+                      },
+                      "prefix": {
+                        "type": "string",
+                        "description": "This restricts the possible constraints to only indexed values with a specified prefix."
+                      },
+                      "limit": {
+                        "type": "number",
+                        "description": "Maximum number of results"
+                      },
+                      "pageSize": {
+                        "type": "number",
+                        "description": "Display page size"
+                      },
+                      "offset": { "type": "integer" }
+                    }
+                  }
                 }
               }
             },
diff --git a/lib/core/assets/images/logo.png b/lib/core/assets/images/logo.png
new file mode 100644
index 0000000000..d342b10ee0
Binary files /dev/null and b/lib/core/assets/images/logo.png differ
diff --git a/lib/core/buttons-menu/buttons-menu.module.ts b/lib/core/buttons-menu/buttons-menu.module.ts
index dc350c7a79..29e5ddfd51 100644
--- a/lib/core/buttons-menu/buttons-menu.module.ts
+++ b/lib/core/buttons-menu/buttons-menu.module.ts
@@ -26,7 +26,7 @@ import { FlexLayoutModule } from '@angular/flex-layout';
     imports: [
         CommonModule,
         MaterialModule,
-        TranslateModule,
+        TranslateModule.forChild(),
         FlexLayoutModule
     ],
     declarations: [
diff --git a/lib/core/card-view/card-view.module.ts b/lib/core/card-view/card-view.module.ts
index ae5f2e068f..4f2e8d5a1a 100644
--- a/lib/core/card-view/card-view.module.ts
+++ b/lib/core/card-view/card-view.module.ts
@@ -21,10 +21,12 @@ import { FormsModule } from '@angular/forms';
 import {
     MatButtonModule,
     MatDatepickerModule,
+    MatTableModule,
     MatIconModule,
     MatInputModule,
     MatCheckboxModule,
-    MatNativeDateModule
+    MatNativeDateModule,
+    MatSelectModule
 } from '@angular/material';
 import { MatDatetimepickerModule, MatNativeDatetimeModule } from '@mat-datetimepicker/core';
 import { FlexLayoutModule } from '@angular/flex-layout';
@@ -37,18 +39,22 @@ import { CardViewDateItemComponent } from './components/card-view-dateitem/card-
 import { CardViewItemDispatcherComponent } from './components/card-view-item-dispatcher/card-view-item-dispatcher.component';
 import { CardViewMapItemComponent } from './components/card-view-mapitem/card-view-mapitem.component';
 import { CardViewTextItemComponent } from './components/card-view-textitem/card-view-textitem.component';
+import { CardViewKeyValuePairsItemComponent } from './components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component';
+import { CardViewSelectItemComponent } from './components/card-view-selectitem/card-view-selectitem.component';
 
 @NgModule({
     imports: [
         CommonModule,
         FormsModule,
         FlexLayoutModule,
-        TranslateModule,
+        TranslateModule.forChild(),
         MatDatepickerModule,
         MatNativeDateModule,
         MatCheckboxModule,
         MatInputModule,
+        MatTableModule,
         MatIconModule,
+        MatSelectModule,
         MatButtonModule,
         MatDatetimepickerModule,
         MatNativeDatetimeModule
@@ -59,6 +65,8 @@ import { CardViewTextItemComponent } from './components/card-view-textitem/card-
         CardViewDateItemComponent,
         CardViewMapItemComponent,
         CardViewTextItemComponent,
+        CardViewKeyValuePairsItemComponent,
+        CardViewSelectItemComponent,
         CardViewItemDispatcherComponent,
         CardViewContentProxyDirective
     ],
@@ -66,14 +74,18 @@ import { CardViewTextItemComponent } from './components/card-view-textitem/card-
         CardViewBoolItemComponent,
         CardViewDateItemComponent,
         CardViewMapItemComponent,
-        CardViewTextItemComponent
+        CardViewTextItemComponent,
+        CardViewSelectItemComponent,
+        CardViewKeyValuePairsItemComponent
     ],
     exports: [
         CardViewComponent,
         CardViewBoolItemComponent,
         CardViewDateItemComponent,
         CardViewMapItemComponent,
-        CardViewTextItemComponent
+        CardViewTextItemComponent,
+        CardViewSelectItemComponent,
+        CardViewKeyValuePairsItemComponent
     ]
 })
 export class CardViewModule {}
diff --git a/lib/core/card-view/components/card-view-boolitem/card-view-boolitem.component.html b/lib/core/card-view/components/card-view-boolitem/card-view-boolitem.component.html
index d3024d959a..e8443a6078 100644
--- a/lib/core/card-view/components/card-view-boolitem/card-view-boolitem.component.html
+++ b/lib/core/card-view/components/card-view-boolitem/card-view-boolitem.component.html
@@ -1,7 +1,8 @@
 <ng-container *ngIf="!property.isEmpty() || isEditable()">
-    <div class="adf-property-label">{{ property.label | translate }}</div>
+    <div [attr.data-automation-id]="'card-boolean-label-' + property.key" class="adf-property-label">{{ property.label | translate }}</div>
     <div class="adf-property-value">
         <mat-checkbox
+            [attr.data-automation-id]="'card-boolean-' + property.key"
             [attr.title]="'CORE.METADATA.ACTIONS.TOGGLE' | translate"
             [checked]="property.displayValue"
             [disabled]="!isEditable()"
diff --git a/lib/core/card-view/components/card-view-dateitem/card-view-dateitem.component.html b/lib/core/card-view/components/card-view-dateitem/card-view-dateitem.component.html
index b2c60bad5d..a1eee5b48e 100644
--- a/lib/core/card-view/components/card-view-dateitem/card-view-dateitem.component.html
+++ b/lib/core/card-view/components/card-view-dateitem/card-view-dateitem.component.html
@@ -1,6 +1,6 @@
-<div class="adf-property-label" *ngIf="showProperty() || isEditable()">{{ property.label | translate }}</div>
+<div [attr.data-automation-id]="'card-dateitem-label-' + property.key" class="adf-property-label" *ngIf="showProperty() || isEditable()">{{ property.label | translate }}</div>
 <div class="adf-property-value">
-    <span *ngIf="!isEditable()">
+    <span *ngIf="!isEditable()" [attr.data-automation-id]="'card-' + property.type + '-value-' + property.key">
         <span [attr.data-automation-id]="'card-dateitem-' + property.key">
             <span *ngIf="showProperty()">{{ property.displayValue }}</span>
         </span>
@@ -10,8 +10,8 @@
             <span
                 class="adf-datepicker-toggle"
                 [attr.data-automation-id]="'datepicker-label-toggle-' + property.key"
-                (click)="showDatePicker($event)">
-                <span *ngIf="showProperty(); else elseEmptyValueBlock">{{ property.displayValue }}</span>
+                (click)="showDatePicker()">
+                <span [attr.data-automation-id]="'card-' + property.type + '-value-' + property.key" *ngIf="showProperty(); else elseEmptyValueBlock">{{ property.displayValue }}</span>
             </span>
             <mat-datetimepicker-toggle
                 [attr.title]="'CORE.METADATA.ACTIONS.EDIT' | translate"
diff --git a/lib/core/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.html b/lib/core/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.html
new file mode 100644
index 0000000000..fc92c7592e
--- /dev/null
+++ b/lib/core/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.html
@@ -0,0 +1,58 @@
+<div [attr.data-automation-id]="'card-key-value-pairs-label-' + property.key" class="adf-property-label">{{ property.label | translate }}</div>
+<div class="adf-property-value">
+
+    <div *ngIf="isEditable()">
+        {{ 'CORE.CARDVIEW.KEYVALUEPAIRS.ADD' | translate }}
+        <button (click)="add()" mat-icon-button class="card-view__key-value-pairs__add-btn" [attr.data-automation-id]="'card-key-value-pairs-button-' + property.key">
+            <mat-icon>add</mat-icon>
+        </button>
+    </div>
+
+    <div *ngIf="!isEditable()" class="card-view__key-value-pairs__read-only">
+        <mat-table #table [dataSource]="matTableValues" class="mat-elevation-z8">
+            <ng-container matColumnDef="name">
+                <mat-header-cell *matHeaderCellDef>{{ 'CORE.CARDVIEW.KEYVALUEPAIRS.NAME' | translate }}</mat-header-cell>
+                <mat-cell *matCellDef="let item">{{item.name}}</mat-cell>
+            </ng-container>
+            <ng-container matColumnDef="value">
+                <mat-header-cell *matHeaderCellDef>{{ 'CORE.CARDVIEW.KEYVALUEPAIRS.VALUE' | translate }}</mat-header-cell>
+                <mat-cell *matCellDef="let item">{{item.value}}</mat-cell>
+            </ng-container>
+
+            <mat-header-row *matHeaderRowDef="['name', 'value']"></mat-header-row>
+            <mat-row *matRowDef="let row; columns: ['name', 'value'];"></mat-row>
+        </mat-table>
+    </div>
+
+
+    <div class="card-view__key-value-pairs" *ngIf="isEditable() && values && values.length">
+        <div class="card-view__key-value-pairs__row">
+            <div class="card-view__key-value-pairs__col">{{ 'CORE.CARDVIEW.KEYVALUEPAIRS.NAME' | translate }}</div>
+            <div class="card-view__key-value-pairs__col">{{ 'CORE.CARDVIEW.KEYVALUEPAIRS.VALUE' | translate }}</div>
+        </div>
+
+        <div class="card-view__key-value-pairs__row" *ngFor="let item of values; let i = index">
+            <div class="card-view__key-value-pairs__col">
+                <mat-form-field class="example-full-width">
+                    <input matInput
+                           placeholder="{{ 'CORE.CARDVIEW.KEYVALUEPAIRS.NAME' | translate }}"
+                           (blur)="onBlur(item.value)"
+                           [attr.data-automation-id]="'card-'+ property.key +'-name-input-' + i"
+                           [(ngModel)]="values[i].name">
+                </mat-form-field>
+            </div>
+            <div class="card-view__key-value-pairs__col">
+                <mat-form-field class="example-full-width">
+                    <input matInput
+                           placeholder="{{ 'CORE.CARDVIEW.KEYVALUEPAIRS.VALUE' | translate }}"
+                           (blur)="onBlur(item.value)"
+                           [attr.data-automation-id]="'card-'+ property.key +'-value-input-' + i"
+                           [(ngModel)]="values[i].value">
+                </mat-form-field>
+            </div>
+            <button mat-icon-button (click)="remove(i)" class="card-view__key-value-pairs__remove-btn">
+                <mat-icon>close</mat-icon>
+            </button>
+        </div>
+    </div>
+</div>
diff --git a/lib/core/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.scss b/lib/core/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.scss
new file mode 100644
index 0000000000..84caf9ce97
--- /dev/null
+++ b/lib/core/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.scss
@@ -0,0 +1,22 @@
+.card-view {
+    &__key-value-pairs {
+        &__col {
+            display: inline-block;
+            width: 39%;
+
+            .mat-form-field {
+                width: 100%;
+            }
+        }
+
+        &__read-only {
+            .mat-table {
+                box-shadow: none;
+            }
+
+            .mat-header-row, .mat-row {
+                padding: 0;
+            }
+        }
+    }
+}
diff --git a/lib/core/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.spec.ts b/lib/core/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.spec.ts
new file mode 100644
index 0000000000..c81e8cccd2
--- /dev/null
+++ b/lib/core/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.spec.ts
@@ -0,0 +1,176 @@
+/*!
+ * @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 { ComponentFixture, TestBed, async } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { CardViewKeyValuePairsItemModel } from '../../models/card-view-keyvaluepairs.model';
+import { CardViewKeyValuePairsItemComponent } from './card-view-keyvaluepairsitem.component';
+import { setupTestBed } from '../../../testing/setupTestBed';
+import { CoreTestingModule } from '../../../testing/core.testing.module';
+import { CardViewUpdateService } from '../../services/card-view-update.service';
+
+describe('CardViewKeyValuePairsItemComponent', () => {
+
+    let fixture: ComponentFixture<CardViewKeyValuePairsItemComponent>;
+    let component: CardViewKeyValuePairsItemComponent;
+    let cardViewUpdateService;
+    const mockEmptyData = [{ name: '', value: '' }];
+    const mockData = [{ name: 'test-name', value: 'test-value' }];
+
+    setupTestBed({
+        imports: [CoreTestingModule]
+    });
+
+    beforeEach(() => {
+        fixture = TestBed.createComponent(CardViewKeyValuePairsItemComponent);
+        cardViewUpdateService = TestBed.get(CardViewUpdateService);
+        component = fixture.componentInstance;
+        component.property = new CardViewKeyValuePairsItemModel({
+            label: 'Key Value Pairs',
+            value: [],
+            key: 'key-value-pairs',
+            editable: true
+        });
+        component.editable = true;
+    });
+
+    afterEach(() => {
+        fixture.destroy();
+    });
+
+    describe('Component', () => {
+
+        it('should render the label', () => {
+            fixture.detectChanges();
+
+            const labelValue = fixture.debugElement.query(By.css('.adf-property-label'));
+            expect(labelValue).not.toBeNull();
+            expect(labelValue.nativeElement.innerText).toBe('Key Value Pairs');
+        });
+
+        it('should render readOnly table is editable property is FALSE', () => {
+            component.property = new CardViewKeyValuePairsItemModel({
+                label: 'Key Value Pairs',
+                value: mockData,
+                key: 'key-value-pairs'
+            });
+
+            component.ngOnChanges();
+            fixture.detectChanges();
+
+            const table = fixture.debugElement.query(By.css('.card-view__key-value-pairs__read-only'));
+            const form = fixture.debugElement.query(By.css('.card-view__key-value-pairs'));
+
+            expect(table).not.toBeNull();
+            expect(form).toBeNull();
+        });
+
+        it('should add new item on ADD button click', () => {
+            component.ngOnChanges();
+            fixture.detectChanges();
+
+            const addButton = fixture.debugElement.query(By.css('.card-view__key-value-pairs__add-btn'));
+            addButton.triggerEventHandler('click', null);
+            fixture.detectChanges();
+
+            expect(JSON.stringify(component.values)).toBe(JSON.stringify(mockEmptyData));
+
+            const content = fixture.debugElement.query(By.css('.card-view__key-value-pairs'));
+            expect(content).not.toBeNull();
+
+            let nameInput = fixture.debugElement.query(By.css(`[data-automation-id="card-${component.property.key}-name-input-0"]`));
+            let valueInput = fixture.debugElement.query(By.css(`[data-automation-id="card-${component.property.key}-value-input-0"]`));
+            expect(nameInput).not.toBeNull();
+            expect(valueInput).not.toBeNull();
+
+        });
+
+        it('should remove an item from list on REMOVE button click', () => {
+            spyOn(cardViewUpdateService, 'update');
+            component.ngOnChanges();
+            fixture.detectChanges();
+
+            const addButton = fixture.debugElement.query(By.css('.card-view__key-value-pairs__add-btn'));
+            addButton.triggerEventHandler('click', null);
+            fixture.detectChanges();
+
+            const removeButton = fixture.debugElement.query(By.css('.card-view__key-value-pairs__remove-btn'));
+            removeButton.triggerEventHandler('click', null);
+            fixture.detectChanges();
+
+            expect(component.values.length).toBe(0);
+            const content = fixture.debugElement.query(By.css('.card-view__key-value-pairs'));
+            expect(content).toBeNull();
+
+            expect(cardViewUpdateService.update).toHaveBeenCalled();
+            expect(component.property.value.length).toBe(0);
+        });
+
+        it('should update property on input blur', async(() => {
+            spyOn(cardViewUpdateService, 'update');
+            component.ngOnChanges();
+            fixture.detectChanges();
+
+            const addButton = fixture.debugElement.query(By.css('.card-view__key-value-pairs__add-btn'));
+            addButton.triggerEventHandler('click', null);
+            fixture.detectChanges();
+
+            let nameInput = fixture.debugElement.query(By.css(`[data-automation-id="card-${component.property.key}-name-input-0"]`));
+            let valueInput = fixture.debugElement.query(By.css(`[data-automation-id="card-${component.property.key}-value-input-0"]`));
+
+            nameInput.nativeElement.value = mockData[0].name;
+            nameInput.nativeElement.dispatchEvent(new Event('input'));
+            valueInput.nativeElement.value = mockData[0].value;
+            valueInput.nativeElement.dispatchEvent(new Event('input'));
+
+            fixture.whenStable().then(() => {
+                fixture.detectChanges();
+
+                valueInput.triggerEventHandler('blur', null);
+                fixture.detectChanges();
+
+                expect(cardViewUpdateService.update).toHaveBeenCalled();
+                expect(JSON.stringify(component.property.value)).toBe(JSON.stringify(mockData));
+            });
+        }));
+
+        it('should not update property if at least one input is empty on blur', async(() => {
+            spyOn(cardViewUpdateService, 'update');
+            component.ngOnChanges();
+            fixture.detectChanges();
+
+            const addButton = fixture.debugElement.query(By.css('.card-view__key-value-pairs__add-btn'));
+            addButton.triggerEventHandler('click', null);
+            fixture.detectChanges();
+
+            let valueInput = fixture.debugElement.query(By.css(`[data-automation-id="card-${component.property.key}-value-input-0"]`));
+
+            valueInput.nativeElement.value = mockData[0].value;
+            valueInput.nativeElement.dispatchEvent(new Event('input'));
+
+            fixture.whenStable().then(() => {
+                fixture.detectChanges();
+
+                valueInput.triggerEventHandler('blur', null);
+                fixture.detectChanges();
+
+                expect(cardViewUpdateService.update).not.toHaveBeenCalled();
+            });
+        }));
+
+    });
+});
diff --git a/lib/core/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.ts b/lib/core/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.ts
new file mode 100644
index 0000000000..cab8beacb9
--- /dev/null
+++ b/lib/core/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.ts
@@ -0,0 +1,75 @@
+/*!
+ * @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 { Component, Input, OnChanges } from '@angular/core';
+import { CardViewUpdateService } from '../../services/card-view-update.service';
+import { CardViewKeyValuePairsItemModel } from '../../models/card-view.models';
+import { CardViewKeyValuePairsItemType } from '../../interfaces/card-view.interfaces';
+import { MatTableDataSource } from '@angular/material';
+
+@Component({
+    selector: 'adf-card-view-boolitem',
+    templateUrl: './card-view-keyvaluepairsitem.component.html',
+    styleUrls: ['./card-view-keyvaluepairsitem.component.scss']
+})
+
+export class CardViewKeyValuePairsItemComponent implements OnChanges {
+
+    @Input()
+    property: CardViewKeyValuePairsItemModel;
+
+    @Input()
+    editable: boolean = false;
+
+    values: CardViewKeyValuePairsItemType[];
+    matTableValues: MatTableDataSource<CardViewKeyValuePairsItemType>;
+
+    constructor(private cardViewUpdateService: CardViewUpdateService) {}
+
+    ngOnChanges() {
+        this.values = this.property.value || [];
+        this.matTableValues = new MatTableDataSource(this.values);
+    }
+
+    isEditable(): boolean {
+        return this.editable && this.property.editable;
+    }
+
+    add(): void {
+        this.values.push({ name: '', value: '' });
+    }
+
+    remove(index: number): void {
+        this.values.splice(index, 1);
+        this.save(true);
+    }
+
+    onBlur(value): void {
+        if (value.length) {
+            this.save();
+        }
+    }
+
+    save(remove?: boolean): void {
+        const validValues = this.values.filter(i => i.name.length && i.value.length);
+
+        if (remove || validValues.length) {
+            this.cardViewUpdateService.update(this.property, validValues);
+            this.property.value = validValues;
+        }
+    }
+}
diff --git a/lib/core/card-view/components/card-view-mapitem/card-view-mapitem.component.html b/lib/core/card-view/components/card-view-mapitem/card-view-mapitem.component.html
index 82f9749b3c..1dc68d5da3 100644
--- a/lib/core/card-view/components/card-view-mapitem/card-view-mapitem.component.html
+++ b/lib/core/card-view/components/card-view-mapitem/card-view-mapitem.component.html
@@ -1,4 +1,4 @@
-<div class="adf-property-label" *ngIf="showProperty()">{{ property.label | translate }}</div>
+<div [attr.data-automation-id]="'card-mapitem-label-' + property.key" class="adf-property-label" *ngIf="showProperty()">{{ property.label | translate }}</div>
 <div class="adf-property-value">
     <div>
         <span *ngIf="!isClickable(); else elseBlock" [attr.data-automation-id]="'card-mapitem-value-' + property.key">
diff --git a/lib/core/card-view/components/card-view-selectitem/card-view-selectitem.component.html b/lib/core/card-view/components/card-view-selectitem/card-view-selectitem.component.html
new file mode 100644
index 0000000000..1cd47b7254
--- /dev/null
+++ b/lib/core/card-view/components/card-view-selectitem/card-view-selectitem.component.html
@@ -0,0 +1,13 @@
+<div [attr.data-automation-id]="'card-select-label-' + property.key" class="adf-property-label">{{ property.label | translate }}</div>
+<div class="adf-property-value">
+    <div *ngIf="!isEditable()" data-automation-class="read-only-value">{{ property.displayValue | async }}</div>
+    <div *ngIf="isEditable()">
+        <mat-form-field>
+            <mat-select [(value)]="value" (selectionChange)="onChange($event)" data-automation-class="select-box">
+              <mat-option *ngFor="let option of getOptions() | async" [value]="option.key">
+                {{ option.label | translate }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+    </div>
+</div>
diff --git a/lib/core/card-view/components/card-view-selectitem/card-view-selectitem.component.scss b/lib/core/card-view/components/card-view-selectitem/card-view-selectitem.component.scss
new file mode 100644
index 0000000000..f3797bccfd
--- /dev/null
+++ b/lib/core/card-view/components/card-view-selectitem/card-view-selectitem.component.scss
@@ -0,0 +1,3 @@
+.mat-form-field-type-mat-select {
+    width: 100%;
+}
\ No newline at end of file
diff --git a/lib/core/card-view/components/card-view-selectitem/card-view-selectitem.component.spec.ts b/lib/core/card-view/components/card-view-selectitem/card-view-selectitem.component.spec.ts
new file mode 100644
index 0000000000..6aac094bcc
--- /dev/null
+++ b/lib/core/card-view/components/card-view-selectitem/card-view-selectitem.component.spec.ts
@@ -0,0 +1,122 @@
+/*!
+ * @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 { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { CardViewSelectItemModel } from '../../models/card-view-selectitem.model';
+import { CardViewUpdateService } from '../../services/card-view-update.service';
+import { CardViewSelectItemComponent } from './card-view-selectitem.component';
+import { setupTestBed } from '../../../testing/setupTestBed';
+import { CoreTestingModule } from '../../../testing/core.testing.module';
+import { of } from 'rxjs';
+
+describe('CardViewSelectItemComponent', () => {
+
+    let fixture: ComponentFixture<CardViewSelectItemComponent>;
+    let component: CardViewSelectItemComponent;
+    let cardViewUpdateService;
+    const mockData = [{ key: 'one', label: 'One' }, { key: 'two', label: 'Two' }, { key: 'three', label: 'Three' }];
+    const mockDefaultProps = {
+        label: 'Select box label',
+        value: 'two',
+        options$: of(mockData),
+        key: 'key',
+        editable: true
+    };
+
+    setupTestBed({
+        imports: [CoreTestingModule]
+    });
+
+    beforeEach(() => {
+        fixture = TestBed.createComponent(CardViewSelectItemComponent);
+        cardViewUpdateService = TestBed.get(CardViewUpdateService);
+        component = fixture.componentInstance;
+        component.property = new CardViewSelectItemModel(mockDefaultProps);
+    });
+
+    afterEach(() => {
+        fixture.destroy();
+    });
+
+    describe('Rendering', () => {
+        it('should render the label', () => {
+            fixture.detectChanges();
+
+            const labelValue = fixture.debugElement.query(By.css('.adf-property-label'));
+            expect(labelValue).not.toBeNull();
+            expect(labelValue.nativeElement.innerText).toBe('Select box label');
+        });
+
+        it('should render readOnly value is editable property is FALSE', () => {
+            component.property = new CardViewSelectItemModel({
+                ...mockDefaultProps,
+                editable: false
+            });
+
+            component.ngOnChanges();
+            fixture.detectChanges();
+
+            const readOnly = fixture.debugElement.query(By.css('[data-automation-class="read-only-value"]'));
+            const selectBox = fixture.debugElement.query(By.css('[data-automation-class="select-box"]'));
+
+            expect(readOnly).not.toBeNull();
+            expect(selectBox).toBeNull();
+        });
+
+        it('should render select box if editable property is TRUE', () => {
+            component.ngOnChanges();
+            component.editable = true;
+            fixture.detectChanges();
+
+            const selectBox = fixture.debugElement.query(By.css('[data-automation-class="select-box"]'));
+            expect(selectBox).not.toBeNull();
+        });
+
+        it('should not have label twice', () => {
+            component.ngOnChanges();
+            component.editable = true;
+            fixture.detectChanges();
+
+            const label = fixture.debugElement.query(By.css('[data-automation-class="select-box"] .mat-form-field-label'));
+            expect(label).toBeNull();
+        });
+
+        xit('should update property on input blur', async(() => {
+            spyOn(cardViewUpdateService, 'update');
+
+            component.ngOnChanges();
+            component.editable = true;
+            fixture.detectChanges();
+
+            const selectBox = fixture.debugElement.query(By.css('[data-automation-class="select-box"]'));
+            selectBox.nativeElement.click();
+            fixture.detectChanges();
+
+            const option = fixture.debugElement.query(By.css(`mat-option[ng-reflect-value="${mockData[2].key}"]`));
+            option.nativeElement.click();
+            fixture.detectChanges();
+
+            fixture.whenStable().then(() => {
+                fixture.detectChanges();
+
+                expect(cardViewUpdateService.update).toHaveBeenCalled();
+                expect(component.property.value).toBe(mockData[2].key);
+            });
+        }));
+    });
+});
diff --git a/lib/core/card-view/components/card-view-selectitem/card-view-selectitem.component.ts b/lib/core/card-view/components/card-view-selectitem/card-view-selectitem.component.ts
new file mode 100644
index 0000000000..088759df72
--- /dev/null
+++ b/lib/core/card-view/components/card-view-selectitem/card-view-selectitem.component.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 { Component, Input, OnChanges } from '@angular/core';
+import { CardViewSelectItemModel } from '../../models/card-view-selectitem.model';
+import { CardViewUpdateService } from '../../services/card-view-update.service';
+import { Observable } from 'rxjs';
+import { CardViewSelectItemOption } from '../../interfaces/card-view.interfaces';
+import { MatSelectChange } from '@angular/material';
+
+@Component({
+    selector: 'adf-card-view-selectitem',
+    templateUrl: './card-view-selectitem.component.html',
+    styleUrls: ['./card-view-selectitem.component.scss']
+})
+export class CardViewSelectItemComponent implements OnChanges {
+    @Input() property: CardViewSelectItemModel<string>;
+
+    @Input() editable: boolean = false;
+
+    @Input() options$: Observable<CardViewSelectItemOption<string>[]>;
+
+    value: string;
+
+    constructor(private cardViewUpdateService: CardViewUpdateService) {}
+
+    ngOnChanges(): void {
+        this.value = this.property.value;
+    }
+
+    isEditable(): boolean {
+        return this.editable && this.property.editable;
+    }
+
+    getOptions(): Observable<CardViewSelectItemOption<string>[]> {
+        return this.options$ || this.property.options$;
+    }
+
+    onChange(event: MatSelectChange): void {
+        this.cardViewUpdateService.update(this.property, event.value);
+        this.property.value = event.value;
+    }
+}
diff --git a/lib/core/card-view/components/card-view-textitem/card-view-textitem.component.html b/lib/core/card-view/components/card-view-textitem/card-view-textitem.component.html
index de7758095c..b92fad3f44 100644
--- a/lib/core/card-view/components/card-view-textitem/card-view-textitem.component.html
+++ b/lib/core/card-view/components/card-view-textitem/card-view-textitem.component.html
@@ -1,4 +1,4 @@
-<div class="adf-property-label" *ngIf="showProperty() || isEditable()">{{ property.label | translate }}</div>
+<div [attr.data-automation-id]="'card-textitem-label-' + property.key" class="adf-property-label" *ngIf="showProperty() || isEditable()">{{ property.label | translate }}</div>
 <div class="adf-property-value">
     <span *ngIf="!isEditable()">
         <span *ngIf="!isClickable(); else elseBlock" [attr.data-automation-id]="'card-textitem-value-' + property.key">
@@ -53,7 +53,7 @@
                     [attr.title]="'CORE.METADATA.ACTIONS.CANCEL' | translate"
                     [attr.data-automation-id]="'card-textitem-reset-' + property.key">clear</mat-icon>
             </div>
-            <mat-error class="adf-textitem-editable-error" *ngIf="hasErrors()">
+            <mat-error  [attr.data-automation-id]="'card-textitem-error-' + property.key" class="adf-textitem-editable-error" *ngIf="hasErrors()">
                 <ul>
                     <li *ngFor="let errorMessage of errorMessages">{{ errorMessage | translate }}</li>
                 </ul>
diff --git a/lib/core/card-view/components/card-view-textitem/card-view-textitem.component.scss b/lib/core/card-view/components/card-view-textitem/card-view-textitem.component.scss
index d9e2839158..11158524a9 100644
--- a/lib/core/card-view/components/card-view-textitem/card-view-textitem.component.scss
+++ b/lib/core/card-view/components/card-view-textitem/card-view-textitem.component.scss
@@ -76,26 +76,26 @@
             color: mat-color($foreground, text, 0.54);
         }
 
-        &-textitem-editable .mat-input-wrapper {
+        &-textitem-editable .mat-form-field-wrapper {
             margin: 0;
             padding-bottom: 0;
         }
 
-        &-textitem-editable .mat-input-underline {
+        &-textitem-editable .mat-form-field-underline {
             display: none;
         }
 
-        &-textitem-editable .mat-input-infix {
+        &-textitem-editable .mat-form-field-infix {
             padding: 0;
             border-top: none;
         }
 
-        &-textitem-editable .mat-input-placeholder-wrapper {
+        &-textitem-editable .mat-form-field-label-wrapper {
             padding-top: 2em;
             position: static;
         }
 
-        &-textitem-editable .mat-input-placeholder {
+        &-textitem-editable .mat-form-field-label {
             top: 4px;
         }
 
diff --git a/lib/core/card-view/components/card-view.components.ts b/lib/core/card-view/components/card-view.components.ts
index 3187f44ff6..638ba6ffcb 100644
--- a/lib/core/card-view/components/card-view.components.ts
+++ b/lib/core/card-view/components/card-view.components.ts
@@ -21,3 +21,5 @@ export * from './card-view-dateitem/card-view-dateitem.component';
 export * from './card-view-item-dispatcher/card-view-item-dispatcher.component';
 export * from './card-view-mapitem/card-view-mapitem.component';
 export * from './card-view-textitem/card-view-textitem.component';
+export * from './card-view-selectitem/card-view-selectitem.component';
+export * from './card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component';
diff --git a/lib/core/card-view/interfaces/card-view-keyvaluepairsitem-properties.interface.ts b/lib/core/card-view/interfaces/card-view-keyvaluepairsitem-properties.interface.ts
new file mode 100644
index 0000000000..3cd011e045
--- /dev/null
+++ b/lib/core/card-view/interfaces/card-view-keyvaluepairsitem-properties.interface.ts
@@ -0,0 +1,27 @@
+/*!
+ * @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 { CardViewItemProperties } from './card-view-item-properties.interface';
+
+export interface CardViewKeyValuePairsItemType {
+    name: string;
+    value: string;
+}
+
+export interface CardViewKeyValuePairsItemProperties extends CardViewItemProperties {
+    value: CardViewKeyValuePairsItemType[];
+}
diff --git a/lib/content-services/search/response-facet-field.interface.ts b/lib/core/card-view/interfaces/card-view-selectitem-properties.interface.ts
similarity index 65%
rename from lib/content-services/search/response-facet-field.interface.ts
rename to lib/core/card-view/interfaces/card-view-selectitem-properties.interface.ts
index dfb973daa6..5228d7345f 100644
--- a/lib/content-services/search/response-facet-field.interface.ts
+++ b/lib/core/card-view/interfaces/card-view-selectitem-properties.interface.ts
@@ -15,13 +15,15 @@
  * limitations under the License.
  */
 
-import { FacetFieldBucket } from './facet-field-bucket.interface';
-import { SearchFilterList } from './components/search-filter/models/search-filter-list.model';
+import { CardViewItemProperties } from './card-view-item-properties.interface';
+import { Observable } from 'rxjs';
 
-export interface ResponseFacetField {
+export interface CardViewSelectItemOption<T> {
     label: string;
-    buckets: SearchFilterList<FacetFieldBucket>;
-    pageSize?: number;
-    currentPageSize?: number;
-    expanded?: boolean;
+    key: T;
+}
+
+export interface CardViewSelectItemProperties<T> extends CardViewItemProperties {
+    value: string;
+    options$: Observable<CardViewSelectItemOption<T>[]>;
 }
diff --git a/lib/core/card-view/interfaces/card-view.interfaces.ts b/lib/core/card-view/interfaces/card-view.interfaces.ts
index a28204cf4c..13b11ea022 100644
--- a/lib/core/card-view/interfaces/card-view.interfaces.ts
+++ b/lib/core/card-view/interfaces/card-view.interfaces.ts
@@ -22,3 +22,5 @@ export * from './card-view-textitem-properties.interface';
 export * from './card-view-dateitem-properties.interface';
 export * from './card-view-boolitem-properties.interface';
 export * from './card-view-textitem-pipe-property.interface';
+export * from './card-view-keyvaluepairsitem-properties.interface';
+export * from './card-view-selectitem-properties.interface';
diff --git a/lib/core/card-view/models/card-view-keyvaluepairs.model.ts b/lib/core/card-view/models/card-view-keyvaluepairs.model.ts
new file mode 100644
index 0000000000..1c986f2021
--- /dev/null
+++ b/lib/core/card-view/models/card-view-keyvaluepairs.model.ts
@@ -0,0 +1,33 @@
+/*!
+ * @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 { CardViewItem } from '../interfaces/card-view-item.interface';
+import { DynamicComponentModel } from '../../services/dynamic-component-mapper.service';
+import { CardViewBaseItemModel } from './card-view-baseitem.model';
+import { CardViewKeyValuePairsItemProperties } from '../interfaces/card-view.interfaces';
+
+export class CardViewKeyValuePairsItemModel extends CardViewBaseItemModel implements CardViewItem, DynamicComponentModel {
+    type: string = 'keyvaluepairs';
+
+    constructor(obj: CardViewKeyValuePairsItemProperties) {
+        super(obj);
+    }
+
+    get displayValue() {
+        return this.value;
+    }
+}
diff --git a/lib/core/card-view/models/card-view-selectitem.model.spec.ts b/lib/core/card-view/models/card-view-selectitem.model.spec.ts
new file mode 100644
index 0000000000..c915c6f7ff
--- /dev/null
+++ b/lib/core/card-view/models/card-view-selectitem.model.spec.ts
@@ -0,0 +1,46 @@
+/*!
+ * @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 { async } from '@angular/core/testing';
+import { CardViewSelectItemModel } from './card-view-selectitem.model';
+import { CardViewSelectItemProperties } from '../interfaces/card-view.interfaces';
+import { of } from 'rxjs';
+
+describe('CardViewSelectItemModel', () => {
+    let properties: CardViewSelectItemProperties<string>;
+    const mockData = [{ key: 'one', label: 'One' }, { key: 'two', label: 'Two' }, { key: 'three', label: 'Three' }];
+
+    beforeEach(() => {
+        properties = {
+            label: 'Select box label',
+            value: 'two',
+            options$: of(mockData),
+            key: 'key',
+            editable: true
+        };
+    });
+
+    describe('displayValue', () => {
+        it('should return the value if it is present', async(() => {
+            const itemModel = new CardViewSelectItemModel(properties);
+
+            itemModel.displayValue.subscribe(value => {
+                expect(value).toBe(mockData[1].label);
+            });
+        }));
+    });
+});
diff --git a/lib/core/card-view/models/card-view-selectitem.model.ts b/lib/core/card-view/models/card-view-selectitem.model.ts
new file mode 100644
index 0000000000..f3daa54c26
--- /dev/null
+++ b/lib/core/card-view/models/card-view-selectitem.model.ts
@@ -0,0 +1,43 @@
+/*!
+ * @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 { CardViewItem } from '../interfaces/card-view-item.interface';
+import { DynamicComponentModel } from '../../services/dynamic-component-mapper.service';
+import { CardViewBaseItemModel } from './card-view-baseitem.model';
+import { CardViewSelectItemProperties, CardViewSelectItemOption } from '../interfaces/card-view.interfaces';
+import { Observable, of } from 'rxjs';
+import { switchMap } from 'rxjs/operators';
+
+export class CardViewSelectItemModel<T> extends CardViewBaseItemModel implements CardViewItem, DynamicComponentModel {
+    type: string = 'select';
+    options$: Observable<CardViewSelectItemOption<T>[]>;
+
+    constructor(obj: CardViewSelectItemProperties<T>) {
+        super(obj);
+
+        this.options$ = obj.options$;
+    }
+
+    get displayValue() {
+        return this.options$.pipe(
+            switchMap(options => {
+                const option = options.find(o => o.key === this.value);
+                return of(option ? option.label : '');
+            })
+        );
+    }
+}
diff --git a/lib/core/card-view/models/card-view.models.ts b/lib/core/card-view/models/card-view.models.ts
index 0d16dc6552..17a3506952 100644
--- a/lib/core/card-view/models/card-view.models.ts
+++ b/lib/core/card-view/models/card-view.models.ts
@@ -23,3 +23,5 @@ export * from './card-view-floatitem.model';
 export * from './card-view-intitem.model';
 export * from './card-view-mapitem.model';
 export * from './card-view-textitem.model';
+export * from './card-view-keyvaluepairs.model';
+export * from './card-view-selectitem.model';
diff --git a/lib/core/card-view/public-api.ts b/lib/core/card-view/public-api.ts
index 68ec4b151c..d1aa834802 100644
--- a/lib/core/card-view/public-api.ts
+++ b/lib/core/card-view/public-api.ts
@@ -20,7 +20,9 @@ export {
     CardViewBoolItemComponent,
     CardViewDateItemComponent,
     CardViewMapItemComponent,
-    CardViewTextItemComponent
+    CardViewTextItemComponent,
+    CardViewSelectItemComponent,
+    CardViewKeyValuePairsItemComponent
 } from './components/card-view.components';
 
 export * from './interfaces/card-view.interfaces';
diff --git a/lib/core/card-view/services/card-item-types.service.ts b/lib/core/card-view/services/card-item-types.service.ts
index e237d44005..713d729b30 100644
--- a/lib/core/card-view/services/card-item-types.service.ts
+++ b/lib/core/card-view/services/card-item-types.service.ts
@@ -19,7 +19,9 @@ import { Injectable, Type } from '@angular/core';
 import { CardViewDateItemComponent } from '../components/card-view-dateitem/card-view-dateitem.component';
 import { CardViewMapItemComponent } from '../components/card-view-mapitem/card-view-mapitem.component';
 import { CardViewTextItemComponent } from '../components/card-view-textitem/card-view-textitem.component';
+import { CardViewSelectItemComponent } from '../components/card-view-selectitem/card-view-selectitem.component';
 import { CardViewBoolItemComponent } from '../components/card-view-boolitem/card-view-boolitem.component';
+import { CardViewKeyValuePairsItemComponent } from '../components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component';
 import { DynamicComponentMapper, DynamicComponentResolveFunction, DynamicComponentResolver } from '../../services/dynamic-component-mapper.service';
 
 @Injectable()
@@ -29,11 +31,13 @@ export class CardItemTypeService extends DynamicComponentMapper {
 
     protected types: { [key: string]: DynamicComponentResolveFunction } = {
         'text': DynamicComponentResolver.fromType(CardViewTextItemComponent),
+        'select': DynamicComponentResolver.fromType(CardViewSelectItemComponent),
         'int': DynamicComponentResolver.fromType(CardViewTextItemComponent),
         'float': DynamicComponentResolver.fromType(CardViewTextItemComponent),
         'date': DynamicComponentResolver.fromType(CardViewDateItemComponent),
         'datetime': DynamicComponentResolver.fromType(CardViewDateItemComponent),
         'bool': DynamicComponentResolver.fromType(CardViewBoolItemComponent),
-        'map': DynamicComponentResolver.fromType(CardViewMapItemComponent)
+        'map': DynamicComponentResolver.fromType(CardViewMapItemComponent),
+        'keyvaluepairs': DynamicComponentResolver.fromType(CardViewKeyValuePairsItemComponent)
     };
 }
diff --git a/lib/core/card-view/services/card-view-update.service.ts b/lib/core/card-view/services/card-view-update.service.ts
index ea308818a1..245e940fe7 100644
--- a/lib/core/card-view/services/card-view-update.service.ts
+++ b/lib/core/card-view/services/card-view-update.service.ts
@@ -16,8 +16,7 @@
  */
 
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
-import { Subject } from 'rxjs/Subject';
+import { Observable, Subject } from 'rxjs';
 import { CardViewBaseItemModel } from '../models/card-view-baseitem.model';
 
 export interface UpdateNotification {
diff --git a/lib/core/collapsable/accordion-group.component.html b/lib/core/collapsable/accordion-group.component.html
index 650e223fe6..cf5f059581 100644
--- a/lib/core/collapsable/accordion-group.component.html
+++ b/lib/core/collapsable/accordion-group.component.html
@@ -1,13 +1,13 @@
 <mat-accordion class="adf-panel">
-    <mat-expansion-panel #expansionPanel 
+    <mat-expansion-panel #expansionPanel
         id="adf-expansion-panel-id"
-        (click)="isExpandable($event)"
+        (click)="isExpandable()"
         [expanded]="toggleExpansion()"
         (opened)="onHeaderClick()"
         [hideToggle]="!hasAccordionIcon">
         <mat-expansion-panel-header>
             <mat-panel-title>
-                <div class="adf-panel-heading" [ngClass]="{'adf-panel-heading-selected': isSelected}">
+                <div class="adf-panel-heading" data-automation-id="adf-panel-heading" [ngClass]="{'adf-panel-heading-selected': isSelected}">
                     <div id="heading-icon" *ngIf="hasHeadingIcon()" class="adf-panel-heading-icon">
                         <mat-icon class="material-icons"
                             [matTooltip]="headingIconTooltip"
@@ -19,8 +19,8 @@
                 </div>
             </mat-panel-title>
         </mat-expansion-panel-header>
-            <div id="adf-expansion-panel-content-id" #contentWrapper>
-                <ng-content></ng-content>
-            </div>
+        <div id="adf-expansion-panel-content-id" #contentWrapper>
+            <ng-content></ng-content>
+        </div>
     </mat-expansion-panel>
-</mat-accordion>
\ No newline at end of file
+</mat-accordion>
diff --git a/lib/core/collapsable/accordion-group.component.spec.ts b/lib/core/collapsable/accordion-group.component.spec.ts
index d6c149d030..a66e4756e2 100644
--- a/lib/core/collapsable/accordion-group.component.spec.ts
+++ b/lib/core/collapsable/accordion-group.component.spec.ts
@@ -115,4 +115,15 @@ describe('AccordionGroupComponent', () => {
         header.click();
     }));
 
+    it('should display icon if is present', (done) => {
+        component.headingIcon = 'assignment';
+        fixture.detectChanges();
+        fixture.whenStable().then(() => {
+            fixture.detectChanges();
+            expect(component.hasHeadingIcon()).toBe(true);
+            let headerText = element.querySelector('.adf-panel-heading-icon');
+            expect(headerText).toBeDefined();
+            done();
+        });
+    });
 });
diff --git a/lib/core/collapsable/accordion-group.component.ts b/lib/core/collapsable/accordion-group.component.ts
index 9a8b919d11..0e8ca8a1c4 100644
--- a/lib/core/collapsable/accordion-group.component.ts
+++ b/lib/core/collapsable/accordion-group.component.ts
@@ -82,14 +82,14 @@ export class AccordionGroupComponent implements AfterViewInit {
     }
 
     hasHeadingIcon() {
-        return this.headingIcon ? true : false;
+        return !!this.headingIcon;
     }
 
     onHeaderClick(): void {
         this.headingClick.emit(this.heading);
     }
 
-    isExpandable(event: any) {
+    isExpandable() {
         if (!this.hasContent || !this.isOpen) {
             this.expandPanel();
         }
diff --git a/lib/core/collapsable/collapsable.module.ts b/lib/core/collapsable/collapsable.module.ts
index d419fc7f30..3e17249a3b 100644
--- a/lib/core/collapsable/collapsable.module.ts
+++ b/lib/core/collapsable/collapsable.module.ts
@@ -36,9 +36,6 @@ import { AccordionComponent } from './accordion.component';
     exports: [
         AccordionComponent,
         AccordionGroupComponent
-    ],
-    providers: [
-        AccordionComponent
     ]
 })
 export class CollapsableModule {}
diff --git a/lib/core/comments/comment-list.component.html b/lib/core/comments/comment-list.component.html
index 8f497a0039..734fa6ea4f 100644
--- a/lib/core/comments/comment-list.component.html
+++ b/lib/core/comments/comment-list.component.html
@@ -21,9 +21,7 @@
             <div matLine id="comment-user" class="adf-comment-user-name">
                 {{comment.createdBy?.firstName}} {{comment.createdBy?.lastName}}
             </div>
-            <div matLine id="comment-message" class="adf-comment-message">
-                {{comment.message}}
-            </div>
+            <div matLine id="comment-message" class="adf-comment-message" [innerHTML]="comment.message"></div>
             <div matLine id="comment-time" class="adf-comment-message-time">
                 {{ comment.created | adfTimeAgo: currentLocale }}
             </div>
diff --git a/lib/core/comments/comments.component.html b/lib/core/comments/comments.component.html
index 70fc4f4863..d661ff8227 100644
--- a/lib/core/comments/comments.component.html
+++ b/lib/core/comments/comments.component.html
@@ -4,12 +4,23 @@
     </div>
     <div class="adf-comments-input-container" *ngIf="!isReadOnly()">
             <mat-form-field class="adf-full-width">
-                <input matInput id="comment-input" placeholder="{{'COMMENTS.ADD' | translate}}" [(ngModel)]="message" (keyup.enter)="add()" (keyup.esc)="clear()">
+                <textarea (keyup.escape)="clear()" matInput id="comment-input" placeholder="{{'COMMENTS.ADD' | translate}}" [(ngModel)]="message"></textarea>
             </mat-form-field>
+
+            <div class="adf-comments-input-actions">
+                <button mat-button
+                    class="adf-comments-input-add"
+                    data-automation-id="comments-input-add"
+                    color="primary"
+                    (click)="add()"
+                    [disabled]="!message">
+                    {{ 'COMMENTS.ADD' | translate }}
+                </button>
+            </div>
     </div>
 
     <div *ngIf="comments.length > 0">
         <adf-comment-list [comments]="comments">
         </adf-comment-list>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/lib/core/comments/comments.component.scss b/lib/core/comments/comments.component.scss
index de8c836fc1..49041e8b1b 100644
--- a/lib/core/comments/comments.component.scss
+++ b/lib/core/comments/comments.component.scss
@@ -20,6 +20,16 @@
         width: calc(100% - 30px);
         padding-top: 8px;
         border-bottom: $header-border;
+
+        textarea {
+            resize: vertical;
+        }
+    }
+
+    .adf-comments-input-actions {
+        display: flex;
+        justify-content: flex-end;
+        margin-bottom: 10px;
     }
 
     .adf-full-width {
diff --git a/lib/core/comments/comments.component.spec.ts b/lib/core/comments/comments.component.spec.ts
index 4fb5b43c33..95a2dcf6e4 100644
--- a/lib/core/comments/comments.component.spec.ts
+++ b/lib/core/comments/comments.component.spec.ts
@@ -18,7 +18,7 @@
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { SimpleChange } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { Observable } from 'rxjs/Observable';
+import { of, throwError } from 'rxjs';
 import { CommentProcessService } from '../services/comment-process.service';
 import { CommentsComponent } from './comments.component';
 import { CommentContentService } from '../services/comment-content.service';
@@ -48,24 +48,24 @@ describe('CommentsComponent', () => {
         commentProcessService = fixture.debugElement.injector.get(CommentProcessService);
         commentContentService = fixture.debugElement.injector.get(CommentContentService);
 
-        addContentCommentSpy = spyOn(commentContentService, 'addNodeComment').and.returnValue(Observable.of({
+        addContentCommentSpy = spyOn(commentContentService, 'addNodeComment').and.returnValue(of({
             id: 123,
             message: 'Test Comment',
             createdBy: {id: '999'}
         }));
 
-        getContentCommentsSpy = spyOn(commentContentService, 'getNodeComments').and.returnValue(Observable.of([
+        getContentCommentsSpy = spyOn(commentContentService, 'getNodeComments').and.returnValue(of([
             {message: 'Test1', created: Date.now(), createdBy: {firstName: 'Admin', lastName: 'User'}},
             {message: 'Test2', created: Date.now(), createdBy: {firstName: 'Admin', lastName: 'User'}},
             {message: 'Test3', created: Date.now(), createdBy: {firstName: 'Admin', lastName: 'User'}}
         ]));
 
-        getProcessCommentsSpy = spyOn(commentProcessService, 'getTaskComments').and.returnValue(Observable.of([
+        getProcessCommentsSpy = spyOn(commentProcessService, 'getTaskComments').and.returnValue(of([
             {message: 'Test1', created: Date.now(), createdBy: {firstName: 'Admin', lastName: 'User'}},
             {message: 'Test2', created: Date.now(), createdBy: {firstName: 'Admin', lastName: 'User'}},
             {message: 'Test3', created: Date.now(), createdBy: {firstName: 'Admin', lastName: 'User'}}
         ]));
-        addProcessCommentSpy = spyOn(commentProcessService, 'addTaskComment').and.returnValue(Observable.of({
+        addProcessCommentSpy = spyOn(commentProcessService, 'addTaskComment').and.returnValue(of({
             id: 123,
             message: 'Test Comment',
             createdBy: {id: '999'}
@@ -92,7 +92,7 @@ describe('CommentsComponent', () => {
 
     it('should emit an error when an error occurs loading comments', () => {
         let emitSpy = spyOn(component.error, 'emit');
-        getProcessCommentsSpy.and.returnValue(Observable.throw({}));
+        getProcessCommentsSpy.and.returnValue(throwError({}));
 
         let change = new SimpleChange(null, '123', true);
         component.ngOnChanges({'taskId': change});
@@ -128,7 +128,7 @@ describe('CommentsComponent', () => {
 
     it('should not display comments when the task has no comments', async(() => {
         component.taskId = '123';
-        getProcessCommentsSpy.and.returnValue(Observable.of([]));
+        getProcessCommentsSpy.and.returnValue(of([]));
         fixture.whenStable().then(() => {
             fixture.detectChanges();
             expect(fixture.nativeElement.querySelector('#comment-container')).toBeNull();
@@ -219,11 +219,43 @@ describe('CommentsComponent', () => {
             fixture.whenStable();
         }));
 
-        it('should call service to add a comment when enter key is pressed', async(() => {
-            let event = new KeyboardEvent('keyup', {'key': 'Enter'});
-            let element = fixture.nativeElement.querySelector('#comment-input');
+        it('should sanitize comment when user input contains html elements', async(() => {
+            let element = fixture.nativeElement.querySelector('.adf-comments-input-add');
+            component.message = '<div class="text-class"><button onclick=""><h1>action</h1></button></div>';
+            element.dispatchEvent(new Event('click'));
+            fixture.detectChanges();
+            fixture.whenStable().then(() => {
+                fixture.detectChanges();
+                expect(addProcessCommentSpy).toHaveBeenCalledWith('123', 'action');
+            });
+        }));
+
+        it('should normalize comment when user input contains spaces sequence', async(() => {
+            let element = fixture.nativeElement.querySelector('.adf-comments-input-add');
+            component.message = 'test    comment';
+            element.dispatchEvent(new Event('click'));
+            fixture.detectChanges();
+            fixture.whenStable().then(() => {
+                fixture.detectChanges();
+                expect(addProcessCommentSpy).toHaveBeenCalledWith('123', 'test comment');
+            });
+        }));
+
+        it('should add break lines to comment when user input contains new line characters', async(() => {
+            let element = fixture.nativeElement.querySelector('.adf-comments-input-add');
+            component.message = 'these\nare\nparagraphs\n';
+            element.dispatchEvent(new Event('click'));
+            fixture.detectChanges();
+            fixture.whenStable().then(() => {
+                fixture.detectChanges();
+                expect(addProcessCommentSpy).toHaveBeenCalledWith('123', 'these<br/>are<br/>paragraphs');
+            });
+        }));
+
+        it('should call service to add a comment when add button is pressed', async(() => {
+            let element = fixture.nativeElement.querySelector('.adf-comments-input-add');
             component.message = 'Test Comment';
-            element.dispatchEvent(event);
+            element.dispatchEvent(new Event('click'));
             fixture.detectChanges();
             fixture.whenStable().then(() => {
                 fixture.detectChanges();
@@ -235,10 +267,9 @@ describe('CommentsComponent', () => {
         }));
 
         it('should not call service to add a comment when comment is empty', async(() => {
-            let event = new KeyboardEvent('keyup', {'key': 'Enter'});
-            let element = fixture.nativeElement.querySelector('#comment-input');
+            let element = fixture.nativeElement.querySelector('.adf-comments-input-add');
             component.message = '';
-            element.dispatchEvent(event);
+            element.dispatchEvent(new Event('click'));
             fixture.detectChanges();
             fixture.whenStable().then(() => {
                 fixture.detectChanges();
@@ -249,7 +280,6 @@ describe('CommentsComponent', () => {
         it('should clear comment when escape key is pressed', async(() => {
             let event = new KeyboardEvent('keyup', {'key': 'Escape'});
             let element = fixture.nativeElement.querySelector('#comment-input');
-            component.message = 'Test comment';
             element.dispatchEvent(event);
             fixture.detectChanges();
             fixture.whenStable().then(() => {
@@ -261,7 +291,7 @@ describe('CommentsComponent', () => {
 
         it('should emit an error when an error occurs adding the comment', () => {
             let emitSpy = spyOn(component.error, 'emit');
-            addProcessCommentSpy.and.returnValue(Observable.throw({}));
+            addProcessCommentSpy.and.returnValue(throwError({}));
             component.message = 'Test comment';
             component.add();
             expect(emitSpy).toHaveBeenCalled();
@@ -277,11 +307,10 @@ describe('CommentsComponent', () => {
             fixture.whenStable();
         }));
 
-        it('should call service to add a comment when enter key is pressed', async(() => {
-            let event = new KeyboardEvent('keyup', {'key': 'Enter'});
-            let element = fixture.nativeElement.querySelector('#comment-input');
+        it('should call service to add a comment when add button is pressed', async(() => {
+            let element = fixture.nativeElement.querySelector('.adf-comments-input-add');
             component.message = 'Test Comment';
-            element.dispatchEvent(event);
+            element.dispatchEvent(new Event('click'));
             fixture.detectChanges();
             fixture.whenStable().then(() => {
                 fixture.detectChanges();
@@ -292,11 +321,43 @@ describe('CommentsComponent', () => {
             });
         }));
 
+        it('should sanitize comment when user input contains html elements', async(() => {
+            let element = fixture.nativeElement.querySelector('.adf-comments-input-add');
+            component.message = '<div class="text-class"><button onclick=""><h1>action</h1></button></div>';
+            element.dispatchEvent(new Event('click'));
+            fixture.detectChanges();
+            fixture.whenStable().then(() => {
+                fixture.detectChanges();
+                expect(addContentCommentSpy).toHaveBeenCalledWith('123', 'action');
+            });
+        }));
+
+        it('should normalize comment when user input contains spaces sequence', async(() => {
+            let element = fixture.nativeElement.querySelector('.adf-comments-input-add');
+            component.message = 'test    comment';
+            element.dispatchEvent(new Event('click'));
+            fixture.detectChanges();
+            fixture.whenStable().then(() => {
+                fixture.detectChanges();
+                expect(addContentCommentSpy).toHaveBeenCalledWith('123', 'test comment');
+            });
+        }));
+
+        it('should add break lines to comment when user input contains new line characters', async(() => {
+            let element = fixture.nativeElement.querySelector('.adf-comments-input-add');
+            component.message = 'these\nare\nparagraphs\n';
+            element.dispatchEvent(new Event('click'));
+            fixture.detectChanges();
+            fixture.whenStable().then(() => {
+                fixture.detectChanges();
+                expect(addContentCommentSpy).toHaveBeenCalledWith('123', 'these<br/>are<br/>paragraphs');
+            });
+        }));
+
         it('should not call service to add a comment when comment is empty', async(() => {
-            let event = new KeyboardEvent('keyup', {'key': 'Enter'});
-            let element = fixture.nativeElement.querySelector('#comment-input');
+            let element = fixture.nativeElement.querySelector('.adf-comments-input-add');
             component.message = '';
-            element.dispatchEvent(event);
+            element.dispatchEvent(new Event('click'));
             fixture.detectChanges();
             fixture.whenStable().then(() => {
                 fixture.detectChanges();
@@ -307,7 +368,6 @@ describe('CommentsComponent', () => {
         it('should clear comment when escape key is pressed', async(() => {
             let event = new KeyboardEvent('keyup', {'key': 'Escape'});
             let element = fixture.nativeElement.querySelector('#comment-input');
-            component.message = 'Test comment';
             element.dispatchEvent(event);
             fixture.detectChanges();
             fixture.whenStable().then(() => {
@@ -319,7 +379,7 @@ describe('CommentsComponent', () => {
 
         it('should emit an error when an error occurs adding the comment', () => {
             let emitSpy = spyOn(component.error, 'emit');
-            addContentCommentSpy.and.returnValue(Observable.throw({}));
+            addContentCommentSpy.and.returnValue(throwError({}));
             component.message = 'Test comment';
             component.add();
             expect(emitSpy).toHaveBeenCalled();
diff --git a/lib/core/comments/comments.component.ts b/lib/core/comments/comments.component.ts
index b58fc62bde..f657062f90 100644
--- a/lib/core/comments/comments.component.ts
+++ b/lib/core/comments/comments.component.ts
@@ -19,8 +19,8 @@ import { CommentProcessService } from '../services/comment-process.service';
 import { CommentContentService } from '../services/comment-content.service';
 import { CommentModel } from '../models/comment.model';
 import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
-import { Observer } from 'rxjs/Observer';
+import { Observable, Observer } from 'rxjs';
+import { share } from 'rxjs/operators';
 
 @Component({
     selector: 'adf-comments',
@@ -55,7 +55,8 @@ export class CommentsComponent implements OnChanges {
     beingAdded: boolean = false;
 
     constructor(private commentProcessService: CommentProcessService, private commentContentService: CommentContentService) {
-        this.comment$ = new Observable<CommentModel>(observer => this.commentObserver = observer).share();
+        this.comment$ = new Observable<CommentModel>(observer => this.commentObserver = observer)
+            .pipe(share());
         this.comment$.subscribe((comment: CommentModel) => {
             this.comments.push(comment);
         });
@@ -126,9 +127,11 @@ export class CommentsComponent implements OnChanges {
 
     add(): void {
         if (this.message && this.message.trim() && !this.beingAdded) {
+            const comment = this.sanitize(this.message);
+
             this.beingAdded = true;
             if (this.isATask()) {
-                this.commentProcessService.addTaskComment(this.taskId, this.message)
+                this.commentProcessService.addTaskComment(this.taskId, comment)
                     .subscribe(
                         (res: CommentModel) => {
                             this.comments.unshift(res);
@@ -144,7 +147,7 @@ export class CommentsComponent implements OnChanges {
             }
 
             if (this.isANode()) {
-                this.commentContentService.addNodeComment(this.nodeId, this.message)
+                this.commentContentService.addNodeComment(this.nodeId, comment)
                     .subscribe(
                         (res: CommentModel) => {
                             this.comments.unshift(res);
@@ -176,4 +179,10 @@ export class CommentsComponent implements OnChanges {
     isANode(): boolean {
         return this.nodeId ? true : false;
     }
+
+    private sanitize(input: string) {
+        return input.replace(/<[^>]+>/g, '')
+            .replace(/^\s+|\s+$|\s+(?=\s)/g, '')
+            .replace(/\r?\n/g, '<br/>');
+    }
 }
diff --git a/lib/core/comments/comments.module.ts b/lib/core/comments/comments.module.ts
index 2f870935bf..9f7640233a 100644
--- a/lib/core/comments/comments.module.ts
+++ b/lib/core/comments/comments.module.ts
@@ -36,7 +36,7 @@ import { CommentsComponent } from './comments.component';
         ReactiveFormsModule,
         MaterialModule,
         CommonModule,
-        TranslateModule
+        TranslateModule.forChild()
     ],
     declarations: [
         CommentListComponent,
diff --git a/lib/core/context-menu/animations.ts b/lib/core/context-menu/animations.ts
new file mode 100644
index 0000000000..33bb01173b
--- /dev/null
+++ b/lib/core/context-menu/animations.ts
@@ -0,0 +1,46 @@
+/*!
+ * @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 {
+    state,
+    style,
+    animate,
+    transition,
+    query,
+    group,
+    sequence,
+    AnimationStateMetadata,
+    AnimationTransitionMetadata
+} from '@angular/animations';
+
+export const contextMenuAnimation: ( AnimationStateMetadata | AnimationTransitionMetadata)[] = [
+    state('void', style({
+        opacity: 0,
+        transform: 'scale(0.01, 0.01)'
+    })),
+    transition('void => *', sequence([
+        query('.mat-menu-content', style({ opacity: 0 })),
+        animate('100ms linear', style({ opacity: 1, transform: 'scale(1, 0.5)' })),
+        group([
+            query('.mat-menu-content', animate('400ms cubic-bezier(0.55, 0, 0.55, 0.2)',
+                style({ opacity: 1 })
+            )),
+            animate('300ms cubic-bezier(0.25, 0.8, 0.25, 1)', style({ transform: 'scale(1, 1)' }))
+        ])
+    ])),
+    transition('* => void', animate('150ms 50ms linear', style({ opacity: 0 })))
+];
diff --git a/lib/core/context-menu/context-menu-holder.component.spec.ts b/lib/core/context-menu/context-menu-holder.component.spec.ts
index dd867f3afa..8909201afd 100644
--- a/lib/core/context-menu/context-menu-holder.component.spec.ts
+++ b/lib/core/context-menu/context-menu-holder.component.spec.ts
@@ -21,6 +21,7 @@ import { fakeAsync, ComponentFixture, TestBed, tick } from '@angular/core/testin
 import { ContextMenuHolderComponent } from './context-menu-holder.component';
 import { ContextMenuModule } from './context-menu.module';
 import { ContextMenuService } from './context-menu.service';
+import { CoreModule } from '../core.module';
 
 describe('ContextMenuHolderComponent', () => {
     let fixture: ComponentFixture<ContextMenuHolderComponent>;
@@ -53,6 +54,7 @@ describe('ContextMenuHolderComponent', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
                 imports: [
+                    CoreModule.forRoot(),
                     ContextMenuModule
                 ],
                 providers: [
diff --git a/lib/core/context-menu/context-menu-holder.component.ts b/lib/core/context-menu/context-menu-holder.component.ts
index e0eb824e52..ea0a175da6 100644
--- a/lib/core/context-menu/context-menu-holder.component.ts
+++ b/lib/core/context-menu/context-menu-holder.component.ts
@@ -19,8 +19,9 @@ import { OverlayContainer } from '@angular/cdk/overlay';
 import { ViewportRuler } from '@angular/cdk/scrolling';
 import { Component, HostListener, Input, OnDestroy, OnInit, Renderer2, ViewChild } from '@angular/core';
 import { MatMenuTrigger } from '@angular/material';
-import { Subscription } from 'rxjs/Subscription';
+import { Subscription } from 'rxjs';
 import { ContextMenuService } from './context-menu.service';
+
 /**
  * @deprecated: context-menu-holder is deprecated, use adf-context-menu-holder instead.
  */
@@ -31,9 +32,10 @@ import { ContextMenuService } from './context-menu.service';
         <mat-menu #contextMenu="matMenu" class="context-menu">
             <ng-container *ngFor="let link of links">
                 <button *ngIf="link.model?.visible"
-                    mat-menu-item
-                    [disabled]="link.model?.disabled"
-                    (click)="onMenuItemClick($event, link)">
+                        [attr.data-automation-id]="'context-'+((link.title || link.model?.title) | translate)"
+                        mat-menu-item
+                        [disabled]="link.model?.disabled"
+                        (click)="onMenuItemClick($event, link)">
                     <mat-icon *ngIf="showIcons && link.model?.icon">{{ link.model.icon }}</mat-icon>
                     {{ (link.title || link.model?.title) | translate }}
                 </button>
@@ -44,7 +46,7 @@ import { ContextMenuService } from './context-menu.service';
 export class ContextMenuHolderComponent implements OnInit, OnDestroy {
     links = [];
 
-    private mouseLocation: { left: number, top: number } = {left: 0, top: 0};
+    private mouseLocation: { left: number, top: number } = { left: 0, top: 0 };
     private menuElement = null;
     private subscriptions: Subscription[] = [];
     private contextMenuListenerFn: () => void;
@@ -70,11 +72,12 @@ export class ContextMenuHolderComponent implements OnInit, OnDestroy {
     }
 
     constructor(
-            private viewport: ViewportRuler,
-            private overlayContainer: OverlayContainer,
-            private contextMenuService: ContextMenuService,
-            private renderer: Renderer2
-    ) {}
+        private viewport: ViewportRuler,
+        private overlayContainer: OverlayContainer,
+        private contextMenuService: ContextMenuService,
+        private renderer: Renderer2
+    ) {
+    }
 
     ngOnInit() {
         this.subscriptions.push(
@@ -149,20 +152,22 @@ export class ContextMenuHolderComponent implements OnInit, OnDestroy {
 
     private updatePosition() {
         setTimeout(() => {
-            if (this.mdMenuElement.clientWidth + this.mouseLocation.left > this.viewport.getViewportRect().width) {
-                this.menuTrigger.menu.xPosition = 'before';
-                this.mdMenuElement.parentElement.style.left = this.mouseLocation.left - this.mdMenuElement.clientWidth + 'px';
-            } else {
-                this.menuTrigger.menu.xPosition = 'after';
-                this.mdMenuElement.parentElement.style.left = this.locationCss().left;
-            }
+            if (this.mdMenuElement.parentElement) {
+                if (this.mdMenuElement.clientWidth + this.mouseLocation.left > this.viewport.getViewportRect().width) {
+                    this.menuTrigger.menu.xPosition = 'before';
+                    this.mdMenuElement.parentElement.style.left = this.mouseLocation.left - this.mdMenuElement.clientWidth + 'px';
+                } else {
+                    this.menuTrigger.menu.xPosition = 'after';
+                    this.mdMenuElement.parentElement.style.left = this.locationCss().left;
+                }
 
-            if (this.mdMenuElement.clientHeight + this.mouseLocation.top > this.viewport.getViewportRect().height) {
-                this.menuTrigger.menu.yPosition = 'above';
-                this.mdMenuElement.parentElement.style.top = this.mouseLocation.top - this.mdMenuElement.clientHeight + 'px';
-            } else {
-                this.menuTrigger.menu.yPosition = 'below';
-                this.mdMenuElement.parentElement.style.top = this.locationCss().top;
+                if (this.mdMenuElement.clientHeight + this.mouseLocation.top > this.viewport.getViewportRect().height) {
+                    this.menuTrigger.menu.yPosition = 'above';
+                    this.mdMenuElement.parentElement.style.top = this.mouseLocation.top - this.mdMenuElement.clientHeight + 'px';
+                } else {
+                    this.menuTrigger.menu.yPosition = 'below';
+                    this.mdMenuElement.parentElement.style.top = this.locationCss().top;
+                }
             }
         }, 0);
     }
diff --git a/lib/core/context-menu/context-menu-list.component.ts b/lib/core/context-menu/context-menu-list.component.ts
new file mode 100644
index 0000000000..24acc6cef3
--- /dev/null
+++ b/lib/core/context-menu/context-menu-list.component.ts
@@ -0,0 +1,101 @@
+/*!
+ * @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 {
+    Component, ViewEncapsulation, HostListener, AfterViewInit,
+    Optional, Inject, QueryList, ViewChildren
+} from '@angular/core';
+import { trigger } from '@angular/animations';
+import { DOWN_ARROW, UP_ARROW } from '@angular/cdk/keycodes';
+import { FocusKeyManager } from '@angular/cdk/a11y';
+import { MatMenuItem } from '@angular/material';
+import { ContextMenuOverlayRef } from './context-menu-overlay';
+import { contextMenuAnimation } from './animations';
+import { CONTEXT_MENU_DATA } from './context-menu.tokens';
+
+@Component({
+    selector: 'adf-context-menu',
+    template: `
+        <div mat-menu class="mat-menu-panel" @panelAnimation>
+            <div id="adf-context-menu-content" class="mat-menu-content">
+                <ng-container *ngFor="let link of links">
+                    <button *ngIf="link.model?.visible"
+                            [attr.data-automation-id]="'context-'+((link.title || link.model?.title) | translate)"
+                            mat-menu-item
+                            [disabled]="link.model?.disabled"
+                            (click)="onMenuItemClick($event, link)">
+                        <mat-icon *ngIf="link.model?.icon">{{ link.model.icon }}</mat-icon>
+                        <span>{{ (link.title || link.model?.title) | translate }}</span>
+                    </button>
+                </ng-container>
+            </div>
+        </div>
+    `,
+    host: {
+        role: 'menu',
+        class: 'adf-context-menu'
+    },
+    encapsulation: ViewEncapsulation.None,
+    animations: [
+        trigger('panelAnimation', contextMenuAnimation)
+    ]
+})
+export class ContextMenuListComponent implements AfterViewInit {
+    private keyManager: FocusKeyManager<MatMenuItem>;
+    @ViewChildren(MatMenuItem) items: QueryList<MatMenuItem>;
+    links: any[];
+
+    @HostListener('document:keydown.Escape', ['$event'])
+    handleKeydownEscape(event: KeyboardEvent) {
+        if (event) {
+            this.contextMenuOverlayRef.close();
+        }
+    }
+
+    @HostListener('document:keydown', ['$event'])
+    handleKeydownEvent(event: KeyboardEvent) {
+        if (event) {
+            const keyCode = event.keyCode;
+            if (keyCode === UP_ARROW || keyCode === DOWN_ARROW) {
+                this.keyManager.onKeydown(event);
+            }
+        }
+    }
+
+    constructor(
+        @Inject(ContextMenuOverlayRef) private contextMenuOverlayRef: ContextMenuOverlayRef,
+        @Optional() @Inject(CONTEXT_MENU_DATA) private data: any
+    ) {
+        this.links = this.data;
+    }
+
+    onMenuItemClick(event: Event, menuItem: any) {
+        if (menuItem && menuItem.model && menuItem.model.disabled) {
+            event.preventDefault();
+            event.stopImmediatePropagation();
+            return;
+        }
+
+        menuItem.subject.next(menuItem);
+        this.contextMenuOverlayRef.close();
+    }
+
+    ngAfterViewInit() {
+        this.keyManager = new FocusKeyManager<MatMenuItem>(this.items);
+        this.keyManager.setFirstItemActive();
+    }
+}
diff --git a/lib/core/context-menu/context-menu-overlay.service.ts b/lib/core/context-menu/context-menu-overlay.service.ts
new file mode 100644
index 0000000000..fb1641eca6
--- /dev/null
+++ b/lib/core/context-menu/context-menu-overlay.service.ts
@@ -0,0 +1,129 @@
+/*!
+ * @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 { Injectable, Injector, ElementRef, ComponentRef } from '@angular/core';
+import { Overlay, OverlayConfig, OverlayRef } from '@angular/cdk/overlay';
+import { PortalInjector, ComponentPortal } from '@angular/cdk/portal';
+import { ContextMenuOverlayRef } from './context-menu-overlay';
+import { ContextMenuOverlayConfig } from './interfaces';
+import { CONTEXT_MENU_DATA } from './context-menu.tokens';
+import { ContextMenuListComponent } from './context-menu-list.component';
+
+const DEFAULT_CONFIG: ContextMenuOverlayConfig = {
+    panelClass: 'cdk-overlay-pane',
+    backdropClass: 'cdk-overlay-transparent-backdrop',
+    hasBackdrop: true
+};
+
+@Injectable()
+export class ContextMenuOverlayService {
+
+    constructor( private injector: Injector, private overlay: Overlay) { }
+
+    open(config: ContextMenuOverlayConfig): ContextMenuOverlayRef {
+        const overlayConfig = { ...DEFAULT_CONFIG, ...config };
+
+        const overlay = this.createOverlay(overlayConfig);
+
+        const overlayRef = new ContextMenuOverlayRef(overlay);
+
+        this.attachDialogContainer(overlay, config, overlayRef);
+
+        overlay.backdropClick().subscribe(() => overlayRef.close());
+
+        // prevent native contextmenu on overlay element if config.hasBackdrop is true
+        if (overlayConfig.hasBackdrop) {
+            (<any> overlay)._backdropElement
+                .addEventListener('contextmenu', (event) => {
+                    event.preventDefault();
+                    (<any> overlay)._backdropClick.next(null);
+                }, true);
+        }
+
+        return overlayRef;
+    }
+
+    private createOverlay(config: ContextMenuOverlayConfig): OverlayRef {
+        const overlayConfig = this.getOverlayConfig(config);
+        return this.overlay.create(overlayConfig);
+    }
+
+    private attachDialogContainer(overlay: OverlayRef, config: ContextMenuOverlayConfig, contextMenuOverlayRef: ContextMenuOverlayRef) {
+        const injector = this.createInjector(config, contextMenuOverlayRef);
+
+        const containerPortal = new ComponentPortal(ContextMenuListComponent, null, injector);
+        const containerRef: ComponentRef<ContextMenuListComponent> = overlay.attach(containerPortal);
+
+        return containerRef.instance;
+    }
+
+    private createInjector(config: ContextMenuOverlayConfig, contextMenuOverlayRef: ContextMenuOverlayRef): PortalInjector {
+        const injectionTokens = new WeakMap();
+
+        injectionTokens.set(ContextMenuOverlayRef, contextMenuOverlayRef);
+        injectionTokens.set(CONTEXT_MENU_DATA, config.data);
+
+        return new PortalInjector(this.injector, injectionTokens);
+    }
+
+    private getOverlayConfig(config: ContextMenuOverlayConfig): OverlayConfig {
+        const { clientY, clientX  } = config.source;
+
+        const fakeElement: any = {
+            getBoundingClientRect: (): ClientRect => ({
+                bottom: clientY,
+                height: 0,
+                left: clientX,
+                right: clientX,
+                top: clientY,
+                width: 0
+            })
+        };
+
+        const positionStrategy = this.overlay.position()
+            .connectedTo(
+                new ElementRef(fakeElement),
+                { originX: 'start', originY: 'bottom' },
+                { overlayX: 'start', overlayY: 'top' })
+            .withFallbackPosition(
+                { originX: 'start', originY: 'top' },
+                { overlayX: 'start', overlayY: 'bottom' })
+            .withFallbackPosition(
+                { originX: 'end', originY: 'top' },
+                { overlayX: 'start', overlayY: 'top' })
+            .withFallbackPosition(
+                { originX: 'start', originY: 'top' },
+                { overlayX: 'end', overlayY: 'top' })
+            .withFallbackPosition(
+                { originX: 'end', originY: 'center' },
+                { overlayX: 'start', overlayY: 'center' })
+            .withFallbackPosition(
+                { originX: 'start', originY: 'center' },
+                { overlayX: 'end', overlayY: 'center' }
+            );
+
+        const overlayConfig = new OverlayConfig({
+            hasBackdrop: config.hasBackdrop,
+            backdropClass: config.backdropClass,
+            panelClass: config.panelClass,
+            scrollStrategy: this.overlay.scrollStrategies.close(),
+            positionStrategy
+        });
+
+        return overlayConfig;
+    }
+}
diff --git a/lib/core/context-menu/context-menu-overlay.ts b/lib/core/context-menu/context-menu-overlay.ts
new file mode 100644
index 0000000000..fa5bdba518
--- /dev/null
+++ b/lib/core/context-menu/context-menu-overlay.ts
@@ -0,0 +1,27 @@
+/*!
+ * @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 { OverlayRef } from '@angular/cdk/overlay';
+
+export class ContextMenuOverlayRef {
+
+    constructor(private overlayRef: OverlayRef) { }
+
+    close(): void {
+        this.overlayRef.dispose();
+    }
+}
diff --git a/lib/core/context-menu/context-menu.directive.spec.ts b/lib/core/context-menu/context-menu.directive.spec.ts
deleted file mode 100644
index 608d622a27..0000000000
--- a/lib/core/context-menu/context-menu.directive.spec.ts
+++ /dev/null
@@ -1,72 +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 { ContextMenuDirective } from './context-menu.directive';
-import { ContextMenuService } from './context-menu.service';
-
-describe('ContextMenuDirective', () => {
-
-    let contextMenuService;
-    let directive;
-
-    beforeEach(() => {
-        contextMenuService = new ContextMenuService();
-        directive = new ContextMenuDirective(contextMenuService);
-        directive.enabled = true;
-    });
-
-    it('should show menu via service', (done) => {
-        contextMenuService.show.subscribe(() => {
-            done();
-        });
-
-        directive.links = [{}];
-        directive.onShowContextMenu(null);
-    });
-
-    it('should prevent default behavior', () => {
-        let event = new MouseEvent('click');
-        spyOn(event, 'preventDefault').and.callThrough();
-
-        directive.onShowContextMenu(event);
-        expect(event.preventDefault).toHaveBeenCalled();
-    });
-
-    it('should forward event to service', () => {
-        let event = new MouseEvent('click');
-
-        contextMenuService.show.subscribe(e => {
-            expect(e.event).toBeDefined();
-            expect(e.event).toBe(event);
-        });
-
-        directive.onShowContextMenu(event);
-    });
-
-    it('should forward menu items to service', () => {
-        let links = [{}, {}];
-        directive.links = links;
-
-        contextMenuService.show.subscribe(e => {
-            expect(e.obj).toBeDefined();
-            expect(e.obj).toBe(links);
-        });
-
-        directive.onShowContextMenu(null);
-    });
-
-});
diff --git a/lib/core/context-menu/context-menu.directive.ts b/lib/core/context-menu/context-menu.directive.ts
index 4e8dfe77e1..864aa565cb 100644
--- a/lib/core/context-menu/context-menu.directive.ts
+++ b/lib/core/context-menu/context-menu.directive.ts
@@ -18,7 +18,7 @@
 /* tslint:disable:no-input-rename  */
 
 import { Directive, HostListener, Input } from '@angular/core';
-import { ContextMenuService } from './context-menu.service';
+import { ContextMenuOverlayService } from './context-menu-overlay.service';
 
 // @deprecated 2.3.0 context-menu tag removed
 @Directive({
@@ -33,8 +33,7 @@ export class ContextMenuDirective {
     @Input('context-menu-enabled')
     enabled: boolean = false;
 
-    constructor(private _contextMenuService: ContextMenuService) {
-    }
+    constructor(private contextMenuService: ContextMenuOverlayService) {}
 
     @HostListener('contextmenu', ['$event'])
     onShowContextMenu(event?: MouseEvent) {
@@ -44,9 +43,10 @@ export class ContextMenuDirective {
             }
 
             if (this.links && this.links.length > 0) {
-                if (this._contextMenuService) {
-                    this._contextMenuService.show.next({event: event, obj: this.links});
-                }
+                this.contextMenuService.open({
+                    source: event,
+                    data: this.links
+                });
             }
         }
     }
diff --git a/lib/core/context-menu/context-menu.module.ts b/lib/core/context-menu/context-menu.module.ts
index 06bbbc88d0..d253b62502 100644
--- a/lib/core/context-menu/context-menu.module.ts
+++ b/lib/core/context-menu/context-menu.module.ts
@@ -22,24 +22,25 @@ import { TranslateModule } from '@ngx-translate/core';
 
 import { ContextMenuHolderComponent } from './context-menu-holder.component';
 import { ContextMenuDirective } from './context-menu.directive';
-import { ContextMenuService } from './context-menu.service';
+import { ContextMenuListComponent } from './context-menu-list.component';
 
 @NgModule({
     imports: [
         CommonModule,
         MaterialModule,
-        TranslateModule
+        TranslateModule.forChild()
     ],
     declarations: [
         ContextMenuHolderComponent,
-        ContextMenuDirective
+        ContextMenuDirective,
+        ContextMenuListComponent
     ],
     exports: [
         ContextMenuHolderComponent,
         ContextMenuDirective
     ],
-    providers: [
-        ContextMenuService
+    entryComponents: [
+        ContextMenuListComponent
     ]
 })
 export class ContextMenuModule {}
diff --git a/lib/core/context-menu/context-menu.service.ts b/lib/core/context-menu/context-menu.service.ts
index fef5c9759a..871dc89d6b 100644
--- a/lib/core/context-menu/context-menu.service.ts
+++ b/lib/core/context-menu/context-menu.service.ts
@@ -16,7 +16,7 @@
  */
 
 import { Injectable } from '@angular/core';
-import { Subject } from 'rxjs/Subject';
+import { Subject } from 'rxjs';
 
 @Injectable()
 export class ContextMenuService {
diff --git a/lib/core/context-menu/context-menu.spec.ts b/lib/core/context-menu/context-menu.spec.ts
new file mode 100644
index 0000000000..bd45c075b3
--- /dev/null
+++ b/lib/core/context-menu/context-menu.spec.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 { Component } from '@angular/core';
+import { TestBed, ComponentFixture } from '@angular/core/testing';
+import { ContextMenuModule } from './context-menu.module';
+import { CoreModule } from '../core.module';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+
+@Component({
+    selector: 'adf-test-component',
+    template: `
+        <div id="target" [context-menu]="actions" [context-menu-enabled]="true"></div>
+    `
+})
+class TestComponent {
+    actions;
+}
+
+describe('ContextMenuDirective', () => {
+    let fixture: ComponentFixture<TestComponent>;
+    const actions = [
+        {
+            model: {
+                visible: false,
+                title: 'Action 1'
+            },
+            subject: {
+                next: jasmine.createSpy('next')
+            }
+        },
+        {
+            model: {
+                visible: true,
+                disabled: true,
+                title: 'Action 2',
+                icon: null
+            },
+            subject: {
+                next: jasmine.createSpy('next')
+            }
+        },
+        {
+            model: {
+                visible: true,
+                disabled: false,
+                title: 'Action 3',
+                icon: 'action-icon-3'
+            },
+            subject: {
+                next: jasmine.createSpy('next')
+            }
+        },
+        {
+            model: {
+                visible: true,
+                disabled: false,
+                title: 'Action 4',
+                icon: 'action-icon-4'
+            },
+            subject: {
+                next: jasmine.createSpy('next')
+            }
+        }
+    ];
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+                imports: [
+                    CoreModule.forRoot(),
+                    ContextMenuModule,
+                    NoopAnimationsModule
+                ],
+                declarations: [
+                    TestComponent
+                ]
+        });
+
+        fixture = TestBed.createComponent(TestComponent);
+        fixture.componentInstance.actions = actions;
+        fixture.detectChanges();
+    });
+
+    it('should not render contextmenu when action was not performed', () => {
+        const  containerElement = fixture.debugElement.nativeElement.parentElement;
+        expect(containerElement.querySelector('.adf-context-menu button')).toBe(null);
+    });
+
+    describe('Events', () => {
+        let targetElement: HTMLElement;
+        let contextMenu: HTMLElement;
+
+        beforeEach(() => {
+            targetElement = fixture.debugElement.nativeElement.querySelector('#target');
+            targetElement.dispatchEvent(new CustomEvent('contextmenu'));
+            fixture.detectChanges();
+            contextMenu = document.querySelector('.adf-context-menu');
+        });
+
+        it('should show menu on mouse contextmenu event', () => {
+            expect(contextMenu).not.toBe(null);
+        });
+
+        it('should set DOM element reference on  menu open event', () => {
+            expect(contextMenu.className).toContain('adf-context-menu');
+        });
+
+        it('should reset DOM element reference on Escape event', () => {
+            const event = new KeyboardEvent('keydown', {
+                bubbles : true, cancelable : true, key : 'Escape'
+            });
+
+            document.querySelector('.cdk-overlay-backdrop').dispatchEvent(event);
+            fixture.detectChanges();
+            expect(document.querySelector('.adf-context-menu')).toBe(null);
+        });
+    });
+
+    describe('Contextmenu list', () => {
+        let targetElement: HTMLElement;
+        let contextMenu: HTMLElement;
+
+        beforeEach(() => {
+            targetElement = fixture.debugElement.nativeElement.querySelector('#target');
+            targetElement.dispatchEvent(new CustomEvent('contextmenu'));
+            fixture.detectChanges();
+            contextMenu = document.querySelector('.adf-context-menu');
+        });
+
+        it('should not render item with visibility property set to false', () => {
+            expect(contextMenu.querySelectorAll('button').length).toBe(3);
+        });
+
+        it('should render item as disabled when `disabled` property is set to true', () => {
+            expect(contextMenu.querySelectorAll('button')[0].disabled).toBe(true);
+        });
+
+        it('should set first not disabled item as active', () => {
+            expect(document.activeElement.querySelector('mat-icon').innerHTML).toContain('action-icon-3');
+        });
+
+        it('should not allow action event when item is disabled', () => {
+            contextMenu.querySelectorAll('button')[0].click();
+            fixture.detectChanges();
+
+            expect(fixture.componentInstance.actions[1].subject.next).not.toHaveBeenCalled();
+        });
+
+        it('should perform action when item is not disabled', () => {
+            contextMenu.querySelectorAll('button')[1].click();
+            fixture.detectChanges();
+
+            expect(fixture.componentInstance.actions[2].subject.next).toHaveBeenCalled();
+        });
+
+        it('should not render item icon if not set', () => {
+            expect(contextMenu.querySelectorAll('button')[0].querySelector('mat-icon')).toBe(null);
+        });
+    });
+});
diff --git a/lib/config/assets/license_header.txt b/lib/core/context-menu/context-menu.tokens.ts
similarity index 82%
rename from lib/config/assets/license_header.txt
rename to lib/core/context-menu/context-menu.tokens.ts
index 58ad8b656b..aaaab85592 100644
--- a/lib/config/assets/license_header.txt
+++ b/lib/core/context-menu/context-menu.tokens.ts
@@ -14,3 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+import { InjectionToken } from '@angular/core';
+
+export const CONTEXT_MENU_DATA = new InjectionToken<any>('CONTEXT_MENU_DATA');
diff --git a/lib/core/context-menu/interfaces.ts b/lib/core/context-menu/interfaces.ts
new file mode 100644
index 0000000000..623f01da23
--- /dev/null
+++ b/lib/core/context-menu/interfaces.ts
@@ -0,0 +1,24 @@
+/*!
+ * @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.
+ */
+
+export interface ContextMenuOverlayConfig {
+    panelClass?: string;
+    hasBackdrop?: boolean;
+    backdropClass?: string;
+    source?: MouseEvent;
+    data?: any;
+}
diff --git a/lib/core/core.module.ts b/lib/core/core.module.ts
index 568d50240f..5a2531c365 100644
--- a/lib/core/core.module.ts
+++ b/lib/core/core.module.ts
@@ -39,7 +39,7 @@ import { ToolbarModule } from './toolbar/toolbar.module';
 import { UserInfoModule } from './userinfo/userinfo.module';
 import { ViewerModule } from './viewer/viewer.module';
 import { FormModule } from './form/form.module';
-import { SidenavLayoutModule } from './sidenav-layout/sidenav-layout.module';
+import { SidenavLayoutModule } from './layout/layout.module';
 import { CommentsModule } from './comments/comments.module';
 import { ButtonsMenuModule } from './buttons-menu/buttons-menu.module';
 import { TemplateModule } from './templates/template.module';
@@ -83,6 +83,18 @@ import { UserPreferencesService } from './services/user-preferences.service';
 import { SearchConfigurationService } from './services/search-configuration.service';
 import { startupServiceFactory } from './services/startup-service-factory';
 import { SortingPickerModule } from './sorting-picker/sorting-picker.module';
+import { AppConfigService } from './app-config/app-config.service';
+import { ContextMenuService } from './context-menu/context-menu.service';
+import { ContextMenuOverlayService } from './context-menu/context-menu-overlay.service';
+import { ActivitiContentService } from './form/services/activiti-alfresco.service';
+import { EcmModelService } from './form/services/ecm-model.service';
+import { FormRenderingService } from './form/services/form-rendering.service';
+import { FormService } from './form/services/form.service';
+import { NodeService } from './form/services/node.service';
+import { ProcessContentService } from './form/services/process-content.service';
+import { WidgetVisibilityService } from './form/services/widget-visibility.service';
+import { EcmUserService } from './userinfo/services/ecm-user.service';
+import { BpmUserService } from './userinfo/services/bpm-user.service';
 
 export function createTranslateLoader(http: HttpClient, logService: LogService) {
     return new TranslateLoaderService(http, logService);
@@ -124,7 +136,19 @@ export function providers() {
         CommentProcessService,
         CommentContentService,
         SearchConfigurationService,
-        DatePipe
+        DatePipe,
+        AppConfigService,
+        ContextMenuService,
+        ContextMenuOverlayService,
+        ActivitiContentService,
+        EcmModelService,
+        FormRenderingService,
+        FormService,
+        NodeService,
+        ProcessContentService,
+        WidgetVisibilityService,
+        EcmUserService,
+        BpmUserService
     ];
 }
 
diff --git a/lib/core/datatable/components/datatable/datatable.component.html b/lib/core/datatable/components/datatable/datatable.component.html
index a2e1161466..337d83a034 100644
--- a/lib/core/datatable/components/datatable/datatable.component.html
+++ b/lib/core/datatable/components/datatable/datatable.component.html
@@ -33,16 +33,16 @@
             </div>
         </div>
         <mat-form-field *ngIf="display === 'gallery'">
-            <mat-select [value]="getSortingKey()">
+            <mat-select [value]="getSortingKey()" [attr.data-automation-id]="'grid-view-sorting'">
                 <mat-option *ngFor="let col of getSortableColumns()"
                             [value]="col.key"
+                            [attr.data-automation-id]="'grid-view-sorting-'+col.title"
                             (click)="onColumnHeaderClick(col)"
                             (keyup.enter)="onColumnHeaderClick(col)">
                     {{ col.title | translate}}
                 </mat-option>
             </mat-select>
         </mat-form-field>
-
     </div>
 
     <div class="adf-datatable-body">
@@ -191,6 +191,9 @@
                     <ng-content select="adf-empty-list"></ng-content>
                 </div>
             </div>
+            <div *ngFor="let row of fakeRows"
+                 class="adf-datatable-row adf-datatable-row-empty-card">
+            </div>
         </ng-container>
         <div *ngIf="!loading && noPermission"
              [class.adf-datatable-row]="display === 'list'"
diff --git a/lib/core/datatable/components/datatable/datatable.component.scss b/lib/core/datatable/components/datatable/datatable.component.scss
index c4b9dfbec1..61a0a61c9d 100644
--- a/lib/core/datatable/components/datatable/datatable.component.scss
+++ b/lib/core/datatable/components/datatable/datatable.component.scss
@@ -29,13 +29,10 @@
             display: flex;
 
             width: 100%;
-            flex-direction: row;
-            justify-content: space-between;
 
-            &:after {
-                content: "";
-                flex: auto;
-            }
+            justify-content: space-evenly;
+            align-content: flex-start;
+            align-items: flex-start;
 
             .adf-datatable-row {
                 transition: all 0.3s ease;
@@ -58,6 +55,14 @@
                 @include mat-overridable-elevation(2);
             }
 
+            .adf-datatable-row-empty-card {
+                height: 0 !important;
+                padding-top: 0;
+                padding-bottom: 0;
+                margin-top: 0;
+                margin-bottom: 0;
+            }
+
             .is-selected {
                 background: mat-color($primary, 100);
                 padding-bottom: 31px;
@@ -390,8 +395,6 @@
         .ellipsis-cell {
             .cell-container {
                 height: 100%;
-                display: inline-grid;
-                width: 100%;
             }
 
             .cell-container > * {
@@ -407,7 +410,7 @@
             /* visible content */
             .cell-value {
                 display: block;
-                position: relative;
+                position: absolute;
                 max-width: calc(100% - 2em);
                 white-space: nowrap;
                 overflow: hidden;
diff --git a/lib/core/datatable/components/datatable/datatable.component.ts b/lib/core/datatable/components/datatable/datatable.component.ts
index 6e4e34407d..553e7566f5 100644
--- a/lib/core/datatable/components/datatable/datatable.component.ts
+++ b/lib/core/datatable/components/datatable/datatable.component.ts
@@ -20,7 +20,7 @@ import {
     IterableDiffers, OnChanges, Output, SimpleChange, SimpleChanges, TemplateRef, ViewEncapsulation, OnDestroy
 } from '@angular/core';
 import { MatCheckboxChange } from '@angular/material';
-import { Subscription, Observable, Observer } from 'rxjs/Rx';
+import { Subscription, Observable, Observer } from 'rxjs';
 import { DataColumnListComponent } from '../../../data-column/data-column-list.component';
 import { DataColumn } from '../../data/data-column.model';
 import { DataRowEvent } from '../../data/data-row-event.model';
@@ -32,9 +32,7 @@ import { ObjectDataRow } from '../../data/object-datarow.model';
 import { ObjectDataTableAdapter } from '../../data/object-datatable-adapter';
 import { DataCellEvent } from './data-cell.event';
 import { DataRowActionEvent } from './data-row-action.event';
-import 'rxjs/add/operator/debounceTime';
-import 'rxjs/add/operator/buffer';
-import 'rxjs/add/operator/filter';
+import { share, buffer, map, filter, debounceTime } from 'rxjs/operators';
 
 export enum DisplayMode {
     List = 'list',
@@ -161,6 +159,9 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck,
     isSelectAllChecked: boolean = false;
     selection = new Array<DataRow>();
 
+    /** This array of fake rows fix the flex layout for the gallery view */
+    fakeRows = [];
+
     private clickObserver: Observer<DataRowEvent>;
     private click$: Observable<DataRowEvent>;
 
@@ -177,7 +178,8 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck,
         if (differs) {
             this.differ = differs.find([]).create(null);
         }
-        this.click$ = new Observable<DataRowEvent>(observer => this.clickObserver = observer).share();
+        this.click$ = new Observable<DataRowEvent>(observer => this.clickObserver = observer)
+            .pipe(share());
     }
 
     ngAfterContentInit() {
@@ -188,6 +190,7 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck,
                 })
             );
         }
+        this.datatableLayoutFix();
         this.setTableSchema();
     }
 
@@ -220,6 +223,10 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck,
         if (this.isPropertyChanged(changes['sorting'])) {
             this.setTableSorting(changes['sorting'].currentValue);
         }
+
+        if (this.isPropertyChanged(changes['display'])) {
+            this.datatableLayoutFix();
+        }
     }
 
     ngDoCheck() {
@@ -246,9 +253,15 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck,
     private initAndSubscribeClickStream() {
         this.unsubscribeClickStream();
         let singleClickStream = this.click$
-            .buffer(this.click$.debounceTime(250))
-            .map(list => list)
-            .filter(x => x.length === 1);
+            .pipe(
+                buffer(
+                    this.click$.pipe(
+                        debounceTime(250)
+                    )
+                ),
+                map(list => list),
+                filter(x => x.length === 1)
+            );
 
         this.singleClickStreamSub = singleClickStream.subscribe((obj: DataRowEvent[]) => {
             let event: DataRowEvent = obj[0];
@@ -265,9 +278,15 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck,
         });
 
         let multiClickStream = this.click$
-            .buffer(this.click$.debounceTime(250))
-            .map(list => list)
-            .filter(x => x.length >= 2);
+            .pipe(
+                buffer(
+                    this.click$.pipe(
+                        debounceTime(250)
+                    )
+                ),
+                map(list => list),
+                filter(x => x.length >= 2)
+            );
 
         this.multiClickStreamSub = multiClickStream.subscribe((obj: DataRowEvent[]) => {
             let event: DataRowEvent = obj[0];
@@ -526,7 +545,7 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck,
         return event.value.actions;
     }
 
-    getRowActions(row: DataRow, col: DataColumn): any[] {
+    getRowActions(row: DataRow, col?: DataColumn): any[] {
         const id = row.getValue('id');
 
         if (!this.rowMenuCache[id]) {
@@ -654,4 +673,16 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck,
             this.dataRowsChanged = null;
         }
     }
+
+    datatableLayoutFix() {
+        const maxGalleryRows = 25;
+
+        if (this.display === 'gallery') {
+            for (let i = 0; i < maxGalleryRows; i++) {
+               this.fakeRows.push('');
+            }
+        } else {
+            this.fakeRows = [];
+        }
+    }
 }
diff --git a/lib/core/datatable/data/datatable-adapter.ts b/lib/core/datatable/data/datatable-adapter.ts
index 3c0ef1937a..02622a5f91 100644
--- a/lib/core/datatable/data/datatable-adapter.ts
+++ b/lib/core/datatable/data/datatable-adapter.ts
@@ -18,7 +18,7 @@
 import { DataColumn } from './data-column.model';
 import { DataRow } from './data-row.model';
 import { DataSorting } from './data-sorting.model';
-import { Subject } from 'rxjs/Rx';
+import { Subject } from 'rxjs';
 
 export interface DataTableAdapter {
     rowsChanged?: Subject<Array<DataRow>>;
diff --git a/lib/core/datatable/data/object-datatable-adapter.ts b/lib/core/datatable/data/object-datatable-adapter.ts
index 7875a6bf64..398045e71e 100644
--- a/lib/core/datatable/data/object-datatable-adapter.ts
+++ b/lib/core/datatable/data/object-datatable-adapter.ts
@@ -21,7 +21,7 @@ import { ObjectDataRow } from './object-datarow.model';
 import { ObjectDataColumn } from './object-datacolumn.model';
 import { DataSorting } from './data-sorting.model';
 import { DataTableAdapter } from './datatable-adapter';
-import { Subject } from 'rxjs/Subject';
+import { Subject } from 'rxjs';
 
 // Simple implementation of the DataTableAdapter interface.
 export class ObjectDataTableAdapter implements DataTableAdapter {
diff --git a/lib/core/datatable/datatable.module.ts b/lib/core/datatable/datatable.module.ts
index 88394d4d5d..85d4199942 100644
--- a/lib/core/datatable/datatable.module.ts
+++ b/lib/core/datatable/datatable.module.ts
@@ -44,7 +44,7 @@ import { EmptyCustomContentDirective } from './directives/empty-custom-content.d
         RouterModule,
         MaterialModule,
         CommonModule,
-        TranslateModule,
+        TranslateModule.forChild(),
         ContextMenuModule,
         PipeModule,
         DirectiveModule
diff --git a/lib/core/directives/highlight.directive.ts b/lib/core/directives/highlight.directive.ts
index 89c5dea233..5b1596df5d 100644
--- a/lib/core/directives/highlight.directive.ts
+++ b/lib/core/directives/highlight.directive.ts
@@ -17,7 +17,7 @@
 
 /* tslint:disable:no-input-rename  */
 
-import { Directive, ElementRef, Input, Renderer } from '@angular/core';
+import { Directive, ElementRef, Input, Renderer2 } from '@angular/core';
 import { HighlightTransformService, HightlightTransformResult } from '../services/highlight-transform.service';
 
 @Directive({
@@ -39,7 +39,7 @@ export class HighlightDirective {
 
     constructor(
         private el: ElementRef,
-        private renderer: Renderer,
+        private renderer: Renderer2,
         private highlightTransformService: HighlightTransformService) { }
 
     public highlight(search = this.search, selector = this.selector, classToApply = this.classToApply) {
@@ -49,7 +49,7 @@ export class HighlightDirective {
             elements.forEach((element) => {
                 const result: HightlightTransformResult = this.highlightTransformService.highlight(element.innerHTML, search, classToApply);
                 if (result.changed) {
-                    this.renderer.setElementProperty(element, 'innerHTML', result.text);
+                    this.renderer.setProperty(element, 'innerHTML', result.text);
                 }
             });
         }
diff --git a/lib/core/directives/logout.directive.spec.ts b/lib/core/directives/logout.directive.spec.ts
index 398d772323..29e9fad954 100644
--- a/lib/core/directives/logout.directive.spec.ts
+++ b/lib/core/directives/logout.directive.spec.ts
@@ -19,7 +19,7 @@ import { Component, ContentChildren } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
-import { Observable } from 'rxjs/Observable';
+import { of, throwError } from 'rxjs';
 import { AuthenticationService } from '../services';
 import { setupTestBed } from '../testing/setupTestBed';
 import { CoreModule } from '../core.module';
@@ -60,8 +60,8 @@ describe('LogoutDirective', () => {
         });
 
         it('should redirect to login on click', () => {
-            spyOn(router, 'navigate').and.callThrough();
-            spyOn(authService, 'logout').and.returnValue(Observable.of(true));
+            spyOn(router, 'navigate');
+            spyOn(authService, 'logout').and.returnValue(of(true));
 
             const button = fixture.nativeElement.querySelector('button');
             button.click();
@@ -71,8 +71,8 @@ describe('LogoutDirective', () => {
         });
 
         it('should redirect to login even on logout error', () => {
-            spyOn(router, 'navigate').and.callThrough();
-            spyOn(authService, 'logout').and.returnValue(Observable.throw('err'));
+            spyOn(router, 'navigate');
+            spyOn(authService, 'logout').and.returnValue(throwError('err'));
 
             const button = fixture.nativeElement.querySelector('button');
             button.click();
@@ -116,8 +116,8 @@ describe('LogoutDirective', () => {
         });
 
         it('should redirect to the the input redirectUri on click if present', () => {
-            spyOn(router, 'navigate').and.callThrough();
-            spyOn(authService, 'logout').and.returnValue(Observable.of(true));
+            spyOn(router, 'navigate');
+            spyOn(authService, 'logout').and.returnValue(of(true));
 
             const button = fixture.nativeElement.querySelector('button');
             button.click();
@@ -128,7 +128,7 @@ describe('LogoutDirective', () => {
 
     });
 
-    describe('redirectUri', () => {
+    describe('enabelRedirect', () => {
 
         @Component({
             selector: 'adf-test-component',
@@ -161,8 +161,8 @@ describe('LogoutDirective', () => {
         });
 
         it('should not redirect if enabelRedirect is false', () => {
-            spyOn(router, 'navigate').and.callThrough();
-            spyOn(authService, 'logout').and.returnValue(Observable.of(true));
+            spyOn(router, 'navigate');
+            spyOn(authService, 'logout').and.returnValue(of(true));
             const button = fixture.nativeElement.querySelector('button');
             button.click();
 
diff --git a/lib/core/directives/node-delete.directive.ts b/lib/core/directives/node-delete.directive.ts
index df0a9bad8c..ba6b6d641c 100644
--- a/lib/core/directives/node-delete.directive.ts
+++ b/lib/core/directives/node-delete.directive.ts
@@ -19,12 +19,10 @@
 
 import { Directive, ElementRef, EventEmitter, HostListener, Input, OnChanges, Output } from '@angular/core';
 import { MinimalNodeEntity, MinimalNodeEntryEntity, DeletedNodeEntity, DeletedNodeMinimalEntry } from 'alfresco-js-api';
-import { Observable } from 'rxjs/Observable';
+import { Observable, forkJoin, from, of } from 'rxjs';
 import { AlfrescoApiService } from '../services/alfresco-api.service';
 import { TranslationService } from '../services/translation.service';
-import 'rxjs/add/observable/fromPromise';
-import 'rxjs/observable/forkJoin';
-import 'rxjs/add/operator/catch';
+import { map, catchError } from 'rxjs/operators';
 
 interface ProcessedNodeData {
     entry: MinimalNodeEntryEntity | DeletedNodeMinimalEntry;
@@ -93,7 +91,7 @@ export class NodeDeleteDirective implements OnChanges {
 
             const batch = this.getDeleteNodesBatch(selection);
 
-            Observable.forkJoin(...batch)
+            forkJoin(...batch)
                 .subscribe((data: ProcessedNodeData[]) => {
                     const processedItems: ProcessStatus = this.processStatus(data);
                     const message = this.getMessage(processedItems);
@@ -118,17 +116,16 @@ export class NodeDeleteDirective implements OnChanges {
             promise = this.alfrescoApiService.nodesApi.deleteNode(id, { permanent: this.permanent });
         }
 
-        return Observable.fromPromise(promise)
-            .map(() => ({
+        return from(promise).pipe(
+            map(() => ({
                 entry: node.entry,
                 status: 1
+            })),
+            catchError(() => of({
+                entry: node.entry,
+                status: 0
             }))
-            .catch((error: any) => {
-                return Observable.of({
-                    entry: node.entry,
-                    status: 0
-                });
-            });
+        );
     }
 
     private processStatus(data): ProcessStatus {
diff --git a/lib/core/directives/node-favorite.directive.spec.ts b/lib/core/directives/node-favorite.directive.spec.ts
index a0f7a81f89..14ef959399 100644
--- a/lib/core/directives/node-favorite.directive.spec.ts
+++ b/lib/core/directives/node-favorite.directive.spec.ts
@@ -175,8 +175,8 @@ describe('NodeFavoriteDirective', () => {
         let addFavoriteSpy;
 
         beforeEach(() => {
-            removeFavoriteSpy = spyOn(alfrescoApiService.getInstance().core.favoritesApi, 'removeFavoriteSite');
-            addFavoriteSpy = spyOn(alfrescoApiService.getInstance().core.favoritesApi, 'addFavorite');
+            removeFavoriteSpy = spyOn(alfrescoApiService.getInstance().core.favoritesApi, 'removeFavoriteSite').and.callThrough();
+            addFavoriteSpy = spyOn(alfrescoApiService.getInstance().core.favoritesApi, 'addFavorite').and.callThrough();
         });
 
         afterEach(() => {
diff --git a/lib/core/directives/node-favorite.directive.ts b/lib/core/directives/node-favorite.directive.ts
index 6f527950a9..7e50d1f207 100644
--- a/lib/core/directives/node-favorite.directive.ts
+++ b/lib/core/directives/node-favorite.directive.ts
@@ -19,10 +19,9 @@
 
 import { Directive, EventEmitter, HostListener, Input, OnChanges, Output } from '@angular/core';
 import { FavoriteBody, MinimalNodeEntity } from 'alfresco-js-api';
-import { Observable } from 'rxjs/Observable';
+import { Observable, from, forkJoin, of } from 'rxjs';
 import { AlfrescoApiService } from '../services/alfresco-api.service';
-import 'rxjs/add/observable/fromPromise';
-import 'rxjs/observable/forkJoin';
+import { catchError, map } from 'rxjs/operators';
 
 @Directive({
     selector: '[adf-node-favorite]',
@@ -71,10 +70,10 @@ export class NodeFavoriteDirective implements OnChanges {
                 // shared files have nodeId
                 const id = selected.entry.nodeId || selected.entry.id;
 
-                return Observable.fromPromise(this.alfrescoApiService.favoritesApi.removeFavoriteSite('-me-', id));
+                return from(this.alfrescoApiService.favoritesApi.removeFavoriteSite('-me-', id));
             });
 
-            Observable.forkJoin(batch).subscribe(
+            forkJoin(batch).subscribe(
                 () => {
                     this.favorites.map(selected => selected.entry.isFavorite = false);
                     this.toggle.emit();
@@ -87,7 +86,7 @@ export class NodeFavoriteDirective implements OnChanges {
             const notFavorite = this.favorites.filter((node) => !node.entry.isFavorite);
             const body: FavoriteBody[] = notFavorite.map((node) => this.createFavoriteBody(node));
 
-            Observable.fromPromise(this.alfrescoApiService.favoritesApi.addFavorite('-me-', <any> body))
+            from(this.alfrescoApiService.favoritesApi.addFavorite('-me-', <any> body))
                 .subscribe(
                     () => {
                         notFavorite.map(selected => selected.entry.isFavorite = true);
@@ -107,7 +106,7 @@ export class NodeFavoriteDirective implements OnChanges {
         const result = this.diff(selection, this.favorites);
         const batch = this.getProcessBatch(result);
 
-        Observable.forkJoin(batch).subscribe((data) => {
+        forkJoin(batch).subscribe(data => {
             this.favorites.push(...data);
         });
     }
@@ -129,7 +128,7 @@ export class NodeFavoriteDirective implements OnChanges {
 
         // ACS 6.x with 'isFavorite' include
         if (node && node.hasOwnProperty('isFavorite')) {
-            return Observable.of(selected);
+            return of(selected);
         }
 
         // ACS 5.x and 6.x without 'isFavorite' include
@@ -139,8 +138,8 @@ export class NodeFavoriteDirective implements OnChanges {
 
         const promise = this.alfrescoApiService.favoritesApi.getFavorite('-me-', id);
 
-        return Observable.from(promise)
-            .map(() => ({
+        return from(promise).pipe(
+            map(() => ({
                 entry: {
                     id,
                     isFolder,
@@ -148,9 +147,9 @@ export class NodeFavoriteDirective implements OnChanges {
                     name,
                     isFavorite: true
                 }
-            }))
-            .catch(() => {
-                return Observable.of({
+            })),
+            catchError(() => {
+                return of({
                     entry: {
                         id,
                         isFolder,
@@ -159,7 +158,8 @@ export class NodeFavoriteDirective implements OnChanges {
                         isFavorite: false
                     }
                 });
-            });
+            })
+        );
     }
 
     private createFavoriteBody(node): FavoriteBody {
diff --git a/lib/core/directives/node-restore.directive.ts b/lib/core/directives/node-restore.directive.ts
index d5260137d4..aa71196499 100644
--- a/lib/core/directives/node-restore.directive.ts
+++ b/lib/core/directives/node-restore.directive.ts
@@ -19,12 +19,10 @@
 
 import { Directive, EventEmitter, HostListener, Input, Output } from '@angular/core';
 import { DeletedNodeEntry, DeletedNodesPaging, PathInfoEntity } from 'alfresco-js-api';
-import { Observable } from 'rxjs/Observable';
+import { Observable, forkJoin, from, of } from 'rxjs';
 import { AlfrescoApiService } from '../services/alfresco-api.service';
 import { TranslationService } from '../services/translation.service';
-import 'rxjs/add/observable/from';
-import 'rxjs/add/observable/zip';
-import 'rxjs/add/operator/mergeMap';
+import { tap, mergeMap, map, catchError } from 'rxjs/operators';
 
 export class RestoreMessageModel {
     message: string;
@@ -69,28 +67,27 @@ export class NodeRestoreDirective {
 
         if (selection.length && nodesWithPath.length) {
 
-            this.restoreNodesBatch(nodesWithPath)
-                .do((restoredNodes) => {
+            this.restoreNodesBatch(nodesWithPath).pipe(
+                tap(restoredNodes => {
                     const status = this.processStatus(restoredNodes);
 
                     this.restoreProcessStatus.fail.push(...status.fail);
                     this.restoreProcessStatus.success.push(...status.success);
-                })
-                .mergeMap(() => this.getDeletedNodes())
-                .subscribe(
-                    (deletedNodesList: any) => {
-                        const { entries: nodelist } = deletedNodesList.list;
-                        const { fail: restoreErrorNodes } = this.restoreProcessStatus;
-                        const selectedNodes = this.diff(restoreErrorNodes, selection, false);
-                        const remainingNodes = this.diff(selectedNodes, nodelist);
+                }),
+                mergeMap(() => this.getDeletedNodes())
+            )
+            .subscribe(deletedNodesList => {
+                const { entries: nodelist } = deletedNodesList.list;
+                const { fail: restoreErrorNodes } = this.restoreProcessStatus;
+                const selectedNodes = this.diff(restoreErrorNodes, selection, false);
+                const remainingNodes = this.diff(selectedNodes, nodelist);
 
-                        if (!remainingNodes.length) {
-                            this.notification();
-                        } else {
-                            this.recover(remainingNodes);
-                        }
-                    }
-                );
+                if (!remainingNodes.length) {
+                    this.notification();
+                } else {
+                    this.recover(remainingNodes);
+                }
+            });
         } else {
             this.restoreProcessStatus.fail.push(...selection);
             this.notification();
@@ -99,7 +96,7 @@ export class NodeRestoreDirective {
     }
 
     private restoreNodesBatch(batch: DeletedNodeEntry[]): Observable<DeletedNodeEntry[]> {
-        return Observable.forkJoin(batch.map((node) => this.restoreNode(node)));
+        return forkJoin(batch.map((node) => this.restoreNode(node)));
     }
 
     private getNodesWithPath(selection): DeletedNodeEntry[] {
@@ -110,7 +107,7 @@ export class NodeRestoreDirective {
         const promise = this.alfrescoApiService.getInstance()
             .core.nodesApi.getDeletedNodes({ include: ['path'] });
 
-        return Observable.from(promise);
+        return from(promise);
     }
 
     private restoreNode(node): Observable<any> {
@@ -118,20 +115,21 @@ export class NodeRestoreDirective {
 
         const promise = this.alfrescoApiService.getInstance().nodes.restoreNode(entry.id);
 
-        return Observable.from(promise)
-            .map(() => ({
+        return from(promise).pipe(
+            map(() => ({
                 status: 1,
                 entry
-            }))
-            .catch((error) => {
+            })),
+            catchError((error) => {
                 const { statusCode } = (JSON.parse(error.message)).error;
 
-                return Observable.of({
+                return of({
                     status: 0,
                     statusCode,
                     entry
                 });
-            });
+            })
+        );
     }
 
     private diff(selection, list, fromList = true): any {
diff --git a/lib/core/directives/upload.directive.ts b/lib/core/directives/upload.directive.ts
index 7988b5dc7f..38a178856f 100644
--- a/lib/core/directives/upload.directive.ts
+++ b/lib/core/directives/upload.directive.ts
@@ -17,7 +17,7 @@
 
 /* tslint:disable:no-input-rename  */
 
-import { Directive, ElementRef, HostListener, Input, NgZone, OnDestroy, OnInit, Renderer } from '@angular/core';
+import { Directive, ElementRef, HostListener, Input, NgZone, OnDestroy, OnInit, Renderer2 } from '@angular/core';
 import { FileInfo, FileUtils } from '../utils/file-utils';
 
 @Directive({
@@ -57,13 +57,15 @@ export class UploadDirective implements OnInit, OnDestroy {
     private upload: HTMLInputElement;
     private element: HTMLElement;
 
-    constructor(private el: ElementRef, private renderer: Renderer, private ngZone: NgZone) {
+    constructor(private el: ElementRef, private renderer: Renderer2, private ngZone: NgZone) {
         this.element = el.nativeElement;
     }
 
     ngOnInit() {
         if (this.isClickMode() && this.renderer) {
-            this.upload = this.renderer.createElement(this.el.nativeElement.parentNode, 'input') as HTMLInputElement;
+            let inputUpload = this.renderer.createElement('input');
+            this.upload = this.el.nativeElement.parentElement.appendChild(inputUpload);
+
             this.upload.type = 'file';
             this.upload.style.display = 'none';
             this.upload.addEventListener('change', e => this.onSelectFiles(e));
diff --git a/lib/core/form/components/form-list.component.spec.ts b/lib/core/form/components/form-list.component.spec.ts
index ed1c697490..59c18ed99b 100644
--- a/lib/core/form/components/form-list.component.spec.ts
+++ b/lib/core/form/components/form-list.component.spec.ts
@@ -17,7 +17,7 @@
 
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { TranslationService, TranslationMock } from '../../index';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 import { FormService } from '../services/form.service';
 import { FormListComponent } from './form-list.component';
 import { setupTestBed } from '../../testing/setupTestBed';
@@ -51,7 +51,7 @@ describe('TaskAttachmentList', () => {
     }));
 
     it('should show the forms as a list', async(() => {
-        spyOn(service, 'getForms').and.returnValue(Observable.of([
+        spyOn(service, 'getForms').and.returnValue(of([
             { name: 'FakeName-1', lastUpdatedByFullName: 'FakeUser-1', lastUpdated: '2017-01-02' },
             { name: 'FakeName-2', lastUpdatedByFullName: 'FakeUser-2', lastUpdated: '2017-01-03' }
         ]));
@@ -62,6 +62,6 @@ describe('TaskAttachmentList', () => {
         fixture.whenStable().then(() => {
             expect(element.querySelectorAll('.adf-datatable-body > .adf-datatable-row').length).toBe(2);
         });
-    });
+    }));
 
 });
diff --git a/lib/core/form/components/form.component.html b/lib/core/form/components/form.component.html
index 750eabc070..7ec125474b 100644
--- a/lib/core/form/components/form.component.html
+++ b/lib/core/form/components/form.component.html
@@ -2,11 +2,12 @@
     <ng-content select="[empty-form]">
     </ng-content>
 </div>
+
 <div *ngIf="hasForm()" class="{{form.className}} adf-form-container">
     <mat-card>
         <mat-card-header>
             <mat-card-title>
-                <h4 *ngIf="isTitleEnabled()">
+                <h4>
                     <div *ngIf="showValidationIcon" class="adf-form-validation-button">
                         <i id="adf-valid-form-icon" class="material-icons" *ngIf="form.isValid; else no_valid_form">check_circle</i>
                         <ng-template #no_valid_form>
@@ -18,14 +19,14 @@
                             <mat-icon>refresh</mat-icon>
                         </button>
                     </div>
-                    <span class="adf-form-title">{{form.taskName}}</span>
+                    <span  *ngIf="isTitleEnabled()" class="adf-form-title">{{form.taskName}}</span>
 
                 </h4>
             </mat-card-title>
         </mat-card-header>
         <mat-card-content>
             <div *ngIf="form.hasTabs()">
-                <tabs-widget [tabs]="form.tabs" (formTabChanged)="onFieldChanged($event);"></tabs-widget>
+                <tabs-widget [tabs]="form.tabs"></tabs-widget>
             </div>
 
             <div *ngIf="!form.hasTabs() && form.hasFields()">
@@ -41,7 +42,7 @@
                     mat-button
                     [disabled]="!isOutcomeButtonEnabled(outcome)"
                     [class.adf-form-hide-button]="!isOutcomeButtonVisible(outcome, form.readOnly)"
-                    (click)="onOutcomeClicked(outcome, $event)">
+                    (click)="onOutcomeClicked(outcome)">
                 {{outcome.name | uppercase}}
             </button>
         </mat-card-actions>
diff --git a/lib/core/form/components/form.component.scss b/lib/core/form/components/form.component.scss
index 527eb14911..00c36457bd 100644
--- a/lib/core/form/components/form.component.scss
+++ b/lib/core/form/components/form.component.scss
@@ -35,7 +35,7 @@
                 height: 4px;
             }
 
-            & .mat-input-wrapper {
+            & .mat-form-field-wrapper {
                 margin: 0px 12px 0px 0px;
             }
         }
diff --git a/lib/core/form/components/form.component.spec.ts b/lib/core/form/components/form.component.spec.ts
index 8c07f8b966..325304cb64 100644
--- a/lib/core/form/components/form.component.spec.ts
+++ b/lib/core/form/components/form.component.spec.ts
@@ -17,7 +17,7 @@
 
 import { SimpleChange } from '@angular/core';
 import { LogService } from '../../services/log.service';
-import { Observable } from 'rxjs/Observable';
+import { Observable, of, throwError } from 'rxjs';
 import { fakeForm } from '../../mock';
 import { FormService } from './../services/form.service';
 import { NodeService } from './../services/node.service';
@@ -177,7 +177,7 @@ describe('FormComponent', () => {
             });
         });
 
-        spyOn(visibilityService, 'getTaskProcessVariable').and.returnValue(Observable.of({}));
+        spyOn(visibilityService, 'getTaskProcessVariable').and.returnValue(of({}));
         spyOn(formService, 'getTask').and.callFake((currentTaskId) => {
             return Observable.create(observer => {
                 observer.next({ taskId: currentTaskId, processDefinitionId: '10201' });
@@ -200,7 +200,7 @@ describe('FormComponent', () => {
             });
         });
 
-        spyOn(visibilityService, 'getTaskProcessVariable').and.returnValue(Observable.of({}));
+        spyOn(visibilityService, 'getTaskProcessVariable').and.returnValue(of({}));
         spyOn(formService, 'getTask').and.callFake((currentTaskId) => {
             return Observable.create(observer => {
                 observer.next({ taskId: currentTaskId, processDefinitionId: 'null' });
@@ -226,7 +226,7 @@ describe('FormComponent', () => {
     });
 
     it('should refresh visibility when the form is loaded', () => {
-        spyOn(formService, 'getFormDefinitionById').and.returnValue(Observable.of(JSON.parse(JSON.stringify(fakeForm))));
+        spyOn(formService, 'getFormDefinitionById').and.returnValue(of(JSON.parse(JSON.stringify(fakeForm))));
         const formId = '123';
 
         formComponent.formId = formId;
@@ -418,7 +418,7 @@ describe('FormComponent', () => {
     });
 
     it('should fetch and parse form by task id', (done) => {
-        spyOn(formService, 'getTask').and.returnValue(Observable.of({}));
+        spyOn(formService, 'getTask').and.returnValue(of({}));
         spyOn(formService, 'getTaskForm').and.callFake((currentTaskId) => {
             return Observable.create(observer => {
                 observer.next({ taskId: currentTaskId });
@@ -441,10 +441,10 @@ describe('FormComponent', () => {
     it('should handle error when getting form by task id', (done) => {
         const error = 'Some error';
 
-        spyOn(formService, 'getTask').and.returnValue(Observable.of({}));
+        spyOn(formService, 'getTask').and.returnValue(of({}));
         spyOn(formComponent, 'handleError').and.stub();
         spyOn(formService, 'getTaskForm').and.callFake((taskId) => {
-            return Observable.throw(error);
+            return throwError(error);
         });
 
         formComponent.getFormByTaskId('123').then(_ => {
@@ -454,7 +454,7 @@ describe('FormComponent', () => {
     });
 
     it('should apply readonly state when getting form by task id', (done) => {
-        spyOn(formService, 'getTask').and.returnValue(Observable.of({}));
+        spyOn(formService, 'getTask').and.returnValue(of({}));
         spyOn(formService, 'getTaskForm').and.callFake((taskId) => {
             return Observable.create(observer => {
                 observer.next({ taskId: taskId });
@@ -495,7 +495,7 @@ describe('FormComponent', () => {
         const error = 'Some error';
 
         spyOn(formComponent, 'handleError').and.stub();
-        spyOn(formService, 'getFormDefinitionById').and.callFake(() => Observable.throw(error));
+        spyOn(formService, 'getFormDefinitionById').and.callFake(() => throwError(error));
 
         formComponent.getFormDefinitionByFormId('123');
         expect(formService.getFormDefinitionById).toHaveBeenCalledWith('123');
@@ -562,7 +562,7 @@ describe('FormComponent', () => {
 
     it('should handle error during form save', () => {
         const error = 'Error';
-        spyOn(formService, 'saveTaskForm').and.callFake(() => Observable.throw(error));
+        spyOn(formService, 'saveTaskForm').and.callFake(() => throwError(error));
         spyOn(formComponent, 'handleError').and.stub();
 
         formComponent.form = new FormModel({ taskId: '123' });
diff --git a/lib/core/form/components/form.component.ts b/lib/core/form/components/form.component.ts
index 7af0e1374e..d1e9864dbb 100644
--- a/lib/core/form/components/form.component.ts
+++ b/lib/core/form/components/form.component.ts
@@ -23,8 +23,9 @@ import { FormService } from './../services/form.service';
 import { NodeService } from './../services/node.service';
 import { ContentLinkModel } from './widgets/core/content-link.model';
 import { FormFieldModel, FormModel, FormOutcomeEvent, FormOutcomeModel, FormValues, FormFieldValidator } from './widgets/core/index';
-import { Observable } from 'rxjs/Observable';
+import { Observable, of } from 'rxjs';
 import { WidgetVisibilityService } from './../services/widget-visibility.service';
+import { switchMap } from 'rxjs/operators';
 
 @Component({
     selector: 'adf-form',
@@ -320,14 +321,15 @@ export class FormComponent implements OnInit, OnChanges {
     }
 
     findProcessVariablesByTaskId(taskId: string): Observable<any> {
-        return this.formService.getTask(taskId).
-        switchMap((task: any) => {
-            if (this.isAProcessTask(task)) {
-                return this.visibilityService.getTaskProcessVariable(taskId);
-            } else {
-                return Observable.of({});
-            }
-        });
+        return this.formService.getTask(taskId).pipe(
+            switchMap((task: any) => {
+                if (this.isAProcessTask(task)) {
+                    return this.visibilityService.getTaskProcessVariable(taskId);
+                } else {
+                    return of({});
+                }
+            })
+        );
     }
 
     isAProcessTask(taskRepresentation) {
diff --git a/lib/core/form/components/form.component.visibility.spec.ts b/lib/core/form/components/form.component.visibility.spec.ts
index 689105bcc3..9214f1c5a8 100644
--- a/lib/core/form/components/form.component.visibility.spec.ts
+++ b/lib/core/form/components/form.component.visibility.spec.ts
@@ -17,7 +17,7 @@
 
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { SimpleChange } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 
 import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
@@ -75,8 +75,8 @@ describe('FormComponent UI and visibility', () => {
     describe('Validation icon', () => {
 
         it('should display valid icon for valid form', () => {
-            spyOn(service, 'getTask').and.returnValue(Observable.of({}));
-            spyOn(service, 'getTaskForm').and.returnValue(Observable.of(formDefinitionTwoTextFields));
+            spyOn(service, 'getTask').and.returnValue(of({}));
+            spyOn(service, 'getTaskForm').and.returnValue(of(formDefinitionTwoTextFields));
 
             let change = new SimpleChange(null, 1, true);
             component.ngOnChanges({ 'taskId': change });
@@ -87,8 +87,8 @@ describe('FormComponent UI and visibility', () => {
         });
 
         it('should display invalid icon for valid form', () => {
-            spyOn(service, 'getTask').and.returnValue(Observable.of({}));
-            spyOn(service, 'getTaskForm').and.returnValue(Observable.of(formDefinitionRequiredField));
+            spyOn(service, 'getTask').and.returnValue(of({}));
+            spyOn(service, 'getTaskForm').and.returnValue(of(formDefinitionRequiredField));
 
             let change = new SimpleChange(null, 1, true);
             component.ngOnChanges({ 'taskId': change });
@@ -99,8 +99,8 @@ describe('FormComponent UI and visibility', () => {
         });
 
         it('should NOT display validation icon when [showValidationIcon] is false', () => {
-            spyOn(service, 'getTask').and.returnValue(Observable.of({}));
-            spyOn(service, 'getTaskForm').and.returnValue(Observable.of(formDefinitionTwoTextFields));
+            spyOn(service, 'getTask').and.returnValue(of({}));
+            spyOn(service, 'getTaskForm').and.returnValue(of(formDefinitionTwoTextFields));
 
             let change = new SimpleChange(null, 1, true);
             component.ngOnChanges({ 'taskId': change });
@@ -114,8 +114,8 @@ describe('FormComponent UI and visibility', () => {
     describe('form definition', () => {
 
         it('should display two text fields form definition', () => {
-            spyOn(service, 'getTask').and.returnValue(Observable.of({}));
-            spyOn(service, 'getTaskForm').and.returnValue(Observable.of(formDefinitionTwoTextFields));
+            spyOn(service, 'getTask').and.returnValue(of({}));
+            spyOn(service, 'getTaskForm').and.returnValue(of(formDefinitionTwoTextFields));
 
             let change = new SimpleChange(null, 1, true);
             component.ngOnChanges({ 'taskId': change });
@@ -131,8 +131,8 @@ describe('FormComponent UI and visibility', () => {
         });
 
         it('should display dropdown field', fakeAsync(() => {
-            spyOn(service, 'getTask').and.returnValue(Observable.of({}));
-            spyOn(service, 'getTaskForm').and.returnValue(Observable.of(formDefinitionDropdownField));
+            spyOn(service, 'getTask').and.returnValue(of({}));
+            spyOn(service, 'getTaskForm').and.returnValue(of(formDefinitionDropdownField));
 
             let change = new SimpleChange(null, 1, true);
             component.ngOnChanges({ 'taskId': change });
@@ -162,8 +162,8 @@ describe('FormComponent UI and visibility', () => {
         describe('Visibility conditions', () => {
 
             it('should hide the field based on the next one', () => {
-                spyOn(service, 'getTask').and.returnValue(Observable.of({}));
-                spyOn(service, 'getTaskForm').and.returnValue(Observable.of(formDefVisibilitiFieldDependsOnNextOne));
+                spyOn(service, 'getTask').and.returnValue(of({}));
+                spyOn(service, 'getTaskForm').and.returnValue(of(formDefVisibilitiFieldDependsOnNextOne));
 
                 let change = new SimpleChange(null, 1, true);
                 component.ngOnChanges({ 'taskId': change });
@@ -179,8 +179,8 @@ describe('FormComponent UI and visibility', () => {
             });
 
             it('should hide the field based on the previous one', () => {
-                spyOn(service, 'getTask').and.returnValue(Observable.of({}));
-                spyOn(service, 'getTaskForm').and.returnValue(Observable.of(formDefVisibilitiFieldDependsOnPreviousOne));
+                spyOn(service, 'getTask').and.returnValue(of({}));
+                spyOn(service, 'getTaskForm').and.returnValue(of(formDefVisibilitiFieldDependsOnPreviousOne));
 
                 let change = new SimpleChange(null, 1, true);
                 component.ngOnChanges({ 'taskId': change });
@@ -196,8 +196,8 @@ describe('FormComponent UI and visibility', () => {
             });
 
             it('should show the hidden field when the visibility condition change to true', () => {
-                spyOn(service, 'getTask').and.returnValue(Observable.of({}));
-                spyOn(service, 'getTaskForm').and.returnValue(Observable.of(formDefVisibilitiFieldDependsOnNextOne));
+                spyOn(service, 'getTask').and.returnValue(of({}));
+                spyOn(service, 'getTaskForm').and.returnValue(of(formDefVisibilitiFieldDependsOnNextOne));
 
                 let change = new SimpleChange(null, 1, true);
                 component.ngOnChanges({ 'taskId': change });
@@ -221,8 +221,8 @@ describe('FormComponent UI and visibility', () => {
 
         describe('Readonly Form', () => {
             it('should display two text fields readonly', () => {
-                spyOn(service, 'getTask').and.returnValue(Observable.of({}));
-                spyOn(service, 'getTaskForm').and.returnValue(Observable.of(formReadonlyTwoTextFields));
+                spyOn(service, 'getTask').and.returnValue(of({}));
+                spyOn(service, 'getTaskForm').and.returnValue(of(formReadonlyTwoTextFields));
 
                 let change = new SimpleChange(null, 1, true);
                 component.ngOnChanges({ 'taskId': change });
diff --git a/lib/core/form/components/start-form.component.html b/lib/core/form/components/start-form.component.html
index e621499dd9..87e6fbdf4b 100644
--- a/lib/core/form/components/start-form.component.html
+++ b/lib/core/form/components/start-form.component.html
@@ -24,7 +24,7 @@
                     [disabled]="!isOutcomeButtonEnabled(outcome)"
                     [class.mdl-button--colored]="!outcome.isSystem"
                     [class.adf-form-hide-button]="!isOutcomeButtonVisible(outcome, form.readOnly)"
-                    (click)="onOutcomeClicked(outcome, $event)">
+                    (click)="onOutcomeClicked(outcome)">
                 {{outcome.name}}
             </button>
         </mat-card-content>
diff --git a/lib/core/form/components/start-form.component.spec.ts b/lib/core/form/components/start-form.component.spec.ts
index 7bf75ff22e..87fa2523af 100644
--- a/lib/core/form/components/start-form.component.spec.ts
+++ b/lib/core/form/components/start-form.component.spec.ts
@@ -17,7 +17,7 @@
 
 import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { Observable } from 'rxjs/Observable';
+import { of, throwError } from 'rxjs';
 import { startFormDateWidgetMock, startFormDropdownDefinitionMock, startFormTextDefinitionMock, startMockForm, startMockFormWithTab } from '../../mock';
 import { startFormAmountWidgetMock, startFormNumberWidgetMock, startFormRadioButtonWidgetMock } from '../../mock';
 import { FormService } from './../services/form.service';
@@ -53,7 +53,7 @@ describe('StartFormComponent', () => {
         formService = TestBed.get(FormService);
         visibilityService = TestBed.get(WidgetVisibilityService);
 
-        getStartFormSpy = spyOn(formService, 'getStartFormDefinition').and.returnValue(Observable.of({
+        getStartFormSpy = spyOn(formService, 'getStartFormDefinition').and.returnValue(of({
             processDefinitionName: 'my:process'
         }));
     });
@@ -89,13 +89,13 @@ describe('StartFormComponent', () => {
     });
 
     it('should consume errors encountered when loading start form', () => {
-        getStartFormSpy.and.returnValue(Observable.throw({}));
+        getStartFormSpy.and.returnValue(throwError({}));
         component.processDefinitionId = exampleId1;
         component.ngOnInit();
     });
 
     it('should show outcome buttons by default', () => {
-        getStartFormSpy.and.returnValue(Observable.of({
+        getStartFormSpy.and.returnValue(of({
             id: '1',
             processDefinitionName: 'my:process',
             outcomes: [{
@@ -111,7 +111,7 @@ describe('StartFormComponent', () => {
     });
 
     it('should show outcome buttons if showOutcomeButtons is true', () => {
-        getStartFormSpy.and.returnValue(Observable.of({
+        getStartFormSpy.and.returnValue(of({
             id: '1',
             processDefinitionName: 'my:process',
             outcomes: [{
@@ -127,7 +127,7 @@ describe('StartFormComponent', () => {
     });
 
     it('should fetch start form detasils by processDefinitionId ', () => {
-        getStartFormSpy.and.returnValue(Observable.of(startMockForm));
+        getStartFormSpy.and.returnValue(of(startMockForm));
         component.processDefinitionId = exampleId1;
         component.showOutcomeButtons = true;
         component.ngOnChanges({ processDefinitionId: new SimpleChange(exampleId1, exampleId2, true) });
@@ -139,7 +139,7 @@ describe('StartFormComponent', () => {
     describe('Disply widgets', () => {
 
         it('should be able to display a textWidget from a process definition', () => {
-            getStartFormSpy.and.returnValue(Observable.of(startFormTextDefinitionMock));
+            getStartFormSpy.and.returnValue(of(startFormTextDefinitionMock));
             component.processDefinitionId = exampleId1;
             component.showOutcomeButtons = true;
             component.ngOnChanges({ processDefinitionId: new SimpleChange(exampleId1, exampleId2, true) });
@@ -157,7 +157,7 @@ describe('StartFormComponent', () => {
         });
 
         it('should be able to display a radioButtonWidget from a process definition', () => {
-            getStartFormSpy.and.returnValue(Observable.of(startFormRadioButtonWidgetMock));
+            getStartFormSpy.and.returnValue(of(startFormRadioButtonWidgetMock));
             component.processDefinitionId = exampleId1;
             component.showOutcomeButtons = true;
             component.ngOnChanges({ processDefinitionId: new SimpleChange(exampleId1, exampleId2, true) });
@@ -175,7 +175,7 @@ describe('StartFormComponent', () => {
         });
 
         it('should be able to display a amountWidget from a process definition', () => {
-            getStartFormSpy.and.returnValue(Observable.of(startFormAmountWidgetMock));
+            getStartFormSpy.and.returnValue(of(startFormAmountWidgetMock));
             component.processDefinitionId = exampleId1;
             component.showOutcomeButtons = true;
             component.ngOnChanges({ processDefinitionId: new SimpleChange(exampleId1, exampleId2, true) });
@@ -193,7 +193,7 @@ describe('StartFormComponent', () => {
         });
 
         it('should be able to display a numberWidget from a process definition', () => {
-            getStartFormSpy.and.returnValue(Observable.of(startFormNumberWidgetMock));
+            getStartFormSpy.and.returnValue(of(startFormNumberWidgetMock));
             component.processDefinitionId = exampleId1;
             component.showOutcomeButtons = true;
             component.ngOnChanges({ processDefinitionId: new SimpleChange(exampleId1, exampleId2, true) });
@@ -209,7 +209,7 @@ describe('StartFormComponent', () => {
         });
 
         it('should be able to display a dropDown Widget from a process definition', () => {
-            getStartFormSpy.and.returnValue(Observable.of(startFormDropdownDefinitionMock));
+            getStartFormSpy.and.returnValue(of(startFormDropdownDefinitionMock));
             component.processDefinitionId = exampleId1;
             component.showOutcomeButtons = true;
             component.ngOnChanges({ processDefinitionId: new SimpleChange(exampleId1, exampleId2, true) });
@@ -232,7 +232,7 @@ describe('StartFormComponent', () => {
         });
 
         it('should be able to display a date Widget from a process definition', () => {
-            getStartFormSpy.and.returnValue(Observable.of(startFormDateWidgetMock));
+            getStartFormSpy.and.returnValue(of(startFormDateWidgetMock));
             component.processDefinitionId = exampleId1;
             component.showOutcomeButtons = true;
             component.ngOnChanges({ processDefinitionId: new SimpleChange(exampleId1, exampleId2, true) });
@@ -242,7 +242,7 @@ describe('StartFormComponent', () => {
                 const formFields = component.form.getFormFields();
                 const labelField = formFields.find(field => field.id === 'date');
                 const dateWidget = fixture.debugElement.nativeElement.querySelector('dropdown-widget');
-                const dateLabelElement = fixture.debugElement.nativeElement.querySelector('#data-widget .mat-input-infix> .adf-label');
+                const dateLabelElement = fixture.debugElement.nativeElement.querySelector('#data-widget .mat-form-field-infix> .adf-label');
                 expect(dateWidget).toBeDefined();
                 expect(labelField.type).toBe('date');
                 expect(dateLabelElement.innerText).toBe('date (D-M-YYYY)');
@@ -250,7 +250,7 @@ describe('StartFormComponent', () => {
         });
 
         it('should fetch and define form fields with proper type', () => {
-            getStartFormSpy.and.returnValue(Observable.of(startMockForm));
+            getStartFormSpy.and.returnValue(of(startMockForm));
             component.processDefinitionId = exampleId1;
             component.showOutcomeButtons = true;
             component.ngOnChanges({ processDefinitionId: new SimpleChange(exampleId1, exampleId2, true) });
@@ -265,7 +265,7 @@ describe('StartFormComponent', () => {
         });
 
         it('should show dropdown options', () => {
-            getStartFormSpy.and.returnValue(Observable.of(startMockForm));
+            getStartFormSpy.and.returnValue(of(startMockForm));
             component.processDefinitionId = exampleId1;
             component.showOutcomeButtons = true;
             component.ngOnChanges({ processDefinitionId: new SimpleChange(exampleId1, exampleId2, true) });
@@ -281,7 +281,7 @@ describe('StartFormComponent', () => {
         });
 
         it('should disply start form with fields ', async(() => {
-            getStartFormSpy.and.returnValue(Observable.of(startMockForm));
+            getStartFormSpy.and.returnValue(of(startMockForm));
             component.processDefinitionId = exampleId1;
             component.showOutcomeButtons = true;
             component.ngOnChanges({ processDefinitionId: new SimpleChange(exampleId1, exampleId2, true) });
@@ -289,9 +289,9 @@ describe('StartFormComponent', () => {
                 fixture.detectChanges();
                 const formFieldsWidget = fixture.debugElement.nativeElement.querySelector('form-field');
                 const inputElement = fixture.debugElement.nativeElement.querySelector('.adf-input');
-                const inputLabelElement = fixture.debugElement.nativeElement.querySelector('.mat-input-infix > .adf-label');
+                const inputLabelElement = fixture.debugElement.nativeElement.querySelector('.mat-form-field-infix > .adf-label');
                 const dateElement = fixture.debugElement.nativeElement.querySelector('#billdate');
-                const dateLabelElement = fixture.debugElement.nativeElement.querySelector('#data-widget .mat-input-infix> .adf-label');
+                const dateLabelElement = fixture.debugElement.nativeElement.querySelector('#data-widget .mat-form-field-infix> .adf-label');
                 const selectElement = fixture.debugElement.nativeElement.querySelector('#claimtype');
                 const selectLabelElement = fixture.debugElement.nativeElement.querySelector('.adf-dropdown-widget > .adf-label');
                 expect(formFieldsWidget).toBeDefined();
@@ -305,7 +305,7 @@ describe('StartFormComponent', () => {
         }));
 
         it('should refresh start form on click of refresh button  ', async(() => {
-            getStartFormSpy.and.returnValue(Observable.of(startMockForm));
+            getStartFormSpy.and.returnValue(of(startMockForm));
             component.processDefinitionId = exampleId1;
             component.showOutcomeButtons = true;
             component.showRefreshButton = true;
@@ -324,7 +324,7 @@ describe('StartFormComponent', () => {
         }));
 
         it('should difine custom-tabs ', async(() => {
-            getStartFormSpy.and.returnValue(Observable.of(startMockFormWithTab));
+            getStartFormSpy.and.returnValue(of(startMockFormWithTab));
             component.processDefinitionId = exampleId1;
             component.showOutcomeButtons = true;
             component.showRefreshButton = true;
@@ -342,7 +342,7 @@ describe('StartFormComponent', () => {
         }));
 
         it('should difine title and [custom-action-buttons]', async(() => {
-            getStartFormSpy.and.returnValue(Observable.of(startMockFormWithTab));
+            getStartFormSpy.and.returnValue(of(startMockFormWithTab));
             component.processDefinitionId = exampleId1;
             component.showOutcomeButtons = true;
             component.showRefreshButton = true;
diff --git a/lib/core/form/components/start-form.component.ts b/lib/core/form/components/start-form.component.ts
index c698cc228b..5fa62f021f 100644
--- a/lib/core/form/components/start-form.component.ts
+++ b/lib/core/form/components/start-form.component.ts
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import { LogService } from '../../services/log.service';
-import { Component, ElementRef, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild, ViewEncapsulation } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild, ViewEncapsulation, OnDestroy } from '@angular/core';
 import { FormService } from './../services/form.service';
 import { WidgetVisibilityService } from './../services/widget-visibility.service';
 import { FormComponent } from './form.component';
 import { ContentLinkModel } from './widgets/core/content-link.model';
 import { FormOutcomeModel } from './widgets/core/index';
+import { Subscription } from 'rxjs';
 
 /**
  * Displays the start form for a named process definition, which can be used to retrieve values to start a new process.
@@ -45,7 +45,9 @@ import { FormOutcomeModel } from './widgets/core/index';
     styleUrls: ['./form.component.scss'],
     encapsulation: ViewEncapsulation.None
 })
-export class StartFormComponent extends FormComponent implements OnChanges, OnInit {
+export class StartFormComponent extends FormComponent implements OnChanges, OnInit, OnDestroy {
+
+    private subscriptions: Subscription[] = [];
 
     /** Definition ID of the process to start. */
     @Input()
@@ -79,16 +81,22 @@ export class StartFormComponent extends FormComponent implements OnChanges, OnIn
     outcomesContainer: ElementRef = null;
 
     constructor(formService: FormService,
-                visibilityService: WidgetVisibilityService,
-                logService: LogService) {
+                visibilityService: WidgetVisibilityService) {
         super(formService, visibilityService, null, null);
         this.showTitle = false;
     }
 
     ngOnInit() {
-        this.formService.formContentClicked.subscribe((content: ContentLinkModel) => {
-            this.formContentClicked.emit(content);
-        });
+        this.subscriptions.push(
+            this.formService.formContentClicked.subscribe(content => {
+                this.formContentClicked.emit(content);
+            })
+        );
+    }
+
+    ngOnDestroy() {
+        this.subscriptions.forEach(subscription => subscription.unsubscribe());
+        this.subscriptions = [];
     }
 
     ngOnChanges(changes: SimpleChanges) {
@@ -109,22 +117,22 @@ export class StartFormComponent extends FormComponent implements OnChanges, OnIn
 
     loadStartForm(processId: string) {
         this.formService.getProcessIntance(processId)
-            .subscribe((intance: any) => {
+            .subscribe((instance: any) => {
                 this.formService
                     .getStartFormInstance(processId)
                     .subscribe(
-                    form => {
-                        this.formName = form.name;
-                        if (intance.variables) {
-                            form.processVariables = intance.variables;
-                        }
-                        this.form = this.parseForm(form);
-                        this.visibilityService.refreshVisibility(this.form);
-                        this.form.validateForm();
-                        this.form.readOnly = this.readOnlyForm;
-                        this.onFormLoaded(this.form);
-                    },
-                    error => this.handleError(error)
+                        form => {
+                            this.formName = form.name;
+                            if (instance.variables) {
+                                form.processVariables = instance.variables;
+                            }
+                            this.form = this.parseForm(form);
+                            this.visibilityService.refreshVisibility(this.form);
+                            this.form.validateForm();
+                            this.form.readOnly = this.readOnlyForm;
+                            this.onFormLoaded(this.form);
+                        },
+                        error => this.handleError(error)
                     );
             });
     }
diff --git a/lib/core/form/components/widgets/amount/amount.widget.html b/lib/core/form/components/widgets/amount/amount.widget.html
index e70e41eb77..1f51c6d0a9 100644
--- a/lib/core/form/components/widgets/amount/amount.widget.html
+++ b/lib/core/form/components/widgets/amount/amount.widget.html
@@ -1,5 +1,5 @@
 <div class="adf-amount-widget__container adf-amount-widget {{field.className}}" [class.adf-invalid]="!field.isValid" [class.adf-readonly]="field.readOnly">
-    <mat-form-field floatPlaceholder="never" class="adf-amount-widget__input">
+    <mat-form-field class="adf-amount-widget__input">
         <label class="adf-label" [attr.for]="field.id">{{field.name}}<span *ngIf="isRequired()">*</span></label>
         <span matPrefix class="adf-amount-widget__prefix-spacing"> {{currency }}</span>
         <input matInput
@@ -7,13 +7,12 @@
                 type="text"
                 [id]="field.id"
                 [required]="isRequired()"
+                [placeholder]="field.placeholder"
                 [value]="field.value"
                 [(ngModel)]="field.value"
                 (ngModelChange)="onFieldChanged(field)"
-                [disabled]="field.readOnly"
-                placeholder="{{field.placeholder}}">
+                [disabled]="field.readOnly">
     </mat-form-field>
     <error-widget [error]="field.validationSummary" ></error-widget>
     <error-widget *ngIf="isInvalidFieldRequired()" required="{{ 'FORM.FIELD.REQUIRED' | translate }}"></error-widget>
 </div>
-
diff --git a/lib/core/form/components/widgets/amount/amount.widget.scss b/lib/core/form/components/widgets/amount/amount.widget.scss
index efa92993e4..3ac51bc004 100644
--- a/lib/core/form/components/widgets/amount/amount.widget.scss
+++ b/lib/core/form/components/widgets/amount/amount.widget.scss
@@ -5,31 +5,34 @@
         width: 100%;
         vertical-align: baseline !important;
 
-        .mat-input-element {
-            margin-left: 11px;
-        }
-
-        .mat-input-prefix {
-            position: absolute;
-            margin-top: 58px;
-        }
-
         .mat-input-placeholder {
             margin-top: 5px;
             display: none;
         }
 
+        .mat-form-field-flex{
+            position: relative;
+            padding-top: 18.5px;
+        }
+
+        .mat-form-field-infix{
+            position: static;
+            padding-top: 19px;
+        }
+
+        .adf-label{
+            position: absolute;
+            top: 18.5px;
+            left:0;
+        }
+
     }
 
     &-amount-widget__container {
         max-width: 100%;
 
-        .mat-input-placeholder-wrapper {
-            top: -6px !important;
-        }
-
-        .mat-input-placeholder-wrapper {
-            top: 0 !important;
+        .mat-form-field-label-wrapper {
+            top: 34px !important;
             left: 13px;
         }
     }
diff --git a/lib/core/form/components/widgets/container/container.widget.scss b/lib/core/form/components/widgets/container/container.widget.scss
index 4a7cd091b1..58466f7096 100644
--- a/lib/core/form/components/widgets/container/container.widget.scss
+++ b/lib/core/form/components/widgets/container/container.widget.scss
@@ -8,32 +8,29 @@
         display: none;
     }
 
-    .adf {
-        &-field-list {
-            padding: 0;
-            list-style-type: none;
-            width: 100%;
-            height: 100%;
+    .container-widget__header-text {
+        border-bottom: 1px solid rgba(0, 0, 0, 0.87);
+        padding-bottom: 10px;
+        cursor: default;
+        user-select: none;
+        -webkit-user-select: none;
+        /* Chrome/Safari/Opera */
+        -moz-user-select: none;
+        /* Firefox */
+        -ms-user-select: none;
+        /* IE/Edge */
+        -webkit-touch-callout: none;
+        /* iOS Safari */
+        &.collapsible {
+            cursor: pointer;
         }
+    }
 
-        .container-widget__header-text {
-            border-bottom: 1px solid rgba(0, 0, 0, 0.87);
-            margin-left: 10px;
-            margin-right: 10px;
-            cursor: default;
-            user-select: none;
-            -webkit-user-select: none;
-            /* Chrome/Safari/Opera */
-            -moz-user-select: none;
-            /* Firefox */
-            -ms-user-select: none;
-            /* IE/Edge */
-            -webkit-touch-callout: none;
-            /* iOS Safari */
-            &.collapsible {
-                cursor: pointer;
-            }
-        }
+    .adf-field-list {
+        padding: 0;
+        list-style-type: none;
+        width: 100%;
+        height: 100%;
     }
 
     container-widget {
@@ -50,7 +47,7 @@
             padding-left: 1%;
             padding-right: 1%;
         }
-        
+
         @media screen and ($mat-small) {
             .grid-list-item {
                 flex: 1 0 100%;
@@ -65,8 +62,8 @@
             width: 100%;
         }
 
-        .mat-input-placeholder-wrapper {
-            top: 5px !important;
+        .mat-form-field-label-wrapper {
+            top: 22px !important;
         }
 
         .mat-input-placeholder {
@@ -82,7 +79,7 @@
                 color: mat-color($primary);
             }
 
-            .mat-input-prefix {
+            .mat-form-field-prefix {
                 color: mat-color($primary);
             }
         }
diff --git a/lib/core/form/components/widgets/content/content.widget.spec.ts b/lib/core/form/components/widgets/content/content.widget.spec.ts
index 005b9e58f5..3794815b63 100644
--- a/lib/core/form/components/widgets/content/content.widget.spec.ts
+++ b/lib/core/form/components/widgets/content/content.widget.spec.ts
@@ -19,7 +19,7 @@ import { SimpleChange } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { TranslationService, ContentService } from '../../../../services';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 
 import { ProcessContentService } from '../../../services/process-content.service';
 import { ContentLinkModel } from '../index';
@@ -105,7 +105,7 @@ describe('ContentWidgetComponent', () => {
 
         it('should load the thumbnail preview of the png image', (done) => {
             let blob = createFakeImageBlob();
-            spyOn(processContentService, 'getFileRawContent').and.returnValue(Observable.of(blob));
+            spyOn(processContentService, 'getFileRawContent').and.returnValue(of(blob));
 
             component.thumbnailLoaded.subscribe((res) => {
                 fixture.detectChanges();
@@ -148,7 +148,7 @@ describe('ContentWidgetComponent', () => {
 
         it('should load the thumbnail preview of a pdf', (done) => {
             let blob = createFakePdfBlob();
-            spyOn(processContentService, 'getContentThumbnail').and.returnValue(Observable.of(blob));
+            spyOn(processContentService, 'getContentThumbnail').and.returnValue(of(blob));
 
             component.thumbnailLoaded.subscribe((res) => {
                 fixture.detectChanges();
@@ -230,8 +230,8 @@ describe('ContentWidgetComponent', () => {
 
         it('should open the viewer when the view button is clicked', (done) => {
             let blob = createFakePdfBlob();
-            spyOn(processContentService, 'getContentPreview').and.returnValue(Observable.of(blob));
-            spyOn(processContentService, 'getFileRawContent').and.returnValue(Observable.of(blob));
+            spyOn(processContentService, 'getContentPreview').and.returnValue(of(blob));
+            spyOn(processContentService, 'getFileRawContent').and.returnValue(of(blob));
 
             component.content = new ContentLinkModel({
                 id: 4004,
@@ -264,7 +264,7 @@ describe('ContentWidgetComponent', () => {
 
         it('should download the pdf when the download button is clicked', () => {
             let blob = createFakePdfBlob();
-            spyOn(processContentService, 'getFileRawContent').and.returnValue(Observable.of(blob));
+            spyOn(processContentService, 'getFileRawContent').and.returnValue(of(blob));
             spyOn(serviceContent, 'downloadBlob').and.callThrough();
 
             component.content = new ContentLinkModel({
diff --git a/lib/core/form/components/widgets/content/content.widget.ts b/lib/core/form/components/widgets/content/content.widget.ts
index 03e5c1f5c8..04e0dac5ec 100644
--- a/lib/core/form/components/widgets/content/content.widget.ts
+++ b/lib/core/form/components/widgets/content/content.widget.ts
@@ -18,7 +18,7 @@
 import { ContentService } from '../../../../services/content.service';
 import { LogService } from '../../../../services/log.service';
 import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges, ViewEncapsulation } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { ProcessContentService } from '../../../services/process-content.service';
 import { ContentLinkModel } from '../core/content-link.model';
 import { FormService } from './../../../services/form.service';
diff --git a/lib/core/form/components/widgets/core/form-field.model.ts b/lib/core/form/components/widgets/core/form-field.model.ts
index 07cdf72030..3c33d30ca3 100644
--- a/lib/core/form/components/widgets/core/form-field.model.ts
+++ b/lib/core/form/components/widgets/core/form-field.model.ts
@@ -120,11 +120,13 @@ export class FormFieldModel extends FormWidgetModel {
     validate(): boolean {
         this.validationSummary = new ErrorMessageModel();
 
-        let validators = this.form.fieldValidators || [];
-        for (let validator of validators) {
-            if (!validator.validate(this)) {
-                this._isValid = false;
-                return this._isValid;
+        if (!this.readOnly) {
+            let validators = this.form.fieldValidators || [];
+            for (let validator of validators) {
+                if (!validator.validate(this)) {
+                    this._isValid = false;
+                    return this._isValid;
+                }
             }
         }
 
diff --git a/lib/core/form/components/widgets/date-time/date-time.widget.scss b/lib/core/form/components/widgets/date-time/date-time.widget.scss
index cc5b941b96..5ab1e17a15 100644
--- a/lib/core/form/components/widgets/date-time/date-time.widget.scss
+++ b/lib/core/form/components/widgets/date-time/date-time.widget.scss
@@ -4,7 +4,7 @@
 
     &-date-time-widget {
 
-        .mat-input-suffix {
+        .mat-form-field-suffix {
             text-align: right;
             position: absolute;
             margin-top: 30px;
diff --git a/lib/core/form/components/widgets/date/date.widget.scss b/lib/core/form/components/widgets/date/date.widget.scss
index 7a9963aab4..3bd307e69d 100644
--- a/lib/core/form/components/widgets/date/date.widget.scss
+++ b/lib/core/form/components/widgets/date/date.widget.scss
@@ -3,7 +3,7 @@
 .adf {
 
     &-date-widget {
-        .mat-input-suffix {
+        .mat-form-field-suffix {
             text-align: right;
             position: absolute;
             margin-top: 30px;
diff --git a/lib/core/form/components/widgets/date/date.widget.spec.ts b/lib/core/form/components/widgets/date/date.widget.spec.ts
index 70d765fb20..dbadcb7ab3 100644
--- a/lib/core/form/components/widgets/date/date.widget.spec.ts
+++ b/lib/core/form/components/widgets/date/date.widget.spec.ts
@@ -151,7 +151,7 @@ describe('DateWidgetComponent', () => {
             widget.field = new FormFieldModel(new FormModel(), {
                 id: 'date-field-id',
                 name: 'date-name',
-                value:  '12-30-9999';
+                value:  '12-30-9999',
                 type: 'date',
                 readOnly: 'false'
             });
diff --git a/lib/core/form/components/widgets/dropdown/dropdown.widget.spec.ts b/lib/core/form/components/widgets/dropdown/dropdown.widget.spec.ts
index d17be4691c..3ec508c9e0 100644
--- a/lib/core/form/components/widgets/dropdown/dropdown.widget.spec.ts
+++ b/lib/core/form/components/widgets/dropdown/dropdown.widget.spec.ts
@@ -17,7 +17,7 @@
 
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { Observable } from 'rxjs/Observable';
+import { Observable, of } from 'rxjs';
 import { FormService } from '../../../services/form.service';
 import { WidgetVisibilityService } from '../../../services/widget-visibility.service';
 import { FormFieldOption } from './../core/form-field-option';
@@ -130,7 +130,7 @@ describe('DropdownWidgetComponent', () => {
             beforeEach(async(() => {
                 spyOn(visibilityService, 'refreshVisibility').and.stub();
                 spyOn(formService, 'getRestFieldValues').and.callFake(() => {
-                    return Observable.of(fakeOptionList);
+                    return of(fakeOptionList);
                 });
                 widget.field = new FormFieldModel(new FormModel({ taskId: 'fake-task-id' }), {
                     id: 'dropdown-id',
@@ -194,7 +194,7 @@ describe('DropdownWidgetComponent', () => {
             beforeEach(async(() => {
                 spyOn(visibilityService, 'refreshVisibility').and.stub();
                 spyOn(formService, 'getRestFieldValuesByProcessId').and.callFake(() => {
-                    return Observable.of(fakeOptionList);
+                    return of(fakeOptionList);
                 });
                 widget.field = new FormFieldModel(new FormModel({ processDefinitionId: 'fake-process-id' }), {
                     id: 'dropdown-id',
diff --git a/lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.html b/lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.html
index d17df39eb8..c8b0eb8c4c 100644
--- a/lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.html
+++ b/lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.html
@@ -17,7 +17,13 @@
                         [class.adf-dynamic-table-widget__row-selected]="row.selected" (keyup)="onKeyPressed($event, row)">
                         <td *ngFor="let column of content.visibleColumns"
                             (click)="onRowClicked(row)">
-                            {{ getCellValue(row, column) }}
+                            <span *ngIf="column.type !== 'Boolean' else checkbox">
+                                {{ getCellValue(row, column) }}
+                            </span>
+                            <ng-template #checkbox>
+                                <mat-checkbox disabled [checked]="getCellValue(row, column)">
+                                </mat-checkbox>
+                            </ng-template>
                         </td>
                     </tr>
                 </tbody>
@@ -57,7 +63,6 @@
      <row-editor *ngIf="editMode"
         [table]="content"
         [row]="editRow"
-        [column]="column"
         (save)="onSaveChanges()"
         (cancel)="onCancelChanges()">
      </row-editor>
diff --git a/lib/core/form/components/widgets/dynamic-table/editors/datetime/datetime.editor.html b/lib/core/form/components/widgets/dynamic-table/editors/datetime/datetime.editor.html
new file mode 100644
index 0000000000..55be3f2f1c
--- /dev/null
+++ b/lib/core/form/components/widgets/dynamic-table/editors/datetime/datetime.editor.html
@@ -0,0 +1,20 @@
+<div>
+    <mat-form-field class="adf-date-editor">
+        <label [attr.for]="column.id">{{column.name}} {{DATE_FORMAT}}</label>
+        <input matInput
+            [matDatetimepicker]="datetimePicker"
+            [(ngModel)]="value"
+            [id]="column.id"
+            [required]="column.required"
+            [disabled]="!column.editable"
+            (focusout)="onDateChanged($event.srcElement.value)"
+            (dateChange)="onDateChanged($event)">
+            <mat-datetimepicker-toggle matSuffix [for]="datetimePicker"
+                            *ngIf="column.editable"
+                            class="adf-date-editor-button"></mat-datetimepicker-toggle>
+    </mat-form-field>
+    <mat-datetimepicker #datetimePicker
+                        type="datetime"
+                        openOnFocus="true"
+                        timeInterval="5"></mat-datetimepicker>
+</div>
diff --git a/lib/core/form/components/widgets/dynamic-table/editors/datetime/datetime.editor.scss b/lib/core/form/components/widgets/dynamic-table/editors/datetime/datetime.editor.scss
new file mode 100644
index 0000000000..3be29ca848
--- /dev/null
+++ b/lib/core/form/components/widgets/dynamic-table/editors/datetime/datetime.editor.scss
@@ -0,0 +1,10 @@
+.adf {
+    &-date-editor {
+        width: 100%;
+    }
+
+    &-date-editor-button {
+        position: relative;
+        top: 25px;
+    }
+}
diff --git a/lib/core/form/components/widgets/dynamic-table/editors/datetime/datetime.editor.spec.ts b/lib/core/form/components/widgets/dynamic-table/editors/datetime/datetime.editor.spec.ts
new file mode 100644
index 0000000000..d0c635e82e
--- /dev/null
+++ b/lib/core/form/components/widgets/dynamic-table/editors/datetime/datetime.editor.spec.ts
@@ -0,0 +1,89 @@
+/*!
+ * @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 { ComponentFixture, TestBed } from '@angular/core/testing';
+import moment from 'moment-es6';
+import { FormFieldModel, FormModel } from '../../../index';
+import { DynamicTableColumn  } from './../../dynamic-table-column.model';
+import { DynamicTableRow  } from './../../dynamic-table-row.model';
+import { DynamicTableModel } from './../../dynamic-table.widget.model';
+import { DateTimeEditorComponent } from './datetime.editor';
+import { setupTestBed } from '../../../../../../testing/setupTestBed';
+import { CoreModule } from '../../../../../../core.module';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+
+describe('DateTimeEditorComponent', () => {
+    let component: DateTimeEditorComponent;
+    let fixture: ComponentFixture<DateTimeEditorComponent>;
+    let row: DynamicTableRow;
+    let column: DynamicTableColumn;
+    let table: DynamicTableModel;
+
+    setupTestBed({
+        imports: [
+            NoopAnimationsModule,
+            CoreModule.forRoot()
+        ]
+    });
+
+    beforeEach(() => {
+        fixture = TestBed.createComponent(DateTimeEditorComponent);
+        component = fixture.componentInstance;
+
+        row = <DynamicTableRow> { value: { date: '1879-03-14T00:00:00.000Z' } };
+        column = <DynamicTableColumn> { id: 'datetime', type: 'Datetime' };
+        const field = new FormFieldModel(new FormModel());
+        table = new DynamicTableModel(field, null);
+        table.rows.push(row);
+        table.columns.push(column);
+        component.table = table;
+        component.row = row;
+        component.column = column;
+    });
+
+    it('should create instance of DateTimeEditorComponent', () => {
+        expect(fixture.componentInstance instanceof DateTimeEditorComponent).toBe(true, 'should create DateTimeEditorComponent');
+    });
+
+    it('should update fow value on change', () => {
+        component.ngOnInit();
+        let newDate = moment('22-6-2018 04:20 AM', 'D-M-YYYY hh:mm A');
+        component.onDateChanged(newDate);
+        expect(moment(row.value[column.id]).isSame(newDate)).toBeTruthy();
+    });
+
+    it('should update row value upon user input', () => {
+        const input = '22-6-2018 04:20 AM';
+
+        component.ngOnInit();
+        component.onDateChanged(input);
+
+        let actual = row.value[column.id];
+        expect(actual).toBe('22-6-2018 04:20 AM');
+    });
+
+    it('should flush value on user input', () => {
+        spyOn(table, 'flushValue').and.callThrough();
+        const input = '22-6-2018 04:20 AM';
+
+        component.ngOnInit();
+        component.onDateChanged(input);
+
+        expect(table.flushValue).toHaveBeenCalled();
+    });
+
+});
diff --git a/lib/core/form/components/widgets/dynamic-table/editors/datetime/datetime.editor.ts b/lib/core/form/components/widgets/dynamic-table/editors/datetime/datetime.editor.ts
new file mode 100644
index 0000000000..32f1f32b26
--- /dev/null
+++ b/lib/core/form/components/widgets/dynamic-table/editors/datetime/datetime.editor.ts
@@ -0,0 +1,92 @@
+/*!
+ * @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.
+ */
+
+/* tslint:disable:component-selector  */
+
+import { UserPreferencesService } from '../../../../../../services/user-preferences.service';
+import { MomentDateAdapter } from '../../../../../../utils/momentDateAdapter';
+import { MOMENT_DATE_FORMATS } from '../../../../../../utils/moment-date-formats.model';
+import { Component, Input, OnInit } from '@angular/core';
+import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material';
+import moment from 'moment-es6';
+import { Moment } from 'moment';
+import { DynamicTableColumn } from './../../dynamic-table-column.model';
+import { DynamicTableRow } from './../../dynamic-table-row.model';
+import { DynamicTableModel } from './../../dynamic-table.widget.model';
+import { DatetimeAdapter, MAT_DATETIME_FORMATS } from '@mat-datetimepicker/core';
+import { MomentDatetimeAdapter, MAT_MOMENT_DATETIME_FORMATS } from '@mat-datetimepicker/moment';
+
+@Component({
+    selector: 'adf-datetime-editor',
+    templateUrl: './datetime.editor.html',
+    providers: [
+        { provide: DateAdapter, useClass: MomentDateAdapter },
+        { provide: MAT_DATE_FORMATS, useValue: MOMENT_DATE_FORMATS },
+        { provide: DatetimeAdapter, useClass: MomentDatetimeAdapter },
+        { provide: MAT_DATETIME_FORMATS, useValue: MAT_MOMENT_DATETIME_FORMATS }
+    ],
+    styleUrls: ['./datetime.editor.scss']
+})
+export class DateTimeEditorComponent implements OnInit {
+
+    DATE_FORMAT: string = 'D-M-YYYY hh:mm A';
+
+    value: any;
+
+    @Input()
+    table: DynamicTableModel;
+
+    @Input()
+    row: DynamicTableRow;
+
+    @Input()
+    column: DynamicTableColumn;
+
+    minDate: Moment;
+    maxDate: Moment;
+
+    constructor(private dateAdapter: DateAdapter<Moment>,
+                private preferences: UserPreferencesService) {
+    }
+
+    ngOnInit() {
+        this.preferences.locale$.subscribe((locale) => {
+            this.dateAdapter.setLocale(locale);
+        });
+        let momentDateAdapter = <MomentDateAdapter> this.dateAdapter;
+        momentDateAdapter.overrideDisplyaFormat = this.DATE_FORMAT;
+
+        this.value = moment(this.table.getCellValue(this.row, this.column), this.DATE_FORMAT);
+    }
+
+    onDateChanged(newDateValue) {
+        if (newDateValue && newDateValue.value) {
+            const newValue = moment(newDateValue.value, this.DATE_FORMAT);
+            this.row.value[this.column.id] = newDateValue.value.format(this.DATE_FORMAT);
+            this.value = newValue;
+            this.table.flushValue();
+        } else if (newDateValue) {
+            const newValue = moment(newDateValue, this.DATE_FORMAT);
+            this.value = newValue;
+            this.row.value[this.column.id] = newDateValue;
+            this.table.flushValue();
+        } else {
+            this.row.value[this.column.id] = '';
+        }
+    }
+
+}
diff --git a/lib/core/form/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts b/lib/core/form/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts
index dd84a5a928..1e7f353070 100644
--- a/lib/core/form/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts
+++ b/lib/core/form/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts
@@ -17,7 +17,7 @@
 
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { Observable } from 'rxjs/Observable';
+import { Observable, of, throwError } from 'rxjs';
 import { FormService } from './../../../../../services/form.service';
 import { FormFieldModel, FormModel } from './../../../core/index';
 import { DynamicTableColumnOption  } from './../../dynamic-table-column-option.model';
@@ -145,7 +145,7 @@ describe('DropdownEditorComponent', () => {
         const error = 'error';
 
         spyOn(formService, 'getRestFieldValuesColumn').and.returnValue(
-            Observable.throw(error)
+            throwError(error)
         );
         spyOn(component, 'handleError').and.stub();
 
@@ -161,7 +161,7 @@ describe('DropdownEditorComponent', () => {
         const error = 'error';
 
         spyOn(formService, 'getRestFieldValuesColumnByProcessId').and.returnValue(
-            Observable.throw(error)
+            throwError(error)
         );
         spyOn(component, 'handleError').and.stub();
 
@@ -209,7 +209,7 @@ describe('DropdownEditorComponent', () => {
 
             beforeEach(async(() => {
                 stubFormService = fixture.debugElement.injector.get(FormService);
-                spyOn(stubFormService, 'getRestFieldValuesColumn').and.returnValue(Observable.of(fakeOptionList));
+                spyOn(stubFormService, 'getRestFieldValuesColumn').and.returnValue(of(fakeOptionList));
                 row = <DynamicTableRow> {value: {dropdown: 'one'}};
                 column = <DynamicTableColumn> {
                     id: 'column-id',
@@ -257,7 +257,7 @@ describe('DropdownEditorComponent', () => {
 
             beforeEach(async(() => {
                 stubFormService = fixture.debugElement.injector.get(FormService);
-                spyOn(stubFormService, 'getRestFieldValuesColumnByProcessId').and.returnValue(Observable.of(fakeOptionList));
+                spyOn(stubFormService, 'getRestFieldValuesColumnByProcessId').and.returnValue(of(fakeOptionList));
                 row = <DynamicTableRow> {value: {dropdown: 'one'}};
                 column = <DynamicTableColumn> {
                     id: 'column-id',
diff --git a/lib/core/form/components/widgets/dynamic-table/editors/row.editor.html b/lib/core/form/components/widgets/dynamic-table/editors/row.editor.html
index cc4b07d634..7f283a27e5 100644
--- a/lib/core/form/components/widgets/dynamic-table/editors/row.editor.html
+++ b/lib/core/form/components/widgets/dynamic-table/editors/row.editor.html
@@ -16,7 +16,13 @@
                     [column]="column">
                 </adf-date-editor>
                 </div>
-
+                <div *ngSwitchCase="'Datetime'">
+                    <adf-datetime-editor
+                        [table]="table"
+                        [row]="row"
+                        [column]="column">
+                    </adf-datetime-editor>
+                </div>
                 <div *ngSwitchCase="'Boolean'">
                 <adf-boolean-editor
                     [table]="table"
diff --git a/lib/core/form/components/widgets/form.scss b/lib/core/form/components/widgets/form.scss
index d0e800cc6b..c2259918a0 100644
--- a/lib/core/form/components/widgets/form.scss
+++ b/lib/core/form/components/widgets/form.scss
@@ -39,7 +39,7 @@
 
         &-invalid {
 
-            .mat-input-underline {
+            .mat-form-field-underline {
                 background-color: #f44336 !important;
             }
 
@@ -47,7 +47,7 @@
                 border-color: mat-color($warn);
             }
 
-            .mat-input-prefix {
+            .mat-form-field-prefix {
                 color: mat-color($warn);
             }
 
diff --git a/lib/core/form/components/widgets/functional-group/functional-group.widget.spec.ts b/lib/core/form/components/widgets/functional-group/functional-group.widget.spec.ts
index 7c62d2a723..d5ddda1195 100644
--- a/lib/core/form/components/widgets/functional-group/functional-group.widget.spec.ts
+++ b/lib/core/form/components/widgets/functional-group/functional-group.widget.spec.ts
@@ -16,7 +16,7 @@
  */
 
 import { ElementRef } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { FormService } from '../../../services/form.service';
 import { FormFieldModel } from '../core/form-field.model';
 import { FormModel } from '../core/form.model';
diff --git a/lib/core/form/components/widgets/index.ts b/lib/core/form/components/widgets/index.ts
index 09a9480d16..b3f179fdd5 100644
--- a/lib/core/form/components/widgets/index.ts
+++ b/lib/core/form/components/widgets/index.ts
@@ -28,6 +28,7 @@ import { DropdownWidgetComponent } from './dropdown/dropdown.widget';
 import { DynamicTableWidgetComponent } from './dynamic-table/dynamic-table.widget';
 import { BooleanEditorComponent } from './dynamic-table/editors/boolean/boolean.editor';
 import { DateEditorComponent } from './dynamic-table/editors/date/date.editor';
+import { DateTimeEditorComponent } from './dynamic-table/editors/datetime/datetime.editor';
 import { DropdownEditorComponent } from './dynamic-table/editors/dropdown/dropdown.editor';
 import { RowEditorComponent } from './dynamic-table/editors/row.editor';
 import { TextEditorComponent } from './dynamic-table/editors/text/text.editor';
@@ -80,6 +81,7 @@ export * from './dynamic-table/editors/date/date.editor';
 export * from './dynamic-table/editors/dropdown/dropdown.editor';
 export * from './dynamic-table/editors/boolean/boolean.editor';
 export * from './dynamic-table/editors/text/text.editor';
+export * from './dynamic-table/editors/datetime/datetime.editor';
 export * from './text/text-mask.component';
 
 export const WIDGET_DIRECTIVES: any[] = [
@@ -108,7 +110,8 @@ export const WIDGET_DIRECTIVES: any[] = [
     RowEditorComponent,
     ErrorWidgetComponent,
     DocumentWidgetComponent,
-    DateTimeWidgetComponent
+    DateTimeWidgetComponent,
+    DateTimeEditorComponent
 ];
 
 export const MASK_DIRECTIVE: any[] = [
diff --git a/lib/core/form/components/widgets/people/people.widget.html b/lib/core/form/components/widgets/people/people.widget.html
index e0d9dbebdc..bdd903e8f2 100644
--- a/lib/core/form/components/widgets/people/people.widget.html
+++ b/lib/core/form/components/widgets/people/people.widget.html
@@ -7,6 +7,7 @@
         <input #inputValue
                matInput
                class="adf-input"
+               data-automation-id="adf-people-search-input"
                type="text"
                [id]="field.id"
                [(ngModel)]="value"
@@ -14,7 +15,7 @@
                placeholder="{{field.placeholder}}"
                [matAutocomplete]="auto">
         <mat-autocomplete class="adf-people-widget-list" #auto="matAutocomplete" (optionSelected)="onItemSelect($event.option.value)">
-            <mat-option *ngFor="let user of users$ | async; let i = index" [value]="user">
+            <mat-option *ngFor="let user of users$ | async; let i = index" [value]="getDisplayName(user)">
                 <div class="adf-people-widget-row" id="adf-people-widget-user-{{i}}">
                     <div [outerHTML]="user | usernameInitials:'adf-people-widget-pic'"></div>
                     <div *ngIf="user.pictureId" class="adf-people-widget-image-row">
diff --git a/lib/core/form/components/widgets/people/people.widget.scss b/lib/core/form/components/widgets/people/people.widget.scss
index 3d8946e6a3..5113e2c616 100644
--- a/lib/core/form/components/widgets/people/people.widget.scss
+++ b/lib/core/form/components/widgets/people/people.widget.scss
@@ -7,6 +7,10 @@
 
         &-people-widget {
             width: 100%;
+
+            .mat-form-field-label-wrapper {
+                top: 10px !important;
+            }
         }
 
         &-people-widget-list {
diff --git a/lib/core/form/components/widgets/people/people.widget.spec.ts b/lib/core/form/components/widgets/people/people.widget.spec.ts
index ea2cf1a728..4f5872b302 100644
--- a/lib/core/form/components/widgets/people/people.widget.spec.ts
+++ b/lib/core/form/components/widgets/people/people.widget.spec.ts
@@ -18,7 +18,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { UserProcessModel } from '../../../../models';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { FormService } from '../../../services/form.service';
 import { FormFieldTypes } from '../core/form-field-types';
 import { FormFieldModel } from '../core/form-field.model';
@@ -206,6 +206,34 @@ describe('PeopleWidgetComponent', () => {
                 expect(fixture.debugElement.query(By.css('#adf-people-widget-user-0'))).toBeNull();
             });
         });
+
+        it('should display two options if we tap one letter', async(() => {
+            let peopleHTMLElement: HTMLInputElement = <HTMLInputElement> element.querySelector('input');
+            peopleHTMLElement.focus();
+            peopleHTMLElement.value = 'T';
+            peopleHTMLElement.dispatchEvent(new Event('keyup'));
+            peopleHTMLElement.dispatchEvent(new Event('input'));
+            fixture.detectChanges();
+            fixture.whenStable().then(() => {
+                fixture.detectChanges();
+                expect(fixture.debugElement.query(By.css('#adf-people-widget-user-0'))).not.toBeNull();
+                expect(fixture.debugElement.query(By.css('#adf-people-widget-user-1'))).not.toBeNull();
+            });
+        }));
+
+        it('should emit peopleSelected if option is valid', async() => {
+            let selectEmitSpy = spyOn(widget.peopleSelected, 'emit');
+            let peopleHTMLElement: HTMLInputElement = <HTMLInputElement> element.querySelector('input');
+            peopleHTMLElement.focus();
+            peopleHTMLElement.value = 'Test01 Test01';
+            peopleHTMLElement.dispatchEvent(new Event('keyup'));
+            peopleHTMLElement.dispatchEvent(new Event('input'));
+            fixture.detectChanges();
+            fixture.whenStable().then(() => {
+                fixture.detectChanges();
+                expect(selectEmitSpy).toHaveBeenCalledWith(1001);
+            });
+        });
     });
 
 });
diff --git a/lib/core/form/components/widgets/people/people.widget.ts b/lib/core/form/components/widgets/people/people.widget.ts
index ce9a4b5787..c54f766bfb 100644
--- a/lib/core/form/components/widgets/people/people.widget.ts
+++ b/lib/core/form/components/widgets/people/people.widget.ts
@@ -19,12 +19,12 @@
 
 import { PeopleProcessService } from '../../../../services/people-process.service';
 import { UserProcessModel } from '../../../../models';
-import { Component, ElementRef, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
+import { Component, ElementRef, EventEmitter, OnInit, Output, ViewChild, ViewEncapsulation } from '@angular/core';
 import { FormService } from '../../../services/form.service';
 import { GroupModel } from '../core/group.model';
 import { baseHost, WidgetComponent } from './../widget.component';
 import { FormControl } from '@angular/forms';
-import { Observable } from 'rxjs/Observable';
+import { Observable, of } from 'rxjs';
 import {
     catchError,
     distinctUntilChanged,
@@ -32,7 +32,6 @@ import {
     switchMap,
     tap
 } from 'rxjs/operators';
-import 'rxjs/add/observable/empty';
 
 @Component({
     selector: 'people-widget',
@@ -46,6 +45,9 @@ export class PeopleWidgetComponent extends WidgetComponent implements OnInit {
     @ViewChild('inputValue')
     input: ElementRef;
 
+    @Output()
+    peopleSelected: EventEmitter<number>;
+
     groupId: string;
     value: any;
 
@@ -59,36 +61,24 @@ export class PeopleWidgetComponent extends WidgetComponent implements OnInit {
         }),
         distinctUntilChanged(),
         switchMap((searchTerm) => {
-            let userResponse = Observable.empty();
-
-            if (typeof searchTerm === 'string') {
-                userResponse = this.formService.getWorkflowUsers(searchTerm, this.groupId)
-                    .pipe(
-                        catchError(err => {
-                            this.errorMsg = err.message;
-                            return userResponse;
-                        })
-                    );
-            }
-
-            return userResponse;
+            return this.formService.getWorkflowUsers(searchTerm, this.groupId)
+                .pipe(
+                    catchError(err => {
+                        this.errorMsg = err.message;
+                        return of();
+                    })
+                );
         }),
         map((list: UserProcessModel[]) => {
             let value = (this.input.nativeElement as HTMLInputElement).value;
-
-            if (value) {
-                this.checkUserAndValidateForm(list, value);
-            } else {
-                this.field.value = null;
-                list = [];
-            }
-
+            this.checkUserAndValidateForm(list, value);
             return list;
         })
     );
 
     constructor(public formService: FormService, public peopleProcessService: PeopleProcessService) {
         super(formService);
+        this.peopleSelected = new EventEmitter();
     }
 
     ngOnInit() {
@@ -119,9 +109,15 @@ export class PeopleWidgetComponent extends WidgetComponent implements OnInit {
     }
 
     isValidUser(users: UserProcessModel[], name: string) {
-        return users.find((user) => {
-            return this.getDisplayName(user).toLocaleLowerCase() === name.toLocaleLowerCase();
-        });
+        if (users) {
+            return users.find((user) => {
+                const selectedUser = this.getDisplayName(user).toLocaleLowerCase() === name.toLocaleLowerCase();
+                if (selectedUser) {
+                    this.peopleSelected.emit(user && user.id || undefined);
+                }
+                return selectedUser;
+            });
+        }
     }
 
     getDisplayName(model: UserProcessModel) {
@@ -132,10 +128,10 @@ export class PeopleWidgetComponent extends WidgetComponent implements OnInit {
         return '';
     }
 
-    onItemSelect(item: UserProcessModel) {
+    onItemSelect(item) {
         if (item) {
             this.field.value = item;
-            this.value = this.getDisplayName(item);
+            this.value = item;
         }
     }
 }
diff --git a/lib/core/form/components/widgets/radio-buttons/radio-buttons.widget.spec.ts b/lib/core/form/components/widgets/radio-buttons/radio-buttons.widget.spec.ts
index ab3133bd53..47cf5a2d31 100644
--- a/lib/core/form/components/widgets/radio-buttons/radio-buttons.widget.spec.ts
+++ b/lib/core/form/components/widgets/radio-buttons/radio-buttons.widget.spec.ts
@@ -16,7 +16,7 @@
  */
 
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { Observable } from 'rxjs/Observable';
+import { Observable, of } from 'rxjs';
 import { FormService } from '../../../services/form.service';
 import { ContainerModel } from '../core/container.model';
 import { FormFieldTypes } from '../core/form-field-types';
@@ -123,7 +123,7 @@ describe('RadioButtonsWidgetComponent', () => {
     });
 
     it('should update the field value when an option is selected', () => {
-        spyOn(widget, 'onFieldChanged').and.returnValue(Observable.of({}));
+        spyOn(widget, 'onFieldChanged').and.returnValue(of({}));
         widget.onOptionClick('fake-opt');
 
         expect(widget.field.value).toEqual('fake-opt');
@@ -153,7 +153,7 @@ describe('RadioButtonsWidgetComponent', () => {
 
             beforeEach(async(() => {
                 stubFormService = fixture.debugElement.injector.get(FormService);
-                spyOn(stubFormService, 'getRestFieldValues').and.returnValue(Observable.of(restOption));
+                spyOn(stubFormService, 'getRestFieldValues').and.returnValue(of(restOption));
                 radioButtonWidget.field = new FormFieldModel(new FormModel({ taskId: 'task-id' }), {
                     id: 'radio-id',
                     name: 'radio-name',
@@ -196,7 +196,7 @@ describe('RadioButtonsWidgetComponent', () => {
                     restUrl: 'rest-url'
                 });
                 stubFormService = fixture.debugElement.injector.get(FormService);
-                spyOn(stubFormService, 'getRestFieldValuesByProcessId').and.returnValue(Observable.of(restOption));
+                spyOn(stubFormService, 'getRestFieldValuesByProcessId').and.returnValue(of(restOption));
                 radioButtonWidget.field.isVisible = true;
                 fixture.detectChanges();
             }));
diff --git a/lib/core/form/components/widgets/text/text-mask.component.ts b/lib/core/form/components/widgets/text/text-mask.component.ts
index d5345a2822..d5bd3aceec 100644
--- a/lib/core/form/components/widgets/text/text-mask.component.ts
+++ b/lib/core/form/components/widgets/text/text-mask.component.ts
@@ -24,7 +24,7 @@ import {
     HostListener,
     Input,
     OnChanges,
-    Renderer,
+    Renderer2,
     SimpleChanges
 } from '@angular/core';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
@@ -59,7 +59,7 @@ export class InputMaskDirective implements OnChanges, ControlValueAccessor {
     private value;
     private invalidCharacters = [];
 
-    constructor(private el: ElementRef, private render: Renderer) {
+    constructor(private el: ElementRef, private render: Renderer2) {
     }
 
     _onChange = (_: any) => {
@@ -100,7 +100,7 @@ export class InputMaskDirective implements OnChanges, ControlValueAccessor {
         if (this.byPassKeys.indexOf(keyCode) === -1) {
             let value = this.getMasked(false, actualValue, maskToApply, isMaskReversed);
             let calculatedCaret = this.calculateCaretPosition(startCaret, actualValue, keyCode);
-            this.render.setElementAttribute(this.el.nativeElement, 'value', value);
+            this.render.setAttribute(this.el.nativeElement, 'value', value);
             this.el.nativeElement.value = value;
             this.setValue(value);
             this._onChange(value);
diff --git a/lib/core/form/components/widgets/typeahead/typeahead.widget.spec.ts b/lib/core/form/components/widgets/typeahead/typeahead.widget.spec.ts
index d9191fd523..a22ca35df8 100644
--- a/lib/core/form/components/widgets/typeahead/typeahead.widget.spec.ts
+++ b/lib/core/form/components/widgets/typeahead/typeahead.widget.spec.ts
@@ -16,7 +16,7 @@
  */
 
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { Observable } from 'rxjs/Observable';
+import { Observable, of, throwError } from 'rxjs';
 
 import { By } from '@angular/platform-browser';
 import { FormService } from '../../../services/form.service';
@@ -99,7 +99,7 @@ describe('TypeaheadWidgetComponent', () => {
             restUrl: 'whateverURL'
         });
         const err = 'Error';
-        spyOn(formService, 'getRestFieldValues').and.returnValue(Observable.throw(err));
+        spyOn(formService, 'getRestFieldValues').and.returnValue(throwError(err));
         spyOn(widget, 'handleError').and.stub();
 
         widget.ngOnInit();
@@ -121,7 +121,7 @@ describe('TypeaheadWidgetComponent', () => {
             restUrl: 'whateverURL'
         });
         const err = 'Error';
-        spyOn(formService, 'getRestFieldValuesByProcessId').and.returnValue(Observable.throw(err));
+        spyOn(formService, 'getRestFieldValuesByProcessId').and.returnValue(throwError(err));
         spyOn(widget, 'handleError').and.stub();
 
         widget.ngOnInit();
@@ -270,7 +270,7 @@ describe('TypeaheadWidgetComponent', () => {
 
             beforeEach(async(() => {
                 stubFormService = fixture.debugElement.injector.get(FormService);
-                spyOn(stubFormService, 'getRestFieldValues').and.returnValue(Observable.of(fakeOptionList));
+                spyOn(stubFormService, 'getRestFieldValues').and.returnValue(of(fakeOptionList));
                 typeaheadWidgetComponent.field = new FormFieldModel(new FormModel({ taskId: 'fake-task-id' }), {
                     id: 'typeahead-id',
                     name: 'typeahead-name',
@@ -348,7 +348,7 @@ describe('TypeaheadWidgetComponent', () => {
 
             beforeEach(async(() => {
                 stubFormService = fixture.debugElement.injector.get(FormService);
-                spyOn(stubFormService, 'getRestFieldValuesByProcessId').and.returnValue(Observable.of(fakeOptionList));
+                spyOn(stubFormService, 'getRestFieldValuesByProcessId').and.returnValue(of(fakeOptionList));
                 typeaheadWidgetComponent.field = new FormFieldModel(new FormModel({ processDefinitionId: 'fake-process-id' }), {
                     id: 'typeahead-id',
                     name: 'typeahead-name',
diff --git a/lib/core/form/components/widgets/upload-folder/upload-folder.widget.ts b/lib/core/form/components/widgets/upload-folder/upload-folder.widget.ts
index 31df392ea2..e8188e8092 100644
--- a/lib/core/form/components/widgets/upload-folder/upload-folder.widget.ts
+++ b/lib/core/form/components/widgets/upload-folder/upload-folder.widget.ts
@@ -20,12 +20,12 @@
 import { LogService } from '../../../../services/log.service';
 import { ThumbnailService } from '../../../../services/thumbnail.service';
 import { Component, ElementRef, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable, from } from 'rxjs';
 import { FormService } from '../../../services/form.service';
 import { ProcessContentService } from '../../../services/process-content.service';
 import { ContentLinkModel } from '../core/content-link.model';
 import { baseHost, WidgetComponent } from './../widget.component';
-import 'rxjs/add/operator/mergeMap';
+import { mergeMap, map } from 'rxjs/operators';
 
 @Component({
     selector: 'upload-folder-widget',
@@ -75,27 +75,32 @@ export class UploadFolderWidgetComponent extends WidgetComponent implements OnIn
         }
 
         if (files && files.length > 0) {
-            Observable.from(files).mergeMap(file => this.uploadRawContent(file)).subscribe((res) => {
-                    filesSaved.push(res);
-                },
-                (error) => {
-                    this.logService.error('Error uploading file. See console output for more details.');
-                },
-                () => {
-                    this.field.value = filesSaved;
-                    this.field.json.value = filesSaved;
-                });
+            from(files)
+                .pipe(mergeMap(file => this.uploadRawContent(file)))
+                .subscribe(
+                    (res) => {
+                        filesSaved.push(res);
+                    },
+                    () => {
+                        this.logService.error('Error uploading file. See console output for more details.');
+                    },
+                    () => {
+                        this.field.value = filesSaved;
+                        this.field.json.value = filesSaved;
+                    }
+                );
 
             this.hasFile = true;
         }
     }
 
     private uploadRawContent(file): Observable<any> {
-        return this.processContentService.createTemporaryRawRelatedContent(file)
-            .map((response: any) => {
+        return this.processContentService.createTemporaryRawRelatedContent(file).pipe(
+            map((response: any) => {
                 this.logService.info(response);
                 return response;
-            });
+            })
+        );
     }
 
     private getMultipleFileParam() {
diff --git a/lib/core/form/components/widgets/upload/upload.widget.spec.ts b/lib/core/form/components/widgets/upload/upload.widget.spec.ts
index abac954adc..8e254bb237 100644
--- a/lib/core/form/components/widgets/upload/upload.widget.spec.ts
+++ b/lib/core/form/components/widgets/upload/upload.widget.spec.ts
@@ -18,7 +18,7 @@
 import { DebugElement } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 import { FormService } from '../../../services/form.service';
 import { ProcessContentService } from '../../../services/process-content.service';
 import { FormFieldTypes } from '../core/form-field-types';
@@ -189,7 +189,7 @@ describe('UploadWidgetComponent', () => {
         }));
 
         it('should show the list file after upload a new content', async(() => {
-            spyOn(contentService, 'createTemporaryRawRelatedContent').and.returnValue(Observable.of(fakePngAnswer));
+            spyOn(contentService, 'createTemporaryRawRelatedContent').and.returnValue(of(fakePngAnswer));
 
             uploadWidgetComponent.field.params.multiple = false;
             fixture.detectChanges();
@@ -204,11 +204,11 @@ describe('UploadWidgetComponent', () => {
         it('should update the form after deleted a file', async(() => {
             spyOn(contentService, 'createTemporaryRawRelatedContent').and.callFake((file) => {
                 if (file.name === 'file-fake.png') {
-                    return Observable.of(fakePngAnswer);
+                    return of(fakePngAnswer);
                 }
 
                 if (file.name === 'file-fake.jpg') {
-                    return Observable.of(fakeJpgAnswer);
+                    return of(fakeJpgAnswer);
                 }
             });
 
@@ -232,11 +232,11 @@ describe('UploadWidgetComponent', () => {
         it('should set has field value all the files uploaded', async(() => {
             spyOn(contentService, 'createTemporaryRawRelatedContent').and.callFake((file) => {
                 if (file.name === 'file-fake.png') {
-                    return Observable.of(fakePngAnswer);
+                    return of(fakePngAnswer);
                 }
 
                 if (file.name === 'file-fake.jpg') {
-                    return Observable.of(fakeJpgAnswer);
+                    return of(fakeJpgAnswer);
                 }
             });
 
@@ -380,8 +380,8 @@ describe('UploadWidgetComponent', () => {
         }));
 
         it('should emit form content clicked event on icon click', (done) => {
-            spyOn(contentService, 'getContentPreview').and.returnValue(Observable.of(new Blob()));
-            spyOn(contentService, 'getFileRawContent').and.returnValue(Observable.of(new Blob()));
+            spyOn(contentService, 'getContentPreview').and.returnValue(of(new Blob()));
+            spyOn(contentService, 'getFileRawContent').and.returnValue(of(new Blob()));
 
             formServiceInstance.formContentClicked.subscribe((content: any) => {
                 expect(content.name).toBe(fakeJpgAnswer.name);
diff --git a/lib/core/form/components/widgets/upload/upload.widget.ts b/lib/core/form/components/widgets/upload/upload.widget.ts
index 0a861b78e6..98cc670076 100644
--- a/lib/core/form/components/widgets/upload/upload.widget.ts
+++ b/lib/core/form/components/widgets/upload/upload.widget.ts
@@ -20,12 +20,12 @@
 import { LogService } from '../../../../services/log.service';
 import { ThumbnailService } from '../../../../services/thumbnail.service';
 import { Component, ElementRef, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable, from } from 'rxjs';
 import { FormService } from '../../../services/form.service';
 import { ProcessContentService } from '../../../services/process-content.service';
 import { ContentLinkModel } from '../core/content-link.model';
 import { baseHost, WidgetComponent } from './../widget.component';
-import 'rxjs/add/operator/mergeMap';
+import { mergeMap, map } from 'rxjs/operators';
 
 @Component({
     selector: 'upload-widget',
@@ -75,27 +75,29 @@ export class UploadWidgetComponent extends WidgetComponent implements OnInit {
         }
 
         if (files && files.length > 0) {
-            Observable.from(files).mergeMap(file => this.uploadRawContent(file)).subscribe((res) => {
-                    filesSaved.push(res);
-                },
-                (error) => {
-                    this.logService.error('Error uploading file. See console output for more details.');
-                },
-                () => {
-                    this.field.value = filesSaved;
-                    this.field.json.value = filesSaved;
-                    this.hasFile = true;
-                });
+            from(files)
+                .pipe(mergeMap(file => this.uploadRawContent(file)))
+                .subscribe(
+                    (res) => filesSaved.push(res),
+                    () => this.logService.error('Error uploading file. See console output for more details.'),
+                    () => {
+                        this.field.value = filesSaved;
+                        this.field.json.value = filesSaved;
+                        this.hasFile = true;
+                    }
+                );
         }
     }
 
     private uploadRawContent(file): Observable<any> {
         return this.processContentService.createTemporaryRawRelatedContent(file)
-            .map((response: any) => {
-                this.logService.info(response);
-                response.contentBlob = file;
-                return response;
-            });
+            .pipe(
+                map((response: any) => {
+                    this.logService.info(response);
+                    response.contentBlob = file;
+                    return response;
+                })
+            );
     }
 
     getMultipleFileParam() {
@@ -142,7 +144,7 @@ export class UploadWidgetComponent extends WidgetComponent implements OnInit {
                 file.contentBlob = blob;
                 this.formService.formContentClicked.next(file);
             },
-            (error) => {
+            () => {
                 this.logService.error('Unable to send event for file ' + file.name);
             }
         );
diff --git a/lib/core/form/components/widgets/widget.component.ts b/lib/core/form/components/widgets/widget.component.ts
index 3dd014691e..f42da52c00 100644
--- a/lib/core/form/components/widgets/widget.component.ts
+++ b/lib/core/form/components/widgets/widget.component.ts
@@ -121,7 +121,7 @@ export class WidgetComponent implements AfterViewInit {
         return null;
     }
 
-    protected event(event: Event): void {
+    event(event: Event): void {
         this.formService.formEvents.next(event);
     }
 }
diff --git a/lib/core/form/form.module.ts b/lib/core/form/form.module.ts
index ad2d84e42a..ba9271c7ee 100644
--- a/lib/core/form/form.module.ts
+++ b/lib/core/form/form.module.ts
@@ -18,11 +18,11 @@
 import { CommonModule } from '@angular/common';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { NgModule } from '@angular/core';
-import { HttpModule } from '@angular/http';
 import { TranslateModule } from '@ngx-translate/core';
 import { DataTableModule } from '../datatable/datatable.module';
 import { DataColumnModule } from '../data-column/data-column.module';
 import { PipeModule } from '../pipes/pipe.module';
+import { HttpClientModule } from '@angular/common/http';
 
 import { MaterialModule } from '../material.module';
 
@@ -36,23 +36,15 @@ import { FormComponent } from './components/form.component';
 import { StartFormComponent } from './components/start-form.component';
 import { ContentWidgetComponent } from './components/widgets/content/content.widget';
 import { WidgetComponent } from './components/widgets/widget.component';
-
-import { ActivitiContentService } from './services/activiti-alfresco.service';
-import { EcmModelService } from './services/ecm-model.service';
-import { FormRenderingService } from './services/form-rendering.service';
-import { FormService } from './services/form.service';
-import { NodeService } from './services/node.service';
-import { ProcessContentService } from './services/process-content.service';
-import { WidgetVisibilityService } from './services/widget-visibility.service';
 import { MatDatetimepickerModule, MatNativeDatetimeModule } from '@mat-datetimepicker/core';
 
 @NgModule({
     imports: [
         CommonModule,
         DataTableModule,
-        HttpModule,
+        HttpClientModule,
         MaterialModule,
-        TranslateModule,
+        TranslateModule.forChild(),
         FormsModule,
         ReactiveFormsModule,
         DataColumnModule,
@@ -74,15 +66,6 @@ import { MatDatetimepickerModule, MatNativeDatetimeModule } from '@mat-datetimep
     entryComponents: [
         ...WIDGET_DIRECTIVES
     ],
-    providers: [
-        ActivitiContentService,
-        EcmModelService,
-        FormRenderingService,
-        FormService,
-        NodeService,
-        ProcessContentService,
-        WidgetVisibilityService
-    ],
     exports: [
         ContentWidgetComponent,
         FormFieldComponent,
diff --git a/lib/core/form/services/activiti-alfresco.service.ts b/lib/core/form/services/activiti-alfresco.service.ts
index d371dce770..66098cfef4 100644
--- a/lib/core/form/services/activiti-alfresco.service.ts
+++ b/lib/core/form/services/activiti-alfresco.service.ts
@@ -19,10 +19,10 @@ import { AlfrescoApiService } from '../../services/alfresco-api.service';
 import { LogService } from '../../services/log.service';
 import { Injectable } from '@angular/core';
 import { AlfrescoApi, MinimalNodeEntryEntity, RelatedContentRepresentation } from 'alfresco-js-api';
-import { Observable } from 'rxjs/Observable';
+import { Observable, from, throwError } from 'rxjs';
 import { ExternalContent } from '../components/widgets/core/external-content';
 import { ExternalContentLink } from '../components/widgets/core/external-content-link';
-import 'rxjs/add/observable/throw';
+import { map, catchError } from 'rxjs/operators';
 
 @Injectable()
 export class ActivitiContentService {
@@ -43,9 +43,11 @@ export class ActivitiContentService {
     getAlfrescoNodes(accountId: string, folderId: string): Observable<[ExternalContent]> {
         let apiService: AlfrescoApi = this.apiService.getInstance();
         let accountShortId = accountId.replace('alfresco-', '');
-        return Observable.fromPromise(apiService.activiti.alfrescoApi.getContentInFolder(accountShortId, folderId))
-            .map(this.toJsonArray)
-            .catch(err => this.handleError(err));
+        return from(apiService.activiti.alfrescoApi.getContentInFolder(accountShortId, folderId))
+            .pipe(
+                map(this.toJsonArray),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -60,9 +62,11 @@ export class ActivitiContentService {
             tenantId: tenantId,
             includeAccounts: includeAccount
         };
-        return Observable.fromPromise(apiService.activiti.alfrescoApi.getRepositories(opts))
-            .map(this.toJsonArray)
-            .catch(err => this.handleError(err));
+        return from(apiService.activiti.alfrescoApi.getRepositories(opts))
+            .pipe(
+                map(this.toJsonArray),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -73,14 +77,18 @@ export class ActivitiContentService {
      * @param siteId
      */
     linkAlfrescoNode(accountId: string, node: ExternalContent, siteId: string): Observable<ExternalContentLink> {
-        let apiService: AlfrescoApi = this.apiService.getInstance();
-        return Observable.fromPromise(apiService.activiti.contentApi.createTemporaryRelatedContent({
+        const apiService: AlfrescoApi = this.apiService.getInstance();
+        return from(apiService.activiti.contentApi.createTemporaryRelatedContent({
             link: true,
             name: node.title,
             simpleType: node.simpleType,
             source: accountId,
             sourceId: node.id + '@' + siteId
-        })).map(this.toJson).catch(err => this.handleError(err));
+        }))
+        .pipe(
+            map(this.toJson),
+            catchError(err => this.handleError(err))
+        );
     }
 
     applyAlfrescoNode(node: MinimalNodeEntryEntity, siteId: string, accountId: string) {
@@ -93,10 +101,11 @@ export class ActivitiContentService {
             name: node.name,
             link: false
         };
-        return Observable.fromPromise(
-                apiService.activiti.contentApi.createTemporaryRelatedContent(params))
-                    .map(this.toJson)
-                    .catch(err => this.handleError(err));
+        return from(apiService.activiti.contentApi.createTemporaryRelatedContent(params))
+            .pipe(
+                map(this.toJson),
+                catchError(err => this.handleError(err))
+            );
     }
 
     private getSiteNameFromNodePath(node: MinimalNodeEntryEntity): string {
@@ -132,6 +141,6 @@ export class ActivitiContentService {
                 error.status ? `${error.status} - ${error.statusText}` : ActivitiContentService.GENERIC_ERROR_MESSAGE;
         }
         this.logService.error(errMsg);
-        return Observable.throw(errMsg);
+        return throwError(errMsg);
     }
 }
diff --git a/lib/core/form/services/ecm-model.service.spec.ts b/lib/core/form/services/ecm-model.service.spec.ts
index 673607ed5f..8e9b5db33c 100644
--- a/lib/core/form/services/ecm-model.service.spec.ts
+++ b/lib/core/form/services/ecm-model.service.spec.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { FormModel } from './../components/widgets/core/form.model';
 import { EcmModelService } from './ecm-model.service';
 import { setupTestBed } from '../../testing/setupTestBed';
diff --git a/lib/core/form/services/ecm-model.service.ts b/lib/core/form/services/ecm-model.service.ts
index 86d5951f89..d365724bec 100644
--- a/lib/core/form/services/ecm-model.service.ts
+++ b/lib/core/form/services/ecm-model.service.ts
@@ -18,9 +18,9 @@
 import { LogService } from '../../services/log.service';
 import { AlfrescoApiService } from '../../services/alfresco-api.service';
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable, from } from 'rxjs';
 import { FormModel } from '../components/widgets/core/form.model';
-import 'rxjs/add/observable/fromPromise';
+import { map, catchError } from 'rxjs/operators';
 
 @Injectable()
 export class EcmModelService {
@@ -56,9 +56,9 @@ export class EcmModelService {
     }
 
     searchActivitiEcmModel() {
-        return this.getEcmModels().map(function (ecmModels: any) {
+        return this.getEcmModels().pipe(map(function (ecmModels: any) {
             return ecmModels.list.entries.find(model => model.entry.name === EcmModelService.MODEL_NAME);
-        });
+        }));
     }
 
     createActivitiEcmModel(formName: string, form: FormModel): Observable<any> {
@@ -120,41 +120,51 @@ export class EcmModelService {
     }
 
     public searchEcmType(typeName: string, modelName: string): Observable<any> {
-        return this.getEcmType(modelName).map(function (customTypes: any) {
+        return this.getEcmType(modelName).pipe(map(function (customTypes: any) {
             return customTypes.list.entries.find(type => type.entry.prefixedName === typeName || type.entry.title === typeName);
-        });
+        }));
     }
 
     public activeEcmModel(modelName: string): Observable<any> {
-        return Observable.fromPromise(this.apiService.getInstance().core.customModelApi.activateCustomModel(modelName))
-            .map(this.toJson)
-            .catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().core.customModelApi.activateCustomModel(modelName))
+            .pipe(
+                map(this.toJson),
+                catchError(err => this.handleError(err))
+            );
     }
 
     public createEcmModel(modelName: string, nameSpace: string): Observable<any> {
-        return Observable.fromPromise(this.apiService.getInstance().core.customModelApi.createCustomModel('DRAFT', '', modelName, modelName, nameSpace))
-            .map(this.toJson)
-            .catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().core.customModelApi.createCustomModel('DRAFT', '', modelName, modelName, nameSpace))
+            .pipe(
+                map(this.toJson),
+                catchError(err => this.handleError(err))
+            );
     }
 
     public getEcmModels(): Observable<any> {
-        return Observable.fromPromise(this.apiService.getInstance().core.customModelApi.getAllCustomModel())
-            .map(this.toJson)
-            .catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().core.customModelApi.getAllCustomModel())
+            .pipe(
+                map(this.toJson),
+                catchError(err => this.handleError(err))
+            );
     }
 
     public getEcmType(modelName: string): Observable<any> {
-        return Observable.fromPromise(this.apiService.getInstance().core.customModelApi.getAllCustomType(modelName))
-            .map(this.toJson)
-            .catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().core.customModelApi.getAllCustomType(modelName))
+            .pipe(
+                map(this.toJson),
+                catchError(err => this.handleError(err))
+            );
     }
 
     public createEcmType(typeName: string, modelName: string, parentType: string): Observable<any> {
         let name = this.cleanNameType(typeName);
 
-        return Observable.fromPromise(this.apiService.getInstance().core.customModelApi.createCustomType(modelName, name, parentType, typeName, ''))
-            .map(this.toJson)
-            .catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().core.customModelApi.createCustomType(modelName, name, parentType, typeName, ''))
+            .pipe(
+                map(this.toJson),
+                catchError(err => this.handleError(err))
+            );
     }
 
     public addPropertyToAType(modelName: string, typeName: string, formFields: any) {
@@ -177,9 +187,11 @@ export class EcmModelService {
             }
         }
 
-        return Observable.fromPromise(this.apiService.getInstance().core.customModelApi.addPropertyToType(modelName, name, properties))
-            .map(this.toJson)
-            .catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().core.customModelApi.addPropertyToType(modelName, name, properties))
+            .pipe(
+                map(this.toJson),
+                catchError(err => this.handleError(err))
+            );
 
     }
 
diff --git a/lib/core/form/services/form.service.ts b/lib/core/form/services/form.service.ts
index 57fbcb1c90..0a1392efcf 100644
--- a/lib/core/form/services/form.service.ts
+++ b/lib/core/form/services/form.service.ts
@@ -19,8 +19,7 @@ import { AlfrescoApiService } from '../../services/alfresco-api.service';
 import { LogService } from '../../services/log.service';
 import { UserProcessModel } from '../../models';
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
-import { Subject } from 'rxjs/Subject';
+import { Observable, Subject, from, of, throwError } from 'rxjs';
 import { FormDefinitionModel } from '../models/form-definition.model';
 import { ContentLinkModel } from './../components/widgets/core/content-link.model';
 import { GroupModel } from './../components/widgets/core/group.model';
@@ -30,10 +29,7 @@ import {
     ValidateDynamicTableRowEvent, ValidateFormEvent, ValidateFormFieldEvent
 } from './../events/index';
 import { EcmModelService } from './ecm-model.service';
-import 'rxjs/add/observable/fromPromise';
-import 'rxjs/add/operator/defaultIfEmpty';
-import 'rxjs/add/operator/catch';
-import 'rxjs/add/observable/throw';
+import { map, catchError, switchMap, combineAll, defaultIfEmpty } from 'rxjs/operators';
 
 @Injectable()
 export class FormService {
@@ -150,7 +146,7 @@ export class FormService {
             stencilSet: 0
         };
 
-        return Observable.fromPromise(
+        return from(
             this.modelsApi.createModel(dataModel)
         );
     }
@@ -162,7 +158,7 @@ export class FormService {
      * @returns Data for the saved form
      */
     saveForm(formId: string, formModel: FormDefinitionModel): Observable<any> {
-        return Observable.fromPromise(
+        return from(
             this.editorApi.saveForm(formId, formModel)
         );
     }
@@ -175,7 +171,7 @@ export class FormService {
      */
     addFieldsToAForm(formId: string, formModel: FormDefinitionModel): Observable<any> {
         this.logService.log('addFieldsToAForm is deprecated in 1.7.0, use saveForm API instead');
-        return Observable.fromPromise(
+        return from(
             this.editorApi.saveForm(formId, formModel)
         );
     }
@@ -190,13 +186,15 @@ export class FormService {
             'modelType': 2
         };
 
-        return Observable.fromPromise(
+        return from(
             this.modelsApi.getModels(opts)
         )
-            .map(function (forms: any) {
+        .pipe(
+            map(function (forms: any) {
                 return forms.data.find(formdata => formdata.name === name);
-            })
-            .catch(err => this.handleError(err));
+            }),
+            catchError(err => this.handleError(err))
+        );
     }
 
     /**
@@ -208,9 +206,11 @@ export class FormService {
             'modelType': 2
         };
 
-        return Observable.fromPromise(this.modelsApi.getModels(opts))
-            .map(this.toJsonArray)
-            .catch(err => this.handleError(err));
+        return from(this.modelsApi.getModels(opts))
+            .pipe(
+                map(this.toJsonArray),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -218,9 +218,11 @@ export class FormService {
      * @returns List of process definitions
      */
     getProcessDefinitions(): Observable<any> {
-        return Observable.fromPromise(this.processApi.getProcessDefinitions({}))
-            .map(this.toJsonArray)
-            .catch(err => this.handleError(err));
+        return from(this.processApi.getProcessDefinitions({}))
+            .pipe(
+                map(this.toJsonArray),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -229,9 +231,11 @@ export class FormService {
      * @returns List of instance variable information
      */
     getProcessVarablesById(processInstanceId: string): Observable<any[]> {
-        return Observable.fromPromise(this.processInstanceVariablesApi.getProcessInstanceVariables(processInstanceId))
-            .map(this.toJson)
-            .catch(err => this.handleError(err));
+        return from(this.processInstanceVariablesApi.getProcessInstanceVariables(processInstanceId))
+            .pipe(
+                map(this.toJson),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -239,9 +243,11 @@ export class FormService {
      * @returns List of tasks
      */
     getTasks(): Observable<any> {
-        return Observable.fromPromise(this.taskApi.listTasks({}))
-            .map(this.toJsonArray)
-            .catch(err => this.handleError(err));
+        return from(this.taskApi.listTasks({}))
+            .pipe(
+                map(this.toJsonArray),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -250,9 +256,11 @@ export class FormService {
      * @returns Task info
      */
     getTask(taskId: string): Observable<any> {
-        return Observable.fromPromise(this.taskApi.getTask(taskId))
-            .map(this.toJson)
-            .catch(err => this.handleError(err));
+        return from(this.taskApi.getTask(taskId))
+            .pipe(
+                map(this.toJson),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -264,8 +272,10 @@ export class FormService {
     saveTaskForm(taskId: string, formValues: FormValues): Observable<any> {
         let body = JSON.stringify({values: formValues});
 
-        return Observable.fromPromise(this.taskApi.saveTaskForm(taskId, body))
-            .catch(err => this.handleError(err));
+        return from(this.taskApi.saveTaskForm(taskId, body))
+            .pipe(
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -282,8 +292,10 @@ export class FormService {
         }
         let body = JSON.stringify(data);
 
-        return Observable.fromPromise(this.taskApi.completeTaskForm(taskId, body))
-            .catch(err => this.handleError(err));
+        return from(this.taskApi.completeTaskForm(taskId, body))
+            .pipe(
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -292,9 +304,11 @@ export class FormService {
      * @returns Form definition
      */
     getTaskForm(taskId: string): Observable<any> {
-        return Observable.fromPromise(this.taskApi.getTaskForm(taskId))
-            .map(this.toJson)
-            .catch(err => this.handleError(err));
+        return from(this.taskApi.getTaskForm(taskId))
+            .pipe(
+                map(this.toJson),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -303,9 +317,11 @@ export class FormService {
      * @returns Form definition
      */
     getFormDefinitionById(formId: string): Observable<any> {
-        return Observable.fromPromise(this.editorApi.getForm(formId))
-            .map(this.toJson)
-            .catch(err => this.handleError(err));
+        return from(this.editorApi.getForm(formId))
+            .pipe(
+                map(this.toJson),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -320,9 +336,11 @@ export class FormService {
             'modelType': 2
         };
 
-        return Observable.fromPromise(this.modelsApi.getModels(opts))
-            .map(this.getFormId)
-            .catch(err => this.handleError(err));
+        return from(this.modelsApi.getModels(opts))
+            .pipe(
+                map(this.getFormId),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -331,10 +349,11 @@ export class FormService {
      * @returns Form definition
      */
     getStartFormInstance(processId: string): Observable<any> {
-        return Observable.fromPromise(
-            this.processApi.getProcessInstanceStartForm(processId))
-            .map(this.toJson)
-            .catch(err => this.handleError(err));
+        return from(this.processApi.getProcessInstanceStartForm(processId))
+            .pipe(
+                map(this.toJson),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -343,9 +362,11 @@ export class FormService {
      * @returns Process instance
      */
     getProcessIntance(processId: string): Observable<any> {
-        return Observable.fromPromise(this.processApi.getProcessInstance(processId))
-            .map(this.toJson)
-            .catch(err => this.handleError(err));
+        return from(this.processApi.getProcessInstance(processId))
+            .pipe(
+                map(this.toJson),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -354,10 +375,11 @@ export class FormService {
      * @returns Form definition
      */
     getStartFormDefinition(processId: string): Observable<any> {
-        return Observable.fromPromise(
-            this.processApi.getProcessDefinitionStartForm(processId))
-            .map(this.toJson)
-            .catch(err => this.handleError(err));
+        return from(this.processApi.getProcessDefinitionStartForm(processId))
+            .pipe(
+                map(this.toJson),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -367,7 +389,10 @@ export class FormService {
      * @returns Field values
      */
     getRestFieldValues(taskId: string, field: string): Observable<any> {
-        return Observable.fromPromise(this.taskApi.getRestFieldValues(taskId, field)).catch(err => this.handleError(err));
+        return from(this.taskApi.getRestFieldValues(taskId, field))
+            .pipe(
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -377,7 +402,10 @@ export class FormService {
      * @returns Field values
      */
     getRestFieldValuesByProcessId(processDefinitionId: string, field: string): Observable<any> {
-        return Observable.fromPromise(this.processApi.getRestFieldValues(processDefinitionId, field)).catch(err => this.handleError(err));
+        return from(this.processApi.getRestFieldValues(processDefinitionId, field))
+            .pipe(
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -388,7 +416,10 @@ export class FormService {
      * @returns Field values
      */
     getRestFieldValuesColumnByProcessId(processDefinitionId: string, field: string, column?: string): Observable<any> {
-        return Observable.fromPromise(this.processApi.getRestTableFieldValues(processDefinitionId, field, column)).catch(err => this.handleError(err));
+        return from(this.processApi.getRestTableFieldValues(processDefinitionId, field, column))
+            .pipe(
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -399,7 +430,10 @@ export class FormService {
      * @returns Field values
      */
     getRestFieldValuesColumn(taskId: string, field: string, column?: string): Observable<any> {
-        return Observable.fromPromise(this.taskApi.getRestFieldValuesColumn(taskId, field, column)).catch(err => this.handleError(err));
+        return from(this.taskApi.getRestFieldValuesColumn(taskId, field, column))
+            .pipe(
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -422,15 +456,17 @@ export class FormService {
         if (groupId) {
             option.groupId = groupId;
         }
-        return Observable.fromPromise(this.usersWorkflowApi.getUsers(option))
-            .switchMap((response: any) => <UserProcessModel[]> response.data || [])
-            .map((user: any) => {
-                user.userImage = this.getUserProfileImageApi(user.id);
-                return Observable.of(user);
-            })
-            .combineAll()
-            .defaultIfEmpty([])
-            .catch(err => this.handleError(err));
+        return from(this.usersWorkflowApi.getUsers(option))
+            .pipe(
+                switchMap((response: any) => <UserProcessModel[]> response.data || []),
+                map((user: any) => {
+                    user.userImage = this.getUserProfileImageApi(user.id);
+                    return of(user);
+                }),
+                combineAll(),
+                defaultIfEmpty([]),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -444,9 +480,11 @@ export class FormService {
         if (groupId) {
             option.groupId = groupId;
         }
-        return Observable.fromPromise(this.groupsApi.getGroups(option))
-            .map((response: any) => <GroupModel[]> response.data || [])
-            .catch(err => this.handleError(err));
+        return from(this.groupsApi.getGroups(option))
+            .pipe(
+                map((response: any) => <GroupModel[]> response.data || []),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -500,6 +538,6 @@ export class FormService {
                 error.status ? `${error.status} - ${error.statusText}` : FormService.GENERIC_ERROR_MESSAGE;
         }
         this.logService.error(errMsg);
-        return Observable.throw(errMsg);
+        return throwError(errMsg);
     }
 }
diff --git a/lib/core/form/services/node.service.ts b/lib/core/form/services/node.service.ts
index 9a00dc4c33..7333c887e4 100644
--- a/lib/core/form/services/node.service.ts
+++ b/lib/core/form/services/node.service.ts
@@ -17,8 +17,9 @@
 
 import { AlfrescoApiService } from '../../services/alfresco-api.service';
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable, from } from 'rxjs';
 import { NodeMetadata } from '../models/node-metadata.model';
+import { map } from 'rxjs/operators';
 
 @Injectable()
 export class NodeService {
@@ -31,7 +32,8 @@ export class NodeService {
      * @param nodeId Node Id
      */
     public getNodeMetadata(nodeId: string): Observable<NodeMetadata> {
-        return Observable.fromPromise(this.apiService.getInstance().nodes.getNodeInfo(nodeId)).map(this.cleanMetadataFromSemicolon);
+        return from(this.apiService.getInstance().nodes.getNodeInfo(nodeId))
+            .pipe(map(this.cleanMetadataFromSemicolon));
     }
 
     /**
@@ -69,7 +71,7 @@ export class NodeService {
 
         // TODO: requires update to alfresco-js-api typings
         let apiService: any = this.apiService.getInstance();
-        return Observable.fromPromise(apiService.nodes.addNode('-root-', body, {}));
+        return from(apiService.nodes.addNode('-root-', body, {}));
     }
 
     private generateUuid() {
diff --git a/lib/core/form/services/process-content.service.spec.ts b/lib/core/form/services/process-content.service.spec.ts
index 3bb0c6a48d..91ebca6028 100644
--- a/lib/core/form/services/process-content.service.spec.ts
+++ b/lib/core/form/services/process-content.service.spec.ts
@@ -16,7 +16,7 @@
  */
 
 import { TestBed } from '@angular/core/testing';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 import { ProcessContentService } from './process-content.service';
 import { setupTestBed } from '../../testing/setupTestBed';
 import { CoreModule } from '../../core.module';
@@ -188,7 +188,7 @@ describe('ProcessContentService', () => {
     it('should return a Blob as thumbnail', (done) => {
         let contentId: number = 999;
         let blob = createFakeBlob();
-        spyOn(service, 'getContentThumbnail').and.returnValue(Observable.of(blob));
+        spyOn(service, 'getContentThumbnail').and.returnValue(of(blob));
         service.getContentThumbnail(contentId).subscribe(result => {
             expect(result).toEqual(jasmine.any(Blob));
             expect(result.size).toEqual(48);
diff --git a/lib/core/form/services/process-content.service.ts b/lib/core/form/services/process-content.service.ts
index 662859eb84..870cf14888 100644
--- a/lib/core/form/services/process-content.service.ts
+++ b/lib/core/form/services/process-content.service.ts
@@ -19,10 +19,8 @@ import { AlfrescoApiService } from '../../services/alfresco-api.service';
 import { LogService } from '../../services/log.service';
 import { Injectable } from '@angular/core';
 import { RelatedContentRepresentation } from 'alfresco-js-api';
-import { Observable } from 'rxjs/Observable';
-import 'rxjs/add/observable/fromPromise';
-import 'rxjs/add/operator/catch';
-import 'rxjs/add/observable/throw';
+import { Observable, from, throwError } from 'rxjs';
+import { catchError } from 'rxjs/operators';
 
 @Injectable()
 export class ProcessContentService {
@@ -44,7 +42,8 @@ export class ProcessContentService {
      * @returns The created content data
      */
     createTemporaryRawRelatedContent(file: any): Observable<RelatedContentRepresentation> {
-        return Observable.fromPromise(this.contentApi.createTemporaryRawRelatedContent(file)).catch(err => this.handleError(err));
+        return from(this.contentApi.createTemporaryRawRelatedContent(file))
+            .pipe(catchError(err => this.handleError(err)));
     }
 
     /**
@@ -53,7 +52,8 @@ export class ProcessContentService {
      * @returns Metadata for the content
      */
     getFileContent(contentId: number): Observable<RelatedContentRepresentation> {
-        return Observable.fromPromise(this.contentApi.getContent(contentId)).catch(err => this.handleError(err));
+        return from(this.contentApi.getContent(contentId))
+            .pipe(catchError(err => this.handleError(err)));
     }
 
     /**
@@ -62,7 +62,8 @@ export class ProcessContentService {
      * @returns Binary data of the related content
      */
     getFileRawContent(contentId: number): Observable<Blob> {
-        return Observable.fromPromise(this.contentApi.getRawContent(contentId)).catch(err => this.handleError(err));
+        return from(this.contentApi.getRawContent(contentId))
+            .pipe(catchError(err => this.handleError(err)));
     }
 
     /**
@@ -108,7 +109,8 @@ export class ProcessContentService {
      * @returns Binary data of the thumbnail image
      */
     getContentThumbnail(contentId: number): Observable<Blob> {
-        return Observable.fromPromise(this.contentApi.getContentThumbnail(contentId)).catch(err => this.handleError(err));
+        return from(this.contentApi.getContentThumbnail(contentId))
+            .pipe(catchError(err => this.handleError(err)));
     }
 
     /**
@@ -117,8 +119,8 @@ export class ProcessContentService {
      * @returns Metadata for the content
      */
     getTaskRelatedContent(taskId: string): Observable<any> {
-        return Observable.fromPromise(this.contentApi.getRelatedContentForTask(taskId))
-            .catch(err => this.handleError(err));
+        return from(this.contentApi.getRelatedContentForTask(taskId))
+            .pipe(catchError(err => this.handleError(err)));
     }
 
     /**
@@ -127,8 +129,8 @@ export class ProcessContentService {
      * @returns Metadata for the content
      */
     getProcessRelatedContent(processId: string): Observable<any> {
-        return Observable.fromPromise(this.contentApi.getRelatedContentForProcessInstance(processId))
-            .catch(err => this.handleError(err));
+        return from(this.contentApi.getRelatedContentForProcessInstance(processId))
+            .pipe(catchError(err => this.handleError(err)));
     }
 
     /**
@@ -137,8 +139,8 @@ export class ProcessContentService {
      * @returns Null response that notifies when the deletion is complete
      */
     deleteRelatedContent(contentId: number): Observable<any> {
-        return Observable.fromPromise(this.contentApi.deleteContent(contentId))
-            .catch(err => this.handleError(err));
+        return from(this.contentApi.deleteContent(contentId))
+            .pipe(catchError(err => this.handleError(err)));
     }
 
     /**
@@ -149,8 +151,8 @@ export class ProcessContentService {
      * @returns Details of created content
      */
     createProcessRelatedContent(processInstanceId: string, content: any, opts?: any): Observable<any> {
-        return Observable.fromPromise(this.contentApi.createRelatedContentOnProcessInstance(processInstanceId, content, opts))
-            .catch(err => this.handleError(err));
+        return from(this.contentApi.createRelatedContentOnProcessInstance(processInstanceId, content, opts))
+            .pipe(catchError(err => this.handleError(err)));
     }
 
     /**
@@ -161,8 +163,8 @@ export class ProcessContentService {
      * @returns Details of created content
      */
     createTaskRelatedContent(taskId: string, file: any, opts?: any) {
-        return Observable.fromPromise(this.contentApi.createRelatedContentOnTask(taskId, file, opts))
-            .catch(err => this.handleError(err));
+        return from(this.contentApi.createRelatedContentOnTask(taskId, file, opts))
+            .pipe(catchError(err => this.handleError(err)));
     }
 
     /**
@@ -201,7 +203,7 @@ export class ProcessContentService {
                 error.status ? `${error.status} - ${error.statusText}` : ProcessContentService.GENERIC_ERROR_MESSAGE;
         }
         this.logService.error(errMsg);
-        return Observable.throw(errMsg);
+        return throwError(errMsg);
     }
 
 }
diff --git a/lib/core/form/services/widget-visibility.service.ts b/lib/core/form/services/widget-visibility.service.ts
index 8bf36b1b0f..f0aaf43d03 100644
--- a/lib/core/form/services/widget-visibility.service.ts
+++ b/lib/core/form/services/widget-visibility.service.ts
@@ -19,11 +19,11 @@ import { AlfrescoApiService } from '../../services/alfresco-api.service';
 import { LogService } from '../../services/log.service';
 import { Injectable } from '@angular/core';
 import moment from 'moment-es6';
-import { Observable } from 'rxjs/Observable';
+import { Observable, from, throwError } from 'rxjs';
 import { FormFieldModel, FormModel, TabModel } from '../components/widgets/core/index';
 import { TaskProcessVariableModel } from '../models/task-process-variable.model';
 import { WidgetVisibilityModel } from '../models/widget-visibility.model';
-import 'rxjs/add/observable/throw';
+import { map, catchError } from 'rxjs/operators';
 
 @Injectable()
 export class WidgetVisibilityService {
@@ -244,13 +244,15 @@ export class WidgetVisibilityService {
     }
 
     getTaskProcessVariable(taskId: string): Observable<TaskProcessVariableModel[]> {
-        return Observable.fromPromise(this.apiService.getInstance().activiti.taskFormsApi.getTaskFormVariables(taskId))
-            .map(res => {
-                let jsonRes = this.toJson(res);
-                this.processVarList = <TaskProcessVariableModel[]> jsonRes;
-                return jsonRes;
-            })
-            .catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().activiti.taskFormsApi.getTaskFormVariables(taskId))
+            .pipe(
+                map(res => {
+                    let jsonRes = this.toJson(res);
+                    this.processVarList = <TaskProcessVariableModel[]> jsonRes;
+                    return jsonRes;
+                }),
+                catchError(err => this.handleError(err))
+            );
     }
 
     toJson(res: any) {
@@ -259,6 +261,6 @@ export class WidgetVisibilityService {
 
     private handleError(err) {
         this.logService.error('Error while performing a call');
-        return Observable.throw('Error while performing a call - Server error');
+        return throwError('Error while performing a call - Server error');
     }
 }
diff --git a/lib/core/i18n/de.json b/lib/core/i18n/de.json
index a46a4101a3..759de19f83 100644
--- a/lib/core/i18n/de.json
+++ b/lib/core/i18n/de.json
@@ -118,6 +118,12 @@
       "ERROR_PLURAL": "{{ number }} Elemente konnten nicht gelöscht werden"
     },
     "HOST_SETTINGS": {
+      "TYPE-AUTH": "Authentifizierungstyp",
+      "BASIC": "Basisauthentifizierung",
+      "SSO": "SSO",
+      "IMPLICIT-FLOW": "Impliziter Fluss",
+      "PROVIDER": "Provider",
+      "REQUIRED": "Dies ist ein Pflichtfeld",
       "CS_URL_ERROR": "Content Services-Adresse nicht im richtigen URL-Format",
       "PS_URL_ERROR": "Process Services-Adresse nicht im richtigen URL-Format",
       "TITLE": "Einstellungen",
@@ -125,9 +131,19 @@
       "BP-HOST": "URL für Process Services",
       "BACK": "Zurück",
       "APPLY": "Anwenden",
-      "NOT_VALID": "http(s)://host|ip:port(/path) nicht erkannt. Probieren Sie es mit einer anderen URL."
+      "NOT_VALID": "http(s)://host|ip:port(/path) nicht erkannt. Probieren Sie es mit einer anderen URL.",
+      "REDIRECT": "Umleitungs-URI",
+      "REDIRECT_LOGOUT": "Umleitungs-URI zum Abmelden",
+      "SILENT": "Automatische Anmeldung",
+      "SCOPE": "Bereich",
+      "CLIENT": "Client-ID"
     },
     "CARDVIEW": {
+      "KEYVALUEPAIRS": {
+        "ADD": "Neue hinzufügen",
+        "NAME": "Name",
+        "VALUE": "Wert"
+      },
       "VALIDATORS": {
         "FLOAT_VALIDATION_ERROR": "Verwenden Sie ein Zahlenformat",
         "INT_VALIDATION_ERROR": "Verwenden Sie ein Ganzzahlenformat"
@@ -157,7 +173,7 @@
   },
   "COMMENTS": {
     "NONE": "Keine Kommentare vorhanden",
-    "ADD": "Kommentar hinzufügen",
+    "ADD": "Hinzufügen",
     "HEADER": "Kommentare ({{ count }})",
     "CREATED_BY_HEADER": "Erstellt von",
     "MESSAGE_HEADER": "Fehlermeldung",
@@ -193,7 +209,8 @@
     "BUTTON": {
       "LOGIN": "Anmelden",
       "CHECKING": "Überprüfung",
-      "WELCOME": "Willkommen"
+      "WELCOME": "Willkommen",
+      "SSO": "Bei SSO anmelden"
     },
     "ACTION": {
       "HELP": "Brauchen Sie Hilfe?",
@@ -289,25 +306,21 @@
       "TITLE": "Sie sind nicht zum Zugriff auf diesen Server berechtigt.",
       "DESCRIPTION": "Sie sind nicht zum Zugriff auf diese Ressource auf dem Server berechtigt.",
       "SECONDARY_BUTTON": {
-        "TEXT": "Problem melden",
-        "URL": ""
+        "TEXT": "Problem melden"
       },
       "RETURN_BUTTON": {
-        "TEXT": "Zurück zur Startseite",
-        "ROUTE": "Startseite"
+        "TEXT": "Zurück zur Startseite"
       }
     },
     "404": {
       "TITLE": "Es ist ein Fehler aufgetreten.",
       "DESCRIPTION": "Die Seite, nach der Sie suchen, wurde nicht gefunden.",
       "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
       },
       "RETURN_BUTTON": {
-        "TEXT": "Zurück zur Startseite",
-        "ROUTE": "Startseite"
+        "TEXT": "Zurück zur Startseite"
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/lib/core/i18n/en.json b/lib/core/i18n/en.json
index 4fc92119f6..f4cadf4074 100644
--- a/lib/core/i18n/en.json
+++ b/lib/core/i18n/en.json
@@ -119,11 +119,11 @@
     },
     "HOST_SETTINGS": {
       "TYPE-AUTH": "Authentication type",
-      "BASIC": "Basic Auth",
+      "BASIC": "Basic Authentication",
       "SSO": "SSO",
-      "IMPLICIT-FLOW": "implicitFlow",
+      "IMPLICIT-FLOW": "Implicit Flow",
       "PROVIDER": "Provider",
-      "REQUIRED": "The field is required",
+      "REQUIRED": "This field is required",
       "CS_URL_ERROR": "Content Services address doesn't match the URL format",
       "PS_URL_ERROR": "Process Services address doesn't match the URL format",
       "TITLE": "Settings",
@@ -132,12 +132,18 @@
       "BACK": "Back",
       "APPLY": "APPLY",
       "NOT_VALID": "http(s)://host|ip:port(/path) not recognized, try a different URL.",
-      "REDIRECT": "Redirect Uri",
+      "REDIRECT": "Redirect URI",
+      "REDIRECT_LOGOUT": "Redirect URI Logout",
       "SILENT": "Silent Login",
       "SCOPE": "Scope",
-      "CLIENT": "ClientId"
+      "CLIENT": "Client ID"
     },
     "CARDVIEW": {
+      "KEYVALUEPAIRS": {
+        "ADD": "Add New",
+        "NAME": "Name",
+        "VALUE": "Value"
+      },
       "VALIDATORS": {
         "FLOAT_VALIDATION_ERROR": "Use a number format",
         "INT_VALIDATION_ERROR": "Use an integer format"
@@ -167,7 +173,7 @@
   },
   "COMMENTS": {
     "NONE": "No comments",
-    "ADD": "Add a comment",
+    "ADD": "Add",
     "HEADER": "Comments ({{ count }})",
     "CREATED_BY_HEADER": "Created by",
     "MESSAGE_HEADER": "Message",
@@ -288,36 +294,30 @@
       "TITLE": "We hit a problem.",
       "DESCRIPTION": "Looks like something went wrong.",
       "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
       },
       "RETURN_BUTTON": {
-        "TEXT": "Back to home",
-        "ROUTE": "Home"
+        "TEXT": "Back to home"
       }
     },
     "403": {
       "TITLE": "You don't have permission to access this server.",
       "DESCRIPTION": "You're not allowed access to this resource on the server.",
       "SECONDARY_BUTTON": {
-        "TEXT": "Report issue",
-        "URL": ""
+        "TEXT": "Report issue"
       },
       "RETURN_BUTTON": {
-        "TEXT": "Back to home",
-        "ROUTE": "Home"
+        "TEXT": "Back to home"
       }
     },
     "404": {
       "TITLE": "An error occurred.",
       "DESCRIPTION": "We couldn’t find the page you were looking for.",
       "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
       },
       "RETURN_BUTTON": {
-        "TEXT": "Back to home",
-        "ROUTE": "Home"
+        "TEXT": "Back to home"
       }
     }
   }
diff --git a/lib/core/i18n/es.json b/lib/core/i18n/es.json
index 903f72b849..94d4570dda 100644
--- a/lib/core/i18n/es.json
+++ b/lib/core/i18n/es.json
@@ -118,6 +118,12 @@
       "ERROR_PLURAL": "{{ number }} elementos no se han podido eliminar"
     },
     "HOST_SETTINGS": {
+      "TYPE-AUTH": "Tipo de autenticación",
+      "BASIC": "Autenticación básica",
+      "SSO": "SSO",
+      "IMPLICIT-FLOW": "Flujo implícito",
+      "PROVIDER": "Proveedor",
+      "REQUIRED": "Campo necesario",
       "CS_URL_ERROR": "La dirección de Content Services no coincide con el formato de la URL",
       "PS_URL_ERROR": "La dirección de Process Services no coincide con el formato de la URL",
       "TITLE": "Configuración",
@@ -125,9 +131,19 @@
       "BP-HOST": "URL de Process Services",
       "BACK": "Volver",
       "APPLY": "Aplicar",
-      "NOT_VALID": "http(s)://host|ip:port(/path) no reconocido; pruebe con una URL diferente."
+      "NOT_VALID": "http(s)://host|ip:port(/path) no reconocido; pruebe con una URL diferente.",
+      "REDIRECT": "URI de redireccionamiento",
+      "REDIRECT_LOGOUT": "Cierre de sesión de URI de redireccionamiento",
+      "SILENT": "Inicio de sesión silencioso",
+      "SCOPE": "Ámbito",
+      "CLIENT": "ID de cliente"
     },
     "CARDVIEW": {
+      "KEYVALUEPAIRS": {
+        "ADD": "Añadir nuevo",
+        "NAME": "Nombre",
+        "VALUE": "Valor"
+      },
       "VALIDATORS": {
         "FLOAT_VALIDATION_ERROR": "Utilizar un formato de número",
         "INT_VALIDATION_ERROR": "Utilizar un formato de entero"
@@ -157,7 +173,7 @@
   },
   "COMMENTS": {
     "NONE": "No hay comentarios",
-    "ADD": "Añadir comentario",
+    "ADD": "Añadir",
     "HEADER": "Comentarios ({{ count }})",
     "CREATED_BY_HEADER": "Creado por",
     "MESSAGE_HEADER": "Mensaje",
@@ -193,7 +209,8 @@
     "BUTTON": {
       "LOGIN": "Iniciar sesión",
       "CHECKING": "Comprobando",
-      "WELCOME": "Bienvenido"
+      "WELCOME": "Bienvenido",
+      "SSO": "Iniciar sesión en SSO"
     },
     "ACTION": {
       "HELP": "¿Necesita ayuda?",
@@ -277,37 +294,31 @@
       "TITLE": "Se ha producido un error.",
       "DESCRIPTION": "Parece que algo ha ido mal.",
       "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
       },
       "RETURN_BUTTON": {
-        "TEXT": "Volver al inicio",
-        "ROUTE": "Inicio"
+        "TEXT": "Volver al inicio"
       }
     },
     "403": {
       "TITLE": "No tiene permiso para acceder a este servidor.",
       "DESCRIPTION": "No tiene permitido acceder a este recurso en el servidor.",
       "SECONDARY_BUTTON": {
-        "TEXT": "Notificar problema",
-        "URL": ""
+        "TEXT": "Notificar problema"
       },
       "RETURN_BUTTON": {
-        "TEXT": "Volver al inicio",
-        "ROUTE": "Inicio"
+        "TEXT": "Volver al inicio"
       }
     },
     "404": {
       "TITLE": "Se ha producido un error.",
       "DESCRIPTION": "No hemos podido encontrar la página que busca.",
       "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
       },
       "RETURN_BUTTON": {
-        "TEXT": "Volver al inicio",
-        "ROUTE": "Inicio"
+        "TEXT": "Volver al inicio"
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/lib/core/i18n/fr.json b/lib/core/i18n/fr.json
index 7dbd5e650c..f0b8ceb723 100644
--- a/lib/core/i18n/fr.json
+++ b/lib/core/i18n/fr.json
@@ -118,6 +118,12 @@
       "ERROR_PLURAL": "{{ number }} éléments n'ont pas pu être supprimés"
     },
     "HOST_SETTINGS": {
+      "TYPE-AUTH": "Type d'authentification",
+      "BASIC": "Authentification de base",
+      "SSO": "SSO",
+      "IMPLICIT-FLOW": "Flux implicite",
+      "PROVIDER": "Fournisseur",
+      "REQUIRED": "Ce champ est obligatoire",
       "CS_URL_ERROR": "L'adresse Content Services ne correspond pas au format d'URL",
       "PS_URL_ERROR": "L'adresse Process Services ne correspond pas au format d'URL",
       "TITLE": "Paramètres",
@@ -125,9 +131,19 @@
       "BP-HOST": "URL Process Services",
       "BACK": "Retour",
       "APPLY": "Appliquer",
-      "NOT_VALID": "Adresse http(s)://host|ip:port(/path) non reconnue, essayez une autre URL."
+      "NOT_VALID": "Adresse http(s)://host|ip:port(/path) non reconnue, essayez une autre URL.",
+      "REDIRECT": "URI de redirection",
+      "REDIRECT_LOGOUT": "Déconnexion URI de redirection",
+      "SILENT": "Connexion en mode silencieux",
+      "SCOPE": "Etendue",
+      "CLIENT": "ID client"
     },
     "CARDVIEW": {
+      "KEYVALUEPAIRS": {
+        "ADD": "Ajouter nouveau",
+        "NAME": "Nom",
+        "VALUE": "Valeur"
+      },
       "VALIDATORS": {
         "FLOAT_VALIDATION_ERROR": "Utiliser un format de numéro",
         "INT_VALIDATION_ERROR": "Utiliser un format d'entier"
@@ -157,7 +173,7 @@
   },
   "COMMENTS": {
     "NONE": "Pas de commentaire",
-    "ADD": "Ajouter un commentaire",
+    "ADD": "Ajouter",
     "HEADER": "Commentaires ({{ count }})",
     "CREATED_BY_HEADER": "Créé par",
     "MESSAGE_HEADER": "Message",
@@ -193,7 +209,8 @@
     "BUTTON": {
       "LOGIN": "Connexion",
       "CHECKING": "Vérification",
-      "WELCOME": "Bienvenue"
+      "WELCOME": "Bienvenue",
+      "SSO": "Authentification SSO"
     },
     "ACTION": {
       "HELP": "Besoin d'aide ?",
@@ -277,37 +294,31 @@
       "TITLE": "Une erreur est survenue.",
       "DESCRIPTION": "Il semble qu'une erreur soit survenue.",
       "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
       },
       "RETURN_BUTTON": {
-        "TEXT": "Retour à l'accueil",
-        "ROUTE": "Accueil"
+        "TEXT": "Retour à l'accueil"
       }
     },
     "403": {
       "TITLE": "Vous n'avez pas les droits d'accès à ce serveur.",
       "DESCRIPTION": "Vous n'êtes pas autorisé à accéder à cette ressource sur le serveur.",
       "SECONDARY_BUTTON": {
-        "TEXT": "Signaler le problème",
-        "URL": ""
+        "TEXT": "Signaler le problème"
       },
       "RETURN_BUTTON": {
-        "TEXT": "Retour à l'accueil",
-        "ROUTE": "Accueil"
+        "TEXT": "Retour à l'accueil"
       }
     },
     "404": {
       "TITLE": "Une erreur est survenue.",
       "DESCRIPTION": "Impossible de trouver la page recherchée.",
       "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
       },
       "RETURN_BUTTON": {
-        "TEXT": "Retour à l'accueil",
-        "ROUTE": "Accueil"
+        "TEXT": "Retour à l'accueil"
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/lib/core/i18n/it.json b/lib/core/i18n/it.json
index 45802b3db0..7727321b54 100644
--- a/lib/core/i18n/it.json
+++ b/lib/core/i18n/it.json
@@ -118,6 +118,12 @@
       "ERROR_PLURAL": "Impossibile eliminare {{ number }} elementi"
     },
     "HOST_SETTINGS": {
+      "TYPE-AUTH": "Tipo di autenticazione",
+      "BASIC": "Autenticazione di base",
+      "SSO": "SSO",
+      "IMPLICIT-FLOW": "Flusso implicito",
+      "PROVIDER": "Fornitore",
+      "REQUIRED": "Questo campo è obbligatorio",
       "CS_URL_ERROR": "L'indirizzo Content Services non corrisponde al formato dell'URL",
       "PS_URL_ERROR": "L'indirizzo Process Services non corrisponde al formato dell'URL",
       "TITLE": "Impostazioni",
@@ -125,9 +131,19 @@
       "BP-HOST": "URL Process Services",
       "BACK": "Indietro",
       "APPLY": "Applica",
-      "NOT_VALID": "http(s)://host|ip:port(/path) non riconosciuto, provare un URL diverso."
+      "NOT_VALID": "http(s)://host|ip:port(/path) non riconosciuto, provare un URL diverso.",
+      "REDIRECT": "Reindirizza URI",
+      "REDIRECT_LOGOUT": "Reindirizza uscita URI",
+      "SILENT": "Accesso invisibile",
+      "SCOPE": "Ambito",
+      "CLIENT": "ID cliente"
     },
     "CARDVIEW": {
+      "KEYVALUEPAIRS": {
+        "ADD": "Aggiungi nuova",
+        "NAME": "Nome",
+        "VALUE": "Valore"
+      },
       "VALIDATORS": {
         "FLOAT_VALIDATION_ERROR": "Utilizzare un formato numerico",
         "INT_VALIDATION_ERROR": "Utilizzare numeri interi"
@@ -157,7 +173,7 @@
   },
   "COMMENTS": {
     "NONE": "Nessun commento",
-    "ADD": "Aggiungi commento",
+    "ADD": "Aggiungi",
     "HEADER": "Commenti ({{ count }})",
     "CREATED_BY_HEADER": "Creato da",
     "MESSAGE_HEADER": "Messaggio",
@@ -193,7 +209,8 @@
     "BUTTON": {
       "LOGIN": "Accedi",
       "CHECKING": "Verifica in corso",
-      "WELCOME": "Benvenuto"
+      "WELCOME": "Benvenuto",
+      "SSO": "Accedi con SSO"
     },
     "ACTION": {
       "HELP": "Hai bisogno di aiuto?",
@@ -277,37 +294,31 @@
       "TITLE": "Si è verificato un errore.",
       "DESCRIPTION": "Si è verificato un errore.",
       "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
       },
       "RETURN_BUTTON": {
-        "TEXT": "Torna alla home",
-        "ROUTE": "Home"
+        "TEXT": "Torna alla home"
       }
     },
     "403": {
       "TITLE": "Non si dispone delle autorizzazioni per accedere al server.",
       "DESCRIPTION": "Accesso alla risorsa sul server non consentito.",
       "SECONDARY_BUTTON": {
-        "TEXT": "Segnala errore",
-        "URL": ""
+        "TEXT": "Segnala errore"
       },
       "RETURN_BUTTON": {
-        "TEXT": "Torna alla home",
-        "ROUTE": "Home"
+        "TEXT": "Torna alla home"
       }
     },
     "404": {
       "TITLE": "Si è verificato un errore.",
       "DESCRIPTION": "Impossibile trovare la pagina.",
       "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
       },
       "RETURN_BUTTON": {
-        "TEXT": "Torna alla home",
-        "ROUTE": "Home"
+        "TEXT": "Torna alla home"
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/lib/core/i18n/ja.json b/lib/core/i18n/ja.json
index 87b9552466..636ed63857 100644
--- a/lib/core/i18n/ja.json
+++ b/lib/core/i18n/ja.json
@@ -118,6 +118,12 @@
       "ERROR_PLURAL": "{{ number }} 件のアイテムを削除できませんでした"
     },
     "HOST_SETTINGS": {
+      "TYPE-AUTH": "認証の種類",
+      "BASIC": "基本認証",
+      "SSO": "SSO",
+      "IMPLICIT-FLOW": "暗黙的フロー",
+      "PROVIDER": "プロバイダ",
+      "REQUIRED": "このフィールドは必須です",
       "CS_URL_ERROR": "Content Services のアドレスが URL 形式と一致しません",
       "PS_URL_ERROR": "Process Services のアドレスが URL 形式と一致しません",
       "TITLE": "設定",
@@ -125,9 +131,19 @@
       "BP-HOST": "Process Services の URL",
       "BACK": "戻る",
       "APPLY": "適用",
-      "NOT_VALID": "http(s)://host|ip:port(/path) が認識されません。別の URL を指定してください。"
+      "NOT_VALID": "http(s)://host|ip:port(/path) が認識されません。別の URL を指定してください。",
+      "REDIRECT": "リダイレクト URI",
+      "REDIRECT_LOGOUT": "リダイレクト URI のログアウト",
+      "SILENT": "サイレントログイン",
+      "SCOPE": "範囲",
+      "CLIENT": "クライアント ID"
     },
     "CARDVIEW": {
+      "KEYVALUEPAIRS": {
+        "ADD": "新規追加",
+        "NAME": "名前",
+        "VALUE": "値"
+      },
       "VALIDATORS": {
         "FLOAT_VALIDATION_ERROR": "番号形式を使用してください",
         "INT_VALIDATION_ERROR": "整数形式を使用してください"
@@ -157,7 +173,7 @@
   },
   "COMMENTS": {
     "NONE": "コメントなし",
-    "ADD": "コメントの追加",
+    "ADD": "追加",
     "HEADER": "コメント ({{ count }} 件)",
     "CREATED_BY_HEADER": "作成者",
     "MESSAGE_HEADER": "メッセージ",
@@ -193,7 +209,8 @@
     "BUTTON": {
       "LOGIN": "サインイン",
       "CHECKING": "確認中",
-      "WELCOME": "ようこそ"
+      "WELCOME": "ようこそ",
+      "SSO": "サインイン SSO"
     },
     "ACTION": {
       "HELP": "ヘルプが必要ですか?",
@@ -277,37 +294,31 @@
       "TITLE": "エラーが発生しました。",
       "DESCRIPTION": "何らかの問題がある可能性があります。",
       "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
       },
       "RETURN_BUTTON": {
-        "TEXT": "ホームへ戻る",
-        "ROUTE": "ホーム"
+        "TEXT": "ホームへ戻る"
       }
     },
     "403": {
       "TITLE": "このサーバーにアクセスする権限がありません。",
       "DESCRIPTION": "サーバー上のこのリソースにはアクセスできません。",
       "SECONDARY_BUTTON": {
-        "TEXT": "問題の報告",
-        "URL": ""
+        "TEXT": "問題の報告"
       },
       "RETURN_BUTTON": {
-        "TEXT": "ホームへ戻る",
-        "ROUTE": "ホーム"
+        "TEXT": "ホームへ戻る"
       }
     },
     "404": {
       "TITLE": "エラーが発生しました。",
       "DESCRIPTION": "お探しのページが見つかりませんでした。",
       "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
       },
       "RETURN_BUTTON": {
-        "TEXT": "ホームへ戻る",
-        "ROUTE": "ホーム"
+        "TEXT": "ホームへ戻る"
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/lib/core/i18n/nb.json b/lib/core/i18n/nb.json
index 4a17513917..a5f7576441 100644
--- a/lib/core/i18n/nb.json
+++ b/lib/core/i18n/nb.json
@@ -118,6 +118,12 @@
       "ERROR_PLURAL": "{{ number }} elementer kan ikke slettes"
     },
     "HOST_SETTINGS": {
+      "TYPE-AUTH": "Godkjenningstype",
+      "BASIC": "Grunnleggende godkjenning",
+      "SSO": "SSO",
+      "IMPLICIT-FLOW": "Implisitt flyt",
+      "PROVIDER": "Leverandør",
+      "REQUIRED": "Dette feltet er påkrevd",
       "CS_URL_ERROR": "Adressen til innholdstjenesten stemmer ikke med URL-formatet",
       "PS_URL_ERROR": "Adressen til prosesstjenestene stemmer ikke med URL-formatet",
       "TITLE": "Innstillinger",
@@ -125,9 +131,19 @@
       "BP-HOST": "URL prosesstjenester",
       "BACK": "Tilbake",
       "APPLY": "Bruk",
-      "NOT_VALID": "http(s)://host|ip:port(/path) ikke gjenkjent, prøv en annen URL."
+      "NOT_VALID": "http(s)://host|ip:port(/path) ikke gjenkjent, prøv en annen URL.",
+      "REDIRECT": "Omdirigerings-URI",
+      "REDIRECT_LOGOUT": "Omdirigerings-URI avlogging",
+      "SILENT": "Stille pålogging",
+      "SCOPE": "Område",
+      "CLIENT": "Klient-ID"
     },
     "CARDVIEW": {
+      "KEYVALUEPAIRS": {
+        "ADD": "Legg til ny",
+        "NAME": "Navn",
+        "VALUE": "Verdi"
+      },
       "VALIDATORS": {
         "FLOAT_VALIDATION_ERROR": "Bruk et nummerformat",
         "INT_VALIDATION_ERROR": "Bruk heltall"
@@ -157,7 +173,7 @@
   },
   "COMMENTS": {
     "NONE": "Ingen kommentarer",
-    "ADD": "Legg til kommentar",
+    "ADD": "Legg til",
     "HEADER": "Kommentarer ({{ count }})",
     "CREATED_BY_HEADER": "Opprettet av",
     "MESSAGE_HEADER": "Melding",
@@ -193,7 +209,8 @@
     "BUTTON": {
       "LOGIN": "Logg på",
       "CHECKING": "Kontrollerer",
-      "WELCOME": "Velkommen"
+      "WELCOME": "Velkommen",
+      "SSO": "Påloggings-SSO"
     },
     "ACTION": {
       "HELP": "Trenger hjelp?",
@@ -277,37 +294,31 @@
       "TITLE": "Det oppstod en feil",
       "DESCRIPTION": "Noe gikk galt.",
       "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
       },
       "RETURN_BUTTON": {
-        "TEXT": "Tilbake til startsiden",
-        "ROUTE": "Hjem"
+        "TEXT": "Tilbake til startsiden"
       }
     },
     "403": {
       "TITLE": "Du har ikke tillatelse for tilgang til denne serveren.",
       "DESCRIPTION": "Du har ikke lov til å få tilgang til denne ressursen på serveren.",
       "SECONDARY_BUTTON": {
-        "TEXT": "Rapporter problem",
-        "URL": ""
+        "TEXT": "Rapporter problem"
       },
       "RETURN_BUTTON": {
-        "TEXT": "Tilbake til startsiden",
-        "ROUTE": "Hjem"
+        "TEXT": "Tilbake til startsiden"
       }
     },
     "404": {
       "TITLE": "Det oppstod en feil.",
       "DESCRIPTION": "Vi kunne ikke finne siden du så etter.",
       "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
       },
       "RETURN_BUTTON": {
-        "TEXT": "Tilbake til startsiden",
-        "ROUTE": "Hjem"
+        "TEXT": "Tilbake til startsiden"
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/lib/core/i18n/nl.json b/lib/core/i18n/nl.json
index 674d8c27c8..1710428ec0 100644
--- a/lib/core/i18n/nl.json
+++ b/lib/core/i18n/nl.json
@@ -118,6 +118,12 @@
       "ERROR_PLURAL": "Kan {{ number }} items niet verwijderen"
     },
     "HOST_SETTINGS": {
+      "TYPE-AUTH": "Verificatietype",
+      "BASIC": "Basisverificatie",
+      "SSO": "SSO",
+      "IMPLICIT-FLOW": "Impliciete stroom",
+      "PROVIDER": "Provider",
+      "REQUIRED": "Dit veld is vereist",
       "CS_URL_ERROR": "Content Services-adres komt niet overeen met de URL-indeling",
       "PS_URL_ERROR": "Process Services-adres komt niet overeen met de URL-indeling",
       "TITLE": "Instellingen",
@@ -125,9 +131,19 @@
       "BP-HOST": "Process Services-URL",
       "BACK": "Terug",
       "APPLY": "Toepassen",
-      "NOT_VALID": "http(s)://host|ip:port(/path) niet herkend, probeer een andere URL."
+      "NOT_VALID": "http(s)://host|ip:port(/path) niet herkend, probeer een andere URL.",
+      "REDIRECT": "Omleidings-URI",
+      "REDIRECT_LOGOUT": "Omleidings-URI afmelden",
+      "SILENT": "Stille aanmelding",
+      "SCOPE": "Bereik",
+      "CLIENT": "Client-id"
     },
     "CARDVIEW": {
+      "KEYVALUEPAIRS": {
+        "ADD": "Nieuwe toevoegen",
+        "NAME": "Naam",
+        "VALUE": "Waarde"
+      },
       "VALIDATORS": {
         "FLOAT_VALIDATION_ERROR": "Gebruik een getalnotatie",
         "INT_VALIDATION_ERROR": "Gebruik een notatie voor gehele getallen"
@@ -157,7 +173,7 @@
   },
   "COMMENTS": {
     "NONE": "Geen opmerkingen",
-    "ADD": "Opmerking toevoegen",
+    "ADD": "Toevoegen",
     "HEADER": "Opmerkingen ({{ count }})",
     "CREATED_BY_HEADER": "Gemaakt door",
     "MESSAGE_HEADER": "Bericht",
@@ -193,7 +209,8 @@
     "BUTTON": {
       "LOGIN": "Aanmelden",
       "CHECKING": "Controleren",
-      "WELCOME": "Welkom"
+      "WELCOME": "Welkom",
+      "SSO": "Aanmelden SSO"
     },
     "ACTION": {
       "HELP": "Hulp nodig?",
@@ -277,37 +294,31 @@
       "TITLE": "Er is een fout opgetreden.",
       "DESCRIPTION": "Er is waarschijnlijk iets fout gegaan.",
       "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
       },
       "RETURN_BUTTON": {
-        "TEXT": "Terug naar Home",
-        "ROUTE": "Home"
+        "TEXT": "Terug naar Home"
       }
     },
     "403": {
       "TITLE": "U hebt geen machtiging voor toegang tot deze server.",
       "DESCRIPTION": "Het is u niet toegestaan toegang te krijgen tot deze resource op de server.",
       "SECONDARY_BUTTON": {
-        "TEXT": "Probleem melden",
-        "URL": ""
+        "TEXT": "Probleem melden"
       },
       "RETURN_BUTTON": {
-        "TEXT": "Terug naar Home",
-        "ROUTE": "Home"
+        "TEXT": "Terug naar Home"
       }
     },
     "404": {
       "TITLE": "Er is een fout opgetreden.",
       "DESCRIPTION": "De pagina die u zoekt is niet gevonden.",
       "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
       },
       "RETURN_BUTTON": {
-        "TEXT": "Terug naar Home",
-        "ROUTE": "Home"
+        "TEXT": "Terug naar Home"
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/lib/core/i18n/pt-BR.json b/lib/core/i18n/pt-BR.json
index 985bb02898..e7045d4142 100644
--- a/lib/core/i18n/pt-BR.json
+++ b/lib/core/i18n/pt-BR.json
@@ -118,6 +118,12 @@
       "ERROR_PLURAL": "Não foi possível excluir {{ number }} itens"
     },
     "HOST_SETTINGS": {
+      "TYPE-AUTH": "Tipo de autenticação",
+      "BASIC": "Autenticação básica",
+      "SSO": "SSO",
+      "IMPLICIT-FLOW": "Fluxo implícito",
+      "PROVIDER": "Provedor",
+      "REQUIRED": "Este campo é obrigatório",
       "CS_URL_ERROR": "O endereço do Content Services não corresponde ao formato de URL",
       "PS_URL_ERROR": "O endereço do Process Services não corresponde ao formato de URL",
       "TITLE": "Configurações",
@@ -125,9 +131,19 @@
       "BP-HOST": "URL do Process Services",
       "BACK": "Voltar",
       "APPLY": "Aplicar",
-      "NOT_VALID": "http(s)://host|ip:port(/path) não reconhecida, tente uma URL diferente."
+      "NOT_VALID": "http(s)://host|ip:port(/path) não reconhecida, tente uma URL diferente.",
+      "REDIRECT": "Redirecionar URI",
+      "REDIRECT_LOGOUT": "Redirecionar logout de URI",
+      "SILENT": "Login silencioso",
+      "SCOPE": "Escopo",
+      "CLIENT": "ID de cliente"
     },
     "CARDVIEW": {
+      "KEYVALUEPAIRS": {
+        "ADD": "Adicionar",
+        "NAME": "Nome",
+        "VALUE": "Valor"
+      },
       "VALIDATORS": {
         "FLOAT_VALIDATION_ERROR": "Use um formato de número",
         "INT_VALIDATION_ERROR": "Use um formato inteiro"
@@ -157,7 +173,7 @@
   },
   "COMMENTS": {
     "NONE": "Sem comentários",
-    "ADD": "Adicionar comentário",
+    "ADD": "Adicionar",
     "HEADER": "({{ count }}) comentários",
     "CREATED_BY_HEADER": "Criado por",
     "MESSAGE_HEADER": "Mensagem",
@@ -193,7 +209,8 @@
     "BUTTON": {
       "LOGIN": "Entrar",
       "CHECKING": "Verificando",
-      "WELCOME": "Bem-vindo"
+      "WELCOME": "Bem-vindo",
+      "SSO": "Entrar no SSO"
     },
     "ACTION": {
       "HELP": "Precisa de ajuda?",
@@ -277,37 +294,31 @@
       "TITLE": "Ocorreu um erro.",
       "DESCRIPTION": "Parece que ocorreu um erro.",
       "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
       },
       "RETURN_BUTTON": {
-        "TEXT": "Voltar para a página inicial",
-        "ROUTE": "Página Inicial"
+        "TEXT": "Voltar para a página inicial"
       }
     },
     "403": {
       "TITLE": "Você não tem permissão para acessar este servidor.",
       "DESCRIPTION": "Você não tem permissão para acessar este recurso no servidor.",
       "SECONDARY_BUTTON": {
-        "TEXT": "Relatar problema",
-        "URL": ""
+        "TEXT": "Relatar problema""
       },
       "RETURN_BUTTON": {
-        "TEXT": "Voltar para a página inicial",
-        "ROUTE": "Página Inicial"
+        "TEXT": "Voltar para a página inicial"
       }
     },
     "404": {
       "TITLE": "Ocorreu um erro.",
       "DESCRIPTION": "Não foi possível encontrar a página que você está procurando.",
       "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
       },
       "RETURN_BUTTON": {
-        "TEXT": "Voltar para a página inicial",
-        "ROUTE": "Página Inicial"
+        "TEXT": "Voltar para a página inicial"
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/lib/core/i18n/ru.json b/lib/core/i18n/ru.json
index ce3ced5434..b094877bcf 100644
--- a/lib/core/i18n/ru.json
+++ b/lib/core/i18n/ru.json
@@ -118,6 +118,12 @@
       "ERROR_PLURAL": "Не удалось удалить элементов: {{ number }}"
     },
     "HOST_SETTINGS": {
+      "TYPE-AUTH": "Тип авторизации",
+      "BASIC": "Базовая авторизация",
+      "SSO": "SSO",
+      "IMPLICIT-FLOW": "Неявный поток",
+      "PROVIDER": "Поставщик",
+      "REQUIRED": "Поле обязательно для заполнения",
       "CS_URL_ERROR": "Адрес Content Services не соответствует формату URL",
       "PS_URL_ERROR": "Адрес Process Services не соответствует формату URL",
       "TITLE": "Параметры",
@@ -125,9 +131,19 @@
       "BP-HOST": "URL-адрес Process Services",
       "BACK": "Назад",
       "APPLY": "Применить",
-      "NOT_VALID": "http(s)://host|ip:port(/path) не распознан, используйте другой URL-адрес."
+      "NOT_VALID": "http(s)://host|ip:port(/path) не распознан, используйте другой URL-адрес.",
+      "REDIRECT": "URI перенаправления",
+      "REDIRECT_LOGOUT": "Выход URI перенаправления",
+      "SILENT": "Автоматический вход",
+      "SCOPE": "Область применения",
+      "CLIENT": "Идентификатор клиента"
     },
     "CARDVIEW": {
+      "KEYVALUEPAIRS": {
+        "ADD": "Добавить",
+        "NAME": "Имя",
+        "VALUE": "Значение"
+      },
       "VALIDATORS": {
         "FLOAT_VALIDATION_ERROR": "Использовать формат числа",
         "INT_VALIDATION_ERROR": "Использовать формат целого числа"
@@ -193,7 +209,8 @@
     "BUTTON": {
       "LOGIN": "Войти",
       "CHECKING": "Проверка",
-      "WELCOME": "Добро пожаловать"
+      "WELCOME": "Добро пожаловать",
+      "SSO": "SSO входа"
     },
     "ACTION": {
       "HELP": "Справка?",
@@ -277,37 +294,31 @@
       "TITLE": "Произошла ошибка.",
       "DESCRIPTION": "Кажется, что-то пошло не так.",
       "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
       },
       "RETURN_BUTTON": {
-        "TEXT": "Назад на главную",
-        "ROUTE": "Домашняя"
+        "TEXT": "Назад на главную"
       }
     },
     "403": {
       "TITLE": "У вас нет разрешения для доступа к этому серверу.",
       "DESCRIPTION": "У вас нет разрешения для доступа к этому ресурсу на сервере.",
       "SECONDARY_BUTTON": {
-        "TEXT": "Сообщить о проблеме",
-        "URL": ""
+        "TEXT": "Сообщить о проблеме"
       },
       "RETURN_BUTTON": {
-        "TEXT": "Назад на главную",
-        "ROUTE": "Домашняя"
+        "TEXT": "Назад на главную"
       }
     },
     "404": {
       "TITLE": "Произошла ошибка.",
       "DESCRIPTION": "Нам не удалось найти страницу, которую вы искали.",
       "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
       },
       "RETURN_BUTTON": {
-        "TEXT": "Назад на главную",
-        "ROUTE": "Домашняя"
+        "TEXT": "Назад на главную"
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/lib/core/i18n/zh-CN.json b/lib/core/i18n/zh-CN.json
index 6a633e7cb8..b4204e3e9a 100644
--- a/lib/core/i18n/zh-CN.json
+++ b/lib/core/i18n/zh-CN.json
@@ -118,6 +118,12 @@
       "ERROR_PLURAL": "{{ number }} 个项目无法删除"
     },
     "HOST_SETTINGS": {
+      "TYPE-AUTH": "身份验证类型",
+      "BASIC": "基本身份验证",
+      "SSO": "SSO",
+      "IMPLICIT-FLOW": "隐式流",
+      "PROVIDER": "提供程序",
+      "REQUIRED": "此字段为必填项",
       "CS_URL_ERROR": "Content Services 地址与 URL 格式不匹配",
       "PS_URL_ERROR": "Process Services 地址与 URL 格式不匹配",
       "TITLE": "设置",
@@ -125,9 +131,19 @@
       "BP-HOST": "Process Services URL",
       "BACK": "返回",
       "APPLY": "应用",
-      "NOT_VALID": "http(s)://host|ip:port(/path) 无法识别，请使用其他 URL。"
+      "NOT_VALID": "http(s)://host|ip:port(/path) 无法识别，请使用其他 URL。",
+      "REDIRECT": "重定向 URI",
+      "REDIRECT_LOGOUT": "重定向 URI 注销",
+      "SILENT": "静默登录",
+      "SCOPE": "范围",
+      "CLIENT": "客户端 ID"
     },
     "CARDVIEW": {
+      "KEYVALUEPAIRS": {
+        "ADD": "新增",
+        "NAME": "名称",
+        "VALUE": "值"
+      },
       "VALIDATORS": {
         "FLOAT_VALIDATION_ERROR": "使用数字格式",
         "INT_VALIDATION_ERROR": "使用整数格式"
@@ -193,7 +209,8 @@
     "BUTTON": {
       "LOGIN": "登录",
       "CHECKING": "正在检验",
-      "WELCOME": "欢迎使用"
+      "WELCOME": "欢迎使用",
+      "SSO": "登录 SSO"
     },
     "ACTION": {
       "HELP": "是否需要帮助？",
@@ -277,37 +294,31 @@
       "TITLE": "出现错误。",
       "DESCRIPTION": "看似发生错误。",
       "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
       },
       "RETURN_BUTTON": {
-        "TEXT": "返回到主页",
-        "ROUTE": "主页"
+        "TEXT": "返回到主页"
       }
     },
     "403": {
       "TITLE": "您没有访问此服务器的权限。",
       "DESCRIPTION": "不允许您访问服务器上的此资源。",
       "SECONDARY_BUTTON": {
-        "TEXT": "报告问题",
-        "URL": ""
+        "TEXT": "报告问题"
       },
       "RETURN_BUTTON": {
-        "TEXT": "返回到主页",
-        "ROUTE": "主页"
+        "TEXT": "返回到主页"
       }
     },
     "404": {
       "TITLE": "出现错误。",
       "DESCRIPTION": "我们无法找到您正在查找的页面。",
       "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
       },
       "RETURN_BUTTON": {
-        "TEXT": "返回到主页",
-        "ROUTE": "主页"
+        "TEXT": "返回到主页"
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/lib/core/index.ts b/lib/core/index.ts
index a7c994c411..23669abccf 100644
--- a/lib/core/index.ts
+++ b/lib/core/index.ts
@@ -31,7 +31,7 @@ export * from './collapsable/index';
 export * from './card-view/index';
 export * from './app-config/index';
 export * from './form/index';
-export * from './sidenav-layout/index';
+export * from './layout/index';
 export * from './comments/index';
 export * from './buttons-menu/index';
 export * from './sorting-picker/index';
diff --git a/lib/core/info-drawer/info-drawer.component.html b/lib/core/info-drawer/info-drawer.component.html
index 6ffddbc2ad..1c0b7c2072 100644
--- a/lib/core/info-drawer/info-drawer.component.html
+++ b/lib/core/info-drawer/info-drawer.component.html
@@ -8,17 +8,16 @@
 
     <ng-template #tabLayout>
         <mat-tab-group [(selectedIndex)]="selectedIndex" class="adf-info-drawer-tabs" (selectedTabChange)="onTabChange($event)">
-            <ng-container *ngFor="let contentBlock of contentBlocks">
-                <mat-tab [label]="contentBlock.label" class="adf-info-drawer-tab">
-                    <ng-container *ngIf="contentBlock.icon">
-                        <ng-template mat-tab-label>
-                            <mat-icon>{{ contentBlock.icon }}</mat-icon>
-                        </ng-template>
-                    </ng-container>
+            <mat-tab *ngFor="let contentBlock of contentBlocks" [label]="contentBlock.label" class="adf-info-drawer-tab">
+                <ng-container *ngIf="contentBlock.icon">
+                    <ng-template mat-tab-label>
+                        <mat-icon>{{ contentBlock.icon }}</mat-icon>
+                        <span *ngIf="contentBlock.label">{{ contentBlock.label }}</span>
+                    </ng-template>
+                </ng-container>
 
-                    <ng-container *ngTemplateOutlet="contentBlock.content"></ng-container>
-                </mat-tab>
-            </ng-container>
+                <ng-container *ngTemplateOutlet="contentBlock.content"></ng-container>
+            </mat-tab>
         </mat-tab-group>
     </ng-template>
 
diff --git a/lib/core/info-drawer/info-drawer.component.scss b/lib/core/info-drawer/info-drawer.component.scss
index 6d2a00dbe7..fbbd55abbd 100644
--- a/lib/core/info-drawer/info-drawer.component.scss
+++ b/lib/core/info-drawer/info-drawer.component.scss
@@ -28,6 +28,10 @@
 
                     .mat-tab-label {
                         flex-grow: 1;
+
+                        .mat-icon + span {
+                            padding-left: 5px;
+                        }
                     }
 
                     .mat-ink-bar {
diff --git a/lib/core/info-drawer/info-drawer.component.spec.ts b/lib/core/info-drawer/info-drawer.component.spec.ts
index e063ca242c..0ed60709fb 100644
--- a/lib/core/info-drawer/info-drawer.component.spec.ts
+++ b/lib/core/info-drawer/info-drawer.component.spec.ts
@@ -115,7 +115,7 @@ describe('Custom InfoDrawer', () => {
         fixture.detectChanges();
         let tab: any = fixture.debugElement.queryAll(By.css('.mat-tab-label-active'));
         expect(tab.length).toBe(1);
-        expect(tab[0].nativeElement.innerText).toBe('Tab1');
+        expect(tab[0].nativeElement.innerText).toContain('Tab1');
     });
 
     it('should select the tab 2 (index 1)', () => {
@@ -123,7 +123,7 @@ describe('Custom InfoDrawer', () => {
         fixture.detectChanges();
         let tab: any = fixture.debugElement.queryAll(By.css('.mat-tab-label-active'));
         expect(tab.length).toBe(1);
-        expect(tab[0].nativeElement.innerText).toBe('Tab2');
+        expect(tab[0].nativeElement.innerText).toContain('Tab2');
     });
 
     it('should render a tab with icon', () => {
diff --git a/lib/core/info-drawer/info-drawer.component.ts b/lib/core/info-drawer/info-drawer.component.ts
index aa093b8b96..b623e8e169 100644
--- a/lib/core/info-drawer/info-drawer.component.ts
+++ b/lib/core/info-drawer/info-drawer.component.ts
@@ -24,7 +24,7 @@ import { MatTabChangeEvent } from '@angular/material';
 export class InfoDrawerTabComponent {
     /** The title of the tab. */
     @Input()
-    label: string = 'Main tab';
+    label: string = '';
 
     /** Icon to render for the tab. */
     @Input()
diff --git a/lib/core/interface/authentication.interface.ts b/lib/core/interface/authentication.interface.ts
index cac45f01ea..25fb44d01c 100644
--- a/lib/core/interface/authentication.interface.ts
+++ b/lib/core/interface/authentication.interface.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 
 export interface AbstractAuthentication {
     TYPE: string;
diff --git a/lib/core/karma-test-shim.js b/lib/core/karma-test-shim.js
deleted file mode 100644
index 70548c246b..0000000000
--- a/lib/core/karma-test-shim.js
+++ /dev/null
@@ -1,28 +0,0 @@
-Error.stackTraceLimit = Infinity;
-
-require('../../node_modules/core-js/es6');
-require('../../node_modules/core-js/es7/reflect');
-
-require('../../node_modules/zone.js/dist/zone');
-require('../../node_modules/zone.js/dist/long-stack-trace-zone');
-require('../../node_modules/zone.js/dist/proxy');
-require('../../node_modules/zone.js/dist/sync-test');
-require('../../node_modules/zone.js/dist/jasmine-patch');
-require('../../node_modules/zone.js/dist/async-test');
-require('../../node_modules/zone.js/dist/fake-async-test');
-
-const pdfjsLib = require('pdfjs-dist');
-pdfjsLib.PDFJS.workerSrc = 'base/node_modules/pdfjs-dist/build/pdf.worker.js';
-
-jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
-
-var appContext = require.context(".", true, /.spec.ts/);
-appContext.keys().forEach(appContext);
-
-const TestBed = require('@angular/core/testing').TestBed;
-const browser = require('@angular/platform-browser-dynamic/testing');
-
-TestBed.initTestEnvironment(
-    browser.BrowserDynamicTestingModule,
-    browser.platformBrowserDynamicTesting()
-);
diff --git a/lib/core/karma.conf.js b/lib/core/karma.conf.js
new file mode 100644
index 0000000000..63d1a810db
--- /dev/null
+++ b/lib/core/karma.conf.js
@@ -0,0 +1,111 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/config/configuration-file.html
+
+module.exports = function (config) {
+    config.set({
+        basePath: '../../',
+
+        files: [
+            {pattern: 'node_modules/core-js/client/core.js', included: true, watched: false},
+            {pattern: 'node_modules/tslib/tslib.js', included: true, watched: false},
+            {pattern: 'node_modules/hammerjs/hammer.min.js', included: true, watched: false},
+            {pattern: 'node_modules/hammerjs/hammer.min.js.map', included: false, watched: false},
+
+            // pdf-js
+            {pattern: 'node_modules/pdfjs-dist/build/pdf.js', included: true, watched: false},
+            {pattern: 'node_modules/pdfjs-dist/build/pdf.worker.js', included: true, watched: false, served: true},
+            {pattern: 'node_modules/pdfjs-dist/build/pdf.worker.min.js', included: true, watched: false, served: true},
+            {pattern: 'node_modules/pdfjs-dist/web/pdf_viewer.js', included: true, watched: false},
+
+            {
+                pattern: 'node_modules/@angular/material/prebuilt-themes/indigo-pink.css',
+                included: true,
+                watched: false
+            },
+
+            {pattern: 'node_modules/alfresco-js-api/dist/alfresco-js-api.min.js', included: true, watched: false},
+            {pattern: 'node_modules/moment/min/moment.min.js', included: true, watched: false},
+
+            {pattern: 'lib/core/i18n/**/en.json', included: false, served: true, watched: false},
+
+            {pattern: 'lib/core/./**/*.ts', included: false, served: true, watched: false},
+
+            {pattern: 'lib/config/app.config.json', included: false, served: true, watched: false},
+            {pattern: 'lib/core//viewer/assets/fake-test-file.pdf', included: false, served: true, watched: false},
+            {pattern: 'lib/core/viewer/assets/fake-test-file.txt', included: false, served: true, watched: false},
+            {
+                pattern: 'lib/core//viewer/assets/fake-test-password-file.pdf',
+                included: false,
+                served: true,
+                watched: false
+            }
+        ],
+
+        frameworks: ['jasmine-ajax', 'jasmine', '@angular-devkit/build-angular'],
+
+        proxies: {
+            '/pdf.worker.min.js' :'/base/node_modules/pdfjs-dist/build/pdf.worker.min.js',
+            '/pdf.worker.js' :'/base/node_modules/pdfjs-dist/build/pdf.worker.js',
+            '/fake-url-file.png' :'/base/lib/core/assets/images/logo.png',
+            '/assets/images/ft_ic_pdf.svg' :'/base/lib/core/assets/images/ft_ic_pdf.svg',
+            '/assets/images/ft_ic_document.svg' :'/base/lib/core/assets/images/ft_ic_document.svg',
+            '/assets/images/ft_ic_miscellaneous.svg' :'/base/lib/core/assets/images/ft_ic_miscellaneous.svg',
+            '/assets/images/ft_ic_raster_image.svg' :'/base/lib/core/assets/images/ft_ic_raster_image.svg',
+            '/content.bin': '/base/lib/core/viewer/assets/fake-test-file.pdf',
+            '/base/assets/' :'/base/lib/core/assets/',
+            '/app.config.json': '/base/lib/config/app.config.json',
+            '/fake-test-file.pdf': '/base/lib/core/viewer/assets/fake-test-file.pdf',
+            '/fake-test-file.txt': '/base/lib/core/viewer/assets/fake-test-file.txt',
+            '/fake-test-password-file.pdf': '/base/lib/core/viewer/assets/fake-test-password-file.pdf'
+        },
+
+        plugins: [
+            require('karma-jasmine-ajax'),
+            require('karma-jasmine'),
+            require('karma-chrome-launcher'),
+            require('karma-jasmine-html-reporter'),
+            require('karma-coverage-istanbul-reporter'),
+            require('@angular-devkit/build-angular/plugins/karma'),
+            require('karma-mocha-reporter')
+        ],
+        client: {
+            clearContext: false // leave Jasmine Spec Runner output visible in browser
+        },
+        coverageIstanbulReporter: {
+            dir: './lib/coverage/core/',
+            reports: ['html', 'lcovonly'],
+            fixWebpackSourcePaths: true
+        },
+
+        // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+        logLevel: config.LOG_DEBUG,
+
+        colors: true,
+
+        autoWatch: false,
+
+        browserDisconnectTimeout: 200000,
+        browserNoActivityTimeout: 2400000,
+        captureTimeout: 1200000,
+
+        customLaunchers: {
+            ChromeHeadless: {
+                base: 'Chrome',
+                flags: [
+                    '--no-sandbox',
+                    '--headless',
+                    '--disable-gpu',
+                    '--remote-debugging-port=9222'
+                ]
+            }
+        },
+
+        reporters: ['mocha', 'kjhtml'],
+        port: 9876,
+        colors: true,
+        logLevel: config.LOG_INFO,
+        autoWatch: true,
+        browsers: ['Chrome'],
+        singleRun: false
+    });
+};
diff --git a/lib/core/layout/components/header/header.component.html b/lib/core/layout/components/header/header.component.html
new file mode 100644
index 0000000000..1f45245519
--- /dev/null
+++ b/lib/core/layout/components/header/header.component.html
@@ -0,0 +1,13 @@
+<mat-toolbar color="{{color}}" [style.background-color]="color">
+    <button *ngIf="showSidenavToggle" data-automation-id="adf-menu-icon" class="mat-icon-button adf-menu-icon" mat-icon-button (click)="toggleMenu()">
+        <mat-icon class="mat-icon material-icon" role="img" aria-hidden="true">menu</mat-icon>
+    </button>
+
+    <a [routerLink]="redirectUrl" title="{{ tooltip }}">
+        <img src="{{logo}}" class="adf-app-logo" />
+    </a>
+
+    <span fxFlex="1 1 auto" fxShow fxHide.lt-sm="true" class="adf-app-title">{{title}}</span>
+    <ng-content></ng-content>
+</mat-toolbar>
+
diff --git a/lib/core/layout/components/header/header.component.scss b/lib/core/layout/components/header/header.component.scss
new file mode 100644
index 0000000000..055042e825
--- /dev/null
+++ b/lib/core/layout/components/header/header.component.scss
@@ -0,0 +1,54 @@
+@mixin  adf-header-layout-theme($theme) {
+    $primary: map-get($theme, primary);
+    $accent: map-get($theme, accent);
+    $background: map-get($theme, background);
+
+    adf-layout-header .mat-toolbar-single-row {
+
+        color: mat-color($primary, default-contrast) !important;
+        position: relative;
+        padding: 0 24px;
+
+        .adf-menu-icon {
+            position: relative;
+            margin-left: -11px;
+            margin-right: 3px;
+        }
+
+        .adf-app-logo {
+            position: relative;
+            height: 28px;
+            width: 28px;
+            margin-right: 6px;
+        }
+
+        .adf-header-delimiter {
+            height: 24px;
+            width: 2px;
+            background-color: mat-color($primary, default-contrast);
+            margin-right: 16px;
+        }
+
+        .adf-app-layout-user-profile {
+            margin-right: 16px;
+        }
+
+        .adf-userinfo-container {
+            flex-direction: row;
+            padding: 0;
+        }
+
+        .adf-userinfo-name{
+            padding-right: 8px;
+        }
+
+        @media screen and ($mat-xsmall) {
+            .adf-app-logo,
+            .adf-app-title {
+                display: none;
+            }
+        }
+    }
+}
+
+
diff --git a/lib/core/layout/components/header/header.component.spec.ts b/lib/core/layout/components/header/header.component.spec.ts
new file mode 100644
index 0000000000..daf94bb3d0
--- /dev/null
+++ b/lib/core/layout/components/header/header.component.spec.ts
@@ -0,0 +1,149 @@
+/*!
+ * @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 { ComponentFixture, TestBed, async } from '@angular/core/testing';
+import { HeaderLayoutComponent } from './header.component';
+import { setupTestBed } from '../../../testing/setupTestBed';
+import { CoreTestingModule } from '../../../testing/core.testing.module';
+import { By } from '@angular/platform-browser';
+import { LayoutModule } from '../..';
+import { Component } from '@angular/core';
+import { RouterTestingModule } from '@angular/router/testing';
+import { MaterialModule } from './../../../material.module';
+
+describe('HeaderLayoutComponent', () => {
+    let fixture: ComponentFixture<HeaderLayoutComponent>;
+    let component: HeaderLayoutComponent;
+
+    describe('Input parameters', () => {
+        setupTestBed({
+            imports: [CoreTestingModule]
+        });
+
+        beforeEach(() => {
+            fixture = TestBed.createComponent(HeaderLayoutComponent);
+            component = fixture.componentInstance;
+        });
+
+        afterEach(() => {
+            fixture.destroy();
+        });
+
+        it('should create instance of HeaderLayoutComponent', () => {
+            expect(fixture.componentInstance instanceof HeaderLayoutComponent).toBe(true, 'should create HeaderLayoutComponent');
+        });
+
+        it('title element should been displayed', () => {
+            const titleElement = fixture.debugElement.query(By.css('.adf-app-title'));
+            expect(titleElement === null).toBeFalsy();
+        });
+
+        it('should show TEST TITLE', () => {
+            component.title = 'TEST TITLE';
+            fixture.detectChanges();
+
+            const titleElement = fixture.nativeElement.querySelector('.adf-app-title');
+            expect(titleElement.innerText).toEqual('TEST TITLE');
+        });
+
+        it('color attribute should be present on mat-toolbar', () => {
+            component.color = 'primary';
+            fixture.detectChanges();
+
+            const toolbar = fixture.nativeElement.querySelector('mat-toolbar');
+            expect(toolbar.getAttribute('ng-reflect-color') === null).toBeFalsy();
+            expect(toolbar.getAttribute('ng-reflect-color')).toEqual('primary');
+        });
+
+        it('should display the img element with the expected src if a logo path is set', () => {
+            component.logo = 'logo.png';
+            fixture.detectChanges();
+
+            const logo = fixture.nativeElement.querySelector('.adf-app-logo');
+            const src = logo.getAttribute('src');
+            expect(logo === null).toBeFalsy();
+            expect(src).toEqual('logo.png');
+        });
+
+        it('should have custom url link set on logo when the redirectUrl is set', () => {
+            component.redirectUrl = '/customHomePage';
+            fixture.detectChanges();
+
+            const logoAnchor = fixture.nativeElement.querySelector('mat-toolbar>a');
+            expect(/\/customHomePage$/.test(logoAnchor.href)).toEqual(true);
+        });
+
+        it('should have custom tooltip text set on logo when the tooltip parameter is set', () => {
+            component.tooltip = 'logo title';
+            fixture.detectChanges();
+
+            const logoAnchor = fixture.nativeElement.querySelector('mat-toolbar>a');
+            expect(logoAnchor.title).toEqual('logo title');
+        });
+
+        it('test click on sidenav button', () => {
+            component.showSidenavToggle = true;
+            fixture.detectChanges();
+            spyOn(component.clicked, 'emit');
+            const button = fixture.nativeElement.querySelector('.adf-menu-icon');
+
+            button.dispatchEvent(new Event('click'));
+            fixture.detectChanges();
+            expect(component.clicked.emit).toHaveBeenCalledWith(true);
+        });
+
+        it('if showSidenavToggle is true the button menu should be displayed', () => {
+            component.showSidenavToggle = true;
+            fixture.detectChanges();
+
+            const button = fixture.nativeElement.querySelector('.adf-menu-icon');
+            expect(button === null).toBeFalsy();
+        });
+
+        it('if showSidenavToggle is false the button menu should  not be displayed', () => {
+            component.showSidenavToggle = false;
+            fixture.detectChanges();
+
+            const button = fixture.nativeElement.querySelector('.adf-menu-icon');
+            expect(button === null).toBeTruthy();
+        });
+    });
+
+    describe('Template tranclusion', () => {
+
+        @Component({
+            selector: 'adf-test-layout-header',
+            template: `<adf-layout-header title="test" color="primary"><p>Test text<p></adf-layout-header>`
+        })
+        class HeaderLayoutTesterComponent {}
+
+        beforeEach(async(() => {
+            TestBed.configureTestingModule({
+              declarations: [HeaderLayoutTesterComponent],
+              imports: [ LayoutModule, MaterialModule, RouterTestingModule ]
+            })
+            .compileComponents();
+          }));
+
+        it('should transclude the provided nodes into the component', () => {
+            const hostFixture = TestBed.createComponent(HeaderLayoutTesterComponent);
+            hostFixture.detectChanges();
+            const innerText = hostFixture.nativeElement.querySelector('mat-toolbar>p').innerText;
+            expect(innerText).toEqual('Test text');
+        });
+    });
+});
diff --git a/lib/core/layout/components/header/header.component.ts b/lib/core/layout/components/header/header.component.ts
new file mode 100644
index 0000000000..32a9bd44c1
--- /dev/null
+++ b/lib/core/layout/components/header/header.component.ts
@@ -0,0 +1,44 @@
+/*!
+ * @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 { Component, Input, Output, EventEmitter, ViewEncapsulation, OnInit } from '@angular/core';
+
+@Component({
+    selector: 'adf-layout-header',
+    templateUrl: './header.component.html',
+    encapsulation: ViewEncapsulation.None,
+    host: { class: 'adf-layout-header' }
+})
+export class HeaderLayoutComponent implements OnInit {
+    @Input() title: string;
+    @Input() logo: string;
+    @Input() redirectUrl: string | any[] = '/';
+    @Input() tooltip: string;
+    @Input() color: string;
+    @Input() showSidenavToggle: boolean = true;
+    @Output() clicked = new EventEmitter<any>();
+
+    toggleMenu() {
+        this.clicked.emit(true);
+    }
+
+    ngOnInit() {
+        if (!this.logo) {
+            this.logo = './assets/images/logo.png';
+        }
+    }
+}
diff --git a/lib/core/sidenav-layout/components/layout-container/layout-container.component.html b/lib/core/layout/components/layout-container/layout-container.component.html
similarity index 100%
rename from lib/core/sidenav-layout/components/layout-container/layout-container.component.html
rename to lib/core/layout/components/layout-container/layout-container.component.html
diff --git a/lib/core/sidenav-layout/components/layout-container/layout-container.component.scss b/lib/core/layout/components/layout-container/layout-container.component.scss
similarity index 100%
rename from lib/core/sidenav-layout/components/layout-container/layout-container.component.scss
rename to lib/core/layout/components/layout-container/layout-container.component.scss
diff --git a/lib/core/sidenav-layout/components/layout-container/layout-container.component.ts b/lib/core/layout/components/layout-container/layout-container.component.ts
similarity index 100%
rename from lib/core/sidenav-layout/components/layout-container/layout-container.component.ts
rename to lib/core/layout/components/layout-container/layout-container.component.ts
diff --git a/lib/core/sidenav-layout/components/sidebar-action/sidebar-action-menu.component.html b/lib/core/layout/components/sidebar-action/sidebar-action-menu.component.html
similarity index 100%
rename from lib/core/sidenav-layout/components/sidebar-action/sidebar-action-menu.component.html
rename to lib/core/layout/components/sidebar-action/sidebar-action-menu.component.html
diff --git a/lib/core/sidenav-layout/components/sidebar-action/sidebar-action-menu.component.scss b/lib/core/layout/components/sidebar-action/sidebar-action-menu.component.scss
similarity index 94%
rename from lib/core/sidenav-layout/components/sidebar-action/sidebar-action-menu.component.scss
rename to lib/core/layout/components/sidebar-action/sidebar-action-menu.component.scss
index 7222be4b0d..f1be3aa450 100644
--- a/lib/core/sidenav-layout/components/sidebar-action/sidebar-action-menu.component.scss
+++ b/lib/core/layout/components/sidebar-action/sidebar-action-menu.component.scss
@@ -59,7 +59,8 @@
         &-sidebar-action-menu-panel {
             margin-top: 7.5px;
             border-radius: 2px;
-            box-shadow: #{map-get($_umbra-elevation-map, 2)}, #{map-get($_penumbra-elevation-map, 2)},#{map-get($_ambient-elevation-map, 2)};
+
+            @include mat-elevation(2);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/lib/core/sidenav-layout/components/sidebar-action/sidebar-action-menu.component.spec.ts b/lib/core/layout/components/sidebar-action/sidebar-action-menu.component.spec.ts
similarity index 99%
rename from lib/core/sidenav-layout/components/sidebar-action/sidebar-action-menu.component.spec.ts
rename to lib/core/layout/components/sidebar-action/sidebar-action-menu.component.spec.ts
index 9d83345969..b009187557 100644
--- a/lib/core/sidenav-layout/components/sidebar-action/sidebar-action-menu.component.spec.ts
+++ b/lib/core/layout/components/sidebar-action/sidebar-action-menu.component.spec.ts
@@ -132,7 +132,7 @@ describe('Custom SidebarActionMenuComponent', () => {
             expect(actionButton).not.toBeNull();
             expect(actionButton).toBeDefined();
             expect(options).toBeDefined();
-            expect(actionButton.innerText.trim()).toBe('Fake title arrow_drop_down');
+            expect(actionButton.innerText.trim()).toBe('Fake titlearrow_drop_down');
         });
     });
 
diff --git a/lib/core/sidenav-layout/components/sidebar-action/sidebar-action-menu.component.ts b/lib/core/layout/components/sidebar-action/sidebar-action-menu.component.ts
similarity index 100%
rename from lib/core/sidenav-layout/components/sidebar-action/sidebar-action-menu.component.ts
rename to lib/core/layout/components/sidebar-action/sidebar-action-menu.component.ts
diff --git a/lib/core/sidenav-layout/components/sidenav-layout/sidenav-layout.component.html b/lib/core/layout/components/sidenav-layout/sidenav-layout.component.html
similarity index 100%
rename from lib/core/sidenav-layout/components/sidenav-layout/sidenav-layout.component.html
rename to lib/core/layout/components/sidenav-layout/sidenav-layout.component.html
diff --git a/lib/core/sidenav-layout/components/sidenav-layout/sidenav-layout.component.scss b/lib/core/layout/components/sidenav-layout/sidenav-layout.component.scss
similarity index 100%
rename from lib/core/sidenav-layout/components/sidenav-layout/sidenav-layout.component.scss
rename to lib/core/layout/components/sidenav-layout/sidenav-layout.component.scss
diff --git a/lib/core/sidenav-layout/components/sidenav-layout/sidenav-layout.component.spec.ts b/lib/core/layout/components/sidenav-layout/sidenav-layout.component.spec.ts
similarity index 100%
rename from lib/core/sidenav-layout/components/sidenav-layout/sidenav-layout.component.spec.ts
rename to lib/core/layout/components/sidenav-layout/sidenav-layout.component.spec.ts
diff --git a/lib/core/sidenav-layout/components/sidenav-layout/sidenav-layout.component.ts b/lib/core/layout/components/sidenav-layout/sidenav-layout.component.ts
similarity index 97%
rename from lib/core/sidenav-layout/components/sidenav-layout/sidenav-layout.component.ts
rename to lib/core/layout/components/sidenav-layout/sidenav-layout.component.ts
index df9ee37cce..993f90bfe6 100644
--- a/lib/core/sidenav-layout/components/sidenav-layout/sidenav-layout.component.ts
+++ b/lib/core/layout/components/sidenav-layout/sidenav-layout.component.ts
@@ -20,8 +20,7 @@ import { MediaMatcher } from '@angular/cdk/layout';
 import { SidenavLayoutContentDirective } from '../../directives/sidenav-layout-content.directive';
 import { SidenavLayoutHeaderDirective } from '../../directives/sidenav-layout-header.directive';
 import { SidenavLayoutNavigationDirective } from '../../directives/sidenav-layout-navigation.directive';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
-import { Observable } from 'rxjs/Observable';
+import { BehaviorSubject, Observable } from 'rxjs';
 
 @Component({
     selector: 'adf-sidenav-layout',
diff --git a/lib/core/sidenav-layout/directives/sidenav-layout-content.directive.ts b/lib/core/layout/directives/sidenav-layout-content.directive.ts
similarity index 100%
rename from lib/core/sidenav-layout/directives/sidenav-layout-content.directive.ts
rename to lib/core/layout/directives/sidenav-layout-content.directive.ts
diff --git a/lib/core/sidenav-layout/directives/sidenav-layout-header.directive.ts b/lib/core/layout/directives/sidenav-layout-header.directive.ts
similarity index 100%
rename from lib/core/sidenav-layout/directives/sidenav-layout-header.directive.ts
rename to lib/core/layout/directives/sidenav-layout-header.directive.ts
diff --git a/lib/core/sidenav-layout/directives/sidenav-layout-navigation.directive.ts b/lib/core/layout/directives/sidenav-layout-navigation.directive.ts
similarity index 100%
rename from lib/core/sidenav-layout/directives/sidenav-layout-navigation.directive.ts
rename to lib/core/layout/directives/sidenav-layout-navigation.directive.ts
diff --git a/lib/core/sidenav-layout/helpers/animations.ts b/lib/core/layout/helpers/animations.ts
similarity index 100%
rename from lib/core/sidenav-layout/helpers/animations.ts
rename to lib/core/layout/helpers/animations.ts
diff --git a/lib/core/sidenav-layout/index.ts b/lib/core/layout/index.ts
similarity index 100%
rename from lib/core/sidenav-layout/index.ts
rename to lib/core/layout/index.ts
diff --git a/lib/core/sidenav-layout/sidenav-layout.module.ts b/lib/core/layout/layout.module.ts
similarity index 84%
rename from lib/core/sidenav-layout/sidenav-layout.module.ts
rename to lib/core/layout/layout.module.ts
index c2e34236e3..5a66f0546b 100644
--- a/lib/core/sidenav-layout/sidenav-layout.module.ts
+++ b/lib/core/layout/layout.module.ts
@@ -17,6 +17,7 @@
 
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
 import { MaterialModule } from '../material.module';
 import { SidenavLayoutContentDirective } from './directives/sidenav-layout-content.directive';
 import { SidenavLayoutHeaderDirective } from './directives/sidenav-layout-header.directive';
@@ -25,11 +26,12 @@ import { SidenavLayoutComponent } from './components/sidenav-layout/sidenav-layo
 import { LayoutContainerComponent } from './components/layout-container/layout-container.component';
 import { SidebarActionMenuComponent, SidebarMenuDirective,
     SidebarMenuExpandIconDirective, SidebarMenuTitleIconDirective } from './components/sidebar-action/sidebar-action-menu.component';
-
+import { HeaderLayoutComponent } from './components/header/header.component';
 @NgModule({
     imports: [
         CommonModule,
-        MaterialModule
+        MaterialModule,
+        RouterModule
     ],
     exports: [
         SidenavLayoutHeaderDirective,
@@ -40,7 +42,8 @@ import { SidebarActionMenuComponent, SidebarMenuDirective,
         SidebarActionMenuComponent,
         SidebarMenuDirective,
         SidebarMenuExpandIconDirective,
-        SidebarMenuTitleIconDirective
+        SidebarMenuTitleIconDirective,
+        HeaderLayoutComponent
     ],
     declarations: [
         SidenavLayoutHeaderDirective,
@@ -51,7 +54,9 @@ import { SidebarActionMenuComponent, SidebarMenuDirective,
         SidebarActionMenuComponent,
         SidebarMenuDirective,
         SidebarMenuExpandIconDirective,
-        SidebarMenuTitleIconDirective
+        SidebarMenuTitleIconDirective,
+        HeaderLayoutComponent
     ]
 })
-export class SidenavLayoutModule {}
+export class LayoutModule {}
+export { LayoutModule as SidenavLayoutModule };
diff --git a/lib/core/sidenav-layout/public-api.ts b/lib/core/layout/public-api.ts
similarity index 94%
rename from lib/core/sidenav-layout/public-api.ts
rename to lib/core/layout/public-api.ts
index 300a5ec5b5..880bafe4ab 100644
--- a/lib/core/sidenav-layout/public-api.ts
+++ b/lib/core/layout/public-api.ts
@@ -17,4 +17,4 @@
 
 export * from './components/sidenav-layout/sidenav-layout.component';
 
-export * from './sidenav-layout.module';
+export * from './layout.module';
diff --git a/lib/core/login/components/login.component.html b/lib/core/login/components/login.component.html
index 752d62ca87..bfb1d834d2 100644
--- a/lib/core/login/components/login.component.html
+++ b/lib/core/login/components/login.component.html
@@ -13,7 +13,7 @@
                                              ngFor [ngForOf]="[data]"
                                              [ngForTemplate]="headerTemplate">
                                 </ng-template>
-                                <img *ngIf="!headerTemplate" class="adf-img-logo" [src]="logoImageUrl"
+                                <img *ngIf="!headerTemplate" id="adf-login-img-logo" class="adf-img-logo" [src]="logoImageUrl"
                                      alt="{{'LOGIN.LOGO' | translate }}">
                             </div>
                         </mat-card-title>
@@ -61,11 +61,11 @@
                                            data-automation-id="password"
                                            tabindex="2">
                                     <mat-icon *ngIf="isPasswordShow" matSuffix class="adf-login-password-icon"
-                                              data-automation-id="hide_password" (click)="toggleShowPassword()">
+                                              data-automation-id="hide_password" (click)="toggleShowPassword()" (keyup.enter)="toggleShowPassword()" tabindex="3">
                                         visibility
                                     </mat-icon>
                                     <mat-icon *ngIf="!isPasswordShow" matSuffix class="adf-login-password-icon"
-                                              data-automation-id="show_password" (click)="toggleShowPassword()">
+                                              data-automation-id="show_password" (click)="toggleShowPassword()" (keyup.enter)="toggleShowPassword()" tabindex="3">
                                         visibility_off
                                     </mat-icon>
                                 </mat-form-field>
@@ -79,7 +79,7 @@
                             <ng-content></ng-content>
 
                             <br>
-                            <button type="submit" id="login-button" tabindex="3"
+                            <button type="submit" id="login-button" tabindex="4"
                                     class="adf-login-button"
                                     mat-raised-button color="primary"
                                     [class.isChecking]="actualLoginStep === LoginSteps.Checking"
diff --git a/lib/core/login/components/login.component.scss b/lib/core/login/components/login.component.scss
index 3e9f510296..6bef5d20ae 100644
--- a/lib/core/login/components/login.component.scss
+++ b/lib/core/login/components/login.component.scss
@@ -226,7 +226,7 @@
             color: $text-color-primary;
         }
 
-        .adf-login__field .mat-input-wrapper {
+        .adf-login__field .mat-form-field-wrapper {
             margin: 1em 0 0 0;
             font-size: 16px;
         }
diff --git a/lib/core/login/components/login.component.spec.ts b/lib/core/login/components/login.component.spec.ts
index 2c49a35e82..2dd93bf357 100644
--- a/lib/core/login/components/login.component.spec.ts
+++ b/lib/core/login/components/login.component.spec.ts
@@ -25,7 +25,7 @@ import { AuthenticationService } from '../../services/authentication.service';
 import { LoginErrorEvent } from '../models/login-error.event';
 import { LoginSuccessEvent } from '../models/login-success.event';
 import { LoginComponent } from './login.component';
-import { Observable } from 'rxjs/Observable';
+import { of, throwError } from 'rxjs';
 import { OauthConfigModel } from '../../models/oauth-config.model';
 import { AlfrescoApiService } from '../../services/alfresco-api.service';
 
@@ -107,7 +107,7 @@ describe('LoginComponent', () => {
     });
 
     it('should redirect to route on successful login', () => {
-        spyOn(authService, 'login').and.returnValue(Observable.of({ type: 'type', ticket: 'ticket' }));
+        spyOn(authService, 'login').and.returnValue(of({ type: 'type', ticket: 'ticket' }));
         const redirect = '/home';
         component.successRoute = redirect;
         spyOn(router, 'navigate');
@@ -116,7 +116,7 @@ describe('LoginComponent', () => {
     });
 
     it('should redirect to previous route state on successful login', () => {
-        spyOn(authService, 'login').and.returnValue(Observable.of({ type: 'type', ticket: 'ticket' }));
+        spyOn(authService, 'login').and.returnValue(of({ type: 'type', ticket: 'ticket' }));
         const redirect = '/home';
         component.successRoute = redirect;
         authService.setRedirect({ provider: 'ECM', url: 'some-route' });
@@ -160,14 +160,14 @@ describe('LoginComponent', () => {
         });
 
         it('should be changed back to the default after a failed login attempt', () => {
-            spyOn(authService, 'login').and.returnValue(Observable.throw('Fake server error'));
+            spyOn(authService, 'login').and.returnValue(throwError('Fake server error'));
             loginWithCredentials('fake-wrong-username', 'fake-wrong-password');
 
             expect(getLoginButtonText()).toEqual('LOGIN.BUTTON.LOGIN');
         });
 
         it('should be changed to the "welcome key" after a successful login attempt', () => {
-            spyOn(authService, 'login').and.returnValue(Observable.of({ type: 'type', ticket: 'ticket' }));
+            spyOn(authService, 'login').and.returnValue(of({ type: 'type', ticket: 'ticket' }));
             loginWithCredentials('fake-username', 'fake-password');
 
             expect(getLoginButtonText()).toEqual('LOGIN.BUTTON.WELCOME');
@@ -391,7 +391,7 @@ describe('LoginComponent', () => {
     });
 
     it('should return success event after the login have succeeded', (done) => {
-        spyOn(authService, 'login').and.returnValue(Observable.of({ type: 'type', ticket: 'ticket' }));
+        spyOn(authService, 'login').and.returnValue(of({ type: 'type', ticket: 'ticket' }));
 
         component.providers = 'ECM';
         expect(component.isError).toBe(false);
@@ -456,7 +456,7 @@ describe('LoginComponent', () => {
     });
 
     it('should return CORS error when server CORS error occurs', (done) => {
-        spyOn(authService, 'login').and.returnValue(Observable.throw({
+        spyOn(authService, 'login').and.returnValue(throwError({
             error: {
                 crossDomain: true,
                 message: 'ERROR: the network is offline, Origin is not allowed by Access-Control-Allow-Origin'
@@ -479,7 +479,7 @@ describe('LoginComponent', () => {
 
     it('should return CSRF error when server CSRF error occurs', async(() => {
         spyOn(authService, 'login')
-            .and.returnValue(Observable.throw({ message: 'ERROR: Invalid CSRF-token', status: 403 }));
+            .and.returnValue(throwError({ message: 'ERROR: Invalid CSRF-token', status: 403 }));
         component.providers = 'ECM';
 
         component.error.subscribe(() => {
@@ -496,7 +496,7 @@ describe('LoginComponent', () => {
     it('should return ECOM read-oly error when error occurs', async(() => {
         spyOn(authService, 'login')
             .and.returnValue(
-            Observable.throw(
+                throwError(
                 {
                     message: 'ERROR: 00170728 Access Denied.  The system is currently in read-only mode',
                     status: 403
@@ -531,7 +531,7 @@ describe('LoginComponent', () => {
     }));
 
     it('should emit error event after the login has failed', async(() => {
-        spyOn(authService, 'login').and.returnValue(Observable.throw('Fake server error'));
+        spyOn(authService, 'login').and.returnValue(throwError('Fake server error'));
         component.providers = 'ECM';
 
         component.error.subscribe((error) => {
diff --git a/lib/core/login/components/login.component.ts b/lib/core/login/components/login.component.ts
index 44448b8833..a256a614e9 100644
--- a/lib/core/login/components/login.component.ts
+++ b/lib/core/login/components/login.component.ts
@@ -48,8 +48,7 @@ enum LoginSteps {
     styleUrls: ['./login.component.scss'],
     encapsulation: ViewEncapsulation.None,
     host: {
-        class: 'adf-login',
-        '(blur)': 'onBlur($event)'
+        class: 'adf-login'
     }
 })
 export class LoginComponent implements OnInit {
diff --git a/lib/core/login/login.module.ts b/lib/core/login/login.module.ts
index 9e80aa563e..6b79eaf007 100644
--- a/lib/core/login/login.module.ts
+++ b/lib/core/login/login.module.ts
@@ -33,7 +33,7 @@ import { LoginHeaderDirective } from './directives/login-header.directive';
         FormsModule,
         ReactiveFormsModule,
         CommonModule,
-        TranslateModule
+        TranslateModule.forChild()
     ],
     declarations: [
         LoginComponent,
@@ -41,11 +41,9 @@ import { LoginHeaderDirective } from './directives/login-header.directive';
         LoginHeaderDirective
     ],
     exports: [
-        [
-            LoginComponent,
-            LoginFooterDirective,
-            LoginHeaderDirective
-        ]
+        LoginComponent,
+        LoginFooterDirective,
+        LoginHeaderDirective
     ]
 })
 export class LoginModule {
diff --git a/lib/core/mock/authentication.service.mock.ts b/lib/core/mock/authentication.service.mock.ts
index 61d502f2be..6bb96f4f01 100644
--- a/lib/core/mock/authentication.service.mock.ts
+++ b/lib/core/mock/authentication.service.mock.ts
@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import { Observable } from 'rxjs/Observable';
-import 'rxjs/add/observable/throw';
+import { Observable, of, throwError } from 'rxjs';
 import { RedirectionModel } from '../models/redirection.model';
 
 // TODO: should be extending AuthenticationService
@@ -34,11 +33,11 @@ export class AuthenticationMock /*extends AuthenticationService*/ {
     // TODO: real auth service returns Observable<string>
     login(username: string, password: string): Observable<{ type: string, ticket: any }> {
         if (username === 'fake-username' && password === 'fake-password') {
-            return Observable.of({ type: 'type', ticket: 'ticket'});
+            return of({ type: 'type', ticket: 'ticket'});
         }
 
         if (username === 'fake-username-CORS-error' && password === 'fake-password') {
-            return Observable.throw({
+            return throwError({
                 error: {
                     crossDomain: true,
                     message: 'ERROR: the network is offline, Origin is not allowed by Access-Control-Allow-Origin'
@@ -47,13 +46,13 @@ export class AuthenticationMock /*extends AuthenticationService*/ {
         }
 
         if (username === 'fake-username-CSRF-error' && password === 'fake-password') {
-            return Observable.throw({message: 'ERROR: Invalid CSRF-token', status: 403});
+            return throwError({message: 'ERROR: Invalid CSRF-token', status: 403});
         }
 
         if (username === 'fake-username-ECM-access-error' && password === 'fake-password') {
-            return Observable.throw({message: 'ERROR: 00170728 Access Denied.  The system is currently in read-only mode', status: 403});
+            return throwError({message: 'ERROR: 00170728 Access Denied.  The system is currently in read-only mode', status: 403});
         }
 
-        return Observable.throw('Fake server error');
+        return throwError('Fake server error');
     }
 }
diff --git a/lib/core/mock/translation.service.mock.ts b/lib/core/mock/translation.service.mock.ts
index f55d3313ca..34015859b7 100644
--- a/lib/core/mock/translation.service.mock.ts
+++ b/lib/core/mock/translation.service.mock.ts
@@ -16,7 +16,7 @@
  */
 
 import { EventEmitter } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable, of } from 'rxjs';
 import { TranslationService } from '../services/translation.service';
 
 export interface LangChangeEvent {
@@ -47,7 +47,7 @@ export class TranslationMock implements TranslationService {
     }
 
     get(key: string | Array<string>, interpolateParams?: Object): Observable<string | any> {
-        return Observable.of(key);
+        return of(key);
     }
 
     instant(key: string | Array<string>, interpolateParams?: Object): string | any {
diff --git a/lib/core/models/file.model.ts b/lib/core/models/file.model.ts
index 2f114e1b99..6d82a5ff26 100644
--- a/lib/core/models/file.model.ts
+++ b/lib/core/models/file.model.ts
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+import { AssocChildBody, AssocTargetBody } from 'alfresco-js-api';
+
 export interface FileUploadProgress {
     loaded: number;
     total: number;
@@ -28,6 +30,10 @@ export interface FileUploadOptions {
     parentId?: string;
     path?: string;
     nodeType?: string;
+    properties?: any;
+    association?: any;
+    secondaryChildren?: AssocChildBody[];
+    targets?: AssocTargetBody[];
 }
 
 export enum FileUploadStatus {
diff --git a/lib/core/models/user-process.model.ts b/lib/core/models/user-process.model.ts
index e2c7fdb817..bd395519f1 100644
--- a/lib/core/models/user-process.model.ts
+++ b/lib/core/models/user-process.model.ts
@@ -27,6 +27,7 @@ export class UserProcessModel implements LightUserRepresentation {
     firstName?: string;
     lastName?: string;
     pictureId?: number = null;
+    externalId?: string;
 
     constructor(obj?: any) {
         if (obj) {
@@ -35,6 +36,7 @@ export class UserProcessModel implements LightUserRepresentation {
             this.firstName = obj.firstName || null;
             this.lastName = obj.lastName || null;
             this.pictureId = obj.pictureId || null;
+            this.externalId = obj.externalId || null;
         }
     }
 
diff --git a/lib/core/ng-package.json b/lib/core/ng-package.json
index ceaf415625..5f119ba607 100644
--- a/lib/core/ng-package.json
+++ b/lib/core/ng-package.json
@@ -1,18 +1,16 @@
 {
   "$schema": "./node_modules/ng-packagr/ng-package.schema.json",
-  "whitelistedNonPeerDependencies": [ "." ],
   "workingDirectory" : "./ng_work",
   "src": "./core/",
   "dest": "../dist/core/",
   "lib": {
     "languageLevel": [ "dom", "es2016" ],
-    "licensePath": "../config/assets/license_header_add.txt",
     "comments" : "none",
     "entryFile": "./public-api.ts",
     "flatModuleFile": "adf-core",
     "umdModuleIds": {
       "alfresco-js-api": "alfresco-js-api",
-      "minimatch": "minimatch",
+      "minimatch": "minimatch-browser",
       "@angular/platform-browser/animations": "@angular/platform-browser/animations",
       "@angular/material": "@angular/material",
       "@mat-datetimepicker/core": "@mat-datetimepicker/core",
diff --git a/lib/core/package.json b/lib/core/package.json
index e0e48b465a..5af7d2dd29 100644
--- a/lib/core/package.json
+++ b/lib/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@alfresco/adf-core",
   "description": "Alfresco ADF core",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "author": "Alfresco Software, Ltd.",
   "main": "bundles/adf-core.js",
   "repository": {
@@ -11,36 +11,33 @@
   "bugs": {
     "url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
   },
-  "dependencies": {
-    "@angular/animations": "5.1.1",
-    "@angular/cdk": "5.0.1",
-    "@angular/common": "5.1.1",
-    "@angular/compiler": "5.1.1",
-    "@angular/core": "5.1.1",
-    "@angular/flex-layout": "2.0.0-beta.12",
-    "@angular/forms": "5.1.1",
-    "@angular/http": "5.1.1",
-    "@angular/material": "5.0.1",
-    "@angular/material-moment-adapter": "5.0.1",
-    "@angular/platform-browser": "5.1.1",
-    "@angular/platform-browser-dynamic": "5.1.1",
-    "@angular/router": "5.1.1",
-    "@ngx-translate/core": "9.1.1",
-    "alfresco-js-api": "2.4.0",
-    "chart.js": "2.5.0",
+  "peerDependencies": {
+    "@angular/animations": ">=5.1.1",
+    "@angular/cdk": ">=5.1.1",
+    "@angular/common": ">=5.1.1",
+    "@angular/compiler": ">=5.1.1",
+    "@angular/core": ">=5.1.1",
+    "@angular/flex-layout": ">=5.1.1",
+    "@angular/forms": ">=5.1.1",
+    "@angular/http": ">=5.1.1",
+    "@angular/material": ">=5.1.1",
+    "@angular/material-moment-adapter": ">=5.1.1",
+    "@angular/platform-browser": ">=5.1.1",
+    "@angular/platform-browser-dynamic": ">=5.1.1",
+    "@angular/router": ">=5.1.1",
+    "@mat-datetimepicker/core": "2.0.1",
+    "@mat-datetimepicker/moment": "2.0.1",
+    "alfresco-js-api": "2.5.0",
+    "rxjs": ">=6.2.2",
+    "@ngx-translate/core": "^10.0.2",
     "core-js": "2.4.1",
     "hammerjs": "2.0.8",
-    "minimatch": "3.0.4",
-    "moment": "2.20.1",
-    "ng2-charts": "1.6.0",
-    "pdfjs-dist": "1.5.404",
-    "raphael": "2.2.7",
-    "reflect-metadata": "0.1.10",
-    "rxjs": "5.5.2",
-    "systemjs": "0.19.27",
-    "zone.js": "0.8.14"
+    "minimatch-browser": "1.0.0",
+    "moment": "^2.22.2",
+    "pdfjs-dist": "2.0.303",
+    "reflect-metadata": "^0.1.12",
+    "zone.js": "^0.8.26"
   },
-  "devDependencies": {},
   "keywords": [
     "core",
     "alfresco-component",
diff --git a/lib/core/pagination/infinite-pagination.component.html b/lib/core/pagination/infinite-pagination.component.html
index aab590bcde..26d4069c92 100644
--- a/lib/core/pagination/infinite-pagination.component.html
+++ b/lib/core/pagination/infinite-pagination.component.html
@@ -2,7 +2,7 @@
     <button mat-button
         *ngIf="!isLoading"
         class="adf-infinite-pagination-load-more"
-        (click)="onLoadMore($event)"
+        (click)="onLoadMore()"
         data-automation-id="adf-infinite-pagination-button">
             <ng-content></ng-content>
     </button>
diff --git a/lib/core/pagination/infinite-pagination.component.spec.ts b/lib/core/pagination/infinite-pagination.component.spec.ts
index ef2ab441f6..db8ddd097d 100644
--- a/lib/core/pagination/infinite-pagination.component.spec.ts
+++ b/lib/core/pagination/infinite-pagination.component.spec.ts
@@ -20,7 +20,7 @@ import { By } from '@angular/platform-browser';
 import { Pagination } from 'alfresco-js-api';
 import { InfinitePaginationComponent } from './infinite-pagination.component';
 import { PaginatedComponent } from './paginated-component.interface';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
+import { BehaviorSubject } from 'rxjs';
 import { setupTestBed } from '../testing/setupTestBed';
 import { CoreTestingModule } from '../testing/core.testing.module';
 
@@ -100,7 +100,7 @@ describe('InfinitePaginationComponent', () => {
             fixture.detectChanges();
 
             component.loadMore.subscribe((newPagination: Pagination) => {
-                expect(newPagination.skipCount).toBe(10);
+                expect(newPagination.skipCount).toBe(0);
                 done();
             });
 
@@ -130,7 +130,7 @@ describe('InfinitePaginationComponent', () => {
             fixture.detectChanges();
 
             expect(component.pagination).toBe(pagination);
-            expect(component.pageSize).toBe(pagination.maxItems);
+            expect(component.pageSize).toBe(25);
         });
 
         it('should call the target\'s updatePagination on invoking the onLoadMore', () => {
@@ -139,7 +139,7 @@ describe('InfinitePaginationComponent', () => {
 
             component.onLoadMore();
 
-            expect(testTarget.updatePagination).toHaveBeenCalledWith({ maxItems: 444, skipCount: 444, totalItems: 888, hasMoreItems: true, merge: true });
+            expect(testTarget.updatePagination).toHaveBeenCalledWith({ maxItems: 469, skipCount: 0, totalItems: 888, hasMoreItems: true, merge: true });
         });
 
         it('should unsubscribe from the target\'s pagination on onDestroy', () => {
diff --git a/lib/core/pagination/infinite-pagination.component.ts b/lib/core/pagination/infinite-pagination.component.ts
index 479286075f..65e4ab2dd1 100644
--- a/lib/core/pagination/infinite-pagination.component.ts
+++ b/lib/core/pagination/infinite-pagination.component.ts
@@ -24,9 +24,10 @@ import {
 
 import { PaginatedComponent } from './paginated-component.interface';
 import { Pagination } from 'alfresco-js-api';
-import { Subscription } from 'rxjs/Subscription';
+import { Subscription } from 'rxjs';
 import { PaginationComponentInterface } from './pagination-component.interface';
 import { PaginationModel } from '../models/pagination.model';
+import { UserPreferencesService } from '../services/user-preferences.service';
 
 @Component({
     selector: 'adf-infinite-pagination',
@@ -68,7 +69,7 @@ export class InfinitePaginationComponent implements OnInit, OnDestroy, Paginatio
 
     private paginationSubscription: Subscription;
 
-    constructor(private cdr: ChangeDetectorRef) {
+    constructor(private cdr: ChangeDetectorRef, private userPreferencesService: UserPreferencesService) {
     }
 
     ngOnInit() {
@@ -76,7 +77,7 @@ export class InfinitePaginationComponent implements OnInit, OnDestroy, Paginatio
             this.paginationSubscription = this.target.pagination.subscribe(pagination => {
                 this.isLoading = false;
                 this.pagination = pagination;
-                this.pageSize = pagination.maxItems;
+                this.pageSize = this.userPreferencesService.paginationSize || this.pageSize;
                 this.cdr.detectChanges();
             });
         }
@@ -87,12 +88,12 @@ export class InfinitePaginationComponent implements OnInit, OnDestroy, Paginatio
     }
 
     onLoadMore() {
-        this.pagination.skipCount += this.pageSize;
-        this.pagination.skipCount = this.pagination.skipCount;
+        this.pagination.skipCount = 0;
+        this.pagination.maxItems = this.pagination.maxItems + this.pageSize;
         this.pagination.merge = true;
         this.loadMore.next(this.pagination);
 
-        if ((this.pagination.skipCount + this.pageSize) > this.pagination.totalItems) {
+        if (this.pagination.maxItems >= this.pagination.totalItems) {
             this.pagination.hasMoreItems = false;
         }
 
diff --git a/lib/core/pagination/paginated-component.interface.ts b/lib/core/pagination/paginated-component.interface.ts
index b062eef1ee..603b743537 100644
--- a/lib/core/pagination/paginated-component.interface.ts
+++ b/lib/core/pagination/paginated-component.interface.ts
@@ -16,7 +16,7 @@
  */
 
 import { PaginationModel } from '../models/pagination.model';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
+import { BehaviorSubject } from 'rxjs';
 
 export interface PaginatedComponent {
     pagination: BehaviorSubject<PaginationModel>;
diff --git a/lib/core/pagination/pagination.component.spec.ts b/lib/core/pagination/pagination.component.spec.ts
index 100b2a167c..1f74368133 100644
--- a/lib/core/pagination/pagination.component.spec.ts
+++ b/lib/core/pagination/pagination.component.spec.ts
@@ -20,7 +20,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { Pagination } from 'alfresco-js-api';
 import { PaginationComponent } from './pagination.component';
 import { PaginatedComponent } from './public-api';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
+import { BehaviorSubject } from 'rxjs';
 import { setupTestBed } from '../testing/setupTestBed';
 import { CoreTestingModule } from '../testing/core.testing.module';
 
@@ -232,6 +232,8 @@ describe('PaginationComponent', () => {
 
     describe('Without pagination input', () => {
         it('has defaults', () => {
+            component.ngOnInit();
+
             const {
                 current, lastPage, isFirstPage, isLastPage,
                 next, previous, range, pages
diff --git a/lib/core/pagination/pagination.component.ts b/lib/core/pagination/pagination.component.ts
index d6486e6eb6..2ba68eb318 100644
--- a/lib/core/pagination/pagination.component.ts
+++ b/lib/core/pagination/pagination.component.ts
@@ -15,14 +15,17 @@
  * limitations under the License.
  */
 
-import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation,
-    ChangeDetectorRef, OnDestroy, HostBinding } from '@angular/core';
+import {
+    ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation,
+    ChangeDetectorRef, OnDestroy, HostBinding
+} from '@angular/core';
 
 import { Pagination } from 'alfresco-js-api';
 import { PaginatedComponent } from './paginated-component.interface';
 import { PaginationComponentInterface } from './pagination-component.interface';
-import { Subscription } from 'rxjs/Subscription';
+import { Subscription } from 'rxjs';
 import { PaginationModel } from '../models/pagination.model';
+import { UserPreferencesService } from '../services/user-preferences.service';
 
 @Component({
     selector: 'adf-pagination',
@@ -53,11 +56,11 @@ export class PaginationComponent implements OnInit, OnDestroy, PaginationCompone
 
     /** An array of page sizes. */
     @Input()
-    supportedPageSizes: number[] = [5, 25, 50, 100];
+    supportedPageSizes: number[];
 
     /** Pagination object. */
     @Input()
-    pagination: PaginationModel = PaginationComponent.DEFAULT_PAGINATION;
+    pagination: PaginationModel;
 
     /** Emitted when pagination changes in any way. */
     @Output()
@@ -81,10 +84,20 @@ export class PaginationComponent implements OnInit, OnDestroy, PaginationCompone
 
     private paginationSubscription: Subscription;
 
-    constructor(private cdr: ChangeDetectorRef) {
+    constructor(private cdr: ChangeDetectorRef, private userPreferencesService: UserPreferencesService) {
     }
 
     ngOnInit() {
+        if (!this.pagination) {
+            let defaultPagination = PaginationComponent.DEFAULT_PAGINATION;
+            defaultPagination.maxItems = this.userPreferencesService.paginationSize;
+            this.pagination = defaultPagination;
+        }
+
+        if (!this.supportedPageSizes) {
+            this.supportedPageSizes =  this.userPreferencesService.getDefaultPageSizes();
+        }
+
         if (this.target) {
             this.paginationSubscription = this.target.pagination.subscribe((pagination: PaginationModel) => {
 
diff --git a/lib/core/pagination/pagination.module.ts b/lib/core/pagination/pagination.module.ts
index 9d02ec6866..8bf90d2ad4 100644
--- a/lib/core/pagination/pagination.module.ts
+++ b/lib/core/pagination/pagination.module.ts
@@ -26,7 +26,7 @@ import { PaginationComponent } from './pagination.component';
     imports: [
         CommonModule,
         MaterialModule,
-        TranslateModule
+        TranslateModule.forChild()
     ],
     declarations: [
         InfinitePaginationComponent,
diff --git a/lib/core/pipes/user-initial.pipe.ts b/lib/core/pipes/user-initial.pipe.ts
index efe8458882..500a984fd3 100644
--- a/lib/core/pipes/user-initial.pipe.ts
+++ b/lib/core/pipes/user-initial.pipe.ts
@@ -18,15 +18,17 @@
 import { Pipe, PipeTransform } from '@angular/core';
 import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
 import { UserProcessModel } from '../models/user-process.model';
+import { EcmUserModel } from '../userinfo/models/ecm-user.model';
 
 @Pipe({
     name: 'usernameInitials'
 })
 export class InitialUsernamePipe implements PipeTransform {
 
-    constructor(private sanitized: DomSanitizer) {}
+    constructor(private sanitized: DomSanitizer) {
+    }
 
-    transform(user: UserProcessModel, className: string = '', delimiter: string = ''): SafeHtml {
+    transform(user: UserProcessModel | EcmUserModel, className: string = '', delimiter: string = ''): SafeHtml {
         let result: SafeHtml = '';
         if (user) {
             let initialResult = this.getInitialUserName(user.firstName, user.lastName, delimiter);
diff --git a/lib/core/services/alfresco-api.service.ts b/lib/core/services/alfresco-api.service.ts
index d05f83fb9e..d09364663b 100644
--- a/lib/core/services/alfresco-api.service.ts
+++ b/lib/core/services/alfresco-api.service.ts
@@ -34,7 +34,7 @@ import {
 import * as alfrescoApi from 'alfresco-js-api';
 import { AppConfigService, AppConfigValues } from '../app-config/app-config.service';
 import { StorageService } from './storage.service';
-import { Subject } from 'rxjs/Subject';
+import { Subject } from 'rxjs';
 import { OauthConfigModel } from '../models/oauth-config.model';
 
 /* tslint:disable:adf-file-name */
diff --git a/lib/core/services/apps-process.service.ts b/lib/core/services/apps-process.service.ts
index ccee827c67..24410b2fd1 100644
--- a/lib/core/services/apps-process.service.ts
+++ b/lib/core/services/apps-process.service.ts
@@ -17,11 +17,10 @@
 
 import { Injectable } from '@angular/core';
 import { AppDefinitionRepresentation } from 'alfresco-js-api';
-import { Observable } from 'rxjs/Observable';
+import { Observable, from, throwError } from 'rxjs';
 import { AlfrescoApiService } from './alfresco-api.service';
 import { LogService } from './log.service';
-import 'rxjs/add/observable/fromPromise';
-import 'rxjs/add/observable/throw';
+import { map, catchError } from 'rxjs/operators';
 
 @Injectable()
 export class AppsProcessService {
@@ -35,11 +34,11 @@ export class AppsProcessService {
      * @returns The list of deployed apps
      */
     getDeployedApplications(): Observable<AppDefinitionRepresentation[]> {
-        return Observable.fromPromise(this.apiService.getInstance().activiti.appsApi.getAppDefinitions())
-            .map((response: any) => {
-                return response.data;
-            })
-            .catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().activiti.appsApi.getAppDefinitions())
+            .pipe(
+                map((response: any) => <AppDefinitionRepresentation[]> response.data),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -48,11 +47,11 @@ export class AppsProcessService {
      * @returns The list of deployed apps
      */
     getDeployedApplicationsByName(name: string): Observable<AppDefinitionRepresentation> {
-        return Observable.fromPromise(this.apiService.getInstance().activiti.appsApi.getAppDefinitions())
-            .map((response: any) => {
-                return response.data.find(app => app.name === name);
-            })
-            .catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().activiti.appsApi.getAppDefinitions())
+            .pipe(
+                map((response: any) => <AppDefinitionRepresentation> response.data.find(app => app.name === name)),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -61,16 +60,16 @@ export class AppsProcessService {
      * @returns Details of the app
      */
     getApplicationDetailsById(appId: number): Observable<AppDefinitionRepresentation> {
-        return Observable.fromPromise(this.apiService.getInstance().activiti.appsApi.getAppDefinitions())
-            .map((response: any) => {
-                return response.data.find(app => app.id === appId);
-            })
-            .catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().activiti.appsApi.getAppDefinitions())
+            .pipe(
+                map((response: any) => response.data.find(app => app.id === appId)),
+                catchError(err => this.handleError(err))
+            );
     }
 
     private handleError(error: any) {
         this.logService.error(error);
-        return Observable.throw(error || 'Server error');
+        return throwError(error || 'Server error');
     }
 
 }
diff --git a/lib/core/services/auth-guard.service.ts b/lib/core/services/auth-guard.service.ts
index 1641c1491a..776db6c398 100644
--- a/lib/core/services/auth-guard.service.ts
+++ b/lib/core/services/auth-guard.service.ts
@@ -21,7 +21,7 @@ import {
     CanActivateChild, RouterStateSnapshot, Router
 } from '@angular/router';
 import { AuthenticationService } from './authentication.service';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { AppConfigService, AppConfigValues } from '../app-config/app-config.service';
 import { OauthConfigModel } from '../models/oauth-config.model';
 
@@ -32,12 +32,12 @@ export class AuthGuard implements CanActivate, CanActivateChild {
                 private appConfig: AppConfigService) {
     }
 
-    canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean | Observable<boolean> {
+    canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | Promise<boolean> | boolean {
         const redirectUrl = state.url;
         return this.checkLogin(redirectUrl);
     }
 
-    canActivateChild(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean | Observable<boolean> {
+    canActivateChild(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | Promise<boolean> | boolean {
         return this.canActivate(route, state);
     }
 
diff --git a/lib/core/services/authentication.service.spec.ts b/lib/core/services/authentication.service.spec.ts
index 072bb9934b..a598328dc0 100644
--- a/lib/core/services/authentication.service.spec.ts
+++ b/lib/core/services/authentication.service.spec.ts
@@ -22,6 +22,7 @@ import { CookieService } from './cookie.service';
 import { AppConfigService } from '../app-config/app-config.service';
 import { setupTestBed } from '../testing/setupTestBed';
 import { CoreTestingModule } from '../testing/core.testing.module';
+import { UserRepresentation } from 'alfresco-js-api';
 
 declare let jasmine: any;
 
@@ -349,6 +350,18 @@ describe('AuthenticationService', () => {
         it('[BPM] should return isALLProvider false', () => {
             expect(authService.isALLProvider()).toBe(false);
         });
+
+        it('[BPM] should be able to retrieve current logged in user', (done) => {
+            spyOn(apiService.getInstance().activiti.profileApi, 'getProfile').and.returnValue(
+                Promise.resolve((<UserRepresentation> {
+                    email: 'fake-email'
+                })));
+
+            authService.getBpmLoggedUser().subscribe((fakeUser) => {
+                expect(fakeUser.email).toBe('fake-email');
+                done();
+            });
+        });
     });
 
     describe('when the setting is both ECM and BPM ', () => {
diff --git a/lib/core/services/authentication.service.ts b/lib/core/services/authentication.service.ts
index b7a8521a06..b47317a373 100644
--- a/lib/core/services/authentication.service.ts
+++ b/lib/core/services/authentication.service.ts
@@ -16,16 +16,14 @@
  */
 
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
-import { Subject } from 'rxjs/Subject';
+import { Observable, Subject, from, throwError } from 'rxjs';
 import { AlfrescoApiService } from './alfresco-api.service';
 import { CookieService } from './cookie.service';
 import { LogService } from './log.service';
 import { RedirectionModel } from '../models/redirection.model';
 import { AppConfigService, AppConfigValues } from '../app-config/app-config.service';
-import 'rxjs/add/observable/fromPromise';
-import 'rxjs/add/operator/catch';
-import 'rxjs/add/observable/throw';
+import { UserRepresentation } from 'alfresco-js-api';
+import { map, catchError, tap } from 'rxjs/operators';
 
 const REMEMBER_ME_COOKIE_KEY = 'ALFRESCO_REMEMBER_ME';
 const REMEMBER_ME_UNTIL = 1000 * 60 * 60 * 24 * 30 ;
@@ -49,7 +47,10 @@ export class AuthenticationService {
      * @returns True if logged in, false otherwise
      */
     isLoggedIn(): boolean {
-        return !!this.alfrescoApi.getInstance().isLoggedIn();
+            if (!this.isOauth() && this.cookie.isEnabled() && !this.isRememberMeSet()) {
+                return false;
+            }
+            return this.alfrescoApi.getInstance().isLoggedIn();
     }
 
     isOauth(): boolean {
@@ -76,16 +77,18 @@ export class AuthenticationService {
      * @returns Object with auth type ("ECM", "BPM" or "ALL") and auth ticket
      */
     login(username: string, password: string, rememberMe: boolean = false): Observable<{ type: string, ticket: any }> {
-        return Observable.fromPromise(this.alfrescoApi.getInstance().login(username, password))
-            .map((response: any) => {
-                this.saveRememberMeCookie(rememberMe);
-                this.onLogin.next(response);
-                return {
-                    type: this.appConfig.get(AppConfigValues.PROVIDERS),
-                    ticket: response
-                };
-            })
-            .catch(err => this.handleError(err));
+        return from(this.alfrescoApi.getInstance().login(username, password))
+            .pipe(
+                map((response: any) => {
+                    this.saveRememberMeCookie(rememberMe);
+                    this.onLogin.next(response);
+                    return {
+                        type: this.appConfig.get(AppConfigValues.PROVIDERS),
+                        ticket: response
+                    };
+                }),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -124,12 +127,14 @@ export class AuthenticationService {
      * @returns Response event called when logout is complete
      */
     logout() {
-        return Observable.fromPromise(this.callApiLogout())
-            .do(response => {
-                this.onLogout.next(response);
-                return response;
-            })
-            .catch(err => this.handleError(err));
+        return from(this.callApiLogout())
+            .pipe(
+                tap(response => {
+                    this.onLogout.next(response);
+                    return response;
+                }),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -228,6 +233,10 @@ export class AuthenticationService {
         return this.hasValidRedirection(provider) ? this.redirectUrl.url : null;
     }
 
+    getBpmLoggedUser(): Observable<UserRepresentation> {
+        return from(this.alfrescoApi.getInstance().activiti.profileApi.getProfile());
+    }
+
     private hasValidRedirection(provider: string): boolean {
         return this.redirectUrl && (this.redirectUrl.provider === provider || this.hasSelectedProviderAll(provider));
     }
@@ -243,6 +252,6 @@ export class AuthenticationService {
      */
     handleError(error: any): Observable<any> {
         this.logService.error('Error when logging in', error);
-        return Observable.throw(error || 'Server error');
+        return throwError(error || 'Server error');
     }
 }
diff --git a/lib/core/services/comment-content.service.ts b/lib/core/services/comment-content.service.ts
index 6e3ae4c7c7..85c8abc7e2 100644
--- a/lib/core/services/comment-content.service.ts
+++ b/lib/core/services/comment-content.service.ts
@@ -16,13 +16,11 @@
  */
 
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable, from, throwError } from 'rxjs';
 import { CommentModel } from '../models/comment.model';
 import { AlfrescoApiService } from '../services/alfresco-api.service';
 import { LogService } from '../services/log.service';
-import 'rxjs/add/observable/fromPromise';
-import 'rxjs/add/operator/catch';
-import 'rxjs/add/observable/throw';
+import { map, catchError } from 'rxjs/operators';
 
 @Injectable()
 export class CommentContentService {
@@ -38,15 +36,18 @@ export class CommentContentService {
      * @returns Details of the comment added
      */
     addNodeComment(nodeId: string, message: string): Observable<CommentModel> {
-        return Observable.fromPromise(this.apiService.getInstance().core.commentsApi.addComment(nodeId, {content: message}))
-            .map((response: any) => {
-                return new CommentModel({
-                    id: response.entry.id,
-                    message: response.entry.content,
-                    created: response.entry.createdAt,
-                    createdBy: response.entry.createdBy
-                });
-            }).catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().core.commentsApi.addComment(nodeId, {content: message}))
+            .pipe(
+                map((response: any) => {
+                    return new CommentModel({
+                        id: response.entry.id,
+                        message: response.entry.content,
+                        created: response.entry.createdAt,
+                        createdBy: response.entry.createdBy
+                    });
+                }),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -55,24 +56,27 @@ export class CommentContentService {
      * @returns Details for each comment
      */
     getNodeComments(nodeId: string): Observable<CommentModel[]> {
-        return Observable.fromPromise(this.apiService.getInstance().core.commentsApi.getComments(nodeId))
-            .map((response: any) => {
-                const comments: CommentModel[] = [];
-                response.list.entries.forEach((comment: any) => {
-                    comments.push(new CommentModel({
-                        id: comment.entry.id,
-                        message: comment.entry.content,
-                        created: comment.entry.createdAt,
-                        createdBy: comment.entry.createdBy
-                    }));
-                });
-                return comments;
-            }).catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().core.commentsApi.getComments(nodeId))
+            .pipe(
+                map((response: any) => {
+                    const comments: CommentModel[] = [];
+                    response.list.entries.forEach((comment: any) => {
+                        comments.push(new CommentModel({
+                            id: comment.entry.id,
+                            message: comment.entry.content,
+                            created: comment.entry.createdAt,
+                            createdBy: comment.entry.createdBy
+                        }));
+                    });
+                    return comments;
+                }),
+                catchError(err => this.handleError(err))
+            );
     }
 
     private handleError(error: any) {
         this.logService.error(error);
-        return Observable.throw(error || 'Server error');
+        return throwError(error || 'Server error');
     }
 
 }
diff --git a/lib/core/services/comment-process.service.ts b/lib/core/services/comment-process.service.ts
index 43682d757d..aa1cf7b981 100644
--- a/lib/core/services/comment-process.service.ts
+++ b/lib/core/services/comment-process.service.ts
@@ -16,14 +16,12 @@
  */
 
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable, from, throwError } from 'rxjs';
 import { CommentModel } from '../models/comment.model';
 import { UserProcessModel } from '../models/user-process.model';
 import { AlfrescoApiService } from './alfresco-api.service';
 import { LogService } from './log.service';
-import 'rxjs/add/observable/fromPromise';
-import 'rxjs/add/operator/catch';
-import 'rxjs/add/observable/throw';
+import { map, catchError } from 'rxjs/operators';
 
 @Injectable()
 export class CommentProcessService {
@@ -39,17 +37,18 @@ export class CommentProcessService {
      * @returns Details about the comment
      */
     addTaskComment(taskId: string, message: string): Observable<CommentModel> {
-        return Observable.fromPromise(this.apiService.getInstance().activiti.taskApi.addTaskComment({message: message}, taskId))
-            .map(res => res)
-            .map((response: CommentModel) => {
-                return new CommentModel({
-                    id: response.id,
-                    message: response.message,
-                    created: response.created,
-                    createdBy: response.createdBy
-                });
-            }).catch(err => this.handleError(err));
-
+        return from(this.apiService.getInstance().activiti.taskApi.addTaskComment({message: message}, taskId))
+            .pipe(
+                map((response: CommentModel) => {
+                    return new CommentModel({
+                        id: response.id,
+                        message: response.message,
+                        created: response.created,
+                        createdBy: response.createdBy
+                    });
+                }),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -58,16 +57,18 @@ export class CommentProcessService {
      * @returns Details for each comment
      */
     getTaskComments(taskId: string): Observable<CommentModel[]> {
-        return Observable.fromPromise(this.apiService.getInstance().activiti.taskApi.getTaskComments(taskId))
-            .map(res => res)
-            .map((response: any) => {
-                let comments: CommentModel[] = [];
-                response.data.forEach((comment: CommentModel) => {
-                    let user = new UserProcessModel(comment.createdBy);
-                    comments.push(new CommentModel({id: comment.id, message: comment.message, created: comment.created, createdBy: user}));
-                });
-                return comments;
-            }).catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().activiti.taskApi.getTaskComments(taskId))
+            .pipe(
+                map((response: any) => {
+                    let comments: CommentModel[] = [];
+                    response.data.forEach((comment: CommentModel) => {
+                        let user = new UserProcessModel(comment.createdBy);
+                        comments.push(new CommentModel({id: comment.id, message: comment.message, created: comment.created, createdBy: user}));
+                    });
+                    return comments;
+                }),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -76,16 +77,18 @@ export class CommentProcessService {
      * @returns Details for each comment
      */
     getProcessInstanceComments(processInstanceId: string): Observable<CommentModel[]> {
-        return Observable.fromPromise(this.apiService.getInstance().activiti.commentsApi.getProcessInstanceComments(processInstanceId))
-            .map(res => res)
-            .map((response: any) => {
-                let comments: CommentModel[] = [];
-                response.data.forEach((comment: CommentModel) => {
-                    let user = new UserProcessModel(comment.createdBy);
-                    comments.push(new CommentModel({id: comment.id, message: comment.message, created: comment.created, createdBy: user}));
-                });
-                return comments;
-            }).catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().activiti.commentsApi.getProcessInstanceComments(processInstanceId))
+            .pipe(
+                map((response: any) => {
+                    let comments: CommentModel[] = [];
+                    response.data.forEach((comment: CommentModel) => {
+                        let user = new UserProcessModel(comment.createdBy);
+                        comments.push(new CommentModel({id: comment.id, message: comment.message, created: comment.created, createdBy: user}));
+                    });
+                    return comments;
+                }),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -95,23 +98,24 @@ export class CommentProcessService {
      * @returns Details of the comment added
      */
     addProcessInstanceComment(processInstanceId: string, message: string): Observable<CommentModel> {
-        return Observable.fromPromise(
+        return from(
             this.apiService.getInstance().activiti.commentsApi.addProcessInstanceComment({message: message}, processInstanceId)
-        )
-            .map((response: CommentModel) => {
+        ).pipe(
+            map((response: CommentModel) => {
                 return new CommentModel({
                     id: response.id,
                     message: response.message,
                     created: response.created,
                     createdBy: response.createdBy
                 });
-            }).catch(err => this.handleError(err));
-
+            }),
+            catchError(err => this.handleError(err))
+        );
     }
 
     private handleError(error: any) {
         this.logService.error(error);
-        return Observable.throw(error || 'Server error');
+        return throwError(error || 'Server error');
     }
 
 }
diff --git a/lib/core/services/content.service.ts b/lib/core/services/content.service.ts
index 8060aeef31..206a2d4dce 100644
--- a/lib/core/services/content.service.ts
+++ b/lib/core/services/content.service.ts
@@ -18,17 +18,13 @@
 import { Injectable } from '@angular/core';
 import { DomSanitizer } from '@angular/platform-browser';
 import { ContentApi, MinimalNodeEntryEntity, Node, NodeEntry } from 'alfresco-js-api';
-import { Observable } from 'rxjs/Observable';
-import { Subject } from 'rxjs/Subject';
+import { Observable, Subject, from, throwError } from 'rxjs';
 import { FolderCreatedEvent } from '../events/folder-created.event';
 import { PermissionsEnum } from '../models/permissions.enum';
 import { AlfrescoApiService } from './alfresco-api.service';
 import { AuthenticationService } from './authentication.service';
 import { LogService } from './log.service';
-import 'rxjs/add/observable/fromPromise';
-import 'rxjs/add/operator/catch';
-import 'rxjs/add/operator/do';
-import 'rxjs/add/observable/throw';
+import { catchError, tap } from 'rxjs/operators';
 
 @Injectable()
 export class ContentService {
@@ -157,9 +153,10 @@ export class ContentService {
      * @returns Content data
      */
     getNodeContent(nodeId: string): Observable<any> {
-        return Observable.fromPromise(this.apiService.getInstance().core.nodesApi.getFileContent(nodeId).then((dataContent) => {
-            return dataContent;
-        })).catch(this.handleError);
+        return from(this.apiService.getInstance().core.nodesApi.getFileContent(nodeId))
+            .pipe(
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -169,17 +166,19 @@ export class ContentService {
      * @param parentId Node ID of parent folder
      * @returns Information about the new folder
      */
-    createFolder(relativePath: string, name: string, parentId?: string): Observable<FolderCreatedEvent> {
-        return Observable.fromPromise(this.apiService.getInstance().nodes.createFolder(name, relativePath, parentId))
-            .do(data => {
-                this.folderCreated.next(<FolderCreatedEvent> {
-                    relativePath: relativePath,
-                    name: name,
-                    parentId: parentId,
-                    node: data
-                });
-            })
-            .catch(err => this.handleError(err));
+    createFolder(relativePath: string, name: string, parentId?: string): Observable<NodeEntry> {
+        return from(this.apiService.getInstance().nodes.createFolder(name, relativePath, parentId))
+            .pipe(
+                tap(data => {
+                    this.folderCreated.next(<FolderCreatedEvent> {
+                        relativePath: relativePath,
+                        name: name,
+                        parentId: parentId,
+                        node: data
+                    });
+                }),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -189,7 +188,7 @@ export class ContentService {
      * @returns Details of the folder
      */
     getNode(nodeId: string, opts?: any): Observable<NodeEntry> {
-        return Observable.fromPromise(this.apiService.getInstance().nodes.getNode(nodeId, opts));
+        return from(this.apiService.getInstance().nodes.getNode(nodeId, opts));
     }
 
     /**
@@ -240,6 +239,6 @@ export class ContentService {
 
     private handleError(error: any) {
         this.logService.error(error);
-        return Observable.throw(error || 'Server error');
+        return throwError(error || 'Server error');
     }
 }
diff --git a/lib/core/services/cookie.service.ts b/lib/core/services/cookie.service.ts
index 474f0da98d..dff0ebe114 100644
--- a/lib/core/services/cookie.service.ts
+++ b/lib/core/services/cookie.service.ts
@@ -31,7 +31,7 @@ export class CookieService {
         }
 
         document.cookie = 'test-cookie';
-        return document.cookie.indexOf('test-cookie') > 0;
+        return document.cookie.indexOf('test-cookie') >= 0;
     }
 
     /**
diff --git a/lib/core/services/deleted-nodes-api.service.ts b/lib/core/services/deleted-nodes-api.service.ts
index a3a6064b9e..b529c52833 100644
--- a/lib/core/services/deleted-nodes-api.service.ts
+++ b/lib/core/services/deleted-nodes-api.service.ts
@@ -16,11 +16,12 @@
  */
 
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable, from, of } from 'rxjs';
 
 import { NodePaging } from 'alfresco-js-api';
 import { AlfrescoApiService } from './alfresco-api.service';
 import { UserPreferencesService } from './user-preferences.service';
+import { catchError } from 'rxjs/operators';
 
 @Injectable()
 export class DeletedNodesApiService {
@@ -39,21 +40,16 @@ export class DeletedNodesApiService {
      * @returns List of nodes in the trash
      */
     getDeletedNodes(options?: Object): Observable<NodePaging> {
-        const { nodesApi, handleError } = this;
         const defaultOptions = {
             include: [ 'path', 'properties' ],
             maxItems: this.preferences.paginationSize,
             skipCount: 0
         };
         const queryOptions = Object.assign(defaultOptions, options);
-        const promise = nodesApi.getDeletedNodes(queryOptions);
+        const promise = this.nodesApi.getDeletedNodes(queryOptions);
 
-        return Observable
-            .fromPromise(promise)
-            .catch(handleError);
-    }
-
-    private handleError(error: any): Observable<any> {
-        return Observable.of(error);
+        return from(promise).pipe(
+            catchError(err => of(err))
+        );
     }
 }
diff --git a/lib/core/services/discovery-api.service.ts b/lib/core/services/discovery-api.service.ts
index 1720d0eab5..5cc1bc9feb 100644
--- a/lib/core/services/discovery-api.service.ts
+++ b/lib/core/services/discovery-api.service.ts
@@ -16,12 +16,11 @@
  */
 
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { from, throwError } from 'rxjs';
 import { BpmProductVersionModel, EcmProductVersionModel } from '../models/product-version.model';
 import { AlfrescoApiService } from './alfresco-api.service';
-import 'rxjs/add/observable/fromPromise';
-import 'rxjs/add/operator/catch';
-import 'rxjs/add/observable/throw';
+import { map, catchError } from 'rxjs/operators';
+import { Observable } from 'rxjs';
 
 @Injectable()
 export class DiscoveryApiService {
@@ -32,25 +31,23 @@ export class DiscoveryApiService {
      * Gets product information for Content Services.
      * @returns ProductVersionModel containing product details
      */
-    public getEcmProductInfo() {
-        return Observable.fromPromise(
-            this.apiService.getInstance().discovery.discoveryApi.getRepositoryInformation())
-            .map(res => new EcmProductVersionModel(res))
-            .catch(this.handleError);
+    public getEcmProductInfo(): Observable<EcmProductVersionModel> {
+        return from(this.apiService.getInstance().discovery.discoveryApi.getRepositoryInformation())
+            .pipe(
+                map(res => new EcmProductVersionModel(res)),
+                catchError(err => throwError(err))
+            );
     }
 
     /**
      * Gets product information for Process Services.
      * @returns ProductVersionModel containing product details
      */
-    public getBpmProductInfo() {
-        return Observable.fromPromise(
-            this.apiService.getInstance().activiti.aboutApi.getAppVersion())
-            .map(res => new BpmProductVersionModel(res))
-            .catch(this.handleError);
-    }
-
-    private handleError(error): Observable<any> {
-        return Observable.throw(error);
+    public getBpmProductInfo(): Observable<BpmProductVersionModel> {
+        return from(this.apiService.getInstance().activiti.aboutApi.getAppVersion())
+            .pipe(
+                map(res => new BpmProductVersionModel(res)),
+                catchError(err => throwError(err))
+            );
     }
 }
diff --git a/lib/core/services/favorites-api.service.ts b/lib/core/services/favorites-api.service.ts
index fa5817ffd8..93f2bdd295 100644
--- a/lib/core/services/favorites-api.service.ts
+++ b/lib/core/services/favorites-api.service.ts
@@ -17,9 +17,10 @@
 
 import { Injectable } from '@angular/core';
 import { NodePaging } from 'alfresco-js-api';
-import { Observable } from 'rxjs/Observable';
+import { Observable, from, of } from 'rxjs';
 import { AlfrescoApiService } from './alfresco-api.service';
 import { UserPreferencesService } from './user-preferences.service';
+import { catchError } from 'rxjs/operators';
 
 @Injectable()
 export class FavoritesApiService {
@@ -69,7 +70,6 @@ export class FavoritesApiService {
      * @returns List of favorites
      */
     getFavorites(personId: string, options?: any): Observable<NodePaging> {
-        const { favoritesApi, handleError } = this;
         const defaultOptions = {
             maxItems: this.preferences.paginationSize,
             skipCount: 0,
@@ -77,16 +77,12 @@ export class FavoritesApiService {
             include: [ 'properties', 'allowableOperations' ]
         };
         const queryOptions = Object.assign(defaultOptions, options);
-        const promise = favoritesApi
+        const promise = this.favoritesApi
             .getFavorites(personId, queryOptions)
             .then(this.remapFavoritesData);
 
-        return Observable
-            .fromPromise(promise)
-            .catch(handleError);
-    }
-
-    private handleError(error): Observable<any> {
-        return Observable.of(error);
+        return from(promise).pipe(
+            catchError(err => of(err))
+        );
     }
 }
diff --git a/lib/core/services/log.service.ts b/lib/core/services/log.service.ts
index c59a08a3c7..2b6180e9b4 100644
--- a/lib/core/services/log.service.ts
+++ b/lib/core/services/log.service.ts
@@ -20,7 +20,7 @@
 import { Injectable } from '@angular/core';
 import { AppConfigService, AppConfigValues } from '../app-config/app-config.service';
 import { logLevels, LogLevelsEnum } from '../models/log-levels.model';
-import { Subject } from 'rxjs/Subject';
+import { Subject } from 'rxjs';
 
 @Injectable()
 export class LogService {
diff --git a/lib/core/services/nodes-api.service.ts b/lib/core/services/nodes-api.service.ts
index 3e01e846bc..da05a92a3f 100644
--- a/lib/core/services/nodes-api.service.ts
+++ b/lib/core/services/nodes-api.service.ts
@@ -17,11 +17,10 @@
 
 import { Injectable } from '@angular/core';
 import { MinimalNodeEntity, MinimalNodeEntryEntity, NodePaging } from 'alfresco-js-api';
-import { Observable } from 'rxjs/Observable';
+import { Observable, from, throwError } from 'rxjs';
 import { AlfrescoApiService } from './alfresco-api.service';
 import { UserPreferencesService } from './user-preferences.service';
-import 'rxjs/add/observable/fromPromise';
-import 'rxjs/add/observable/throw';
+import { catchError } from 'rxjs/operators';
 
 @Injectable()
 export class NodesApiService {
@@ -45,18 +44,17 @@ export class NodesApiService {
      * @returns Node information
      */
     getNode(nodeId: string, options: any = {}): Observable<MinimalNodeEntryEntity> {
-        const { nodesApi, handleError, getEntryFromEntity } = this;
         const defaults = {
             include: [ 'path', 'properties', 'allowableOperations', 'permissions' ]
         };
         const queryOptions = Object.assign(defaults, options);
-        const promise = nodesApi
+        const promise = this.nodesApi
             .getNode(nodeId, queryOptions)
-            .then(getEntryFromEntity);
+            .then(this.getEntryFromEntity);
 
-        return Observable
-            .fromPromise(promise)
-            .catch(handleError);
+        return from(promise).pipe(
+            catchError(err => throwError(err))
+        );
     }
 
     /**
@@ -66,19 +64,18 @@ export class NodesApiService {
      * @returns List of child items from the folder
      */
     getNodeChildren(nodeId: string, options: any = {}): Observable<NodePaging> {
-        const { nodesApi, handleError } = this;
         const defaults = {
             maxItems: this.preferences.paginationSize,
             skipCount: 0,
             include: [ 'path', 'properties', 'allowableOperations', 'permissions' ]
         };
         const queryOptions = Object.assign(defaults, options);
-        const promise = nodesApi
+        const promise = this.nodesApi
             .getNodeChildren(nodeId, queryOptions);
 
-        return Observable
-            .fromPromise(promise)
-            .catch(handleError);
+        return from(promise).pipe(
+            catchError(err => throwError(err))
+        );
     }
 
     /**
@@ -89,12 +86,13 @@ export class NodesApiService {
      * @returns Details of the new node
      */
     createNode(parentNodeId: string, nodeBody: any, options: any = {}): Observable<MinimalNodeEntryEntity> {
-        const { nodesApi, handleError, getEntryFromEntity } = this;
-        const promise = nodesApi
+        const promise = this.nodesApi
             .addNode(parentNodeId, nodeBody, options)
-            .then(getEntryFromEntity);
+            .then(this.getEntryFromEntity);
 
-        return Observable.fromPromise(promise).catch(handleError);
+        return from(promise).pipe(
+            catchError(err => throwError(err))
+        );
     }
 
     /**
@@ -117,18 +115,18 @@ export class NodesApiService {
      * @returns Updated node information
      */
     updateNode(nodeId: string, nodeBody: any, options: any = {}): Observable<MinimalNodeEntryEntity> {
-        const { nodesApi, handleError, getEntryFromEntity } = this;
-
         const defaults = {
             include: [ 'path', 'properties', 'allowableOperations', 'permissions' ]
         };
         const queryOptions = Object.assign(defaults, options);
 
-        const promise = nodesApi
+        const promise = this.nodesApi
             .updateNode(nodeId, nodeBody, queryOptions)
-            .then(getEntryFromEntity);
+            .then(this.getEntryFromEntity);
 
-        return Observable.fromPromise(promise).catch(handleError);
+        return from(promise).pipe(
+            catchError(err => throwError(err))
+        );
     }
 
     /**
@@ -137,14 +135,12 @@ export class NodesApiService {
      * @param options Optional parameters supported by JSAPI
      * @returns Empty result that notifies when the deletion is complete
      */
-    deleteNode(nodeId: string, options: any = {}): Observable<void> {
-        const { nodesApi, handleError } = this;
-        const promise = nodesApi
-            .deleteNode(nodeId, options);
+    deleteNode(nodeId: string, options: any = {}): Observable<any> {
+        const promise = this.nodesApi.deleteNode(nodeId, options);
 
-        return Observable
-            .fromPromise(promise)
-            .catch(handleError);
+        return from(promise).pipe(
+            catchError(err => throwError(err))
+        );
     }
 
     /**
@@ -153,22 +149,12 @@ export class NodesApiService {
      * @returns Details of the restored node
      */
     restoreNode(nodeId: string): Observable<MinimalNodeEntryEntity> {
-        const { nodesApi, handleError, getEntryFromEntity } = this;
-        const promise = nodesApi
+        const promise = this.nodesApi
             .restoreNode(nodeId)
-            .then(getEntryFromEntity);
+            .then(this.getEntryFromEntity);
 
-        return Observable
-            .fromPromise(promise)
-            .catch(handleError);
-    }
-
-    /**
-     * Reports an error.
-     * @param error Object representing the error
-     * @returns Error information
-     */
-    handleError(error: any): Observable<any> {
-        return Observable.throw(error);
+        return from(promise).pipe(
+            catchError(err => throwError(err))
+        );
     }
 }
diff --git a/lib/core/services/notification.service.spec.ts b/lib/core/services/notification.service.spec.ts
index 877efb9ff7..223bf2f6c7 100644
--- a/lib/core/services/notification.service.spec.ts
+++ b/lib/core/services/notification.service.spec.ts
@@ -20,7 +20,7 @@ import { OVERLAY_PROVIDERS, OverlayModule } from '@angular/cdk/overlay';
 import { Component } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { MatSnackBar, MatSnackBarModule } from '@angular/material';
+import { MatSnackBar, MatSnackBarModule, MatSnackBarConfig } from '@angular/material';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { NotificationService } from './notification.service';
 import { TranslationMock } from '../mock/translation.service.mock';
@@ -35,13 +35,33 @@ class ProvidesNotificationServiceComponent {
 
     }
 
+    sendMessageWithoutConfig() {
+        let promise = this.notificationService.openSnackMessage('Test notification', 1000);
+        return promise;
+    }
+
     sendMessage() {
-        let promise = this.notificationService.openSnackMessage('Test notification', 5000);
+        let promise = this.notificationService.openSnackMessage('Test notification', 1000);
+        return promise;
+    }
+
+    sendCustomMessage() {
+        let promise = this.notificationService.openSnackMessage('Test notification', new MatSnackBarConfig());
+        return promise;
+    }
+
+    sendMessageActionWithoutConfig() {
+        let promise = this.notificationService.openSnackMessageAction('Test notification', 'TestWarn', 1000);
         return promise;
     }
 
     sendMessageAction() {
-        let promise = this.notificationService.openSnackMessageAction('Test notification', 'TestWarn', 5000);
+        let promise = this.notificationService.openSnackMessageAction('Test notification', 'TestWarn', 1000);
+        return promise;
+    }
+
+    sendCustomMessageAction() {
+        let promise = this.notificationService.openSnackMessageAction('Test notification', 'TestWarn', new MatSnackBarConfig());
         return promise;
     }
 
@@ -99,6 +119,28 @@ describe('NotificationService', () => {
         expect(document.querySelector('snack-bar-container')).not.toBeNull();
     });
 
+    it('should open a message notification bar without custom configuration', (done) => {
+        let promise = fixture.componentInstance.sendMessageWithoutConfig();
+        promise.afterDismissed().subscribe(() => {
+            done();
+        });
+
+        fixture.detectChanges();
+
+        expect(document.querySelector('snack-bar-container')).not.toBeNull();
+    });
+
+    it('should open a message notification bar with custom configuration', async((done) => {
+        let promise = fixture.componentInstance.sendCustomMessage();
+        promise.afterDismissed().subscribe(() => {
+            done();
+        });
+
+        fixture.detectChanges();
+
+        expect(document.querySelector('snack-bar-container')).not.toBeNull();
+    }));
+
     it('should open a message notification bar with action', (done) => {
         let promise = fixture.componentInstance.sendMessageAction();
         promise.afterDismissed().subscribe(() => {
@@ -110,4 +152,26 @@ describe('NotificationService', () => {
         expect(document.querySelector('snack-bar-container')).not.toBeNull();
     });
 
+    it('should open a message notification bar with action and custom configuration', async((done) => {
+        let promise = fixture.componentInstance.sendCustomMessageAction();
+        promise.afterDismissed().subscribe(() => {
+            done();
+        });
+
+        fixture.detectChanges();
+
+        expect(document.querySelector('snack-bar-container')).not.toBeNull();
+    }));
+
+    it('should open a message notification bar with action and no custom configuration', (done) => {
+        let promise = fixture.componentInstance.sendMessageActionWithoutConfig();
+        promise.afterDismissed().subscribe(() => {
+            done();
+        });
+
+        fixture.detectChanges();
+
+        expect(document.querySelector('snack-bar-container')).not.toBeNull();
+    });
+
 });
diff --git a/lib/core/services/notification.service.ts b/lib/core/services/notification.service.ts
index 9479a862b0..4ac339b0cf 100644
--- a/lib/core/services/notification.service.ts
+++ b/lib/core/services/notification.service.ts
@@ -16,7 +16,7 @@
  */
 
 import { Injectable } from '@angular/core';
-import { MatSnackBar, MatSnackBarRef } from '@angular/material';
+import { MatSnackBar, MatSnackBarRef, MatSnackBarConfig } from '@angular/material';
 import { TranslationService } from './translation.service';
 
 @Injectable()
@@ -31,29 +31,39 @@ export class NotificationService {
     /**
      * Opens a SnackBar notification to show a message.
      * @param message The message (or resource key) to show.
-     * @param millisecondsDuration Time before notification disappears after being shown
+     * @param config Time before notification disappears after being shown or MatSnackBarConfig object
      * @returns Information/control object for the SnackBar
      */
-    openSnackMessage(message: string, millisecondsDuration?: number): MatSnackBarRef<any> {
+    openSnackMessage(message: string, config: number | MatSnackBarConfig = NotificationService.DEFAULT_DURATION_MESSAGE): MatSnackBarRef<any> {
+
         const translatedMessage = this.translationService.instant(message);
 
-        return this.snackBar.open(translatedMessage, null, {
-            duration: millisecondsDuration || NotificationService.DEFAULT_DURATION_MESSAGE
-        });
+        if (typeof config === 'number') {
+            config = {
+                duration: config
+            };
+        }
+
+        return this.snackBar.open(translatedMessage, null, config);
     }
 
     /**
      * Opens a SnackBar notification with a message and a response button.
      * @param message The message (or resource key) to show.
      * @param action Caption for the response button
-     * @param millisecondsDuration Time before the notification disappears (unless the button is clicked)
+     * @param config Time before notification disappears after being shown or MatSnackBarConfig object
      * @returns Information/control object for the SnackBar
      */
-    openSnackMessageAction(message: string, action: string, millisecondsDuration?: number): MatSnackBarRef<any> {
+    openSnackMessageAction(message: string, action: string, config: number | MatSnackBarConfig = NotificationService.DEFAULT_DURATION_MESSAGE): MatSnackBarRef<any> {
+
         const translatedMessage = this.translationService.instant(message);
 
-        return this.snackBar.open(translatedMessage, action, {
-            duration: millisecondsDuration || NotificationService.DEFAULT_DURATION_MESSAGE
-        });
+        if (typeof config === 'number') {
+            config = {
+                duration: config
+            };
+        }
+
+        return this.snackBar.open(translatedMessage, action, config);
     }
 }
diff --git a/lib/core/services/page-title.service.spec.ts b/lib/core/services/page-title.service.spec.ts
index 107c1f50bf..c9e1e22084 100644
--- a/lib/core/services/page-title.service.spec.ts
+++ b/lib/core/services/page-title.service.spec.ts
@@ -75,4 +75,16 @@ describe('AppTitle service', () => {
         translationService.translate.onLangChange.next(<any> {});
         expect(titleServiceSpy).toHaveBeenCalledWith('привет - My application');
     });
+
+    it('should update title on new content download', () => {
+        spyOn(translationService, 'instant').and.returnValues('hello', 'привет');
+
+        pageTitleService.setTitle('key');
+        expect(titleServiceSpy).toHaveBeenCalledWith('hello - My application');
+
+        (<any> titleService).setTitle.calls.reset();
+
+        translationService.translate.onTranslationChange.next(<any> {});
+        expect(titleServiceSpy).toHaveBeenCalledWith('привет - My application');
+    });
 });
diff --git a/lib/core/services/page-title.service.ts b/lib/core/services/page-title.service.ts
index 822ebd0e65..7377cebd27 100644
--- a/lib/core/services/page-title.service.ts
+++ b/lib/core/services/page-title.service.ts
@@ -31,6 +31,7 @@ export class PageTitleService {
         private appConfig: AppConfigService,
         private translationService: TranslationService) {
         translationService.translate.onLangChange.subscribe(() => this.onLanguageChanged());
+        translationService.translate.onTranslationChange.subscribe(() => this.onLanguageChanged());
     }
 
     /**
diff --git a/lib/core/services/people-content.service.spec.ts b/lib/core/services/people-content.service.spec.ts
index 231c965d3d..a3c8c6926c 100644
--- a/lib/core/services/people-content.service.spec.ts
+++ b/lib/core/services/people-content.service.spec.ts
@@ -97,18 +97,5 @@ describe('PeopleAPI', () => {
                     .toBe('-me-');
             });
         }));
-
-        it('handles the error when it fails', async(() => {
-            const test = new PeopleContentServiceTest({
-                rejectGetPerson: true
-            });
-
-            const handleErrorSpy = spyOn(test.service, 'handleError')
-                .and.callThrough();
-
-            test.service.getPerson().subscribe(() => {
-                expect(handleErrorSpy).toHaveBeenCalled();
-            });
-        }));
     });
 });
diff --git a/lib/core/services/people-content.service.ts b/lib/core/services/people-content.service.ts
index 24363036f9..fc24856925 100644
--- a/lib/core/services/people-content.service.ts
+++ b/lib/core/services/people-content.service.ts
@@ -16,9 +16,9 @@
  */
 
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable, from, of } from 'rxjs';
 import { AlfrescoApiService } from './alfresco-api.service';
-import 'rxjs/add/observable/fromPromise';
+import { catchError } from 'rxjs/operators';
 
 @Injectable()
 export class PeopleContentService {
@@ -35,12 +35,11 @@ export class PeopleContentService {
      * @returns User information
      */
     getPerson(personId: string): Observable<any> {
-        const { peopleApi, handleError } = this;
-        const promise = peopleApi.getPerson(personId);
+        const promise = this.peopleApi.getPerson(personId);
 
-        return Observable
-            .fromPromise(promise)
-            .catch(handleError);
+        return from(promise).pipe(
+            catchError(err => of(err))
+        );
     }
 
     /**
@@ -50,8 +49,4 @@ export class PeopleContentService {
     getCurrentPerson(): Observable<any> {
         return this.getPerson('-me-');
     }
-
-    private handleError(error): Observable<any> {
-        return Observable.of(error);
-    }
 }
diff --git a/lib/core/services/people-process.service.ts b/lib/core/services/people-process.service.ts
index 530de713fd..5cddf25d56 100644
--- a/lib/core/services/people-process.service.ts
+++ b/lib/core/services/people-process.service.ts
@@ -17,12 +17,11 @@
 
 import { Injectable } from '@angular/core';
 import { Response } from '@angular/http';
-import { Observable } from 'rxjs/Observable';
+import { Observable, from, throwError } from 'rxjs';
 import { UserProcessModel } from '../models/user-process.model';
 import { AlfrescoApiService } from './alfresco-api.service';
 import { LogService } from './log.service';
-import 'rxjs/add/observable/fromPromise';
-import 'rxjs/add/observable/throw';
+import { catchError, map } from 'rxjs/operators';
 
 @Injectable()
 export class PeopleProcessService {
@@ -39,9 +38,11 @@ export class PeopleProcessService {
      */
     getWorkflowUsers(taskId?: string, searchWord?: string): Observable<UserProcessModel[]> {
         let option = { excludeTaskId: taskId, filter: searchWord };
-        return Observable.fromPromise(this.getWorkflowUserApi(option))
-            .map((response: any) => <UserProcessModel[]> response.data || [])
-            .catch(err => this.handleError(err));
+        return from(this.getWorkflowUserApi(option))
+            .pipe(
+                map((response: any) => <UserProcessModel[]> response.data || []),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -61,8 +62,10 @@ export class PeopleProcessService {
      */
     involveUserWithTask(taskId: string, idToInvolve: string): Observable<UserProcessModel[]> {
         let node = {userId: idToInvolve};
-        return Observable.fromPromise(this.involveUserToTaskApi(taskId, node))
-            .catch(err => this.handleError(err));
+        return from<UserProcessModel[]>(this.involveUserToTaskApi(taskId, node))
+            .pipe(
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -73,8 +76,10 @@ export class PeopleProcessService {
      */
     removeInvolvedUser(taskId: string, idToRemove: string): Observable<UserProcessModel[]> {
         let node = {userId: idToRemove};
-        return Observable.fromPromise(this.removeInvolvedUserFromTaskApi(taskId, node))
-            .catch(err => this.handleError(err));
+        return from<UserProcessModel[]>(this.removeInvolvedUserFromTaskApi(taskId, node))
+            .pipe(
+                catchError(err => this.handleError(err))
+            );
     }
 
     private getWorkflowUserApi(options: any) {
@@ -99,6 +104,6 @@ export class PeopleProcessService {
      */
     private handleError(error: Response) {
         this.logService.error(error);
-        return Observable.throw(error || 'Server error');
+        return throwError(error || 'Server error');
     }
 }
diff --git a/lib/core/services/renditions.service.ts b/lib/core/services/renditions.service.ts
index a70611fd0d..23d5622a60 100644
--- a/lib/core/services/renditions.service.ts
+++ b/lib/core/services/renditions.service.ts
@@ -17,13 +17,9 @@
 
 import { Injectable } from '@angular/core';
 import { RenditionEntry, RenditionPaging } from 'alfresco-js-api';
-import { Observable } from 'rxjs/Observable';
+import { Observable, from, interval } from 'rxjs';
 import { AlfrescoApiService } from './alfresco-api.service';
-import 'rxjs/add/observable/fromPromise';
-import 'rxjs/add/operator/concatMap';
-import 'rxjs/add/operator/combineAll';
-import 'rxjs/add/observable/interval';
-import 'rxjs/add/operator/takeWhile';
+import { concatMap, switchMap, takeWhile } from 'rxjs/operators';
 
 /**
  * @deprecated
@@ -79,36 +75,40 @@ export class RenditionsService {
 
     /** @deprecated */
     getRendition(nodeId: string, encoding: string): Observable<RenditionEntry> {
-        return Observable.fromPromise(this.apiService.renditionsApi.getRendition(nodeId, encoding));
+        return from(this.apiService.renditionsApi.getRendition(nodeId, encoding));
     }
 
     /** @deprecated */
     getRenditionsListByNodeId(nodeId: string): Observable<RenditionPaging> {
-        return Observable.fromPromise(this.apiService.renditionsApi.getRenditions(nodeId));
+        return from(this.apiService.renditionsApi.getRenditions(nodeId));
     }
 
     /** @deprecated */
     createRendition(nodeId: string, encoding: string): Observable<{}> {
-        return Observable.fromPromise(this.apiService.renditionsApi.createRendition(nodeId, {id: encoding}));
+        return from(this.apiService.renditionsApi.createRendition(nodeId, {id: encoding}));
     }
 
     /** @deprecated */
     convert(nodeId: string, encoding: string, pollingInterval: number = 1000, retries: number = 5) {
         return this.createRendition(nodeId, encoding)
-            .concatMap(() => this.pollRendition(nodeId, encoding, pollingInterval, retries));
+            .pipe(
+                concatMap(() => this.pollRendition(nodeId, encoding, pollingInterval, retries))
+            );
     }
 
     /** @deprecated */
-    private pollRendition(nodeId: string, encoding: string, interval: number = 1000, retries: number = 5) {
+    private pollRendition(nodeId: string, encoding: string, intervalSize: number = 1000, retries: number = 5) {
         let attempts = 0;
-        return Observable.interval(interval)
-            .switchMap(() => this.getRendition(nodeId, encoding))
-            .takeWhile((data) => {
-                attempts += 1;
-                if (attempts > retries) {
-                    return false;
-                }
-                return (data.entry.status.toString() !== 'CREATED');
-            });
+        return interval(intervalSize)
+            .pipe(
+                switchMap(() => this.getRendition(nodeId, encoding)),
+                takeWhile((data) => {
+                    attempts += 1;
+                    if (attempts > retries) {
+                        return false;
+                    }
+                    return (data.entry.status.toString() !== 'CREATED');
+                })
+            );
     }
 }
diff --git a/lib/core/services/search.service.ts b/lib/core/services/search.service.ts
index 18a6eb7369..453b873cd8 100644
--- a/lib/core/services/search.service.ts
+++ b/lib/core/services/search.service.ts
@@ -17,11 +17,10 @@
 
 import { Injectable } from '@angular/core';
 import { NodePaging, QueryBody } from 'alfresco-js-api';
-import { Observable } from 'rxjs/Observable';
+import { Observable, Subject, from, throwError } from 'rxjs';
 import { AlfrescoApiService } from './alfresco-api.service';
-import 'rxjs/add/observable/throw';
 import { SearchConfigurationService } from './search-configuration.service';
-import { Subject } from 'rxjs/Subject';
+import { catchError } from 'rxjs/operators';
 
 @Injectable()
 export class SearchService {
@@ -39,9 +38,9 @@ export class SearchService {
             this.dataLoaded.next(data);
         });
 
-        return Observable
-            .fromPromise(promise)
-            .catch(err => this.handleError(err));
+        return from(promise).pipe(
+            catchError(err => this.handleError(err))
+        );
     }
 
     search(searchTerm: string, maxResults: number, skipCount: number): Observable<NodePaging> {
@@ -52,9 +51,9 @@ export class SearchService {
             this.dataLoaded.next(data);
         });
 
-        return Observable
-            .fromPromise(promise)
-            .catch(err => this.handleError(err));
+        return from(promise).pipe(
+            catchError(err => this.handleError(err))
+        );
     }
 
     searchByQueryBody(queryBody: QueryBody): Observable<NodePaging> {
@@ -64,13 +63,13 @@ export class SearchService {
             this.dataLoaded.next(data);
         });
 
-        return Observable
-            .fromPromise(promise)
-            .catch(err => this.handleError(err));
+        return from(promise).pipe(
+            catchError(err => this.handleError(err))
+        );
     }
 
     private handleError(error: any): Observable<any> {
-        return Observable.throw(error || 'Server error');
+        return throwError(error || 'Server error');
     }
 }
 
diff --git a/lib/core/services/shared-links-api.service.ts b/lib/core/services/shared-links-api.service.ts
index 75b76597d2..c19eeae1d1 100644
--- a/lib/core/services/shared-links-api.service.ts
+++ b/lib/core/services/shared-links-api.service.ts
@@ -17,10 +17,10 @@
 
 import { Injectable } from '@angular/core';
 import { NodePaging, SharedLinkEntry } from 'alfresco-js-api';
-import { Observable } from 'rxjs/Observable';
+import { Observable, from, of } from 'rxjs';
 import { AlfrescoApiService } from './alfresco-api.service';
 import { UserPreferencesService } from './user-preferences.service';
-import 'rxjs/add/observable/fromPromise';
+import { catchError } from 'rxjs/operators';
 
 @Injectable()
 export class SharedLinksApiService {
@@ -39,19 +39,17 @@ export class SharedLinksApiService {
      * @returns List of shared links
      */
     getSharedLinks(options: any = {}): Observable<NodePaging> {
-        const { sharedLinksApi, handleError } = this;
         const defaultOptions = {
             maxItems: this.preferences.paginationSize,
             skipCount: 0,
             include: ['properties', 'allowableOperations']
         };
         const queryOptions = Object.assign({}, defaultOptions, options);
-        const promise = sharedLinksApi
-            .findSharedLinks(queryOptions);
+        const promise = this.sharedLinksApi.findSharedLinks(queryOptions);
 
-        return Observable
-            .fromPromise(promise)
-            .catch(handleError);
+        return from(promise).pipe(
+            catchError(err => of(err))
+        );
     }
 
     /**
@@ -61,13 +59,11 @@ export class SharedLinksApiService {
      * @returns The shared link just created
      */
     createSharedLinks(nodeId: string, options: any = {}): Observable<SharedLinkEntry> {
-        const { sharedLinksApi, handleError } = this;
+        const promise = this.sharedLinksApi.addSharedLink({ nodeId: nodeId });
 
-        const promise = sharedLinksApi.addSharedLink({ nodeId: nodeId });
-
-        return Observable
-            .fromPromise(promise)
-            .catch(handleError);
+        return from(promise).pipe(
+            catchError(err => of(err))
+        );
     }
 
     /**
@@ -76,16 +72,10 @@ export class SharedLinksApiService {
      * @returns Null response notifying when the operation is complete
      */
     deleteSharedLink(sharedId: string): Observable<SharedLinkEntry> {
-        const { sharedLinksApi, handleError } = this;
+        const promise = this.sharedLinksApi.deleteSharedLink(sharedId);
 
-        const promise = sharedLinksApi.deleteSharedLink(sharedId);
-
-        return Observable
-            .fromPromise(promise)
-            .catch(handleError);
-    }
-
-    private handleError(error: any): Observable<any> {
-        return Observable.of(error);
+        return from(promise).pipe(
+            catchError(err => of(err))
+        );
     }
 }
diff --git a/lib/core/services/sites.service.ts b/lib/core/services/sites.service.ts
index 27cfce87bf..8245c55ad4 100644
--- a/lib/core/services/sites.service.ts
+++ b/lib/core/services/sites.service.ts
@@ -17,11 +17,10 @@
 
 import { Injectable } from '@angular/core';
 import { Response } from '@angular/http';
-import { Observable } from 'rxjs/Observable';
+import { Observable, from, throwError } from 'rxjs';
 import { AlfrescoApiService } from './alfresco-api.service';
-import 'rxjs/add/observable/fromPromise';
-import 'rxjs/add/operator/catch';
 import { SitePaging, SiteEntry } from 'alfresco-js-api';
+import { catchError } from 'rxjs/operators';
 
 @Injectable()
 export class SitesService {
@@ -40,8 +39,10 @@ export class SitesService {
             include: ['properties']
         };
         const queryOptions = Object.assign({}, defaultOptions, opts);
-        return Observable.fromPromise(this.apiService.getInstance().core.sitesApi.getSites(queryOptions))
-            .catch(this.handleError);
+        return from(this.apiService.getInstance().core.sitesApi.getSites(queryOptions))
+            .pipe(
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -51,8 +52,10 @@ export class SitesService {
      * @returns Information about the site
      */
     getSite(siteId: string, opts?: any): Observable<SiteEntry> {
-        return Observable.fromPromise(this.apiService.getInstance().core.sitesApi.getSite(siteId, opts))
-            .catch(this.handleError);
+        return from(this.apiService.getInstance().core.sitesApi.getSite(siteId, opts))
+            .pipe(
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -64,8 +67,10 @@ export class SitesService {
     deleteSite(siteId: string, permanentFlag: boolean = true): Observable<any> {
         let options: any = {};
         options.permanent = permanentFlag;
-        return Observable.fromPromise(this.apiService.getInstance().core.sitesApi.deleteSite(siteId, options)
-            .catch(this.handleError));
+        return from(this.apiService.getInstance().core.sitesApi.deleteSite(siteId, options))
+            .pipe(
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -96,6 +101,6 @@ export class SitesService {
 
     private handleError(error: Response): any {
         console.error(error);
-        return Observable.throw(error || 'Server error');
+        return throwError(error || 'Server error');
     }
 }
diff --git a/lib/core/services/translate-loader.service.ts b/lib/core/services/translate-loader.service.ts
index 304d15f9ab..ab9c417297 100644
--- a/lib/core/services/translate-loader.service.ts
+++ b/lib/core/services/translate-loader.service.ts
@@ -19,13 +19,11 @@ import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Response } from '@angular/http';
 import { TranslateLoader } from '@ngx-translate/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable, forkJoin } from 'rxjs';
 import { ComponentTranslationModel } from '../models/component.model';
 import { ObjectUtils } from '../utils/object-utils';
 import { LogService } from './log.service';
 import { map } from 'rxjs/operators';
-import 'rxjs/observable/forkJoin';
-import 'rxjs/add/observable/forkJoin';
 
 @Injectable()
 export class TranslateLoaderService implements TranslateLoader {
@@ -120,7 +118,7 @@ export class TranslateLoaderService implements TranslateLoader {
 
         return Observable.create(observer => {
             if (observableBatch.length > 0) {
-                Observable.forkJoin(observableBatch).subscribe(
+                forkJoin(observableBatch).subscribe(
                     () => {
                         let fullTranslation = this.getFullTranslationJSON(lang);
                         if (fullTranslation) {
diff --git a/lib/core/services/translation.service.ts b/lib/core/services/translation.service.ts
index ac39c8e15a..6207fe4ac0 100644
--- a/lib/core/services/translation.service.ts
+++ b/lib/core/services/translation.service.ts
@@ -17,17 +17,9 @@
 
 import { Inject, Injectable, InjectionToken, Optional } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { TranslateLoaderService } from './translate-loader.service';
 import { UserPreferencesService } from './user-preferences.service';
-import 'rxjs/add/observable/of';
-import 'rxjs/add/operator/concat';
-import 'rxjs/add/operator/share';
-import 'rxjs/add/operator/map';
-import 'rxjs/add/operator/merge';
-import 'rxjs/add/operator/switchMap';
-import 'rxjs/add/operator/toArray';
-import 'rxjs/add/operator/take';
 
 export const TRANSLATION_PROVIDER = new InjectionToken('Injection token for translation providers.');
 
@@ -56,7 +48,7 @@ export class TranslationService {
             }
         }
 
-        userPreference.locale$.subscribe( (locale) => {
+        userPreference.locale$.subscribe((locale) => {
             this.userLang = locale;
             this.use(this.userLang);
         });
@@ -70,22 +62,18 @@ export class TranslationService {
     addTranslationFolder(name: string = '', path: string = '') {
         if (!this.customLoader.providerRegistered(name)) {
             this.customLoader.registerProvider(name, path);
-            if (this.userLang !== this.defaultLang) {
-                this.translate.getTranslation(this.defaultLang).subscribe(() => {
-                    this.translate.getTranslation(this.userLang).subscribe(
-                        () => {
-                            this.translate.use(this.userLang);
-                            this.onTranslationChanged(this.userLang);
-                        }
-                    );
-                });
-            } else {
-                this.translate.getTranslation(this.userLang).subscribe(
-                    () => {
+            if (this.userLang) {
+                this.translate.getTranslation(this.userLang).subscribe(() => {
                         this.translate.use(this.userLang);
                         this.onTranslationChanged(this.userLang);
                     }
                 );
+            } else {
+                this.translate.getTranslation(this.defaultLang).subscribe(() => {
+                        this.translate.use(this.defaultLang);
+                        this.onTranslationChanged(this.defaultLang);
+                    }
+                );
             }
         }
     }
@@ -117,7 +105,7 @@ export class TranslationService {
      * @param interpolateParams String(s) to be interpolated into the main message
      * @returns Translated text
      */
-    get(key: string|Array<string>, interpolateParams?: Object): Observable<string|any> {
+    get(key: string | Array<string>, interpolateParams?: Object): Observable<string | any> {
         return this.translate.get(key, interpolateParams);
     }
 
diff --git a/lib/core/services/upload.service.spec.ts b/lib/core/services/upload.service.spec.ts
index 606dfa5019..7d51c2cef1 100644
--- a/lib/core/services/upload.service.spec.ts
+++ b/lib/core/services/upload.service.spec.ts
@@ -41,7 +41,10 @@ describe('UploadService', () => {
         appConfig.config = {
             ecmHost: 'http://localhost:9876/ecm',
             files: {
-                excluded: ['.DS_Store', 'desktop.ini', '.git', '*.git']
+                excluded: ['.DS_Store', 'desktop.ini', '.git', '*.git', '*.SWF'],
+                'match-options': {
+                    nocase: true
+                }
             }
         };
 
@@ -83,6 +86,14 @@ describe('UploadService', () => {
         expect(result[0]).toBe(file2);
     });
 
+    it('should match the extension in case insensitive way', () => {
+        const file1 = new FileModel(new File([''], 'test.swf'));
+        const file2 = new FileModel(new File([''], 'readme.md'));
+        const result = service.addToQueue(file1, file2);
+        expect(result.length).toBe(1);
+        expect(result[0]).toBe(file2);
+    });
+
     it('should make XHR done request after the file is added in the queue', (done) => {
         let emitter = new EventEmitter();
 
@@ -175,7 +186,7 @@ describe('UploadService', () => {
         expect(uploadFileSpy).toHaveBeenCalledWith({
             name: 'fake-name',
             size: 10
-        }, undefined, undefined, null, {
+        }, undefined, undefined, { newVersion: true }, {
             renditions: 'doclib',
             include: [ 'allowableOperations' ],
             overwrite: true,
@@ -211,6 +222,39 @@ describe('UploadService', () => {
         });
     });
 
+    it('should append to the request the extra upload options', () => {
+        let uploadFileSpy = spyOn(alfrescoApiService.getInstance().upload, 'uploadFile').and.callThrough();
+        let emitter = new EventEmitter();
+
+        let filesFake = new FileModel(
+            <File> { name: 'fake-name', size: 10 },
+            <FileUploadOptions> { parentId: '123', path: 'fake-dir',
+                                    secondaryChildren: [{ assocType: 'assoc-1', childId: 'child-id' }],
+                                    association: { assocType: 'fake-assoc' },
+                                    targets: [{ assocType: 'target-assoc', targetId: 'fake-target-id' }]
+                                }
+        );
+        service.addToQueue(filesFake);
+        service.uploadFilesInTheQueue(emitter);
+
+        expect(uploadFileSpy).toHaveBeenCalledWith({
+            name: 'fake-name',
+            size: 10
+        }, 'fake-dir', '123', {
+            newVersion: false,
+                parentId: '123',
+                path: 'fake-dir',
+                secondaryChildren: [
+                    { assocType: 'assoc-1', childId: 'child-id' }],
+                    association: { assocType: 'fake-assoc' },
+                    targets: [{ assocType: 'target-assoc', targetId: 'fake-target-id' }]
+            }, {
+                renditions: 'doclib',
+                include: ['allowableOperations'],
+                autoRename: true
+            });
+    });
+
     it('should start downloading the next one if a file of the list is aborted', (done) => {
         let emitter = new EventEmitter();
 
diff --git a/lib/core/services/upload.service.ts b/lib/core/services/upload.service.ts
index d08bdfac79..c80a72037c 100644
--- a/lib/core/services/upload.service.ts
+++ b/lib/core/services/upload.service.ts
@@ -16,8 +16,8 @@
  */
 
 import { EventEmitter, Injectable } from '@angular/core';
-import * as minimatch_ from 'minimatch';
-import { Subject } from 'rxjs/Subject';
+import { Minimatch } from 'minimatch-browser';
+import { Subject } from 'rxjs';
 import { AppConfigService } from '../app-config/app-config.service';
 import {
     FileUploadCompleteEvent,
@@ -28,8 +28,6 @@ import {
 import { FileModel, FileUploadProgress, FileUploadStatus } from '../models/file.model';
 import { AlfrescoApiService } from './alfresco-api.service';
 
-let minimatch: any = (<any> minimatch_).default || minimatch_;
-
 @Injectable()
 export class UploadService {
 
@@ -37,7 +35,8 @@ export class UploadService {
     private totalComplete: number = 0;
     private totalAborted: number = 0;
     private totalError: number = 0;
-    private excludedFileList: String[] = [];
+    private excludedFileList: string[] = [];
+    private matchingOptions: any = null;
 
     activeTask: Promise<any> = null;
     queue: FileModel[] = [];
@@ -55,7 +54,8 @@ export class UploadService {
 
     constructor(protected apiService: AlfrescoApiService,
                 appConfigService: AppConfigService) {
-        this.excludedFileList = <String[]> appConfigService.get('files.excluded');
+        this.excludedFileList = <string[]> appConfigService.get('files.excluded');
+        this.matchingOptions = appConfigService.get('files.match-options');
     }
 
     /**
@@ -90,7 +90,11 @@ export class UploadService {
         let isAllowed = true;
 
         if (this.excludedFileList) {
-            isAllowed = this.excludedFileList.filter(expr => minimatch(file.name, expr)).length === 0;
+
+            isAllowed = this.excludedFileList.filter((pattern) => {
+                let minimatch = new Minimatch(pattern, this.matchingOptions);
+                return minimatch.match(file.name);
+            }).length === 0;
         }
         return isAllowed;
     }
@@ -187,7 +191,7 @@ export class UploadService {
                 file.file,
                 file.options.path,
                 file.options.parentId,
-                null,
+                file.options,
                 opts
             );
         }
diff --git a/lib/core/services/user-preferences.service.ts b/lib/core/services/user-preferences.service.ts
index 2a59d36fbc..bcb9881cfa 100644
--- a/lib/core/services/user-preferences.service.ts
+++ b/lib/core/services/user-preferences.service.ts
@@ -17,11 +17,10 @@
 
 import { Injectable } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
-import { Observable } from 'rxjs/Observable';
+import { Observable, BehaviorSubject } from 'rxjs';
 import { AppConfigService } from '../app-config/app-config.service';
 import { StorageService } from './storage.service';
-import 'rxjs/add/operator/distinctUntilChanged';
+import { distinctUntilChanged, map } from 'rxjs/operators';
 
 export enum UserPreferenceValues {
     PaginationSize = 'PAGINATION_SIZE',
@@ -53,7 +52,7 @@ export class UserPreferencesService {
                 private appConfig: AppConfigService,
                 private storage: StorageService) {
         this.appConfig.onLoad.subscribe(this.initUserPreferenceStatus.bind(this));
-        this.localeSubject = new BehaviorSubject(this.userPreferenceStatus[UserPreferenceValues.Locale]);
+        this.localeSubject = new BehaviorSubject(this.get(UserPreferenceValues.Locale, this.getDefaultLocale()));
         this.locale$ = this.localeSubject.asObservable();
         this.onChangeSubject = new BehaviorSubject(this.userPreferenceStatus);
         this.onChange = this.onChangeSubject.asObservable();
@@ -61,8 +60,7 @@ export class UserPreferencesService {
 
     private initUserPreferenceStatus() {
         this.userPreferenceStatus[UserPreferenceValues.Locale] = this.locale || this.getDefaultLocale();
-        this.userPreferenceStatus[UserPreferenceValues.PaginationSize] = this.paginationSize ?
-            this.paginationSize : this.appConfig.get('pagination.size', this.defaults.paginationSize);
+        this.userPreferenceStatus[UserPreferenceValues.PaginationSize] = this.appConfig.get('pagination.size', this.defaults.paginationSize);
         this.userPreferenceStatus[UserPreferenceValues.SupportedPageSizes] = this.appConfig.get('pagination.supportedPageSizes', this.defaults.supportedPageSizes);
     }
 
@@ -72,7 +70,11 @@ export class UserPreferencesService {
      * @returns Notification callback
      */
     select(property: string): Observable<any> {
-        return this.onChange.map((userPreferenceStatus) => userPreferenceStatus[property]).distinctUntilChanged();
+        return this.onChange
+            .pipe(
+                map((userPreferenceStatus) => userPreferenceStatus[property]),
+                distinctUntilChanged()
+            );
     }
 
     /**
@@ -150,27 +152,27 @@ export class UserPreferencesService {
      * @returns Array of page size values
      */
     getDefaultPageSizes(): number[] {
-        return this.defaults.supportedPageSizes;
+        return this.userPreferenceStatus[UserPreferenceValues.SupportedPageSizes];
     }
 
     /** Pagination size. */
     set paginationSize(value: number) {
-        this.set('PAGINATION_SIZE', value);
+        this.set(UserPreferenceValues.PaginationSize, value);
     }
 
     get paginationSize(): number {
-        return Number(this.get('PAGINATION_SIZE')) || this.defaults.paginationSize;
+        return Number(this.get(UserPreferenceValues.PaginationSize, this.userPreferenceStatus[UserPreferenceValues.PaginationSize])) || this.defaults.paginationSize;
     }
 
     /** Current locale setting. */
     get locale(): string {
-        const locale = this.get('LOCALE');
+        const locale = this.get(UserPreferenceValues.Locale, this.userPreferenceStatus[UserPreferenceValues.Locale]);
         return locale;
     }
 
     set locale(value: string) {
         this.localeSubject.next(value);
-        this.set('LOCALE', value);
+        this.set(UserPreferenceValues.Locale, value);
     }
 
     /**
diff --git a/lib/core/settings/host-settings.component.html b/lib/core/settings/host-settings.component.html
index cc0e0a6c55..fb3d894d6b 100644
--- a/lib/core/settings/host-settings.component.html
+++ b/lib/core/settings/host-settings.component.html
@@ -106,6 +106,12 @@
                             {{ 'CORE.HOST_SETTINGS.REQUIRED'| translate }}
                         </mat-error>
                     </mat-form-field>
+
+                    <mat-form-field class="full-width" floatLabel="Redirect Uri Logout">
+                        <mat-label>{{ 'CORE.HOST_SETTINGS.REDIRECT_LOGOUT'| translate }}</mat-label>
+                        <input matInput placeholder="{{ 'CORE.HOST_SETTINGS.REDIRECT_LOGOUT'| translate }}"
+                               name="redirectUriLogout" formControlName="redirectUriLogout">
+                    </mat-form-field>
                 </div>
             </ng-container>
             <mat-card-actions class="adf-actions">
diff --git a/lib/core/settings/host-settings.component.ts b/lib/core/settings/host-settings.component.ts
index f5a465ab2f..29454f9543 100644
--- a/lib/core/settings/host-settings.component.ts
+++ b/lib/core/settings/host-settings.component.ts
@@ -140,6 +140,7 @@ export class HostSettingsComponent implements OnInit {
             host: [oauth.host, [Validators.required, Validators.pattern(this.HOST_REGEX)]],
             clientId: [oauth.clientId, Validators.required],
             redirectUri: [oauth.redirectUri, Validators.required],
+            redirectUriLogout: [oauth.redirectUriLogout],
             scope: [oauth.scope, Validators.required],
             secret: oauth.secret,
             silentLogin: oauth.silentLogin,
@@ -250,6 +251,10 @@ export class HostSettingsComponent implements OnInit {
         return this.oauthConfig.get('redirectUri');
     }
 
+    get redirectUriLogout(): AbstractControl {
+        return this.oauthConfig.get('redirectUriLogout');
+    }
+
     get oauthConfig(): AbstractControl {
         return this.form.get('oauthConfig');
     }
diff --git a/lib/core/settings/host-settings.module.ts b/lib/core/settings/host-settings.module.ts
index 4716a20787..321ba06493 100644
--- a/lib/core/settings/host-settings.module.ts
+++ b/lib/core/settings/host-settings.module.ts
@@ -27,7 +27,7 @@ import { HostSettingsComponent } from './host-settings.component';
     imports: [
         CommonModule,
         MaterialModule,
-        TranslateModule,
+        TranslateModule.forChild(),
         FormsModule,
         ReactiveFormsModule
     ],
diff --git a/lib/core/sorting-picker/sorting-picker.module.ts b/lib/core/sorting-picker/sorting-picker.module.ts
index 138d079317..dbfde9c67e 100644
--- a/lib/core/sorting-picker/sorting-picker.module.ts
+++ b/lib/core/sorting-picker/sorting-picker.module.ts
@@ -25,7 +25,7 @@ import { SortingPickerComponent } from './sorting-picker.component';
     imports: [
         CommonModule,
         MaterialModule,
-        TranslateModule
+        TranslateModule.forChild()
     ],
     declarations: [
         SortingPickerComponent
diff --git a/lib/core/styles/_index.scss b/lib/core/styles/_index.scss
index 98dfbb42b7..74b8ca21fd 100644
--- a/lib/core/styles/_index.scss
+++ b/lib/core/styles/_index.scss
@@ -22,13 +22,14 @@
 @import '../viewer/components/txtViewer.component';
 @import '../viewer/components/imgViewer.component';
 @import '../form/components/form.component';
-@import '../sidenav-layout/components/sidebar-action/sidebar-action-menu.component';
+@import '../layout/components/sidebar-action/sidebar-action-menu.component';
+@import '../layout/components/header/header.component';
 @import '../comments/comment-list.component';
 @import '../comments/comments.component';
-@import '../sidenav-layout/components/layout-container/layout-container.component';
-@import "../templates/empty-content/empty-content.component";
-@import "../templates/error-content/error-content.component";
-@import "../buttons-menu/buttons-menu.component";
+@import '../layout/components/layout-container/layout-container.component';
+@import '../templates/empty-content/empty-content.component';
+@import '../templates/error-content/error-content.component';
+@import '../buttons-menu/buttons-menu.component';
 
 @mixin adf-core-theme($theme) {
     @include adf-colors-theme($theme);
@@ -60,6 +61,5 @@
     @include adf-empty-content-theme($theme);
     @include adf-error-content-theme($theme);
     @include adf-buttons-menu-theme($theme);
+    @include adf-header-layout-theme($theme);
 }
-
-
diff --git a/lib/core/templates/error-content/error-content.component.html b/lib/core/templates/error-content/error-content.component.html
index cf113b19f7..c74df59e22 100644
--- a/lib/core/templates/error-content/error-content.component.html
+++ b/lib/core/templates/error-content/error-content.component.html
@@ -10,12 +10,12 @@
         {{ 'ERROR_CONTENT.' + errorCode + '.DESCRIPTION' | translate }}
     </p>
     <div class="adf-error-content-buttons">
-        <a mat-raised-button color="primary" 
-            *ngIf="secondaryButtonText" (click)="onSecondButton()"
-            class="adf-error-content-description-link"> 
+        <a a id="adf-secondary-button" mat-raised-button color="primary"
+            *ngIf="hasSecondButton" (click)="onSecondButton()"
+            class="adf-error-content-description-link">
             {{ 'ERROR_CONTENT.' + errorCode + '.SECONDARY_BUTTON.TEXT' | translate | uppercase }}
         </a>
-        <a mat-raised-button color="primary" (click)="onReturnButton()">
+        <a id="adf-return-button" mat-raised-button color="primary" (click)="onReturnButton()">
             {{ 'ERROR_CONTENT.' + this.errorCode + '.RETURN_BUTTON.TEXT' | translate | uppercase }}
         </a>
     </div>
diff --git a/lib/core/templates/error-content/error-content.component.spec.ts b/lib/core/templates/error-content/error-content.component.spec.ts
index a0aca798c1..830e6b7686 100644
--- a/lib/core/templates/error-content/error-content.component.spec.ts
+++ b/lib/core/templates/error-content/error-content.component.spec.ts
@@ -22,7 +22,7 @@ import { TranslationService } from '../../services/translation.service';
 import { TranslationMock } from '../../mock/translation.service.mock';
 import { setupTestBed } from '../../testing/setupTestBed';
 import { ActivatedRoute } from '@angular/router';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 
 describe('ErrorContentComponent', () => {
 
@@ -37,7 +37,7 @@ describe('ErrorContentComponent', () => {
         ],
         providers: [
             { provide: TranslationService, useClass: TranslationMock },
-            { provide: ActivatedRoute, useValue: { params: Observable.of({id: '404'})}}
+            { provide: ActivatedRoute, useValue: { params: of({id: '404'})}}
         ]
     });
 
@@ -103,25 +103,23 @@ describe('ErrorContentComponent', () => {
         });
         fixture.detectChanges();
         fixture.whenStable().then(() => {
-            expect(errorContentComponent.secondaryButtonText).toBe('Secondary Button');
-            const errorContentElement = element.querySelector('.adf-error-content-description-link');
+            const errorContentElement = element.querySelector('#adf-secondary-button');
             expect(errorContentElement).not.toBeNull();
             expect(errorContentElement).toBeDefined();
+            expect(errorContentElement.textContent).toContain('ERROR_CONTENT.UNKNOWN.SECONDARY_BUTTON.TEXT');
+
         });
     }));
 
-    it('should render return button with its value from the translate file', async(() => {
-        spyOn(translateService, 'instant').and.callFake((inputString) => {
-            return 'Home';
-        });
+    it('shoul the default value of return burron be /', async(() => {
         fixture.detectChanges();
         fixture.whenStable().then(() => {
-            expect(errorContentComponent.returnButtonUrl).toBe('Home');
+            expect(errorContentComponent.returnButtonUrl).toBe('/');
         });
     }));
 
     it('should navigate to an error given by the route params', async(() => {
-        spyOn(translateService, 'get').and.returnValue(Observable.of('404'));
+        spyOn(translateService, 'get').and.returnValue(of('404'));
         fixture.detectChanges();
         fixture.whenStable().then(() => {
             expect(errorContentComponent.errorCode).toBe('404');
diff --git a/lib/core/templates/error-content/error-content.component.ts b/lib/core/templates/error-content/error-content.component.ts
index 4278a2e5da..4070093e99 100644
--- a/lib/core/templates/error-content/error-content.component.ts
+++ b/lib/core/templates/error-content/error-content.component.ts
@@ -15,7 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ChangeDetectionStrategy, ViewEncapsulation, OnInit, AfterContentChecked } from '@angular/core';
+import {
+    Component,
+    ChangeDetectionStrategy,
+    Input,
+    ViewEncapsulation,
+    OnInit,
+    AfterContentChecked
+} from '@angular/core';
 import { Params, ActivatedRoute, Router } from '@angular/router';
 import { TranslationService } from '../../services/translation.service';
 
@@ -29,10 +36,16 @@ import { TranslationService } from '../../services/translation.service';
 })
 export class ErrorContentComponent implements OnInit, AfterContentChecked {
 
+    @Input()
+    secondaryButtonUrl: string = 'report-issue';
+
+    @Input()
+    returnButtonUrl: string = '/';
+
+    @Input()
     errorCode: string;
-    secondaryButtonText: string;
-    secondaryButtonUrl: string;
-    returnButtonUrl: string;
+
+    hasSecondButton: boolean;
 
     constructor(private route: ActivatedRoute,
                 private router: Router,
@@ -42,7 +55,7 @@ export class ErrorContentComponent implements OnInit, AfterContentChecked {
     ngOnInit() {
         if (this.route) {
             this.route.params.forEach((params: Params) => {
-                if (params['id']) {
+                if (params['id'] && !this.errorCode) {
                     this.errorCode = params['id'];
                     let unknown = '';
                     this.translateService.get('ERROR_CONTENT.' + this.errorCode + '.TITLE').subscribe((errorTranslation: string) => {
@@ -56,21 +69,13 @@ export class ErrorContentComponent implements OnInit, AfterContentChecked {
         }
     }
 
-    ngAfterContentChecked() {
-        this.getTranslations();
+    getTranslations() {
+        this.hasSecondButton = this.translateService.instant(
+            'ERROR_CONTENT.' + this.errorCode + '.SECONDARY_BUTTON.TEXT') ? true : false;
     }
 
-    getTranslations() {
-        this.returnButtonUrl = this.translateService.instant(
-            'ERROR_CONTENT.' + this.errorCode + '.RETURN_BUTTON.ROUTE');
-
-        this.secondaryButtonText = this.translateService.instant(
-            'ERROR_CONTENT.' + this.errorCode + '.SECONDARY_BUTTON.TEXT');
-
-        if (this.secondaryButtonText) {
-            this.secondaryButtonUrl = this.translateService.instant(
-                'ERROR_CONTENT.' + this.errorCode + '.SECONDARY_BUTTON.URL');
-        }
+    ngAfterContentChecked() {
+        this.getTranslations();
     }
 
     onSecondButton() {
diff --git a/lib/core/templates/template.module.ts b/lib/core/templates/template.module.ts
index fb6ec2d54e..c3950b638f 100644
--- a/lib/core/templates/template.module.ts
+++ b/lib/core/templates/template.module.ts
@@ -26,7 +26,7 @@ import { EmptyContentComponent } from './empty-content/empty-content.component';
     imports: [
         CommonModule,
         MaterialModule,
-        TranslateModule
+        TranslateModule.forChild()
     ],
     declarations: [
         ErrorContentComponent,
diff --git a/lib/core/test.ts b/lib/core/test.ts
new file mode 100644
index 0000000000..c9fff28a62
--- /dev/null
+++ b/lib/core/test.ts
@@ -0,0 +1,41 @@
+/*!
+ * @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 'core-js/es7/reflect';
+import 'zone.js/dist/zone';
+import 'zone.js/dist/zone-testing';
+import { getTestBed } from '@angular/core/testing';
+import {
+    BrowserDynamicTestingModule,
+    platformBrowserDynamicTesting
+} from '@angular/platform-browser-dynamic/testing';
+import pdfjsLib = require('pdfjs-dist');
+
+declare const require: any;
+
+// First, initialize the Angular testing environment.
+getTestBed().initTestEnvironment(
+    BrowserDynamicTestingModule,
+    platformBrowserDynamicTesting()
+);
+
+pdfjsLib.PDFJS.workerSrc = 'base/node_modules/pdfjs-dist/build/pdf.worker.js';
+
+// Then we find all the tests.
+const context = require.context('./', true, /\.spec\.ts$/);
+// And load the modules.
+context.keys().map(context);
diff --git a/lib/core/toolbar/toolbar.component.scss b/lib/core/toolbar/toolbar.component.scss
index ad46e3ffbc..adf2e845a0 100644
--- a/lib/core/toolbar/toolbar.component.scss
+++ b/lib/core/toolbar/toolbar.component.scss
@@ -1,7 +1,6 @@
 
 @mixin adf-toolbar-theme($theme) {
     $foreground: map-get($theme, foreground);
-    $background: map-get($theme, background);
     $adf-toolbar-height: 48px;
     $adf-toolbar-font-size: 14px;
 
@@ -18,7 +17,6 @@
         .mat-toolbar {
             min-height: $adf-toolbar-height;
             border: 1px solid mat-color($foreground, text, .07);
-            background-color: mat-color($background, app-bar);
         }
 
         .mat-toolbar-row {
diff --git a/lib/core/userinfo/components/user-info.component.html b/lib/core/userinfo/components/user-info.component.html
index ac5907a63e..be3a6d7143 100644
--- a/lib/core/userinfo/components/user-info.component.html
+++ b/lib/core/userinfo/components/user-info.component.html
@@ -5,8 +5,8 @@
           class="adf-userinfo-name">{{ecmUser.fullNameDisplay}}</span>
     <span *ngIf="bpmUser && !ecmUser && showName" id="adf-userinfo-bpm-name-display"
           class="adf-userinfo-name">{{bpmUser.fullNameDisplay}}</span>
-    <button mat-button [matMenuTriggerFor]="menu" class="adf-userinfo-menu_button">
-        <div class="adf-userinfo-button-profile" id="user-profile" data-automation-id="user-profile">
+    <button mat-button [matMenuTriggerFor]="menu" class="adf-userinfo-menu_button" data-automation-id="adf-user-profile">
+        <div class="adf-userinfo-button-profile" id="user-profile">
             <div *ngIf="bpmUser && !ecmUser" id="bpm-user-image">
                 <div *ngIf="!hasBpmUserPictureId()" [outerHTML]="bpmUser | usernameInitials:'adf-userinfo-pic'"></div>
                 <div *ngIf="hasBpmUserPictureId()" class="adf-userinfo-profile-container">
@@ -15,7 +15,8 @@
                 </div>
             </div>
             <div *ngIf="ecmUser" id="ecm-user-image">
-                    <div *ngIf="!hasEcmUserAvatarId()" [outerHTML]="ecmUser | usernameInitials:'adf-userinfo-pic'"></div>
+                    <div *ngIf="!hasEcmUserAvatarId()"
+                         [outerHTML]="ecmUser | usernameInitials:'adf-userinfo-pic'"></div>
                     <div *ngIf="hasEcmUserAvatarId()" class="adf-userinfo-profile-container">
                         <img id="logged-user-img" [src]="ecmUserImage" alt="user-info-profile-button"
                             class="adf-userinfo-profile-image"/>
@@ -29,7 +30,9 @@
             <mat-tab id="ecm-panel" label="{{ 'USER_PROFILE.TAB.CS' | translate }}" *ngIf="ecmUser">
                 <mat-card class="adf-userinfo-card">
                     <mat-card-header class="adf-userinfo-card-header" [style.background-image]="'url(' + ecmBackgroundImage + ')'">
-                        <div *ngIf="!hasEcmUserAvatarId()" [outerHTML]="ecmUser | usernameInitials:'adf-userinfo-profile-initials adf-hide-small'"></div>
+                        <div *ngIf="!hasEcmUserAvatarId()"
+                             [outerHTML]="ecmUser | usernameInitials:'adf-userinfo-profile-initials adf-hide-small'">
+                        </div>
                         <div *ngIf="hasEcmUserAvatarId()" class="adf-userinfo-profile-container adf-hide-small">
                             <img class="adf-userinfo-profile-picture" id="ecm-user-detail-image"
                                 alt="ecm-profile-image" [src]="ecmUserImage" />
diff --git a/lib/core/userinfo/components/user-info.component.spec.ts b/lib/core/userinfo/components/user-info.component.spec.ts
index d4de5f4df0..17f01f150b 100644
--- a/lib/core/userinfo/components/user-info.component.spec.ts
+++ b/lib/core/userinfo/components/user-info.component.spec.ts
@@ -25,7 +25,7 @@ import { BpmUserService } from '../services/bpm-user.service';
 import { EcmUserService } from '../services/ecm-user.service';
 import { BpmUserModel } from './../models/bpm-user.model';
 import { UserInfoComponent } from './user-info.component';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 import { setupTestBed } from '../../testing/setupTestBed';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 
@@ -115,7 +115,7 @@ describe('User info component', () => {
             beforeEach(() => {
                 spyOn(authService, 'isEcmLoggedIn').and.returnValue(true);
                 spyOn(authService, 'isLoggedIn').and.returnValue(true);
-                spyOn(ecmUserService, 'getCurrentUserInfo').and.returnValue(Observable.of(fakeEcmEditedUser));
+                spyOn(ecmUserService, 'getCurrentUserInfo').and.returnValue(of(fakeEcmEditedUser));
             });
 
             it('should show ecm only last name when user first name is null ', async(() => {
@@ -178,7 +178,7 @@ describe('User info component', () => {
             beforeEach(async(() => {
                 spyOn(authService, 'isEcmLoggedIn').and.returnValue(true);
                 spyOn(authService, 'isLoggedIn').and.returnValue(true);
-                spyOn(ecmUserService, 'getCurrentUserInfo').and.returnValue(Observable.of(fakeEcmUser));
+                spyOn(ecmUserService, 'getCurrentUserInfo').and.returnValue(of(fakeEcmUser));
                 spyOn(contentService, 'getContentUrl').and.returnValue('assets/images/ecmImg.gif');
                 fixture.detectChanges();
             }));
@@ -238,7 +238,7 @@ describe('User info component', () => {
             beforeEach(async(() => {
                 spyOn(authService, 'isEcmLoggedIn').and.returnValue(true);
                 spyOn(authService, 'isLoggedIn').and.returnValue(true);
-                spyOn(ecmUserService, 'getCurrentUserInfo').and.returnValue(Observable.of(fakeEcmUserNoImage));
+                spyOn(ecmUserService, 'getCurrentUserInfo').and.returnValue(of(fakeEcmUserNoImage));
                 fixture.detectChanges();
                 fixture.whenStable().then(() => fixture.detectChanges());
             }));
@@ -286,7 +286,7 @@ describe('User info component', () => {
         beforeEach(async(() => {
             spyOn(authService, 'isBpmLoggedIn').and.returnValue(true);
             spyOn(authService, 'isLoggedIn').and.returnValue(true);
-            getCurrentUserInfoStub = spyOn(bpmUserService, 'getCurrentUserInfo').and.returnValue(Observable.of(fakeBpmUser));
+            getCurrentUserInfoStub = spyOn(bpmUserService, 'getCurrentUserInfo').and.returnValue(of(fakeBpmUser));
         }));
 
         it('should show full name next the user image', async(() => {
@@ -320,7 +320,7 @@ describe('User info component', () => {
                 firstName: null,
                 lastName: 'fake-last-name'
             });
-            getCurrentUserInfoStub.and.returnValue(Observable.of(wrongBpmUser));
+            getCurrentUserInfoStub.and.returnValue(of(wrongBpmUser));
 
             fixture.detectChanges();
             fixture.whenStable().then(() => {
@@ -337,7 +337,7 @@ describe('User info component', () => {
                 firstName: 'null',
                 lastName: 'fake-last-name'
             });
-            getCurrentUserInfoStub.and.returnValue(Observable.of(wrongFirstNameBpmUser));
+            getCurrentUserInfoStub.and.returnValue(of(wrongFirstNameBpmUser));
 
             fixture.detectChanges();
             fixture.whenStable().then(() => {
@@ -354,7 +354,7 @@ describe('User info component', () => {
                 firstName: 'fake-first-name',
                 lastName: 'null'
             });
-            getCurrentUserInfoStub.and.returnValue(Observable.of(wrongLastNameBpmUser));
+            getCurrentUserInfoStub.and.returnValue(of(wrongLastNameBpmUser));
             fixture.detectChanges();
 
             fixture.whenStable().then(() => {
@@ -388,8 +388,8 @@ describe('User info component', () => {
             spyOn(authService, 'isLoggedIn').and.returnValue(true);
             spyOn(contentService, 'getContentUrl').and.returnValue('src/assets/images/ecmImg.gif');
 
-            ecmUserInfoSpy = spyOn(ecmUserService, 'getCurrentUserInfo').and.returnValue(Observable.of(fakeEcmUser));
-            spyOn(bpmUserService, 'getCurrentUserInfo').and.returnValue(Observable.of(fakeBpmUser));
+            ecmUserInfoSpy = spyOn(ecmUserService, 'getCurrentUserInfo').and.returnValue(of(fakeEcmUser));
+            spyOn(bpmUserService, 'getCurrentUserInfo').and.returnValue(of(fakeBpmUser));
         }));
 
         it('should get the bpm user informations from the service', async(() => {
@@ -433,7 +433,7 @@ describe('User info component', () => {
         }));
 
         it('should show the ecm initials if the ecm user has no image', async(() => {
-            ecmUserInfoSpy.and.returnValue(Observable.of(fakeEcmUserNoImage));
+            ecmUserInfoSpy.and.returnValue(of(fakeEcmUserNoImage));
             fixture.detectChanges();
 
             fixture.whenStable().then(() => {
diff --git a/lib/core/userinfo/components/user-info.component.ts b/lib/core/userinfo/components/user-info.component.ts
index 3e4061f5cc..965ba2670b 100644
--- a/lib/core/userinfo/components/user-info.component.ts
+++ b/lib/core/userinfo/components/user-info.component.ts
@@ -60,6 +60,7 @@ export class UserInfoComponent implements OnInit {
     bpmUser: BpmUserModel;
     bpmUserImage: any;
     ecmUserImage: any;
+    selectedIndex: number;
 
     constructor(private ecmUserService: EcmUserService,
                 private bpmUserService: BpmUserService,
@@ -124,4 +125,5 @@ export class UserInfoComponent implements OnInit {
     hasEcmUserAvatarId(): boolean {
         return !!this.ecmUser.avatarId;
     }
+
 }
diff --git a/lib/core/userinfo/services/bpm-user.service.ts b/lib/core/userinfo/services/bpm-user.service.ts
index ae956aa7d6..5178cc9193 100644
--- a/lib/core/userinfo/services/bpm-user.service.ts
+++ b/lib/core/userinfo/services/bpm-user.service.ts
@@ -17,11 +17,11 @@
 
 import { Injectable } from '@angular/core';
 import { Response } from '@angular/http';
-import { Observable } from 'rxjs/Observable';
+import { Observable, from, throwError } from 'rxjs';
 import { AlfrescoApiService } from '../../services/alfresco-api.service';
 import { LogService } from '../../services/log.service';
 import { BpmUserModel } from '../models/bpm-user.model';
-import 'rxjs/add/observable/throw';
+import { map, catchError } from 'rxjs/operators';
 
 /**
  *
@@ -40,9 +40,11 @@ export class BpmUserService {
      * @returns User information object
      */
     getCurrentUserInfo(): Observable<BpmUserModel> {
-        return Observable.fromPromise(this.apiService.getInstance().activiti.profileApi.getProfile())
-            .map((data) => <BpmUserModel> data)
-            .catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().activiti.profileApi.getProfile())
+            .pipe(
+                map((data) => <BpmUserModel> data),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -61,7 +63,7 @@ export class BpmUserService {
         // in a real world app, we may send the error to some remote logging infrastructure
         // instead of just logging it to the console
         this.logService.error(error);
-        return Observable.throw(error || 'Server error');
+        return throwError(error || 'Server error');
     }
 
 }
diff --git a/lib/core/userinfo/services/ecm-user.service.ts b/lib/core/userinfo/services/ecm-user.service.ts
index d3ea7f9fc7..1260ff6d94 100644
--- a/lib/core/userinfo/services/ecm-user.service.ts
+++ b/lib/core/userinfo/services/ecm-user.service.ts
@@ -17,12 +17,12 @@
 
 import { Injectable } from '@angular/core';
 import { Response } from '@angular/http';
-import { Observable } from 'rxjs/Observable';
+import { Observable, from, throwError } from 'rxjs';
+import { map, catchError } from 'rxjs/operators';
 import { ContentService } from '../../services/content.service';
 import { AlfrescoApiService } from '../../services/alfresco-api.service';
 import { LogService } from '../../services/log.service';
 import { EcmUserModel } from '../models/ecm-user.model';
-import 'rxjs/add/observable/throw';
 
 @Injectable()
 export class EcmUserService {
@@ -38,9 +38,11 @@ export class EcmUserService {
      * @returns User information
      */
     getUserInfo(userName: string): Observable<EcmUserModel> {
-        return Observable.fromPromise(this.apiService.getInstance().core.peopleApi.getPerson(userName))
-            .map(data => <EcmUserModel> data['entry'])
-            .catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().core.peopleApi.getPerson(userName))
+            .pipe(
+                map(data => <EcmUserModel> data['entry']),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -68,10 +70,8 @@ export class EcmUserService {
      * @param error
      */
     private handleError(error: Response) {
-        // in a real world app, we may send the error to some remote logging infrastructure
-        // instead of just logging it to the console
         this.logService.error(error);
-        return Observable.throw(error || 'Server error');
+        return throwError(error || 'Server error');
     }
 
 }
diff --git a/lib/core/userinfo/userinfo.module.ts b/lib/core/userinfo/userinfo.module.ts
index 5d7262b1e2..4a1b6f2cac 100644
--- a/lib/core/userinfo/userinfo.module.ts
+++ b/lib/core/userinfo/userinfo.module.ts
@@ -22,23 +22,17 @@ import { TranslateModule } from '@ngx-translate/core';
 import { MaterialModule } from '../material.module';
 import { PipeModule } from '../pipes/pipe.module';
 import { UserInfoComponent } from './components/user-info.component';
-import { BpmUserService } from './services/bpm-user.service';
-import { EcmUserService } from './services/ecm-user.service';
 
 @NgModule({
     imports: [
         CommonModule,
         MaterialModule,
-        TranslateModule,
+        TranslateModule.forChild(),
         PipeModule
     ],
     declarations: [
         UserInfoComponent
     ],
-    providers: [
-        EcmUserService,
-        BpmUserService
-    ],
     exports: [
         UserInfoComponent
     ]
diff --git a/lib/core/utils/momentDateAdapter.ts b/lib/core/utils/momentDateAdapter.ts
index 5ef710b927..c0208186d8 100644
--- a/lib/core/utils/momentDateAdapter.ts
+++ b/lib/core/utils/momentDateAdapter.ts
@@ -19,11 +19,6 @@ import { DateAdapter } from '@angular/material';
 import { isMoment, Moment } from 'moment';
 import moment from 'moment-es6';
 
-const dateNames: string[] = [];
-for (let date = 1; date <= 31; date++) {
-    dateNames.push(String(date));
-}
-
 export class MomentDateAdapter extends DateAdapter<Moment> {
 
     private localeData: any = moment.localeData();
@@ -60,6 +55,11 @@ export class MomentDateAdapter extends DateAdapter<Moment> {
     }
 
     getDateNames(): string[] {
+        const dateNames: string[] = [];
+        for (let date = 1; date <= 31; date++) {
+            dateNames.push(String(date));
+        }
+
         return dateNames;
     }
 
@@ -89,7 +89,8 @@ export class MomentDateAdapter extends DateAdapter<Moment> {
     }
 
     clone(date: Moment): Moment {
-        return date.clone().locale(this.locale);
+        let locale = this.locale || 'en';
+        return date.clone().locale(locale);
     }
 
     createDate(year: number, month: number, date: number): Moment {
@@ -97,16 +98,18 @@ export class MomentDateAdapter extends DateAdapter<Moment> {
     }
 
     today(): Moment {
-        return moment().locale(this.locale);
+        let locale = this.locale || 'en';
+        return moment().locale(locale);
     }
 
     parse(value: any, parseFormat: any): Moment {
+        let locale = this.locale || 'en';
 
         if (value && typeof value === 'string') {
-            let m = moment(value, parseFormat, this.locale, true);
+            let m = moment(value, parseFormat, locale, true);
             if (!m.isValid()) {
                 // use strict parsing because Moment's parser is very forgiving, and this can lead to undesired behavior.
-                m = moment(value, this.overrideDisplyaFormat, this.locale, true);
+                m = moment(value, this.overrideDisplyaFormat, locale, true);
             }
             if (m.isValid()) {
                 // if user omits year, it defaults to 2001, so check for that issue.
@@ -123,7 +126,7 @@ export class MomentDateAdapter extends DateAdapter<Moment> {
             return m;
         }
 
-        return value ? moment(value).locale(this.locale) : null;
+        return value ? moment(value).locale(locale) : null;
     }
 
     format(date: Moment, displayFormat: any): string {
@@ -204,7 +207,8 @@ export class MomentDateAdapter extends DateAdapter<Moment> {
     }
 
     fromIso8601(iso8601String: string): Moment | null {
-        let d = moment(iso8601String, moment.ISO_8601).locale(this.locale);
+        let locale = this.locale || 'en';
+        let d = moment(iso8601String, moment.ISO_8601).locale(locale);
         return this.isValid(d) ? d : null;
     }
 
diff --git a/lib/core/viewer/components/imgViewer.component.html b/lib/core/viewer/components/imgViewer.component.html
index 8a819b1561..d67291f40a 100644
--- a/lib/core/viewer/components/imgViewer.component.html
+++ b/lib/core/viewer/components/imgViewer.component.html
@@ -1,4 +1,4 @@
-<div class="image-container" [ngStyle]="{ transform: transform }">
+<div class="image-container" [ngStyle]="{ transform: transform }" data-automation-id="adf-image-container">
     <img id="viewer-image" [src]="urlFile" [alt]="nameFile" [ngStyle]="{ 'cursor' : isDragged ? 'move': 'default' } " />
 </div>
 
@@ -22,7 +22,7 @@
             <mat-icon>zoom_out</mat-icon>
         </button>
 
-        <div class="adf-viewer__toolbar-page-scale">
+        <div class="adf-viewer__toolbar-page-scale" data-automation-id="adf-page-scale">
             {{ currentScaleText }}
         </div>
 
diff --git a/lib/core/viewer/components/pdfViewer-password-dialog.html b/lib/core/viewer/components/pdfViewer-password-dialog.html
index 684d4521dc..dbb92bcbc0 100644
--- a/lib/core/viewer/components/pdfViewer-password-dialog.html
+++ b/lib/core/viewer/components/pdfViewer-password-dialog.html
@@ -4,14 +4,15 @@
 
 <mat-dialog-content>
     <form (submit)="submit()">
-        <mat-input-container class="adf-full-width">
-                <input matInput
-                type="password"
-                placeholder="{{ 'ADF_VIEWER.PDF_DIALOG.PLACEHOLDER' | translate }}"
-                [formControl]="passwordFormControl" />
-        </mat-input-container>
+        <mat-form-field class="adf-full-width">
+            <input matInput
+                   data-automation-id='adf-password-dialog-input'
+                   type="password"
+                   placeholder="{{ 'ADF_VIEWER.PDF_DIALOG.PLACEHOLDER' | translate }}"
+                   [formControl]="passwordFormControl" />
+        </mat-form-field>
 
-        <mat-error *ngIf="isError()">{{ 'ADF_VIEWER.PDF_DIALOG.ERROR' | translate }}</mat-error>
+        <mat-error *ngIf="isError()" data-automation-id='adf-password-dialog-error'>{{ 'ADF_VIEWER.PDF_DIALOG.ERROR' | translate }}</mat-error>
     </form>
 </mat-dialog-content>
 
@@ -21,9 +22,10 @@
     <button mat-button mat-dialog-close>{{ 'ADF_VIEWER.PDF_DIALOG.CLOSE' | translate }}</button>
 
     <button mat-button
-        class="adf-dialog-action-button"
-        [disabled]="!isValid()"
-        (click)="submit()">
+            data-automation-id='adf-password-dialog-submit'
+            class="adf-dialog-action-button"
+            [disabled]="!isValid()"
+            (click)="submit()">
         {{ 'ADF_VIEWER.PDF_DIALOG.SUBMIT' | translate }}
     </button>
-</mat-dialog-actions>
\ No newline at end of file
+</mat-dialog-actions>
diff --git a/lib/core/viewer/components/pdfViewer-thumbnails.component.html b/lib/core/viewer/components/pdfViewer-thumbnails.component.html
index 95965c0c0b..136ef94b0a 100644
--- a/lib/core/viewer/components/pdfViewer-thumbnails.component.html
+++ b/lib/core/viewer/components/pdfViewer-thumbnails.component.html
@@ -1,4 +1,5 @@
 <div class="pdf-thumbnails__content"
+     data-automation-id='adf-thumbnails-content'
     [style.height.px]="virtualHeight"
     [style.transform]="'translate(-50%, ' + translateY + 'px)'">
     <adf-pdf-thumb *ngFor="let page of renderItems; trackBy: trackByFn"
diff --git a/lib/core/viewer/components/pdfViewer.component.html b/lib/core/viewer/components/pdfViewer.component.html
index f4a0692a15..c947141db3 100644
--- a/lib/core/viewer/components/pdfViewer.component.html
+++ b/lib/core/viewer/components/pdfViewer.component.html
@@ -3,8 +3,8 @@
         <div class="adf-pdf-viewer__thumbnails">
             <div class="thumbnails-template__container">
                 <div class="thumbnails-template__buttons">
-                    <button mat-icon-button (click)="toggleThumbnails()">
-                            <mat-icon>close</mat-icon>
+                    <button mat-icon-button data-automation-id='adf-thumbnails-close' (click)="toggleThumbnails()">
+                        <mat-icon>close</mat-icon>
                     </button>
                 </div>
 
@@ -37,8 +37,9 @@
 
         <ng-container *ngIf="allowThumbnails">
             <button mat-icon-button
-                [disabled]="isPanelDisabled"
-                (click)="toggleThumbnails()">
+                    data-automation-id="adf-thumbnails-button"
+                    [disabled]="isPanelDisabled"
+                    (click)="toggleThumbnails()">
                 <mat-icon>dashboard</mat-icon>
             </button>
             <adf-toolbar-divider></adf-toolbar-divider>
@@ -65,14 +66,15 @@
         <div class="adf-pdf-viewer__toolbar-page-selector">
             <span>{{ 'ADF_VIEWER.PAGE_LABEL.SHOWING' | translate }}</span>
             <input #page
-                type="text"
-                pattern="-?[0-9]*(\.[0-9]+)?"
-                value="{{ displayPage }}"
-                (keyup.enter)="inputPage(page.value)">
+                   type="text"
+                   data-automation-id="adf-page-selector"
+                   pattern="-?[0-9]*(\.[0-9]+)?"
+                   value="{{ displayPage }}"
+                   (keyup.enter)="inputPage(page.value)">
             <span>{{ 'ADF_VIEWER.PAGE_LABEL.OF' | translate }} {{ totalPages }}</span>
         </div>
 
-        <div class="adf-viewer__toolbar-page-scale">
+        <div class="adf-viewer__toolbar-page-scale" data-automation-id="adf-page-scale">
             {{ currentScaleText }}
         </div>
 
diff --git a/lib/core/viewer/components/pdfViewer.component.spec.ts b/lib/core/viewer/components/pdfViewer.component.spec.ts
index 79722ec37e..37a143d640 100644
--- a/lib/core/viewer/components/pdfViewer.component.spec.ts
+++ b/lib/core/viewer/components/pdfViewer.component.spec.ts
@@ -22,7 +22,7 @@ import { RenderingQueueServices } from '../services/rendering-queue.services';
 import { PdfViewerComponent } from './pdfViewer.component';
 import { RIGHT_ARROW, LEFT_ARROW } from '@angular/cdk/keycodes';
 import { MatDialog } from '@angular/material';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 import { setupTestBed } from '../../testing/setupTestBed';
 import { CoreModule } from '../../core.module';
 import { TranslationService } from '../../services/translation.service';
@@ -530,13 +530,13 @@ describe('Test PdfViewer component', () => {
             spyOn(dialog, 'open').and.callFake((comp, context) => {
                 if (context.data.reason === PDFJS.PasswordResponses.NEED_PASSWORD) {
                     return {
-                        afterClosed: () => Observable.of('wrong_password')
+                        afterClosed: () => of('wrong_password')
                     };
                 }
 
                 if (context.data.reason === PDFJS.PasswordResponses.INCORRECT_PASSWORD) {
                     return {
-                        afterClosed: () => Observable.of('password')
+                        afterClosed: () => of('password')
                     };
                 }
             });
diff --git a/lib/core/viewer/components/pdfViewer.component.ts b/lib/core/viewer/components/pdfViewer.component.ts
index 6e59493f0c..813787b24b 100644
--- a/lib/core/viewer/components/pdfViewer.component.ts
+++ b/lib/core/viewer/components/pdfViewer.component.ts
@@ -327,7 +327,7 @@ export class PdfViewerComponent implements OnChanges, OnDestroy {
      *
      * @param ticks
      */
-    zoomIn(ticks: number) {
+    zoomIn(ticks?: number) {
         let newScale: any = this.currentScale;
         do {
             newScale = (newScale * this.DEFAULT_SCALE_DELTA).toFixed(2);
@@ -343,7 +343,7 @@ export class PdfViewerComponent implements OnChanges, OnDestroy {
      *
      * @param ticks
      */
-    zoomOut(ticks: number) {
+    zoomOut(ticks?: number) {
         let newScale: any = this.currentScale;
         do {
             newScale = (newScale / this.DEFAULT_SCALE_DELTA).toFixed(2);
@@ -413,10 +413,10 @@ export class PdfViewerComponent implements OnChanges, OnDestroy {
                 data: { reason }
             })
             .afterClosed().subscribe(password => {
-                if (password) {
-                    callback(password);
-                }
-            });
+            if (password) {
+                callback(password);
+            }
+        });
     }
 
     /**
diff --git a/lib/core/viewer/components/txtViewer.component.ts b/lib/core/viewer/components/txtViewer.component.ts
index 12226fe5d3..89a8d89b7f 100644
--- a/lib/core/viewer/components/txtViewer.component.ts
+++ b/lib/core/viewer/components/txtViewer.component.ts
@@ -18,7 +18,6 @@
 import { HttpClient } from '@angular/common/http';
 import { Component, Input, OnChanges, ViewEncapsulation } from '@angular/core';
 import { SimpleChanges } from '@angular/core';
-import 'rxjs/add/operator/toPromise';
 
 @Component({
     selector: 'adf-txt-viewer',
@@ -77,7 +76,7 @@ export class TxtViewerComponent implements OnChanges {
                 resolve();
             };
 
-            reader.onerror = (error: ErrorEvent) => {
+            reader.onerror = (error: any) => {
                 reject(error);
             };
 
diff --git a/lib/core/viewer/components/viewer.component.html b/lib/core/viewer/components/viewer.component.html
index 31a1fd0edd..c9e0c87aa4 100644
--- a/lib/core/viewer/components/viewer.component.html
+++ b/lib/core/viewer/components/viewer.component.html
@@ -11,7 +11,7 @@
                 <adf-toolbar-title>
                     <button *ngIf="allowGoBack"
                         class="adf-viewer-close-button"
-                        data-automation-id="toolbar-back"
+                        data-automation-id="adf-toolbar-back"
                         mat-icon-button
                         title="{{ 'ADF_VIEWER.ACTIONS.CLOSE' | translate }}"
                         (click)="onBackButtonClick()">
@@ -22,17 +22,17 @@
                 <div fxFlex="1 1 auto" class="adf-viewer__file-title">
                     <button
                         *ngIf="allowNavigate && canNavigateBefore"
-                        data-automation-id="toolbar-pref-file"
+                        data-automation-id="adf-toolbar-pref-file"
                         mat-icon-button
                         title="{{ 'ADF_VIEWER.ACTIONS.PREV_FILE' | translate }}"
                         (click)="onNavigateBeforeClick()">
                         <mat-icon>navigate_before</mat-icon>
                     </button>
-                    <img class="adf-viewer__mimeicon" [src]="mimeType | adfMimeTypeIcon">
-                    <span class="adf-viewer__display-name" id="adf-viewer-display-name">{{ displayName }}</span>
+                    <img class="adf-viewer__mimeicon" [src]="mimeType | adfMimeTypeIcon" data-automation-id="adf-file-thumbnail">
+                    <span class="adf-viewer__display-name" id="adf-viewer-display-name">{{ fileTitle }}</span>
                     <button
                         *ngIf="allowNavigate && canNavigateNext"
-                        data-automation-id="toolbar-next-file"
+                        data-automation-id="adf-toolbar-next-file"
                         mat-icon-button
                         title="{{ 'ADF_VIEWER.ACTIONS.NEXT_FILE' | translate }}"
                         (click)="onNavigateNextClick()">
@@ -42,11 +42,11 @@
 
                 <ng-content select="adf-viewer-toolbar-actions"></ng-content>
 
-                <ng-container *ngIf="mnuOpenWith">
+                <ng-container *ngIf="mnuOpenWith" data-automation-id='adf-toolbar-custom-btn'>
                     <button
                         mat-button
                         [matMenuTriggerFor]="mnuOpenWith"
-                        data-automation-id="toolbar-open-with">
+                        data-automation-id="adf-toolbar-open-with">
                         <span>{{ 'ADF_VIEWER.ACTIONS.OPEN_WITH' | translate }}</span>
                         <mat-icon>arrow_drop_down</mat-icon>
                     </button>
@@ -61,7 +61,7 @@
                     *ngIf="allowDownload"
                     mat-icon-button
                     title="{{ 'ADF_VIEWER.ACTIONS.DOWNLOAD' | translate }}"
-                    data-automation-id="toolbar-download"
+                    data-automation-id="adf-toolbar-download"
                     (click)="downloadContent()">
                     <mat-icon>file_download</mat-icon>
                 </button>
@@ -70,7 +70,7 @@
                     *ngIf="allowPrint"
                     mat-icon-button
                     title="{{ 'ADF_VIEWER.ACTIONS.PRINT' | translate }}"
-                    data-automation-id="toolbar-print"
+                    data-automation-id="adf-toolbar-print"
                     (click)="printContent()">
                     <mat-icon>print</mat-icon>
                 </button>
@@ -79,7 +79,7 @@
                     *ngIf="allowShare"
                     mat-icon-button
                     title="{{ 'ADF_VIEWER.ACTIONS.SHARE' | translate }}"
-                    data-automation-id="toolbar-share"
+                    data-automation-id="adf-toolbar-share"
                     (click)="shareContent()">
                     <mat-icon>share</mat-icon>
                 </button>
@@ -88,7 +88,7 @@
                     *ngIf="viewerType !== 'media' && allowFullScreen"
                     mat-icon-button
                     title="{{ 'ADF_VIEWER.ACTIONS.FULLSCREEN' | translate }}"
-                    data-automation-id="toolbar-fullscreen"
+                    data-automation-id="adf-toolbar-fullscreen"
                     (click)="enterFullScreen()">
                     <mat-icon>fullscreen</mat-icon>
                 </button>
@@ -98,7 +98,7 @@
                         mat-icon-button
                         [matMenuTriggerFor]="mnuMoreActions"
                         title="{{ 'ADF_VIEWER.ACTIONS.MORE_ACTIONS' | translate }}"
-                        data-automation-id="toolbar-more-actions">
+                        data-automation-id="adf-toolbar-more-actions">
                         <mat-icon>more_vert</mat-icon>
                     </button>
                     <mat-menu #mnuMoreActions="matMenu" [overlapTrigger]="false">
@@ -112,9 +112,9 @@
                     <button
                         mat-icon-button
                         title="{{ 'ADF_VIEWER.ACTIONS.INFO' | translate }}"
-                        data-automation-id="toolbar-sidebar"
+                        data-automation-id="adf-toolbar-sidebar"
                         [color]="showSidebar ? 'accent' : 'default'"
-                        (click)="toggleSidebar($event)">
+                        (click)="toggleSidebar()">
                         <mat-icon>info_outline</mat-icon>
                     </button>
                 </ng-container>
@@ -161,13 +161,22 @@
                         </ng-container>
 
                         <ng-container *ngSwitchCase="'media'">
-                            <adf-media-player [urlFile]="urlFileContent" [mimeType]="mimeType" [blobFile]="blobFile" [nameFile]="displayName"></adf-media-player>
+                            <adf-media-player id="adf-mdedia-player" [urlFile]="urlFileContent" [mimeType]="mimeType" [blobFile]="blobFile" [nameFile]="displayName"></adf-media-player>
                         </ng-container>
 
                         <ng-container *ngSwitchCase="'text'">
                             <adf-txt-viewer [urlFile]="urlFileContent" [blobFile]="blobFile"></adf-txt-viewer>
                         </ng-container>
 
+                        <ng-container *ngSwitchCase="'in_creation'">
+                                    <div class="adf-viewer__loading-screen" fxFlex="1 1 auto">
+                                        <h2>{{ 'ADF_VIEWER.LOADING' | translate }}</h2>
+                                        <div>
+                                            <mat-spinner></mat-spinner>
+                                        </div>
+                                    </div>
+                        </ng-container>
+
                         <ng-container *ngSwitchCase="'custom'">
                             <span class="adf-viewer-custom-content" *ngFor="let extensionTemplate of extensionTemplates">
                                 <ng-template *ngIf="extensionTemplate.isVisible" [ngTemplateOutlet]="extensionTemplate.template" [ngTemplateOutletContext]="{ urlFileContent: urlFileContent, extension:extension }">
diff --git a/lib/core/viewer/components/viewer.component.spec.ts b/lib/core/viewer/components/viewer.component.spec.ts
index ad230bbdf2..d0a08911bd 100644
--- a/lib/core/viewer/components/viewer.component.spec.ts
+++ b/lib/core/viewer/components/viewer.component.spec.ts
@@ -23,11 +23,10 @@ import { AlfrescoApiService, RenditionsService } from '../../services';
 
 import { CoreModule } from '../../core.module';
 
-import { Observable } from 'rxjs/Observable';
+import { throwError } from 'rxjs';
 import { EventMock } from '../../mock/event.mock';
 import { RenderingQueueServices } from '../services/rendering-queue.services';
 import { ViewerComponent } from './viewer.component';
-import 'rxjs/add/observable/throw';
 import { setupTestBed } from '../../testing/setupTestBed';
 import { AlfrescoApiServiceMock } from '../../mock/alfresco-api.service.mock';
 
@@ -143,7 +142,7 @@ describe('ViewerComponent', () => {
             {
                 provide: RenditionsService, useValue: {
                 getRendition: () => {
-                    return Observable.throw('throwed');
+                    return throwError('throwed');
                 }
             }
             },
@@ -176,14 +175,14 @@ describe('ViewerComponent', () => {
         tick();
 
         expect(alfrescoApiService.nodesApi.getNodeInfo).toHaveBeenCalledWith('id1', {include: [ 'allowableOperations' ]});
-        expect(component.displayName).toBe('file1');
+        expect(component.fileTitle).toBe('file1');
 
         component.fileNodeId = 'id2';
         component.ngOnChanges({});
         tick();
 
         expect(alfrescoApiService.nodesApi.getNodeInfo).toHaveBeenCalledWith('id2', {include: [ 'allowableOperations' ]});
-        expect(component.displayName).toBe('file2');
+        expect(component.fileTitle).toBe('file2');
     }));
 
     describe('Viewer Example Component Rendering', () => {
@@ -233,7 +232,7 @@ describe('ViewerComponent', () => {
 
         beforeEach(() => {
             component.showToolbar = true;
-            component.urlFile = 'base/src/assets/fake-test-file.pdf';
+            component.urlFile = 'fake-test-file.pdf';
             component.mimeType = 'application/pdf';
 
             fixture.detectChanges();
@@ -285,27 +284,27 @@ describe('ViewerComponent', () => {
         describe('Toolbar', () => {
 
             it('should render fullscreen button', () => {
-                expect(element.querySelector('[data-automation-id="toolbar-fullscreen"]')).toBeDefined();
+                expect(element.querySelector('[data-automation-id="adf-toolbar-fullscreen"]')).toBeDefined();
             });
 
             it('should not render fullscreen button', () => {
                 component.allowFullScreen = false;
                 fixture.detectChanges();
 
-                expect(element.querySelector('[data-automation-id="toolbar-fullscreen"]')).toBeNull();
+                expect(element.querySelector('[data-automation-id="adf-toolbar-fullscreen"]')).toBeNull();
             });
 
             it('should render default download button', () => {
                 component.allowDownload = true;
 
-                expect(element.querySelector('[data-automation-id="toolbar-download"]')).toBeDefined();
+                expect(element.querySelector('[data-automation-id="adf-toolbar-download"]')).toBeDefined();
             });
 
             it('should not render default download button', () => {
                 component.allowDownload = false;
                 fixture.detectChanges();
 
-                expect(element.querySelector('[data-automation-id="toolbar-download"]')).toBeNull();
+                expect(element.querySelector('[data-automation-id="adf-toolbar-download"]')).toBeNull();
             });
 
             it('should invoke download action with the toolbar button', () => {
@@ -313,7 +312,7 @@ describe('ViewerComponent', () => {
                 spyOn(component, 'downloadContent').and.stub();
                 fixture.detectChanges();
 
-                const button: HTMLButtonElement = element.querySelector('[data-automation-id="toolbar-download"]') as HTMLButtonElement;
+                const button: HTMLButtonElement = element.querySelector('[data-automation-id="adf-toolbar-download"]') as HTMLButtonElement;
                 button.click();
 
                 expect(component.downloadContent).toHaveBeenCalled();
@@ -327,7 +326,7 @@ describe('ViewerComponent', () => {
                     expect(e).not.toBeNull();
                 });
 
-                const button: HTMLButtonElement = element.querySelector('[data-automation-id="toolbar-download"]') as HTMLButtonElement;
+                const button: HTMLButtonElement = element.querySelector('[data-automation-id="adf-toolbar-download"]') as HTMLButtonElement;
                 button.click();
             }));
 
@@ -335,14 +334,14 @@ describe('ViewerComponent', () => {
                 component.allowPrint = true;
                 fixture.detectChanges();
 
-                expect(element.querySelector('[data-automation-id="toolbar-print"]')).toBeDefined();
+                expect(element.querySelector('[data-automation-id="adf-toolbar-print"]')).toBeDefined();
             });
 
             it('should not render default print button', () => {
                 component.allowPrint = false;
                 fixture.detectChanges();
 
-                expect(element.querySelector('[data-automation-id="toolbar-print"]')).toBeNull();
+                expect(element.querySelector('[data-automation-id="adf-toolbar-print"]')).toBeNull();
             });
 
             it('should invoke print action with the toolbar button', () => {
@@ -351,7 +350,7 @@ describe('ViewerComponent', () => {
 
                 spyOn(component, 'printContent').and.stub();
 
-                const button: HTMLButtonElement = element.querySelector('[data-automation-id="toolbar-print"]') as HTMLButtonElement;
+                const button: HTMLButtonElement = element.querySelector('[data-automation-id="adf-toolbar-print"]') as HTMLButtonElement;
                 button.click();
 
                 expect(component.printContent).toHaveBeenCalled();
@@ -365,7 +364,7 @@ describe('ViewerComponent', () => {
                     expect(e).not.toBeNull();
                 });
 
-                const button: HTMLButtonElement = element.querySelector('[data-automation-id="toolbar-print"]') as HTMLButtonElement;
+                const button: HTMLButtonElement = element.querySelector('[data-automation-id="adf-toolbar-print"]') as HTMLButtonElement;
                 button.click();
             }));
 
@@ -373,14 +372,14 @@ describe('ViewerComponent', () => {
                 component.allowShare = true;
                 fixture.detectChanges();
 
-                expect(element.querySelector('[data-automation-id="toolbar-share"]')).toBeDefined();
+                expect(element.querySelector('[data-automation-id="adf-toolbar-share"]')).toBeDefined();
             });
 
             it('should not render default share button', () => {
                 component.allowShare = false;
                 fixture.detectChanges();
 
-                expect(element.querySelector('[data-automation-id="toolbar-share"]')).toBeNull();
+                expect(element.querySelector('[data-automation-id="adf-toolbar-share"]')).toBeNull();
             });
 
             it('should invoke share action with the toolbar button', () => {
@@ -389,7 +388,7 @@ describe('ViewerComponent', () => {
 
                 spyOn(component, 'shareContent').and.stub();
 
-                const button: HTMLButtonElement = element.querySelector('[data-automation-id="toolbar-share"]') as HTMLButtonElement;
+                const button: HTMLButtonElement = element.querySelector('[data-automation-id="adf-toolbar-share"]') as HTMLButtonElement;
                 button.click();
 
                 expect(component.shareContent).toHaveBeenCalled();
@@ -403,7 +402,7 @@ describe('ViewerComponent', () => {
                     expect(e).not.toBeNull();
                 });
 
-                const button: HTMLButtonElement = element.querySelector('[data-automation-id="toolbar-share"]') as HTMLButtonElement;
+                const button: HTMLButtonElement = element.querySelector('[data-automation-id="adf-toolbar-share"]') as HTMLButtonElement;
                 button.click();
             }));
 
@@ -456,10 +455,6 @@ describe('ViewerComponent', () => {
                     fixture.detectChanges();
                 });
 
-                it('should header be NOT be present if is not overlay mode', () => {
-                    expect(element.querySelector('header')).toBeNull();
-                });
-
                 it('should Esc button not hide the viewer if is not overlay mode', () => {
                     EventMock.keyDown(27);
                     fixture.detectChanges();
@@ -514,7 +509,7 @@ describe('ViewerComponent', () => {
         describe('Extension Type Test', () => {
 
             it('should  extension file pdf  be loaded', async(() => {
-                component.urlFile = 'base/src/assets/fake-test-file.pdf';
+                component.urlFile = 'fake-test-file.pdf';
                 component.ngOnChanges(null);
                 fixture.detectChanges();
 
@@ -592,6 +587,41 @@ describe('ViewerComponent', () => {
             }));
         });
 
+        describe('error handling', () => {
+
+            it('should show unknown view when node file not found', async(() => {
+                spyOn(alfrescoApiService.getInstance().nodes, 'getNodeInfo')
+                    .and.returnValue(Promise.reject({}));
+
+                component.nodeId = 'the-node-id-of-the-file-to-preview';
+                component.urlFile = null;
+                component.mimeType = null;
+
+                component.ngOnChanges(null);
+                fixture.whenStable().then(() => {
+                    fixture.detectChanges();
+                    expect(element.querySelector('adf-viewer-unknown-format')).not.toBeNull();
+                });
+            }));
+
+            it('should show unknown view when sharedLink file not found', async(() => {
+                spyOn(alfrescoApiService.getInstance().core.sharedlinksApi, 'getSharedLink')
+                    .and.returnValue(Promise.reject({}));
+
+                component.sharedLinkId = 'the-Shared-Link-id';
+                component.urlFile = null;
+                component.mimeType = null;
+
+                component.ngOnChanges(null);
+                fixture.whenStable().then(() => {
+                    fixture.detectChanges();
+                    expect(element.querySelector('adf-viewer-unknown-format')).not.toBeNull();
+                });
+
+            }));
+
+        });
+
         describe('MimeType handling', () => {
 
             it('should display a PDF file identified by mimetype when the filename has no extension', async(() => {
@@ -667,7 +697,7 @@ describe('ViewerComponent', () => {
                 });
             });
 
-            it('should display the media player if the file identified by mimetype is a media when the filename has no extension', async(() => {
+            xit('should display the media player if the file identified by mimetype is a media when the filename has no extension', async(() => {
                 component.urlFile = 'content';
                 component.mimeType = 'video/mp4';
                 fixture.detectChanges();
@@ -679,7 +709,7 @@ describe('ViewerComponent', () => {
                 });
             }));
 
-            it('should node without content show unkonwn', async(() => {
+            xit('should node without content show unkonwn', async(() => {
                 const displayName = 'the-name';
                 const nodeDetails = { name: displayName, id: '12' };
                 const contentUrl = '/content/url/path';
@@ -719,7 +749,7 @@ describe('ViewerComponent', () => {
         describe('display name property override by urlFile', () => {
 
             it('should displayName override the default name if is present and urlFile is set', async(() => {
-                component.urlFile = 'base/src/assets/fake-test-file.pdf';
+                component.urlFile = 'fake-test-file.pdf';
                 component.displayName = 'test name';
                 fixture.detectChanges();
                 component.ngOnChanges(null);
@@ -731,7 +761,7 @@ describe('ViewerComponent', () => {
             }));
 
             it('should use the urlFile name if displayName is NOT set and urlFile is set', async(() => {
-                component.urlFile = 'base/src/assets/fake-test-file.pdf';
+                component.urlFile = 'fake-test-file.pdf';
                 component.displayName = null;
                 fixture.detectChanges();
                 component.ngOnChanges(null);
@@ -804,7 +834,7 @@ describe('ViewerComponent', () => {
             component = fixture.componentInstance;
 
             component.showToolbar = true;
-            component.urlFile = 'base/src/assets/fake-test-file.pdf';
+            component.urlFile = 'fake-test-file.pdf';
             component.mimeType = 'application/pdf';
             fixture.detectChanges();
         });
diff --git a/lib/core/viewer/components/viewer.component.ts b/lib/core/viewer/components/viewer.component.ts
index d1d29fc910..6e4b60a6aa 100644
--- a/lib/core/viewer/components/viewer.component.ts
+++ b/lib/core/viewer/components/viewer.component.ts
@@ -29,7 +29,7 @@ import { ViewerMoreActionsComponent } from './viewer-more-actions.component';
 import { ViewerOpenWithComponent } from './viewer-open-with.component';
 import { ViewerSidebarComponent } from './viewer-sidebar.component';
 import { ViewerToolbarComponent } from './viewer-toolbar.component';
-import { Subscription } from 'rxjs/Subscription';
+import { Subscription } from 'rxjs';
 
 @Component({
     selector: 'adf-viewer',
@@ -175,7 +175,7 @@ export class ViewerComponent implements OnChanges, OnInit, OnDestroy {
      * There is a delay of at least one second between attempts.
      */
     @Input()
-    maxRetries = 5;
+    maxRetries = 10;
 
     /** Emitted when user clicks the 'Back' button. */
     @Output()
@@ -219,6 +219,7 @@ export class ViewerComponent implements OnChanges, OnInit, OnDestroy {
     otherMenu: any;
     extension: string;
     sidebarTemplateContext: { node: MinimalNodeEntryEntity } = { node: null };
+    fileTitle: string;
 
     private cacheBusterNumber;
 
@@ -298,16 +299,21 @@ export class ViewerComponent implements OnChanges, OnInit, OnDestroy {
                 );
             } else if (this.sharedLinkId) {
 
-                this.apiService.sharedLinksApi.getSharedLink(this.sharedLinkId).then(details => {
-                    this.setUpSharedLinkFile(details);
-                    this.isLoading = false;
-                });
+                this.apiService.sharedLinksApi.getSharedLink(this.sharedLinkId).then(
+                    details => {
+                        this.setUpSharedLinkFile(details);
+                        this.isLoading = false;
+                    },
+                    () => {
+                        this.isLoading = false;
+                        this.logService.error('This sharedLink does not exist');
+                    });
             }
         }
     }
 
     private setUpBlobData() {
-        this.displayName = this.getDisplayName('Unknown');
+        this.fileTitle = this.getDisplayName('Unknown');
         this.mimeType = this.blobFile.type;
         this.viewerType = this.getViewerTypeByMimeType(this.mimeType);
 
@@ -320,7 +326,7 @@ export class ViewerComponent implements OnChanges, OnInit, OnDestroy {
 
     private setUpUrlFile() {
         let filenameFromUrl = this.getFilenameFromUrl(this.urlFile);
-        this.displayName = this.getDisplayName(filenameFromUrl);
+        this.fileTitle = this.getDisplayName(filenameFromUrl);
         this.extension = this.getFileExtension(filenameFromUrl);
         this.urlFileContent = this.urlFile;
 
@@ -343,7 +349,7 @@ export class ViewerComponent implements OnChanges, OnInit, OnDestroy {
             this.mimeType = data.content.mimeType;
         }
 
-        this.displayName = data.name;
+        this.fileTitle = this.getDisplayName(data.name);
 
         this.urlFileContent = this.apiService.contentApi.getContentUrl(data.id);
         this.urlFileContent = this.cacheBusterNumber ? this.urlFileContent + '&' + this.cacheBusterNumber : this.urlFileContent;
@@ -371,7 +377,7 @@ export class ViewerComponent implements OnChanges, OnInit, OnDestroy {
 
     private setUpSharedLinkFile(details: any) {
         this.mimeType = details.entry.content.mimeType;
-        this.displayName = this.getDisplayName(details.entry.name);
+        this.fileTitle = this.getDisplayName(details.entry.name);
         this.extension = this.getFileExtension(details.entry.name);
         this.fileName = details.entry.name;
 
@@ -401,7 +407,7 @@ export class ViewerComponent implements OnChanges, OnInit, OnDestroy {
     }
 
     private getDisplayName(name) {
-        return this.displayName || name;
+        return this.displayName || name ;
     }
 
     scrollTop() {
@@ -648,7 +654,7 @@ export class ViewerComponent implements OnChanges, OnInit, OnDestroy {
         }
     }
 
-    private async resolveRendition(nodeId: string, renditionId: string): Promise<RenditionEntry> {
+    private async resolveRendition(nodeId: string, renditionId: string) {
         renditionId = renditionId.toLowerCase();
 
         const supported = await this.apiService.renditionsApi.getRenditions(nodeId);
@@ -664,7 +670,9 @@ export class ViewerComponent implements OnChanges, OnInit, OnDestroy {
 
             if (status === 'NOT_CREATED') {
                 try {
-                    await this.apiService.renditionsApi.createRendition(nodeId, { id: renditionId });
+                    await this.apiService.renditionsApi.createRendition(nodeId, { id: renditionId }).then(() => {
+                        this.viewerType = 'in_creation';
+                    });
                     rendition = await this.waitRendition(nodeId, renditionId, 0);
                 } catch (err) {
                     this.logService.error(err);
@@ -676,23 +684,33 @@ export class ViewerComponent implements OnChanges, OnInit, OnDestroy {
     }
 
     private async waitRendition(nodeId: string, renditionId: string, retries: number): Promise<RenditionEntry> {
-        const rendition = await this.apiService.renditionsApi.getRendition(nodeId, renditionId);
+        let currentRetry = 0;
+        return new Promise((resolve, reject) => {
+            let intervalId = setInterval(() => {
+                currentRetry++;
+                if (this.maxRetries >= currentRetry) {
+                    this.apiService.renditionsApi.getRendition(nodeId, renditionId).then((rendition) => {
+                        const status = rendition.entry.status.toString();
+                        if (status === 'CREATED') {
 
-        if (this.maxRetries < retries) {
-            const status = rendition.entry.status.toString();
+                            if (renditionId === 'pdf') {
+                                this.viewerType = 'pdf';
+                            } else if (renditionId === 'imgpreview') {
+                                this.viewerType = 'image';
+                            }
 
-            if (status === 'CREATED') {
-                return rendition;
-            } else {
-                retries += 1;
-                await this.wait(1000);
-                return await this.waitRendition(nodeId, renditionId, retries);
-            }
-        }
-    }
+                            this.urlFileContent = this.apiService.contentApi.getRenditionUrl(nodeId, renditionId);
 
-    private wait(ms: number): Promise<any> {
-        return new Promise(resolve => setTimeout(resolve, ms));
+                            clearInterval(intervalId);
+                            return resolve(rendition);
+                        }
+                    }, () => {
+                        this.viewerType = 'error_in_creation';
+                        return reject();
+                    });
+                }
+            }, 1000);
+        });
     }
 
     getSideBarStyle(): string {
diff --git a/lib/core/viewer/services/rendering-queue.services.ts b/lib/core/viewer/services/rendering-queue.services.ts
index ec67daf46f..c0e47b965c 100644
--- a/lib/core/viewer/services/rendering-queue.services.ts
+++ b/lib/core/viewer/services/rendering-queue.services.ts
@@ -1,3 +1,5 @@
+/* tslint:disable:adf-license-banner  */
+
 /* Copyright 2012 Mozilla Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/core/viewer/viewer.module.ts b/lib/core/viewer/viewer.module.ts
index 3832bf45b0..171bd1ded6 100644
--- a/lib/core/viewer/viewer.module.ts
+++ b/lib/core/viewer/viewer.module.ts
@@ -40,11 +40,15 @@ import { ViewerComponent } from './components/viewer.component';
 import { ViewerExtensionDirective } from './directives/viewer-extension.directive';
 import { ViewerToolbarActionsComponent } from './components/viewer-toolbar-actions.component';
 
+import * as pdfjsLib from 'pdfjs-dist';
+pdfjsLib.PDFJS.workerSrc = 'pdf.worker.min.js';
+pdfjsLib.PDFJS.disableFontFace = true;
+
 @NgModule({
     imports: [
         CommonModule,
         MaterialModule,
-        TranslateModule,
+        TranslateModule.forChild(),
         FormsModule,
         ReactiveFormsModule,
         ToolbarModule,
diff --git a/lib/insights/analytics-process/analytics-process.module.ts b/lib/insights/analytics-process/analytics-process.module.ts
index c1070452ba..fd3cd9bff2 100644
--- a/lib/insights/analytics-process/analytics-process.module.ts
+++ b/lib/insights/analytics-process/analytics-process.module.ts
@@ -18,13 +18,12 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { TranslateModule } from '@ngx-translate/core';
 import { DiagramsModule } from '../diagram/diagram.module';
 import { MaterialModule } from '../material.module';
 
 import { ChartsModule } from 'ng2-charts';
 
-import { ToolbarModule, ButtonsMenuModule } from '@alfresco/adf-core';
+import { CoreModule } from '@alfresco/adf-core';
 import { AnalyticsGeneratorComponent } from './components/analytics-generator.component';
 import { AnalyticsReportHeatMapComponent } from './components/analytics-report-heat-map.component';
 import { AnalyticsReportListComponent } from './components/analytics-report-list.component';
@@ -37,7 +36,6 @@ import { DropdownWidgetAanalyticsComponent } from './components/widgets/dropdown
 import { DurationWidgetComponent } from './components/widgets/duration/duration.widget';
 import { NumberWidgetAanlyticsComponent } from './components/widgets/number/number.widget';
 
-import { AnalyticsService } from './services/analytics.service';
 import { FlexLayoutModule } from '@angular/flex-layout';
 
 @NgModule({
@@ -48,10 +46,8 @@ import { FlexLayoutModule } from '@angular/flex-layout';
         ChartsModule,
         DiagramsModule,
         MaterialModule,
-        TranslateModule,
-        ToolbarModule,
         FlexLayoutModule,
-        ButtonsMenuModule
+        CoreModule.forChild()
     ],
     declarations: [
         AnalyticsComponent,
@@ -65,9 +61,6 @@ import { FlexLayoutModule } from '@angular/flex-layout';
         CheckboxWidgetAanalyticsComponent,
         DateRangeWidgetComponent
     ],
-    providers: [
-        AnalyticsService
-    ],
     exports: [
         AnalyticsComponent,
         AnalyticsReportListComponent,
diff --git a/lib/insights/analytics-process/components/analytics-report-list.component.ts b/lib/insights/analytics-process/components/analytics-report-list.component.ts
index d84b42f6b0..8f0c1787d0 100644
--- a/lib/insights/analytics-process/components/analytics-report-list.component.ts
+++ b/lib/insights/analytics-process/components/analytics-report-list.component.ts
@@ -16,10 +16,10 @@
  */
 
 import { Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
-import { Observer } from 'rxjs/Observer';
+import { Observable, Observer } from 'rxjs';
 import { ReportParametersModel } from '../../diagram/models/report/reportParameters.model';
 import { AnalyticsService } from '../services/analytics.service';
+import { share } from 'rxjs/operators';
 
 // @deprecated 2.3.0 analytics-report-list tag removed
 @Component({
@@ -59,7 +59,8 @@ export class AnalyticsReportListComponent implements OnInit {
     reports: ReportParametersModel[] = [];
 
     constructor(private analyticsService: AnalyticsService) {
-        this.report$ = new Observable<ReportParametersModel>(observer => this.reportObserver = observer).share();
+        this.report$ = new Observable<ReportParametersModel>(observer => this.reportObserver = observer)
+            .pipe(share());
     }
 
     ngOnInit() {
diff --git a/lib/insights/analytics-process/components/analytics-report-parameters.component.html b/lib/insights/analytics-process/components/analytics-report-parameters.component.html
index 0649e801a2..67a6b73cc4 100644
--- a/lib/insights/analytics-process/components/analytics-report-parameters.component.html
+++ b/lib/insights/analytics-process/components/analytics-report-parameters.component.html
@@ -15,8 +15,8 @@
                                     data-automation-id="reportName"
                                     [value]="reportParameters.name"
                                     (input)="reportParameters.name=$event.target.value"
-                                    (blur)="editTitle($event)"
-                                    (keyup.enter)="editTitle($event)"
+                                    (blur)="editTitle()"
+                                    (keyup.enter)="editTitle()"
                                 />
                             </mat-form-field>
                         </div>
@@ -24,7 +24,7 @@
                             <mat-icon class="adf-report-icon" >mode_edit</mat-icon>
                             <h4>{{reportParameters.name}}</h4>
                         </div>
-                    </adf-toolbar-title> 
+                    </adf-toolbar-title>
                     <adf-buttons-action-menu *ngIf="!isEditable">
                         <button mat-menu-item (click)="toggleParameters()" id="">
                             <mat-icon>settings</mat-icon><span>{{ 'ANALYTICS.MESSAGES.ICON-SETTING' | translate }}</span>
@@ -40,7 +40,7 @@
                                 <mat-icon>save</mat-icon><span>{{ 'ANALYTICS.MESSAGES.ICON-SAVE' | translate }}</span>
                             </button>
                         </div>
-                    </adf-buttons-action-menu>   
+                    </adf-buttons-action-menu>
                 </adf-toolbar>
                 <div *ngFor="let field of reportParameters.definition.parameters"
                         [class.is-hide]="isParametersHide()">
@@ -132,4 +132,4 @@
             </form>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/lib/insights/analytics-process/components/analytics-report-parameters.component.spec.ts b/lib/insights/analytics-process/components/analytics-report-parameters.component.spec.ts
index 02cbf03f8e..6ac7beb9cf 100644
--- a/lib/insights/analytics-process/components/analytics-report-parameters.component.spec.ts
+++ b/lib/insights/analytics-process/components/analytics-report-parameters.component.spec.ts
@@ -23,7 +23,7 @@ import { AnalyticsReportParametersComponent } from '../components/analytics-repo
 import { setupTestBed } from '@alfresco/adf-core';
 import { InsightsTestingModule } from '../../testing/insights.testing.module';
 import { AnalyticsService } from '../services/analytics.service';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 
 declare let jasmine: any;
 
@@ -448,7 +448,7 @@ describe('AnalyticsReportParametersComponent', () => {
             }));
 
             it('Should be able to change the report title', (done) => {
-                spyOn(service, 'updateReport').and.returnValue(Observable.of(analyticParamsMock.reportDefParamStatus));
+                spyOn(service, 'updateReport').and.returnValue(of(analyticParamsMock.reportDefParamStatus));
 
                 let title: HTMLElement = element.querySelector('h4');
                 title.click();
diff --git a/lib/insights/analytics-process/components/analytics-report-parameters.component.ts b/lib/insights/analytics-process/components/analytics-report-parameters.component.ts
index ad7da8a374..c08a5373d5 100644
--- a/lib/insights/analytics-process/components/analytics-report-parameters.component.ts
+++ b/lib/insights/analytics-process/components/analytics-report-parameters.component.ts
@@ -98,7 +98,7 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges, On
     private dropDownSub;
     private reportParamsSub;
     private paramOpts;
-    private reportParamQuery: ReportQuery;
+    reportParamQuery: ReportQuery;
     private hideParameters: boolean = true;
     formValidState: boolean = false;
 
diff --git a/lib/insights/analytics-process/services/analytics.service.ts b/lib/insights/analytics-process/services/analytics.service.ts
index d936c0d419..01f52fd2de 100644
--- a/lib/insights/analytics-process/services/analytics.service.ts
+++ b/lib/insights/analytics-process/services/analytics.service.ts
@@ -18,7 +18,7 @@
 import { AlfrescoApiService, LogService } from '@alfresco/adf-core';
 import { Injectable } from '@angular/core';
 import { Response } from '@angular/http';
-import { Observable } from 'rxjs/Observable';
+import { Observable, from, throwError } from 'rxjs';
 import { ParameterValueModel } from '../../diagram/models/report/parameterValue.model';
 import { ReportParametersModel } from '../../diagram/models/report/reportParameters.model';
 import { BarChart } from '../../diagram/models/chart/barChart.model';
@@ -28,8 +28,7 @@ import { HeatMapChart } from '../../diagram/models/chart/heatMapChart.model';
 import { MultiBarChart } from '../../diagram/models/chart/multiBarChart.model';
 import { PieChart } from '../../diagram/models/chart/pieChart.model';
 import { TableChart } from '../../diagram/models/chart/tableChart.model';
-
-import 'rxjs/add/observable/throw';
+import { map, catchError } from 'rxjs/operators';
 
 @Injectable()
 export class AnalyticsService {
@@ -39,31 +38,37 @@ export class AnalyticsService {
     }
 
     /**
-     * Retrive all the Deployed app
+     * Retrieve all the Deployed app
      */
     getReportList(appId: number): Observable<any> {
-        return Observable.fromPromise(this.apiService.getInstance().activiti.reportApi.getReportList())
-            .map((res: any) => {
-                let reports: ReportParametersModel[] = [];
-                res.forEach((report: ReportParametersModel) => {
-                    let reportModel = new ReportParametersModel(report);
-                    if (this.isReportValid(appId, report)) {
-                        reports.push(reportModel);
-                    }
-                });
-                return reports;
-            }).catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().activiti.reportApi.getReportList())
+            .pipe(
+                map((res: any) => {
+                    let reports: ReportParametersModel[] = [];
+                    res.forEach((report: ReportParametersModel) => {
+                        let reportModel = new ReportParametersModel(report);
+                        if (this.isReportValid(appId, report)) {
+                            reports.push(reportModel);
+                        }
+                    });
+                    return reports;
+                }),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
-     * Retrive Report by name
+     * Retrieve Report by name
      * @param reportName - string - The name of report
      */
     getReportByName(reportName: string): Observable<any> {
-        return Observable.fromPromise(this.apiService.getInstance().activiti.reportApi.getReportList())
-            .map((response: any) => {
-                return response.find(report => report.name === reportName);
-            }).catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().activiti.reportApi.getReportList())
+            .pipe(
+                map((response: any) => {
+                    return response.find(report => report.name === reportName);
+                }),
+                catchError(err => this.handleError(err))
+            );
     }
 
     private isReportValid(appId: number, report: ReportParametersModel) {
@@ -75,10 +80,13 @@ export class AnalyticsService {
     }
 
     getReportParams(reportId: string): Observable<any> {
-        return Observable.fromPromise(this.apiService.getInstance().activiti.reportApi.getReportParams(reportId))
-            .map((res: any) => {
-                return new ReportParametersModel(res);
-            }).catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().activiti.reportApi.getReportParams(reportId))
+            .pipe(
+                map((res: any) => {
+                    return new ReportParametersModel(res);
+                }),
+                catchError(err => this.handleError(err))
+            );
     }
 
     getParamValuesByType(type: string, appId: number, reportId?: string, processDefinitionId?: string) {
@@ -144,101 +152,125 @@ export class AnalyticsService {
     }
 
     getProcessDefinitionsValuesNoApp(): Observable<any> {
-        return Observable.fromPromise(this.apiService.getInstance().activiti.reportApi.getProcessDefinitions())
-            .map((res: any) => {
-                let paramOptions: ParameterValueModel[] = [];
-                res.forEach((opt) => {
-                    paramOptions.push(new ParameterValueModel(opt));
-                });
-                return paramOptions;
-            }).catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().activiti.reportApi.getProcessDefinitions())
+            .pipe(
+                map((res: any) => {
+                    let paramOptions: ParameterValueModel[] = [];
+                    res.forEach((opt) => {
+                        paramOptions.push(new ParameterValueModel(opt));
+                    });
+                    return paramOptions;
+                }),
+                catchError(err => this.handleError(err))
+            );
     }
 
     getProcessDefinitionsValues(appId: number): Observable<any> {
         let options = { 'appDefinitionId': appId };
-        return Observable.fromPromise(this.apiService.getInstance().activiti.processDefinitionsApi.getProcessDefinitions(options))
-            .map((res: any) => {
-                let paramOptions: ParameterValueModel[] = [];
-                res.data.forEach((opt) => {
-                    paramOptions.push(new ParameterValueModel(opt));
-                });
-                return paramOptions;
-            }).catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().activiti.processDefinitionsApi.getProcessDefinitions(options))
+            .pipe(
+                map((res: any) => {
+                    let paramOptions: ParameterValueModel[] = [];
+                    res.data.forEach((opt) => {
+                        paramOptions.push(new ParameterValueModel(opt));
+                    });
+                    return paramOptions;
+                }),
+                catchError(err => this.handleError(err))
+            );
     }
 
     getTasksByProcessDefinitionId(reportId: string, processDefinitionId: string): Observable<any> {
-        return Observable.fromPromise(this.apiService.getInstance().activiti.reportApi.getTasksByProcessDefinitionId(reportId, processDefinitionId))
-            .map((res: any) => {
-                let paramOptions: ParameterValueModel[] = [];
-                res.forEach((opt) => {
-                    paramOptions.push(new ParameterValueModel({ id: opt, name: opt }));
-                });
-                return paramOptions;
-            }).catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().activiti.reportApi.getTasksByProcessDefinitionId(reportId, processDefinitionId))
+            .pipe(
+                map((res: any) => {
+                    let paramOptions: ParameterValueModel[] = [];
+                    res.forEach((opt) => {
+                        paramOptions.push(new ParameterValueModel({ id: opt, name: opt }));
+                    });
+                    return paramOptions;
+                }),
+                catchError(err => this.handleError(err))
+            );
     }
 
     getReportsByParams(reportId: number, paramsQuery: any): Observable<any> {
-        return Observable.fromPromise(this.apiService.getInstance().activiti.reportApi.getReportsByParams(reportId, paramsQuery))
-            .map((res: any) => {
-                let elements: Chart[] = [];
-                res.elements.forEach((chartData) => {
-                    if (chartData.type === 'pieChart') {
-                        elements.push(new PieChart(chartData));
-                    } else if (chartData.type === 'table') {
-                        elements.push(new TableChart(chartData));
-                    } else if (chartData.type === 'processDefinitionHeatMap') {
-                        elements.push(new HeatMapChart(chartData));
-                    } else if (chartData.type === 'masterDetailTable') {
-                        elements.push(new DetailsTableChart(chartData));
-                    } else if (chartData.type === 'barChart') {
-                        elements.push(new BarChart(chartData));
-                    } else if (chartData.type === 'multiBarChart') {
-                        elements.push(new MultiBarChart(chartData));
-                    }
-                });
+        return from(this.apiService.getInstance().activiti.reportApi.getReportsByParams(reportId, paramsQuery))
+            .pipe(
+                map((res: any) => {
+                    let elements: Chart[] = [];
+                    res.elements.forEach((chartData) => {
+                        if (chartData.type === 'pieChart') {
+                            elements.push(new PieChart(chartData));
+                        } else if (chartData.type === 'table') {
+                            elements.push(new TableChart(chartData));
+                        } else if (chartData.type === 'processDefinitionHeatMap') {
+                            elements.push(new HeatMapChart(chartData));
+                        } else if (chartData.type === 'masterDetailTable') {
+                            elements.push(new DetailsTableChart(chartData));
+                        } else if (chartData.type === 'barChart') {
+                            elements.push(new BarChart(chartData));
+                        } else if (chartData.type === 'multiBarChart') {
+                            elements.push(new MultiBarChart(chartData));
+                        }
+                    });
 
-                return elements;
-            }).catch(err => this.handleError(err));
+                    return elements;
+                }),
+                catchError(err => this.handleError(err))
+            );
     }
 
     createDefaultReports(): Observable<any> {
-        return Observable.fromPromise(this.apiService.getInstance().activiti.reportApi.createDefaultReports())
-            .map(this.toJson)
-            .catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().activiti.reportApi.createDefaultReports())
+            .pipe(
+                map(this.toJson),
+                catchError(err => this.handleError(err))
+            );
     }
 
     updateReport(reportId: number, name: string): Observable<any> {
-        return Observable.fromPromise(this.apiService.getInstance().activiti.reportApi.updateReport(reportId, name))
-            .map((res: any) => {
-                this.logService.info('upload');
-            }).catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().activiti.reportApi.updateReport(reportId, name))
+            .pipe(
+                map(() => this.logService.info('upload')),
+                catchError(err => this.handleError(err))
+            );
     }
 
     exportReportToCsv(reportId: string, paramsQuery: any): Observable<any> {
-        return Observable.fromPromise(this.apiService.getInstance().activiti.reportApi.exportToCsv(reportId, paramsQuery))
-            .map((res: any) => {
-                this.logService.info('export');
-                return res;
-            }).catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().activiti.reportApi.exportToCsv(reportId, paramsQuery))
+            .pipe(
+                map((res: any) => {
+                    this.logService.info('export');
+                    return res;
+                }),
+                catchError(err => this.handleError(err))
+            );
     }
 
     saveReport(reportId: string, paramsQuery: any): Observable<any> {
-        return Observable.fromPromise(this.apiService.getInstance().activiti.reportApi.saveReport(reportId, paramsQuery))
-            .map(() => {
-                this.logService.info('save');
-            }).catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().activiti.reportApi.saveReport(reportId, paramsQuery))
+            .pipe(
+                map(() => {
+                    this.logService.info('save');
+                }),
+                catchError(err => this.handleError(err))
+            );
     }
 
     deleteReport(reportId: string): Observable<any> {
-        return Observable.fromPromise(this.apiService.getInstance().activiti.reportApi.deleteReport(reportId))
-            .map(() => {
-                this.logService.info('delete');
-            }).catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().activiti.reportApi.deleteReport(reportId))
+            .pipe(
+                map(() => {
+                    this.logService.info('delete');
+                }),
+                catchError(err => this.handleError(err))
+            );
     }
 
     private handleError(error: Response) {
         this.logService.error(error);
-        return Observable.throw(error || 'Server error');
+        return throwError(error || 'Server error');
     }
 
     toJson(res: any) {
diff --git a/lib/insights/diagram/components/tooltip/diagram-tooltip.component.html b/lib/insights/diagram/components/tooltip/diagram-tooltip.component.html
index 39f606a33b..3e91ad3f70 100644
--- a/lib/insights/diagram/components/tooltip/diagram-tooltip.component.html
+++ b/lib/insights/diagram/components/tooltip/diagram-tooltip.component.html
@@ -1,6 +1,10 @@
 <div #tooltipContent class="{{adf}}-diagram-tooltip">
     <div class="{{adf}}-diagram-tooltip-header">{{ data.type }} {{ data.name || data.id }}</div>
     <div class="{{adf}}-diagram-tooltip-body">
+        <div *ngIf="data.value" class="{{adf}}-diagram-heat-value">
+            <span class="{{adf}}-diagram-value">{{ data.value }}</span>
+            <span class="{{adf}}-diagram-valuetype"> {{ data.dataType }}</span>
+        </div>
         <div *ngIf="data.name" class="{{adf}}-diagram-name-property">
             <span class="{{adf}}-diagram-propertyName">Name:</span>
             <span class="{{adf}}-diagram-propertyValue">{{ data.name }}</span>
diff --git a/lib/insights/diagram/components/tooltip/diagram-tooltip.component.spec.ts b/lib/insights/diagram/components/tooltip/diagram-tooltip.component.spec.ts
index 110bffd2ae..0fdbaf7c70 100644
--- a/lib/insights/diagram/components/tooltip/diagram-tooltip.component.spec.ts
+++ b/lib/insights/diagram/components/tooltip/diagram-tooltip.component.spec.ts
@@ -41,7 +41,7 @@ describe('DiagramTooltipComponent', () => {
 
         beforeEach(async(() => {
             TestBed.configureTestingModule({
-                declarations: [ DiagramTooltipComponent ]
+                declarations: [DiagramTooltipComponent]
             }).compileComponents();
         }));
 
@@ -77,7 +77,7 @@ describe('DiagramTooltipComponent', () => {
             let nameProperty = fixture.debugElement.query(By.css('.adf-diagram-name-property'));
 
             expect(nameProperty).not.toBeNull();
-            expect(nameProperty.nativeElement.innerText).toBe('Name: diagram-element-name');
+            expect(nameProperty.nativeElement.innerText).toBe('Name:diagram-element-name');
         });
 
         it('should NOT render the name if name is NOT defined in the tooltip body', () => {
@@ -91,8 +91,8 @@ describe('DiagramTooltipComponent', () => {
 
         it('should render the properties, if there is any', () => {
             data.properties = [
-                { name: 'property-1-name', value: 'property-1-value' },
-                { name: 'property-2-name', value: 'property-2-value' }
+                {name: 'property-1-name', value: 'property-1-value'},
+                {name: 'property-2-name', value: 'property-2-value'}
             ];
             fixture.detectChanges();
 
@@ -106,6 +106,21 @@ describe('DiagramTooltipComponent', () => {
             expect(propertyValues[0].nativeElement.innerText).toBe('property-1-value');
             expect(propertyValues[1].nativeElement.innerText).toBe('property-2-value');
         });
+
+        it('should render value and data type', () => {
+            data.value = '1';
+            data.dataType = 'hour';
+
+            fixture.detectChanges();
+
+            let propertyValue = fixture.debugElement.queryAll(By.css('.adf-diagram-heat-value > .adf-diagram-value')),
+                propertyValueType = fixture.debugElement.queryAll(By.css('.adf-diagram-heat-value > .adf-diagram-valuetype'));
+
+            expect(propertyValue.length).toBe(1);
+            expect(propertyValueType.length).toBe(1);
+            expect(propertyValue[0].nativeElement.innerText).toBe('1');
+            expect(propertyValueType[0].nativeElement.innerText).toBe(' hour');
+        });
     });
 
     describe('Tooltip functionality', () => {
@@ -114,12 +129,12 @@ describe('DiagramTooltipComponent', () => {
 
         beforeEach(async(() => {
             TestBed.configureTestingModule({
-                declarations: [ DiagramTooltipComponent, TestHostComponent ]
+                declarations: [DiagramTooltipComponent, TestHostComponent]
             }).compileComponents();
         }));
 
         beforeEach(() => {
-            fixture  = TestBed.createComponent(TestHostComponent);
+            fixture = TestBed.createComponent(TestHostComponent);
 
             fixture.detectChanges();
         });
diff --git a/lib/insights/diagram/diagram.module.ts b/lib/insights/diagram/diagram.module.ts
index e34b1be646..542654ed47 100644
--- a/lib/insights/diagram/diagram.module.ts
+++ b/lib/insights/diagram/diagram.module.ts
@@ -17,7 +17,6 @@
 
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
 
 import { DiagramEndEventComponent } from './components/events/diagram-end-event.component';
 import { DiagramEventComponent } from './components/events/diagram-event.component';
@@ -83,11 +82,6 @@ import { DiagramLanesComponent } from './components/swimlanes/diagram-lanes.comp
 
 import { DiagramTooltipComponent } from './components/tooltip/diagram-tooltip.component';
 
-import { DiagramColorService } from './services/diagram-color.service';
-import { DiagramsService } from './services/diagrams.service';
-
-import { RaphaelService } from './components/raphael/raphael.service';
-
 import { RaphaelCircleDirective } from './components/raphael/raphael-circle.component';
 import { RaphaelCrossDirective } from './components/raphael/raphael-cross.component';
 import { RaphaelFlowArrowDirective } from './components/raphael/raphael-flow-arrow.component';
@@ -115,11 +109,12 @@ import { RaphaelIconServiceDirective } from './components/raphael/icons/raphael-
 import { RaphaelIconSignalDirective } from './components/raphael/icons/raphael-icon-signal.component';
 import { RaphaelIconTimerDirective } from './components/raphael/icons/raphael-icon-timer.component';
 import { RaphaelIconUserDirective } from './components/raphael/icons/raphael-icon-user.component';
+import { CoreModule } from '@alfresco/adf-core';
 
 @NgModule({
     imports: [
         CommonModule,
-        TranslateModule
+        CoreModule.forChild()
     ],
     declarations: [
         DiagramComponent,
@@ -202,11 +197,6 @@ import { RaphaelIconUserDirective } from './components/raphael/icons/raphael-ico
         RaphaelIconSignalDirective,
         RaphaelIconMessageDirective
     ],
-    providers: [
-        DiagramsService,
-        DiagramColorService,
-        RaphaelService
-    ],
     exports: [
         DiagramComponent,
         DiagramEventComponent,
diff --git a/lib/insights/diagram/services/diagrams.service.ts b/lib/insights/diagram/services/diagrams.service.ts
index 6d081bbebf..e04f51dab6 100644
--- a/lib/insights/diagram/services/diagrams.service.ts
+++ b/lib/insights/diagram/services/diagrams.service.ts
@@ -17,8 +17,8 @@
 
 import { AlfrescoApiService, LogService } from '@alfresco/adf-core';
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
-import 'rxjs/add/observable/throw';
+import { Observable, from, throwError } from 'rxjs';
+import { catchError } from 'rxjs/operators';
 
 @Injectable()
 export class DiagramsService {
@@ -28,17 +28,21 @@ export class DiagramsService {
     }
 
     getProcessDefinitionModel(processDefinitionId: string): Observable<any> {
-        return Observable.fromPromise(this.apiService.getInstance().
-        activiti.modelJsonBpmnApi.getModelJSON(processDefinitionId)).catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().activiti.modelJsonBpmnApi.getModelJSON(processDefinitionId))
+            .pipe(
+                catchError(err => this.handleError(err))
+            );
     }
 
     getRunningProcessDefinitionModel(processInstanceId: string): Observable<any> {
-        return Observable.fromPromise(this.apiService.getInstance().
-        activiti.modelJsonBpmnApi.getModelJSONForProcessDefinition(processInstanceId)).catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().activiti.modelJsonBpmnApi.getModelJSONForProcessDefinition(processInstanceId))
+            .pipe(
+                catchError(err => this.handleError(err))
+            );
     }
 
     private handleError(error: any) {
         this.logService.error(error);
-        return Observable.throw(error || 'Server error');
+        return throwError(error || 'Server error');
     }
 }
diff --git a/lib/insights/insights.module.ts b/lib/insights/insights.module.ts
index 41db783dd1..43fd686823 100644
--- a/lib/insights/insights.module.ts
+++ b/lib/insights/insights.module.ts
@@ -16,7 +16,7 @@
  */
 
 import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
+import { NgModule, ModuleWithProviders } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { CoreModule, TRANSLATION_PROVIDER } from '@alfresco/adf-core';
 
@@ -24,10 +24,23 @@ import { DiagramsModule } from './diagram/diagram.module';
 import { AnalyticsProcessModule } from './analytics-process/analytics-process.module';
 
 import { MaterialModule } from './material.module';
+import { DiagramsService } from './diagram/services/diagrams.service';
+import { DiagramColorService } from './diagram/services/diagram-color.service';
+import { RaphaelService } from './diagram/components/raphael/raphael.service';
+import { AnalyticsService } from './analytics-process/services/analytics.service';
+
+export function providers() {
+    return [
+        AnalyticsService,
+        DiagramsService,
+        DiagramColorService,
+        RaphaelService
+    ];
+}
 
 @NgModule({
     imports: [
-        CoreModule,
+        CoreModule.forChild(),
         CommonModule,
         FormsModule,
         ReactiveFormsModule,
@@ -36,6 +49,7 @@ import { MaterialModule } from './material.module';
         AnalyticsProcessModule
     ],
     providers: [
+        ...providers(),
         {
             provide: TRANSLATION_PROVIDER,
             multi: true,
@@ -46,7 +60,6 @@ import { MaterialModule } from './material.module';
         }
     ],
     exports: [
-        CoreModule,
         CommonModule,
         FormsModule,
         ReactiveFormsModule,
@@ -56,4 +69,47 @@ import { MaterialModule } from './material.module';
     ]
 })
 export class InsightsModule {
+    static forRoot(): ModuleWithProviders {
+        return {
+            ngModule: InsightsModule,
+            providers: [
+                ...providers(),
+                {
+                    provide: TRANSLATION_PROVIDER,
+                    multi: true,
+                    useValue: {
+                        name: 'adf-insights',
+                        source: 'assets/adf-insights'
+                    }
+                }
+            ]
+        };
+    }
+
+    static forChild(): ModuleWithProviders {
+        return {
+            ngModule: InsightsModuleLazy
+        };
+    }
 }
+
+@NgModule({
+    imports: [
+        CoreModule.forChild(),
+        CommonModule,
+        FormsModule,
+        ReactiveFormsModule,
+        MaterialModule,
+        DiagramsModule,
+        AnalyticsProcessModule
+    ],
+    exports: [
+        CommonModule,
+        FormsModule,
+        ReactiveFormsModule,
+        MaterialModule,
+        DiagramsModule,
+        AnalyticsProcessModule
+    ]
+})
+export class InsightsModuleLazy {}
diff --git a/lib/insights/karma-test-shim.js b/lib/insights/karma-test-shim.js
deleted file mode 100644
index 2da62e2cc0..0000000000
--- a/lib/insights/karma-test-shim.js
+++ /dev/null
@@ -1,25 +0,0 @@
-Error.stackTraceLimit = Infinity;
-
-require('core-js/es6');
-require('core-js/es7/reflect');
-
-require('zone.js/dist/zone');
-require('zone.js/dist/long-stack-trace-zone');
-require('zone.js/dist/proxy');
-require('zone.js/dist/sync-test');
-require('zone.js/dist/jasmine-patch');
-require('zone.js/dist/async-test');
-require('zone.js/dist/fake-async-test');
-
-jasmine.DEFAULT_TIMEOUT_INTERVAL = 20000;
-
-var appContext = require.context(".", true, /.spec.ts/);
-appContext.keys().forEach(appContext);
-
-const TestBed = require('@angular/core/testing').TestBed;
-const browser = require('@angular/platform-browser-dynamic/testing');
-
-TestBed.initTestEnvironment(
-    browser.BrowserDynamicTestingModule,
-    browser.platformBrowserDynamicTesting()
-);
diff --git a/lib/insights/karma.conf.js b/lib/insights/karma.conf.js
new file mode 100644
index 0000000000..4c6bbefce2
--- /dev/null
+++ b/lib/insights/karma.conf.js
@@ -0,0 +1,101 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/config/configuration-file.html
+
+module.exports = function (config) {
+    config.set({
+        basePath: '',
+
+        files: [
+            {pattern: '../../node_modules/core-js/client/core.js', included: true, watched: false},
+            {pattern: '../../node_modules/tslib/tslib.js', included: true, watched: false},
+            {pattern: '../../node_modules/hammerjs/hammer.min.js', included: true, watched: false},
+            {pattern: '../../node_modules/hammerjs/hammer.min.js.map', included: false, watched: false},
+
+            // pdf-js
+            {pattern: '../../node_modules/pdfjs-dist/build/pdf.js', included: true, watched: false},
+            {pattern: '../../node_modules/pdfjs-dist/build/pdf.worker.js', included: true, watched: false},
+            {pattern: '../../node_modules/pdfjs-dist/web/pdf_viewer.js', included: true, watched: false},
+
+            {
+                pattern: '../../node_modules/@angular/material/prebuilt-themes/indigo-pink.css',
+                included: true,
+                watched: false
+            },
+
+            {pattern: '../../node_modules/chart.js/dist/Chart.js', included: true, watched: false},
+            {pattern: '../../node_modules/raphael/raphael.min.js', included: true, watched: false},
+            {
+                pattern: './node_modules/ng2-charts/bundles/ng2-charts.umd.js',
+                included: false,
+                served: true,
+                watched: false
+            },
+
+            {pattern: '../../node_modules/alfresco-js-api/dist/alfresco-js-api.min.js', included: true, watched: false},
+            {pattern: '../../node_modules/moment/min/moment.min.js', included: true, watched: false},
+
+            {pattern: './i18n/**/en.json', included: false, served: true, watched: false},
+
+            {pattern: './**/*.ts', included: false, served: true, watched: false},
+
+            {pattern: './app.config.json', included: false, served: true, watched: false},
+        ],
+
+        frameworks: ['jasmine-ajax', 'jasmine', '@angular-devkit/build-angular'],
+
+        proxies: {
+            '/base/assets/' :'/base/assets/',
+            '/assets/adf-insights/i18n/en.json': '/base/i18n/en.json',
+            '/app.config.json': '/base/app.config.json'
+        },
+
+        plugins: [
+            require('karma-jasmine-ajax'),
+            require('karma-jasmine'),
+            require('karma-chrome-launcher'),
+            require('karma-jasmine-html-reporter'),
+            require('karma-coverage-istanbul-reporter'),
+            require('@angular-devkit/build-angular/plugins/karma'),
+            require('karma-mocha-reporter')
+        ],
+        client: {
+            clearContext: false // leave Jasmine Spec Runner output visible in browser
+        },
+        coverageIstanbulReporter: {
+            dir: './lib/coverage/insights/',
+            reports: ['html', 'lcovonly'],
+            fixWebpackSourcePaths: true
+        },
+
+        // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+        logLevel: config.LOG_DEBUG,
+
+        colors: true,
+
+        autoWatch: false,
+
+        browserDisconnectTimeout: 200000,
+        browserNoActivityTimeout: 2400000,
+        captureTimeout: 1200000,
+
+        customLaunchers: {
+            ChromeHeadless: {
+                base: 'Chrome',
+                flags: [
+                    '--no-sandbox',
+                    '--headless',
+                    '--disable-gpu',
+                    '--remote-debugging-port=9222'
+                ]
+            }
+        },
+
+        reporters: ['mocha', 'kjhtml'],
+        port: 9876,
+        colors: true,
+        logLevel: config.LOG_INFO,
+        autoWatch: true,
+        browsers: ['Chrome'],
+        singleRun: false
+    });
+};
diff --git a/lib/insights/material.module.ts b/lib/insights/material.module.ts
index 966f50cf82..95bfbdd2e4 100644
--- a/lib/insights/material.module.ts
+++ b/lib/insights/material.module.ts
@@ -17,11 +17,12 @@
 
 import { NgModule } from '@angular/core';
 import {
-    MAT_PLACEHOLDER_GLOBAL_OPTIONS, MatAutocompleteModule, MatButtonModule, MatCardModule, MatCheckboxModule,
+    MatAutocompleteModule, MatButtonModule, MatCardModule, MatCheckboxModule,
     MatChipsModule, MatDatepickerModule, MatDialogModule, MatGridListModule, MatIconModule,
     MatInputModule, MatListModule, MatNativeDateModule, MatOptionModule, MatProgressSpinnerModule, MatRadioModule,
     MatRippleModule, MatSelectModule, MatSlideToggleModule, MatTableModule, MatTabsModule,
-    MatTooltipModule, MatMenuModule
+    MatTooltipModule, MatMenuModule,
+    MAT_LABEL_GLOBAL_OPTIONS
 } from '@angular/material';
 
 export function modules() {
@@ -35,10 +36,10 @@ export function modules() {
 }
 
 @NgModule({
-    providers: [
-        {provide: MAT_PLACEHOLDER_GLOBAL_OPTIONS, useValue: { float: 'never' }}
-    ],
     imports: modules(),
-    exports: modules()
+    exports: modules(),
+    providers: [
+        { provide: MAT_LABEL_GLOBAL_OPTIONS, useValue: { float: 'never' }}
+    ]
 })
 export class MaterialModule {}
diff --git a/lib/insights/ng-package.json b/lib/insights/ng-package.json
index 3062489c3e..2fc92629aa 100644
--- a/lib/insights/ng-package.json
+++ b/lib/insights/ng-package.json
@@ -1,12 +1,10 @@
 {
   "$schema": "./node_modules/ng-packagr/ng-package.schema.json",
-  "whitelistedNonPeerDependencies": [ "." ],
   "workingDirectory" : "./ng_work",
   "src": "../insights/",
   "dest": "../dist/insights/",
   "lib": {
     "languageLevel": [ "dom", "es2016" ],
-    "licensePath": "../config/assets/license_header_add.txt",
     "comments" : "none",
     "entryFile": "./public-api.ts",
     "flatModuleFile": "adf-insights",
diff --git a/lib/insights/package.json b/lib/insights/package.json
index ec5ab8413b..ddeb41d816 100644
--- a/lib/insights/package.json
+++ b/lib/insights/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@alfresco/adf-insights",
   "description": "Alfresco ADF insights",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "author": "Alfresco Software, Ltd.",
   "main": "bundles/adf-insights.js",
   "repository": {
@@ -11,37 +11,33 @@
   "bugs": {
     "url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
   },
-  "dependencies": {
-    "@angular/animations": "5.1.1",
-    "@angular/cdk": "5.0.1",
-    "@angular/common": "5.1.1",
-    "@angular/compiler": "5.1.1",
-    "@angular/core": "5.1.1",
-    "@angular/flex-layout": "2.0.0-beta.12",
-    "@angular/forms": "5.1.1",
-    "@angular/http": "5.1.1",
-    "@angular/material": "5.0.1",
-    "@angular/material-moment-adapter": "5.0.1",
-    "@angular/platform-browser": "5.1.1",
-    "@angular/platform-browser-dynamic": "5.1.1",
-    "@angular/router": "5.1.1",
-    "@ngx-translate/core": "9.1.1",
-    "alfresco-js-api": "2.4.0",
-    "@alfresco/adf-core": "2.4.0",
+  "peerDependencies": {
+    "@angular/animations": ">=5.1.1",
+    "@angular/cdk": ">=5.1.1",
+    "@angular/common": ">=5.1.1",
+    "@angular/compiler": ">=5.1.1",
+    "@angular/core": ">=5.1.1",
+    "@angular/flex-layout": ">=5.1.1",
+    "@angular/forms": ">=5.1.1",
+    "@angular/http": ">=5.1.1",
+    "@angular/material": ">=5.1.1",
+    "@angular/material-moment-adapter": ">=5.1.1",
+    "@angular/platform-browser": ">=5.1.1",
+    "@angular/platform-browser-dynamic": ">=5.1.1",
+    "@angular/router": ">=5.1.1",
+    "alfresco-js-api": "2.5.0",
+    "rxjs": ">=6.2.2",
+    "@alfresco/adf-core": "2.5.0",
+    "@alfresco/adf-content-services": "2.5.0",
+    "@ngx-translate/core": "^10.0.2",
     "chart.js": "2.5.0",
     "core-js": "2.4.1",
     "hammerjs": "2.0.8",
-    "minimatch": "3.0.4",
-    "moment": "2.20.1",
+    "moment": "^2.22.2",
     "ng2-charts": "1.6.0",
-    "pdfjs-dist": "1.5.404",
     "raphael": "2.2.7",
     "reflect-metadata": "0.1.10",
-    "rxjs": "5.5.2",
-    "systemjs": "0.19.27",
-    "zone.js": "0.8.14"
-  },
-  "devDependencies": {
+    "zone.js": "^0.8.26"
   },
   "keywords": [
     "analytics",
diff --git a/lib/insights/test.ts b/lib/insights/test.ts
new file mode 100644
index 0000000000..f3a01bd2ef
--- /dev/null
+++ b/lib/insights/test.ts
@@ -0,0 +1,41 @@
+/*!
+ * @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 'core-js/es7/reflect';
+import 'zone.js/dist/zone';
+import 'zone.js/dist/zone-testing';
+import { getTestBed } from '@angular/core/testing';
+import {
+    BrowserDynamicTestingModule,
+    platformBrowserDynamicTesting
+} from '@angular/platform-browser-dynamic/testing';
+import pdfjsLib = require('pdfjs-dist');
+
+declare const require: any;
+
+// First, initialize the Angular testing environment.
+getTestBed().initTestEnvironment(
+    BrowserDynamicTestingModule,
+    platformBrowserDynamicTesting()
+);
+
+pdfjsLib.PDFJS.workerSrc = 'node_modules/pdfjs-dist/build/pdf.worker.js';
+
+// Then we find all the tests.
+const context = require.context('./', true, /\.spec\.ts$/);
+// And load the modules.
+context.keys().map(context);
diff --git a/lib/insights/testing/insights.testing.module.ts b/lib/insights/testing/insights.testing.module.ts
index c276bebd08..1e43bef9c9 100644
--- a/lib/insights/testing/insights.testing.module.ts
+++ b/lib/insights/testing/insights.testing.module.ts
@@ -24,11 +24,16 @@ import {
     AppConfigService,
     AppConfigServiceMock,
     TranslationService,
-    TranslationMock
+    TranslationMock,
+    CoreModule
 } from '@alfresco/adf-core';
 
 @NgModule({
-    imports: [NoopAnimationsModule, InsightsModule],
+    imports: [
+        NoopAnimationsModule,
+        CoreModule.forRoot(),
+        InsightsModule.forRoot()
+    ],
     providers: [
         { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock },
         { provide: AppConfigService, useClass: AppConfigServiceMock },
diff --git a/lib/karma.conf.js b/lib/karma.conf.js
deleted file mode 100644
index 28ded64e4a..0000000000
--- a/lib/karma.conf.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('./config/karma.conf-all.js');
diff --git a/lib/process-services/app-list/apps-list.component.spec.ts b/lib/process-services/app-list/apps-list.component.spec.ts
index dc3fd2e392..57c1ca7255 100644
--- a/lib/process-services/app-list/apps-list.component.spec.ts
+++ b/lib/process-services/app-list/apps-list.component.spec.ts
@@ -19,7 +19,7 @@ import { DebugElement, Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { AppsProcessService, setupTestBed } from '@alfresco/adf-core';
-import { Observable } from 'rxjs/Observable';
+import { of, throwError } from 'rxjs';
 
 import { defaultApp, deployedApps, nonDeployedApps } from '../mock/apps-list.mock';
 import { AppsListComponent } from './apps-list.component';
@@ -43,7 +43,7 @@ describe('AppsListComponent', () => {
         debugElement = fixture.debugElement;
 
         service = TestBed.get(AppsProcessService);
-        getAppsSpy = spyOn(service, 'getDeployedApplications').and.returnValue(Observable.of(deployedApps));
+        getAppsSpy = spyOn(service, 'getDeployedApplications').and.returnValue(of(deployedApps));
     });
 
     it('should define layoutType with the default value', () => {
@@ -125,7 +125,7 @@ describe('AppsListComponent', () => {
 
     it('should emit an error when an error occurs loading apps', () => {
         let emitSpy = spyOn(component.error, 'emit');
-        getAppsSpy.and.returnValue(Observable.throw({}));
+        getAppsSpy.and.returnValue(throwError({}));
         fixture.detectChanges();
         expect(emitSpy).toHaveBeenCalled();
     });
@@ -185,19 +185,19 @@ describe('AppsListComponent', () => {
     describe('display apps', () => {
 
         it('should display all deployed apps', () => {
-            getAppsSpy.and.returnValue(Observable.of(deployedApps));
+            getAppsSpy.and.returnValue(of(deployedApps));
             fixture.detectChanges();
             expect(debugElement.queryAll(By.css('h1')).length).toBe(6);
         });
 
         it('should not display undeployed apps', () => {
-            getAppsSpy.and.returnValue(Observable.of(nonDeployedApps));
+            getAppsSpy.and.returnValue(of(nonDeployedApps));
             fixture.detectChanges();
             expect(debugElement.queryAll(By.css('h1')).length).toBe(0);
         });
 
         it('should display default app', () => {
-            getAppsSpy.and.returnValue(Observable.of(defaultApp));
+            getAppsSpy.and.returnValue(of(defaultApp));
             fixture.detectChanges();
             expect(debugElement.queryAll(By.css('h1')).length).toBe(1);
         });
@@ -207,7 +207,7 @@ describe('AppsListComponent', () => {
     describe('select apps', () => {
 
         beforeEach(() => {
-            getAppsSpy.and.returnValue(Observable.of(deployedApps));
+            getAppsSpy.and.returnValue(of(deployedApps));
             fixture.detectChanges();
         });
 
diff --git a/lib/process-services/app-list/apps-list.component.ts b/lib/process-services/app-list/apps-list.component.ts
index 339efa7adb..90c98b07ac 100644
--- a/lib/process-services/app-list/apps-list.component.ts
+++ b/lib/process-services/app-list/apps-list.component.ts
@@ -17,10 +17,10 @@
 
 import { AppsProcessService, TranslationService, EmptyCustomContentDirective } from '@alfresco/adf-core';
 import { AfterContentInit, Component, EventEmitter, Input, OnInit, Output, ContentChild } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
-import { Observer } from 'rxjs/Observer';
+import { Observable, Observer, of } from 'rxjs';
 import { AppDefinitionRepresentationModel } from '../task-list';
 import { IconModel } from './icon.model';
+import { share } from 'rxjs/operators';
 
 @Component({
     selector: 'adf-apps',
@@ -74,7 +74,8 @@ export class AppsListComponent implements OnInit, AfterContentInit {
     constructor(
         private appsProcessService: AppsProcessService,
         private translationService: TranslationService) {
-            this.apps$ = new Observable<AppDefinitionRepresentationModel>(observer => this.appsObserver = observer).share();
+            this.apps$ = new Observable<AppDefinitionRepresentationModel>(observer => this.appsObserver = observer)
+                .pipe(share());
     }
 
     ngOnInit() {
@@ -125,7 +126,7 @@ export class AppsListComponent implements OnInit, AfterContentInit {
     getAppName(app) {
         return this.isDefaultApp(app)
             ? this.translationService.get(AppsListComponent.DEFAULT_TASKS_APP_NAME)
-            : Observable.of(app.name);
+            : of(app.name);
     }
 
     /**
diff --git a/lib/process-services/app-list/apps-list.module.ts b/lib/process-services/app-list/apps-list.module.ts
index 304455c87c..f7e38b9b52 100644
--- a/lib/process-services/app-list/apps-list.module.ts
+++ b/lib/process-services/app-list/apps-list.module.ts
@@ -19,7 +19,6 @@ import { CommonModule } from '@angular/common';
 import { FlexLayoutModule } from '@angular/flex-layout';
 import { NgModule } from '@angular/core';
 import { MaterialModule } from '../material.module';
-import { TranslateModule } from '@ngx-translate/core';
 import { CoreModule } from '@alfresco/adf-core';
 
 import { AppsListComponent } from './apps-list.component';
@@ -30,8 +29,7 @@ import { SelectAppsDialogComponent } from './select-apps-dialog-component';
         CommonModule,
         MaterialModule,
         FlexLayoutModule,
-        TranslateModule,
-        CoreModule
+        CoreModule.forChild()
     ],
     declarations: [
         AppsListComponent,
diff --git a/lib/process-services/app-list/select-apps-dialog-component.spec.ts b/lib/process-services/app-list/select-apps-dialog-component.spec.ts
index 0e5a6b946a..6b847a5ffa 100644
--- a/lib/process-services/app-list/select-apps-dialog-component.spec.ts
+++ b/lib/process-services/app-list/select-apps-dialog-component.spec.ts
@@ -23,7 +23,7 @@ import { MatDialog } from '@angular/material';
 import { OverlayContainer } from '@angular/cdk/overlay';
 import { AppsProcessService, setupTestBed } from '@alfresco/adf-core';
 import { deployedApps } from '../mock/apps-list.mock';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 
 import { SelectAppsDialogComponent } from './select-apps-dialog-component';
 import { ProcessTestingModule } from '../testing/process.testing.module';
@@ -90,7 +90,7 @@ describe('Select app dialog', () => {
         service = TestBed.get(AppsProcessService);
 
         spyOn(service, 'getDeployedApplications').and.returnValue(
-            Observable.of(deployedApps)
+            of(deployedApps)
         );
     });
 
diff --git a/lib/process-services/attachment/attachment.module.ts b/lib/process-services/attachment/attachment.module.ts
index 89f140640e..1fe6c5ddd0 100644
--- a/lib/process-services/attachment/attachment.module.ts
+++ b/lib/process-services/attachment/attachment.module.ts
@@ -26,7 +26,7 @@ import { CoreModule } from '@alfresco/adf-core';
 
 @NgModule({
     imports: [
-        CoreModule,
+        CoreModule.forChild(),
         MaterialModule
     ],
     declarations: [
diff --git a/lib/process-services/attachment/create-process-attachment.component.html b/lib/process-services/attachment/create-process-attachment.component.html
index 7014408d43..85872afbbb 100644
--- a/lib/process-services/attachment/create-process-attachment.component.html
+++ b/lib/process-services/attachment/create-process-attachment.component.html
@@ -5,8 +5,8 @@
     mat-raised-button
     mat-icon-button
     class="adf-create-attachment"
-    [adf-upload]="true"
-    mode="['click']"
+    adf-upload="true"
+    [mode]="['click']"
     [multiple]="true"
     (upload-files)="onFileUpload($event)">
     <mat-icon>add</mat-icon>
diff --git a/lib/process-services/attachment/create-task-attachment.component.html b/lib/process-services/attachment/create-task-attachment.component.html
index 757fa98e1a..c9d4d85dcd 100644
--- a/lib/process-services/attachment/create-task-attachment.component.html
+++ b/lib/process-services/attachment/create-task-attachment.component.html
@@ -4,8 +4,8 @@
     mat-raised-button
     mat-icon-button
     class="adf-create-attachment"
-    [adf-upload]="true"
-    mode="['click']"
+    adf-upload="true"
+    [mode]="['click']"
     [multiple]="true"
     (upload-files)="onFileUpload($event)">
     <mat-icon>add</mat-icon>
diff --git a/lib/process-services/attachment/create-task-attachment.component.spec.ts b/lib/process-services/attachment/create-task-attachment.component.spec.ts
index b47b9b03c8..504a82e55d 100644
--- a/lib/process-services/attachment/create-task-attachment.component.spec.ts
+++ b/lib/process-services/attachment/create-task-attachment.component.spec.ts
@@ -17,7 +17,7 @@
 
 import { SimpleChange } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 
 import { ProcessContentService, setupTestBed } from '@alfresco/adf-core';
 import { AttachmentComponent } from './create-task-attachment.component';
@@ -40,7 +40,7 @@ describe('AttachmentComponent', () => {
         component = fixture.componentInstance;
         service = fixture.debugElement.injector.get(ProcessContentService);
 
-        createTaskRelatedContentSpy = spyOn(service, 'createTaskRelatedContent').and.returnValue(Observable.of(
+        createTaskRelatedContentSpy = spyOn(service, 'createTaskRelatedContent').and.returnValue(of(
             {
                 status: true
             }));
diff --git a/lib/process-services/attachment/process-attachment-list.component.spec.ts b/lib/process-services/attachment/process-attachment-list.component.spec.ts
index b777d523e9..1715510ffb 100644
--- a/lib/process-services/attachment/process-attachment-list.component.spec.ts
+++ b/lib/process-services/attachment/process-attachment-list.component.spec.ts
@@ -19,7 +19,7 @@ import { SimpleChange, Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { ProcessContentService, setupTestBed } from '@alfresco/adf-core';
-import { Observable } from 'rxjs/Observable';
+import { of, throwError } from 'rxjs';
 import { ProcessAttachmentListComponent } from './process-attachment-list.component';
 import { ProcessTestingModule } from '../testing/process.testing.module';
 
@@ -87,13 +87,11 @@ describe('ProcessAttachmentListComponent', () => {
                 }]
         };
 
-        getProcessRelatedContentSpy = spyOn(service, 'getProcessRelatedContent').and.returnValue(Observable.of(mockAttachment));
-        spyOn(service, 'deleteRelatedContent').and.returnValue(Observable.of({successCode: true}));
+        getProcessRelatedContentSpy = spyOn(service, 'getProcessRelatedContent').and.returnValue(of(mockAttachment));
+        spyOn(service, 'deleteRelatedContent').and.returnValue(of({successCode: true}));
 
         let blobObj = new Blob();
-        spyOn(service, 'getFileRawContent').and.returnValue(Observable.of(
-            blobObj
-        ));
+        spyOn(service, 'getFileRawContent').and.returnValue(of(blobObj));
     });
 
     afterEach(() => {
@@ -113,7 +111,7 @@ describe('ProcessAttachmentListComponent', () => {
 
     it('should emit an error when an error occurs loading attachments', () => {
         let emitSpy = spyOn(component.error, 'emit');
-        getProcessRelatedContentSpy.and.returnValue(Observable.throw({}));
+        getProcessRelatedContentSpy.and.returnValue(throwError({}));
         let change = new SimpleChange(null, '123', true);
         component.ngOnChanges({ 'processInstanceId': change });
         expect(emitSpy).toHaveBeenCalled();
@@ -180,7 +178,7 @@ describe('ProcessAttachmentListComponent', () => {
     }));
 
     it('should show the empty list component when the attachments list is empty', async(() => {
-        getProcessRelatedContentSpy.and.returnValue(Observable.of({
+        getProcessRelatedContentSpy.and.returnValue(of({
             'size': 0,
             'total': 0,
             'start': 0,
@@ -195,7 +193,7 @@ describe('ProcessAttachmentListComponent', () => {
     }));
 
     it('should not show the empty list drag and drop component when is disabled', async(() => {
-        getProcessRelatedContentSpy.and.returnValue(Observable.of({
+        getProcessRelatedContentSpy.and.returnValue(of({
             'size': 0,
             'total': 0,
             'start': 0,
@@ -213,7 +211,7 @@ describe('ProcessAttachmentListComponent', () => {
     }));
 
     it('should show the empty list component when the attachments list is empty for completed process', async(() => {
-        getProcessRelatedContentSpy.and.returnValue(Observable.of({
+        getProcessRelatedContentSpy.and.returnValue(of({
             'size': 0,
             'total': 0,
             'start': 0,
@@ -231,7 +229,7 @@ describe('ProcessAttachmentListComponent', () => {
     }));
 
     it('should not show the empty list component when the attachments list is not empty for completed process', async(() => {
-        getProcessRelatedContentSpy.and.returnValue(Observable.of(mockAttachment));
+        getProcessRelatedContentSpy.and.returnValue(of(mockAttachment));
         let change = new SimpleChange(null, '123', true);
         component.ngOnChanges({'processInstanceId': change});
         component.disabled = true;
diff --git a/lib/process-services/attachment/task-attachment-list.component.spec.ts b/lib/process-services/attachment/task-attachment-list.component.spec.ts
index d337493775..6b61efb99f 100644
--- a/lib/process-services/attachment/task-attachment-list.component.spec.ts
+++ b/lib/process-services/attachment/task-attachment-list.component.spec.ts
@@ -18,7 +18,7 @@
 import { SimpleChange, Component, CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { Observable } from 'rxjs/Observable';
+import { of, throwError } from 'rxjs';
 import { TaskAttachmentListComponent } from './task-attachment-list.component';
 import { ProcessContentService, setupTestBed } from '@alfresco/adf-core';
 import { ProcessTestingModule } from '../testing/process.testing.module';
@@ -80,14 +80,14 @@ describe('TaskAttachmentList', () => {
             ]
         };
 
-        getTaskRelatedContentSpy = spyOn(service, 'getTaskRelatedContent').and.returnValue(Observable.of(
+        getTaskRelatedContentSpy = spyOn(service, 'getTaskRelatedContent').and.returnValue(of(
             mockAttachment
         ));
 
-        deleteContentSpy = spyOn(service, 'deleteRelatedContent').and.returnValue(Observable.of({ successCode: true }));
+        deleteContentSpy = spyOn(service, 'deleteRelatedContent').and.returnValue(of({ successCode: true }));
 
         let blobObj = new Blob();
-        getFileRawContentSpy = spyOn(service, 'getFileRawContent').and.returnValue(Observable.of(blobObj));
+        getFileRawContentSpy = spyOn(service, 'getFileRawContent').and.returnValue(of(blobObj));
     });
 
     afterEach(() => {
@@ -109,7 +109,7 @@ describe('TaskAttachmentList', () => {
 
     it('should emit an error when an error occurs loading attachments', () => {
         let emitSpy = spyOn(component.error, 'emit');
-        getTaskRelatedContentSpy.and.returnValue(Observable.throw({}));
+        getTaskRelatedContentSpy.and.returnValue(throwError({}));
         let change = new SimpleChange(null, '123', true);
         component.ngOnChanges({ 'taskId': change });
         expect(emitSpy).toHaveBeenCalled();
@@ -153,7 +153,7 @@ describe('TaskAttachmentList', () => {
     });
 
     it('should show the empty default message when has no custom template', async(() => {
-        getTaskRelatedContentSpy.and.returnValue(Observable.of({
+        getTaskRelatedContentSpy.and.returnValue(of({
             'size': 0,
             'total': 0,
             'start': 0,
@@ -206,7 +206,7 @@ describe('TaskAttachmentList', () => {
     }));
 
     it('should show the empty list component when the attachments list is empty', async(() => {
-        getTaskRelatedContentSpy.and.returnValue(Observable.of({
+        getTaskRelatedContentSpy.and.returnValue(of({
             'size': 0,
             'total': 0,
             'start': 0,
@@ -222,7 +222,7 @@ describe('TaskAttachmentList', () => {
     }));
 
     it('should show the empty list component when the attachments list is empty for completed task', async(() => {
-        getTaskRelatedContentSpy.and.returnValue(Observable.of({
+        getTaskRelatedContentSpy.and.returnValue(of({
             'size': 0,
             'total': 0,
             'start': 0,
@@ -239,7 +239,7 @@ describe('TaskAttachmentList', () => {
     }));
 
     it('should not show the empty list component when the attachments list is not empty for completed task', async(() => {
-        getTaskRelatedContentSpy.and.returnValue(Observable.of(mockAttachment));
+        getTaskRelatedContentSpy.and.returnValue(of(mockAttachment));
         let change = new SimpleChange(null, '123', true);
         component.ngOnChanges({ 'taskId': change });
         component.disabled = true;
diff --git a/lib/process-services/content-widget/attach-file-widget.component.ts b/lib/process-services/content-widget/attach-file-widget.component.ts
index 50b42776f2..1b0826dadf 100644
--- a/lib/process-services/content-widget/attach-file-widget.component.ts
+++ b/lib/process-services/content-widget/attach-file-widget.component.ts
@@ -30,10 +30,8 @@ import {
 } from '@alfresco/adf-core';
 import { ContentNodeDialogService } from '@alfresco/adf-content-services';
 import { MinimalNodeEntryEntity } from 'alfresco-js-api';
-import { Observable } from 'rxjs/Observable';
-import 'rxjs/add/observable/from';
-import { zip } from 'rxjs/observable/zip';
-import { of } from 'rxjs/observable/of';
+import { from, zip, of } from 'rxjs';
+import { mergeMap } from 'rxjs/operators';
 
 @Component({
     selector: 'attach-widget',
@@ -184,24 +182,27 @@ export class AttachFileWidgetComponent extends UploadWidgetComponent implements
     }
 
     private uploadFileFromCS(fileNodeList: MinimalNodeEntryEntity[], accountId: string, siteId?: string) {
-        let filesSaved = [];
-        Observable.from(fileNodeList)
-            .mergeMap(node =>
-                zip(of(node.content.mimeType), this.activitiContentService.applyAlfrescoNode(node,
-                    siteId,
-                    accountId))
-            ).subscribe(([mymeType, res]) => {
-                res.mimeType = mymeType;
-                filesSaved.push(res);
-            },
-            (error) => {
-                this.logger.error(error);
-            },
-            () => {
-                this.field.value = filesSaved;
-                this.field.json.value = filesSaved;
-                this.hasFile = true;
-            });
+        const filesSaved = [];
+        from(fileNodeList).pipe(
+            mergeMap(node =>
+                zip(
+                    of(node.content.mimeType),
+                    this.activitiContentService.applyAlfrescoNode(node, siteId, accountId)
+                )
+            )
+        )
+        .subscribe(([mymeType, res]) => {
+            res.mimeType = mymeType;
+            filesSaved.push(res);
+        },
+        (error) => {
+            this.logger.error(error);
+        },
+        () => {
+            this.field.value = filesSaved;
+            this.field.json.value = filesSaved;
+            this.hasFile = true;
+        });
     }
 
 }
diff --git a/lib/process-services/content-widget/attach-file-widget.components.spec.ts b/lib/process-services/content-widget/attach-file-widget.components.spec.ts
index 6b596058c2..748c93708a 100644
--- a/lib/process-services/content-widget/attach-file-widget.components.spec.ts
+++ b/lib/process-services/content-widget/attach-file-widget.components.spec.ts
@@ -29,8 +29,8 @@ import {
     ContentService,
     setupTestBed
 } from '@alfresco/adf-core';
-import { ContentNodeDialogService, ContentNodeSelectorModule } from '@alfresco/adf-content-services';
-import { Observable } from 'rxjs/Observable';
+import { ContentNodeDialogService, ContentModule } from '@alfresco/adf-content-services';
+import { of } from 'rxjs';
 import { MinimalNodeEntryEntity } from 'alfresco-js-api';
 import { ProcessTestingModule } from '../testing/process.testing.module';
 
@@ -104,7 +104,10 @@ describe('AttachFileWidgetComponent', () => {
     let formService: FormService;
 
     setupTestBed({
-        imports: [ProcessTestingModule, ContentNodeSelectorModule]
+        imports: [
+            ProcessTestingModule,
+            ContentModule.forRoot()
+        ]
     });
 
     beforeEach(async(() => {
@@ -127,7 +130,7 @@ describe('AttachFileWidgetComponent', () => {
     });
 
     it('should show up as simple upload when is configured for only local files', async(() => {
-        spyOn(activitiContentService, 'getAlfrescoRepositories').and.returnValue(Observable.of(null));
+        spyOn(activitiContentService, 'getAlfrescoRepositories').and.returnValue(of(null));
         widget.field = new FormFieldModel(new FormModel(), {
             type: FormFieldTypes.UPLOAD,
             value: []
@@ -147,7 +150,7 @@ describe('AttachFileWidgetComponent', () => {
         });
         widget.field.id = 'attach-file-attach';
         widget.field.params = <FormFieldMetadata> allSourceParams;
-        spyOn(activitiContentService, 'getAlfrescoRepositories').and.returnValue(Observable.of(fakeRepositoryListAnswer));
+        spyOn(activitiContentService, 'getAlfrescoRepositories').and.returnValue(of(fakeRepositoryListAnswer));
         fixture.detectChanges();
         fixture.whenRenderingDone().then(() => {
             let attachButton: HTMLButtonElement = element.querySelector('#attach-file-attach');
@@ -166,9 +169,9 @@ describe('AttachFileWidgetComponent', () => {
     }));
 
     it('should be able to upload files coming from content node selector', async(() => {
-        spyOn(activitiContentService, 'getAlfrescoRepositories').and.returnValue(Observable.of(fakeRepositoryListAnswer));
-        spyOn(activitiContentService, 'applyAlfrescoNode').and.returnValue(Observable.of(fakePngAnswer));
-        spyOn(contentNodeDialogService, 'openFileBrowseDialogBySite').and.returnValue(Observable.of([fakeMinimalNode]));
+        spyOn(activitiContentService, 'getAlfrescoRepositories').and.returnValue(of(fakeRepositoryListAnswer));
+        spyOn(activitiContentService, 'applyAlfrescoNode').and.returnValue(of(fakePngAnswer));
+        spyOn(contentNodeDialogService, 'openFileBrowseDialogBySite').and.returnValue(of([fakeMinimalNode]));
         widget.field = new FormFieldModel(new FormModel(), {
             type: FormFieldTypes.UPLOAD,
             value: []
@@ -196,9 +199,9 @@ describe('AttachFileWidgetComponent', () => {
         });
         widget.field.id = 'attach-file-attach';
         widget.field.params = <FormFieldMetadata> definedSourceParams;
-        spyOn(activitiContentService, 'getAlfrescoRepositories').and.returnValue(Observable.of(fakeRepositoryListAnswer));
-        spyOn(activitiContentService, 'applyAlfrescoNode').and.returnValue(Observable.of(fakePngAnswer));
-        spyOn(contentNodeDialogService, 'openFileBrowseDialogByFolderId').and.returnValue(Observable.of([fakeMinimalNode]));
+        spyOn(activitiContentService, 'getAlfrescoRepositories').and.returnValue(of(fakeRepositoryListAnswer));
+        spyOn(activitiContentService, 'applyAlfrescoNode').and.returnValue(of(fakePngAnswer));
+        spyOn(contentNodeDialogService, 'openFileBrowseDialogByFolderId').and.returnValue(of([fakeMinimalNode]));
         fixture.detectChanges();
         fixture.whenStable().then(() => {
             let attachButton: HTMLButtonElement = element.querySelector('#attach-file-attach');
@@ -213,14 +216,14 @@ describe('AttachFileWidgetComponent', () => {
     }));
 
     it('should be able to upload files from local source', async(() => {
-        spyOn(activitiContentService, 'getAlfrescoRepositories').and.returnValue(Observable.of(null));
+        spyOn(activitiContentService, 'getAlfrescoRepositories').and.returnValue(of(null));
         widget.field = new FormFieldModel(new FormModel(), {
             type: FormFieldTypes.UPLOAD,
             value: []
         });
         widget.field.id = 'attach-file-attach';
         widget.field.params = <FormFieldMetadata> onlyLocalParams;
-        spyOn(processContentService, 'createTemporaryRawRelatedContent').and.returnValue(Observable.of(fakePngAnswer));
+        spyOn(processContentService, 'createTemporaryRawRelatedContent').and.returnValue(of(fakePngAnswer));
         fixture.detectChanges();
         fixture.whenStable().then(() => {
             let inputDebugElement = fixture.debugElement.query(By.css('#attach-file-attach'));
@@ -236,7 +239,7 @@ describe('AttachFileWidgetComponent', () => {
             type: FormFieldTypes.UPLOAD,
             value: [fakePngAnswer]
         });
-        spyOn(activitiContentService, 'getAlfrescoRepositories').and.returnValue(Observable.of(null));
+        spyOn(activitiContentService, 'getAlfrescoRepositories').and.returnValue(of(null));
         widget.field.id = 'attach-file-attach';
         widget.field.params = <FormFieldMetadata> onlyLocalParams;
         fixture.detectChanges();
@@ -254,8 +257,8 @@ describe('AttachFileWidgetComponent', () => {
             });
             widget.field.id = 'attach-file-attach';
             widget.field.params = <FormFieldMetadata>  onlyLocalParams;
-            spyOn(activitiContentService, 'getAlfrescoRepositories').and.returnValue(Observable.of(null));
-            spyOn(processContentService, 'createTemporaryRawRelatedContent').and.returnValue(Observable.of(fakePngAnswer));
+            spyOn(activitiContentService, 'getAlfrescoRepositories').and.returnValue(of(null));
+            spyOn(processContentService, 'createTemporaryRawRelatedContent').and.returnValue(of(fakePngAnswer));
             fixture.detectChanges();
             fixture.whenStable().then(() => {
                 let inputDebugElement = fixture.debugElement.query(By.css('#attach-file-attach'));
@@ -304,7 +307,7 @@ describe('AttachFileWidgetComponent', () => {
         }));
 
         it('should raise formContentClicked event when show file is clicked', async(() => {
-            spyOn(processContentService, 'getFileRawContent').and.returnValue(Observable.of(fakePngAnswer));
+            spyOn(processContentService, 'getFileRawContent').and.returnValue(of(fakePngAnswer));
             formService.formContentClicked.subscribe((file) => {
                 expect(file).not.toBeNull();
                 expect(file.id).toBe(1155);
diff --git a/lib/process-services/content-widget/attach-folder-widget.component.spec.ts b/lib/process-services/content-widget/attach-folder-widget.component.spec.ts
index 4f1fa69fb8..81e64082b2 100644
--- a/lib/process-services/content-widget/attach-folder-widget.component.spec.ts
+++ b/lib/process-services/content-widget/attach-folder-widget.component.spec.ts
@@ -25,7 +25,7 @@ import {
     setupTestBed
 } from '@alfresco/adf-core';
 import { ContentNodeDialogService } from '@alfresco/adf-content-services';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 import { MinimalNodeEntryEntity } from 'alfresco-js-api';
 import { ProcessTestingModule } from '../testing/process.testing.module';
 
@@ -88,7 +88,7 @@ xdescribe('AttachFolderWidgetComponent', () => {
     });
 
     it('should show the folder selected by content node', async(() => {
-        spyOn(contentNodeDialogService, 'openFolderBrowseDialogBySite').and.returnValue(Observable.of([fakeMinimalNode]));
+        spyOn(contentNodeDialogService, 'openFolderBrowseDialogBySite').and.returnValue(of([fakeMinimalNode]));
         expect(widget).not.toBeNull();
         widget.field = new FormFieldModel(new FormModel(), {
             type: 'select-folder',
@@ -104,7 +104,7 @@ xdescribe('AttachFolderWidgetComponent', () => {
     }));
 
     it('should show the folder selected by content node opening on a configured folder', async(() => {
-        spyOn(contentNodeDialogService, 'openFolderBrowseDialogByFolderId').and.returnValue(Observable.of([fakeMinimalNode]));
+        spyOn(contentNodeDialogService, 'openFolderBrowseDialogByFolderId').and.returnValue(of([fakeMinimalNode]));
         expect(widget).not.toBeNull();
         widget.field = new FormFieldModel(new FormModel(), {
             type: 'select-folder',
@@ -121,7 +121,7 @@ xdescribe('AttachFolderWidgetComponent', () => {
     }));
 
     it('should retrieve the node information on init', async(() => {
-        spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeMinimalNode));
+        spyOn(nodeService, 'getNode').and.returnValue(of(fakeMinimalNode));
         expect(widget).not.toBeNull();
         widget.field = new FormFieldModel(new FormModel(), {
             type: 'select-folder',
@@ -136,7 +136,7 @@ xdescribe('AttachFolderWidgetComponent', () => {
     }));
 
     it('should remove the folder via the remove button', async(() => {
-        spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeMinimalNode));
+        spyOn(nodeService, 'getNode').and.returnValue(of(fakeMinimalNode));
         expect(widget).not.toBeNull();
         widget.field = new FormFieldModel(new FormModel(), {
             type: 'select-folder',
diff --git a/lib/process-services/content-widget/content-widget.module.ts b/lib/process-services/content-widget/content-widget.module.ts
index 39587d501f..41814ab812 100644
--- a/lib/process-services/content-widget/content-widget.module.ts
+++ b/lib/process-services/content-widget/content-widget.module.ts
@@ -24,7 +24,7 @@ import { AttachFolderWidgetComponent } from './attach-folder-widget.component';
 
 @NgModule({
     imports: [
-        CoreModule,
+        CoreModule.forChild(),
         MaterialModule
     ],
     entryComponents: [
diff --git a/lib/process-services/i18n/de.json b/lib/process-services/i18n/de.json
index ea9d0affe7..d5101fd0b5 100644
--- a/lib/process-services/i18n/de.json
+++ b/lib/process-services/i18n/de.json
@@ -19,6 +19,8 @@
     },
     "LIST": {
       "MESSAGES": {
+        "TITLE": "Keine Aufgaben gefunden",
+        "SUBTITLE": "Erstellen Sie eine neue Aufgabe, die sich später leicht wiederfinden lässt",
         "NONE": "Keine Aufgabenliste gefunden"
       }
     },
@@ -150,6 +152,11 @@
       "NO_FORM_MESSAGE": "Keine Formulare angehängt",
       "COMPLETE_TASK_MESSAGE": "Aufgabe {{taskName}} abgeschlossen",
       "COMPLETE_TASK_SUB_MESSAGE": "Keine Formulare, die hinzugefügt werden können"
+    },
+    "ATTACH_FORM": {
+      "SELECT_FORM": "Abzuhängendes Formular auswählen",
+      "REMOVE_FORM": "Formular entfernen",
+      "SELECT_OPTION": "Option auswählen"
     }
   },
   "ADF_PROCESS_LIST": {
diff --git a/lib/process-services/i18n/en.json b/lib/process-services/i18n/en.json
index e10eb91517..cc1e4d572f 100644
--- a/lib/process-services/i18n/en.json
+++ b/lib/process-services/i18n/en.json
@@ -152,6 +152,11 @@
       "NO_FORM_MESSAGE": "No forms attached",
       "COMPLETE_TASK_MESSAGE": "Task {{taskName}} completed",
       "COMPLETE_TASK_SUB_MESSAGE": "No forms to be added"
+    },
+    "ATTACH_FORM":{
+      "SELECT_FORM": "Select Form To Attach",
+      "REMOVE_FORM": "Remove Form",
+      "SELECT_OPTION": "Select an option"
     }
   },
   "ADF_PROCESS_LIST": {
diff --git a/lib/process-services/i18n/es.json b/lib/process-services/i18n/es.json
index 158b20744e..9754aa9ab8 100644
--- a/lib/process-services/i18n/es.json
+++ b/lib/process-services/i18n/es.json
@@ -7,7 +7,7 @@
     "START-DATE": "Fecha de inicio",
     "END-DATE": "Fecha de fin",
     "MESSAGES": {
-      "START-DATE-REQUIRED": "Fecha de inicio obligatoria",
+      "START-DATE-REQUIRED": "Se necesita fecha de inicio",
       "START-LESS-THAN-END-DATE": "La fecha de inicio debe ser anterior a la fecha de finalización"
     }
   },
@@ -19,6 +19,8 @@
     },
     "LIST": {
       "MESSAGES": {
+        "TITLE": "Ninguna tarea encontrada",
+        "SUBTITLE": "Crear una nueva tarea que desee encontrar fácilmente después",
         "NONE": "No se han encontrado listas de tareas"
       }
     },
@@ -150,6 +152,11 @@
       "NO_FORM_MESSAGE": "No se han adjuntado formularios",
       "COMPLETE_TASK_MESSAGE": "Tarea {{taskName}} finalizada",
       "COMPLETE_TASK_SUB_MESSAGE": "No se han añadido formularios"
+    },
+    "ATTACH_FORM": {
+      "SELECT_FORM": "Seleccionar formulario para adjuntar",
+      "REMOVE_FORM": "Eliminar formulario",
+      "SELECT_OPTION": "Seleccionar una opción"
     }
   },
   "ADF_PROCESS_LIST": {
diff --git a/lib/process-services/i18n/fr.json b/lib/process-services/i18n/fr.json
index 2d2362d244..acfc783cac 100644
--- a/lib/process-services/i18n/fr.json
+++ b/lib/process-services/i18n/fr.json
@@ -19,6 +19,8 @@
     },
     "LIST": {
       "MESSAGES": {
+        "TITLE": "Aucune tâche trouvée",
+        "SUBTITLE": "Créer une nouvelle tâche facilement accessible ultérieurement",
         "NONE": "Aucune liste de tâches trouvée"
       }
     },
@@ -150,6 +152,11 @@
       "NO_FORM_MESSAGE": "Aucun formulaire joint",
       "COMPLETE_TASK_MESSAGE": "La tâche {{taskName}} est terminée",
       "COMPLETE_TASK_SUB_MESSAGE": "Aucun formulaire à ajouter"
+    },
+    "ATTACH_FORM": {
+      "SELECT_FORM": "Sélectionner le formulaire à joindre",
+      "REMOVE_FORM": "Supprimer le formulaire",
+      "SELECT_OPTION": "Sélectionner une option"
     }
   },
   "ADF_PROCESS_LIST": {
diff --git a/lib/process-services/i18n/it.json b/lib/process-services/i18n/it.json
index 72b967d976..0f30fd598c 100644
--- a/lib/process-services/i18n/it.json
+++ b/lib/process-services/i18n/it.json
@@ -19,6 +19,8 @@
     },
     "LIST": {
       "MESSAGES": {
+        "TITLE": "Nessuna attività trovata",
+        "SUBTITLE": "Crea una nuova attività da trovare facilmente più tardi",
         "NONE": "Nessun elenco compiti trovato"
       }
     },
@@ -150,6 +152,11 @@
       "NO_FORM_MESSAGE": "Nessun modulo allegato",
       "COMPLETE_TASK_MESSAGE": "Compito {{taskName}} completato",
       "COMPLETE_TASK_SUB_MESSAGE": "Nessun modulo da aggiungere"
+    },
+    "ATTACH_FORM": {
+      "SELECT_FORM": "Seleziona modulo da allegare",
+      "REMOVE_FORM": "Rimuovi modulo",
+      "SELECT_OPTION": "Seleziona un'opzione"
     }
   },
   "ADF_PROCESS_LIST": {
diff --git a/lib/process-services/i18n/ja.json b/lib/process-services/i18n/ja.json
index 51a84c3203..43a067769f 100644
--- a/lib/process-services/i18n/ja.json
+++ b/lib/process-services/i18n/ja.json
@@ -19,6 +19,8 @@
     },
     "LIST": {
       "MESSAGES": {
+        "TITLE": "タスクが見つかりません",
+        "SUBTITLE": "後で簡単に見つけられるよう、新しいタスクを作成してください",
         "NONE": "タスクリストが見つかりません"
       }
     },
@@ -150,6 +152,11 @@
       "NO_FORM_MESSAGE": "フォームが添付されていません",
       "COMPLETE_TASK_MESSAGE": "タスク {{taskName}} が完了しました",
       "COMPLETE_TASK_SUB_MESSAGE": "フォームは追加されません"
+    },
+    "ATTACH_FORM": {
+      "SELECT_FORM": "添付するフォームを選択してください",
+      "REMOVE_FORM": "フォームの削除",
+      "SELECT_OPTION": "オプションを選択してください"
     }
   },
   "ADF_PROCESS_LIST": {
diff --git a/lib/process-services/i18n/nb.json b/lib/process-services/i18n/nb.json
index 06ef74c734..9b582ddfea 100644
--- a/lib/process-services/i18n/nb.json
+++ b/lib/process-services/i18n/nb.json
@@ -19,6 +19,8 @@
     },
     "LIST": {
       "MESSAGES": {
+        "TITLE": "Fant ingen oppgaver",
+        "SUBTITLE": "Opprett en ny oppgave som du lett kan finne igjen senere",
         "NONE": "Ingen oppgavelister funnet"
       }
     },
@@ -150,6 +152,11 @@
       "NO_FORM_MESSAGE": "Ingen skjemaer er vedlagt",
       "COMPLETE_TASK_MESSAGE": "Oppgaven {{taskName}} er fullført",
       "COMPLETE_TASK_SUB_MESSAGE": "Ingen skjemaer å legge til"
+    },
+    "ATTACH_FORM": {
+      "SELECT_FORM": "Velg skjema å legge ved",
+      "REMOVE_FORM": "Fjern skjema",
+      "SELECT_OPTION": "Velg et alternativ"
     }
   },
   "ADF_PROCESS_LIST": {
diff --git a/lib/process-services/i18n/nl.json b/lib/process-services/i18n/nl.json
index fe70e0798b..d1104faca8 100644
--- a/lib/process-services/i18n/nl.json
+++ b/lib/process-services/i18n/nl.json
@@ -19,6 +19,8 @@
     },
     "LIST": {
       "MESSAGES": {
+        "TITLE": "Geen taken gevonden",
+        "SUBTITLE": "Maak een nieuwe taak die u later gemakkelijk wilt kunnen vinden",
         "NONE": "Geen takenlijsten gevonden"
       }
     },
@@ -150,6 +152,11 @@
       "NO_FORM_MESSAGE": "Geen formulieren bijgevoegd",
       "COMPLETE_TASK_MESSAGE": "Taak {{taskName}} voltooid",
       "COMPLETE_TASK_SUB_MESSAGE": "Geen formulieren om toe te voegen"
+    },
+    "ATTACH_FORM": {
+      "SELECT_FORM": "Selecteer formulier om bij te voegen",
+      "REMOVE_FORM": "Formulier verwijderen",
+      "SELECT_OPTION": "Selecteer een optie"
     }
   },
   "ADF_PROCESS_LIST": {
diff --git a/lib/process-services/i18n/pt-BR.json b/lib/process-services/i18n/pt-BR.json
index 4a9a9ba9bf..34d034962f 100644
--- a/lib/process-services/i18n/pt-BR.json
+++ b/lib/process-services/i18n/pt-BR.json
@@ -19,6 +19,8 @@
     },
     "LIST": {
       "MESSAGES": {
+        "TITLE": "Nenhuma tarefa encontrada",
+        "SUBTITLE": "Crie uma tarefa que você consiga encontrar facilmente depois",
         "NONE": "Nenhuma lista de tarefas encontrada"
       }
     },
@@ -150,6 +152,11 @@
       "NO_FORM_MESSAGE": "Sem formulários anexados",
       "COMPLETE_TASK_MESSAGE": "Tarefa {{taskName}} concluída",
       "COMPLETE_TASK_SUB_MESSAGE": "Sem formulários a serem adicionados"
+    },
+    "ATTACH_FORM": {
+      "SELECT_FORM": "Selecionar formulário para anexar",
+      "REMOVE_FORM": "Remover formulário",
+      "SELECT_OPTION": "Selecionar uma opção"
     }
   },
   "ADF_PROCESS_LIST": {
diff --git a/lib/process-services/i18n/ru.json b/lib/process-services/i18n/ru.json
index 7a34b7c92a..e3ccf8fe8a 100644
--- a/lib/process-services/i18n/ru.json
+++ b/lib/process-services/i18n/ru.json
@@ -19,6 +19,8 @@
     },
     "LIST": {
       "MESSAGES": {
+        "TITLE": "Задачи не найдены",
+        "SUBTITLE": "Создать новую задачу для быстрого поиска позже",
         "NONE": "Списков задач не найдено"
       }
     },
@@ -150,6 +152,11 @@
       "NO_FORM_MESSAGE": "Нет прикрепленных форм",
       "COMPLETE_TASK_MESSAGE": "Задача {{taskName}} выполнена",
       "COMPLETE_TASK_SUB_MESSAGE": "Нет форм для добавления"
+    },
+    "ATTACH_FORM": {
+      "SELECT_FORM": "Выбрать форму для прикрепления",
+      "REMOVE_FORM": "Удалить форму",
+      "SELECT_OPTION": "Выбрать параметр"
     }
   },
   "ADF_PROCESS_LIST": {
diff --git a/lib/process-services/i18n/zh-CN.json b/lib/process-services/i18n/zh-CN.json
index ca05b60d19..4fa5d6afcf 100644
--- a/lib/process-services/i18n/zh-CN.json
+++ b/lib/process-services/i18n/zh-CN.json
@@ -19,6 +19,8 @@
     },
     "LIST": {
       "MESSAGES": {
+        "TITLE": "找不到任务",
+        "SUBTITLE": "创建您希望稍后轻松找到的新任务",
         "NONE": "未找到任务列表"
       }
     },
@@ -150,6 +152,11 @@
       "NO_FORM_MESSAGE": "未附加表单",
       "COMPLETE_TASK_MESSAGE": "已完成任务 {{taskName}}",
       "COMPLETE_TASK_SUB_MESSAGE": "没有要添加的表单"
+    },
+    "ATTACH_FORM": {
+      "SELECT_FORM": "选择要附加的表单",
+      "REMOVE_FORM": "删除表单",
+      "SELECT_OPTION": "选择选项"
     }
   },
   "ADF_PROCESS_LIST": {
diff --git a/lib/process-services/karma-test-shim.js b/lib/process-services/karma-test-shim.js
deleted file mode 100644
index 2da62e2cc0..0000000000
--- a/lib/process-services/karma-test-shim.js
+++ /dev/null
@@ -1,25 +0,0 @@
-Error.stackTraceLimit = Infinity;
-
-require('core-js/es6');
-require('core-js/es7/reflect');
-
-require('zone.js/dist/zone');
-require('zone.js/dist/long-stack-trace-zone');
-require('zone.js/dist/proxy');
-require('zone.js/dist/sync-test');
-require('zone.js/dist/jasmine-patch');
-require('zone.js/dist/async-test');
-require('zone.js/dist/fake-async-test');
-
-jasmine.DEFAULT_TIMEOUT_INTERVAL = 20000;
-
-var appContext = require.context(".", true, /.spec.ts/);
-appContext.keys().forEach(appContext);
-
-const TestBed = require('@angular/core/testing').TestBed;
-const browser = require('@angular/platform-browser-dynamic/testing');
-
-TestBed.initTestEnvironment(
-    browser.BrowserDynamicTestingModule,
-    browser.platformBrowserDynamicTesting()
-);
diff --git a/lib/process-services/karma.conf.js b/lib/process-services/karma.conf.js
new file mode 100644
index 0000000000..f03a1ef131
--- /dev/null
+++ b/lib/process-services/karma.conf.js
@@ -0,0 +1,101 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/config/configuration-file.html
+
+module.exports = function (config) {
+    config.set({
+        basePath: '',
+
+        files: [
+            {pattern: '../../node_modules/core-js/client/core.js', included: true, watched: false},
+            {pattern: '../../node_modules/tslib/tslib.js', included: true, watched: false},
+            {pattern: '../../node_modules/hammerjs/hammer.min.js', included: true, watched: false},
+            {pattern: '../../node_modules/hammerjs/hammer.min.js.map', included: false, watched: false},
+
+            // pdf-js
+            {pattern: '../../node_modules/pdfjs-dist/build/pdf.js', included: true, watched: false},
+            {pattern: '../../node_modules/pdfjs-dist/build/pdf.worker.js', included: true, watched: false},
+            {pattern: '../../node_modules/pdfjs-dist/web/pdf_viewer.js', included: true, watched: false},
+
+            {
+                pattern: '../../node_modules/@angular/material/prebuilt-themes/indigo-pink.css',
+                included: true,
+                watched: false
+            },
+
+            {pattern: '../../node_modules/chart.js/dist/Chart.js', included: true, watched: false},
+            {pattern: '../../node_modules/raphael/raphael.min.js', included: true, watched: false},
+            {
+                pattern: './node_modules/ng2-charts/bundles/ng2-charts.umd.js',
+                included: false,
+                served: true,
+                watched: false
+            },
+
+            {pattern: '../../node_modules/alfresco-js-api/dist/alfresco-js-api.min.js', included: true, watched: false},
+            {pattern: '../../node_modules/moment/min/moment.min.js', included: true, watched: false},
+
+            {pattern: './i18n/**/en.json', included: false, served: true, watched: false},
+
+            {pattern: './**/*.ts', included: false, served: true, watched: false},
+
+            {pattern: './app.config.json', included: false, served: true, watched: false},
+        ],
+
+        frameworks: ['jasmine-ajax', 'jasmine', '@angular-devkit/build-angular'],
+
+        proxies: {
+            '/base/assets/' :'/base/assets/',
+            '/assets/adf-process-services/i18n/en.json': '/base/i18n/en.json',
+            '/app.config.json': '/base/app.config.json'
+        },
+
+        plugins: [
+            require('karma-jasmine-ajax'),
+            require('karma-jasmine'),
+            require('karma-chrome-launcher'),
+            require('karma-jasmine-html-reporter'),
+            require('karma-coverage-istanbul-reporter'),
+            require('@angular-devkit/build-angular/plugins/karma'),
+            require('karma-mocha-reporter')
+        ],
+        client: {
+            clearContext: false // leave Jasmine Spec Runner output visible in browser
+        },
+        coverageIstanbulReporter: {
+            dir: './lib/coverage/process-services/',
+            reports: ['html', 'lcovonly'],
+            fixWebpackSourcePaths: true
+        },
+
+        // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+        logLevel: config.LOG_DEBUG,
+
+        colors: true,
+
+        autoWatch: false,
+
+        browserDisconnectTimeout: 200000,
+        browserNoActivityTimeout: 2400000,
+        captureTimeout: 1200000,
+
+        customLaunchers: {
+            ChromeHeadless: {
+                base: 'Chrome',
+                flags: [
+                    '--no-sandbox',
+                    '--headless',
+                    '--disable-gpu',
+                    '--remote-debugging-port=9222'
+                ]
+            }
+        },
+
+        reporters: ['mocha', 'kjhtml'],
+        port: 9876,
+        colors: true,
+        logLevel: config.LOG_INFO,
+        autoWatch: true,
+        browsers: ['Chrome'],
+        singleRun: false
+    });
+};
diff --git a/lib/process-services/material.module.ts b/lib/process-services/material.module.ts
index 966f50cf82..76c04b2672 100644
--- a/lib/process-services/material.module.ts
+++ b/lib/process-services/material.module.ts
@@ -17,7 +17,7 @@
 
 import { NgModule } from '@angular/core';
 import {
-    MAT_PLACEHOLDER_GLOBAL_OPTIONS, MatAutocompleteModule, MatButtonModule, MatCardModule, MatCheckboxModule,
+    MAT_LABEL_GLOBAL_OPTIONS, MatAutocompleteModule, MatButtonModule, MatCardModule, MatCheckboxModule,
     MatChipsModule, MatDatepickerModule, MatDialogModule, MatGridListModule, MatIconModule,
     MatInputModule, MatListModule, MatNativeDateModule, MatOptionModule, MatProgressSpinnerModule, MatRadioModule,
     MatRippleModule, MatSelectModule, MatSlideToggleModule, MatTableModule, MatTabsModule,
@@ -36,7 +36,7 @@ export function modules() {
 
 @NgModule({
     providers: [
-        {provide: MAT_PLACEHOLDER_GLOBAL_OPTIONS, useValue: { float: 'never' }}
+        {provide: MAT_LABEL_GLOBAL_OPTIONS, useValue: { float: 'never' }}
     ],
     imports: modules(),
     exports: modules()
diff --git a/lib/process-services/mock/process/process-instances-list.mock.ts b/lib/process-services/mock/process/process-instances-list.mock.ts
index 7d3c42df73..041640d4b2 100644
--- a/lib/process-services/mock/process/process-instances-list.mock.ts
+++ b/lib/process-services/mock/process/process-instances-list.mock.ts
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+import { ObjectDataColumn } from '@alfresco/adf-core';
+
 export let fakeProcessInstance = {
     size: 2, total: 2, start: 0,
     data: [
@@ -87,3 +89,31 @@ export let fakeProcessInstancesWithNoName = {
         }
     ]
 };
+
+export let fakeProcessCutomSchema =
+    [
+        new ObjectDataColumn({
+            'key': 'fakeName',
+            'type': 'text',
+            'title': 'ADF_PROCESS_LIST.PROPERTIES.FAKE',
+            'sortable': true
+        }),
+        new ObjectDataColumn({
+            'key': 'fakeProcessName',
+            'type': 'text',
+            'title': 'ADF_PROCESS_LIST.PROPERTIES.PROCESS_FAKE',
+            'sortable': true
+        })
+    ];
+
+export let fakeProcessColumnSchema = {
+    'default': [
+        {
+            'key': 'name',
+            'type': 'text',
+            'title': 'ADF_PROCESS_LIST.PROPERTIES.NAME',
+            'sortable': true
+        }
+    ]
+    , fakeProcessCutomSchema
+};
diff --git a/lib/process-services/mock/task/task-details.mock.ts b/lib/process-services/mock/task/task-details.mock.ts
index f93d082ccd..45362bcdc8 100644
--- a/lib/process-services/mock/task/task-details.mock.ts
+++ b/lib/process-services/mock/task/task-details.mock.ts
@@ -17,6 +17,76 @@
 
 import { TaskDetailsModel } from '../../task-list/models/task-details.model';
 
+export let standaloneTaskWithForm = new TaskDetailsModel({
+    'id': '100',
+    'name': 'Standalone Task With Form',
+    'description': null,
+    'category': null,
+    'assignee': { 'id': 1001, 'firstName': 'Wilbur', 'lastName': 'Adams', 'email': 'wilbur@app.activiti.com' },
+    'created': '2016-11-03T15:25:42.749+0000',
+    'dueDate': null,
+    'endDate': null,
+    'duration': null,
+    'priority': 50,
+    'parentTaskId': null,
+    'parentTaskName': null,
+    'processInstanceId': null,
+    'processInstanceName': null,
+    'processDefinitionId': null,
+    'processDefinitionName': null,
+    'processDefinitionDescription': null,
+    'processDefinitionKey': null,
+    'processDefinitionCategory': null,
+    'processDefinitionVersion': null,
+    'processDefinitionDeploymentId': null,
+    'formKey': '222',
+    'processInstanceStartUserId': null,
+    'initiatorCanCompleteTask': false,
+    'adhocTaskCanBeReassigned': false,
+    'taskDefinitionKey': 'sid-DDECD9E4-0299-433F-9193-C3D905C3EEBE',
+    'executionId': '86',
+    'involvedGroups': [],
+    'involvedPeople': [],
+    'memberOfCandidateUsers': false,
+    'managerOfCandidateGroup': false,
+    'memberOfCandidateGroup': false
+});
+
+export let standaloneTaskWithoutForm = new TaskDetailsModel({
+    'id': '200',
+    'name': 'Standalone Task Without Form',
+    'description': null,
+    'category': null,
+    'assignee': { 'id': 1001, 'firstName': 'Wilbur', 'lastName': 'Adams', 'email': 'wilbur@app.activiti.com' },
+    'created': '2016-11-03T15:25:42.749+0000',
+    'dueDate': null,
+    'endDate': null,
+    'duration': null,
+    'priority': 50,
+    'parentTaskId': null,
+    'parentTaskName': null,
+    'processInstanceId': null,
+    'processInstanceName': null,
+    'processDefinitionId': null,
+    'processDefinitionName': null,
+    'processDefinitionDescription': null,
+    'processDefinitionKey': null,
+    'processDefinitionCategory': null,
+    'processDefinitionVersion': null,
+    'processDefinitionDeploymentId': null,
+    'formKey': null,
+    'processInstanceStartUserId': null,
+    'initiatorCanCompleteTask': false,
+    'adhocTaskCanBeReassigned': false,
+    'taskDefinitionKey': 'sid-DDECD9E4-0299-433F-9193-C3D905C3EEBE',
+    'executionId': '86',
+    'involvedGroups': [],
+    'involvedPeople': [],
+    'memberOfCandidateUsers': false,
+    'managerOfCandidateGroup': false,
+    'memberOfCandidateGroup': false
+});
+
 export let taskDetailsMock = new TaskDetailsModel({
     'id': '91',
     'name': 'Request translation',
diff --git a/lib/process-services/ng-package.json b/lib/process-services/ng-package.json
index 34991acbb3..fc17c9aff5 100644
--- a/lib/process-services/ng-package.json
+++ b/lib/process-services/ng-package.json
@@ -1,12 +1,10 @@
 {
   "$schema": "./node_modules/ng-packagr/ng-package.schema.json",
-  "whitelistedNonPeerDependencies": [ "." ],
   "workingDirectory": "./ng_work",
   "src": "../process-services/",
   "dest": "../dist/process-services/",
   "lib": {
     "languageLevel": [ "dom", "es2016" ],
-    "licensePath": "../config/assets/license_header_add.txt",
     "comments" : "none",
     "entryFile": "./public-api.ts",
     "flatModuleFile": "adf-process-services",
diff --git a/lib/process-services/package.json b/lib/process-services/package.json
index 69e7729f9a..5e347c625b 100644
--- a/lib/process-services/package.json
+++ b/lib/process-services/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@alfresco/adf-process-services",
   "description": "Alfresco ADF process services",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "author": "Alfresco Software, Ltd.",
   "main": "bundles/adf-process-services.js",
   "repository": {
@@ -11,38 +11,31 @@
   "bugs": {
     "url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
   },
-  "dependencies": {
-  	"@alfresco/adf-core": "2.4.0",
-    "@alfresco/adf-content-services": "2.4.0",
-    "@angular/animations": "5.1.1",
-    "@angular/cdk": "5.0.1",
-    "@angular/common": "5.1.1",
-    "@angular/compiler": "5.1.1",
-    "@angular/core": "5.1.1",
-    "@angular/flex-layout": "2.0.0-beta.12",
-    "@angular/forms": "5.1.1",
-    "@angular/http": "5.1.1",
-    "@angular/material": "5.0.1",
-    "@angular/material-moment-adapter": "5.0.1",
-    "@angular/platform-browser": "5.1.1",
-    "@angular/platform-browser-dynamic": "5.1.1",
-    "@angular/router": "5.1.1",
-    "@ngx-translate/core": "9.1.1",
-    "alfresco-js-api": "2.4.0",
-    "chart.js": "2.5.0",
+  "peerDependencies": {
+    "@angular/animations": ">=5.1.1",
+    "@angular/cdk": ">=5.1.1",
+    "@angular/common": ">=5.1.1",
+    "@angular/compiler": ">=5.1.1",
+    "@angular/core": ">=5.1.1",
+    "@angular/flex-layout": ">=5.1.1",
+    "@angular/forms": ">=5.1.1",
+    "@angular/http": ">=5.1.1",
+    "@angular/material": ">=5.1.1",
+    "@angular/material-moment-adapter": ">=5.1.1",
+    "@angular/platform-browser": ">=5.1.1",
+    "@angular/platform-browser-dynamic": ">=5.1.1",
+    "@angular/router": ">=5.1.1",
+    "alfresco-js-api": "2.5.0",
+    "rxjs": ">=6.2.2",
+    "@alfresco/adf-core": "2.5.0",
+    "@alfresco/adf-content-services": "2.5.0",
+    "@ngx-translate/core": "^10.0.2",
     "core-js": "2.4.1",
     "hammerjs": "2.0.8",
-    "minimatch": "3.0.4",
-    "moment": "2.20.1",
-    "ng2-charts": "1.6.0",
-    "pdfjs-dist": "1.5.404",
-    "raphael": "2.2.7",
+    "moment": "^2.22.2",
     "reflect-metadata": "0.1.10",
-    "rxjs": "5.5.2",
-    "systemjs": "0.19.27",
-    "zone.js": "0.8.14"
+    "zone.js": "^0.8.26"
   },
-  "devDependencies": {},
   "keywords": [
     "process-services",
     "alfresco-component",
diff --git a/lib/process-services/people/components/people-search-field/people-search-field.component.ts b/lib/process-services/people/components/people-search-field/people-search-field.component.ts
index 378435568d..100051a002 100644
--- a/lib/process-services/people/components/people-search-field/people-search-field.component.ts
+++ b/lib/process-services/people/components/people-search-field/people-search-field.component.ts
@@ -18,8 +18,8 @@
 import { UserProcessModel, TranslationService, PeopleProcessService } from '@alfresco/adf-core';
 import { Component, EventEmitter, Input, Output, ViewEncapsulation } from '@angular/core';
 import { FormControl } from '@angular/forms';
-import { debounceTime } from 'rxjs/operators';
-import { Observable } from 'rxjs/Observable';
+import { debounceTime, switchMap } from 'rxjs/operators';
+import { Observable, of } from 'rxjs';
 import { PerformSearchCallback } from '../../interfaces/perform-search-callback.interface';
 import { getDisplayUser } from '../../helpers/getDisplayUser';
 
@@ -50,14 +50,16 @@ export class PeopleSearchFieldComponent {
     constructor(public peopleProcessService: PeopleProcessService,
                 private translationService: TranslationService) {
         this.users$ = this.searchUser.valueChanges
-            .pipe(debounceTime(200))
-            .switchMap((searchWord: string) => {
-                if (searchWord && searchWord.trim()) {
-                    return this.performSearch(searchWord);
-                } else {
-                    return Observable.of([]);
-                }
-            });
+            .pipe(
+                debounceTime(200),
+                switchMap((searchWord: string) => {
+                    if (searchWord && searchWord.trim()) {
+                        return this.performSearch(searchWord);
+                    } else {
+                        return of([]);
+                    }
+                })
+            );
 
         this.defaultPlaceholder = this.translationService.instant(this.defaultPlaceholder);
     }
diff --git a/lib/process-services/people/components/people-search/people-search.component.spec.ts b/lib/process-services/people/components/people-search/people-search.component.spec.ts
index 59d756395f..0689ed68e1 100644
--- a/lib/process-services/people/components/people-search/people-search.component.spec.ts
+++ b/lib/process-services/people/components/people-search/people-search.component.spec.ts
@@ -17,7 +17,7 @@
 
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { UserProcessModel, setupTestBed } from '@alfresco/adf-core';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 import { PeopleSearchComponent } from './people-search.component';
 import { ProcessTestingModule } from '../../../testing/process.testing.module';
 
@@ -51,7 +51,7 @@ describe('PeopleSearchComponent', () => {
         fixture = TestBed.createComponent(PeopleSearchComponent);
         peopleSearchComponent = fixture.componentInstance;
         element = fixture.nativeElement;
-        peopleSearchComponent.results = Observable.of([]);
+        peopleSearchComponent.results = of([]);
         fixture.detectChanges();
     }));
 
@@ -70,7 +70,7 @@ describe('PeopleSearchComponent', () => {
     });
 
     it('should show user which can be involved ', (done) => {
-        peopleSearchComponent.results = Observable.of(userArray);
+        peopleSearchComponent.results = of(userArray);
         peopleSearchComponent.ngOnInit();
         fixture.detectChanges();
 
@@ -93,7 +93,7 @@ describe('PeopleSearchComponent', () => {
             expect(user.firstName).toBe('fake-name');
             done();
         });
-        peopleSearchComponent.results = Observable.of(userArray);
+        peopleSearchComponent.results = of(userArray);
         peopleSearchComponent.ngOnInit();
         fixture.detectChanges();
         fixture.whenStable()
@@ -105,7 +105,7 @@ describe('PeopleSearchComponent', () => {
     });
 
     it('should remove clicked user', (done) => {
-        peopleSearchComponent.results = Observable.of(userArray);
+        peopleSearchComponent.results = of(userArray);
         peopleSearchComponent.ngOnInit();
         fixture.detectChanges();
 
diff --git a/lib/process-services/people/components/people-search/people-search.component.ts b/lib/process-services/people/components/people-search/people-search.component.ts
index d4f31600f8..8ac6fd411b 100644
--- a/lib/process-services/people/components/people-search/people-search.component.ts
+++ b/lib/process-services/people/components/people-search/people-search.component.ts
@@ -17,8 +17,9 @@
 
 import { UserProcessModel } from '@alfresco/adf-core';
 import { Component, EventEmitter, OnInit, Input, Output, ViewEncapsulation } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { PerformSearchCallback } from '../../interfaces/perform-search-callback.interface';
+import { map } from 'rxjs/operators';
 
 @Component({
     selector: 'adf-people-search',
@@ -55,9 +56,12 @@ export class PeopleSearchComponent implements OnInit {
     constructor() {}
 
     ngOnInit() {
-        this.filteredResults$ = this.results.map((users) => {
-            return users.filter(user => user.id !== this.selectedUser.id);
-        });
+        this.filteredResults$ = this.results
+            .pipe(
+                map((users) => {
+                    return users.filter(user => user.id !== this.selectedUser.id);
+                })
+            );
         this.performSearch = this.performSearchCallback.bind(this);
     }
 
diff --git a/lib/process-services/people/components/people-selector/people-selector.component.spec.ts b/lib/process-services/people/components/people-selector/people-selector.component.spec.ts
index ea8d587f48..92f38a6764 100644
--- a/lib/process-services/people/components/people-selector/people-selector.component.spec.ts
+++ b/lib/process-services/people/components/people-selector/people-selector.component.spec.ts
@@ -18,7 +18,7 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { LogService, PeopleProcessService, setupTestBed } from '@alfresco/adf-core';
 import { PeopleSelectorComponent } from './people-selector.component';
-import { Observable } from 'rxjs/Observable';
+import { of, throwError } from 'rxjs';
 import { By } from '@angular/platform-browser';
 import { ProcessTestingModule } from '../../../testing/process.testing.module';
 
@@ -51,17 +51,17 @@ describe('PeopleSelectorComponent', () => {
 
     it('should call the PeopleProcessService\'s getWorkflowUsers method on search', () => {
         const peopleProcessService = TestBed.get(PeopleProcessService);
-        spyOn(peopleProcessService, 'getWorkflowUsers').and.returnValue(Observable.of([]));
+        spyOn(peopleProcessService, 'getWorkflowUsers').and.returnValue(of([]));
 
         component.performSearch('Chloe Price');
 
         expect(peopleProcessService.getWorkflowUsers).toHaveBeenCalledWith(undefined, 'Chloe Price');
     });
 
-    it('should log error on getWorkflowUsers\'s error', () => {
+    it('should log error on getWorkflowUsers error', () => {
         const peopleProcessService = TestBed.get(PeopleProcessService);
         const logService = TestBed.get(LogService);
-        spyOn(peopleProcessService, 'getWorkflowUsers').and.returnValue(Observable.throw(new Error()));
+        spyOn(peopleProcessService, 'getWorkflowUsers').and.returnValue(throwError(new Error()));
         spyOn(logService, 'error');
 
         component.performSearch('Chloe Price')
diff --git a/lib/process-services/people/components/people-selector/people-selector.component.ts b/lib/process-services/people/components/people-selector/people-selector.component.ts
index bd0fcb4b41..7212972efb 100644
--- a/lib/process-services/people/components/people-selector/people-selector.component.ts
+++ b/lib/process-services/people/components/people-selector/people-selector.component.ts
@@ -20,7 +20,8 @@ import { PerformSearchCallback } from '../../interfaces/perform-search-callback.
 import { PeopleProcessService, UserProcessModel, LogService, TranslationService } from '@alfresco/adf-core';
 import { PeopleSearchFieldComponent } from '../people-search-field/people-search-field.component';
 import { getDisplayUser } from '../../helpers/getDisplayUser';
-import { Observable } from 'rxjs/Observable';
+import { Observable, of } from 'rxjs';
+import { catchError } from 'rxjs/operators';
 
 const DEFAULT_ASSIGNEE_PLACEHOLDER = 'ADF_TASK_LIST.PEOPLE.ASSIGNEE';
 
@@ -60,12 +61,14 @@ export class PeopleSelectorComponent {
 
     searchUser(searchWord: string): Observable<{} | UserProcessModel[]> {
         return this.peopleProcessService.getWorkflowUsers(undefined, searchWord)
-            .catch(this.onSearchUserError.bind(this));
+            .pipe(
+                catchError(this.onSearchUserError.bind(this))
+            );
     }
 
     private onSearchUserError(): Observable<UserProcessModel[]> {
         this.logService.error('getWorkflowUsers threw error');
-        return Observable.of([]);
+        return of([]);
     }
 
     userSelected(user: UserProcessModel): void {
diff --git a/lib/process-services/people/components/people/people.component.ts b/lib/process-services/people/components/people/people.component.ts
index ee8c34269f..f2bf995aae 100644
--- a/lib/process-services/people/components/people/people.component.ts
+++ b/lib/process-services/people/components/people/people.component.ts
@@ -18,10 +18,10 @@
 import { LogService, UserProcessModel } from '@alfresco/adf-core';
 import { PeopleProcessService } from '@alfresco/adf-core';
 import { AfterViewInit, Component, Input, OnInit, ViewChild } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
-import { Observer } from 'rxjs/Observer';
+import { Observable, Observer } from 'rxjs';
 import { UserEventModel } from '../../../task-list/models/user-event.model';
 import { PeopleSearchComponent } from '../people-search/people-search.component';
+import { share } from 'rxjs/operators';
 
 @Component({
     selector: 'adf-people',
@@ -51,7 +51,10 @@ export class PeopleComponent implements OnInit, AfterViewInit {
     peopleSearch$: Observable<UserProcessModel[]>;
 
     constructor(private logService: LogService, public peopleProcessService: PeopleProcessService) {
-        this.peopleSearch$ = new Observable<UserProcessModel[]>(observer => this.peopleSearchObserver = observer).share();
+        this.peopleSearch$ = new Observable<UserProcessModel[]>(observer => this.peopleSearchObserver = observer)
+            .pipe(
+                share()
+            );
     }
 
     ngOnInit() {
diff --git a/lib/process-services/people/interfaces/perform-search-callback.interface.ts b/lib/process-services/people/interfaces/perform-search-callback.interface.ts
index b344f6493e..b1f19e9053 100644
--- a/lib/process-services/people/interfaces/perform-search-callback.interface.ts
+++ b/lib/process-services/people/interfaces/perform-search-callback.interface.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { UserProcessModel } from '@alfresco/adf-core';
 
 export type PerformSearchCallback = (searchWord: string) => Observable<UserProcessModel[]>;
diff --git a/lib/process-services/people/people.module.ts b/lib/process-services/people/people.module.ts
index 744a31b789..4347058513 100644
--- a/lib/process-services/people/people.module.ts
+++ b/lib/process-services/people/people.module.ts
@@ -17,11 +17,10 @@
 
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
 import { MaterialModule } from '../material.module';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 
-import { DataColumnModule,  DataTableModule } from '@alfresco/adf-core';
+import { CoreModule } from '@alfresco/adf-core';
 import { PeopleComponent } from './components/people/people.component';
 import { PeopleListComponent } from './components/people-list/people-list.component';
 import { PeopleSearchComponent } from './components/people-search/people-search.component';
@@ -35,11 +34,9 @@ import { PeopleSearchTitleDirective } from './directives/people-search-title.dir
     imports: [
         FormsModule,
         ReactiveFormsModule,
-        DataColumnModule,
-        DataTableModule,
         MaterialModule,
         CommonModule,
-        TranslateModule
+        CoreModule.forChild()
     ],
     declarations: [
         PeopleComponent,
diff --git a/lib/process-services/process-comments/process-comments.component.spec.ts b/lib/process-services/process-comments/process-comments.component.spec.ts
index 7f795c6d03..d4a648a634 100644
--- a/lib/process-services/process-comments/process-comments.component.spec.ts
+++ b/lib/process-services/process-comments/process-comments.component.spec.ts
@@ -17,7 +17,7 @@
 
 import { SimpleChange } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { Observable } from 'rxjs/Observable';
+import { of, throwError } from 'rxjs';
 
 import { CommentProcessService, setupTestBed } from '@alfresco/adf-core';
 
@@ -41,7 +41,7 @@ describe('ProcessCommentsComponent', () => {
         component = fixture.componentInstance;
         commentProcessService = TestBed.get(CommentProcessService);
 
-        getCommentsSpy = spyOn(commentProcessService, 'getProcessInstanceComments').and.returnValue(Observable.of([
+        getCommentsSpy = spyOn(commentProcessService, 'getProcessInstanceComments').and.returnValue(of([
             { message: 'Test1', created: Date.now(), createdBy: {firstName: 'Admin', lastName: 'User'} },
             { message: 'Test2', created: Date.now(), createdBy: {firstName: 'Admin', lastName: 'User'} },
             { message: 'Test3', created: Date.now(), createdBy: {firstName: 'Admin', lastName: 'User'} }
@@ -57,7 +57,7 @@ describe('ProcessCommentsComponent', () => {
 
     it('should emit an error when an error occurs loading comments', () => {
         let emitSpy = spyOn(component.error, 'emit');
-        getCommentsSpy.and.returnValue(Observable.throw({}));
+        getCommentsSpy.and.returnValue(throwError({}));
 
         let change = new SimpleChange(null, '123', true);
         component.ngOnChanges({ 'processInstanceId': change });
@@ -97,7 +97,7 @@ describe('ProcessCommentsComponent', () => {
         let change = new SimpleChange(null, '123', true);
         component.ngOnChanges({ 'processInstanceId': change });
 
-        getCommentsSpy.and.returnValue(Observable.of([]));
+        getCommentsSpy.and.returnValue(of([]));
         fixture.whenStable().then(() => {
             fixture.detectChanges();
             expect(fixture.nativeElement.querySelector('#comment-container')).toBeNull();
diff --git a/lib/process-services/process-comments/process-comments.component.ts b/lib/process-services/process-comments/process-comments.component.ts
index 6dec5bf860..00bb17ed6b 100644
--- a/lib/process-services/process-comments/process-comments.component.ts
+++ b/lib/process-services/process-comments/process-comments.component.ts
@@ -17,8 +17,8 @@
 
 import { CommentModel, CommentProcessService } from '@alfresco/adf-core';
 import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
-import { Observer } from 'rxjs/Observer';
+import { Observable, Observer } from 'rxjs';
+import { share } from 'rxjs/operators';
 
 @Component({
     selector: 'adf-process-instance-comments',
@@ -49,7 +49,8 @@ export class ProcessCommentsComponent implements OnChanges {
     beingAdded: boolean = false;
 
     constructor(private commentProcessService: CommentProcessService) {
-        this.comment$ = new Observable<CommentModel>(observer =>  this.commentObserver = observer).share();
+        this.comment$ = new Observable<CommentModel>(observer =>  this.commentObserver = observer)
+            .pipe(share());
         this.comment$.subscribe((comment: CommentModel) => {
             this.comments.push(comment);
         });
diff --git a/lib/process-services/process-comments/process-comments.module.ts b/lib/process-services/process-comments/process-comments.module.ts
index cfdec735f8..c26ca698df 100644
--- a/lib/process-services/process-comments/process-comments.module.ts
+++ b/lib/process-services/process-comments/process-comments.module.ts
@@ -17,23 +17,19 @@
 
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
 import { MaterialModule } from '../material.module';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { DataColumnModule, DataTableModule, CommentsModule } from '@alfresco/adf-core';
+import { CoreModule } from '@alfresco/adf-core';
 
 import { ProcessCommentsComponent } from './process-comments.component';
 
 @NgModule({
     imports: [
-        DataColumnModule,
-        DataTableModule,
         FormsModule,
         ReactiveFormsModule,
         MaterialModule,
         CommonModule,
-        TranslateModule,
-        CommentsModule
+        CoreModule.forChild()
     ],
     declarations: [
         ProcessCommentsComponent
diff --git a/lib/process-services/process-list/components/process-audit.directive.spec.ts b/lib/process-services/process-list/components/process-audit.directive.spec.ts
index 26cbf4e8eb..95ae6a5d0b 100644
--- a/lib/process-services/process-list/components/process-audit.directive.spec.ts
+++ b/lib/process-services/process-list/components/process-audit.directive.spec.ts
@@ -17,7 +17,7 @@
 
 import { Component } from '@angular/core';
 import { ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 import { ProcessService } from './../services/process.service';
 import { ProcessAuditDirective } from './process-audit.directive';
 import { setupTestBed, CoreModule } from '@alfresco/adf-core';
@@ -100,7 +100,7 @@ describe('ProcessAuditDirective', () => {
         component.fileName = 'FakeAuditName';
         component.format = 'pdf';
         let blob = createFakePdfBlob();
-        spyOn(service, 'fetchProcessAuditPdfById').and.returnValue(Observable.of(blob));
+        spyOn(service, 'fetchProcessAuditPdfById').and.returnValue(of(blob));
         spyOn(component, 'onAuditClick').and.callThrough();
 
         fixture.detectChanges();
@@ -136,7 +136,7 @@ describe('ProcessAuditDirective', () => {
             }
             ], decisionInfo: { calculatedValues: [], appliedRules: [] }
         };
-        spyOn(service, 'fetchProcessAuditJsonById').and.returnValue(Observable.of(auditJson));
+        spyOn(service, 'fetchProcessAuditJsonById').and.returnValue(of(auditJson));
         spyOn(component, 'onAuditClick').and.callThrough();
 
         fixture.detectChanges();
@@ -156,7 +156,7 @@ describe('ProcessAuditDirective', () => {
         component.fileName = 'FakeAuditName';
         component.format = 'fakeFormat';
         let blob = createFakePdfBlob();
-        spyOn(service, 'fetchProcessAuditPdfById').and.returnValue(Observable.of(blob));
+        spyOn(service, 'fetchProcessAuditPdfById').and.returnValue(of(blob));
         spyOn(component, 'onAuditClick').and.callThrough();
 
         fixture.detectChanges();
diff --git a/lib/process-services/process-list/components/process-filters.component.html b/lib/process-services/process-list/components/process-filters.component.html
index 73020f7a5b..8620c89d4e 100644
--- a/lib/process-services/process-list/components/process-filters.component.html
+++ b/lib/process-services/process-list/components/process-filters.component.html
@@ -2,7 +2,7 @@
     <mat-list class="adf-menu-list">
         <mat-list-item (click)="selectFilter(filter)" *ngFor="let filter of filters"
                         class="adf-filters__entry" [class.active]="currentFilter === filter">
-            <mat-icon *ngIf="hasIcon" matListIcon class="adf-filters__entry-icon">assignment</mat-icon>
+            <mat-icon *ngIf="showIcon" matListIcon class="adf-filters__entry-icon">assignment</mat-icon>
             <span matLine [attr.data-automation-id]="filter.name + '_filter'">{{filter.name}}</span>
         </mat-list-item>
     </mat-list>
diff --git a/lib/process-services/process-list/components/process-filters.component.spec.ts b/lib/process-services/process-list/components/process-filters.component.spec.ts
index fef42446e2..125557cae2 100644
--- a/lib/process-services/process-list/components/process-filters.component.spec.ts
+++ b/lib/process-services/process-list/components/process-filters.component.spec.ts
@@ -15,32 +15,53 @@
  * limitations under the License.
  */
 
-import { SimpleChange } from '@angular/core';
+import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange } from '@angular/core';
 import { AppsProcessService } from '@alfresco/adf-core';
-import { Observable } from 'rxjs/Observable';
+import { from } from 'rxjs';
 import { FilterProcessRepresentationModel } from '../models/filter-process.model';
 import { ProcessFilterService } from '../services/process-filter.service';
 import { ProcessFiltersComponent } from './process-filters.component';
+import { setupTestBed } from '../../../core/testing/setupTestBed';
+import { CoreModule } from '../../../core/core.module';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 describe('ProcessFiltersComponent', () => {
 
     let filterList: ProcessFiltersComponent;
+    let fixture: ComponentFixture<ProcessFiltersComponent>;
     let processFilterService: ProcessFilterService;
     let appsProcessService: AppsProcessService;
     let fakeGlobalFilterPromise;
     let mockErrorFilterPromise;
 
+    setupTestBed({
+        imports: [
+            NoopAnimationsModule,
+            CoreModule.forRoot()
+        ],
+        declarations: [ProcessFiltersComponent],
+        providers: [AppsProcessService, ProcessFilterService],
+        schemas: [CUSTOM_ELEMENTS_SCHEMA]
+    });
+
     beforeEach(() => {
+        fixture = TestBed.createComponent(ProcessFiltersComponent);
+        filterList = fixture.componentInstance;
+
         fakeGlobalFilterPromise = Promise.resolve([
             new FilterProcessRepresentationModel({
+                id: 10,
                 name: 'FakeInvolvedTasks',
                 filter: { state: 'open', assignment: 'fake-involved' }
             }),
             new FilterProcessRepresentationModel({
+                id: 20,
                 name: 'FakeMyTasks',
                 filter: { state: 'open', assignment: 'fake-assignee' }
             }),
             new FilterProcessRepresentationModel({
+                id: 30,
                 name: 'Running',
                 filter: { state: 'open', assignment: 'fake-running' }
             })
@@ -55,8 +76,12 @@ describe('ProcessFiltersComponent', () => {
         filterList = new ProcessFiltersComponent(processFilterService, appsProcessService);
     });
 
+    afterEach(() => {
+        fixture.destroy();
+    });
+
     it('should return the filter task list', (done) => {
-        spyOn(processFilterService, 'getProcessFilters').and.returnValue(Observable.fromPromise(fakeGlobalFilterPromise));
+        spyOn(processFilterService, 'getProcessFilters').and.returnValue(from(fakeGlobalFilterPromise));
         const appId = '1';
         let change = new SimpleChange(null, appId, true);
         filterList.ngOnChanges({ 'appId': change });
@@ -75,7 +100,7 @@ describe('ProcessFiltersComponent', () => {
     });
 
     it('should select the Running process filter', (done) => {
-        spyOn(processFilterService, 'getProcessFilters').and.returnValue(Observable.fromPromise(fakeGlobalFilterPromise));
+        spyOn(processFilterService, 'getProcessFilters').and.returnValue(from(fakeGlobalFilterPromise));
         const appId = '1';
         let change = new SimpleChange(null, appId, true);
         filterList.ngOnChanges({ 'appId': change });
@@ -92,8 +117,8 @@ describe('ProcessFiltersComponent', () => {
     });
 
     it('should return the filter task list, filtered By Name', (done) => {
-        spyOn(appsProcessService, 'getDeployedApplicationsByName').and.returnValue(Observable.fromPromise(Promise.resolve({ id: 1 })));
-        spyOn(processFilterService, 'getProcessFilters').and.returnValue(Observable.fromPromise(fakeGlobalFilterPromise));
+        spyOn(appsProcessService, 'getDeployedApplicationsByName').and.returnValue(from(Promise.resolve({ id: 1 })));
+        spyOn(processFilterService, 'getProcessFilters').and.returnValue(from(fakeGlobalFilterPromise));
 
         let change = new SimpleChange(null, 'test', true);
         filterList.ngOnChanges({ 'appName': change });
@@ -109,7 +134,7 @@ describe('ProcessFiltersComponent', () => {
     });
 
     it('should emit an error with a bad response', (done) => {
-        spyOn(processFilterService, 'getProcessFilters').and.returnValue(Observable.fromPromise(mockErrorFilterPromise));
+        spyOn(processFilterService, 'getProcessFilters').and.returnValue(from(mockErrorFilterPromise));
 
         const appId = '1';
         let change = new SimpleChange(null, appId, true);
@@ -124,7 +149,7 @@ describe('ProcessFiltersComponent', () => {
     });
 
     it('should emit an error with a bad response', (done) => {
-        spyOn(appsProcessService, 'getDeployedApplicationsByName').and.returnValue(Observable.fromPromise(mockErrorFilterPromise));
+        spyOn(appsProcessService, 'getDeployedApplicationsByName').and.returnValue(from(mockErrorFilterPromise));
 
         const appId = 'fake-app';
         let change = new SimpleChange(null, appId, true);
@@ -140,10 +165,9 @@ describe('ProcessFiltersComponent', () => {
 
     it('should emit an event when a filter is selected', (done) => {
         let currentFilter = new FilterProcessRepresentationModel({
-            filter: {
-                state: 'open',
-                assignment: 'fake-involved'
-            }
+            id: 10,
+            name: 'FakeInvolvedTasks',
+            filter: { state: 'open', assignment: 'fake-involved' }
         });
 
         filterList.filterClick.subscribe((filter: FilterProcessRepresentationModel) => {
@@ -196,4 +220,63 @@ describe('ProcessFiltersComponent', () => {
         expect(filterList.getCurrentFilter()).toBe(filter);
     });
 
+    it('should select the filter passed as input by id', (done) => {
+        spyOn(processFilterService, 'getProcessFilters').and.returnValue(from(fakeGlobalFilterPromise));
+
+        filterList.filterParam = new FilterProcessRepresentationModel({ id: 20 });
+
+        const appId = 1;
+        let change = new SimpleChange(null, appId, true);
+
+        filterList.ngOnChanges({ 'appId': change });
+
+        fixture.whenStable().then(() => {
+            fixture.detectChanges();
+            expect(filterList.filters).toBeDefined();
+            expect(filterList.filters.length).toEqual(3);
+            expect(filterList.currentFilter).toBeDefined();
+            expect(filterList.currentFilter.name).toEqual('FakeMyTasks');
+            done();
+        });
+    });
+
+    it('should select the filter passed as input by name', (done) => {
+        spyOn(processFilterService, 'getProcessFilters').and.returnValue(from(fakeGlobalFilterPromise));
+
+        filterList.filterParam = new FilterProcessRepresentationModel({ name: 'FakeMyTasks' });
+
+        const appId = 1;
+        let change = new SimpleChange(null, appId, true);
+
+        filterList.ngOnChanges({ 'appId': change });
+
+        fixture.whenStable().then(() => {
+            fixture.detectChanges();
+            expect(filterList.filters).toBeDefined();
+            expect(filterList.filters.length).toEqual(3);
+            expect(filterList.currentFilter).toBeDefined();
+            expect(filterList.currentFilter.name).toEqual('FakeMyTasks');
+            done();
+        });
+    });
+
+    it('should select first filter if filterParam is empty', (done) => {
+        spyOn(processFilterService, 'getProcessFilters').and.returnValue(from(fakeGlobalFilterPromise));
+
+        filterList.filterParam = new FilterProcessRepresentationModel({});
+
+        const appId = 1;
+        let change = new SimpleChange(null, appId, true);
+
+        filterList.ngOnChanges({ 'appId': change });
+
+        fixture.whenStable().then(() => {
+            fixture.detectChanges();
+            expect(filterList.filters).toBeDefined();
+            expect(filterList.filters.length).toEqual(3);
+            expect(filterList.currentFilter).toBeDefined();
+            expect(filterList.currentFilter.name).toEqual('FakeInvolvedTasks');
+            done();
+        });
+    });
 });
diff --git a/lib/process-services/process-list/components/process-filters.component.ts b/lib/process-services/process-list/components/process-filters.component.ts
index 9a6b8eb9c2..61e8ca6d24 100644
--- a/lib/process-services/process-list/components/process-filters.component.ts
+++ b/lib/process-services/process-list/components/process-filters.component.ts
@@ -17,9 +17,8 @@
 
 import { AppsProcessService } from '@alfresco/adf-core';
 import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
-import { ProcessInstanceFilterRepresentation } from 'alfresco-js-api';
-import { Observable } from 'rxjs/Observable';
-import { Observer } from 'rxjs/Observer';
+import { ProcessInstanceFilterRepresentation, UserProcessInstanceFilterRepresentation } from 'alfresco-js-api';
+import { Observable } from 'rxjs';
 import { FilterProcessRepresentationModel } from '../models/filter-process.model';
 import { ProcessFilterService } from './../services/process-filter.service';
 
@@ -60,33 +59,29 @@ export class ProcessFiltersComponent implements OnInit, OnChanges {
     @Input()
     showIcon: boolean = true;
 
-    private filterObserver: Observer<ProcessInstanceFilterRepresentation>;
     filter$: Observable<ProcessInstanceFilterRepresentation>;
 
     currentFilter: ProcessInstanceFilterRepresentation;
 
-    filters: ProcessInstanceFilterRepresentation [] = [];
+    filters: UserProcessInstanceFilterRepresentation [] = [];
 
-    constructor(private processFilterService: ProcessFilterService, private appsProcessService: AppsProcessService) {
-        this.filter$ = new Observable<ProcessInstanceFilterRepresentation>(observer => this.filterObserver = observer).share();
+    constructor(private processFilterService: ProcessFilterService,
+                private appsProcessService: AppsProcessService) {
     }
 
-    ngOnInit() {
-        this.filter$.subscribe((filter: ProcessInstanceFilterRepresentation) => {
-            this.filters.push(filter);
-        });
-    }
+    ngOnInit() {}
 
     ngOnChanges(changes: SimpleChanges) {
-        let appId = changes['appId'];
+        const appId = changes['appId'];
+        const appName = changes['appName'];
+        const filter = changes['filterParam'];
+
         if (appId && (appId.currentValue || appId.currentValue === null)) {
             this.getFiltersByAppId(appId.currentValue);
-            return;
-        }
-        let appName = changes['appName'];
-        if (appName && appName.currentValue) {
+        } else if (appName && appName.currentValue) {
             this.getFiltersByAppName(appName.currentValue);
-            return;
+        } else if (filter && filter.currentValue !== filter.previousValue) {
+            this.selectProcessFilter(filter.currentValue);
         }
     }
 
@@ -101,10 +96,7 @@ export class ProcessFiltersComponent implements OnInit, OnChanges {
                     this.processFilterService.createDefaultFilters(appId).subscribe(
                         (resDefault: ProcessInstanceFilterRepresentation[]) => {
                             this.resetFilter();
-                            resDefault.forEach((filter) => {
-                                this.filterObserver.next(filter);
-                            });
-
+                            this.filters = resDefault;
                             this.selectProcessFilter(this.filterParam);
                             this.success.emit(resDefault);
                         },
@@ -114,10 +106,7 @@ export class ProcessFiltersComponent implements OnInit, OnChanges {
                     );
                 } else {
                     this.resetFilter();
-                    res.forEach((filter) => {
-                        this.filterObserver.next(filter);
-                    });
-
+                    this.filters = res;
                     this.selectProcessFilter(this.filterParam);
                     this.success.emit(res);
                 }
@@ -157,8 +146,10 @@ export class ProcessFiltersComponent implements OnInit, OnChanges {
      */
     public selectProcessFilter(filterParam: FilterProcessRepresentationModel) {
         if (filterParam) {
-            this.filters.filter((processFilter: ProcessInstanceFilterRepresentation, index) => {
-                if (filterParam.name && filterParam.name.toLowerCase() === processFilter.name.toLowerCase() || filterParam.index === index) {
+            this.filters.filter((processFilter: UserProcessInstanceFilterRepresentation, index) => {
+                if (filterParam.name && filterParam.name.toLowerCase() === processFilter.name.toLowerCase() ||
+                    filterParam.id === processFilter.id ||
+                    filterParam.index === index) {
                     this.currentFilter = processFilter;
                 }
             });
@@ -207,6 +198,6 @@ export class ProcessFiltersComponent implements OnInit, OnChanges {
     }
 
     private isCurrentFilterEmpty(): boolean {
-        return this.currentFilter === undefined || null ? true : false;
+        return this.currentFilter === undefined || null;
     }
 }
diff --git a/lib/process-services/process-list/components/process-instance-details.component.spec.ts b/lib/process-services/process-list/components/process-instance-details.component.spec.ts
index 69fb460edd..41326950df 100644
--- a/lib/process-services/process-list/components/process-instance-details.component.spec.ts
+++ b/lib/process-services/process-list/components/process-instance-details.component.spec.ts
@@ -18,7 +18,7 @@
 import { DebugElement, NO_ERRORS_SCHEMA, SimpleChange } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 
 import { FormModule, setupTestBed } from '@alfresco/adf-core';
 import { TaskListModule } from '../../task-list/task-list.module';
@@ -54,7 +54,7 @@ describe('ProcessInstanceDetailsComponent', () => {
         component = fixture.componentInstance;
         service = fixture.debugElement.injector.get(ProcessService);
 
-        getProcessSpy = spyOn(service, 'getProcess').and.returnValue(Observable.of(exampleProcess));
+        getProcessSpy = spyOn(service, 'getProcess').and.returnValue(of(exampleProcess));
     });
 
     it('should not load task details when no processInstanceId is specified', () => {
@@ -79,7 +79,7 @@ describe('ProcessInstanceDetailsComponent', () => {
     }));
 
     it('should display default details when the process instance has no name', async(() => {
-        getProcessSpy = getProcessSpy.and.returnValue(Observable.of(exampleProcessNoName));
+        getProcessSpy = getProcessSpy.and.returnValue(of(exampleProcessNoName));
         fixture.detectChanges();
         component.ngOnChanges({ 'processInstanceId': new SimpleChange(null, '123', true) });
         fixture.whenStable().then(() => {
diff --git a/lib/process-services/process-list/components/process-instance-tasks.component.html b/lib/process-services/process-list/components/process-instance-tasks.component.html
index bbc23e77e5..918ce0e57b 100644
--- a/lib/process-services/process-list/components/process-instance-tasks.component.html
+++ b/lib/process-services/process-list/components/process-instance-tasks.component.html
@@ -35,7 +35,7 @@
     <!--IF START TASK COMPLETED -->
     <div class="menu-container">
         <mat-list>
-            <mat-list-item class="process-tasks__task-item" (click)="clickStartTask($event)">
+            <mat-list-item class="process-tasks__task-item" (click)="clickStartTask()">
                 <mat-icon mat-list-icon>assignment</mat-icon>
                 <h3 matLine>{{ 'ADF_PROCESS_LIST.DETAILS.LABELS.START_FORM'|translate }}</h3>
                 <span matLine>
@@ -75,7 +75,7 @@
         <div mat-dialog-content class="adf-start-process-dialog-content">
             <adf-start-form [processId]="processId"
                                  [showRefreshButton]="false" [readOnlyForm]="true"
-                                 (formContentClicked)='onFormContentClick($event)'>
+                                 (formContentClicked)='onFormContentClick()'>
             </adf-start-form>
         </div>
         <div mat-dialog-actions class="adf-start-process-dialog-actions">
diff --git a/lib/process-services/process-list/components/process-instance-tasks.component.spec.ts b/lib/process-services/process-list/components/process-instance-tasks.component.spec.ts
index 550eea93a8..5bf65fad34 100644
--- a/lib/process-services/process-list/components/process-instance-tasks.component.spec.ts
+++ b/lib/process-services/process-list/components/process-instance-tasks.component.spec.ts
@@ -18,7 +18,7 @@
 import { SimpleChange } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 
 import { TaskDetailsModel } from '../../task-list';
 
@@ -50,7 +50,7 @@ describe('ProcessInstanceTasksComponent', () => {
         component = fixture.componentInstance;
         service = TestBed.get(ProcessService);
 
-        spyOn(service, 'getProcessTasks').and.returnValue(Observable.of([new TaskDetailsModel(taskDetailsMock)]));
+        spyOn(service, 'getProcessTasks').and.returnValue(of([new TaskDetailsModel(taskDetailsMock)]));
     });
 
     afterEach(() => {
diff --git a/lib/process-services/process-list/components/process-instance-tasks.component.ts b/lib/process-services/process-list/components/process-instance-tasks.component.ts
index b2a55f48f1..8d4f8c951c 100644
--- a/lib/process-services/process-list/components/process-instance-tasks.component.ts
+++ b/lib/process-services/process-list/components/process-instance-tasks.component.ts
@@ -19,11 +19,11 @@ import { LogService } from '@alfresco/adf-core';
 import { DatePipe } from '@angular/common';
 import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core';
 import { MatDialog } from '@angular/material';
-import { Observable } from 'rxjs/Observable';
-import { Observer } from 'rxjs/Observer';
+import { Observable, Observer } from 'rxjs';
 import { TaskDetailsEvent, TaskDetailsModel } from '../../task-list';
 import { ProcessInstance } from '../models/process-instance.model';
 import { ProcessService } from './../services/process.service';
+import { share } from 'rxjs/operators';
 
 @Component({
     selector: 'adf-process-instance-tasks',
@@ -71,8 +71,10 @@ export class ProcessInstanceTasksComponent implements OnInit, OnChanges {
     constructor(private activitiProcess: ProcessService,
                 private logService: LogService,
                 private dialog: MatDialog) {
-        this.task$ = new Observable<TaskDetailsModel>(observer => this.taskObserver = observer).share();
-        this.completedTask$ = new Observable<TaskDetailsModel>(observer => this.completedTaskObserver = observer).share();
+        this.task$ = new Observable<TaskDetailsModel>(observer => this.taskObserver = observer)
+            .pipe(share());
+        this.completedTask$ = new Observable<TaskDetailsModel>(observer => this.completedTaskObserver = observer)
+            .pipe(share());
     }
 
     ngOnInit() {
diff --git a/lib/process-services/process-list/components/process-list.component.html b/lib/process-services/process-list/components/process-list.component.html
index 8d0fecea57..a1786d66df 100644
--- a/lib/process-services/process-list/components/process-list.component.html
+++ b/lib/process-services/process-list/components/process-list.component.html
@@ -1,5 +1,7 @@
 <adf-datatable #dataTable
         [data]="data"
+        [rows]="rows"
+        [columns]="columns"
         [sorting]="sorting"
         [loading]="isLoading"
         [selectionMode]="selectionMode"
diff --git a/lib/process-services/process-list/components/process-list.component.spec.ts b/lib/process-services/process-list/components/process-list.component.spec.ts
index 10b050b0ba..f7109c9f5a 100644
--- a/lib/process-services/process-list/components/process-list.component.spec.ts
+++ b/lib/process-services/process-list/components/process-list.component.spec.ts
@@ -17,17 +17,18 @@
 
 import { Component, SimpleChange, ViewChild, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
-import { Observable } from 'rxjs/Observable';
+import { of, throwError } from 'rxjs';
 import { By } from '@angular/platform-browser';
 
 import { ProcessInstanceListComponent } from './process-list.component';
 
 import { AppConfigService, setupTestBed, CoreModule } from '@alfresco/adf-core';
-import { DataRowEvent, DataSorting, ObjectDataRow, ObjectDataTableAdapter } from '@alfresco/adf-core';
+import { DataRowEvent, ObjectDataRow, ObjectDataTableAdapter } from '@alfresco/adf-core';
 
 import { fakeProcessInstance, fakeProcessInstancesWithNoName } from '../../mock';
 import { ProcessService } from '../services/process.service';
 import { ProcessTestingModule } from '../../testing/process.testing.module';
+import { fakeProcessCutomSchema } from '../../mock';
 
 describe('ProcessInstanceListComponent', () => {
 
@@ -37,39 +38,6 @@ describe('ProcessInstanceListComponent', () => {
     let getProcessInstancesSpy: jasmine.Spy;
     let appConfig: AppConfigService;
 
-    let fakeCutomSchema = [
-        {
-            'key': 'fakeName',
-            'type': 'text',
-            'title': 'ADF_PROCESS_LIST.PROPERTIES.FAKE',
-            'sortable': true
-        },
-        {
-            'key': 'fakeProcessName',
-            'type': 'text',
-            'title': 'ADF_PROCESS_LIST.PROPERTIES.PROCESS_FAKE',
-            'sortable': true
-        }
-    ];
-
-    let fakeColumnSchema = {
-        'default': [
-                {
-                    'key': 'name',
-                    'type': 'text',
-                    'title': 'ADF_PROCESS_LIST.PROPERTIES.NAME',
-                    'sortable': true
-                },
-                {
-                    'key': 'created',
-                    'type': 'text',
-                    'title': 'ADF_PROCESS_LIST.PROPERTIES.CREATED',
-                    'cssClass': 'hidden',
-                    'sortable': true
-                }
-            ]
-        , fakeCutomSchema };
-
     setupTestBed({
         imports: [
             ProcessTestingModule
@@ -82,10 +50,10 @@ describe('ProcessInstanceListComponent', () => {
         appConfig = TestBed.get(AppConfigService);
         service = TestBed.get(ProcessService);
 
-        getProcessInstancesSpy = spyOn(service, 'getProcessInstances').and.returnValue(Observable.of(fakeProcessInstance));
+        getProcessInstancesSpy = spyOn(service, 'getProcessInstances').and.returnValue(of(fakeProcessInstance));
         appConfig.config['adf-process-list'] = {
             'presets': {
-                'fakeCutomSchema': [
+                'fakeProcessCutomSchema': [
                     {
                         'key': 'fakeName',
                         'type': 'text',
@@ -105,8 +73,8 @@ describe('ProcessInstanceListComponent', () => {
 
     it('should use the default schemaColumn as default', () => {
         component.ngAfterContentInit();
-        expect(component.data.getColumns()).toBeDefined();
-        expect(component.data.getColumns().length).toEqual(2);
+        expect(component.columns).toBeDefined();
+        expect(component.columns.length).toEqual(2);
     });
 
     it('should use the schemaColumn passed in input', () => {
@@ -123,22 +91,23 @@ describe('ProcessInstanceListComponent', () => {
     });
 
     it('should fetch the custom schemaColumn from app.config.json', () => {
+        component.presetColumn = 'fakeProcessCutomSchema';
         component.ngAfterContentInit();
         fixture.detectChanges();
-        expect(component.layoutPresets).toEqual(fakeColumnSchema);
+        expect(component.columns).toEqual(fakeProcessCutomSchema);
     });
 
     it('should fetch custom schemaColumn when the input presetColumn is defined', () => {
-        component.presetColumn = 'fakeCutomSchema';
+        component.presetColumn = 'fakeProcessCutomSchema';
         component.ngAfterContentInit();
         fixture.detectChanges();
-        expect(component.data.getColumns()).toBeDefined();
-        expect(component.data.getColumns().length).toEqual(2);
+        expect(component.columns).toBeDefined();
+        expect(component.columns.length).toEqual(2);
     });
 
     it('should return an empty process list when no input parameters are passed', () => {
         component.ngAfterContentInit();
-        expect(component.data).toBeDefined();
+        expect(component.rows).toBeDefined();
         expect(component.isListEmpty()).toBeTruthy();
     });
 
@@ -164,86 +133,23 @@ describe('ProcessInstanceListComponent', () => {
         component.processDefinitionKey = null;
         component.success.subscribe((res) => {
             expect(res).toBeDefined();
-            expect(component.data).toBeDefined();
+            expect(component.rows).toBeDefined();
             expect(component.isListEmpty()).not.toBeTruthy();
-            expect(component.data.getRows().length).toEqual(2);
-            expect(component.data.getRows()[0].getValue('name')).toEqual('Process 773443333');
-            expect(component.data.getRows()[1].getValue('name')).toEqual('Process 382927392');
-        });
-        fixture.detectChanges();
-    }));
-
-    it('should order the process instances by name column when no sort passed', async(() => {
-        component.appId = 1;
-        component.state = 'open';
-        component.processDefinitionKey = null;
-        component.success.subscribe((res) => {
-            expect(res).toBeDefined();
-            expect(component.data).toBeDefined();
-            expect(component.isListEmpty()).not.toBeTruthy();
-            expect(component.data.getRows().length).toEqual(2);
-            expect(component.data.getRows()[0].getValue('name')).toEqual('Process 382927392');
-            expect(component.data.getRows()[1].getValue('name')).toEqual('Process 773443333');
-        });
-        fixture.detectChanges();
-    }));
-
-    it('should order the process instances by descending column when specified', async(() => {
-        component.appId = 1;
-        component.state = 'open';
-        component.processDefinitionKey = null;
-        component.sort = 'name-desc';
-        component.success.subscribe((res) => {
-            expect(res).toBeDefined();
-            expect(component.data).toBeDefined();
-            expect(component.isListEmpty()).not.toBeTruthy();
-            expect(component.data.getRows().length).toEqual(2);
-            expect(component.data.getRows()[0].getValue('name')).toEqual('Process 773443333');
-            expect(component.data.getRows()[1].getValue('name')).toEqual('Process 382927392');
-        });
-        fixture.detectChanges();
-    }));
-
-    it('should order the process instances by ascending column when specified', async(() => {
-        component.appId = 1;
-        component.state = 'open';
-        component.processDefinitionKey = null;
-        component.sort = 'started-asc';
-        component.success.subscribe((res) => {
-            expect(res).toBeDefined();
-            expect(component.data).toBeDefined();
-            expect(component.isListEmpty()).not.toBeTruthy();
-            expect(component.data.getRows().length).toEqual(2);
-            expect(component.data.getRows()[0].getValue('name')).toEqual('Process 773443333');
-            expect(component.data.getRows()[1].getValue('name')).toEqual('Process 382927392');
-        });
-        fixture.detectChanges();
-    }));
-
-    it('should order the process instances by descending start date when specified', async(() => {
-        component.appId = 1;
-        component.state = 'open';
-        component.processDefinitionKey = null;
-        component.sort = 'started-desc';
-        component.success.subscribe((res) => {
-            expect(res).toBeDefined();
-            expect(component.data).toBeDefined();
-            expect(component.isListEmpty()).not.toBeTruthy();
-            expect(component.data.getRows().length).toEqual(2);
-            expect(component.data.getRows()[0].getValue('name')).toEqual('Process 382927392');
-            expect(component.data.getRows()[1].getValue('name')).toEqual('Process 773443333');
+            expect(component.rows.length).toEqual(2);
+            expect(component.rows[0]['name']).toEqual('Process 773443333');
+            expect(component.rows[1]['name']).toEqual('Process 382927392');
         });
         fixture.detectChanges();
     }));
 
     it('should return a default name if no name is specified on the process', async(() => {
-        getProcessInstancesSpy = getProcessInstancesSpy.and.returnValue(Observable.of(fakeProcessInstancesWithNoName));
+        getProcessInstancesSpy = getProcessInstancesSpy.and.returnValue(of(fakeProcessInstancesWithNoName));
         component.appId = 1;
         component.state = 'open';
         component.processDefinitionKey = 'fakeprocess';
         component.success.subscribe( (res) => {
-            expect(component.data.getRows()[0].getValue('name')).toEqual('Fake Process Name - Nov 9, 2017, 12:36:14 PM');
-            expect(component.data.getRows()[1].getValue('name')).toEqual('Fake Process Name - Nov 9, 2017, 12:37:25 PM');
+            expect(component.rows[0]['name']).toEqual('Fake Process Name - Nov 9, 2017, 12:36:14 PM');
+            expect(component.rows[1]['name']).toEqual('Fake Process Name - Nov 9, 2017, 12:37:25 PM');
         });
         fixture.detectChanges();
     }));
@@ -254,50 +160,34 @@ describe('ProcessInstanceListComponent', () => {
     });
 
     it('should return selected true for the selected process', () => {
-        component.data = new ObjectDataTableAdapter(
+        component.rows =
             [
                 { id: '999', name: 'Fake-name' },
                 { id: '888', name: 'Fake-name-888' }
-            ],
-            [
-                { type: 'text', key: 'id', title: 'Id' },
-                { type: 'text', key: 'name', title: 'Name' }
-            ]
-        );
+            ];
         component.selectFirst();
-        const dataRow = component.data.getRows();
+        const dataRow = component.rows[0];
         expect(dataRow).toBeDefined();
-        expect(dataRow[0].getValue('id')).toEqual('999');
-        expect(dataRow[0].isSelected).toEqual(true);
-        expect(dataRow[1].getValue('id')).toEqual('888');
-        expect(dataRow[1].isSelected).toEqual(false);
+        expect(component.currentInstanceId).toEqual('999');
     });
 
     it('should not select first row when selectFirstRow is false', () => {
-        component.data = new ObjectDataTableAdapter(
+        component.rows =
             [
                 { id: '999', name: 'Fake-name' },
                 { id: '888', name: 'Fake-name-888' }
-            ],
-            [
-                { type: 'text', key: 'id', title: 'Id' },
-                { type: 'text', key: 'name', title: 'Name' }
-            ]
-        );
+            ];
         component.selectFirstRow = false;
         component.selectFirst();
-        const dataRow = component.data.getRows();
+        const dataRow = component.rows;
         expect(dataRow).toBeDefined();
-        expect(dataRow[0].getValue('id')).toEqual('999');
-        expect(dataRow[0].isSelected).toEqual(false);
-        expect(dataRow[1].getValue('id')).toEqual('888');
-        expect(dataRow[1].isSelected).toEqual(false);
+        expect(dataRow[0]['id']).toEqual('999');
     });
 
     it('should throw an exception when the response is wrong', fakeAsync(() => {
         let emitSpy: jasmine.Spy = spyOn(component.error, 'emit');
         let mockError = 'Fake server error';
-        getProcessInstancesSpy.and.returnValue(Observable.throw(mockError));
+        getProcessInstancesSpy.and.returnValue(throwError(mockError));
         component.appId = 1;
         component.state = 'open';
         fixture.detectChanges();
@@ -327,10 +217,10 @@ describe('ProcessInstanceListComponent', () => {
         component.state = 'open';
         component.success.subscribe( (res) => {
             expect(res).toBeDefined();
-            expect(component.data).toBeDefined();
+            expect(component.rows).toBeDefined();
             expect(component.isListEmpty()).not.toBeTruthy();
-            expect(component.data.getRows().length).toEqual(2);
-            expect(component.data.getRows()[0].getValue('name')).toEqual('Process 773443333');
+            expect(component.rows.length).toEqual(2);
+            expect(component.rows[0]['name']).toEqual('Process 773443333');
             done();
         });
         component.reload();
@@ -410,8 +300,8 @@ describe('ProcessInstanceListComponent', () => {
                 expect(res).toBeDefined();
                 expect(component.data).toBeDefined();
                 expect(component.isListEmpty()).not.toBeTruthy();
-                expect(component.data.getRows().length).toEqual(2);
-                expect(component.data.getRows()[0].getValue('name')).toEqual('Process 773443333');
+                expect(component.rows.length).toEqual(2);
+                expect(component.rows[0]['name']).toEqual('Process 773443333');
                 done();
             });
 
@@ -424,10 +314,10 @@ describe('ProcessInstanceListComponent', () => {
 
             component.success.subscribe((res) => {
                 expect(res).toBeDefined();
-                expect(component.data).toBeDefined();
+                expect(component.rows).toBeDefined();
                 expect(component.isListEmpty()).not.toBeTruthy();
-                expect(component.data.getRows().length).toEqual(2);
-                expect(component.data.getRows()[0].getValue('name')).toEqual('Process 773443333');
+                expect(component.rows.length).toEqual(2);
+                expect(component.rows[0]['name']).toEqual('Process 773443333');
                 done();
             });
 
@@ -440,10 +330,10 @@ describe('ProcessInstanceListComponent', () => {
 
             component.success.subscribe((res) => {
                 expect(res).toBeDefined();
-                expect(component.data).toBeDefined();
+                expect(component.rows).toBeDefined();
                 expect(component.isListEmpty()).not.toBeTruthy();
-                expect(component.data.getRows().length).toEqual(2);
-                expect(component.data.getRows()[0].getValue('name')).toEqual('Process 773443333');
+                expect(component.rows.length).toEqual(2);
+                expect(component.rows[0].name).toEqual('Process 773443333');
                 done();
             });
 
@@ -456,45 +346,110 @@ describe('ProcessInstanceListComponent', () => {
 
             component.success.subscribe((res) => {
                 expect(res).toBeDefined();
-                expect(component.data).toBeDefined();
+                expect(component.rows).toBeDefined();
                 expect(component.isListEmpty()).not.toBeTruthy();
-                expect(component.data.getRows().length).toEqual(2);
-                expect(component.data.getRows()[0].getValue('name')).toEqual('Process 773443333');
+                expect(component.rows.length).toEqual(2);
+                expect(component.rows[0]['name']).toEqual('Process 773443333');
                 done();
             });
 
             component.ngOnChanges({'sort': change});
         });
 
-        it('should sort the list when the sort parameter changes', (done) => {
-            const sort = 'created-asc';
-            let change = new SimpleChange(null, sort, true);
-            let sortSpy = spyOn(component.data, 'setSorting');
+        it('should reload the process list when the processDefinitionKey parameter changes', (done) => {
+            const processDefinitionKey = 'SimpleProcess';
+            let change = new SimpleChange(null, processDefinitionKey, true);
 
             component.success.subscribe((res) => {
                 expect(res).toBeDefined();
-                expect(sortSpy).toHaveBeenCalledWith(new DataSorting('started', 'asc'));
+                expect(component.rows).toBeDefined();
+                expect(component.isListEmpty()).not.toBeTruthy();
+                expect(component.rows.length).toEqual(2);
+                expect(component.rows[0].name).toEqual('Process 773443333');
                 done();
             });
 
-            component.sort = sort;
-            component.ngOnChanges({'sort': change});
+            component.ngOnChanges({'processDefinitionKey': change});
         });
 
-        it('should reload the process list when the name parameter changes', (done) => {
-            const name = 'FakeTaskName';
-            let change = new SimpleChange(null, name, true);
+        it('should reload the process list when the processDefinitionKey parameter changes to null', (done) => {
+            const processDefinitionKey = null;
+            let change = new SimpleChange('SimpleProcess', processDefinitionKey, false);
 
             component.success.subscribe((res) => {
                 expect(res).toBeDefined();
-                expect(component.data).toBeDefined();
+                expect(component.rows).toBeDefined();
                 expect(component.isListEmpty()).not.toBeTruthy();
-                expect(component.data.getRows().length).toEqual(2);
-                expect(component.data.getRows()[0].getValue('name')).toEqual('Process 773443333');
+                expect(component.rows.length).toEqual(2);
+                expect(component.rows[0].name).toEqual('Process 773443333');
                 done();
             });
 
-            component.ngOnChanges({'name': change});
+            component.ngOnChanges({'processDefinitionKey': change});
+        });
+
+        it('should reload the process list when the processDefinitionId parameter changes', (done) => {
+            const processDefinitionId = 'SimpleProcess:1:10';
+            let change = new SimpleChange(null, processDefinitionId, true);
+
+            component.success.subscribe((res) => {
+                expect(res).toBeDefined();
+                expect(component.rows).toBeDefined();
+                expect(component.isListEmpty()).not.toBeTruthy();
+                expect(component.rows.length).toEqual(2);
+                expect(component.rows[0].name).toEqual('Process 773443333');
+                done();
+            });
+
+            component.ngOnChanges({'processDefinitionId': change});
+        });
+
+        it('should reload the process list when the processDefinitionId parameter changes to null', (done) => {
+            const processDefinitionId = null;
+            let change = new SimpleChange('SimpleProcess:1:10', processDefinitionId, false);
+
+            component.success.subscribe((res) => {
+                expect(res).toBeDefined();
+                expect(component.rows).toBeDefined();
+                expect(component.isListEmpty()).not.toBeTruthy();
+                expect(component.rows.length).toEqual(2);
+                expect(component.rows[0].name).toEqual('Process 773443333');
+                done();
+            });
+
+            component.ngOnChanges({'processDefinitionId': change});
+        });
+
+        it('should reload the process list when the processInstanceId parameter changes', (done) => {
+            const processInstanceId = '123';
+            let change = new SimpleChange(null, processInstanceId, true);
+
+            component.success.subscribe((res) => {
+                expect(res).toBeDefined();
+                expect(component.rows).toBeDefined();
+                expect(component.isListEmpty()).not.toBeTruthy();
+                expect(component.rows.length).toEqual(2);
+                expect(component.rows[0].name).toEqual('Process 773443333');
+                done();
+            });
+
+            component.ngOnChanges({'processInstanceId': change});
+        });
+
+        it('should reload the process list when the processInstanceId parameter changes to null', (done) => {
+            const processInstanceId = null;
+            let change = new SimpleChange('123', processInstanceId, false);
+
+            component.success.subscribe((res) => {
+                expect(res).toBeDefined();
+                expect(component.rows).toBeDefined();
+                expect(component.isListEmpty()).not.toBeTruthy();
+                expect(component.rows.length).toEqual(2);
+                expect(component.rows[0].name).toEqual('Process 773443333');
+                done();
+            });
+
+            component.ngOnChanges({'processInstanceId': change});
         });
     });
 });
@@ -542,10 +497,10 @@ describe('CustomProcessListComponent', () => {
 
     it('should fetch custom schemaColumn from html', () => {
         fixture.detectChanges();
-        expect(component.processList.data.getColumns()).toBeDefined();
-        expect(component.processList.data.getColumns()[1].title).toEqual('ADF_PROCESS_LIST.PROPERTIES.END_DATE');
-        expect(component.processList.data.getColumns()[2].title).toEqual('ADF_PROCESS_LIST.PROPERTIES.CREATED');
-        expect(component.processList.data.getColumns().length).toEqual(3);
+        expect(component.processList.columns).toBeDefined();
+        expect(component.processList.columns.length).toEqual(3);
+        expect(component.processList.columns[1]['title']).toEqual('ADF_PROCESS_LIST.PROPERTIES.END_DATE');
+        expect(component.processList.columns[2]['title']).toEqual('ADF_PROCESS_LIST.PROPERTIES.CREATED');
     });
 });
 
diff --git a/lib/process-services/process-list/components/process-list.component.ts b/lib/process-services/process-list/components/process-list.component.ts
index ec0285ec31..d7506f57e1 100644
--- a/lib/process-services/process-list/components/process-list.component.ts
+++ b/lib/process-services/process-list/components/process-list.component.ts
@@ -16,19 +16,13 @@
  */
 
 import {
-    DataColumn,
+    DataTableSchema,
     DataRowEvent,
-    DataSorting,
-    DataTableComponent,
     DataTableAdapter,
-    ObjectDataColumn,
-    ObjectDataRow,
-    ObjectDataTableAdapter,
     EmptyCustomContentDirective
 } from '@alfresco/adf-core';
 import {
     AppConfigService,
-    DataColumnListComponent,
     PaginatedComponent,
     PaginationComponent,
     PaginationModel,
@@ -43,13 +37,12 @@ import {
     Input,
     OnChanges,
     Output,
-    SimpleChanges,
-    ViewChild
+    SimpleChanges
 } from '@angular/core';
 import { ProcessFilterParamRepresentationModel } from '../models/filter-process.model';
 import { processPresetsDefaultModel } from '../models/process-preset.model';
 import { ProcessService } from '../services/process.service';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
+import { BehaviorSubject } from 'rxjs';
 import { ProcessListModel } from '../models/process-list.model';
 
 @Component({
@@ -57,22 +50,30 @@ import { ProcessListModel } from '../models/process-list.model';
     styleUrls: ['./process-list.component.css'],
     templateUrl: './process-list.component.html'
 })
-export class ProcessInstanceListComponent implements OnChanges, AfterContentInit, PaginatedComponent {
+export class ProcessInstanceListComponent extends DataTableSchema  implements OnChanges, AfterContentInit, PaginatedComponent {
 
-    @ContentChild(DataColumnListComponent) columnList: DataColumnListComponent;
+    static PRESET_KEY = 'adf-process-list.presets';
 
     @ContentChild(EmptyCustomContentDirective) emptyCustomContent: EmptyCustomContentDirective;
 
-    @ViewChild('dataTable') dataTable: DataTableComponent;
-
     /** The id of the app. */
     @Input()
     appId: number;
 
-    /** The processDefinitionKey of the process. */
+    /** The Definition Key of the process.
+     * @deprecated 2.4.0
+     */
     @Input()
     processDefinitionKey: string;
 
+    /** The Definition Id of the process. */
+    @Input()
+    processDefinitionId: string;
+
+    /** The id of the process instance. */
+    @Input()
+    processInstanceId: number|string;
+
     /** Defines the state of the processes. Possible values are `running`, `completed` and `all` */
     @Input()
     state: string;
@@ -83,10 +84,6 @@ export class ProcessInstanceListComponent implements OnChanges, AfterContentInit
     @Input()
     sort: string;
 
-    /** The name of the list. */
-    @Input()
-    name: string;
-
     /** The page number of the processes to fetch. */
     @Input()
     page: number = 0;
@@ -95,10 +92,6 @@ export class ProcessInstanceListComponent implements OnChanges, AfterContentInit
     @Input()
     size: number = PaginationComponent.DEFAULT_PAGINATION.maxItems;
 
-    /** Name of a custom schema to fetch from `app.config.json`. */
-    @Input()
-    presetColumn: string;
-
     /** Data source to define the datatable. */
     @Input()
     data: DataTableAdapter;
@@ -133,14 +126,15 @@ export class ProcessInstanceListComponent implements OnChanges, AfterContentInit
     requestNode: ProcessFilterParamRepresentationModel;
     currentInstanceId: string;
     isLoading: boolean = true;
-    layoutPresets = {};
+    rows: any[] = [];
     sorting: any[] = ['created', 'desc'];
 
     pagination: BehaviorSubject<PaginationModel>;
 
     constructor(private processService: ProcessService,
                 private userPreferences: UserPreferencesService,
-                private appConfig: AppConfigService) {
+                appConfig: AppConfigService) {
+        super(appConfig, ProcessInstanceListComponent.PRESET_KEY, processPresetsDefaultModel);
         this.size = this.userPreferences.paginationSize;
 
         this.pagination = new BehaviorSubject<PaginationModel>(<PaginationModel> {
@@ -151,24 +145,13 @@ export class ProcessInstanceListComponent implements OnChanges, AfterContentInit
     }
 
     ngAfterContentInit() {
-        this.loadLayoutPresets();
-        this.setupSchema();
-
-        if (this.appId) {
-            this.reload();
+        this.createDatatableSchema();
+        if (this.data && this.data.getColumns().length === 0) {
+            this.data.setColumns(this.columns);
         }
-    }
 
-    /**
-     * Setup html-based (html definitions) or code behind (data adapter) schema.
-     * If component is assigned with an empty data adater the default schema settings applied.
-     */
-    setupSchema() {
-        let schema = this.getSchema();
-        if (!this.data) {
-            this.data = new ObjectDataTableAdapter([], schema);
-        } else if (this.data.getColumns().length === 0) {
-            this.data.setColumns(schema);
+        if (this.appId != null) {
+            this.reload();
         }
     }
 
@@ -191,22 +174,25 @@ export class ProcessInstanceListComponent implements OnChanges, AfterContentInit
 
         let appId = changes['appId'];
         let processDefinitionKey = changes['processDefinitionKey'];
+        let processDefinitionId = changes['processDefinitionId'];
+        let processInstanceId = changes['processInstanceId'];
         let state = changes['state'];
         let sort = changes['sort'];
-        let name = changes['name'];
         let page = changes['page'];
         let size = changes['size'];
 
         if (appId && appId.currentValue) {
             changed = true;
-        } else if (processDefinitionKey && processDefinitionKey.currentValue) {
+        } else if (processDefinitionKey) {
+            changed = true;
+        } else if (processDefinitionId) {
+            changed = true;
+        } else if (processInstanceId) {
             changed = true;
         } else if (state && state.currentValue) {
             changed = true;
         } else if (sort && sort.currentValue) {
             changed = true;
-        } else if (name && name.currentValue) {
-            changed = true;
         } else if (page && page.currentValue !== page.previousValue) {
             changed = true;
         } else if (size && size.currentValue !== size.previousValue) {
@@ -225,8 +211,7 @@ export class ProcessInstanceListComponent implements OnChanges, AfterContentInit
         this.processService.getProcessInstances(requestNode, this.processDefinitionKey)
             .subscribe(
                 (response) => {
-                    let instancesRow = this.createDataRow(response.data);
-                    this.renderInstances(instancesRow);
+                    this.rows = this.optimizeNames(response.data);
                     this.selectFirst();
                     this.success.emit(response);
                     this.isLoading = false;
@@ -243,59 +228,16 @@ export class ProcessInstanceListComponent implements OnChanges, AfterContentInit
                 });
     }
 
-    /**
-     * Create an array of ObjectDataRow
-     * @param instances
-     */
-    private createDataRow(instances: any[]): ObjectDataRow[] {
-        let instancesRows: ObjectDataRow[] = [];
-        instances.forEach((row) => {
-            instancesRows.push(new ObjectDataRow(row));
-        });
-        return instancesRows;
-    }
-
-    /**
-     * Render the instances list
-     *
-     * @param instances
-     */
-    private renderInstances(instances: any[]) {
-        instances = this.optimizeNames(instances);
-        this.dataTable.resetSelection();
-        this.setDatatableSorting();
-        this.data.setRows(instances);
-    }
-
-    /**
-     * Sort the datatable rows based on current value of 'sort' property
-     */
-    private setDatatableSorting() {
-        if (!this.sort) {
-            return;
-        }
-        let sortingParams: string[] = this.sort.split('-');
-        if (sortingParams.length === 2) {
-            let sortColumn = sortingParams[0] === 'created' ? 'started' : sortingParams[0];
-            let sortOrder = sortingParams[1];
-            this.data.setSorting(new DataSorting(sortColumn, sortOrder));
-        }
-    }
-
     /**
      * Select the first instance of a list if present
      */
     selectFirst() {
         if (this.selectFirstRow) {
             if (!this.isListEmpty()) {
-                let row = this.data.getRows()[0];
-                row.isSelected = true;
-                this.data.selectedRow = row;
-                this.currentInstanceId = row.getValue('id');
+                let dataRow = this.rows[0];
+                dataRow.isSelected = true;
+                this.currentInstanceId = dataRow['id'];
             } else {
-                if (this.data) {
-                    this.data.selectedRow = null;
-                }
                 this.currentInstanceId = null;
             }
         }
@@ -312,8 +254,7 @@ export class ProcessInstanceListComponent implements OnChanges, AfterContentInit
      * Check if the list is empty
      */
     isListEmpty(): boolean {
-        return this.data === undefined ||
-            (this.data && this.data.getRows() && this.data.getRows().length === 0);
+        return !this.rows || this.rows.length === 0;
     }
 
     /**
@@ -343,9 +284,9 @@ export class ProcessInstanceListComponent implements OnChanges, AfterContentInit
      * @param instances
      */
     private optimizeNames(instances: any[]): any[] {
-        instances = instances.map(t => {
-            t.obj.name = this.getProcessNameOrDescription(t.obj, 'medium');
-            return t;
+        instances = instances.map(instance => {
+            instance.name = this.getProcessNameOrDescription(instance, 'medium');
+            return instance;
         });
         return instances;
     }
@@ -371,6 +312,8 @@ export class ProcessInstanceListComponent implements OnChanges, AfterContentInit
     private createRequestNode() {
         let requestNode = {
             appDefinitionId: this.appId,
+            processDefinitionId: this.processDefinitionId,
+            processInstanceId: this.processInstanceId,
             state: this.state,
             sort: this.sort,
             page: this.page,
@@ -380,41 +323,6 @@ export class ProcessInstanceListComponent implements OnChanges, AfterContentInit
         return new ProcessFilterParamRepresentationModel(requestNode);
     }
 
-    private loadLayoutPresets(): void {
-        const externalSettings = this.appConfig.get('adf-process-list.presets', null);
-
-        if (externalSettings) {
-            this.layoutPresets = Object.assign({}, processPresetsDefaultModel, externalSettings);
-        } else {
-            this.layoutPresets = processPresetsDefaultModel;
-        }
-    }
-
-    getSchema(): any {
-        let customSchemaColumns = [];
-        customSchemaColumns = this.getSchemaFromConfig(this.presetColumn).concat(this.getSchemaFromHtml());
-        if (customSchemaColumns.length === 0) {
-            customSchemaColumns = this.getDefaultLayoutPreset();
-        }
-        return customSchemaColumns;
-    }
-
-    getSchemaFromHtml(): any {
-        let schema = [];
-        if (this.columnList && this.columnList.columns && this.columnList.columns.length > 0) {
-            schema = this.columnList.columns.map(c => <DataColumn> c);
-        }
-        return schema;
-    }
-
-    private getSchemaFromConfig(name: string): DataColumn[] {
-        return name ? (this.layoutPresets[name]).map(col => new ObjectDataColumn(col)) : [];
-    }
-
-    private getDefaultLayoutPreset(): DataColumn[] {
-        return (this.layoutPresets['default']).map(col => new ObjectDataColumn(col));
-    }
-
     updatePagination(params: PaginationModel) {
         const needsReload = params.maxItems || params.skipCount;
         this.size = params.maxItems;
@@ -427,8 +335,4 @@ export class ProcessInstanceListComponent implements OnChanges, AfterContentInit
     currentPage(skipCount: number, maxItems: number): number {
         return (skipCount && maxItems) ? Math.floor(skipCount / maxItems) : 0;
     }
-
-    get supportedPageSizes(): number[] {
-        return this.userPreferences.getDefaultPageSizes();
-    }
 }
diff --git a/lib/process-services/process-list/components/start-process.component.spec.ts b/lib/process-services/process-list/components/start-process.component.spec.ts
index 0c75ca24f4..02f1c29d72 100644
--- a/lib/process-services/process-list/components/start-process.component.spec.ts
+++ b/lib/process-services/process-list/components/start-process.component.spec.ts
@@ -18,7 +18,7 @@
 import { SimpleChange } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivitiContentService, AppConfigService, FormService, setupTestBed } from '@alfresco/adf-core';
-import { Observable } from 'rxjs/Observable';
+import { of, throwError } from 'rxjs';
 
 import { ProcessInstanceVariable } from '../models/process-instance-variable.model';
 import { ProcessService } from '../services/process.service';
@@ -59,10 +59,10 @@ describe('StartFormComponent', () => {
         processService = TestBed.get(ProcessService);
         formService = TestBed.get(FormService);
 
-        getDefinitionsSpy = spyOn(processService, 'getProcessDefinitions').and.returnValue(Observable.of(testMultipleProcessDefs));
-        startProcessSpy = spyOn(processService, 'startProcess').and.returnValue(Observable.of(newProcess));
-        getStartFormDefinitionSpy = spyOn(formService, 'getStartFormDefinition').and.returnValue(Observable.of(taskFormMock));
-        spyOn(activitiContentService, 'applyAlfrescoNode').and.returnValue(Observable.of({ id: 1234 }));
+        getDefinitionsSpy = spyOn(processService, 'getProcessDefinitions').and.returnValue(of(testMultipleProcessDefs));
+        startProcessSpy = spyOn(processService, 'startProcess').and.returnValue(of(newProcess));
+        getStartFormDefinitionSpy = spyOn(formService, 'getStartFormDefinition').and.returnValue(of(taskFormMock));
+        spyOn(activitiContentService, 'applyAlfrescoNode').and.returnValue(of({ id: 1234 }));
     });
 
     afterEach(() => {
@@ -122,7 +122,7 @@ describe('StartFormComponent', () => {
         describe('with start form', () => {
 
             beforeEach(() => {
-                getDefinitionsSpy.and.returnValue(Observable.of(testProcessDefWithForm));
+                getDefinitionsSpy.and.returnValue(of(testProcessDefWithForm));
                 let change = new SimpleChange(null, 123, true);
                 component.ngOnChanges({ 'appId': change });
             });
@@ -243,7 +243,7 @@ describe('StartFormComponent', () => {
         });
 
         it('should indicate an error to the user if process defs cannot be loaded', async(() => {
-            getDefinitionsSpy = getDefinitionsSpy.and.returnValue(Observable.throw({}));
+            getDefinitionsSpy = getDefinitionsSpy.and.returnValue(throwError({}));
             component.appId = 123;
             component.ngOnChanges({});
             fixture.detectChanges();
@@ -256,7 +256,7 @@ describe('StartFormComponent', () => {
         }));
 
         it('should show no process available message when no process definition is loaded', async(() => {
-            getDefinitionsSpy = getDefinitionsSpy.and.returnValue(Observable.of([]));
+            getDefinitionsSpy = getDefinitionsSpy.and.returnValue(of([]));
             component.appId = 123;
             component.ngOnChanges({});
             fixture.detectChanges();
@@ -269,7 +269,7 @@ describe('StartFormComponent', () => {
         }));
 
         it('should select processDefinition based on processDefinition input', async(() => {
-            getDefinitionsSpy = getDefinitionsSpy.and.returnValue(Observable.of(testMultipleProcessDefs));
+            getDefinitionsSpy = getDefinitionsSpy.and.returnValue(of(testMultipleProcessDefs));
             component.appId = 123;
             component.processDefinitionName = 'My Process 2';
             component.ngOnChanges({});
@@ -280,7 +280,7 @@ describe('StartFormComponent', () => {
         }));
 
         it('should select automatically the processDefinition if the app contain oly one', async(() => {
-            getDefinitionsSpy = getDefinitionsSpy.and.returnValue(Observable.of(testProcessDefinitions));
+            getDefinitionsSpy = getDefinitionsSpy.and.returnValue(of(testProcessDefinitions));
             component.appId = 123;
             component.ngOnChanges({});
             fixture.detectChanges();
@@ -292,7 +292,7 @@ describe('StartFormComponent', () => {
         describe('dropdown', () => {
 
             it('should hide the process dropdown if showSelectProcessDropdown is false', async(() => {
-                getDefinitionsSpy = getDefinitionsSpy.and.returnValue(Observable.of([testProcessDefRepr]));
+                getDefinitionsSpy = getDefinitionsSpy.and.returnValue(of([testProcessDefRepr]));
                 component.appId = 123;
                 component.showSelectProcessDropdown = false;
                 component.ngOnChanges({});
@@ -304,7 +304,7 @@ describe('StartFormComponent', () => {
             }));
 
             it('should show the process dropdown if showSelectProcessDropdown is false', async(() => {
-                getDefinitionsSpy = getDefinitionsSpy.and.returnValue(Observable.of(testMultipleProcessDefs));
+                getDefinitionsSpy = getDefinitionsSpy.and.returnValue(of(testMultipleProcessDefs));
                 component.appId = 123;
                 component.processDefinitionName = 'My Process 2';
                 component.showSelectProcessDropdown = true;
@@ -317,7 +317,7 @@ describe('StartFormComponent', () => {
             }));
 
             it('should show the process dropdown by default', async(() => {
-                getDefinitionsSpy = getDefinitionsSpy.and.returnValue(Observable.of(testMultipleProcessDefs));
+                getDefinitionsSpy = getDefinitionsSpy.and.returnValue(of(testMultipleProcessDefs));
                 component.appId = 123;
                 component.processDefinitionName = 'My Process 2';
                 component.ngOnChanges({});
@@ -421,7 +421,7 @@ describe('StartFormComponent', () => {
         it('should throw error event when process cannot be started', async(() => {
             let errorSpy = spyOn(component.error, 'error');
             let error = { message: 'My error' };
-            startProcessSpy = startProcessSpy.and.returnValue(Observable.throw(error));
+            startProcessSpy = startProcessSpy.and.returnValue(throwError(error));
             component.selectedProcessDef = testProcessDefRepr;
             component.startProcess();
             fixture.whenStable().then(() => {
@@ -430,7 +430,7 @@ describe('StartFormComponent', () => {
         }));
 
         it('should indicate an error to the user if process cannot be started', async(() => {
-            startProcessSpy = startProcessSpy.and.returnValue(Observable.throw({}));
+            startProcessSpy = startProcessSpy.and.returnValue(throwError({}));
             component.selectedProcessDef = testProcessDefRepr;
             component.startProcess();
             fixture.whenStable().then(() => {
diff --git a/lib/process-services/process-list/models/filter-process.model.ts b/lib/process-services/process-list/models/filter-process.model.ts
index 3464bd229a..8b191ca393 100644
--- a/lib/process-services/process-list/models/filter-process.model.ts
+++ b/lib/process-services/process-list/models/filter-process.model.ts
@@ -49,6 +49,7 @@ export class FilterProcessRepresentationModel implements UserProcessInstanceFilt
 export class ProcessFilterParamRepresentationModel implements ProcessFilterRequestRepresentation {
 
     processDefinitionId?: number;
+    processInstanceId?: number|string;
     appDefinitionId?: number;
     state?: string;
     sort?: string;
@@ -58,6 +59,7 @@ export class ProcessFilterParamRepresentationModel implements ProcessFilterReque
     constructor(obj?: any) {
         this.processDefinitionId = obj.processDefinitionId || null;
         this.appDefinitionId = obj.appDefinitionId || null;
+        this.processInstanceId = obj.processInstanceId || null;
         this.state = obj.state || null;
         this.sort = obj.sort || null;
         this.page = obj.page || null;
diff --git a/lib/process-services/process-list/process-list.module.ts b/lib/process-services/process-list/process-list.module.ts
index 3d29c43a4d..101e784270 100644
--- a/lib/process-services/process-list/process-list.module.ts
+++ b/lib/process-services/process-list/process-list.module.ts
@@ -19,11 +19,9 @@ import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FlexLayoutModule } from '@angular/flex-layout';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { TranslateModule } from '@ngx-translate/core';
 import { CoreModule } from '@alfresco/adf-core';
 import { MaterialModule } from '../material.module';
 import { ProcessCommentsModule } from '../process-comments/process-comments.module';
-import { CardViewModule, DataColumnModule, DataTableModule, DirectiveModule, PipeModule } from '@alfresco/adf-core';
 import { TaskListModule } from '../task-list/task-list.module';
 import { PeopleModule } from '../people/people.module';
 import { ContentWidgetModule } from '../content-widget/content-widget.module';
@@ -39,18 +37,12 @@ import { StartProcessInstanceComponent } from './components/start-process.compon
 @NgModule({
     imports: [
         CommonModule,
-        DataTableModule,
-        CoreModule,
-        TaskListModule,
         MaterialModule,
         FlexLayoutModule,
-        TranslateModule,
-        CardViewModule,
         FormsModule,
         ReactiveFormsModule,
-        PipeModule,
-        DataColumnModule,
-        DirectiveModule,
+        CoreModule.forChild(),
+        TaskListModule,
         PeopleModule,
         ContentWidgetModule,
         ProcessCommentsModule
diff --git a/lib/process-services/process-list/services/process-filter.service.ts b/lib/process-services/process-list/services/process-filter.service.ts
index 35dfc4ac7c..e510aaff4b 100644
--- a/lib/process-services/process-list/services/process-filter.service.ts
+++ b/lib/process-services/process-list/services/process-filter.service.ts
@@ -17,9 +17,9 @@
 
 import { AlfrescoApiService } from '@alfresco/adf-core';
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable, from, forkJoin, throwError } from 'rxjs';
 import { FilterProcessRepresentationModel } from '../models/filter-process.model';
-import 'rxjs/add/observable/throw';
+import { map, catchError } from 'rxjs/operators';
 
 @Injectable()
 export class ProcessFilterService {
@@ -33,16 +33,18 @@ export class ProcessFilterService {
      * @returns Array of filter details
      */
     getProcessFilters(appId: number): Observable<FilterProcessRepresentationModel[]> {
-        return Observable.fromPromise(this.callApiProcessFilters(appId))
-            .map((response: any) => {
-                let filters: FilterProcessRepresentationModel[] = [];
-                response.data.forEach((filter: FilterProcessRepresentationModel) => {
-                    let filterModel = new FilterProcessRepresentationModel(filter);
-                    filters.push(filterModel);
-                });
-                return filters;
-            })
-            .catch(err => this.handleProcessError(err));
+        return from(this.callApiProcessFilters(appId))
+            .pipe(
+                map((response: any) => {
+                    let filters: FilterProcessRepresentationModel[] = [];
+                    response.data.forEach((filter: FilterProcessRepresentationModel) => {
+                        let filterModel = new FilterProcessRepresentationModel(filter);
+                        filters.push(filterModel);
+                    });
+                    return filters;
+                }),
+                catchError(err => this.handleProcessError(err))
+            );
     }
 
     /**
@@ -52,10 +54,13 @@ export class ProcessFilterService {
      * @returns Details of the filter
      */
     getProcessFilterById(filterId: number, appId?: number): Observable<FilterProcessRepresentationModel> {
-        return Observable.fromPromise(this.callApiProcessFilters(appId))
-            .map((response: any) => {
-                return response.data.find(filter => filter.id === filterId);
-            }).catch(err => this.handleProcessError(err));
+        return from(this.callApiProcessFilters(appId))
+            .pipe(
+                map((response: any) => {
+                    return response.data.find(filter => filter.id === filterId);
+                }),
+                catchError(err => this.handleProcessError(err))
+            );
     }
 
     /**
@@ -65,10 +70,13 @@ export class ProcessFilterService {
      * @returns Details of the filter
      */
     getProcessFilterByName(filterName: string, appId?: number): Observable<FilterProcessRepresentationModel> {
-        return Observable.fromPromise(this.callApiProcessFilters(appId))
-            .map((response: any) => {
-                return response.data.find(filter => filter.name === filterName);
-            }).catch(err => this.handleProcessError(err));
+        return from(this.callApiProcessFilters(appId))
+            .pipe(
+                map((response: any) => {
+                    return response.data.find(filter => filter.name === filterName);
+                }),
+                catchError(err => this.handleProcessError(err))
+            );
     }
 
     /**
@@ -87,7 +95,7 @@ export class ProcessFilterService {
         let allObservable = this.addProcessFilter(allFilter);
 
         return Observable.create(observer => {
-            Observable.forkJoin(
+            forkJoin(
                 runningObservable,
                 completedObservable,
                 allObservable
@@ -166,11 +174,13 @@ export class ProcessFilterService {
      * @returns The filter just added
      */
     addProcessFilter(filter: FilterProcessRepresentationModel): Observable<FilterProcessRepresentationModel> {
-        return Observable.fromPromise(this.alfrescoApiService.getInstance().activiti.userFiltersApi.createUserProcessInstanceFilter(filter))
-            .map(res => res)
-            .map((response: FilterProcessRepresentationModel) => {
-                return response;
-            }).catch(err => this.handleProcessError(err));
+        return from(this.alfrescoApiService.getInstance().activiti.userFiltersApi.createUserProcessInstanceFilter(filter))
+            .pipe(
+                map((response: FilterProcessRepresentationModel) => {
+                    return response;
+                }),
+                catchError(err => this.handleProcessError(err))
+            );
     }
 
     /**
@@ -187,6 +197,6 @@ export class ProcessFilterService {
     }
 
     private handleProcessError(error: any) {
-        return Observable.throw(error || 'Server error');
+        return throwError(error || 'Server error');
     }
 }
diff --git a/lib/process-services/process-list/services/process.service.ts b/lib/process-services/process-list/services/process.service.ts
index dab1c2e849..fbfa031c2b 100644
--- a/lib/process-services/process-list/services/process.service.ts
+++ b/lib/process-services/process-list/services/process.service.ts
@@ -17,14 +17,14 @@
 
 import { AlfrescoApiService, FormValues } from '@alfresco/adf-core';
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable, from, throwError } from 'rxjs';
 import { TaskDetailsModel } from '../../task-list';
 import { ProcessFilterParamRepresentationModel } from '../models/filter-process.model';
 import { ProcessDefinitionRepresentation } from '../models/process-definition.model';
 import { ProcessInstanceVariable } from '../models/process-instance-variable.model';
 import { ProcessInstance } from '../models/process-instance.model';
 import { ProcessListModel } from '../models/process-list.model';
-import 'rxjs/add/observable/throw';
+import { map, catchError } from 'rxjs/operators';
 
 declare let moment: any;
 
@@ -41,16 +41,19 @@ export class ProcessService {
      * @returns List of process instances
      */
     getProcessInstances(requestNode: ProcessFilterParamRepresentationModel, processDefinitionKey?: string): Observable<ProcessListModel> {
-        return Observable.fromPromise(this.alfrescoApiService.getInstance().activiti.processApi.getProcessInstances(requestNode))
-            .map((res: any) => {
-                if (processDefinitionKey) {
-                    const filtered = res.data.filter(process => process.processDefinitionKey === processDefinitionKey);
-                    res.data = filtered;
-                    return res;
-                } else {
-                    return res;
-                }
-            }).catch(err => this.handleProcessError(err));
+        return from(this.alfrescoApiService.getInstance().activiti.processApi.getProcessInstances(requestNode))
+            .pipe(
+                map((res: any) => {
+                    if (processDefinitionKey) {
+                        const filtered = res.data.filter(process => process.processDefinitionKey === processDefinitionKey);
+                        res.data = filtered;
+                        return res;
+                    } else {
+                        return res;
+                    }
+                }),
+                catchError(err => this.handleProcessError(err))
+            );
     }
 
     /**
@@ -59,8 +62,10 @@ export class ProcessService {
      * @returns Binary PDF data
      */
     fetchProcessAuditPdfById(processId: string): Observable<Blob> {
-        return Observable.fromPromise(this.alfrescoApiService.getInstance().activiti.processApi.getProcessAuditPdf(processId))
-            .catch(err => this.handleProcessError(err));
+        return from<Blob>(this.alfrescoApiService.getInstance().activiti.processApi.getProcessAuditPdf(processId))
+            .pipe(
+                catchError(err => this.handleProcessError(err))
+            );
     }
 
     /**
@@ -69,8 +74,10 @@ export class ProcessService {
      * @returns JSON data
      */
     fetchProcessAuditJsonById(processId: string): Observable<any> {
-        return Observable.fromPromise(this.alfrescoApiService.getInstance().activiti.processApi.getProcessAuditJson(processId))
-            .catch(err => this.handleProcessError(err));
+        return from(this.alfrescoApiService.getInstance().activiti.processApi.getProcessAuditJson(processId))
+            .pipe(
+                catchError(err => this.handleProcessError(err))
+            );
     }
 
     /**
@@ -79,8 +86,10 @@ export class ProcessService {
      * @returns Metadata for the instance
      */
     getProcess(processInstanceId: string): Observable<ProcessInstance> {
-        return Observable.fromPromise(this.alfrescoApiService.getInstance().activiti.processApi.getProcessInstance(processInstanceId))
-            .catch(err => this.handleProcessError(err));
+        return from(this.alfrescoApiService.getInstance().activiti.processApi.getProcessInstance(processInstanceId))
+            .pipe(
+                catchError(err => this.handleProcessError(err))
+            );
     }
 
     /**
@@ -96,13 +105,15 @@ export class ProcessService {
             } : {
                 processInstanceId: processInstanceId
             };
-        return Observable.fromPromise(this.alfrescoApiService.getInstance().activiti.taskApi.listTasks(taskOpts))
-            .map(this.extractData)
-            .map(tasks => tasks.map((task: any) => {
-                task.created = moment(task.created, 'YYYY-MM-DD').format();
-                return task;
-            }))
-            .catch(err => this.handleProcessError(err));
+        return from(this.alfrescoApiService.getInstance().activiti.taskApi.listTasks(taskOpts))
+            .pipe(
+                map(this.extractData),
+                map(tasks => tasks.map((task: any) => {
+                    task.created = moment(task.created, 'YYYY-MM-DD').format();
+                    return task;
+                })),
+                catchError(err => this.handleProcessError(err))
+            );
     }
 
     /**
@@ -117,12 +128,14 @@ export class ProcessService {
             } : {
                 latest: true
             };
-        return Observable.fromPromise(
+        return from(
             this.alfrescoApiService.getInstance().activiti.processApi.getProcessDefinitions(opts)
         )
-            .map(this.extractData)
-            .map(processDefs => processDefs.map((pd) => new ProcessDefinitionRepresentation(pd)))
-            .catch(err => this.handleProcessError(err));
+        .pipe(
+            map(this.extractData),
+            map(processDefs => processDefs.map((pd) => new ProcessDefinitionRepresentation(pd))),
+            catchError(err => this.handleProcessError(err))
+        );
     }
 
     /**
@@ -148,11 +161,13 @@ export class ProcessService {
         if (variables) {
             startRequest.variables = variables;
         }
-        return Observable.fromPromise(
+        return from(
             this.alfrescoApiService.getInstance().activiti.processApi.startNewProcessInstance(startRequest)
         )
-            .map((pd) => new ProcessInstance(pd))
-            .catch(err => this.handleProcessError(err));
+        .pipe(
+            map((pd) => new ProcessInstance(pd)),
+            catchError(err => this.handleProcessError(err))
+        );
     }
 
     /**
@@ -161,10 +176,12 @@ export class ProcessService {
      * @returns Null response notifying when the operation is complete
      */
     cancelProcess(processInstanceId: string): Observable<void> {
-        return Observable.fromPromise(
+        return from<void>(
             this.alfrescoApiService.getInstance().activiti.processApi.deleteProcessInstance(processInstanceId)
         )
-            .catch(err => this.handleProcessError(err));
+        .pipe(
+            catchError(err => this.handleProcessError(err))
+        );
     }
 
     /**
@@ -173,11 +190,13 @@ export class ProcessService {
      * @returns Array of instance variable info
      */
     getProcessInstanceVariables(processInstanceId: string): Observable<ProcessInstanceVariable[]> {
-        return Observable.fromPromise(
+        return from(
             this.alfrescoApiService.getInstance().activiti.processInstanceVariablesApi.getProcessInstanceVariables(processInstanceId)
         )
-            .map((processVars: any[]) => processVars.map((pd) => new ProcessInstanceVariable(pd)))
-            .catch(err => this.handleProcessError(err));
+        .pipe(
+            map((processVars: any[]) => processVars.map((pd) => new ProcessInstanceVariable(pd))),
+            catchError(err => this.handleProcessError(err))
+        );
     }
 
     /**
@@ -187,10 +206,12 @@ export class ProcessService {
      * @returns Array of instance variable info
      */
     createOrUpdateProcessInstanceVariables(processInstanceId: string, variables: ProcessInstanceVariable[]): Observable<ProcessInstanceVariable[]> {
-        return Observable.fromPromise(
+        return from<ProcessInstanceVariable[]>(
             this.alfrescoApiService.getInstance().activiti.processInstanceVariablesApi.createOrUpdateProcessInstanceVariables(processInstanceId, variables)
         )
-            .catch(err => this.handleProcessError(err));
+        .pipe(
+            catchError(err => this.handleProcessError(err))
+        );
     }
 
     /**
@@ -200,10 +221,12 @@ export class ProcessService {
      * @returns Null response notifying when the operation is complete
      */
     deleteProcessInstanceVariable(processInstanceId: string, variableName: string): Observable<void> {
-        return Observable.fromPromise(
+        return from<void>(
             this.alfrescoApiService.getInstance().activiti.processInstanceVariablesApi.deleteProcessInstanceVariable(processInstanceId, variableName)
         )
-            .catch(err => this.handleProcessError(err));
+        .pipe(
+            catchError(err => this.handleProcessError(err))
+        );
     }
 
     private extractData(res: any) {
@@ -211,6 +234,6 @@ export class ProcessService {
     }
 
     private handleProcessError(error: any) {
-        return Observable.throw(error || 'Server error');
+        return throwError(error || 'Server error');
     }
 }
diff --git a/lib/process-services/process.module.ts b/lib/process-services/process.module.ts
index 1aa8d83582..84b0589470 100644
--- a/lib/process-services/process.module.ts
+++ b/lib/process-services/process.module.ts
@@ -16,9 +16,9 @@
  */
 
 import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
+import { NgModule, ModuleWithProviders } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { CoreModule, TRANSLATION_PROVIDER, CommentsModule } from '@alfresco/adf-core';
+import { CoreModule, TRANSLATION_PROVIDER } from '@alfresco/adf-core';
 
 import { MaterialModule } from './material.module';
 
@@ -30,12 +30,26 @@ import { AttachmentModule } from './attachment/attachment.module';
 import { PeopleModule } from './people/people.module';
 import { ProcessService } from './process-list/services/process.service';
 import { ProcessFilterService } from './process-list/services/process-filter.service';
+import { TaskListService } from './task-list/services/tasklist.service';
+import { TaskFilterService } from './task-list/services/task-filter.service';
+import { TaskUploadService } from './task-list/services/task-upload.service';
+import { ProcessUploadService } from './task-list/services/process-upload.service';
+
+export function providers() {
+    return [
+        ProcessService,
+        ProcessFilterService,
+        TaskListService,
+        TaskFilterService,
+        TaskUploadService,
+        ProcessUploadService
+    ];
+}
 
 @NgModule({
     imports: [
-        CoreModule,
+        CoreModule.forChild(),
         CommonModule,
-        CommentsModule,
         ProcessCommentsModule,
         FormsModule,
         ReactiveFormsModule,
@@ -47,6 +61,7 @@ import { ProcessFilterService } from './process-list/services/process-filter.ser
         PeopleModule
     ],
     providers: [
+        ...providers(),
         {
             provide: TRANSLATION_PROVIDER,
             multi: true,
@@ -54,13 +69,10 @@ import { ProcessFilterService } from './process-list/services/process-filter.ser
                 name: 'adf-process-services',
                 source: 'assets/adf-process-services'
             }
-        },
-        ProcessService,
-        ProcessFilterService
+        }
     ],
     exports: [
         CommonModule,
-        CommentsModule,
         ProcessCommentsModule,
         FormsModule,
         ReactiveFormsModule,
@@ -72,4 +84,54 @@ import { ProcessFilterService } from './process-list/services/process-filter.ser
     ]
 })
 export class ProcessModule {
+    static forRoot(): ModuleWithProviders {
+        return {
+            ngModule: ProcessModule,
+            providers: [
+                ...providers(),
+                {
+                    provide: TRANSLATION_PROVIDER,
+                    multi: true,
+                    useValue: {
+                        name: 'adf-process-services',
+                        source: 'assets/adf-process-services'
+                    }
+                }
+            ]
+        };
+    }
+
+    static forChild(): ModuleWithProviders {
+        return {
+            ngModule: ProcessModuleLazy
+        };
+    }
 }
+
+@NgModule({
+    imports: [
+        CoreModule.forChild(),
+        CommonModule,
+        ProcessCommentsModule,
+        FormsModule,
+        ReactiveFormsModule,
+        MaterialModule,
+        ProcessListModule,
+        TaskListModule,
+        AppsListModule,
+        AttachmentModule,
+        PeopleModule
+    ],
+    exports: [
+        CommonModule,
+        ProcessCommentsModule,
+        FormsModule,
+        ReactiveFormsModule,
+        ProcessListModule,
+        TaskListModule,
+        AppsListModule,
+        AttachmentModule,
+        PeopleModule
+    ]
+})
+export class ProcessModuleLazy {}
diff --git a/lib/process-services/task-list/components/attach-form.component.html b/lib/process-services/task-list/components/attach-form.component.html
new file mode 100644
index 0000000000..f1864b2127
--- /dev/null
+++ b/lib/process-services/task-list/components/attach-form.component.html
@@ -0,0 +1,36 @@
+<div class="adf-attach-form">
+    <mat-card>
+        <mat-card-content>
+            <div class="adf-no-form-message-container">
+                <mat-card-title class="mat-card-title">
+                    <h4 class="adf-form-title">{{ 'ADF_TASK_LIST.ATTACH_FORM.SELECT_FORM' | translate }}</h4>
+                </mat-card-title>
+                <div class="adf-attach-form-row">
+                    <mat-form-field class="adf-grid-full-width">
+                        <mat-select [formControl]="attachFormControl" placeholder="{{ 'ADF_TASK_LIST.ATTACH_FORM.SELECT_OPTION' | translate }}" id="form_id" [(ngModel)]="selectedFormId">
+                            <mat-option *ngFor="let form of forms" [value]="form.id">{{ form.name }}</mat-option>
+                        </mat-select>
+                    </mat-form-field>
+                </div>
+
+                <adf-form *ngIf="this.attachFormControl.valid"
+                    [formId]="selectedFormId"
+                    [readOnly]="true"
+                    [showCompleteButton]="false"
+                    [showRefreshButton]="false"
+                    [showValidationIcon]="false">
+                </adf-form>
+            </div>
+        </mat-card-content>
+
+        <mat-card-actions class="adf-no-form-mat-card-actions">
+            <div>
+                <button mat-button id="adf-no-form-remove-button" color="warn" *ngIf="formKey" (click)="onRemoveButtonClick()">{{ 'ADF_TASK_LIST.ATTACH_FORM.REMOVE_FORM' | translate }}</button>
+            </div>
+            <div>
+                <button mat-button id="adf-no-form-cancel-button" (click)="onCancelButtonClick()">{{ 'ADF_TASK_LIST.START_TASK.FORM.ACTION.CANCEL' | translate }}</button>
+                <button mat-button id="adf-no-form-attach-form-button" [disabled]="disableSubmit" color="primary" (click)="onAttachFormButtonClick()">{{ 'ADF_TASK_LIST.START_TASK.FORM.LABEL.ATTACHFORM' | translate }}</button>
+            </div>
+        </mat-card-actions>
+    </mat-card>
+</div>
diff --git a/lib/process-services/task-list/components/attach-form.component.scss b/lib/process-services/task-list/components/attach-form.component.scss
new file mode 100644
index 0000000000..00cc380d2c
--- /dev/null
+++ b/lib/process-services/task-list/components/attach-form.component.scss
@@ -0,0 +1,17 @@
+.adf-attach-form {
+    .mat-form-field {
+        width: 100%;
+    }
+
+    &-row {
+        display: flex;
+        justify-content: space-between;
+        margin: 20px 0;
+    }
+
+    .adf-no-form-mat-card-actions {
+        justify-content: space-between;
+        margin-top: 30px;
+        text-align: right;
+    }
+}
diff --git a/lib/process-services/task-list/components/attach-form.component.spec.ts b/lib/process-services/task-list/components/attach-form.component.spec.ts
new file mode 100644
index 0000000000..e3eb6b0254
--- /dev/null
+++ b/lib/process-services/task-list/components/attach-form.component.spec.ts
@@ -0,0 +1,171 @@
+/*!
+ * @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 { AttachFormComponent } from './attach-form.component';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { setupTestBed } from '@alfresco/adf-core';
+import { ProcessTestingModule } from '../../testing/process.testing.module';
+import { TaskListService } from './../services/tasklist.service';
+import { of } from 'rxjs';
+import { By } from '@angular/platform-browser';
+
+describe('AttachFormComponent', () => {
+    let component: AttachFormComponent;
+    let fixture: ComponentFixture<AttachFormComponent>;
+    let element: HTMLElement;
+    let taskService: TaskListService;
+
+    setupTestBed({
+        imports: [
+            ProcessTestingModule
+        ]
+    });
+
+    beforeEach(async(() => {
+        fixture = TestBed.createComponent(AttachFormComponent);
+        component = fixture.componentInstance;
+        element = fixture.nativeElement;
+        taskService = TestBed.get(TaskListService);
+        fixture.detectChanges();
+    }));
+
+    afterEach(() => {
+        fixture.destroy();
+        TestBed.resetTestingModule();
+    });
+
+    it('should show the attach button disabled', async(() => {
+        fixture.detectChanges();
+        fixture.whenStable().then(() => {
+            let attachButton = fixture.debugElement.query(By.css('#adf-no-form-attach-form-button'));
+            expect(attachButton.nativeElement.disabled).toBeTruthy();
+        });
+    }));
+
+    it('should emit cancel event if clicked on Cancel Button ', async(() => {
+        fixture.detectChanges();
+        fixture.whenStable().then(() => {
+            const emitSpy = spyOn(component.cancelAttachForm, 'emit');
+            const el = fixture.nativeElement.querySelector('#adf-no-form-cancel-button');
+            el.click();
+            expect(emitSpy).toHaveBeenCalled();
+        });
+    }));
+
+    it('should call attachFormToATask if clicked on attach Button', async(() => {
+        component.taskId = 1;
+        component.attachFormControl.setValue(2);
+        spyOn(taskService, 'attachFormToATask').and.returnValue(of(true));
+        fixture.detectChanges();
+        fixture.whenStable().then(() => {
+            expect(element.querySelector('#adf-no-form-attach-form-button')).toBeDefined();
+            const el = fixture.nativeElement.querySelector('#adf-no-form-attach-form-button');
+            el.click();
+            expect(taskService.attachFormToATask).toHaveBeenCalledWith(1, 2);
+        });
+    }));
+
+    it('should render the attachForm enabled if the user select the different formId', async(() => {
+        component.taskId = 1;
+        component.formId = 2;
+        component.attachFormControl.setValue(3);
+        fixture.detectChanges();
+        spyOn(taskService, 'attachFormToATask').and.returnValue(of(true));
+        fixture.detectChanges();
+        fixture.whenStable().then(() => {
+            let attachButton = fixture.debugElement.query(By.css('#adf-no-form-attach-form-button'));
+            expect(attachButton.nativeElement.disabled).toBeFalsy();
+        });
+    }));
+
+    it('should render a disabled attachForm button if the user select the original formId', async(() => {
+        component.taskId = 1;
+        component.formId = 2;
+        component.attachFormControl.setValue(3);
+        fixture.detectChanges();
+        spyOn(taskService, 'attachFormToATask').and.returnValue(of(true));
+        fixture.detectChanges();
+        fixture.whenStable().then(() => {
+            fixture.detectChanges();
+            component.attachFormControl.setValue(2);
+            fixture.detectChanges();
+            let attachButton = fixture.debugElement.query(By.css('#adf-no-form-attach-form-button'));
+            expect(attachButton.nativeElement.disabled).toBeTruthy();
+        });
+    }));
+
+    it('should show the adf-form of the selected form', async(() => {
+        component.taskId = 1;
+        component.selectedFormId = 12;
+        fixture.detectChanges();
+        fixture.whenStable().then(() => {
+            fixture.detectChanges();
+            const formContainer = fixture.debugElement.nativeElement.querySelector('adf-form');
+            expect(formContainer).toBeDefined();
+            expect(formContainer).not.toBeNull();
+        });
+    }));
+
+    it('should show the formPreview of the selected form', async(() => {
+        component.formKey = 12;
+        fixture.detectChanges();
+        fixture.whenStable().then(() => {
+            fixture.detectChanges();
+            const formContainer = fixture.debugElement.nativeElement.querySelector('.adf-form-container');
+            expect(formContainer).toBeDefined();
+            expect(formContainer).toBeNull();
+        });
+    }));
+
+    it('should remove form if it is present', async(() => {
+        component.taskId = 1;
+        component.attachFormControl.setValue(10);
+        component.formKey = 12;
+        spyOn(taskService, 'deleteForm').and.returnValue(of({}));
+
+        fixture.detectChanges();
+        fixture.whenStable().then(() => {
+            fixture.detectChanges();
+            expect(element.querySelector('#adf-no-form-remove-button')).toBeDefined();
+            const el = fixture.nativeElement.querySelector('#adf-no-form-remove-button');
+            el.click();
+            expect(component.formId).toBeNull();
+        });
+    }));
+
+    it('should emit success when a form is attached', async(() => {
+        component.taskId = 1;
+        component.attachFormControl.setValue(10);
+
+        spyOn(taskService, 'attachFormToATask').and.returnValue(of(
+            {
+                id: 91,
+                name: 'fakeName',
+                formKey: 1204,
+                assignee: null
+            }
+        ));
+
+        fixture.detectChanges();
+        fixture.whenStable().then(() => {
+            const emitSpy = spyOn(component.success, 'emit');
+            const el = fixture.nativeElement.querySelector('#adf-no-form-attach-form-button');
+            el.click();
+            expect(emitSpy).toHaveBeenCalled();
+        });
+    }));
+});
diff --git a/lib/process-services/task-list/components/attach-form.component.ts b/lib/process-services/task-list/components/attach-form.component.ts
new file mode 100644
index 0000000000..bf2acc9062
--- /dev/null
+++ b/lib/process-services/task-list/components/attach-form.component.ts
@@ -0,0 +1,134 @@
+/*!
+ * @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 { FormService, LogService } from '@alfresco/adf-core';
+import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core';
+import { Form } from '../models/form.model';
+import { TaskListService } from './../services/tasklist.service';
+import { FormControl, Validators } from '@angular/forms';
+
+@Component({
+    selector: 'adf-attach-form',
+    templateUrl: './attach-form.component.html',
+    styleUrls: ['./attach-form.component.scss']
+})
+
+export class AttachFormComponent implements OnInit, OnChanges {
+    constructor(private taskService: TaskListService,
+                private logService: LogService,
+                private formService: FormService) { }
+
+    @Input()
+    taskId;
+
+    @Input()
+    formKey;
+
+    @Output()
+    cancelAttachForm: EventEmitter<void> = new EventEmitter<void>();
+
+    @Output()
+    success: EventEmitter<void> = new EventEmitter<void>();
+
+    @Output()
+    error: EventEmitter<any> = new EventEmitter<any>();
+
+    forms: Form[];
+
+    formId: number;
+    disableSubmit: boolean = true;
+    selectedFormId: number;
+
+    attachFormControl: FormControl;
+
+    ngOnInit() {
+        this.attachFormControl = new FormControl('', Validators.required);
+        this.attachFormControl.valueChanges.subscribe( (currentValue) => {
+            if (this.attachFormControl.valid) {
+                if ( this.formId !== currentValue) {
+                    this.disableSubmit = false;
+                } else {
+                    this.disableSubmit = true;
+                }
+            }
+        });
+    }
+
+    ngOnChanges() {
+        this.formId = undefined;
+        this.disableSubmit = true;
+        this.loadFormsTask();
+        if (this.formKey) {
+            this.onFormAttached();
+        }
+    }
+
+    onCancelButtonClick(): void {
+        this.selectedFormId = this.formId;
+        this.cancelAttachForm.emit();
+    }
+
+    onRemoveButtonClick(): void {
+        this.taskService.deleteForm(this.taskId).subscribe(
+            () => {
+                this.formId = this.selectedFormId = null;
+                this.success.emit();
+            },
+            (err) => {
+                this.error.emit(err);
+                this.logService.error('An error occurred while trying to delete the form');
+            });
+    }
+
+    onAttachFormButtonClick(): void {
+        this.attachForm(this.taskId, this.selectedFormId);
+    }
+
+    private loadFormsTask(): void {
+        this.taskService.getFormList().subscribe((res: Form[]) => {
+                this.forms = res;
+            },
+            (err) => {
+                this.error.emit(err);
+                this.logService.error('An error occurred while trying to get the forms');
+            });
+    }
+
+    private onFormAttached() {
+        this.formService.getTaskForm(this.taskId)
+            .subscribe((res) => {
+                this.formService.getFormDefinitionByName(res.name).subscribe((formDef) => {
+                    this.formId = this.selectedFormId = formDef;
+                });
+            }, (err) => {
+                this.error.emit(err);
+                this.logService.error('Could not load forms');
+            });
+    }
+
+    private attachForm(taskId: string, formId: number) {
+        if (taskId && formId) {
+            this.taskService.attachFormToATask(taskId, formId)
+                .subscribe(() => {
+                    this.success.emit();
+                }, (err) => {
+                    this.error.emit(err);
+                    this.logService.error('Could not attach form');
+                });
+        }
+    }
+}
diff --git a/lib/process-services/task-list/components/checklist.component.html b/lib/process-services/task-list/components/checklist.component.html
index 0da060beaf..7a56607fb2 100644
--- a/lib/process-services/task-list/components/checklist.component.html
+++ b/lib/process-services/task-list/components/checklist.component.html
@@ -1,5 +1,5 @@
 <div class="adf-checklist-control">
-    <mat-chip-list id="checklist-label">
+    <mat-chip-list data-automation-id="checklist-label">
         <span class="activiti-label">{{ 'ADF_TASK_LIST.DETAILS.LABELS.CHECKLIST' | translate }}</span>
         <mat-chip class="adf-process-badge" color="accent" selected="true">{{checklist?.length}}</mat-chip>
     </mat-chip-list>
diff --git a/lib/process-services/task-list/components/checklist.component.spec.ts b/lib/process-services/task-list/components/checklist.component.spec.ts
index 527d193dde..4548051a5e 100644
--- a/lib/process-services/task-list/components/checklist.component.spec.ts
+++ b/lib/process-services/task-list/components/checklist.component.spec.ts
@@ -22,7 +22,7 @@ import { ChecklistComponent } from './checklist.component';
 import { setupTestBed } from '@alfresco/adf-core';
 import { ProcessTestingModule } from '../../testing/process.testing.module';
 import { TaskListService } from './../services/tasklist.service';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 
 describe('ChecklistComponent', () => {
 
@@ -38,7 +38,10 @@ describe('ChecklistComponent', () => {
 
     beforeEach(async(() => {
         service = TestBed.get(TaskListService);
-        spyOn(service, 'getTaskChecklist').and.returnValue(Observable.of([{ id: 'fake-check-changed-id', name: 'fake-check-changed-name' }] ));
+        spyOn(service, 'getTaskChecklist').and.returnValue(of([{
+            id: 'fake-check-changed-id',
+            name: 'fake-check-changed-name'
+        }]));
 
         fixture = TestBed.createComponent(ChecklistComponent);
         checklistComponent = fixture.componentInstance;
@@ -48,8 +51,8 @@ describe('ChecklistComponent', () => {
     }));
 
     it('should show checklist component title', () => {
-        expect(element.querySelector('#checklist-label')).toBeDefined();
-        expect(element.querySelector('#checklist-label')).not.toBeNull();
+        expect(element.querySelector('[data-automation-id=checklist-label]')).toBeDefined();
+        expect(element.querySelector('[data-automation-id=checklist-label]')).not.toBeNull();
     });
 
     it('should show no checklist message', () => {
@@ -167,8 +170,8 @@ describe('ChecklistComponent', () => {
         });
 
         it('should add checklist', async(() => {
-            spyOn(service, 'addTask').and.returnValue(Observable.of({
-              id: 'fake-check-added-id', name: 'fake-check-added-name'
+            spyOn(service, 'addTask').and.returnValue(of({
+                id: 'fake-check-added-id', name: 'fake-check-added-name'
             }));
 
             showChecklistDialog.click();
@@ -183,7 +186,7 @@ describe('ChecklistComponent', () => {
         }));
 
         it('should remove a checklist element', async(() => {
-            spyOn(service, 'deleteTask').and.returnValue(Observable.of(''));
+            spyOn(service, 'deleteTask').and.returnValue(of(''));
 
             checklistComponent.taskId = 'new-fake-task-id';
             checklistComponent.checklist.push(new TaskDetailsModel({
@@ -203,7 +206,7 @@ describe('ChecklistComponent', () => {
         }));
 
         it('should send an event when the checklist is deleted', (done) => {
-            spyOn(service, 'deleteTask').and.returnValue(Observable.of(''));
+            spyOn(service, 'deleteTask').and.returnValue(of(''));
             let disposableDelete = checklistComponent.checklistTaskDeleted.subscribe(() => {
                 expect(element.querySelector('#fake-check-id')).toBeNull();
                 disposableDelete.unsubscribe();
@@ -262,7 +265,7 @@ describe('ChecklistComponent', () => {
         }));
 
         it('should emit checklist task created event when the checklist is successfully added', (done) => {
-            spyOn(service, 'addTask').and.returnValue(Observable.of({ id: 'fake-check-added-id', name: 'fake-check-added-name' }));
+            spyOn(service, 'addTask').and.returnValue(of({ id: 'fake-check-added-id', name: 'fake-check-added-name' }));
 
             let disposableCreated = checklistComponent.checklistTaskCreated.subscribe((taskAdded: TaskDetailsModel) => {
                 fixture.detectChanges();
diff --git a/lib/process-services/task-list/components/no-task-detail-template.directive.spec.ts b/lib/process-services/task-list/components/no-task-detail-template.directive.spec.ts
index f74a7785c2..d188548186 100644
--- a/lib/process-services/task-list/components/no-task-detail-template.directive.spec.ts
+++ b/lib/process-services/task-list/components/no-task-detail-template.directive.spec.ts
@@ -17,15 +17,19 @@
 
 import { NoTaskDetailsTemplateDirective } from './no-task-detail-template.directive';
 import { TaskDetailsComponent } from './task-details.component';
-import { FormRenderingService } from '@alfresco/adf-core';
+import { FormRenderingService, AuthenticationService } from '@alfresco/adf-core';
+import { of } from 'rxjs';
 
 describe('NoTaskDetailsTemplateDirective', () => {
 
     let component: NoTaskDetailsTemplateDirective;
     let detailsComponent: TaskDetailsComponent;
+    let authService: AuthenticationService;
 
     beforeEach(() => {
-        detailsComponent = new TaskDetailsComponent(null, null, null, new FormRenderingService(), null, null, null);
+        authService = new AuthenticationService(null, null, null, null);
+        spyOn(authService, 'getBpmLoggedUser').and.returnValue(of({ email: 'fake-email'}));
+        detailsComponent = new TaskDetailsComponent(null, authService, null, new FormRenderingService(), null, null, null);
         component = new NoTaskDetailsTemplateDirective(detailsComponent);
     });
 
diff --git a/lib/process-services/task-list/components/start-task.component.html b/lib/process-services/task-list/components/start-task.component.html
index 82f78bb9e1..b8533d123b 100644
--- a/lib/process-services/task-list/components/start-task.component.html
+++ b/lib/process-services/task-list/components/start-task.component.html
@@ -65,7 +65,7 @@
                 </div>
 
                 <div class="adf-grid-column adf-grid-half-width">
-                    <adf-people-selector [(peopleId)]="assigneeId" id="assignee_id"></adf-people-selector>
+                    <people-widget (peopleSelected)="getAssigneeId($event)" [field]="field"></people-widget>
                 </div>
             </div>
         </div>
diff --git a/lib/process-services/task-list/components/start-task.component.scss b/lib/process-services/task-list/components/start-task.component.scss
index 408bb80611..7c6d0281f8 100644
--- a/lib/process-services/task-list/components/start-task.component.scss
+++ b/lib/process-services/task-list/components/start-task.component.scss
@@ -17,10 +17,7 @@
 
     .adf-new-task-layout-card {
         width: 66%;
-        margin-right: auto;
-        margin-left: auto;
-        margin-top: 10px;
-        margin-bottom: 10px;
+        margin: 10px auto;
 
         &-content {
             display: flex;
@@ -61,7 +58,19 @@
     }
 
     .adf-mat-select {
-        padding-top: 0px;
+        padding-top: 0;
+    }
+
+    #people-widget-content {
+        .mat-form-field {
+            width: 100%;
+        }
+        .adf-label {
+            line-height: 0;
+        }
+        .adf-error-text-container {
+            margin-top: -10px;
+        }
     }
 
     adf-start-task {
@@ -73,7 +82,7 @@
                 }
             }
 
-            &-start-task-input-container .mat-input-wrapper {
+            &-start-task-input-container .mat-form-field-wrapper {
                 padding-top: 8px;
             }
 
@@ -110,7 +119,7 @@
 
             &-invalid {
 
-                .mat-input-underline {
+                .mat-form-field-underline {
                     background-color: #f44336 !important;
                 }
 
@@ -118,7 +127,7 @@
                     border-color: mat-color($warn);
                 }
 
-                .mat-input-prefix {
+                .mat-form-field-prefix {
                     color: mat-color($warn);
                 }
 
diff --git a/lib/process-services/task-list/components/start-task.component.spec.ts b/lib/process-services/task-list/components/start-task.component.spec.ts
index cdf2cb452a..8b87cb5c7a 100644
--- a/lib/process-services/task-list/components/start-task.component.spec.ts
+++ b/lib/process-services/task-list/components/start-task.component.spec.ts
@@ -17,7 +17,7 @@
 
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { setupTestBed } from '@alfresco/adf-core';
-import { Observable } from 'rxjs/Observable';
+import { Observable, of, throwError } from 'rxjs';
 import { startTaskMock } from '../../mock';
 import { StartTaskModel } from '../models/start-task.model';
 import { TaskListService } from '../services/tasklist.service';
@@ -54,7 +54,7 @@ describe('StartTaskComponent', () => {
         element = fixture.nativeElement;
 
         service = TestBed.get(TaskListService);
-        getFormlistSpy = spyOn(service, 'getFormList').and.returnValue(Observable.of(fakeForms));
+        getFormlistSpy = spyOn(service, 'getFormList').and.returnValue(of(fakeForms));
 
         fixture.detectChanges();
     }));
@@ -75,7 +75,7 @@ describe('StartTaskComponent', () => {
     describe('create task', () => {
 
         beforeEach(() => {
-            createNewTaskSpy = spyOn(service, 'createNewTask').and.returnValue(Observable.of(
+            createNewTaskSpy = spyOn(service, 'createNewTask').and.returnValue(of(
                 {
                     id: 91,
                     name: 'fakeName',
@@ -133,7 +133,7 @@ describe('StartTaskComponent', () => {
 
     describe('attach form', () => {
         beforeEach(() => {
-            spyOn(service, 'createNewTask').and.returnValue(Observable.of(
+            spyOn(service, 'createNewTask').and.returnValue(of(
                 {
                     id: 91,
                     name: 'fakeName',
@@ -141,7 +141,7 @@ describe('StartTaskComponent', () => {
                     assignee: null
                 }
             ));
-            spyOn(service, 'attachFormToATask').and.returnValue(Observable.of(
+            spyOn(service, 'attachFormToATask').and.returnValue(of(
                 {
                     id: 91,
                     name: 'fakeName',
@@ -186,7 +186,7 @@ describe('StartTaskComponent', () => {
 
     describe('assign user', () => {
         beforeEach(() => {
-            spyOn(service, 'createNewTask').and.returnValue(Observable.of(
+            spyOn(service, 'createNewTask').and.returnValue(of(
                 {
                     id: 91,
                     name: 'fakeName',
@@ -194,7 +194,7 @@ describe('StartTaskComponent', () => {
                     assignee: null
                 }
             ));
-            spyOn(service, 'attachFormToATask').and.returnValue(Observable.of(
+            spyOn(service, 'attachFormToATask').and.returnValue(of(
                 {
                     id: 91,
                     name: 'fakeName',
@@ -202,7 +202,7 @@ describe('StartTaskComponent', () => {
                     assignee: null
                 }
             ));
-            spyOn(service, 'assignTaskByUserId').and.returnValue(Observable.of(
+            spyOn(service, 'assignTaskByUserId').and.returnValue(of(
                 {
                     id: 91,
                     name: 'fakeName',
@@ -245,10 +245,27 @@ describe('StartTaskComponent', () => {
                 assignee: null
             });
         });
+
+        it('should assign task with id of selected user assigned', () => {
+            let successSpy = spyOn(component.success, 'emit');
+            component.appId = 42;
+            component.startTaskmodel = new StartTaskModel(startTaskMock);
+            component.formKey = 1204;
+            component.getAssigneeId(testUser.id);
+            fixture.detectChanges();
+            let createTaskButton = <HTMLElement> element.querySelector('#button-start');
+            createTaskButton.click();
+            expect(successSpy).toHaveBeenCalledWith({
+                id: 91,
+                name: 'fakeName',
+                formKey: 1204,
+                assignee: testUser
+            });
+        });
     });
 
     it('should not attach a form when a form id is not slected', () => {
-        let attachFormToATask = spyOn(service, 'attachFormToATask').and.returnValue(Observable.of());
+        let attachFormToATask = spyOn(service, 'attachFormToATask').and.returnValue(of());
         spyOn(service, 'createNewTask').and.callFake(
             function() {
                 return Observable.create(observer => {
@@ -326,7 +343,7 @@ describe('StartTaskComponent', () => {
 
     it('should emit error when there is an error while creating task', () => {
         let errorSpy = spyOn(component.error, 'emit');
-        spyOn(service, 'createNewTask').and.returnValue(Observable.throw({}));
+        spyOn(service, 'createNewTask').and.returnValue(throwError({}));
         let createTaskButton = <HTMLElement> element.querySelector('#button-start');
         component.startTaskmodel.name = 'fake-name';
         fixture.detectChanges();
diff --git a/lib/process-services/task-list/components/start-task.component.ts b/lib/process-services/task-list/components/start-task.component.ts
index 85eea416ff..613df4842a 100644
--- a/lib/process-services/task-list/components/start-task.component.ts
+++ b/lib/process-services/task-list/components/start-task.component.ts
@@ -15,17 +15,18 @@
  * limitations under the License.
  */
 
-import { LogService, UserPreferencesService, UserProcessModel } from '@alfresco/adf-core';
+import { LogService, UserPreferencesService, UserProcessModel, FormFieldModel, FormModel } from '@alfresco/adf-core';
 import { Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation } from '@angular/core';
 import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material/core';
 import { MOMENT_DATE_FORMATS, MomentDateAdapter } from '@alfresco/adf-core';
 import moment from 'moment-es6';
 import { Moment } from 'moment';
-import { Observable } from 'rxjs/Observable';
+import { Observable, of } from 'rxjs';
 import { Form } from '../models/form.model';
 import { StartTaskModel } from '../models/start-task.model';
 import { TaskDetailsModel } from '../models/task-details.model';
 import { TaskListService } from './../services/tasklist.service';
+import { switchMap, defaultIfEmpty } from 'rxjs/operators';
 
 @Component({
     selector: 'adf-start-task',
@@ -68,6 +69,8 @@ export class StartTaskComponent implements OnInit {
 
     dateError: boolean;
 
+    field: FormFieldModel;
+
     /**
      * Constructor
      * @param auth
@@ -81,6 +84,7 @@ export class StartTaskComponent implements OnInit {
     }
 
     ngOnInit() {
+        this.field = new FormFieldModel(new FormModel(), {id: this.assigneeId, value: this.assigneeId, placeholder: 'Assignee'});
         this.preferences.locale$.subscribe((locale) => {
             this.dateAdapter.setLocale(locale);
         });
@@ -93,11 +97,17 @@ export class StartTaskComponent implements OnInit {
                 this.startTaskmodel.category = this.appId.toString();
             }
             this.taskService.createNewTask(new TaskDetailsModel(this.startTaskmodel))
-                .switchMap((createRes: any) =>
-                    this.attachForm(createRes.id, this.formKey).defaultIfEmpty(createRes)
-                        .switchMap((attachRes: any) =>
-                            this.assignTaskByUserId(createRes.id, this.assigneeId).defaultIfEmpty(attachRes ? attachRes : createRes)
+                .pipe(
+                    switchMap((createRes: any) =>
+                        this.attachForm(createRes.id, this.formKey).pipe(
+                            defaultIfEmpty(createRes),
+                            switchMap((attachRes: any) =>
+                                this.assignTaskByUserId(createRes.id, this.assigneeId).pipe(
+                                    defaultIfEmpty(attachRes ? attachRes : createRes)
+                                )
+                            )
                         )
+                    )
                 )
                 .subscribe(
                     (res: any) => {
@@ -110,8 +120,12 @@ export class StartTaskComponent implements OnInit {
         }
     }
 
+    getAssigneeId(userId) {
+        this.assigneeId = userId;
+    }
+
     private attachForm(taskId: string, formKey: number): Observable<any> {
-        let response = Observable.of();
+        let response = of();
         if (taskId && formKey) {
             response = this.taskService.attachFormToATask(taskId, formKey);
         }
@@ -119,7 +133,7 @@ export class StartTaskComponent implements OnInit {
     }
 
     private assignTaskByUserId(taskId: string, userId: any): Observable<any> {
-        let response = Observable.of();
+        let response = of();
         if (taskId && userId) {
             response = this.taskService.assignTaskByUserId(taskId, userId);
         }
diff --git a/lib/process-services/task-list/components/task-audit.directive.spec.ts b/lib/process-services/task-list/components/task-audit.directive.spec.ts
index 77128803c6..08cc0d2aba 100644
--- a/lib/process-services/task-list/components/task-audit.directive.spec.ts
+++ b/lib/process-services/task-list/components/task-audit.directive.spec.ts
@@ -22,7 +22,7 @@ import {
     fakeAsync,
     TestBed
 } from '@angular/core/testing';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 import { TaskListService } from './../services/tasklist.service';
 import { setupTestBed, CoreModule } from '@alfresco/adf-core';
 import { TaskAuditDirective } from './task-audit.directive';
@@ -100,7 +100,7 @@ describe('TaskAuditDirective', () => {
         component.fileName = 'FakeAuditName';
         component.format = 'pdf';
         let blob = createFakePdfBlob();
-        spyOn(service, 'fetchTaskAuditPdfById').and.returnValue(Observable.of(blob));
+        spyOn(service, 'fetchTaskAuditPdfById').and.returnValue(of(blob));
         spyOn(component, 'onAuditClick').and.callThrough();
 
         fixture.detectChanges();
@@ -121,7 +121,7 @@ describe('TaskAuditDirective', () => {
         component.format = 'json';
         component.download = true;
         const auditJson = { taskId: '77', taskName: 'Fake Task Naem', assignee: 'FirstName LastName', formData: [], selectedOutcome: null, comments: [] };
-        spyOn(service, 'fetchTaskAuditJsonById').and.returnValue(Observable.of(auditJson));
+        spyOn(service, 'fetchTaskAuditJsonById').and.returnValue(of(auditJson));
         spyOn(component, 'onAuditClick').and.callThrough();
 
         fixture.detectChanges();
@@ -141,7 +141,7 @@ describe('TaskAuditDirective', () => {
         component.fileName = 'FakeAuditName';
         component.format = 'fakeFormat';
         let blob = createFakePdfBlob();
-        spyOn(service, 'fetchTaskAuditPdfById').and.returnValue(Observable.of(blob));
+        spyOn(service, 'fetchTaskAuditPdfById').and.returnValue(of(blob));
         spyOn(component, 'onAuditClick').and.callThrough();
 
         fixture.detectChanges();
diff --git a/lib/process-services/task-list/components/task-details.component.html b/lib/process-services/task-list/components/task-details.component.html
index bf7c480028..f57f8841cd 100644
--- a/lib/process-services/task-list/components/task-details.component.html
+++ b/lib/process-services/task-list/components/task-details.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="!taskDetails">
+<div *ngIf="!taskDetails" data-automation-id="adf-tasks-details--empty">
     <ng-template *ngIf="noTaskDetailsTemplateComponent" ngFor [ngForOf]="[data]"
                  [ngForTemplate]="noTaskDetailsTemplateComponent">
         {{ 'ADF_TASK_LIST.DETAILS.MESSAGES.NONE' | translate }}
@@ -15,6 +15,15 @@
         </h2>
     </div>
 
+    <mat-slide-toggle
+        class="adf-task-details-toggle"
+        id="showHeaderToggle"
+        [color]="'primary'"
+        (change)="toggleHeaderContent()"
+        [checked]="showHeaderContent">
+        {{ 'PS-TAB.TASK-SHOW-HEADER'| translate }}
+    </mat-slide-toggle>
+
     <div class="adf-task-details-core"
         fxLayout="column"
         fxLayoutGap="8px"
@@ -22,7 +31,7 @@
 
         <div class="adf-task-details-core-form">
             <div *ngIf="isAssigned()">
-                <adf-form *ngIf="hasFormKey()" #activitiForm
+                <adf-form *ngIf="isFormComponentVisible()" #activitiForm
                           [showDebugButton]="debugMode"
                           [taskId]="taskDetails.id"
                           [showTitle]="showFormTitle"
@@ -39,13 +48,41 @@
                           (error)='onFormError($event)'
                           (executeOutcome)='onFormExecuteOutcome($event)'>
                 </adf-form>
-                <adf-task-standalone *ngIf="!hasFormKey()" 
-                [taskName]= "taskDetails.name"
-                [isCompleted]="isCompletedTask()"
-                [hasCompletePermission]="isCompleteButtonEnabled()"
-                [hideCancelButton]="true"
-                (complete)="onComplete()">
+                <adf-task-standalone *ngIf="isTaskStandaloneComponentVisible()"
+                                     [taskName]="taskDetails.name"
+                                     [taskId]="taskDetails.id"
+                                     [isCompleted]="isCompletedTask()"
+                                     [hasCompletePermission]="isCompleteButtonEnabled()"
+                                     [hideCancelButton]="true"
+                                     (complete)="onComplete()"
+                                     (showAttachForm)="onShowAttachForm()">
                 </adf-task-standalone>
+
+                <mat-card class="adf-message-card" *ngIf="!isTaskStandaloneComponentVisible() && !isCompletedTask() && !isFormComponentVisible()" >
+                    <mat-card-content>
+                        <div class="adf-no-form-message-container">
+                            <div class="adf-no-form-message-list">
+                                <div *ngIf="!isCompletedTask()" class="adf-no-form-message">
+                                    <span id="adf-no-form-message">{{'ADF_TASK_LIST.STANDALONE_TASK.NO_FORM_MESSAGE' | translate}}</span>
+                                </div>
+                            </div>
+                        </div>
+                    </mat-card-content>
+
+                    <mat-card-actions class="adf-no-form-mat-card-actions">
+                        <div>
+                            <button mat-button id="adf-no-form-complete-button" color="primary" (click)="onComplete()">{{ 'ADF_TASK_LIST.DETAILS.BUTTON.COMPLETE' | translate }}</button>
+                        </div>
+                    </mat-card-actions>
+
+                </mat-card>
+
+                <adf-attach-form *ngIf="isShowAttachForm()"
+                                 [taskId]="taskDetails.id"
+                                 [formKey]="taskDetails.formKey"
+                                 (cancelAttachForm)="onCancelAttachForm()"
+                                 (success)="onCompleteAttachForm()">
+                </adf-attach-form>
             </div>
             <div *ngIf="!isAssigned()" id="claim-message-id">
                 {{ 'ADF_TASK_LIST.DETAILS.MESSAGES.CLAIM' | translate }}
diff --git a/lib/process-services/task-list/components/task-details.component.scss b/lib/process-services/task-list/components/task-details.component.scss
index 2f5678f048..716189dc5a 100644
--- a/lib/process-services/task-list/components/task-details.component.scss
+++ b/lib/process-services/task-list/components/task-details.component.scss
@@ -52,6 +52,10 @@ adf-task-header.assign-edit-view ::ng-deep adf-card-view ::ng-deep .adf-property
         }
     }
 
+    &-toggle {
+        position: relative;
+    }
+
     &-core {
         display: flex;
         justify-content: space-between;
@@ -74,10 +78,12 @@ adf-task-header.assign-edit-view ::ng-deep adf-card-view ::ng-deep .adf-property
             flex-grow: 1;
 
             & ::ng-deep .adf-form-debug-container {
-                padding: 20px 0 0 0;
+                display: flex;
+                flex-direction: column;
+                padding: 20px 0;
 
                 .mat-slide-toggle {
-                    float: right;
+                    margin-left: auto;
 
                     & + div {
                         background-color: black;
diff --git a/lib/process-services/task-list/components/task-details.component.spec.ts b/lib/process-services/task-list/components/task-details.component.spec.ts
index 8379f3d12c..87353ee1d8 100644
--- a/lib/process-services/task-list/components/task-details.component.spec.ts
+++ b/lib/process-services/task-list/components/task-details.component.spec.ts
@@ -18,14 +18,14 @@
 import { NO_ERRORS_SCHEMA, SimpleChange } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { Observable } from 'rxjs/Observable';
+import { of, throwError } from 'rxjs';
 
 import { FormModel, FormOutcomeEvent, FormOutcomeModel, FormService, setupTestBed, BpmUserService } from '@alfresco/adf-core';
-import { CommentProcessService, LogService } from '@alfresco/adf-core';
+import { CommentProcessService, LogService, AuthenticationService } from '@alfresco/adf-core';
 
 import { UserProcessModel } from '@alfresco/adf-core';
 import { TaskDetailsModel } from '../models/task-details.model';
-import { noDataMock, taskDetailsMock, taskFormMock, tasksMock, taskDetailsWithOutAssigneeMock } from '../../mock';
+import { noDataMock, taskDetailsMock, standaloneTaskWithForm, standaloneTaskWithoutForm, taskFormMock, tasksMock, taskDetailsWithOutAssigneeMock } from '../../mock';
 import { TaskListService } from './../services/tasklist.service';
 import { TaskDetailsComponent } from './task-details.component';
 import { ProcessTestingModule } from '../../testing/process.testing.module';
@@ -51,6 +51,7 @@ describe('TaskDetailsComponent', () => {
     let logService: LogService;
     let commentProcessService: CommentProcessService;
     let peopleProcessService: PeopleProcessService;
+    let authService: AuthenticationService;
 
     setupTestBed({
         imports: [
@@ -63,24 +64,27 @@ describe('TaskDetailsComponent', () => {
         logService = TestBed.get(LogService);
 
         const userService: BpmUserService = TestBed.get(BpmUserService);
-        spyOn(userService, 'getCurrentUserInfo').and.returnValue(Observable.of({}));
+        spyOn(userService, 'getCurrentUserInfo').and.returnValue(of({}));
 
         service = TestBed.get(TaskListService);
-        spyOn(service, 'getTaskChecklist').and.returnValue(Observable.of(noDataMock));
+        spyOn(service, 'getTaskChecklist').and.returnValue(of(noDataMock));
 
         formService = TestBed.get(FormService);
 
-        getTaskDetailsSpy = spyOn(service, 'getTaskDetails').and.returnValue(Observable.of(taskDetailsMock));
-        spyOn(formService, 'getTaskForm').and.returnValue(Observable.of(taskFormMock));
+        getTaskDetailsSpy = spyOn(service, 'getTaskDetails').and.returnValue(of(taskDetailsMock));
+        spyOn(formService, 'getTaskForm').and.returnValue(of(taskFormMock));
         taskDetailsMock.processDefinitionId = null;
-        spyOn(formService, 'getTask').and.returnValue(Observable.of(taskDetailsMock));
+        spyOn(formService, 'getTask').and.returnValue(of(taskDetailsMock));
 
-        getTasksSpy = spyOn(service, 'getTasks').and.returnValue(Observable.of(tasksMock));
-        assignTaskSpy = spyOn(service, 'assignTask').and.returnValue(Observable.of(fakeUser));
-        completeTaskSpy = spyOn(service, 'completeTask').and.returnValue(Observable.of({}));
+        getTasksSpy = spyOn(service, 'getTasks').and.returnValue(of(tasksMock));
+        assignTaskSpy = spyOn(service, 'assignTask').and.returnValue(of(fakeUser));
+        completeTaskSpy = spyOn(service, 'completeTask').and.returnValue(of({}));
         commentProcessService = TestBed.get(CommentProcessService);
 
-        spyOn(commentProcessService, 'getTaskComments').and.returnValue(Observable.of([
+        authService = TestBed.get(AuthenticationService);
+        spyOn(authService, 'getBpmLoggedUser').and.returnValue(of({ email: 'fake-email'}));
+
+        spyOn(commentProcessService, 'getTaskComments').and.returnValue(of([
             {message: 'Test1', created: Date.now(), createdBy: {firstName: 'Admin', lastName: 'User'}},
             {message: 'Test2', created: Date.now(), createdBy: {firstName: 'Admin', lastName: 'User'}},
             {message: 'Test3', created: Date.now(), createdBy: {firstName: 'Admin', lastName: 'User'}}
@@ -147,22 +151,40 @@ describe('TaskDetailsComponent', () => {
 
     it('should display task standalone component when the task does not have an associated form', async(() => {
         component.taskId = '123';
+        getTaskDetailsSpy.and.returnValue(of(standaloneTaskWithoutForm));
+
         fixture.detectChanges();
         fixture.whenStable().then(() => {
             fixture.detectChanges();
+            expect(component.isStandaloneTaskWithoutForm()).toBeTruthy();
             expect(fixture.debugElement.query(By.css('adf-task-standalone'))).not.toBeNull();
         });
     }));
 
-    it('should not display task standalone component when the task have an associated form', async(() => {
+    it('should not display task standalone component when the task has a form', async(() => {
         component.taskId = '123';
+        getTaskDetailsSpy.and.returnValue(of(standaloneTaskWithForm));
         fixture.detectChanges();
         fixture.whenStable().then(() => {
             fixture.detectChanges();
+            expect(component.isStandaloneTaskWithForm()).toBeTruthy();
+            expect(fixture.debugElement.query(By.css('adf-task-standalone'))).toBeDefined();
             expect(fixture.debugElement.query(By.css('adf-task-standalone'))).not.toBeNull();
         });
     }));
 
+    it('should display the AttachFormComponent when standaloneTaskWithForm and click on attach button', async(() => {
+        component.taskId = '123';
+        getTaskDetailsSpy.and.returnValue(of(standaloneTaskWithForm));
+        fixture.detectChanges();
+        component.onShowAttachForm();
+        fixture.whenStable().then(() => {
+            fixture.detectChanges();
+            expect(component.isStandaloneTaskWithForm()).toBeTruthy();
+            expect(fixture.debugElement.query(By.css('adf-attach-form'))).toBeDefined();
+        });
+    }));
+
     it('should display the claim message when the task is not assigned', async(() => {
         component.taskDetails = taskDetailsWithOutAssigneeMock;
         fixture.detectChanges();
@@ -267,7 +289,7 @@ describe('TaskDetailsComponent', () => {
         });
 
         it('should show placeholder message if there is no next task', () => {
-            getTasksSpy.and.returnValue(Observable.of([]));
+            getTasksSpy.and.returnValue(of([]));
             component.onComplete();
             fixture.detectChanges();
             expect(fixture.nativeElement.innerText).toBe('ADF_TASK_LIST.DETAILS.MESSAGES.NONE');
@@ -275,7 +297,7 @@ describe('TaskDetailsComponent', () => {
 
         it('should emit an error event if an error occurs fetching the next task', () => {
             let emitSpy: jasmine.Spy = spyOn(component.error, 'emit');
-            getTasksSpy.and.returnValue(Observable.throw({}));
+            getTasksSpy.and.returnValue(throwError({}));
             component.onComplete();
             expect(emitSpy).toHaveBeenCalled();
         });
@@ -414,7 +436,7 @@ describe('TaskDetailsComponent', () => {
         });
 
         it('should return an observable with user search results', (done) => {
-            spyOn(peopleProcessService, 'getWorkflowUsers').and.returnValue(Observable.of([{
+            spyOn(peopleProcessService, 'getWorkflowUsers').and.returnValue(of([{
                     id: 1,
                     firstName: 'fake-test-1',
                     lastName: 'fake-last-1',
@@ -438,7 +460,7 @@ describe('TaskDetailsComponent', () => {
         });
 
         it('should return an empty list for not valid search', (done) => {
-            spyOn(peopleProcessService, 'getWorkflowUsers').and.returnValue(Observable.of([]));
+            spyOn(peopleProcessService, 'getWorkflowUsers').and.returnValue(of([]));
 
             component.peopleSearch.subscribe((users) => {
                 expect(users.length).toBe(0);
@@ -448,7 +470,7 @@ describe('TaskDetailsComponent', () => {
         });
 
         it('should log error message when search fails', async(() => {
-            spyOn(peopleProcessService, 'getWorkflowUsers').and.returnValue(Observable.throw(''));
+            spyOn(peopleProcessService, 'getWorkflowUsers').and.returnValue(throwError(''));
 
             component.peopleSearch.subscribe(() => {
                 expect(logService.error).toHaveBeenCalledWith('Could not load users');
diff --git a/lib/process-services/task-list/components/task-details.component.ts b/lib/process-services/task-list/components/task-details.component.ts
index db3f8d9f96..2cba3c0e4f 100644
--- a/lib/process-services/task-list/components/task-details.component.ts
+++ b/lib/process-services/task-list/components/task-details.component.ts
@@ -37,13 +37,14 @@ import {
     ViewChild
 } from '@angular/core';
 import { MatDialog, MatDialogRef } from '@angular/material';
-import { Observable } from 'rxjs/Observable';
-import { Observer } from 'rxjs/Observer';
+import { Observable, Observer } from 'rxjs';
 import { ContentLinkModel, FormFieldValidator, FormModel, FormOutcomeEvent } from '@alfresco/adf-core';
 import { TaskQueryRequestRepresentationModel } from '../models/filter.model';
 import { TaskDetailsModel } from '../models/task-details.model';
 import { TaskListService } from './../services/tasklist.service';
 import { AttachFileWidgetComponent, AttachFolderWidgetComponent } from '../../content-widget';
+import { UserRepresentation } from 'alfresco-js-api';
+import { share } from 'rxjs/operators';
 
 @Component({
     selector: 'adf-task-details',
@@ -95,7 +96,7 @@ export class TaskDetailsComponent implements OnInit, OnChanges {
 
     /** Toggles rendering of the form title. */
     @Input()
-    showFormTitle: boolean = true;
+    showFormTitle: boolean = false;
 
     /** Toggles rendering of the `Complete` outcome button. */
     @Input()
@@ -173,12 +174,16 @@ export class TaskDetailsComponent implements OnInit, OnChanges {
     noTaskDetailsTemplateComponent: TemplateRef<any>;
 
     showAssignee: boolean = false;
+    showAttachForm: boolean = false;
 
     private peopleSearchObserver: Observer<UserProcessModel[]>;
     public errorDialogRef: MatDialogRef<TemplateRef<any>>;
 
     peopleSearch: Observable<UserProcessModel[]>;
 
+    currentLoggedUser: UserRepresentation;
+    data: any;
+
     constructor(private taskListService: TaskListService,
                 private authService: AuthenticationService,
                 private peopleProcessService: PeopleProcessService,
@@ -189,7 +194,11 @@ export class TaskDetailsComponent implements OnInit, OnChanges {
 
         this.formRenderingService.setComponentTypeResolver('select-folder', () => AttachFolderWidgetComponent, true);
         this.formRenderingService.setComponentTypeResolver('upload', () => AttachFileWidgetComponent, true);
-        this.peopleSearch = new Observable<UserProcessModel[]>(observer => this.peopleSearchObserver = observer).share();
+        this.peopleSearch = new Observable<UserProcessModel[]>(observer => this.peopleSearchObserver = observer)
+            .pipe(share());
+        this.authService.getBpmLoggedUser().subscribe((user: UserRepresentation) => {
+            this.currentLoggedUser = user;
+        });
     }
 
     ngOnInit() {
@@ -208,11 +217,34 @@ export class TaskDetailsComponent implements OnInit, OnChanges {
         if (taskId && !taskId.currentValue) {
             this.reset();
         } else if (taskId && taskId.currentValue) {
-            this.taskFormName = null;
             this.loadDetails(taskId.currentValue);
         }
     }
 
+    isStandaloneTask(): boolean {
+        return !(this.taskDetails && (!!this.taskDetails.processDefinitionId));
+    }
+
+    isStandaloneTaskWithForm(): boolean {
+        return this.isStandaloneTask() && this.hasFormKey();
+    }
+
+    isStandaloneTaskWithoutForm(): boolean {
+        return this.isStandaloneTask() && !this.hasFormKey();
+    }
+
+    isFormComponentVisible(): boolean {
+        return this.hasFormKey() && !this.isShowAttachForm();
+    }
+
+    isTaskStandaloneComponentVisible(): boolean {
+        return this.isStandaloneTaskWithoutForm() && !this.isShowAttachForm();
+    }
+
+    isShowAttachForm(): boolean {
+        return this.showAttachForm;
+    }
+
     /**
      * Reset the task details
      */
@@ -223,10 +255,8 @@ export class TaskDetailsComponent implements OnInit, OnChanges {
     /**
      * Check if the task has a form
      */
-    hasFormKey(): TaskDetailsModel | string | boolean {
-        return (this.taskDetails
-            && this.taskDetails.formKey
-            && this.taskDetails.formKey !== 'null');
+    hasFormKey(): boolean {
+        return (this.taskDetails && (!!this.taskDetails.formKey));
     }
 
     isTaskActive() {
@@ -251,6 +281,9 @@ export class TaskDetailsComponent implements OnInit, OnChanges {
         if (clickNotification.target.key === 'assignee') {
             this.showAssignee = true;
         }
+        if (clickNotification.target.key === 'formName') {
+            this.showAttachForm = true;
+        }
     }
 
     /**
@@ -260,10 +293,12 @@ export class TaskDetailsComponent implements OnInit, OnChanges {
     private loadDetails(taskId: string) {
         this.taskPeople = [];
         this.readOnlyForm = false;
+        this.taskFormName = null;
 
         if (taskId) {
             this.taskListService.getTaskDetails(taskId).subscribe(
                 (res: TaskDetailsModel) => {
+                    this.showAttachForm = false;
                     this.taskDetails = res;
 
                     if (this.taskDetails.name === 'null') {
@@ -282,11 +317,25 @@ export class TaskDetailsComponent implements OnInit, OnChanges {
     }
 
     isAssigned(): boolean {
-        return this.taskDetails.assignee ? true : false;
+        return !!this.taskDetails.assignee;
+    }
+
+    private hasEmailAddress(): boolean {
+        return this.taskDetails.assignee.email ? true : false;
     }
 
     isAssignedToMe(): boolean {
-        return this.isAssigned() ? this.taskDetails.assignee.email === this.authService.getBpmUsername() : false;
+        return this.isAssigned() && this.hasEmailAddress() ?
+                    this.isEmailEqual(this.taskDetails.assignee.email, this.currentLoggedUser.email) :
+                    this.isExternalIdEqual(this.taskDetails.assignee.externalId, this.currentLoggedUser.externalId);
+    }
+
+    private isEmailEqual(assigneeMail, currentLoggedEmail): boolean {
+        return assigneeMail.toLocaleLowerCase() === currentLoggedEmail.toLocaleLowerCase();
+    }
+
+    private isExternalIdEqual(assigneeExternalId, currentUserExternalId): boolean {
+        return assigneeExternalId.toLocaleLowerCase() === currentUserExternalId.toLocaleLowerCase();
     }
 
     isCompleteButtonEnabled(): boolean {
@@ -342,6 +391,19 @@ export class TaskDetailsComponent implements OnInit, OnChanges {
         );
     }
 
+    onShowAttachForm() {
+        this.showAttachForm = true;
+    }
+
+    onCancelAttachForm() {
+        this.showAttachForm = false;
+    }
+
+    onCompleteAttachForm() {
+        this.showAttachForm = false;
+        this.loadDetails(this.taskId);
+    }
+
     onFormContentClick(content: ContentLinkModel): void {
         this.formContentClicked.emit(content);
     }
diff --git a/lib/process-services/task-list/components/task-filters.component.spec.ts b/lib/process-services/task-list/components/task-filters.component.spec.ts
index b60a554be7..8f63ef4eb6 100644
--- a/lib/process-services/task-list/components/task-filters.component.spec.ts
+++ b/lib/process-services/task-list/components/task-filters.component.spec.ts
@@ -18,7 +18,7 @@
 import { SimpleChange } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { AppConfigService, AppsProcessService, setupTestBed } from '@alfresco/adf-core';
-import { Observable } from 'rxjs/Observable';
+import { from, of } from 'rxjs';
 import { FilterParamsModel, FilterRepresentationModel } from '../models/filter.model';
 import { TaskListService } from '../services/tasklist.service';
 import { TaskFilterService } from '../services/task-filter.service';
@@ -88,7 +88,7 @@ describe('TaskFiltersComponent', () => {
     });
 
     it('should emit an error with a bad response', (done) => {
-        spyOn(taskFilterService, 'getTaskListFilters').and.returnValue(Observable.fromPromise(mockErrorFilterPromise));
+        spyOn(taskFilterService, 'getTaskListFilters').and.returnValue(from(mockErrorFilterPromise));
 
         const appId = '1';
         let change = new SimpleChange(null, appId, true);
@@ -102,7 +102,7 @@ describe('TaskFiltersComponent', () => {
     });
 
     it('should return the filter task list', (done) => {
-        spyOn(taskFilterService, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeGlobalFilterPromise));
+        spyOn(taskFilterService, 'getTaskListFilters').and.returnValue(from(fakeGlobalFilterPromise));
         const appId = '1';
         let change = new SimpleChange(null, appId, true);
         component.ngOnChanges({ 'appId': change });
@@ -126,8 +126,8 @@ describe('TaskFiltersComponent', () => {
             resolve({});
         });
 
-        spyOn(appsProcessService, 'getDeployedApplicationsByName').and.returnValue(Observable.fromPromise(fakeDeployedApplicationsPromise));
-        spyOn(taskFilterService, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeGlobalFilterPromise));
+        spyOn(appsProcessService, 'getDeployedApplicationsByName').and.returnValue(from(fakeDeployedApplicationsPromise));
+        spyOn(taskFilterService, 'getTaskListFilters').and.returnValue(from(fakeGlobalFilterPromise));
 
         let change = new SimpleChange(null, 'test', true);
         component.ngOnChanges({ 'appName': change });
@@ -143,7 +143,7 @@ describe('TaskFiltersComponent', () => {
     });
 
     it('should select the first filter as default', (done) => {
-        spyOn(taskFilterService, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeGlobalFilterPromise));
+        spyOn(taskFilterService, 'getTaskListFilters').and.returnValue(from(fakeGlobalFilterPromise));
 
         const appId = '1';
         let change = new SimpleChange(null, appId, true);
@@ -161,7 +161,7 @@ describe('TaskFiltersComponent', () => {
     });
 
     it('should be able to fetch and select the default if the input filter is not valid', (done) => {
-        spyOn(taskFilterService, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeGlobalEmptyFilterPromise));
+        spyOn(taskFilterService, 'getTaskListFilters').and.returnValue(from(fakeGlobalEmptyFilterPromise));
         spyOn(component, 'createFiltersByAppId').and.stub();
 
         const appId = '1';
@@ -176,7 +176,7 @@ describe('TaskFiltersComponent', () => {
     });
 
     it('should select the task filter based on the input by name param', (done) => {
-        spyOn(taskFilterService, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeGlobalFilterPromise));
+        spyOn(taskFilterService, 'getTaskListFilters').and.returnValue(from(fakeGlobalFilterPromise));
 
         component.filterParam = new FilterParamsModel({ name: 'FakeMyTasks1' });
         const appId = '1';
@@ -195,7 +195,7 @@ describe('TaskFiltersComponent', () => {
     });
 
     it('should select the default task filter if filter input does not exist', (done) => {
-        spyOn(taskFilterService, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeGlobalFilterPromise));
+        spyOn(taskFilterService, 'getTaskListFilters').and.returnValue(from(fakeGlobalFilterPromise));
 
         component.filterParam = new FilterParamsModel({ name: 'UnexistableFilter' });
 
@@ -215,7 +215,7 @@ describe('TaskFiltersComponent', () => {
     });
 
     it('should select the task filter based on the input by index param', (done) => {
-        spyOn(taskFilterService, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeGlobalFilterPromise));
+        spyOn(taskFilterService, 'getTaskListFilters').and.returnValue(from(fakeGlobalFilterPromise));
 
         component.filterParam = new FilterParamsModel({ index: 2 });
 
@@ -235,7 +235,7 @@ describe('TaskFiltersComponent', () => {
     });
 
     it('should select the task filter based on the input by id param', (done) => {
-        spyOn(taskFilterService, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeGlobalFilterPromise));
+        spyOn(taskFilterService, 'getTaskListFilters').and.returnValue(from(fakeGlobalFilterPromise));
 
         component.filterParam = new FilterParamsModel({ id: 10 });
 
@@ -345,7 +345,7 @@ describe('TaskFiltersComponent', () => {
         });
         component.filters = fakeGlobalFilter;
         component.currentFilter = filter;
-        spyOn(taskListService, 'isTaskRelatedToFilter').and.returnValue(Observable.of(null));
+        spyOn(taskListService, 'isTaskRelatedToFilter').and.returnValue(of(null));
         component.selectFilterWithTask('111');
 
         expect(component.currentFilter).toBe(filter);
diff --git a/lib/process-services/task-list/components/task-filters.component.ts b/lib/process-services/task-list/components/task-filters.component.ts
index 70b72bf557..5839b9f699 100644
--- a/lib/process-services/task-list/components/task-filters.component.ts
+++ b/lib/process-services/task-list/components/task-filters.component.ts
@@ -17,7 +17,7 @@
 
 import { AppsProcessService } from '@alfresco/adf-core';
 import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { FilterParamsModel, FilterRepresentationModel } from '../models/filter.model';
 import { TaskFilterService } from './../services/task-filter.service';
 import { TaskListService } from './../services/tasklist.service';
diff --git a/lib/process-services/task-list/components/task-header.component.spec.ts b/lib/process-services/task-list/components/task-header.component.spec.ts
index 828bf77f39..51b0c62878 100644
--- a/lib/process-services/task-list/components/task-header.component.spec.ts
+++ b/lib/process-services/task-list/components/task-header.component.spec.ts
@@ -19,7 +19,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { AppConfigService, setupTestBed } from '@alfresco/adf-core';
 import { BpmUserService } from '@alfresco/adf-core';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 import {
     completedTaskDetailsMock,
     taskDetailsMock,
@@ -67,7 +67,7 @@ describe('TaskHeaderComponent', () => {
         component = fixture.componentInstance;
         service = TestBed.get(TaskListService);
         userBpmService = TestBed.get(BpmUserService);
-        spyOn(userBpmService, 'getCurrentUserInfo').and.returnValue(Observable.of(fakeBpmAssignedUser));
+        spyOn(userBpmService, 'getCurrentUserInfo').and.returnValue(of(fakeBpmAssignedUser));
         component.taskDetails = new TaskDetailsModel(taskDetailsMock);
         appConfigService = TestBed.get(AppConfigService);
     });
@@ -241,7 +241,7 @@ describe('TaskHeaderComponent', () => {
     }));
 
     it('should call the service\'s unclaim method on unclaiming', async(() => {
-        spyOn(service, 'unclaimTask').and.returnValue(Observable.of(true));
+        spyOn(service, 'unclaimTask').and.returnValue(of(true));
         component.taskDetails = new TaskDetailsModel(claimedTaskDetailsMock);
         component.refreshData();
         fixture.detectChanges();
@@ -254,9 +254,9 @@ describe('TaskHeaderComponent', () => {
         });
     }));
 
-    it('should trigger the unclaim event on successfull unclaiming', async(() => {
+    it('should trigger the unclaim event on successful unclaiming', async(() => {
         let unclaimed: boolean = false;
-        spyOn(service, 'unclaimTask').and.returnValue(Observable.of(true));
+        spyOn(service, 'unclaimTask').and.returnValue(of(true));
         component.taskDetails = new TaskDetailsModel(claimedTaskDetailsMock);
         component.refreshData();
         fixture.detectChanges();
@@ -301,7 +301,7 @@ describe('TaskHeaderComponent', () => {
         fixture.detectChanges();
 
         fixture.whenStable().then(() => {
-            let valueEl = fixture.debugElement.query(By.css('[data-automation-id="header-formName"] .adf-property-value'));
+            let valueEl = fixture.debugElement.query(By.css('[data-automation-id="header-formName"] .adf-textitem-clickable-value'));
             expect(valueEl.nativeElement.innerText).toBe('test form');
         });
     }));
diff --git a/lib/process-services/task-list/components/task-header.component.ts b/lib/process-services/task-list/components/task-header.component.ts
index 5b467c4637..6af99df6ec 100644
--- a/lib/process-services/task-list/components/task-header.component.ts
+++ b/lib/process-services/task-list/components/task-header.component.ts
@@ -153,7 +153,9 @@ export class TaskHeaderComponent implements OnChanges, OnInit {
                     label: 'ADF_TASK_LIST.PROPERTIES.FORM_NAME',
                     value: this.formName,
                     key: 'formName',
-                    default: this.translationService.instant('ADF_TASK_LIST.PROPERTIES.FORM_NAME_DEFAULT')
+                    default: this.translationService.instant('ADF_TASK_LIST.PROPERTIES.FORM_NAME_DEFAULT'),
+                    clickable: !!this.formName,
+                    icon: 'create'
                 }
             )
         ];
diff --git a/lib/process-services/task-list/components/task-list.component.spec.ts b/lib/process-services/task-list/components/task-list.component.spec.ts
index 664ef3f329..e793b67f5e 100644
--- a/lib/process-services/task-list/components/task-list.component.spec.ts
+++ b/lib/process-services/task-list/components/task-list.component.spec.ts
@@ -197,6 +197,32 @@ describe('TaskListComponent', () => {
         });
     });
 
+    it('should return the filtered task list by processDefinitionId', (done) => {
+        let state = new SimpleChange(null, 'open', true);
+        let processDefinitionId = new SimpleChange(null, 'fakeprocessDefinitionId', true);
+        let assignment = new SimpleChange(null, 'fake-assignee', true);
+
+        component.success.subscribe((res) => {
+            expect(res).toBeDefined();
+            expect(component.rows).toBeDefined();
+            expect(component.isListEmpty()).not.toBeTruthy();
+            expect(component.rows.length).toEqual(2);
+            expect(component.rows[0]['name']).toEqual('nameFake1');
+            expect(component.rows[0]['processDefinitionId']).toEqual('myprocess:1:4');
+            done();
+        });
+
+        component.ngAfterContentInit();
+        component.ngOnChanges({ 'state': state, 'processDefinitionId': processDefinitionId, 'assignment': assignment });
+        fixture.detectChanges();
+
+        jasmine.Ajax.requests.mostRecent().respondWith({
+            'status': 200,
+            contentType: 'application/json',
+            responseText: JSON.stringify(fakeGlobalTask)
+        });
+    });
+
     it('should return the filtered task list for all state', (done) => {
         let state = new SimpleChange(null, 'all', true);
         let processInstanceId = new SimpleChange(null, 'fakeprocessId', true);
diff --git a/lib/process-services/task-list/components/task-list.component.ts b/lib/process-services/task-list/components/task-list.component.ts
index 83736014e2..bf0bcb3f03 100644
--- a/lib/process-services/task-list/components/task-list.component.ts
+++ b/lib/process-services/task-list/components/task-list.component.ts
@@ -23,8 +23,7 @@ import {
     AfterContentInit, Component, ContentChild, EventEmitter,
     Input, OnChanges, Output, SimpleChanges } from '@angular/core';
 
-import { Observable } from 'rxjs/Observable';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
+import { Observable, BehaviorSubject } from 'rxjs';
 import { TaskQueryRequestRepresentationModel } from '../models/filter.model';
 import { TaskListModel } from '../models/task-list.model';
 import { taskPresetsDefaultModel } from '../models/task-preset.model';
@@ -51,6 +50,10 @@ export class TaskListComponent extends DataTableSchema implements OnChanges, Aft
     @Input()
     processInstanceId: string;
 
+    /** The Definition Id of the process. */
+    @Input()
+    processDefinitionId: string;
+
     /** The Definition Key of the process.
      * @deprecated 2.4.0
      */
@@ -107,6 +110,18 @@ export class TaskListComponent extends DataTableSchema implements OnChanges, Aft
     @Input()
     selectFirstRow: boolean = true;
 
+    /** The id of a task */
+    @Input()
+    taskId: string;
+
+    /** Toggles inclusion of Process Instances */
+    @Input()
+    includeProcessInstance: boolean;
+
+    /** Starting point of the */
+    @Input()
+    start: number = 0;
+
     /** Emitted when a task in the list is clicked */
     @Output()
     rowClick: EventEmitter<string> = new EventEmitter<string>();
@@ -317,7 +332,7 @@ export class TaskListComponent extends DataTableSchema implements OnChanges, Aft
 
     /**
      * Optimize name field
-     * @param istances
+     * @param instances
      */
     private optimizeNames(instances: any[]): any[] {
         instances = instances.map(t => {
@@ -334,15 +349,17 @@ export class TaskListComponent extends DataTableSchema implements OnChanges, Aft
         let requestNode = {
             appDefinitionId: this.appId,
             processInstanceId: this.processInstanceId,
+            processDefinitionId: this.processDefinitionId,
             processDefinitionKey: this.processDefinitionKey,
             text: this.name,
             assignment: this.assignment,
             state: this.state,
             sort: this.sort,
-            landingTaskId: this.landingTaskId,
             page: this.page,
             size: this.size,
-            start: 0
+            start: this.start,
+            taskId: this.taskId,
+            includeProcessInstance: this.includeProcessInstance
         };
         return new TaskQueryRequestRepresentationModel(requestNode);
     }
@@ -359,8 +376,4 @@ export class TaskListComponent extends DataTableSchema implements OnChanges, Aft
     currentPage(skipCount: number, maxItems: number): number {
         return (skipCount && maxItems) ? Math.floor(skipCount / maxItems) : 0;
     }
-
-    get supportedPageSizes(): number[] {
-        return this.userPreferences.getDefaultPageSizes();
-    }
 }
diff --git a/lib/process-services/task-list/components/task-standalone.component.html b/lib/process-services/task-list/components/task-standalone.component.html
index e7ff34cf68..6d17c2a31f 100644
--- a/lib/process-services/task-list/components/task-standalone.component.html
+++ b/lib/process-services/task-list/components/task-standalone.component.html
@@ -18,7 +18,10 @@
     </mat-card-content>
 
     <mat-card-actions class="adf-no-form-mat-card-actions">
-        <button mat-button *ngIf="hasCancelButton()" id="adf-no-form-cancel-button" (click)="onCancelButtonClick()">{{ 'ADF_TASK_LIST.START_TASK.FORM.ACTION.CANCEL' | translate }}</button>
-        <button mat-button *ngIf="hasCompleteButton()" id="adf-no-form-complete-button" color="primary" (click)="onCompleteButtonClick()">{{ 'ADF_TASK_LIST.DETAILS.BUTTON.COMPLETE' | translate }}</button>
+        <button mat-button *ngIf="hasAttachFormButton()" id="adf-no-form-attach-form-button" (click)="onShowAttachForm()">{{ 'ADF_TASK_LIST.START_TASK.FORM.LABEL.ATTACHFORM' | translate }}</button>
+        <div>
+            <button mat-button *ngIf="hasCancelButton()" id="adf-no-form-cancel-button" (click)="onCancelButtonClick()">{{ 'ADF_TASK_LIST.START_TASK.FORM.ACTION.CANCEL' | translate }}</button>
+            <button mat-button *ngIf="hasCompleteButton()" id="adf-no-form-complete-button" color="primary" (click)="onCompleteButtonClick()">{{ 'ADF_TASK_LIST.DETAILS.BUTTON.COMPLETE' | translate }}</button>
+        </div>
     </mat-card-actions>
-</mat-card>
\ No newline at end of file
+</mat-card>
diff --git a/lib/process-services/task-list/components/task-standalone.component.scss b/lib/process-services/task-list/components/task-standalone.component.scss
index bfee7edc17..e12364a677 100644
--- a/lib/process-services/task-list/components/task-standalone.component.scss
+++ b/lib/process-services/task-list/components/task-standalone.component.scss
@@ -2,7 +2,7 @@
 
     $config: mat-typography-config();
     $background: map-get($theme, background);
-    
+
     .adf {
         &-message-card {
             width: 60%;
@@ -13,7 +13,7 @@
               }
         }
         &-no-form-message-container {
-            height:256px;
+            height: 256px;
             width: 100%;
             display: table;
         }
@@ -37,8 +37,9 @@
             margin: auto;
             width: fit-content !important;
         }
-        &-no-form-mat-card-actions {
-            text-align: right;
+        &-no-form-mat-card-actions.mat-card-actions {
+            display: flex;
+            justify-content: space-between;
             & .mat-button {
                 text-transform: uppercase;
                 border-radius: 5px;
@@ -50,4 +51,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/lib/process-services/task-list/components/task-standalone.component.ts b/lib/process-services/task-list/components/task-standalone.component.ts
index 3e0ea75720..a28b10c178 100644
--- a/lib/process-services/task-list/components/task-standalone.component.ts
+++ b/lib/process-services/task-list/components/task-standalone.component.ts
@@ -28,7 +28,11 @@ export class TaskStandaloneComponent {
 
     /** Name of the task. */
     @Input()
-    taskName: string;
+    taskName;
+
+    /** Id of the task. */
+    @Input()
+    taskId;
 
     /** If true then Task completed message is shown and `Complete` and `Cancel` buttons are hidden. */
     @Input()
@@ -38,6 +42,7 @@ export class TaskStandaloneComponent {
     @Input()
     hasCompletePermission: boolean = true;
 
+    // TODO: rename all with show prefix
     /** Toggles rendering of the `Cancel` button. */
     @Input()
     hideCancelButton: boolean = true;
@@ -50,6 +55,10 @@ export class TaskStandaloneComponent {
     @Output()
     complete: EventEmitter<void> = new EventEmitter<void>();
 
+    /** Emitted when the form associated with the form task is attached. */
+    @Output()
+    showAttachForm: EventEmitter<void> = new EventEmitter<void>();
+
     constructor() { }
 
     onCancelButtonClick(): void {
@@ -67,4 +76,12 @@ export class TaskStandaloneComponent {
     hasCancelButton(): boolean {
         return !this.hideCancelButton && !this.isCompleted;
     }
+
+    hasAttachFormButton(): boolean {
+        return !this.isCompleted;
+    }
+
+    onShowAttachForm() {
+        this.showAttachForm.emit();
+    }
 }
diff --git a/lib/process-services/task-list/models/filter.model.ts b/lib/process-services/task-list/models/filter.model.ts
index 15ff038ed7..006ff9f59c 100644
--- a/lib/process-services/task-list/models/filter.model.ts
+++ b/lib/process-services/task-list/models/filter.model.ts
@@ -118,6 +118,8 @@ export class TaskQueryRequestRepresentationModel implements TaskQueryRequestRepr
     sort: string;
     page: number;
     size: number;
+    taskId: string;
+    includeProcessInstance: boolean;
 
     constructor(obj?: any) {
         if (obj) {
@@ -131,6 +133,8 @@ export class TaskQueryRequestRepresentationModel implements TaskQueryRequestRepr
             this.sort = obj.sort || null;
             this.page = obj.page || 0;
             this.size = obj.size || 25;
+            this.taskId = obj.taskId || null;
+            this.includeProcessInstance = obj.includeProcessInstance;
         }
     }
 }
diff --git a/lib/process-services/task-list/models/task-list.model.ts b/lib/process-services/task-list/models/task-list.model.ts
index c9bda7b85d..8b9972e313 100644
--- a/lib/process-services/task-list/models/task-list.model.ts
+++ b/lib/process-services/task-list/models/task-list.model.ts
@@ -17,11 +17,13 @@
 
 import { TaskDetailsModel } from './task-details.model';
 
-export interface TaskListModel {
+export class TaskListModel {
     size: number;
     total: number;
     start: number;
     length: number;
-    data: TaskDetailsModel [];
+    data: TaskDetailsModel[] = [];
 
+    constructor() {
+    }
 }
diff --git a/lib/process-services/task-list/public-api.ts b/lib/process-services/task-list/public-api.ts
index fcfc927ea9..b8bbf74a1f 100644
--- a/lib/process-services/task-list/public-api.ts
+++ b/lib/process-services/task-list/public-api.ts
@@ -24,6 +24,7 @@ export * from './components/task-details.component';
 export * from './components/task-audit.directive';
 export * from './components/start-task.component';
 export * from './components/task-standalone.component';
+export * from './components/attach-form.component';
 
 export * from './services/tasklist.service';
 export * from './services/process-upload.service';
diff --git a/lib/process-services/task-list/services/process-upload.service.ts b/lib/process-services/task-list/services/process-upload.service.ts
index 2b0e51db5e..ca98de0615 100644
--- a/lib/process-services/task-list/services/process-upload.service.ts
+++ b/lib/process-services/task-list/services/process-upload.service.ts
@@ -17,8 +17,7 @@
 
 import { AlfrescoApiService, AppConfigService, UploadService } from '@alfresco/adf-core';
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
-import 'rxjs/add/observable/throw';
+import { throwError } from 'rxjs';
 
 @Injectable()
 export class ProcessUploadService extends UploadService {
@@ -40,7 +39,7 @@ export class ProcessUploadService extends UploadService {
     }
 
     private handleError(error: any) {
-        return Observable.throw(error || 'Server error');
+        return throwError(error || 'Server error');
     }
 
 }
diff --git a/lib/process-services/task-list/services/task-filter.service.ts b/lib/process-services/task-list/services/task-filter.service.ts
index cae31a5f22..73bbe8757b 100644
--- a/lib/process-services/task-list/services/task-filter.service.ts
+++ b/lib/process-services/task-list/services/task-filter.service.ts
@@ -17,9 +17,9 @@
 
 import { AlfrescoApiService, LogService } from '@alfresco/adf-core';
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable, forkJoin, from, throwError } from 'rxjs';
 import { FilterRepresentationModel } from '../models/filter.model';
-import 'rxjs/add/observable/throw';
+import { map, catchError } from 'rxjs/operators';
 
 @Injectable()
 export class TaskFilterService {
@@ -47,7 +47,7 @@ export class TaskFilterService {
         let completeObservable = this.addFilter(completedTasksFilter);
 
         return Observable.create(observer => {
-            Observable.forkJoin(
+            forkJoin(
                 involvedObservable,
                 myTaskObservable,
                 queuedObservable,
@@ -85,15 +85,18 @@ export class TaskFilterService {
      * @returns Array of task filter details
      */
     getTaskListFilters(appId?: number): Observable<FilterRepresentationModel[]> {
-        return Observable.fromPromise(this.callApiTaskFilters(appId))
-            .map((response: any) => {
-                let filters: FilterRepresentationModel[] = [];
-                response.data.forEach((filter: FilterRepresentationModel) => {
-                    let filterModel = new FilterRepresentationModel(filter);
-                    filters.push(filterModel);
-                });
-                return filters;
-            }).catch(err => this.handleError(err));
+        return from(this.callApiTaskFilters(appId))
+            .pipe(
+                map((response: any) => {
+                    const filters: FilterRepresentationModel[] = [];
+                    response.data.forEach((filter: FilterRepresentationModel) => {
+                        const filterModel = new FilterRepresentationModel(filter);
+                        filters.push(filterModel);
+                    });
+                    return filters;
+                }),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -103,10 +106,10 @@ export class TaskFilterService {
      * @returns Details of task filter
      */
     getTaskFilterById(filterId: number, appId?: number): Observable<FilterRepresentationModel> {
-        return Observable.fromPromise(this.callApiTaskFilters(appId))
-            .map((response: any) => {
-                return response.data.find(filter => filter.id === filterId);
-            }).catch(err => this.handleError(err));
+        return from(this.callApiTaskFilters(appId)).pipe(
+            map(response => response.data.find(filter => filter.id === filterId)),
+            catchError(err => this.handleError(err))
+        );
     }
 
     /**
@@ -116,10 +119,10 @@ export class TaskFilterService {
      * @returns Details of task filter
      */
     getTaskFilterByName(taskName: string, appId?: number): Observable<FilterRepresentationModel> {
-        return Observable.fromPromise(this.callApiTaskFilters(appId))
-            .map((response: any) => {
-                return response.data.find(filter => filter.name === taskName);
-            }).catch(err => this.handleError(err));
+        return from(this.callApiTaskFilters(appId)).pipe(
+            map(response => response.data.find(filter => filter.name === taskName)),
+            catchError(err => this.handleError(err))
+        );
     }
 
     /**
@@ -128,11 +131,13 @@ export class TaskFilterService {
      * @returns Details of task filter just added
      */
     addFilter(filter: FilterRepresentationModel): Observable<FilterRepresentationModel> {
-        return Observable.fromPromise(this.apiService.getInstance().activiti.userFiltersApi.createUserTaskFilter(filter))
-            .map(res => res)
-            .map((response: FilterRepresentationModel) => {
-                return response;
-            }).catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().activiti.userFiltersApi.createUserTaskFilter(filter))
+            .pipe(
+                map((response: FilterRepresentationModel) => {
+                    return response;
+                }),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -140,7 +145,7 @@ export class TaskFilterService {
      * @param appId ID of the target app
      * @returns List of task filters
      */
-    callApiTaskFilters(appId?: number) {
+    callApiTaskFilters(appId?: number): Promise<any> {
         if (appId) {
             return this.apiService.getInstance().activiti.userFiltersApi.getUserTaskFilters({appId: appId});
         } else {
@@ -210,7 +215,7 @@ export class TaskFilterService {
 
     private handleError(error: any) {
         this.logService.error(error);
-        return Observable.throw(error || 'Server error');
+        return throwError(error || 'Server error');
     }
 
 }
diff --git a/lib/process-services/task-list/services/task-upload.service.ts b/lib/process-services/task-list/services/task-upload.service.ts
index dc1722391b..4b2a8cfc64 100644
--- a/lib/process-services/task-list/services/task-upload.service.ts
+++ b/lib/process-services/task-list/services/task-upload.service.ts
@@ -17,8 +17,7 @@
 
 import { AlfrescoApiService, AppConfigService, UploadService } from '@alfresco/adf-core';
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
-import 'rxjs/add/observable/throw';
+import { throwError } from 'rxjs';
 
 @Injectable()
 export class TaskUploadService extends UploadService {
@@ -40,7 +39,7 @@ export class TaskUploadService extends UploadService {
     }
 
     private handleError(error: any) {
-        return Observable.throw(error || 'Server error');
+        return throwError(error || 'Server error');
     }
 
 }
diff --git a/lib/process-services/task-list/services/tasklist.service.spec.ts b/lib/process-services/task-list/services/tasklist.service.spec.ts
index 08df7db462..52175f03a1 100644
--- a/lib/process-services/task-list/services/tasklist.service.spec.ts
+++ b/lib/process-services/task-list/services/tasklist.service.spec.ts
@@ -17,7 +17,7 @@
 
 import { async } from '@angular/core/testing';
 import { UserProcessModel, setupTestBed, CoreModule } from '@alfresco/adf-core';
-import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs';
 import {
     fakeCompletedTaskList,
     fakeFilter,
@@ -82,8 +82,8 @@ describe('Activiti TaskList Service', () => {
         });
 
         it('should return the task list with all tasks filtered by state', (done) => {
-            spyOn(service, 'getTasks').and.returnValue(Observable.of(fakeTaskList));
-            spyOn(service, 'getTotalTasks').and.returnValue(Observable.of(fakeTaskList));
+            spyOn(service, 'getTasks').and.returnValue(of(fakeTaskList));
+            spyOn(service, 'getTotalTasks').and.returnValue(of(fakeTaskList));
 
             service.findAllTaskByState(<TaskQueryRequestRepresentationModel> fakeFilter, 'open').subscribe(res => {
 
@@ -101,8 +101,8 @@ describe('Activiti TaskList Service', () => {
         });
 
         it('should return the task list with all tasks filtered', (done) => {
-            spyOn(service, 'getTasks').and.returnValue(Observable.of(fakeTaskList));
-            spyOn(service, 'getTotalTasks').and.returnValue(Observable.of(fakeTaskList));
+            spyOn(service, 'getTasks').and.returnValue(of(fakeTaskList));
+            spyOn(service, 'getTotalTasks').and.returnValue(of(fakeTaskList));
 
             service.findAllTaskByState(<TaskQueryRequestRepresentationModel> fakeFilter).subscribe(res => {
                 expect(res).toBeDefined();
@@ -160,8 +160,8 @@ describe('Activiti TaskList Service', () => {
         });
 
         it('should return the task list with all tasks filtered without state', (done) => {
-            spyOn(service, 'getTasks').and.returnValue(Observable.of(fakeTaskList));
-            spyOn(service, 'getTotalTasks').and.returnValue(Observable.of(fakeTaskList));
+            spyOn(service, 'getTasks').and.returnValue(of(fakeTaskList));
+            spyOn(service, 'getTotalTasks').and.returnValue(of(fakeTaskList));
 
             service.findAllTasksWithoutState(<TaskQueryRequestRepresentationModel> fakeFilter).subscribe(res => {
                 expect(res).toBeDefined();
@@ -181,8 +181,8 @@ describe('Activiti TaskList Service', () => {
         });
 
         it('Should return both open and completed task', (done) => {
-            spyOn(service, 'findTasksByState').and.returnValue(Observable.of(fakeOpenTaskList));
-            spyOn(service, 'findAllTaskByState').and.returnValue(Observable.of(fakeCompletedTaskList));
+            spyOn(service, 'findTasksByState').and.returnValue(of(fakeOpenTaskList));
+            spyOn(service, 'findAllTaskByState').and.returnValue(of(fakeCompletedTaskList));
             service.findAllTasksWithoutState(<TaskQueryRequestRepresentationModel> fakeFilter).subscribe(res => {
                 expect(res).toBeDefined();
                 expect(res.data).toBeDefined();
@@ -197,8 +197,8 @@ describe('Activiti TaskList Service', () => {
         });
 
         it('should add  the task list to the tasklistSubject with all tasks filtered without state', (done) => {
-            spyOn(service, 'getTasks').and.returnValue(Observable.of(fakeTaskList));
-            spyOn(service, 'getTotalTasks').and.returnValue(Observable.of(fakeTaskList));
+            spyOn(service, 'getTasks').and.returnValue(of(fakeTaskList));
+            spyOn(service, 'getTotalTasks').and.returnValue(of(fakeTaskList));
 
             service.findAllTasksWithoutState(<TaskQueryRequestRepresentationModel> fakeFilter).subscribe(res => {
                 expect(res).toBeDefined();
diff --git a/lib/process-services/task-list/services/tasklist.service.ts b/lib/process-services/task-list/services/tasklist.service.ts
index 742772b582..25e8f3c220 100644
--- a/lib/process-services/task-list/services/tasklist.service.ts
+++ b/lib/process-services/task-list/services/tasklist.service.ts
@@ -17,16 +17,12 @@
 
 import { AlfrescoApiService, LogService } from '@alfresco/adf-core';
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable, from, forkJoin, throwError, of } from 'rxjs';
+import { map, catchError, switchMap, flatMap, filter } from 'rxjs/operators';
 import { FilterRepresentationModel, TaskQueryRequestRepresentationModel } from '../models/filter.model';
 import { Form } from '../models/form.model';
 import { TaskDetailsModel } from '../models/task-details.model';
 import { TaskListModel } from '../models/task-list.model';
-import 'rxjs/add/observable/throw';
-import 'rxjs/add/observable/forkJoin';
-import 'rxjs/add/observable/fromPromise';
-import 'rxjs/operator/switchMap';
-import 'rxjs/add/observable/from';
 
 @Injectable()
 export class TaskListService {
@@ -42,9 +38,11 @@ export class TaskListService {
      * @returns Filters belonging to the task
      */
     getFilterForTaskById(taskId: string, filterList: FilterRepresentationModel[]): Observable<FilterRepresentationModel> {
-        return Observable.from(filterList)
-            .flatMap((filter: FilterRepresentationModel) => this.isTaskRelatedToFilter(taskId, filter))
-            .filter((filter: FilterRepresentationModel) => filter != null);
+        return from(filterList)
+            .pipe(
+                flatMap((data: FilterRepresentationModel) => this.isTaskRelatedToFilter(taskId, data)),
+                filter((data: FilterRepresentationModel) => data != null)
+            );
     }
 
     /**
@@ -52,12 +50,12 @@ export class TaskListService {
      * @param filter The filter to use
      * @returns The search query
      */
-    private generateTaskRequestNodeFromFilter(filter: FilterRepresentationModel): TaskQueryRequestRepresentationModel {
+    private generateTaskRequestNodeFromFilter(filterModel: FilterRepresentationModel): TaskQueryRequestRepresentationModel {
         let requestNode = {
-            appDefinitionId: filter.appId,
-            assignment: filter.filter.assignment,
-            state: filter.filter.state,
-            sort: filter.filter.sort
+            appDefinitionId: filterModel.appId,
+            assignment: filterModel.filter.assignment,
+            state: filterModel.filter.state,
+            sort: filterModel.filter.sort
         };
         return new TaskQueryRequestRepresentationModel(requestNode);
     }
@@ -68,12 +66,15 @@ export class TaskListService {
      * @param filter The filter you want to check
      * @returns The filter if it is related or null otherwise
      */
-     isTaskRelatedToFilter(taskId: string, filter: FilterRepresentationModel): Observable<FilterRepresentationModel> {
-        let requestNodeForFilter = this.generateTaskRequestNodeFromFilter(filter);
-        return Observable.fromPromise(this.callApiTasksFiltered(requestNodeForFilter))
-            .map((res: any) => {
-                return res.data.find(element => element.id === taskId) ? filter : null;
-            }).catch(err => this.handleError(err));
+    isTaskRelatedToFilter(taskId: string, filterModel: FilterRepresentationModel): Observable<FilterRepresentationModel> {
+        let requestNodeForFilter = this.generateTaskRequestNodeFromFilter(filterModel);
+        return from(this.callApiTasksFiltered(requestNodeForFilter))
+            .pipe(
+                map((res: any) => {
+                    return res.data.find(element => element.id === taskId) ? filterModel : null;
+                }),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -82,10 +83,10 @@ export class TaskListService {
      * @returns List of tasks
      */
     getTasks(requestNode: TaskQueryRequestRepresentationModel): Observable<TaskListModel> {
-        return Observable.fromPromise(this.callApiTasksFiltered(requestNode))
-            .map((res: TaskListModel) => {
-                return res;
-            }).catch(err => this.handleError(err));
+        return from<TaskListModel>(this.callApiTasksFiltered(requestNode))
+            .pipe(
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -98,7 +99,8 @@ export class TaskListService {
         if (state) {
             requestNode.state = state;
         }
-        return this.getTasks(requestNode);
+        return this.getTasks(requestNode)
+            .pipe(catchError(() => of(new TaskListModel())));
     }
 
     /**
@@ -111,10 +113,13 @@ export class TaskListService {
         if (state) {
             requestNode.state = state;
         }
-        return this.getTotalTasks(requestNode).switchMap((res: any) => {
-            requestNode.size = res.total;
-            return this.getTasks(requestNode);
-        });
+        return this.getTotalTasks(requestNode)
+            .pipe(
+                switchMap((res: any) => {
+                    requestNode.size = res.total;
+                    return this.getTasks(requestNode);
+                })
+            );
     }
 
     /**
@@ -123,16 +128,16 @@ export class TaskListService {
      * @returns List of tasks
      */
     findAllTasksWithoutState(requestNode: TaskQueryRequestRepresentationModel): Observable<TaskListModel> {
-        return Observable.forkJoin(
-                this.findTasksByState(requestNode, 'open'),
-                this.findAllTaskByState(requestNode, 'completed'),
-                (activeTasks: TaskListModel, completedTasks: TaskListModel) => {
-                    const tasks = Object.assign({}, activeTasks);
-                    tasks.total += completedTasks.total;
-                    tasks.data = tasks.data.concat(completedTasks.data);
-                    return tasks;
-                }
-            );
+        return forkJoin(
+            this.findTasksByState(requestNode, 'open'),
+            this.findAllTaskByState(requestNode, 'completed'),
+            (activeTasks: TaskListModel, completedTasks: TaskListModel) => {
+                const tasks = Object.assign({}, activeTasks);
+                tasks.total += completedTasks.total;
+                tasks.data = tasks.data.concat(completedTasks.data);
+                return tasks;
+            }
+        );
     }
 
     /**
@@ -141,11 +146,13 @@ export class TaskListService {
      * @returns Task details
      */
     getTaskDetails(taskId: string): Observable<TaskDetailsModel> {
-        return Observable.fromPromise(this.callApiTaskDetails(taskId))
-            .map(res => res)
-            .map((details: any) => {
-                return new TaskDetailsModel(details);
-            }).catch(err => this.handleError(err));
+        return from(this.callApiTaskDetails(taskId))
+            .pipe(
+                map((details: any) => {
+                    return new TaskDetailsModel(details);
+                }),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -154,36 +161,41 @@ export class TaskListService {
      * @returns Array of checklist task details
      */
     getTaskChecklist(id: string): Observable<TaskDetailsModel[]> {
-        return Observable.fromPromise(this.callApiTaskChecklist(id))
-            .map(res => res)
-            .map((response: any) => {
-                let checklists: TaskDetailsModel[] = [];
-                response.data.forEach((checklist) => {
-                    checklists.push(new TaskDetailsModel(checklist));
-                });
-                return checklists;
-            }).catch(err => this.handleError(err));
+        return from(this.callApiTaskChecklist(id))
+            .pipe(
+                map((response: any) => {
+                    const checklists: TaskDetailsModel[] = [];
+                    response.data.forEach((checklist) => {
+                        checklists.push(new TaskDetailsModel(checklist));
+                    });
+                    return checklists;
+                }),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
      * Gets all available reusable forms.
      * @returns Array of form details
      */
-    getFormList(): Observable<Form []> {
+    getFormList(): Observable<Form[]> {
         let opts = {
             'filter': 'myReusableForms', // String | filter
             'sort': 'modifiedDesc', // String | sort
             'modelType': 2 // Integer | modelType
         };
 
-        return Observable.fromPromise(this.apiService.getInstance().activiti.modelsApi.getModels(opts)).map(res => res)
-            .map((response: any) => {
-                let forms: Form[] = [];
-                response.data.forEach((form) => {
-                    forms.push(new Form(form.id, form.name));
-                });
-                return forms;
-            }).catch(err => this.handleError(err));
+        return from(this.apiService.getInstance().activiti.modelsApi.getModels(opts))
+            .pipe(
+                map((response: any) => {
+                    let forms: Form[] = [];
+                    response.data.forEach((form) => {
+                        forms.push(new Form(form.id, form.name));
+                    });
+                    return forms;
+                }),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -193,7 +205,10 @@ export class TaskListService {
      * @returns Null response notifying when the operation is complete
      */
     attachFormToATask(taskId: string, formId: number): Observable<any> {
-        return Observable.fromPromise(this.apiService.taskApi.attachForm(taskId, {'formId': formId})).catch(err => this.handleError(err));
+        return from(this.apiService.taskApi.attachForm(taskId, { 'formId': formId }))
+            .pipe(
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -202,11 +217,13 @@ export class TaskListService {
      * @returns The subtask that was added
      */
     addTask(task: TaskDetailsModel): Observable<TaskDetailsModel> {
-        return Observable.fromPromise(this.callApiAddTask(task))
-            .map(res => res)
-            .map((response: TaskDetailsModel) => {
-                return new TaskDetailsModel(response);
-            }).catch(err => this.handleError(err));
+        return from(this.callApiAddTask(task))
+            .pipe(
+                map((response: TaskDetailsModel) => {
+                    return new TaskDetailsModel(response);
+                }),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -215,8 +232,22 @@ export class TaskListService {
      * @returns Null response notifying when the operation is complete
      */
     deleteTask(taskId: string): Observable<TaskDetailsModel> {
-        return Observable.fromPromise(this.callApiDeleteTask(taskId))
-            .catch(err => this.handleError(err));
+        return from<TaskDetailsModel>(this.callApiDeleteTask(taskId))
+            .pipe(
+                catchError(err => this.handleError(err))
+            );
+    }
+
+    /**
+     * Deletes a form from a task.
+     * @param taskId Task id related to form
+     * @returns Null response notifying when the operation is complete
+     */
+    deleteForm(taskId: string): Observable<TaskDetailsModel> {
+        return from<TaskDetailsModel>(this.callApiDeleteForm(taskId))
+            .pipe(
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -225,9 +256,10 @@ export class TaskListService {
      * @returns Null response notifying when the operation is complete
      */
     completeTask(taskId: string) {
-        return Observable.fromPromise(this.apiService.taskApi.completeTask(taskId))
-            .map(res => res)
-            .catch(err => this.handleError(err));
+        return from(this.apiService.taskApi.completeTask(taskId))
+            .pipe(
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -237,10 +269,13 @@ export class TaskListService {
      */
     public getTotalTasks(requestNode: TaskQueryRequestRepresentationModel): Observable<any> {
         requestNode.size = 0;
-        return Observable.fromPromise(this.callApiTasksFiltered(requestNode))
-            .map((res: any) => {
-                return res;
-            }).catch(err => this.handleError(err));
+        return from(this.callApiTasksFiltered(requestNode))
+            .pipe(
+                map((res: any) => {
+                    return res;
+                }),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -249,11 +284,13 @@ export class TaskListService {
      * @returns Details of the newly created task
      */
     createNewTask(task: TaskDetailsModel): Observable<TaskDetailsModel> {
-        return Observable.fromPromise(this.callApiCreateTask(task))
-            .map(res => res)
-            .map((response: TaskDetailsModel) => {
-                return new TaskDetailsModel(response);
-            }).catch(err => this.handleError(err));
+        return from(this.callApiCreateTask(task))
+            .pipe(
+                map((response: TaskDetailsModel) => {
+                    return new TaskDetailsModel(response);
+                }),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -263,12 +300,14 @@ export class TaskListService {
      * @returns Details of the assigned task
      */
     assignTask(taskId: string, requestNode: any): Observable<TaskDetailsModel> {
-        let assignee = {assignee: requestNode.id};
-        return Observable.fromPromise(this.callApiAssignTask(taskId, assignee))
-            .map(res => res)
-            .map((response: TaskDetailsModel) => {
-                return new TaskDetailsModel(response);
-            }).catch(err => this.handleError(err));
+        let assignee = { assignee: requestNode.id };
+        return from(this.callApiAssignTask(taskId, assignee))
+            .pipe(
+                map((response: TaskDetailsModel) => {
+                    return new TaskDetailsModel(response);
+                }),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -278,12 +317,14 @@ export class TaskListService {
      * @returns Details of the assigned task
      */
     assignTaskByUserId(taskId: string, userId: number): Observable<TaskDetailsModel> {
-        let assignee = {assignee: userId};
-        return Observable.fromPromise(this.callApiAssignTask(taskId, assignee))
-            .map(res => res)
-            .map((response: TaskDetailsModel) => {
-                return new TaskDetailsModel(response);
-            }).catch(err => this.handleError(err));
+        const assignee = { assignee: userId };
+        return from(this.callApiAssignTask(taskId, assignee))
+            .pipe(
+                map((response: TaskDetailsModel) => {
+                    return new TaskDetailsModel(response);
+                }),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -292,8 +333,10 @@ export class TaskListService {
      * @returns Details of the claimed task
      */
     claimTask(taskId: string): Observable<TaskDetailsModel> {
-        return Observable.fromPromise(this.apiService.taskApi.claimTask(taskId))
-            .catch(err => this.handleError(err));
+        return from<TaskDetailsModel>(this.apiService.taskApi.claimTask(taskId))
+            .pipe(
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -302,8 +345,10 @@ export class TaskListService {
      * @returns Null response notifying when the operation is complete
      */
     unclaimTask(taskId: string): Observable<TaskDetailsModel> {
-        return Observable.fromPromise(this.apiService.taskApi.unclaimTask(taskId))
-            .catch(err => this.handleError(err));
+        return from<TaskDetailsModel>(this.apiService.taskApi.unclaimTask(taskId))
+            .pipe(
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -313,8 +358,11 @@ export class TaskListService {
      * @returns Updated task details
      */
     updateTask(taskId: any, updated): Observable<TaskDetailsModel> {
-        return Observable.fromPromise(this.apiService.taskApi.updateTask(taskId, updated))
-            .catch(err => this.handleError(err));
+        return from(this.apiService.taskApi.updateTask(taskId, updated))
+            .pipe(
+                map(result => <TaskDetailsModel> result),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -323,8 +371,11 @@ export class TaskListService {
      * @returns Binary PDF data
      */
     fetchTaskAuditPdfById(taskId: string): Observable<Blob> {
-        return Observable.fromPromise(this.apiService.taskApi.getTaskAuditPdf(taskId))
-            .catch(err => this.handleError(err));
+        return from(this.apiService.taskApi.getTaskAuditPdf(taskId))
+            .pipe(
+                map(data => <Blob> data),
+                catchError(err => this.handleError(err))
+            );
     }
 
     /**
@@ -333,8 +384,10 @@ export class TaskListService {
      * @returns JSON data
      */
     fetchTaskAuditJsonById(taskId: string): Observable<any> {
-        return Observable.fromPromise(this.apiService.taskApi.getTaskAuditJson(taskId))
-            .catch(err => this.handleError(err));
+        return from(this.apiService.taskApi.getTaskAuditJson(taskId))
+            .pipe(
+                catchError(err => this.handleError(err))
+            );
     }
 
     private callApiTasksFiltered(requestNode: TaskQueryRequestRepresentationModel) {
@@ -353,6 +406,10 @@ export class TaskListService {
         return this.apiService.taskApi.deleteTask(taskId);
     }
 
+    private callApiDeleteForm(taskId: string) {
+        return this.apiService.taskApi.removeForm(taskId);
+    }
+
     private callApiTaskChecklist(taskId: string) {
         return this.apiService.taskApi.getChecklist(taskId);
     }
@@ -367,7 +424,7 @@ export class TaskListService {
 
     private handleError(error: any) {
         this.logService.error(error);
-        return Observable.throw(error || 'Server error');
+        return throwError(error || 'Server error');
     }
 
 }
diff --git a/lib/process-services/task-list/task-list.module.ts b/lib/process-services/task-list/task-list.module.ts
index d4a176d9f4..bf2f3a5e76 100644
--- a/lib/process-services/task-list/task-list.module.ts
+++ b/lib/process-services/task-list/task-list.module.ts
@@ -18,7 +18,6 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FlexLayoutModule } from '@angular/flex-layout';
-import { TranslateModule } from '@ngx-translate/core';
 import { CoreModule } from '@alfresco/adf-core';
 import { ProcessCommentsModule } from '../process-comments/process-comments.module';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -26,10 +25,6 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MaterialModule } from '../material.module';
 import { PeopleModule } from '../people/people.module';
 import { ContentWidgetModule } from '../content-widget/content-widget.module';
-import { TaskUploadService } from './services/task-upload.service';
-import { ProcessUploadService } from './services/process-upload.service';
-import { TaskListService } from './services/tasklist.service';
-import { TaskFilterService } from './services/task-filter.service';
 
 import { ChecklistComponent } from './components/checklist.component';
 import { NoTaskDetailsTemplateDirective } from './components/no-task-detail-template.directive';
@@ -40,16 +35,16 @@ import { TaskFiltersComponent } from './components/task-filters.component';
 import { TaskHeaderComponent } from './components/task-header.component';
 import { TaskListComponent } from './components/task-list.component';
 import { TaskStandaloneComponent } from './components/task-standalone.component';
+import { AttachFormComponent } from './components/attach-form.component';
 
 @NgModule({
     imports: [
-        CoreModule,
         CommonModule,
         FlexLayoutModule,
         MaterialModule,
-        TranslateModule,
         FormsModule,
         ReactiveFormsModule,
+        CoreModule.forChild(),
         PeopleModule,
         ProcessCommentsModule,
         ContentWidgetModule
@@ -63,13 +58,8 @@ import { TaskStandaloneComponent } from './components/task-standalone.component'
         ChecklistComponent,
         TaskHeaderComponent,
         StartTaskComponent,
-        TaskStandaloneComponent
-    ],
-    providers: [
-        TaskListService,
-        TaskFilterService,
-        TaskUploadService,
-        ProcessUploadService
+        TaskStandaloneComponent,
+        AttachFormComponent
     ],
     exports: [
         NoTaskDetailsTemplateDirective,
@@ -80,7 +70,8 @@ import { TaskStandaloneComponent } from './components/task-standalone.component'
         ChecklistComponent,
         TaskHeaderComponent,
         StartTaskComponent,
-        TaskStandaloneComponent
+        TaskStandaloneComponent,
+        AttachFormComponent
     ]
 })
 export class TaskListModule {
diff --git a/lib/process-services/test.ts b/lib/process-services/test.ts
new file mode 100644
index 0000000000..f3a01bd2ef
--- /dev/null
+++ b/lib/process-services/test.ts
@@ -0,0 +1,41 @@
+/*!
+ * @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 'core-js/es7/reflect';
+import 'zone.js/dist/zone';
+import 'zone.js/dist/zone-testing';
+import { getTestBed } from '@angular/core/testing';
+import {
+    BrowserDynamicTestingModule,
+    platformBrowserDynamicTesting
+} from '@angular/platform-browser-dynamic/testing';
+import pdfjsLib = require('pdfjs-dist');
+
+declare const require: any;
+
+// First, initialize the Angular testing environment.
+getTestBed().initTestEnvironment(
+    BrowserDynamicTestingModule,
+    platformBrowserDynamicTesting()
+);
+
+pdfjsLib.PDFJS.workerSrc = 'node_modules/pdfjs-dist/build/pdf.worker.js';
+
+// Then we find all the tests.
+const context = require.context('./', true, /\.spec\.ts$/);
+// And load the modules.
+context.keys().map(context);
diff --git a/lib/process-services/testing/process.testing.module.ts b/lib/process-services/testing/process.testing.module.ts
index 1cb4b7d369..c4b43f2883 100644
--- a/lib/process-services/testing/process.testing.module.ts
+++ b/lib/process-services/testing/process.testing.module.ts
@@ -24,11 +24,16 @@ import {
     AppConfigService,
     AppConfigServiceMock,
     TranslationService,
-    TranslationMock
+    TranslationMock,
+    CoreModule
 } from '@alfresco/adf-core';
 
 @NgModule({
-    imports: [NoopAnimationsModule, ProcessModule],
+    imports: [
+        NoopAnimationsModule,
+        CoreModule.forRoot(),
+        ProcessModule
+    ],
     providers: [
         { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock },
         { provide: AppConfigService, useClass: AppConfigServiceMock },
diff --git a/lib/tsconfig.json b/lib/tsconfig.json
index 28d1857a15..6145b57c46 100644
--- a/lib/tsconfig.json
+++ b/lib/tsconfig.json
@@ -48,6 +48,7 @@
     ],
     "angularCompilerOptions": {
         "strictMetadataEmit": false,
-        "skipTemplateCodegen": true
+        "skipTemplateCodegen": true,
+        "preserveWhitespaces": false
     }
 }
diff --git a/lib/tslint.json b/lib/tslint.json
index a3b0be08c1..8ca9e3ac1b 100644
--- a/lib/tslint.json
+++ b/lib/tslint.json
@@ -1,47 +1,43 @@
 {
-    "rulesDirectory": [
-        "../node_modules/codelyzer",
-        "../tools/tslint-rules/"
-    ],
-    "rules": {
-        "align": [
-            true,
-            "parameters",
-            "statements"
-        ],
-        "ban": [
-          true,
-          "eval",
-          "fdescribe"
-        ],
-        "class-name": true,
-        "comment-format": [
-            true,
-            "check-space"
-        ],
-        "curly": true,
-        "eofline": true,
-        "forin": true,
-    "import-blacklist": [
+  "rulesDirectory": [
+    "../node_modules/codelyzer",
+    "../tools/tslint-rules/"
+  ],
+  "rules": {
+    "adf-license-banner": [
       true,
-      "rxjs",
-      "rxjs/Rx"
+      "lib/+(core|content-services|process-services|insights)/**/*.ts"
     ],
-    "import-spacing": true,
-        "indent": [
-            true,
-            "spaces"
-        ],
-        "interface-name": false,
-        "jsdoc-format": true,
-        "label-position": true,
-        "max-line-length": [
-            true,
-            180
-        ],
-        "member-access": false,
-        "member-ordering": [
-            true,
+    "align": [
+      true,
+      "parameters",
+      "statements"
+    ],
+    "ban": [
+      true,
+      "eval"
+    ],
+    "class-name": true,
+    "comment-format": [
+      true,
+      "check-space"
+    ],
+    "curly": true,
+    "eofline": true,
+    "forin": true,
+    "indent": [
+      true,
+      "spaces"
+    ],
+    "interface-name": false,
+    "jsdoc-format": true,
+    "label-position": true,
+    "max-line-length": [
+      true,
+      180
+    ],
+    "member-ordering": [
+      true,
       {
         "order": [
           "static-field",
@@ -50,130 +46,129 @@
           "instance-method"
         ]
       }
-        ],
-        "no-any": false,
-        "no-arg": true,
-        "no-bitwise": false,
-        "no-conditional-assignment": true,
-        "no-consecutive-blank-lines": true,
-        "no-console": [
-            true,
-            "log",
-            "debug",
-            "info",
-            "time",
-            "timeEnd",
-            "trace"
-        ],
-        "no-construct": true,
-        "no-constructor-vars": false,
-        "no-debugger": true,
-        "no-duplicate-super": true,
-        "no-duplicate-variable": true,
-        "no-empty": false,
-        "no-eval": true,
-        "no-inferrable-types": false,
-        "no-internal-module": true,
-        "no-require-imports": false,
-        "no-shadowed-variable": true,
-        "no-switch-case-fall-through": true,
-        "no-trailing-whitespace": true,
-        "no-unused-expression": true,
-        "no-var-keyword": true,
-        "no-var-requires": true,
-        "object-literal-sort-keys": false,
-        "one-line": [
-            true,
-            "check-open-brace",
-            "check-catch",
-            "check-else",
-            "check-whitespace"
-        ],
-        "quotemark": [
-            true,
-            "single",
-            "avoid-escape"
-        ],
-        "radix": true,
-        "semicolon": [
-          true,
-          "always"
-        ],
-        "switch-default": true,
-        "trailing-comma": [
-            true,
-            {
-                "multiline": "never",
-                "singleline": "never"
-            }
-        ],
-        "triple-equals": [
-            true,
-            "allow-null-check"
-        ],
-        "typedef": false,
-        "typedef-whitespace": [
-            true,
-            {
-                "call-signature": "nospace",
-                "index-signature": "nospace",
-                "parameter": "nospace",
-                "property-declaration": "nospace",
-                "variable-declaration": "nospace"
-            }
-        ],
-        "use-strict": false,
-        "variable-name": [
-            true,
-            "check-format",
-            "allow-leading-underscore",
-            "ban-keywords"
-        ],
-        "callable-types": true,
-        "import-blacklist": [
-            true,
-            "rxjs"
-        ],
-        "import-spacing": true,
-        "interface-over-type-literal": true,
-        "member-access": false,
-        "no-empty-interface": true,
-        "no-string-literal": false,
-        "no-string-throw": true,
-        "prefer-const": false,
-        "unified-signatures": true,
-        "whitespace": [
-            true,
-            "check-branch",
-            "check-decl",
-            "check-operator",
-            "check-separator",
-            "check-typecast",
-            "check-type",
-            "check-typecast",
-            "check-module"
-        ],
-        "component-selector": [
-            true,
-            "element",
-            "adf",
-            "kebab-case"
-        ],
-      "naming-convention": [
-        {"type": "enumMember", "format": "PascalCase"}
-      ],
-      "ordered-imports": false,
-        "use-input-property-decorator": true,
-        "use-output-property-decorator": true,
-        "use-host-property-decorator": false,
-        "use-life-cycle-interface": true,
-        "use-pipe-transform-interface": true,
-        "component-class-suffix": true,
-        "directive-class-suffix": true,
-        "adf-file-name": true,
-        "adf-class-name": true,
-        "adf-prefix-name": true,
-        "no-input-rename": true,
-        "no-output-rename": true
-    }
+    ],
+    "no-any": false,
+    "no-arg": true,
+    "no-bitwise": false,
+    "no-conditional-assignment": true,
+    "no-consecutive-blank-lines": true,
+    "no-console": [
+      true,
+      "log",
+      "debug",
+      "info",
+      "time",
+      "timeEnd",
+      "trace"
+    ],
+    "no-construct": true,
+    "no-constructor-vars": false,
+    "no-debugger": true,
+    "no-duplicate-super": true,
+    "no-duplicate-variable": true,
+    "no-empty": false,
+    "no-eval": true,
+    "no-inferrable-types": false,
+    "no-internal-module": true,
+    "no-require-imports": false,
+    "no-shadowed-variable": true,
+    "no-switch-case-fall-through": true,
+    "no-trailing-whitespace": true,
+    "no-unused-expression": true,
+    "no-var-keyword": true,
+    "no-var-requires": true,
+    "object-literal-sort-keys": false,
+    "one-line": [
+      true,
+      "check-open-brace",
+      "check-catch",
+      "check-else",
+      "check-whitespace"
+    ],
+    "quotemark": [
+      true,
+      "single",
+      "avoid-escape"
+    ],
+    "radix": true,
+    "semicolon": [
+      true,
+      "always"
+    ],
+    "switch-default": true,
+    "trailing-comma": [
+      true,
+      {
+        "multiline": "never",
+        "singleline": "never"
+      }
+    ],
+    "triple-equals": [
+      true,
+      "allow-null-check"
+    ],
+    "typedef": false,
+    "typedef-whitespace": [
+      true,
+      {
+        "call-signature": "nospace",
+        "index-signature": "nospace",
+        "parameter": "nospace",
+        "property-declaration": "nospace",
+        "variable-declaration": "nospace"
+      }
+    ],
+    "use-strict": false,
+    "variable-name": [
+      true,
+      "check-format",
+      "allow-leading-underscore",
+      "ban-keywords"
+    ],
+    "callable-types": true,
+    "import-spacing": true,
+    "interface-over-type-literal": true,
+    "member-access": false,
+    "no-empty-interface": true,
+    "no-string-literal": false,
+    "no-string-throw": true,
+    "prefer-const": false,
+    "unified-signatures": true,
+    "whitespace": [
+      true,
+      "check-branch",
+      "check-decl",
+      "check-operator",
+      "check-separator",
+      "check-typecast",
+      "check-type",
+      "check-typecast",
+      "check-module"
+    ],
+    "component-selector": [
+      true,
+      "element",
+      "adf",
+      "kebab-case"
+    ],
+    "naming-convention": [
+      {
+        "type": "enumMember",
+        "format": "PascalCase"
+      }
+    ],
+    "ordered-imports": false,
+    "use-input-property-decorator": true,
+    "use-output-property-decorator": true,
+    "use-host-property-decorator": false,
+    "use-life-cycle-interface": true,
+    "use-pipe-transform-interface": true,
+    "component-class-suffix": true,
+    "directive-class-suffix": true,
+    "adf-file-name": true,
+    "adf-class-name": true,
+    "adf-prefix-name": true,
+    "no-input-rename": true,
+    "no-output-rename": true
+  }
 }
diff --git a/package-lock.json b/package-lock.json
index 463c0851a6..fde7dfc3fd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,723 +1,128 @@
 {
   "name": "alfresco-components",
-  "version": "2.4.0",
+  "version": "2.5.0-beta5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
     "@alfresco/adf-content-services": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-2.4.0.tgz",
-      "integrity": "sha512-WHQFo1bokmc9hYi3C3zlQImvuajOJuycfjSmkyQ27sEQhsjzH7+lPXV7Loa8p5kGFIP6KBL61BxReCfJqIJDCA==",
+      "version": "2.5.0-e54f9bc5fe08d3963ae86dac9aa60fbdf0bf2a41",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-2.5.0-e54f9bc5fe08d3963ae86dac9aa60fbdf0bf2a41.tgz",
+      "integrity": "sha512-tKWlhcn9tV5gL5suZ1iCfOce2MlfM7ru6pgwf2HYyCRv+vNwplecmr20fHqtAurq5oLuH5XzOUAEjwRPuCxMcg==",
       "requires": {
-        "@alfresco/adf-core": "2.4.0",
-        "@angular/animations": "5.1.1",
-        "@angular/cdk": "5.0.1",
-        "@angular/common": "5.1.1",
-        "@angular/compiler": "5.1.1",
-        "@angular/core": "5.1.1",
-        "@angular/flex-layout": "2.0.0-beta.12",
-        "@angular/forms": "5.1.1",
-        "@angular/http": "5.1.1",
-        "@angular/material": "5.0.1",
-        "@angular/material-moment-adapter": "5.0.1",
-        "@angular/platform-browser": "5.1.1",
-        "@angular/platform-browser-dynamic": "5.1.1",
-        "@angular/router": "5.1.1",
-        "@ngx-translate/core": "9.1.1",
-        "alfresco-js-api": "2.4.0",
-        "chart.js": "2.5.0",
-        "core-js": "2.4.1",
-        "hammerjs": "2.0.8",
-        "minimatch": "3.0.4",
-        "moment": "2.20.1",
-        "ng2-charts": "1.6.0",
-        "pdfjs-dist": "1.5.404",
-        "raphael": "2.2.7",
-        "reflect-metadata": "0.1.10",
-        "rxjs": "5.5.2",
-        "systemjs": "0.19.27",
-        "tslib": "^1.7.1",
-        "zone.js": "0.8.14"
-      },
-      "dependencies": {
-        "pdfjs-dist": {
-          "version": "1.5.404",
-          "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-1.5.404.tgz",
-          "integrity": "sha1-hYXGUWquIU1ZCXXo+ys8PzrxTO8=",
-          "requires": {
-            "node-ensure": "^0.0.0"
-          }
-        },
-        "zone.js": {
-          "version": "0.8.14",
-          "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.14.tgz",
-          "integrity": "sha1-DE2ySxeCMidMy0P3jJnbfzZCts8="
-        }
+        "tslib": "^1.9.0"
       }
     },
     "@alfresco/adf-core": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-2.4.0.tgz",
-      "integrity": "sha512-sK0C3Q9yDjqpXV3l5DQXqyRRSiZ+RaUKU81BHEY7Bq1szbBhJq9bJ3rF6PfABzGwB9DKhy+nU+fftCneLJQcnA==",
+      "version": "2.5.0-e54f9bc5fe08d3963ae86dac9aa60fbdf0bf2a41",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-2.5.0-e54f9bc5fe08d3963ae86dac9aa60fbdf0bf2a41.tgz",
+      "integrity": "sha512-rtlk+c8e6ZC+jXyyzRTO10qVJSUqP1MgEo3E7pETBbrVpYrY1yYfcRKtZXr6B4/wXdiX3GQ1mktOAieB6iDZnw==",
       "requires": {
-        "@angular/animations": "5.1.1",
-        "@angular/cdk": "5.0.1",
-        "@angular/common": "5.1.1",
-        "@angular/compiler": "5.1.1",
-        "@angular/core": "5.1.1",
-        "@angular/flex-layout": "2.0.0-beta.12",
-        "@angular/forms": "5.1.1",
-        "@angular/http": "5.1.1",
-        "@angular/material": "5.0.1",
-        "@angular/material-moment-adapter": "5.0.1",
-        "@angular/platform-browser": "5.1.1",
-        "@angular/platform-browser-dynamic": "5.1.1",
-        "@angular/router": "5.1.1",
-        "@ngx-translate/core": "9.1.1",
-        "alfresco-js-api": "2.4.0",
-        "chart.js": "2.5.0",
-        "core-js": "2.4.1",
-        "hammerjs": "2.0.8",
-        "minimatch": "3.0.4",
-        "moment": "2.20.1",
-        "ng2-charts": "1.6.0",
-        "pdfjs-dist": "1.5.404",
-        "raphael": "2.2.7",
-        "reflect-metadata": "0.1.10",
-        "rxjs": "5.5.2",
-        "systemjs": "0.19.27",
-        "tslib": "^1.7.1",
-        "zone.js": "0.8.14"
-      },
-      "dependencies": {
-        "pdfjs-dist": {
-          "version": "1.5.404",
-          "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-1.5.404.tgz",
-          "integrity": "sha1-hYXGUWquIU1ZCXXo+ys8PzrxTO8=",
-          "requires": {
-            "node-ensure": "^0.0.0"
-          }
-        },
-        "zone.js": {
-          "version": "0.8.14",
-          "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.14.tgz",
-          "integrity": "sha1-DE2ySxeCMidMy0P3jJnbfzZCts8="
-        }
+        "tslib": "^1.9.0"
       }
     },
     "@alfresco/adf-insights": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-insights/-/adf-insights-2.4.0.tgz",
-      "integrity": "sha512-umz0DftgaYvQjFuxj4YNXSJPzFri6nkzvFzOG7jJMwrPU2Rqoya7NJxHr3hwA62tvtGY11l6+rKE/iWrN9Cjcw==",
+      "version": "2.5.0-e54f9bc5fe08d3963ae86dac9aa60fbdf0bf2a41",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-insights/-/adf-insights-2.5.0-e54f9bc5fe08d3963ae86dac9aa60fbdf0bf2a41.tgz",
+      "integrity": "sha512-6A48gfZKfhu9eKmBsDufNjvIiPHOAC2FiFxGEl6RZ4BUZlT9TyeDJvT4pB761v9XQ0BsMOo6pWF9KiCs/dgbSA==",
       "requires": {
-        "@alfresco/adf-core": "2.4.0",
-        "@angular/animations": "5.1.1",
-        "@angular/cdk": "5.0.1",
-        "@angular/common": "5.1.1",
-        "@angular/compiler": "5.1.1",
-        "@angular/core": "5.1.1",
-        "@angular/flex-layout": "2.0.0-beta.12",
-        "@angular/forms": "5.1.1",
-        "@angular/http": "5.1.1",
-        "@angular/material": "5.0.1",
-        "@angular/material-moment-adapter": "5.0.1",
-        "@angular/platform-browser": "5.1.1",
-        "@angular/platform-browser-dynamic": "5.1.1",
-        "@angular/router": "5.1.1",
-        "@ngx-translate/core": "9.1.1",
-        "alfresco-js-api": "2.4.0",
-        "chart.js": "2.5.0",
-        "core-js": "2.4.1",
-        "hammerjs": "2.0.8",
-        "minimatch": "3.0.4",
-        "moment": "2.20.1",
-        "ng2-charts": "1.6.0",
-        "pdfjs-dist": "1.5.404",
-        "raphael": "2.2.7",
-        "reflect-metadata": "0.1.10",
-        "rxjs": "5.5.2",
-        "systemjs": "0.19.27",
-        "tslib": "^1.7.1",
-        "zone.js": "0.8.14"
-      },
-      "dependencies": {
-        "pdfjs-dist": {
-          "version": "1.5.404",
-          "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-1.5.404.tgz",
-          "integrity": "sha1-hYXGUWquIU1ZCXXo+ys8PzrxTO8=",
-          "requires": {
-            "node-ensure": "^0.0.0"
-          }
-        },
-        "zone.js": {
-          "version": "0.8.14",
-          "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.14.tgz",
-          "integrity": "sha1-DE2ySxeCMidMy0P3jJnbfzZCts8="
-        }
+        "tslib": "^1.9.0"
       }
     },
     "@alfresco/adf-process-services": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-process-services/-/adf-process-services-2.4.0.tgz",
-      "integrity": "sha512-CooXIqKmEHQHpilEVUlx7WYg734zlgkG1LbLH8OBIHPG+DRnrOfYYiMmeUH3MlbQJ+tT74YWi0x9cHLrqdh2Rw==",
+      "version": "2.5.0-e54f9bc5fe08d3963ae86dac9aa60fbdf0bf2a41",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-process-services/-/adf-process-services-2.5.0-e54f9bc5fe08d3963ae86dac9aa60fbdf0bf2a41.tgz",
+      "integrity": "sha512-HfRqKde3DwWlU7yqdVZbW5Ev/DR6br6jZX23APNsCbCP8doZJT9IxN8iByXuUy7tN6Wgi4UsH1XPsIAXXgnk/A==",
       "requires": {
-        "@alfresco/adf-content-services": "2.4.0",
-        "@alfresco/adf-core": "2.4.0",
-        "@angular/animations": "5.1.1",
-        "@angular/cdk": "5.0.1",
-        "@angular/common": "5.1.1",
-        "@angular/compiler": "5.1.1",
-        "@angular/core": "5.1.1",
-        "@angular/flex-layout": "2.0.0-beta.12",
-        "@angular/forms": "5.1.1",
-        "@angular/http": "5.1.1",
-        "@angular/material": "5.0.1",
-        "@angular/material-moment-adapter": "5.0.1",
-        "@angular/platform-browser": "5.1.1",
-        "@angular/platform-browser-dynamic": "5.1.1",
-        "@angular/router": "5.1.1",
-        "@ngx-translate/core": "9.1.1",
-        "alfresco-js-api": "2.4.0",
-        "chart.js": "2.5.0",
-        "core-js": "2.4.1",
-        "hammerjs": "2.0.8",
-        "minimatch": "3.0.4",
-        "moment": "2.20.1",
-        "ng2-charts": "1.6.0",
-        "pdfjs-dist": "1.5.404",
-        "raphael": "2.2.7",
-        "reflect-metadata": "0.1.10",
-        "rxjs": "5.5.2",
-        "systemjs": "0.19.27",
-        "tslib": "^1.7.1",
-        "zone.js": "0.8.14"
-      },
-      "dependencies": {
-        "pdfjs-dist": {
-          "version": "1.5.404",
-          "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-1.5.404.tgz",
-          "integrity": "sha1-hYXGUWquIU1ZCXXo+ys8PzrxTO8=",
-          "requires": {
-            "node-ensure": "^0.0.0"
-          }
-        },
-        "zone.js": {
-          "version": "0.8.14",
-          "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.14.tgz",
-          "integrity": "sha1-DE2ySxeCMidMy0P3jJnbfzZCts8="
-        }
+        "tslib": "^1.9.0"
       }
     },
-    "@angular-devkit/build-optimizer": {
-      "version": "0.3.2",
-      "resolved": "http://localhost:4873/@angular-devkit%2fbuild-optimizer/-/build-optimizer-0.3.2.tgz",
-      "integrity": "sha512-U0BCZtThq5rUfY08shHXpxe8ZhSsiYB/cJjUvAWRTs/ORrs8pbngS6xwseQws8d/vHoVrtqGD9GU9h8AmFRERQ==",
+    "@angular-devkit/architect": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.7.2.tgz",
+      "integrity": "sha512-p7e4wE+a1AxlfCJQL1IIBltblV9VqFSMlUuPW3PUp0fguo0yaTv9paY5WlFwrj0YhypBj3zHcjSdIruHrgbErg==",
+      "requires": {
+        "@angular-devkit/core": "0.7.2",
+        "rxjs": "^6.0.0"
+      }
+    },
+    "@angular-devkit/build-angular": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.7.2.tgz",
+      "integrity": "sha512-ZJii0Gm4oLrnMpA8oiiNo8RKMvKkE/bVNaJSkt85ZZ8RNqYWboA8T+xvn7jOARTtDMq/gLTXFdYRL+WLIbe9Lg==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0",
-        "source-map": "^0.5.6",
-        "typescript": "~2.6.2",
-        "webpack-sources": "^1.0.1"
-      },
-      "dependencies": {
-        "typescript": {
-          "version": "2.6.2",
-          "resolved": "http://localhost:4873/typescript/-/typescript-2.6.2.tgz",
-          "integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=",
-          "dev": true
-        }
-      }
-    },
-    "@angular-devkit/core": {
-      "version": "0.3.2",
-      "resolved": "http://localhost:4873/@angular-devkit%2fcore/-/core-0.3.2.tgz",
-      "integrity": "sha512-zABk/iP7YX5SVbmK4e+IX7j2d0D37MQJQiKgWdV3JzfvVJhNJzddiirtT980pIafoq+KyvTgVwXtc+vnux0oeQ==",
-      "dev": true,
-      "requires": {
-        "ajv": "~5.5.1",
-        "chokidar": "^1.7.0",
-        "rxjs": "^5.5.6",
-        "source-map": "^0.5.6"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "5.5.2",
-          "resolved": "http://localhost:4873/ajv/-/ajv-5.5.2.tgz",
-          "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-          "dev": true,
-          "requires": {
-            "co": "^4.6.0",
-            "fast-deep-equal": "^1.0.0",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.3.0"
-          }
-        },
-        "fast-deep-equal": {
-          "version": "1.1.0",
-          "resolved": "http://localhost:4873/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-          "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
-          "dev": true
-        },
-        "rxjs": {
-          "version": "5.5.11",
-          "resolved": "http://localhost:4873/rxjs/-/rxjs-5.5.11.tgz",
-          "integrity": "sha512-3bjO7UwWfA2CV7lmwYMBzj4fQ6Cq+ftHc2MvUe+WMS7wcdJ1LosDWmdjPQanYp2dBRj572p7PeU81JUxHKOcBA==",
-          "dev": true,
-          "requires": {
-            "symbol-observable": "1.0.1"
-          }
-        },
-        "symbol-observable": {
-          "version": "1.0.1",
-          "resolved": "http://localhost:4873/symbol-observable/-/symbol-observable-1.0.1.tgz",
-          "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=",
-          "dev": true
-        }
-      }
-    },
-    "@angular-devkit/schematics": {
-      "version": "0.3.2",
-      "resolved": "http://localhost:4873/@angular-devkit%2fschematics/-/schematics-0.3.2.tgz",
-      "integrity": "sha512-B6zZoqvHaTJy+vVdA6EtlxnCdGMa5elCa4j9lQLC3JI8DLvMXUWkCIPVbPzJ/GSRR9nsKWpvYMYaJyfBDUqfhw==",
-      "dev": true,
-      "requires": {
-        "@ngtools/json-schema": "^1.1.0",
-        "rxjs": "^5.5.6"
-      },
-      "dependencies": {
-        "rxjs": {
-          "version": "5.5.11",
-          "resolved": "http://localhost:4873/rxjs/-/rxjs-5.5.11.tgz",
-          "integrity": "sha512-3bjO7UwWfA2CV7lmwYMBzj4fQ6Cq+ftHc2MvUe+WMS7wcdJ1LosDWmdjPQanYp2dBRj572p7PeU81JUxHKOcBA==",
-          "dev": true,
-          "requires": {
-            "symbol-observable": "1.0.1"
-          }
-        },
-        "symbol-observable": {
-          "version": "1.0.1",
-          "resolved": "http://localhost:4873/symbol-observable/-/symbol-observable-1.0.1.tgz",
-          "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=",
-          "dev": true
-        }
-      }
-    },
-    "@angular/animations": {
-      "version": "5.1.1",
-      "resolved": "http://localhost:4873/@angular%2fanimations/-/animations-5.1.1.tgz",
-      "integrity": "sha512-PHLBWDnAzr5b5l52pk5ZYmv/6m0YUe2ICwu5dmbS0d8Kf5dXadMphAWCDbljMF+djGyZeFq2/dQ/t7ygYl3YuA==",
-      "requires": {
-        "tslib": "^1.7.1"
-      }
-    },
-    "@angular/cdk": {
-      "version": "5.0.1",
-      "resolved": "http://localhost:4873/@angular%2fcdk/-/cdk-5.0.1.tgz",
-      "integrity": "sha512-uK4Vyaf06J8KqePzq35BxMHRGolt35EnbZf9wjCs7eYaghbQ7Pk2xUGoynu5Lj1wAOn5N1/C1nT2/aAH/EE2rw==",
-      "requires": {
-        "tslib": "^1.7.1"
-      }
-    },
-    "@angular/cli": {
-      "version": "1.7.4",
-      "resolved": "http://localhost:4873/@angular%2fcli/-/cli-1.7.4.tgz",
-      "integrity": "sha512-URdb1QtnQf+Ievy93wjq7gE81s25BkWUwJFPey+YkphBA3G1lbCAQPiEh2pntBwaIKavgEuCw+Sf2YZdgTVhDA==",
-      "dev": true,
-      "requires": {
-        "@angular-devkit/build-optimizer": "0.3.2",
-        "@angular-devkit/core": "0.3.2",
-        "@angular-devkit/schematics": "0.3.2",
-        "@ngtools/json-schema": "1.2.0",
-        "@ngtools/webpack": "1.10.2",
-        "@schematics/angular": "0.3.2",
-        "@schematics/package-update": "0.3.2",
-        "ajv": "^6.1.1",
-        "autoprefixer": "^7.2.3",
-        "cache-loader": "^1.2.0",
-        "chalk": "~2.2.0",
-        "circular-dependency-plugin": "^4.2.1",
+        "@angular-devkit/architect": "0.7.2",
+        "@angular-devkit/build-optimizer": "0.7.2",
+        "@angular-devkit/build-webpack": "0.7.2",
+        "@angular-devkit/core": "0.7.2",
+        "@ngtools/webpack": "6.1.2",
+        "ajv": "~6.4.0",
+        "autoprefixer": "^8.4.1",
+        "circular-dependency-plugin": "^5.0.2",
         "clean-css": "^4.1.11",
-        "common-tags": "^1.3.1",
-        "copy-webpack-plugin": "~4.4.1",
-        "core-object": "^3.1.0",
-        "denodeify": "^1.2.1",
-        "ember-cli-string-utils": "^1.0.0",
-        "extract-text-webpack-plugin": "^3.0.2",
-        "file-loader": "^1.1.5",
-        "fs-extra": "^4.0.0",
+        "copy-webpack-plugin": "^4.5.2",
+        "file-loader": "^1.1.11",
         "glob": "^7.0.3",
-        "html-webpack-plugin": "^2.29.0",
-        "istanbul-instrumenter-loader": "^3.0.0",
+        "html-webpack-plugin": "^3.0.6",
+        "istanbul": "^0.4.5",
+        "istanbul-instrumenter-loader": "^3.0.1",
         "karma-source-map-support": "^1.2.0",
-        "less": "^2.7.2",
-        "less-loader": "^4.0.5",
-        "license-webpack-plugin": "^1.0.0",
-        "loader-utils": "1.1.0",
-        "lodash": "^4.11.1",
-        "memory-fs": "^0.4.1",
+        "less": "^3.0.4",
+        "less-loader": "^4.1.0",
+        "license-webpack-plugin": "^1.3.1",
+        "mini-css-extract-plugin": "~0.4.0",
         "minimatch": "^3.0.4",
-        "node-modules-path": "^1.0.0",
-        "node-sass": "^4.7.2",
-        "nopt": "^4.0.1",
-        "opn": "~5.1.0",
-        "portfinder": "~1.0.12",
-        "postcss": "^6.0.16",
-        "postcss-import": "^11.0.0",
-        "postcss-loader": "^2.0.10",
-        "postcss-url": "^7.1.2",
+        "node-sass": "^4.9.1",
+        "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",
-        "resolve": "^1.1.7",
-        "rxjs": "^5.5.6",
-        "sass-loader": "^6.0.6",
-        "semver": "^5.1.0",
-        "silent-error": "^1.0.0",
-        "source-map-support": "^0.4.1",
-        "style-loader": "^0.19.1",
+        "rxjs": "^6.0.0",
+        "sass-loader": "~6.0.7",
+        "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.1",
-        "uglifyjs-webpack-plugin": "^1.1.8",
-        "url-loader": "^0.6.2",
-        "webpack": "~3.11.0",
-        "webpack-dev-middleware": "~1.12.0",
-        "webpack-dev-server": "~2.11.0",
-        "webpack-merge": "^4.1.0",
-        "webpack-sources": "^1.0.0",
-        "webpack-subresource-integrity": "^1.0.1"
+        "stylus-loader": "^3.0.2",
+        "tree-kill": "^1.2.0",
+        "uglifyjs-webpack-plugin": "^1.2.5",
+        "url-loader": "^1.0.1",
+        "webpack": "~4.9.2",
+        "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"
       },
       "dependencies": {
-        "@schematics/angular": {
-          "version": "0.3.2",
-          "resolved": "http://localhost:4873/@schematics%2fangular/-/angular-0.3.2.tgz",
-          "integrity": "sha512-Elrk0BA951s0ScFZU0AWrpUeJBYVR52DZ1QTIO5R0AhwEd1PW4olI8szPLGQlVW5Sd6H0FA/fyFLIvn2r9v6Rw==",
-          "dev": true,
-          "requires": {
-            "typescript": "~2.6.2"
-          }
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
         "autoprefixer": {
-          "version": "7.2.6",
-          "resolved": "http://localhost:4873/autoprefixer/-/autoprefixer-7.2.6.tgz",
-          "integrity": "sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==",
+          "version": "8.6.5",
+          "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-8.6.5.tgz",
+          "integrity": "sha512-PLWJN3Xo/rycNkx+mp8iBDMTm3FeWe4VmYaZDSqL5QQB9sLsQkG5k8n+LNDFnhh9kdq2K+egL/icpctOmDHwig==",
           "dev": true,
           "requires": {
-            "browserslist": "^2.11.3",
-            "caniuse-lite": "^1.0.30000805",
+            "browserslist": "^3.2.8",
+            "caniuse-lite": "^1.0.30000864",
             "normalize-range": "^0.1.2",
             "num2fraction": "^1.2.2",
-            "postcss": "^6.0.17",
+            "postcss": "^6.0.23",
             "postcss-value-parser": "^3.2.3"
           }
         },
-        "caseless": {
-          "version": "0.11.0",
-          "resolved": "http://localhost:4873/caseless/-/caseless-0.11.0.tgz",
-          "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
-          "dev": true,
-          "optional": true
-        },
-        "chalk": {
-          "version": "2.2.2",
-          "resolved": "http://localhost:4873/chalk/-/chalk-2.2.2.tgz",
-          "integrity": "sha512-LvixLAQ4MYhbf7hgL4o5PeK32gJKvVzDRiSNIApDofQvyhl8adgG2lJVXn4+ekQoK7HL9RF8lqxwerpe0x2pCw==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.1.0",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^4.0.0"
-          }
-        },
-        "copy-webpack-plugin": {
-          "version": "4.4.3",
-          "resolved": "http://localhost:4873/copy-webpack-plugin/-/copy-webpack-plugin-4.4.3.tgz",
-          "integrity": "sha512-v4THQ24Tks2NkyOvZuFDgZVfDD9YaA9rwYLZTrWg2GHIA8lrH5DboEyeoorh5Skki+PUbgSmnsCwhMWqYrQZrA==",
-          "dev": true,
-          "requires": {
-            "cacache": "^10.0.1",
-            "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"
-          }
-        },
-        "cross-spawn": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/cross-spawn/-/cross-spawn-3.0.1.tgz",
-          "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "lru-cache": "^4.0.1",
-            "which": "^1.2.9"
-          }
-        },
-        "extract-text-webpack-plugin": {
-          "version": "3.0.2",
-          "resolved": "http://localhost:4873/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz",
-          "integrity": "sha512-bt/LZ4m5Rqt/Crl2HiKuAl/oqg0psx1tsTLkvWbJen1CtD+fftkZhMaQ9HOtY2gWsl2Wq+sABmMVi9z3DhKWQQ==",
-          "dev": true,
-          "requires": {
-            "async": "^2.4.1",
-            "loader-utils": "^1.1.0",
-            "schema-utils": "^0.3.0",
-            "webpack-sources": "^1.0.1"
-          }
-        },
-        "fast-deep-equal": {
-          "version": "1.1.0",
-          "resolved": "http://localhost:4873/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-          "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
-          "dev": true
-        },
-        "file-loader": {
-          "version": "1.1.11",
-          "resolved": "http://localhost:4873/file-loader/-/file-loader-1.1.11.tgz",
-          "integrity": "sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==",
-          "dev": true,
-          "requires": {
-            "loader-utils": "^1.0.2",
-            "schema-utils": "^0.4.5"
-          },
-          "dependencies": {
-            "schema-utils": {
-              "version": "0.4.5",
-              "resolved": "http://localhost:4873/schema-utils/-/schema-utils-0.4.5.tgz",
-              "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==",
-              "dev": true,
-              "requires": {
-                "ajv": "^6.1.0",
-                "ajv-keywords": "^3.1.0"
-              }
-            }
-          }
-        },
-        "form-data": {
-          "version": "2.1.4",
-          "resolved": "http://localhost:4873/form-data/-/form-data-2.1.4.tgz",
-          "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "^1.0.5",
-            "mime-types": "^2.1.12"
-          }
-        },
-        "har-validator": {
-          "version": "2.0.6",
-          "resolved": "http://localhost:4873/har-validator/-/har-validator-2.0.6.tgz",
-          "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
-          "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"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "2.2.1",
-              "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-              "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-              "dev": true,
-              "optional": true
-            },
-            "chalk": {
-              "version": "1.1.3",
-              "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-              "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-              "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"
-              }
-            },
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-          "dev": true
-        },
-        "html-webpack-plugin": {
-          "version": "2.30.1",
-          "resolved": "http://localhost:4873/html-webpack-plugin/-/html-webpack-plugin-2.30.1.tgz",
-          "integrity": "sha1-f5xCG36pHsRg9WUn1430hO51N9U=",
-          "dev": true,
-          "requires": {
-            "bluebird": "^3.4.7",
-            "html-minifier": "^3.2.3",
-            "loader-utils": "^0.2.16",
-            "lodash": "^4.17.3",
-            "pretty-error": "^2.0.2",
-            "toposort": "^1.0.0"
-          },
-          "dependencies": {
-            "loader-utils": {
-              "version": "0.2.17",
-              "resolved": "http://localhost:4873/loader-utils/-/loader-utils-0.2.17.tgz",
-              "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"
-              }
-            }
-          }
-        },
-        "is-extglob": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/is-extglob/-/is-extglob-2.1.1.tgz",
-          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-          "dev": true
-        },
-        "is-glob": {
+        "parse5": {
           "version": "4.0.0",
-          "resolved": "http://localhost:4873/is-glob/-/is-glob-4.0.0.tgz",
-          "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.1"
-          }
-        },
-        "node-sass": {
-          "version": "4.9.0",
-          "resolved": "http://localhost:4873/node-sass/-/node-sass-4.9.0.tgz",
-          "integrity": "sha512-QFHfrZl6lqRU3csypwviz2XLgGNOoWQbo2GOvtsfQqOfL4cy1BtWnhx/XUeAO9LT3ahBzSRXcEO6DdvAH9DzSg==",
-          "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.3.1",
-            "npmlog": "^4.0.0",
-            "request": "~2.79.0",
-            "sass-graph": "^2.2.4",
-            "stdout-stream": "^1.4.0",
-            "true-case-path": "^1.0.2"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "2.2.1",
-              "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-              "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-              "dev": true,
-              "optional": true
-            },
-            "chalk": {
-              "version": "1.1.3",
-              "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-              "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-              "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"
-              }
-            },
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "opn": {
-          "version": "5.1.0",
-          "resolved": "http://localhost:4873/opn/-/opn-5.1.0.tgz",
-          "integrity": "sha512-iPNl7SyM8L30Rm1sjGdLLheyHVw5YXVfi3SKWJzBI7efxRwHojfRFjwE/OLM6qp9xJYMgab8WicTU1cPoY+Hpg==",
-          "dev": true,
-          "requires": {
-            "is-wsl": "^1.1.0"
-          }
-        },
-        "qs": {
-          "version": "6.3.2",
-          "resolved": "http://localhost:4873/qs/-/qs-6.3.2.tgz",
-          "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=",
-          "dev": true,
-          "optional": true
-        },
-        "request": {
-          "version": "2.79.0",
-          "resolved": "http://localhost:4873/request/-/request-2.79.0.tgz",
-          "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "aws-sign2": "~0.6.0",
-            "aws4": "^1.2.1",
-            "caseless": "~0.11.0",
-            "combined-stream": "~1.0.5",
-            "extend": "~3.0.0",
-            "forever-agent": "~0.6.1",
-            "form-data": "~2.1.1",
-            "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",
-            "oauth-sign": "~0.8.1",
-            "qs": "~6.3.0",
-            "stringstream": "~0.0.4",
-            "tough-cookie": "~2.3.0",
-            "tunnel-agent": "~0.4.1",
-            "uuid": "^3.0.0"
-          }
-        },
-        "rxjs": {
-          "version": "5.5.11",
-          "resolved": "http://localhost:4873/rxjs/-/rxjs-5.5.11.tgz",
-          "integrity": "sha512-3bjO7UwWfA2CV7lmwYMBzj4fQ6Cq+ftHc2MvUe+WMS7wcdJ1LosDWmdjPQanYp2dBRj572p7PeU81JUxHKOcBA==",
-          "dev": true,
-          "requires": {
-            "symbol-observable": "1.0.1"
-          }
+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
+          "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
+          "dev": true
         },
         "sass-loader": {
           "version": "6.0.7",
-          "resolved": "http://localhost:4873/sass-loader/-/sass-loader-6.0.7.tgz",
+          "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-6.0.7.tgz",
           "integrity": "sha512-JoiyD00Yo1o61OJsoP2s2kb19L1/Y2p3QFcCdWdF6oomBGKVYuZyqHWemRBfQ2uGYsk+CH3eCguXNfpjzlcpaA==",
           "dev": true,
           "requires": {
@@ -728,132 +133,10 @@
             "pify": "^3.0.0"
           }
         },
-        "schema-utils": {
-          "version": "0.3.0",
-          "resolved": "http://localhost:4873/schema-utils/-/schema-utils-0.3.0.tgz",
-          "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
-          "dev": true,
-          "requires": {
-            "ajv": "^5.0.0"
-          },
-          "dependencies": {
-            "ajv": {
-              "version": "5.5.2",
-              "resolved": "http://localhost:4873/ajv/-/ajv-5.5.2.tgz",
-              "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-              "dev": true,
-              "requires": {
-                "co": "^4.6.0",
-                "fast-deep-equal": "^1.0.0",
-                "fast-json-stable-stringify": "^2.0.0",
-                "json-schema-traverse": "^0.3.0"
-              }
-            }
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "http://localhost:4873/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "style-loader": {
-          "version": "0.19.1",
-          "resolved": "http://localhost:4873/style-loader/-/style-loader-0.19.1.tgz",
-          "integrity": "sha512-IRE+ijgojrygQi3rsqT0U4dd+UcPCqcVvauZpCnQrGAlEe+FUIyrK93bUDScamesjP08JlQNsFJU+KmPedP5Og==",
-          "dev": true,
-          "requires": {
-            "loader-utils": "^1.0.2",
-            "schema-utils": "^0.3.0"
-          }
-        },
-        "supports-color": {
-          "version": "4.5.0",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^2.0.0"
-          }
-        },
-        "symbol-observable": {
-          "version": "1.0.1",
-          "resolved": "http://localhost:4873/symbol-observable/-/symbol-observable-1.0.1.tgz",
-          "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=",
-          "dev": true
-        },
-        "tunnel-agent": {
-          "version": "0.4.3",
-          "resolved": "http://localhost:4873/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-          "dev": true,
-          "optional": true
-        },
-        "typescript": {
-          "version": "2.6.2",
-          "resolved": "http://localhost:4873/typescript/-/typescript-2.6.2.tgz",
-          "integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=",
-          "dev": true
-        },
-        "uglify-es": {
-          "version": "3.3.9",
-          "resolved": "http://localhost:4873/uglify-es/-/uglify-es-3.3.9.tgz",
-          "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
-          "dev": true,
-          "requires": {
-            "commander": "~2.13.0",
-            "source-map": "~0.6.1"
-          },
-          "dependencies": {
-            "commander": {
-              "version": "2.13.0",
-              "resolved": "http://localhost:4873/commander/-/commander-2.13.0.tgz",
-              "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==",
-              "dev": true
-            }
-          }
-        },
-        "uglifyjs-webpack-plugin": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.5.tgz",
-          "integrity": "sha512-hIQJ1yxAPhEA2yW/i7Fr+SXZVMp+VEI3d42RTHBgQd2yhp/1UdBcR3QEWPV5ahBxlqQDMEMTuTEvDHSFINfwSw==",
-          "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"
-          },
-          "dependencies": {
-            "schema-utils": {
-              "version": "0.4.5",
-              "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz",
-              "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==",
-              "dev": true,
-              "requires": {
-                "ajv": "6.5.0",
-                "ajv-keywords": "3.2.0"
-              }
-            }
-          }
-        },
         "webpack-merge": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.2.tgz",
-          "integrity": "sha512-/0QYwW/H1N/CdXYA2PNPVbsxO3u2Fpz34vs72xm03SRfg6bMNGfMJIQEpQjKRvkG2JvT6oRJFpDtSrwbX8Jzvw==",
+          "version": "4.1.4",
+          "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.4.tgz",
+          "integrity": "sha512-TmSe1HZKeOPey3oy1Ov2iS3guIZjWvMT2BBJDzzT5jScHTjVC3mpjJofgueEzaEd6ibhxRDD6MIblDr8tzh8iQ==",
           "dev": true,
           "requires": {
             "lodash": "^4.17.5"
@@ -861,215 +144,443 @@
         }
       }
     },
-    "@angular/common": {
-      "version": "5.1.1",
-      "resolved": "http://localhost:4873/@angular%2fcommon/-/common-5.1.1.tgz",
-      "integrity": "sha512-SFRzdDthoiKaMLuV+TAwjKXFWwTRFGuidlWC3BhUf8/HzNSePAdvfdQcqbEaE5buMn403OV105S9Tyx5tILQeA==",
+    "@angular-devkit/build-ng-packagr": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-ng-packagr/-/build-ng-packagr-0.7.2.tgz",
+      "integrity": "sha512-RAiS04QMacUzWnM1mKip/UuyjNRf4op2sY2e+qyagAAdmVez3EmZWftJCZcjLf394nu5i/XuzELmrtUtzm94Bw==",
+      "requires": {
+        "@angular-devkit/architect": "0.7.2",
+        "@angular-devkit/core": "0.7.2",
+        "rxjs": "^6.0.0"
+      }
+    },
+    "@angular-devkit/build-optimizer": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.7.2.tgz",
+      "integrity": "sha512-qnD5W5arKefrWU+xYR1H6kSx/jvfbmDsEhAGzmgbGffKuXnMnQZtL3hVNqL2faLkCONdLCYa/f9JCPihqQfc6w==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.1.0",
+        "source-map": "^0.5.6",
+        "typescript": "~2.9.1",
+        "webpack-sources": "^1.1.0"
+      },
+      "dependencies": {
+        "typescript": {
+          "version": "2.9.2",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
+          "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
+          "dev": true
+        }
+      }
+    },
+    "@angular-devkit/build-webpack": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.7.2.tgz",
+      "integrity": "sha512-gDKNgokpGTaMGPfpUWMGdgWje73Uoe41V+XO1XdxTEDlctGNtYYNZxbHSxFJaizOMfDbadq0lpuzt0qPZIibzg==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/architect": "0.7.2",
+        "@angular-devkit/core": "0.7.2",
+        "rxjs": "^6.0.0"
+      }
+    },
+    "@angular-devkit/core": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.7.2.tgz",
+      "integrity": "sha512-1Es9oNpabOukutBe+0txXUHyhI6ypuc7WrxTutZH7Lr3n3+CTG6oEv42rOcot1aXi1n97wNqcdY3lrENFu9vhQ==",
+      "requires": {
+        "ajv": "~6.4.0",
+        "chokidar": "^2.0.3",
+        "rxjs": "^6.0.0",
+        "source-map": "^0.5.6"
+      }
+    },
+    "@angular-devkit/schematics": {
+      "version": "0.6.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.6.8.tgz",
+      "integrity": "sha512-R4YqAUdo62wtrhX/5HSRGSKXNTWqfQb66ZE6m8jj6GEJNFKdNXMdxOchxr07LCiKTxfh1w6G3nGzxIsu/+D4KA==",
+      "requires": {
+        "@angular-devkit/core": "0.6.8",
+        "rxjs": "^6.0.0"
+      },
+      "dependencies": {
+        "@angular-devkit/core": {
+          "version": "0.6.8",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.6.8.tgz",
+          "integrity": "sha512-rkIa1OSVWTt4g9leLSK/PsqOj3HZbDKHbZjqlslyfVa3AyCeiumFoOgViOVXlYgPX3HHDbE5uH24nyUWSD8uww==",
+          "requires": {
+            "ajv": "~6.4.0",
+            "chokidar": "^2.0.3",
+            "rxjs": "^6.0.0",
+            "source-map": "^0.5.6"
+          }
+        }
+      }
+    },
+    "@angular/animations": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-6.1.2.tgz",
+      "integrity": "sha512-E6eFwoRSKKEGPDsIF5AnecDid3ZoOczG5WUTpOYIGUfKtB1kqiisZCP/090RWN48xU3nDssxwPiN9dJ7a4Hf4w==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "@angular/cdk": {
+      "version": "6.4.5",
+      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-6.4.5.tgz",
+      "integrity": "sha512-bbz8lHzY1NXPqrvHcZTOOD6+BiDNPKXC00xwzls62NPmiueBaWGwQdk7s3sa/0kCyq1ZKrPD3KQIDMyytxlzzw==",
       "requires": {
         "tslib": "^1.7.1"
       }
     },
+    "@angular/cli": {
+      "version": "6.1.3",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-6.1.3.tgz",
+      "integrity": "sha512-S0uVQKKWETeX/mZ0WEZ2f+4xHArEtJ1hRl4GWKZEzU+vpptVnUXDDLC5aiN1ArfEcI1TShDsdhRSYSfccif2xA==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/architect": "0.7.3",
+        "@angular-devkit/core": "0.7.3",
+        "@angular-devkit/schematics": "0.7.3",
+        "@schematics/angular": "0.7.3",
+        "@schematics/update": "0.7.3",
+        "opn": "^5.3.0",
+        "rxjs": "^6.0.0",
+        "semver": "^5.1.0",
+        "symbol-observable": "^1.2.0",
+        "yargs-parser": "^10.0.0"
+      },
+      "dependencies": {
+        "@angular-devkit/architect": {
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.7.3.tgz",
+          "integrity": "sha512-PaHGTohIeXzabpTEbXqjthwJ+PPMHqCi4OyqovHHsDgF82thkS4cYXXmW1zvcgC6yfJVpoo3vGZ3R7HcZ/+/Yw==",
+          "dev": true,
+          "requires": {
+            "@angular-devkit/core": "0.7.3",
+            "rxjs": "^6.0.0"
+          }
+        },
+        "@angular-devkit/core": {
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.7.3.tgz",
+          "integrity": "sha512-2fKNmv4sJ6EEONp6QJ2VcHlR0O2TAXWm6jQsWxJjfVvROhAY7eJkzhqi0pUoWhUiamxCk5ssl8p9KkhtOiTa4Q==",
+          "dev": true,
+          "requires": {
+            "ajv": "~6.4.0",
+            "chokidar": "^2.0.3",
+            "rxjs": "^6.0.0",
+            "source-map": "^0.5.6"
+          }
+        },
+        "@angular-devkit/schematics": {
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.7.3.tgz",
+          "integrity": "sha512-OqZ9qzxDxEqAxV8n4uoq8IeSU+a2GN82z2N3a7z5nNxV6zfJo6K/33SLDuagGFSZfOUuP+35qaR+rHzSzByRig==",
+          "dev": true,
+          "requires": {
+            "@angular-devkit/core": "0.7.3",
+            "rxjs": "^6.0.0"
+          }
+        },
+        "@schematics/angular": {
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.7.3.tgz",
+          "integrity": "sha512-L5n9QGWho/SdNAZjw1im3bfNWdkLAJTW0sye9i3rCHM4oyZ59N+LASCN5LvjrhSjKP8LVqmJm/yArUExzpOaiQ==",
+          "dev": true,
+          "requires": {
+            "@angular-devkit/core": "0.7.3",
+            "@angular-devkit/schematics": "0.7.3",
+            "typescript": ">=2.6.2 <2.10"
+          }
+        }
+      }
+    },
+    "@angular/common": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-6.1.2.tgz",
+      "integrity": "sha512-4nzMOIUmFCsAxToobIGXTgwhlX9ueqOzvhlYQYD+tHWV4udjBccaUROis7BQLU7r60WD4TLGt489xJUYZgFk2g==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
     "@angular/compiler": {
-      "version": "5.1.1",
-      "resolved": "http://localhost:4873/@angular%2fcompiler/-/compiler-5.1.1.tgz",
-      "integrity": "sha512-k4J2kRiBjtjkDcDut2JVUpqQGLJWd8j3Don+swzZHuEklbLmsVRGM6u/fmH0K9TMwKHtC5Ycap8kj4bWXUYfwg==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-6.1.2.tgz",
+      "integrity": "sha512-IMaqx1gIYMqrori41bITgm22patbde/SRINiSggeUqegVhX4b2wIZ6ALIyT6utD2CC9n7oHQgp/VpMVMOIg0yA==",
       "requires": {
-        "tslib": "^1.7.1"
+        "tslib": "^1.9.0"
       }
     },
     "@angular/compiler-cli": {
-      "version": "5.2.11",
-      "resolved": "http://localhost:4873/@angular%2fcompiler-cli/-/compiler-cli-5.2.11.tgz",
-      "integrity": "sha512-dwrQ0yxoCM/XzKzlm7pTsyg4/6ECjT9emZufGj8t12bLMO8NDn1IJOsqXJA1+onEgQKhlr0Ziwi+96TvDTb1Cg==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-6.1.2.tgz",
+      "integrity": "sha512-r3zSbXMc0Uv5kPau+AF7uxps3S8A02Bp2Rw18NnMY+2kXPPKXn/qfAplYidrRrlcW0Kwklt34TSMxd4cxerRuQ==",
       "dev": true,
       "requires": {
         "chokidar": "^1.4.2",
         "minimist": "^1.2.0",
         "reflect-metadata": "^0.1.2",
-        "tsickle": "^0.27.2"
+        "tsickle": "^0.32.1"
       },
       "dependencies": {
+        "anymatch": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
+          "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
+          "dev": true,
+          "requires": {
+            "micromatch": "^2.1.5",
+            "normalize-path": "^2.0.0"
+          }
+        },
+        "arr-diff": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
+          "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.0.1"
+          }
+        },
+        "array-unique": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
+          "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
+          "dev": true
+        },
+        "braces": {
+          "version": "1.8.5",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
+          "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
+          "dev": true,
+          "requires": {
+            "expand-range": "^1.8.1",
+            "preserve": "^0.2.0",
+            "repeat-element": "^1.1.2"
+          }
+        },
+        "chokidar": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
+          "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
+          "dev": true,
+          "requires": {
+            "anymatch": "^1.3.0",
+            "async-each": "^1.0.0",
+            "fsevents": "^1.0.0",
+            "glob-parent": "^2.0.0",
+            "inherits": "^2.0.1",
+            "is-binary-path": "^1.0.0",
+            "is-glob": "^2.0.0",
+            "path-is-absolute": "^1.0.0",
+            "readdirp": "^2.0.0"
+          }
+        },
+        "expand-brackets": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
+          "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
+          "dev": true,
+          "requires": {
+            "is-posix-bracket": "^0.1.0"
+          }
+        },
+        "extglob": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
+          "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^1.0.0"
+          }
+        },
+        "glob-parent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
+          "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+          "dev": true,
+          "requires": {
+            "is-glob": "^2.0.0"
+          }
+        },
+        "is-extglob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^1.0.0"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        },
+        "micromatch": {
+          "version": "2.3.11",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
+          "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
+          "dev": true,
+          "requires": {
+            "arr-diff": "^2.0.0",
+            "array-unique": "^0.2.1",
+            "braces": "^1.8.2",
+            "expand-brackets": "^0.1.4",
+            "extglob": "^0.3.1",
+            "filename-regex": "^2.0.0",
+            "is-extglob": "^1.0.0",
+            "is-glob": "^2.0.1",
+            "kind-of": "^3.0.2",
+            "normalize-path": "^2.0.1",
+            "object.omit": "^2.0.0",
+            "parse-glob": "^3.0.4",
+            "regex-cache": "^0.4.2"
+          }
+        },
         "minimist": {
           "version": "1.2.0",
-          "resolved": "http://localhost:4873/minimist/-/minimist-1.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
           "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
           "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "http://localhost:4873/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "source-map-support": {
-          "version": "0.5.6",
-          "resolved": "http://localhost:4873/source-map-support/-/source-map-support-0.5.6.tgz",
-          "integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==",
-          "dev": true,
-          "requires": {
-            "buffer-from": "^1.0.0",
-            "source-map": "^0.6.0"
-          }
-        },
-        "tsickle": {
-          "version": "0.27.5",
-          "resolved": "http://localhost:4873/tsickle/-/tsickle-0.27.5.tgz",
-          "integrity": "sha512-NP+CjM1EXza/M8mOXBLH3vkFEJiu1zfEAlC5WdJxHPn8l96QPz5eooP6uAgYtw1CcKfuSyIiheNUdKxtDWCNeg==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0",
-            "mkdirp": "^0.5.1",
-            "source-map": "^0.6.0",
-            "source-map-support": "^0.5.0"
-          }
         }
       }
     },
     "@angular/core": {
-      "version": "5.1.1",
-      "resolved": "http://localhost:4873/@angular%2fcore/-/core-5.1.1.tgz",
-      "integrity": "sha512-8HJ0lNM5Z+pf+JfOl5mAWgNfrdtnMhVcEGCEniJAQweKOfYCziuyB0ALkX/Q6jGmd2IshR36SarwCYEc5ttt/w==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-6.1.2.tgz",
+      "integrity": "sha512-ayHmUCBAbn0Rkd4SkUOi/qsN/EK/UorB1VPZeimYJSJUGWOQVyN7vneXn/zN1SQ+oj0KYz5u/mDsNqYh1kkCbw==",
       "requires": {
-        "tslib": "^1.7.1"
+        "tslib": "^1.9.0"
       }
     },
     "@angular/flex-layout": {
-      "version": "2.0.0-beta.12",
-      "resolved": "http://localhost:4873/@angular%2fflex-layout/-/flex-layout-2.0.0-beta.12.tgz",
-      "integrity": "sha512-QTOKZxehYTh8fj64V/pNVWNbfNtebSbssyMIXiGJuHTzfyF7GYdRmtjoR2pNpllycz3rE5NYX77EB140Y6BCnw==",
+      "version": "6.0.0-beta.16",
+      "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-6.0.0-beta.16.tgz",
+      "integrity": "sha512-0AYtIBGrEJshdFMc6TXGloCkD19YTCRKVJl6xZHX4H5dLnUn+daqXcbh4UsWhayevnLp85HEf2ViHLmTa6jv3g==",
       "requires": {
         "tslib": "^1.7.1"
       }
     },
     "@angular/forms": {
-      "version": "5.1.1",
-      "resolved": "http://localhost:4873/@angular%2fforms/-/forms-5.1.1.tgz",
-      "integrity": "sha512-4iN/8N0DgnV82XIb/8PqlFIGrog8BHJlzQ9sdAlpT29biPFezFpqpsXkjLBouBc7oBFTgoyXMgWDj8IGRmwLGQ==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-6.1.2.tgz",
+      "integrity": "sha512-WiYZsiNdKUHAFJXbGmCbG6peUwQ6O68qTrUDBAaq4Ras4FMsFUOVOgwx+HSNLbyKJJYG45EGUtk9uwbNrnJi9w==",
       "requires": {
-        "tslib": "^1.7.1"
+        "tslib": "^1.9.0"
       }
     },
     "@angular/http": {
-      "version": "5.1.1",
-      "resolved": "http://localhost:4873/@angular%2fhttp/-/http-5.1.1.tgz",
-      "integrity": "sha512-oeiLX00TaFlGS5Y4EAGnxxVitN8T9X8olhSC+XDDAAL3JHTAyh4dj7me8vNZk1VaqPFa9AXu4D34vu1Zsm0c1g==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/http/-/http-6.1.2.tgz",
+      "integrity": "sha512-xgot+cgDcYTIglRrzKBCMNn7K6zL7Isrn52h1dQ1+JkxwmznQ3ZATzZZwKALUD9JnG8xloZ6PO7EarBOUl/hDw==",
       "requires": {
-        "tslib": "^1.7.1"
+        "tslib": "^1.9.0"
       }
     },
     "@angular/material": {
-      "version": "5.0.1",
-      "resolved": "http://localhost:4873/@angular%2fmaterial/-/material-5.0.1.tgz",
-      "integrity": "sha512-k95i58ZIVneLE61a5JliM10NSasy9P5C2JJUESo3s/rxt9dq/9XOWpUvNCy49OHYBRFJBlsyrLM6E2V7/tmq4w==",
+      "version": "6.4.5",
+      "resolved": "https://registry.npmjs.org/@angular/material/-/material-6.4.5.tgz",
+      "integrity": "sha512-3wDRfGqlRSo3CBA1XuPXSz7zAwZF5kotXEgbZhIAocv+nsXa73DyPNceAQ++Pu7rFR3ipg6McyggP0OCOgv7NQ==",
       "requires": {
+        "parse5": "^5.0.0",
         "tslib": "^1.7.1"
       }
     },
     "@angular/material-moment-adapter": {
-      "version": "5.0.1",
-      "resolved": "http://localhost:4873/@angular%2fmaterial-moment-adapter/-/material-moment-adapter-5.0.1.tgz",
-      "integrity": "sha512-SyFsoxnwXHAR4zLkFh7Z4NmxZANyBoLGAomVZRi2r9w1prc+kbaCaJ7LYjI6zM7Su4ltSQx0libbat1ppgow2w==",
+      "version": "6.4.5",
+      "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-6.4.5.tgz",
+      "integrity": "sha512-xgPMnntOfwTX4Uuz7g/GQ4IcRn6tiSJCGSikwTK5yRJjUEGguHmBch57q2Xjr/A+WfmGYZnVfzy3V9t/XsNKqA==",
       "requires": {
         "tslib": "^1.7.1"
       }
     },
     "@angular/platform-browser": {
-      "version": "5.1.1",
-      "resolved": "http://localhost:4873/@angular%2fplatform-browser/-/platform-browser-5.1.1.tgz",
-      "integrity": "sha512-QpkNXoO2pqURQJxXPhZo6RFeirKbr56O0SwoMpYfXGGN1qEIicoWZHobCUTp7/jvjx5Xjc7886Fvu/qJrE7wVA==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-6.1.2.tgz",
+      "integrity": "sha512-Rm8nkj2RTFqufbI4z1J4qxWgm7h+8uEAmg7Iied0kzjpY3RZ6rYBc92bW/gFHV42zTkyRT2nngZVG4MB3EcBBw==",
       "requires": {
-        "tslib": "^1.7.1"
+        "tslib": "^1.9.0"
       }
     },
     "@angular/platform-browser-dynamic": {
-      "version": "5.1.1",
-      "resolved": "http://localhost:4873/@angular%2fplatform-browser-dynamic/-/platform-browser-dynamic-5.1.1.tgz",
-      "integrity": "sha512-xnin1eK5nF7EO4tYZvRlhT28DyhL3p4NKWsZQwfqyBwSF0T2mJ1vjhjCZVT0MmaOyt5D+0eUkHIhBDqeZyBMMQ==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.1.2.tgz",
+      "integrity": "sha512-l7/4/cFAnrZrhNrEQuF+HVZvLEmVTZcNUpq2GQFlZ9WDgFiZVaz2eOxdlrnKOTi4B7fKj9BXmU8si1K91u7LrA==",
       "requires": {
-        "tslib": "^1.7.1"
+        "tslib": "^1.9.0"
       }
     },
     "@angular/router": {
-      "version": "5.1.1",
-      "resolved": "http://localhost:4873/@angular%2frouter/-/router-5.1.1.tgz",
-      "integrity": "sha512-96mBZS1b1Dt7HFOGKh5zI/1U6F3zT4cdjIaBmcCKkbyKhs3WRAPXxxCkuCwr6lWmBeQt4iEvSdXiHQbD0iCG7Q==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-6.1.2.tgz",
+      "integrity": "sha512-LDOv4n/dZXFfUZDGUiBURWZQlXxjPIlsARe3bZw6p24JjRvCmaofhbliNu6oxBQCzKNYcuz009uiMkwpwTlH+g==",
       "requires": {
-        "tslib": "^1.7.1"
+        "tslib": "^1.9.0"
       }
     },
     "@mat-datetimepicker/core": {
-      "version": "1.0.4",
-      "resolved": "http://localhost:4873/@mat-datetimepicker%2fcore/-/core-1.0.4.tgz",
-      "integrity": "sha1-IZdDei5AfUkkNNtV2221gXLPvxI="
+      "version": "2.0.1-beta.1",
+      "resolved": "https://registry.npmjs.org/@mat-datetimepicker/core/-/core-2.0.1-beta.1.tgz",
+      "integrity": "sha1-XS8BnbPvZOn83mwZjJpAHv3MaII=",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
     },
     "@mat-datetimepicker/moment": {
-      "version": "1.0.4",
-      "resolved": "http://localhost:4873/@mat-datetimepicker%2fmoment/-/moment-1.0.4.tgz",
-      "integrity": "sha1-aXU6+LXgsJ6WbSjZhPFcKkQFQGA="
+      "version": "2.0.1-beta.1",
+      "resolved": "https://registry.npmjs.org/@mat-datetimepicker/moment/-/moment-2.0.1-beta.1.tgz",
+      "integrity": "sha1-gDoTUvKT6nXrFYxpQJr48H4tlo8=",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
     },
     "@ngrx/schematics": {
       "version": "5.2.0",
-      "resolved": "http://localhost:4873/@ngrx%2fschematics/-/schematics-5.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/@ngrx/schematics/-/schematics-5.2.0.tgz",
       "integrity": "sha1-q3GA158OxovUrD707IO5NI0Y0mw="
     },
     "@ngtools/json-schema": {
-      "version": "1.2.0",
-      "resolved": "http://localhost:4873/@ngtools%2fjson-schema/-/json-schema-1.2.0.tgz",
-      "integrity": "sha512-pMh+HDc6mOjUO3agRfB1tInimo7hf67u+0Cska2bfXFe6oU7rSMnr5PLVtiZVgwMoBHpx/6XjBymvcnWPo2Uzg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@ngtools/json-schema/-/json-schema-1.1.0.tgz",
+      "integrity": "sha1-w6DFRNYjkqzCgTpCyKDcb1j4aSI=",
       "dev": true
     },
     "@ngtools/webpack": {
-      "version": "1.10.2",
-      "resolved": "http://localhost:4873/@ngtools%2fwebpack/-/webpack-1.10.2.tgz",
-      "integrity": "sha512-3u2zg2rarG3qNLSukBClGADWuq/iNn5SQtlSeAbfKzwBeyLGbF0gN1z1tVx1Bcr8YwFzR6NdRePQmJGcoqq1fg==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-6.1.2.tgz",
+      "integrity": "sha512-MkQmt9VL1QvtrC1WNzfEXkk2JdCWrQO2m1lB/A86jj5TsKc4NLObY2a9tNttq3mEsLxkEcOWPLDMiCHJlM+f9Q==",
       "dev": true,
       "requires": {
-        "chalk": "~2.2.0",
-        "enhanced-resolve": "^3.1.0",
-        "loader-utils": "^1.0.2",
-        "magic-string": "^0.22.3",
-        "semver": "^5.3.0",
-        "source-map": "^0.5.6",
+        "@angular-devkit/core": "0.7.2",
+        "rxjs": "^6.0.0",
         "tree-kill": "^1.0.0",
         "webpack-sources": "^1.1.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.2.2",
-          "resolved": "http://localhost:4873/chalk/-/chalk-2.2.2.tgz",
-          "integrity": "sha512-LvixLAQ4MYhbf7hgL4o5PeK32gJKvVzDRiSNIApDofQvyhl8adgG2lJVXn4+ekQoK7HL9RF8lqxwerpe0x2pCw==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.1.0",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^4.0.0"
-          }
-        },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "4.5.0",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^2.0.0"
-          }
-        }
       }
     },
     "@ngx-translate/core": {
-      "version": "9.1.1",
-      "resolved": "http://localhost:4873/@ngx-translate%2fcore/-/core-9.1.1.tgz",
-      "integrity": "sha1-rhA5KINrip4Gn9Li52+iGYzH5ig="
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-10.0.2.tgz",
+      "integrity": "sha512-7nM3DrJaqKswwtJlbu2kuKNl+hE8Isr18sKsKvGGpSxQk+G0gO0reDlx2PhUNus7TJTkA1C59vU/JoN8hIvZ4g==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
     },
     "@nrwl/schematics": {
       "version": "1.0.3",
-      "resolved": "http://localhost:4873/@nrwl%2fschematics/-/schematics-1.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/@nrwl/schematics/-/schematics-1.0.3.tgz",
       "integrity": "sha512-g5du8FtxnyA3qW88Px8zsFNPteXYgd+aoijydO43qMCB+vT115OGyUvARu95zlrnC3fvCr1Mymy1Xf0ro5hgMg==",
       "requires": {
         "@ngrx/schematics": "5.2.0",
@@ -1084,60 +595,104 @@
         "viz.js": "^1.8.1",
         "yargs": "^11.0.0",
         "yargs-parser": "10.0.0"
-      }
-    },
-    "@schematics/angular": {
-      "version": "0.4.6",
-      "resolved": "http://localhost:4873/@schematics%2fangular/-/angular-0.4.6.tgz",
-      "integrity": "sha512-dszECpURkT05a7D0QFEvIZKGhIK3I9Y3//KnZ//Ajt5Qc7/Ulk8OzyzumYcpS78ZF95hXOMZTHfs1kGt5zZ3Ew==",
-      "requires": {
-        "typescript": "~2.6.2"
       },
       "dependencies": {
+        "@schematics/angular": {
+          "version": "0.4.6",
+          "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.4.6.tgz",
+          "integrity": "sha512-dszECpURkT05a7D0QFEvIZKGhIK3I9Y3//KnZ//Ajt5Qc7/Ulk8OzyzumYcpS78ZF95hXOMZTHfs1kGt5zZ3Ew==",
+          "requires": {
+            "typescript": "~2.6.2"
+          }
+        },
         "typescript": {
           "version": "2.6.2",
-          "resolved": "http://localhost:4873/typescript/-/typescript-2.6.2.tgz",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz",
           "integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q="
         }
       }
     },
-    "@schematics/package-update": {
-      "version": "0.3.2",
-      "resolved": "http://localhost:4873/@schematics%2fpackage-update/-/package-update-0.3.2.tgz",
-      "integrity": "sha512-7aVP4994Hu8vRdTTohXkfGWEwLhrdNP3EZnWyBootm5zshWqlQojUGweZe5zwewsKcixeVOiy2YtW+aI4aGSLA==",
+    "@schematics/angular": {
+      "version": "0.6.8",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.6.8.tgz",
+      "integrity": "sha512-9kRphqTYG5Df/I8fvnT1zMsw0YNDPO9tl18tQZXj4am4raT7l9UCr+WkwJdlBoA5pwG6baWE9sL0iGWV/bzF/g==",
+      "requires": {
+        "@angular-devkit/core": "0.6.8",
+        "@angular-devkit/schematics": "0.6.8",
+        "typescript": ">=2.6.2 <2.8"
+      },
+      "dependencies": {
+        "@angular-devkit/core": {
+          "version": "0.6.8",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.6.8.tgz",
+          "integrity": "sha512-rkIa1OSVWTt4g9leLSK/PsqOj3HZbDKHbZjqlslyfVa3AyCeiumFoOgViOVXlYgPX3HHDbE5uH24nyUWSD8uww==",
+          "requires": {
+            "ajv": "~6.4.0",
+            "chokidar": "^2.0.3",
+            "rxjs": "^6.0.0",
+            "source-map": "^0.5.6"
+          }
+        },
+        "typescript": {
+          "version": "2.7.2",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz",
+          "integrity": "sha512-p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw=="
+        }
+      }
+    },
+    "@schematics/update": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.7.3.tgz",
+      "integrity": "sha512-3nERgcu/fy2WG4U8wkYT7GbXzQsKSJUahXFRC6t0DIt5xNYhFzFyA91+QbSLLlRTJsHi3AqZ2GTufHuHKsCG6w==",
       "dev": true,
       "requires": {
-        "rxjs": "^5.5.6",
+        "@angular-devkit/core": "0.7.3",
+        "@angular-devkit/schematics": "0.7.3",
+        "npm-registry-client": "^8.5.1",
+        "rxjs": "^6.0.0",
         "semver": "^5.3.0",
         "semver-intersect": "^1.1.2"
       },
       "dependencies": {
-        "rxjs": {
-          "version": "5.5.11",
-          "resolved": "http://localhost:4873/rxjs/-/rxjs-5.5.11.tgz",
-          "integrity": "sha512-3bjO7UwWfA2CV7lmwYMBzj4fQ6Cq+ftHc2MvUe+WMS7wcdJ1LosDWmdjPQanYp2dBRj572p7PeU81JUxHKOcBA==",
+        "@angular-devkit/core": {
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.7.3.tgz",
+          "integrity": "sha512-2fKNmv4sJ6EEONp6QJ2VcHlR0O2TAXWm6jQsWxJjfVvROhAY7eJkzhqi0pUoWhUiamxCk5ssl8p9KkhtOiTa4Q==",
           "dev": true,
           "requires": {
-            "symbol-observable": "1.0.1"
+            "ajv": "~6.4.0",
+            "chokidar": "^2.0.3",
+            "rxjs": "^6.0.0",
+            "source-map": "^0.5.6"
           }
         },
-        "symbol-observable": {
-          "version": "1.0.1",
-          "resolved": "http://localhost:4873/symbol-observable/-/symbol-observable-1.0.1.tgz",
-          "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=",
-          "dev": true
+        "@angular-devkit/schematics": {
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.7.3.tgz",
+          "integrity": "sha512-OqZ9qzxDxEqAxV8n4uoq8IeSU+a2GN82z2N3a7z5nNxV6zfJo6K/33SLDuagGFSZfOUuP+35qaR+rHzSzByRig==",
+          "dev": true,
+          "requires": {
+            "@angular-devkit/core": "0.7.3",
+            "rxjs": "^6.0.0"
+          }
         }
       }
     },
+    "@types/estree": {
+      "version": "0.0.39",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
+      "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
+      "dev": true
+    },
     "@types/events": {
       "version": "1.2.0",
-      "resolved": "http://localhost:4873/@types%2fevents/-/events-1.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/@types/events/-/events-1.2.0.tgz",
       "integrity": "sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA==",
       "dev": true
     },
     "@types/fs-extra": {
       "version": "5.0.1",
-      "resolved": "http://localhost:4873/@types%2ffs-extra/-/fs-extra-5.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-5.0.1.tgz",
       "integrity": "sha512-h3wnflb+jMTipvbbZnClgA2BexrT4w0GcfoCz5qyxd0IRsbqhLSyesM6mqZTAnhbVmhyTm5tuxfRu9R+8l+lGw==",
       "dev": true,
       "requires": {
@@ -1146,7 +701,7 @@
     },
     "@types/glob": {
       "version": "5.0.35",
-      "resolved": "http://localhost:4873/@types%2fglob/-/glob-5.0.35.tgz",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-5.0.35.tgz",
       "integrity": "sha512-wc+VveszMLyMWFvXLkloixT4n0harUIVZjnpzztaZ0nKLuul7Z32iMt2fUFGAaZ4y1XWjFRMtCI5ewvyh4aIeg==",
       "dev": true,
       "requires": {
@@ -1157,31 +712,31 @@
     },
     "@types/hammerjs": {
       "version": "2.0.35",
-      "resolved": "http://localhost:4873/@types%2fhammerjs/-/hammerjs-2.0.35.tgz",
+      "resolved": "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.35.tgz",
       "integrity": "sha512-4mUIMSZ2U4UOWq1b+iV7XUTE4w+Kr3x+Zb/Qz5ROO6BTZLw2c8/ftjq0aRgluguLs4KRuBnrOy/s389HVn1/zA==",
       "dev": true
     },
     "@types/handlebars": {
       "version": "4.0.36",
-      "resolved": "http://localhost:4873/@types%2fhandlebars/-/handlebars-4.0.36.tgz",
+      "resolved": "https://registry.npmjs.org/@types/handlebars/-/handlebars-4.0.36.tgz",
       "integrity": "sha512-LjNiTX7TY7wtuC6y3QwC93hKMuqYhgV9A1uXBKNvZtVC8ZvyWAjZkJ5BvT0K7RKqORRYRLMrqCxpw5RgS+MdrQ==",
       "dev": true
     },
     "@types/highlight.js": {
       "version": "9.12.2",
-      "resolved": "http://localhost:4873/@types%2fhighlight.js/-/highlight.js-9.12.2.tgz",
+      "resolved": "https://registry.npmjs.org/@types/highlight.js/-/highlight.js-9.12.2.tgz",
       "integrity": "sha512-y5x0XD/WXDaGSyiTaTcKS4FurULJtSiYbGTeQd0m2LYZGBcZZ/7fM6t5H/DzeUF+kv8y6UfmF6yJABQsHcp9VQ==",
       "dev": true
     },
     "@types/jasmine": {
-      "version": "2.8.7",
-      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.8.7.tgz",
-      "integrity": "sha512-RdbrPcW1aD78UmdLiDa9ZCKrbR5Go8PXh6GCpb4oIOkWVEusubSJJDrP4c5RYOu8m/CBz+ygZpicj6Pgms5a4Q==",
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.8.8.tgz",
+      "integrity": "sha512-OJSUxLaxXsjjhob2DBzqzgrkLmukM3+JMpRp0r0E4HTdT1nwDCWhaswjYxazPij6uOdzHCJfNbDjmQ1/rnNbCg==",
       "dev": true
     },
     "@types/jasminewd2": {
       "version": "2.0.3",
-      "resolved": "http://localhost:4873/@types%2fjasminewd2/-/jasminewd2-2.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.3.tgz",
       "integrity": "sha512-hYDVmQZT5VA2kigd4H4bv7vl/OhlympwREUemqBdOqtrYTo5Ytm12a5W5/nGgGYdanGVxj0x/VhZ7J3hOg/YKg==",
       "dev": true,
       "requires": {
@@ -1190,43 +745,43 @@
     },
     "@types/lodash": {
       "version": "4.14.104",
-      "resolved": "http://localhost:4873/@types%2flodash/-/lodash-4.14.104.tgz",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.104.tgz",
       "integrity": "sha512-ufQcVg4daO8xQ5kopxRHanqFdL4AI7ondQkV+2f+7mz3gvp0LkBx2zBRC6hfs3T87mzQFmf5Fck7Fi145Ul6NQ==",
       "dev": true
     },
     "@types/marked": {
       "version": "0.3.0",
-      "resolved": "http://localhost:4873/@types%2fmarked/-/marked-0.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/@types/marked/-/marked-0.3.0.tgz",
       "integrity": "sha512-CSf9YWJdX1DkTNu9zcNtdCcn6hkRtB5ILjbhRId4ZOQqx30fXmdecuaXhugQL6eyrhuXtaHJ7PHI+Vm7k9ZJjg==",
       "dev": true
     },
     "@types/minimatch": {
       "version": "3.0.3",
-      "resolved": "http://localhost:4873/@types%2fminimatch/-/minimatch-3.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
       "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
       "dev": true
     },
     "@types/node": {
       "version": "6.0.90",
-      "resolved": "http://localhost:4873/@types%2fnode/-/node-6.0.90.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.90.tgz",
       "integrity": "sha512-tXoGRVdi7wZX7P1VWoV9Wfk0uYDOAHdEYXAttuWgSrN76Q32wQlSrMX0Rgyv3RTEaQY2ZLQrzYHVM2e8rfo8sA==",
       "dev": true
     },
     "@types/q": {
       "version": "0.0.32",
-      "resolved": "http://localhost:4873/@types%2fq/-/q-0.0.32.tgz",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz",
       "integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=",
       "dev": true
     },
     "@types/selenium-webdriver": {
-      "version": "2.53.43",
-      "resolved": "http://localhost:4873/@types%2fselenium-webdriver/-/selenium-webdriver-2.53.43.tgz",
-      "integrity": "sha512-UBYHWph6P3tutkbXpW6XYg9ZPbTKjw/YC2hGG1/GEvWwTbvezBUv3h+mmUFw79T3RFPnmedpiXdOBbXX+4l0jg==",
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.10.tgz",
+      "integrity": "sha512-ikB0JHv6vCR1KYUQAzTO4gi/lXLElT4Tx+6De2pc/OZwizE9LRNiTa+U8TBFKBD/nntPnr/MPSHSnOTybjhqNA==",
       "dev": true
     },
     "@types/shelljs": {
       "version": "0.7.8",
-      "resolved": "http://localhost:4873/@types%2fshelljs/-/shelljs-0.7.8.tgz",
+      "resolved": "https://registry.npmjs.org/@types/shelljs/-/shelljs-0.7.8.tgz",
       "integrity": "sha512-M2giRw93PxKS7YjU6GZjtdV9HASdB7TWqizBXe4Ju7AqbKlWvTr0gNO92XH56D/gMxqD/jNHLNfC5hA34yGqrQ==",
       "dev": true,
       "requires": {
@@ -1236,30 +791,257 @@
     },
     "@types/strip-bom": {
       "version": "3.0.0",
-      "resolved": "http://localhost:4873/@types%2fstrip-bom/-/strip-bom-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/@types/strip-bom/-/strip-bom-3.0.0.tgz",
       "integrity": "sha1-FKjsOVbC6B7bdSB5CuzyHCkK69I=",
       "dev": true
     },
     "@types/strip-json-comments": {
       "version": "0.0.30",
-      "resolved": "http://localhost:4873/@types%2fstrip-json-comments/-/strip-json-comments-0.0.30.tgz",
+      "resolved": "https://registry.npmjs.org/@types/strip-json-comments/-/strip-json-comments-0.0.30.tgz",
       "integrity": "sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==",
       "dev": true
     },
     "@types/yargs": {
-      "version": "11.0.0",
-      "resolved": "http://localhost:4873/@types%2fyargs/-/yargs-11.0.0.tgz",
-      "integrity": "sha512-vFql3tOxs6clgh+WVoLW3nOkNGCdeKsMU6mQZkOerJpV/CR9Xc1c1lZ+kYU+hNSobrQIOcNovWfPFDJIhcG5Pw=="
+      "version": "11.1.1",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-11.1.1.tgz",
+      "integrity": "sha512-Awgju4dqD8kHXX3jc/B/LaryJC7MsyNfnbN62lIbFzTi0GewH64zrkh4bxo/YTgVEK6r9V3GNecxMhXTJw0+jA=="
+    },
+    "@webassemblyjs/ast": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.4.3.tgz",
+      "integrity": "sha512-S6npYhPcTHDYe9nlsKa9CyWByFi8Vj8HovcAgtmMAQZUOczOZbQ8CnwMYKYC5HEZzxEE+oY0jfQk4cVlI3J59Q==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/helper-wasm-bytecode": "1.4.3",
+        "@webassemblyjs/wast-parser": "1.4.3",
+        "debug": "^3.1.0",
+        "webassemblyjs": "1.4.3"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.4.3.tgz",
+      "integrity": "sha512-3zTkSFswwZOPNHnzkP9ONq4bjJSeKVMcuahGXubrlLmZP8fmTIJ58dW7h/zOVWiFSuG2em3/HH3BlCN7wyu9Rw==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-buffer": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.4.3.tgz",
+      "integrity": "sha512-e8+KZHh+RV8MUvoSRtuT1sFXskFnWG9vbDy47Oa166xX+l0dD5sERJ21g5/tcH8Yo95e9IN3u7Jc3NbhnUcSkw==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "@webassemblyjs/helper-code-frame": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.4.3.tgz",
+      "integrity": "sha512-9FgHEtNsZQYaKrGCtsjswBil48Qp1agrzRcPzCbQloCoaTbOXLJ9IRmqT+uEZbenpULLRNFugz3I4uw18hJM8w==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/wast-printer": "1.4.3"
+      }
+    },
+    "@webassemblyjs/helper-fsm": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.4.3.tgz",
+      "integrity": "sha512-JINY76U+702IRf7ePukOt037RwmtH59JHvcdWbTTyHi18ixmQ+uOuNhcdCcQHTquDAH35/QgFlp3Y9KqtyJsCQ==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.4.3.tgz",
+      "integrity": "sha512-I7bS+HaO0K07Io89qhJv+z1QipTpuramGwUSDkwEaficbSvCcL92CUZEtgykfNtk5wb0CoLQwWlmXTwGbNZUeQ==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-wasm-section": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.4.3.tgz",
+      "integrity": "sha512-p0yeeO/h2r30PyjnJX9xXSR6EDcvJd/jC6xa/Pxg4lpfcNi7JUswOpqDToZQ55HMMVhXDih/yqkaywHWGLxqyQ==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.4.3",
+        "@webassemblyjs/helper-buffer": "1.4.3",
+        "@webassemblyjs/helper-wasm-bytecode": "1.4.3",
+        "@webassemblyjs/wasm-gen": "1.4.3",
+        "debug": "^3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "@webassemblyjs/leb128": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.4.3.tgz",
+      "integrity": "sha512-4u0LJLSPzuRDWHwdqsrThYn+WqMFVqbI2ltNrHvZZkzFPO8XOZ0HFQ5eVc4jY/TNHgXcnwrHjONhPGYuuf//KQ==",
+      "dev": true,
+      "requires": {
+        "leb": "^0.3.0"
+      }
+    },
+    "@webassemblyjs/validation": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/validation/-/validation-1.4.3.tgz",
+      "integrity": "sha512-R+rRMKfhd9mq0rj2mhU9A9NKI2l/Rw65vIYzz4lui7eTKPcCu1l7iZNi4b9Gen8D42Sqh/KGiaQNk/x5Tn/iBQ==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.4.3"
+      }
+    },
+    "@webassemblyjs/wasm-edit": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.4.3.tgz",
+      "integrity": "sha512-qzuwUn771PV6/LilqkXcS0ozJYAeY/OKbXIWU3a8gexuqb6De2p4ya/baBeH5JQ2WJdfhWhSvSbu86Vienttpw==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.4.3",
+        "@webassemblyjs/helper-buffer": "1.4.3",
+        "@webassemblyjs/helper-wasm-bytecode": "1.4.3",
+        "@webassemblyjs/helper-wasm-section": "1.4.3",
+        "@webassemblyjs/wasm-gen": "1.4.3",
+        "@webassemblyjs/wasm-opt": "1.4.3",
+        "@webassemblyjs/wasm-parser": "1.4.3",
+        "@webassemblyjs/wast-printer": "1.4.3",
+        "debug": "^3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "@webassemblyjs/wasm-gen": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.4.3.tgz",
+      "integrity": "sha512-eR394T8dHZfpLJ7U/Z5pFSvxl1L63JdREebpv9gYc55zLhzzdJPAuxjBYT4XqevUdW67qU2s0nNA3kBuNJHbaQ==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.4.3",
+        "@webassemblyjs/helper-wasm-bytecode": "1.4.3",
+        "@webassemblyjs/leb128": "1.4.3"
+      }
+    },
+    "@webassemblyjs/wasm-opt": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.4.3.tgz",
+      "integrity": "sha512-7Gp+nschuKiDuAL1xmp4Xz0rgEbxioFXw4nCFYEmy+ytynhBnTeGc9W9cB1XRu1w8pqRU2lbj2VBBA4cL5Z2Kw==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.4.3",
+        "@webassemblyjs/helper-buffer": "1.4.3",
+        "@webassemblyjs/wasm-gen": "1.4.3",
+        "@webassemblyjs/wasm-parser": "1.4.3",
+        "debug": "^3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "@webassemblyjs/wasm-parser": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.4.3.tgz",
+      "integrity": "sha512-KXBjtlwA3BVukR/yWHC9GF+SCzBcgj0a7lm92kTOaa4cbjaTaa47bCjXw6cX4SGQpkncB9PU2hHGYVyyI7wFRg==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.4.3",
+        "@webassemblyjs/helper-wasm-bytecode": "1.4.3",
+        "@webassemblyjs/leb128": "1.4.3",
+        "@webassemblyjs/wasm-parser": "1.4.3",
+        "webassemblyjs": "1.4.3"
+      }
+    },
+    "@webassemblyjs/wast-parser": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.4.3.tgz",
+      "integrity": "sha512-QhCsQzqV0CpsEkRYyTzQDilCNUZ+5j92f+g35bHHNqS22FppNTywNFfHPq8ZWZfYCgbectc+PoghD+xfzVFh1Q==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.4.3",
+        "@webassemblyjs/floating-point-hex-parser": "1.4.3",
+        "@webassemblyjs/helper-code-frame": "1.4.3",
+        "@webassemblyjs/helper-fsm": "1.4.3",
+        "long": "^3.2.0",
+        "webassemblyjs": "1.4.3"
+      }
+    },
+    "@webassemblyjs/wast-printer": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.4.3.tgz",
+      "integrity": "sha512-EgXk4anf8jKmuZJsqD8qy5bz2frEQhBvZruv+bqwNoLWUItjNSFygk8ywL3JTEz9KtxTlAmqTXNrdD1d9gNDtg==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.4.3",
+        "@webassemblyjs/wast-parser": "1.4.3",
+        "long": "^3.2.0"
+      }
+    },
+    "@webpack-contrib/schema-utils": {
+      "version": "1.0.0-beta.0",
+      "resolved": "https://registry.npmjs.org/@webpack-contrib/schema-utils/-/schema-utils-1.0.0-beta.0.tgz",
+      "integrity": "sha512-LonryJP+FxQQHsjGBi6W786TQB1Oym+agTpY0c+Kj8alnIw+DLUJb6SI8Y1GHGhLCH1yPRrucjObUmxNICQ1pg==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.1.0",
+        "ajv-keywords": "^3.1.0",
+        "chalk": "^2.3.2",
+        "strip-ansi": "^4.0.0",
+        "text-table": "^0.2.0",
+        "webpack-log": "^1.1.2"
+      }
     },
     "abbrev": {
-      "version": "1.1.1",
-      "resolved": "http://localhost:4873/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
+      "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
       "dev": true
     },
     "accepts": {
       "version": "1.3.5",
-      "resolved": "http://localhost:4873/accepts/-/accepts-1.3.5.tgz",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
       "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
       "dev": true,
       "requires": {
@@ -1268,70 +1050,101 @@
       }
     },
     "acorn": {
-      "version": "5.5.3",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz",
-      "integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ==",
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz",
+      "integrity": "sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==",
       "dev": true
     },
     "acorn-dynamic-import": {
-      "version": "2.0.2",
-      "resolved": "http://localhost:4873/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz",
-      "integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz",
+      "integrity": "sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==",
       "dev": true,
       "requires": {
-        "acorn": "^4.0.3"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "4.0.13",
-          "resolved": "http://localhost:4873/acorn/-/acorn-4.0.13.tgz",
-          "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
-          "dev": true
-        }
+        "acorn": "^5.0.0"
       }
     },
     "addressparser": {
       "version": "1.0.1",
-      "resolved": "http://localhost:4873/addressparser/-/addressparser-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz",
       "integrity": "sha1-R6++GiqSYhkdtoOOT9HTm0CCF0Y=",
       "dev": true,
       "optional": true
     },
+    "adf-tslint-rules": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/adf-tslint-rules/-/adf-tslint-rules-0.0.4.tgz",
+      "integrity": "sha512-KvmLXhvc/udWmKAUj9SfC+f3fP+Vz7quM4sUmW/QO6FCRH9kLml4mfjEFoWyXNI9pV59HiignfCBSdwixBTOYA==",
+      "requires": {
+        "app-root-path": "2.0.1",
+        "codelyzer": "3.1.2",
+        "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"
+      },
+      "dependencies": {
+        "app-root-path": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.0.1.tgz",
+          "integrity": "sha1-zWLc+OT9WkF+/GZNLlsQZTxlG0Y="
+        },
+        "codelyzer": {
+          "version": "3.1.2",
+          "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"
+          }
+        },
+        "source-map": {
+          "version": "0.5.6",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
+          "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI="
+        }
+      }
+    },
     "adm-zip": {
       "version": "0.4.11",
-      "resolved": "http://localhost:4873/adm-zip/-/adm-zip-0.4.11.tgz",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.11.tgz",
       "integrity": "sha512-L8vcjDTCOIJk7wFvmlEUN7AsSb8T+2JrdP7KINBjzr24TJ5Mwj590sLu3BC7zNZowvJWa/JtPmD8eJCzdtDWjA==",
       "dev": true
     },
     "after": {
       "version": "0.8.2",
-      "resolved": "http://localhost:4873/after/-/after-0.8.2.tgz",
+      "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
       "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=",
       "dev": true
     },
     "agent-base": {
-      "version": "4.2.0",
-      "resolved": "http://localhost:4873/agent-base/-/agent-base-4.2.0.tgz",
-      "integrity": "sha512-c+R/U5X+2zz2+UCrCFv6odQzJdoqI+YecuhnAJLa1zYaMc13zPfwMwZrr91Pd1DYNo/yPRbiM4WVf9whgwFsIg==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz",
+      "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==",
       "dev": true,
       "requires": {
         "es6-promisify": "^5.0.0"
       }
     },
     "ajv": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.0.tgz",
-      "integrity": "sha512-VDUX1oSajablmiyFyED9L1DFndg0P9h7p1F+NO8FkIzei6EPrR6Zu1n18rd5P8PqaSRd/FrWv3G1TVBqpM83gA==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.4.0.tgz",
+      "integrity": "sha1-06/3jpJ3VJdx2vAWTP9ISCt1T8Y=",
       "requires": {
-        "fast-deep-equal": "^2.0.1",
+        "fast-deep-equal": "^1.0.0",
         "fast-json-stable-stringify": "^2.0.0",
         "json-schema-traverse": "^0.3.0",
-        "uri-js": "^4.2.1"
+        "uri-js": "^3.0.2"
       }
     },
     "ajv-cli": {
       "version": "3.0.0",
-      "resolved": "http://localhost:4873/ajv-cli/-/ajv-cli-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/ajv-cli/-/ajv-cli-3.0.0.tgz",
       "integrity": "sha1-WCMjH2TigzBUEwaQsYCZYJ6YDyk=",
       "dev": true,
       "requires": {
@@ -1345,7 +1158,7 @@
       "dependencies": {
         "minimist": {
           "version": "1.2.0",
-          "resolved": "http://localhost:4873/minimist/-/minimist-1.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
           "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
           "dev": true
         }
@@ -1353,55 +1166,76 @@
     },
     "ajv-keywords": {
       "version": "3.2.0",
-      "resolved": "http://localhost:4873/ajv-keywords/-/ajv-keywords-3.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz",
       "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo="
     },
     "ajv-pack": {
       "version": "0.3.1",
-      "resolved": "http://localhost:4873/ajv-pack/-/ajv-pack-0.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/ajv-pack/-/ajv-pack-0.3.1.tgz",
       "integrity": "sha1-tyxNQhnjko5ihC10Le2Tv1B5ZWA=",
       "dev": true,
       "requires": {
         "js-beautify": "^1.6.4",
         "require-from-string": "^1.2.0"
+      },
+      "dependencies": {
+        "require-from-string": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz",
+          "integrity": "sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg=",
+          "dev": true
+        }
       }
     },
     "alfresco-js-api": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.4.0.tgz",
-      "integrity": "sha512-XVf/B3fE0Rl632SU3w0/m6EX/HEwOebIHjP0tluJoD174VONiTsoBzUuicliZvsfuHAeLC5YqthCV4PaKnehCg==",
+      "version": "2.5.0-beta4",
+      "resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.5.0-beta4.tgz",
+      "integrity": "sha512-7s50SXBAqvPoJrWx8iiCQ232q9ZOACdW8vboexTRjjdnlHeH6nviL9KiG8U0FqCf/YxyadwOVQd27ZSGyxTatA==",
+      "requires": {
+        "event-emitter": "0.3.4",
+        "superagent": "3.8.2"
+      }
+    },
+    "alfresco-js-api-node": {
+      "version": "2.5.0-beta4",
+      "resolved": "https://registry.npmjs.org/alfresco-js-api-node/-/alfresco-js-api-node-2.5.0-beta4.tgz",
+      "integrity": "sha512-1Quqt5Vsk4rwIhihSuANpT3gqMWiRdMHSZgJFG3xCPyVr2g9RVfz9lWYhhiz0/RqLu/oSf/6Q4G4bZG7c6sT/g==",
       "requires": {
         "event-emitter": "0.3.4",
-        "jsrsasign": "^8.0.12",
         "superagent": "3.8.2"
       }
     },
     "align-text": {
       "version": "0.1.4",
-      "resolved": "http://localhost:4873/align-text/-/align-text-0.1.4.tgz",
+      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
       "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
       "dev": true,
       "requires": {
         "kind-of": "^3.0.2",
         "longest": "^1.0.1",
         "repeat-string": "^1.5.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
       }
     },
-    "alphanum-sort": {
-      "version": "1.0.2",
-      "resolved": "http://localhost:4873/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
-      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
-      "dev": true
-    },
     "amdefine": {
       "version": "1.0.1",
-      "resolved": "http://localhost:4873/amdefine/-/amdefine-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
       "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
       "dev": true
     },
     "amqplib": {
       "version": "0.5.2",
-      "resolved": "http://localhost:4873/amqplib/-/amqplib-0.5.2.tgz",
+      "resolved": "https://registry.npmjs.org/amqplib/-/amqplib-0.5.2.tgz",
       "integrity": "sha512-l9mCs6LbydtHqRniRwYkKdqxVa6XMz3Vw1fh+2gJaaVgTM6Jk3o8RccAKWKtlhT1US5sWrFh+KKxsVUALURSIA==",
       "dev": true,
       "optional": true,
@@ -1415,14 +1249,14 @@
       "dependencies": {
         "isarray": {
           "version": "0.0.1",
-          "resolved": "http://localhost:4873/isarray/-/isarray-0.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
           "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
           "dev": true,
           "optional": true
         },
         "readable-stream": {
           "version": "1.1.14",
-          "resolved": "http://localhost:4873/readable-stream/-/readable-stream-1.1.14.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
           "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
           "dev": true,
           "optional": true,
@@ -1435,7 +1269,7 @@
         },
         "string_decoder": {
           "version": "0.10.31",
-          "resolved": "http://localhost:4873/string_decoder/-/string_decoder-0.10.31.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
           "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
           "dev": true,
           "optional": true
@@ -1444,7 +1278,7 @@
     },
     "angular2-template-loader": {
       "version": "0.6.2",
-      "resolved": "http://localhost:4873/angular2-template-loader/-/angular2-template-loader-0.6.2.tgz",
+      "resolved": "https://registry.npmjs.org/angular2-template-loader/-/angular2-template-loader-0.6.2.tgz",
       "integrity": "sha1-wNROkP/w+sleiyPwQ6zaf9HFHXw=",
       "dev": true,
       "requires": {
@@ -1453,7 +1287,7 @@
       "dependencies": {
         "loader-utils": {
           "version": "0.2.17",
-          "resolved": "http://localhost:4873/loader-utils/-/loader-utils-0.2.17.tgz",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
           "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
           "dev": true,
           "requires": {
@@ -1467,22 +1301,31 @@
     },
     "ansi-align": {
       "version": "2.0.0",
-      "resolved": "http://localhost:4873/ansi-align/-/ansi-align-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz",
       "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=",
       "dev": true,
       "requires": {
         "string-width": "^2.0.0"
       }
     },
+    "ansi-cyan": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz",
+      "integrity": "sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=",
+      "dev": true,
+      "requires": {
+        "ansi-wrap": "0.1.0"
+      }
+    },
     "ansi-escapes": {
       "version": "1.4.0",
-      "resolved": "http://localhost:4873/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
       "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=",
       "dev": true
     },
     "ansi-gray": {
       "version": "0.1.1",
-      "resolved": "http://localhost:4873/ansi-gray/-/ansi-gray-0.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
       "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
       "dev": true,
       "requires": {
@@ -1491,13 +1334,13 @@
     },
     "ansi-html": {
       "version": "0.0.7",
-      "resolved": "http://localhost:4873/ansi-html/-/ansi-html-0.0.7.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
       "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
       "dev": true
     },
     "ansi-red": {
       "version": "0.1.1",
-      "resolved": "http://localhost:4873/ansi-red/-/ansi-red-0.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz",
       "integrity": "sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=",
       "dev": true,
       "requires": {
@@ -1506,79 +1349,62 @@
     },
     "ansi-regex": {
       "version": "3.0.0",
-      "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
       "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
     },
     "ansi-styles": {
       "version": "3.2.1",
-      "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "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"
-      },
-      "dependencies": {
-        "color-convert": {
-          "version": "1.9.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz",
-          "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
-          "requires": {
-            "color-name": "^1.1.1"
-          }
-        }
       }
     },
     "ansi-wrap": {
       "version": "0.1.0",
-      "resolved": "http://localhost:4873/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
       "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
       "dev": true
     },
-    "any-promise": {
-      "version": "1.3.0",
-      "resolved": "http://localhost:4873/any-promise/-/any-promise-1.3.0.tgz",
-      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
-      "dev": true
-    },
     "anymatch": {
-      "version": "1.3.2",
-      "resolved": "http://localhost:4873/anymatch/-/anymatch-1.3.2.tgz",
-      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
-      "dev": true,
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
       "requires": {
-        "micromatch": "^2.1.5",
-        "normalize-path": "^2.0.0"
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
       }
     },
     "app-root-path": {
-      "version": "2.0.1",
-      "resolved": "http://localhost:4873/app-root-path/-/app-root-path-2.0.1.tgz",
-      "integrity": "sha1-zWLc+OT9WkF+/GZNLlsQZTxlG0Y="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.1.0.tgz",
+      "integrity": "sha1-mL9lmTJ+zqGZMJhm6BQDaP0uZGo="
     },
     "append-transform": {
-      "version": "0.4.0",
-      "resolved": "http://localhost:4873/append-transform/-/append-transform-0.4.0.tgz",
-      "integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-1.0.0.tgz",
+      "integrity": "sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==",
       "dev": true,
       "requires": {
-        "default-require-extensions": "^1.0.0"
+        "default-require-extensions": "^2.0.0"
       }
     },
     "aproba": {
       "version": "1.2.0",
-      "resolved": "http://localhost:4873/aproba/-/aproba-1.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
       "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
       "dev": true
     },
     "archy": {
       "version": "1.0.0",
-      "resolved": "http://localhost:4873/archy/-/archy-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
       "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
       "dev": true
     },
     "are-we-there-yet": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
-      "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
+      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
       "dev": true,
       "requires": {
         "delegates": "^1.0.0",
@@ -1587,7 +1413,7 @@
     },
     "argparse": {
       "version": "1.0.10",
-      "resolved": "http://localhost:4873/argparse/-/argparse-1.0.10.tgz",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
       "requires": {
@@ -1595,52 +1421,46 @@
       }
     },
     "arr-diff": {
-      "version": "2.0.0",
-      "resolved": "http://localhost:4873/arr-diff/-/arr-diff-2.0.0.tgz",
-      "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-      "dev": true,
-      "requires": {
-        "arr-flatten": "^1.0.1"
-      }
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
     },
     "arr-flatten": {
       "version": "1.1.0",
-      "resolved": "http://localhost:4873/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "dev": true
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="
     },
     "arr-union": {
       "version": "3.1.0",
-      "resolved": "http://localhost:4873/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-      "dev": true
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ="
     },
     "array-differ": {
       "version": "1.0.0",
-      "resolved": "http://localhost:4873/array-differ/-/array-differ-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
       "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
       "dev": true
     },
     "array-filter": {
       "version": "0.0.1",
-      "resolved": "http://localhost:4873/array-filter/-/array-filter-0.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz",
       "integrity": "sha1-fajPLiZijtcygDWB/SH2fKzS7uw="
     },
     "array-find-index": {
       "version": "1.0.2",
-      "resolved": "http://localhost:4873/array-find-index/-/array-find-index-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
       "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
       "dev": true
     },
     "array-flatten": {
       "version": "2.1.1",
-      "resolved": "http://localhost:4873/array-flatten/-/array-flatten-2.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz",
       "integrity": "sha1-Qmu52oQJDBg42BLIFQryCoMx4pY=",
       "dev": true
     },
     "array-includes": {
       "version": "3.0.3",
-      "resolved": "http://localhost:4873/array-includes/-/array-includes-3.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz",
       "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=",
       "dev": true,
       "requires": {
@@ -1650,29 +1470,29 @@
     },
     "array-iterate": {
       "version": "1.1.2",
-      "resolved": "http://localhost:4873/array-iterate/-/array-iterate-1.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/array-iterate/-/array-iterate-1.1.2.tgz",
       "integrity": "sha512-1hWSHTIlG/8wtYD+PPX5AOBtKWngpDFjrsrHgZpe+JdgNGz0udYu6ZIkAa/xuenIUEqFv7DvE2Yr60jxweJSrQ==",
       "dev": true
     },
     "array-map": {
       "version": "0.0.0",
-      "resolved": "http://localhost:4873/array-map/-/array-map-0.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz",
       "integrity": "sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI="
     },
     "array-reduce": {
       "version": "0.0.0",
-      "resolved": "http://localhost:4873/array-reduce/-/array-reduce-0.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz",
       "integrity": "sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys="
     },
     "array-slice": {
       "version": "0.2.3",
-      "resolved": "http://localhost:4873/array-slice/-/array-slice-0.2.3.tgz",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
       "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
       "dev": true
     },
     "array-union": {
       "version": "1.0.2",
-      "resolved": "http://localhost:4873/array-union/-/array-union-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
       "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
       "dev": true,
       "requires": {
@@ -1681,43 +1501,45 @@
     },
     "array-uniq": {
       "version": "1.0.3",
-      "resolved": "http://localhost:4873/array-uniq/-/array-uniq-1.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
       "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
       "dev": true
     },
     "array-unique": {
-      "version": "0.2.1",
-      "resolved": "http://localhost:4873/array-unique/-/array-unique-0.2.1.tgz",
-      "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-      "dev": true
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
     },
     "arraybuffer.slice": {
       "version": "0.0.7",
-      "resolved": "http://localhost:4873/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
+      "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
       "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==",
       "dev": true
     },
     "arrify": {
       "version": "1.0.1",
-      "resolved": "http://localhost:4873/arrify/-/arrify-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
       "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
       "dev": true
     },
     "asap": {
       "version": "2.0.6",
-      "resolved": "http://localhost:4873/asap/-/asap-2.0.6.tgz",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
       "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
       "dev": true
     },
     "asn1": {
-      "version": "0.2.3",
-      "resolved": "http://localhost:4873/asn1/-/asn1-0.2.3.tgz",
-      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
-      "dev": true
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": "~2.1.0"
+      }
     },
     "asn1.js": {
       "version": "4.10.1",
-      "resolved": "http://localhost:4873/asn1.js/-/asn1.js-4.10.1.tgz",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
       "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
       "dev": true,
       "requires": {
@@ -1728,78 +1550,101 @@
     },
     "assert": {
       "version": "1.4.1",
-      "resolved": "http://localhost:4873/assert/-/assert-1.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
       "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
       "dev": true,
       "requires": {
         "util": "0.10.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+          "dev": true
+        },
+        "util": {
+          "version": "0.10.3",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.1"
+          }
+        }
       }
     },
     "assert-plus": {
-      "version": "0.2.0",
-      "resolved": "http://localhost:4873/assert-plus/-/assert-plus-0.2.0.tgz",
-      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
       "dev": true
     },
     "assign-symbols": {
       "version": "1.0.0",
-      "resolved": "http://localhost:4873/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-      "dev": true
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
     },
     "ast-types": {
-      "version": "0.9.6",
-      "resolved": "http://localhost:4873/ast-types/-/ast-types-0.9.6.tgz",
-      "integrity": "sha1-ECyenpAF0+fjgpvwxPok7oYu6bk=",
-      "dev": true
+      "version": "0.11.5",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.11.5.tgz",
+      "integrity": "sha512-oJjo+5e7/vEc2FBK8gUalV0pba4L3VdBIs2EKhOLHLcOd2FgQIVQN9xb0eZ9IjEWyAL7vq6fGJxOvVvdCHNyMw==",
+      "dev": true,
+      "optional": true
     },
-    "async": {
-      "version": "2.6.1",
-      "resolved": "http://localhost:4873/async/-/async-2.6.1.tgz",
-      "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
+    "astrolabe": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/astrolabe/-/astrolabe-0.3.6.tgz",
+      "integrity": "sha1-bT8cztp4DEw88FDvMtfHRFBFewE=",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.10"
+        "exceptions": "~0.1.1",
+        "protractor": "*",
+        "underscore": "*"
       }
     },
+    "async": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+      "dev": true
+    },
     "async-each": {
       "version": "1.0.1",
-      "resolved": "http://localhost:4873/async-each/-/async-each-1.0.1.tgz",
-      "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
-      "dev": true
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
+      "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0="
     },
     "async-foreach": {
       "version": "0.1.3",
-      "resolved": "http://localhost:4873/async-foreach/-/async-foreach-0.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
       "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
       "dev": true
     },
     "async-limiter": {
       "version": "1.0.0",
-      "resolved": "http://localhost:4873/async-limiter/-/async-limiter-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
       "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==",
       "dev": true
     },
     "asynckit": {
       "version": "0.4.0",
-      "resolved": "http://localhost:4873/asynckit/-/asynckit-0.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "atob": {
       "version": "2.1.1",
-      "resolved": "http://localhost:4873/atob/-/atob-2.1.1.tgz",
-      "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio=",
-      "dev": true
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz",
+      "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio="
     },
     "autolinker": {
       "version": "0.15.3",
-      "resolved": "http://localhost:4873/autolinker/-/autolinker-0.15.3.tgz",
+      "resolved": "https://registry.npmjs.org/autolinker/-/autolinker-0.15.3.tgz",
       "integrity": "sha1-NCQX2PLzRhsUzwkIjV7fh5HcmDI=",
       "dev": true
     },
     "autoprefixer": {
       "version": "6.5.4",
-      "resolved": "http://localhost:4873/autoprefixer/-/autoprefixer-6.5.4.tgz",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.5.4.tgz",
       "integrity": "sha1-E4brZwjM/zau//cK3GlOz9YK8bA=",
       "dev": true,
       "requires": {
@@ -1813,19 +1658,19 @@
       "dependencies": {
         "ansi-regex": {
           "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
           "dev": true
         },
         "ansi-styles": {
           "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
           "dev": true
         },
         "browserslist": {
           "version": "1.4.0",
-          "resolved": "http://localhost:4873/browserslist/-/browserslist-1.4.0.tgz",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.4.0.tgz",
           "integrity": "sha1-nP3PU4TZFY9bcNoqoAsw6P8BkEk=",
           "dev": true,
           "requires": {
@@ -1834,7 +1679,7 @@
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
@@ -1847,7 +1692,7 @@
           "dependencies": {
             "supports-color": {
               "version": "2.0.0",
-              "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
               "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
               "dev": true
             }
@@ -1855,13 +1700,13 @@
         },
         "has-flag": {
           "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
           "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
           "dev": true
         },
         "postcss": {
           "version": "5.2.18",
-          "resolved": "http://localhost:4873/postcss/-/postcss-5.2.18.tgz",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
@@ -1873,7 +1718,7 @@
         },
         "strip-ansi": {
           "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
           "requires": {
@@ -1882,7 +1727,7 @@
         },
         "supports-color": {
           "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
@@ -1892,20 +1737,20 @@
       }
     },
     "aws-sign2": {
-      "version": "0.6.0",
-      "resolved": "http://localhost:4873/aws-sign2/-/aws-sign2-0.6.0.tgz",
-      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
       "dev": true
     },
     "aws4": {
-      "version": "1.7.0",
-      "resolved": "http://localhost:4873/aws4/-/aws4-1.7.0.tgz",
-      "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
+      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
       "dev": true
     },
     "axios": {
       "version": "0.16.2",
-      "resolved": "http://localhost:4873/axios/-/axios-0.16.2.tgz",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.16.2.tgz",
       "integrity": "sha1-uk+S8XFn37q0CYN4VFS5rBScPG0=",
       "dev": true,
       "requires": {
@@ -1915,7 +1760,7 @@
     },
     "babel-code-frame": {
       "version": "6.26.0",
-      "resolved": "http://localhost:4873/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
       "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
       "dev": true,
       "requires": {
@@ -1926,19 +1771,19 @@
       "dependencies": {
         "ansi-regex": {
           "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
           "dev": true
         },
         "ansi-styles": {
           "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
           "dev": true
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
@@ -1951,7 +1796,7 @@
         },
         "strip-ansi": {
           "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
           "requires": {
@@ -1960,7 +1805,7 @@
         },
         "supports-color": {
           "version": "2.0.0",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
           "dev": true
         }
@@ -1968,7 +1813,7 @@
     },
     "babel-core": {
       "version": "6.26.3",
-      "resolved": "http://localhost:4873/babel-core/-/babel-core-6.26.3.tgz",
+      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz",
       "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
       "dev": true,
       "requires": {
@@ -1991,22 +1836,11 @@
         "private": "^0.1.8",
         "slash": "^1.0.0",
         "source-map": "^0.5.7"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "http://localhost:4873/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
       }
     },
     "babel-generator": {
       "version": "6.26.1",
-      "resolved": "http://localhost:4873/babel-generator/-/babel-generator-6.26.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
       "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
       "dev": true,
       "requires": {
@@ -2018,11 +1852,19 @@
         "lodash": "^4.17.4",
         "source-map": "^0.5.7",
         "trim-right": "^1.0.1"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+          "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
+          "dev": true
+        }
       }
     },
     "babel-helper-hoist-variables": {
       "version": "6.24.1",
-      "resolved": "http://localhost:4873/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
       "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
       "dev": true,
       "requires": {
@@ -2032,7 +1874,7 @@
     },
     "babel-helpers": {
       "version": "6.24.1",
-      "resolved": "http://localhost:4873/babel-helpers/-/babel-helpers-6.24.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
       "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
       "dev": true,
       "requires": {
@@ -2042,7 +1884,7 @@
     },
     "babel-messages": {
       "version": "6.23.0",
-      "resolved": "http://localhost:4873/babel-messages/-/babel-messages-6.23.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
       "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
       "dev": true,
       "requires": {
@@ -2051,13 +1893,13 @@
     },
     "babel-plugin-transform-cjs-system-require": {
       "version": "0.1.1",
-      "resolved": "http://localhost:4873/babel-plugin-transform-cjs-system-require/-/babel-plugin-transform-cjs-system-require-0.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-cjs-system-require/-/babel-plugin-transform-cjs-system-require-0.1.1.tgz",
       "integrity": "sha1-/+8m0xvCcOgr271DfbJ3foUWKik=",
       "dev": true
     },
     "babel-plugin-transform-cjs-system-wrapper": {
       "version": "0.2.1",
-      "resolved": "http://localhost:4873/babel-plugin-transform-cjs-system-wrapper/-/babel-plugin-transform-cjs-system-wrapper-0.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-cjs-system-wrapper/-/babel-plugin-transform-cjs-system-wrapper-0.2.1.tgz",
       "integrity": "sha1-6FUHiHe1bU0bkrn5Gzf1mdsCAOM=",
       "dev": true,
       "requires": {
@@ -2067,7 +1909,7 @@
     },
     "babel-plugin-transform-es2015-modules-systemjs": {
       "version": "6.24.1",
-      "resolved": "http://localhost:4873/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz",
       "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
       "dev": true,
       "requires": {
@@ -2078,7 +1920,7 @@
     },
     "babel-plugin-transform-global-system-wrapper": {
       "version": "0.0.1",
-      "resolved": "http://localhost:4873/babel-plugin-transform-global-system-wrapper/-/babel-plugin-transform-global-system-wrapper-0.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-global-system-wrapper/-/babel-plugin-transform-global-system-wrapper-0.0.1.tgz",
       "integrity": "sha1-r7RpzsDgRom5/n6LH9KA/JSm2PI=",
       "dev": true,
       "requires": {
@@ -2087,13 +1929,13 @@
     },
     "babel-plugin-transform-system-register": {
       "version": "0.0.1",
-      "resolved": "http://localhost:4873/babel-plugin-transform-system-register/-/babel-plugin-transform-system-register-0.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-system-register/-/babel-plugin-transform-system-register-0.0.1.tgz",
       "integrity": "sha1-nf9AOQwnY6xRjwsq18XqT2WlviU=",
       "dev": true
     },
     "babel-polyfill": {
       "version": "6.23.0",
-      "resolved": "http://localhost:4873/babel-polyfill/-/babel-polyfill-6.23.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.23.0.tgz",
       "integrity": "sha1-g2TKYt+Or7gwSZ9pkXdGbDsDSZ0=",
       "dev": true,
       "requires": {
@@ -2104,7 +1946,7 @@
       "dependencies": {
         "regenerator-runtime": {
           "version": "0.10.5",
-          "resolved": "http://localhost:4873/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
           "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=",
           "dev": true
         }
@@ -2112,7 +1954,7 @@
     },
     "babel-register": {
       "version": "6.26.0",
-      "resolved": "http://localhost:4873/babel-register/-/babel-register-6.26.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
       "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
       "dev": true,
       "requires": {
@@ -2125,17 +1967,20 @@
         "source-map-support": "^0.4.15"
       },
       "dependencies": {
-        "core-js": {
-          "version": "2.5.6",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.6.tgz",
-          "integrity": "sha512-lQUVfQi0aLix2xpyjrrJEvfuYCqPc/HwmTKsC/VNf8q0zsjX7SQZtp4+oRONN5Tsur9GDETPjj+Ub2iDiGZfSQ==",
-          "dev": true
+        "source-map-support": {
+          "version": "0.4.18",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
+          "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+          "dev": true,
+          "requires": {
+            "source-map": "^0.5.6"
+          }
         }
       }
     },
     "babel-runtime": {
       "version": "6.26.0",
-      "resolved": "http://localhost:4873/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
       "dev": true,
       "requires": {
@@ -2145,7 +1990,7 @@
     },
     "babel-template": {
       "version": "6.26.0",
-      "resolved": "http://localhost:4873/babel-template/-/babel-template-6.26.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
       "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
       "dev": true,
       "requires": {
@@ -2158,7 +2003,7 @@
     },
     "babel-traverse": {
       "version": "6.26.0",
-      "resolved": "http://localhost:4873/babel-traverse/-/babel-traverse-6.26.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
       "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
       "dev": true,
       "requires": {
@@ -2171,22 +2016,11 @@
         "globals": "^9.18.0",
         "invariant": "^2.2.2",
         "lodash": "^4.17.4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "http://localhost:4873/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
       }
     },
     "babel-types": {
       "version": "6.26.0",
-      "resolved": "http://localhost:4873/babel-types/-/babel-types-6.26.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
       "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
       "dev": true,
       "requires": {
@@ -2198,32 +2032,31 @@
     },
     "babylon": {
       "version": "6.18.0",
-      "resolved": "http://localhost:4873/babylon/-/babylon-6.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
       "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
       "dev": true
     },
     "backo2": {
       "version": "1.0.2",
-      "resolved": "http://localhost:4873/backo2/-/backo2-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
       "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=",
       "dev": true
     },
     "bail": {
       "version": "1.0.3",
-      "resolved": "http://localhost:4873/bail/-/bail-1.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.3.tgz",
       "integrity": "sha512-1X8CnjFVQ+a+KW36uBNMTU5s8+v5FzeqrP7hTG5aTb4aPreSbZJlhwPon9VKMuEVgV++JM+SQrALY3kr7eswdg==",
       "dev": true
     },
     "balanced-match": {
       "version": "1.0.0",
-      "resolved": "http://localhost:4873/balanced-match/-/balanced-match-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
     },
     "base": {
       "version": "0.11.2",
-      "resolved": "http://localhost:4873/base/-/base-0.11.2.tgz",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
       "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-      "dev": true,
       "requires": {
         "cache-base": "^1.0.1",
         "class-utils": "^0.3.5",
@@ -2236,84 +2069,68 @@
       "dependencies": {
         "define-property": {
           "version": "1.0.0",
-          "resolved": "http://localhost:4873/define-property/-/define-property-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
           "requires": {
             "is-descriptor": "^1.0.0"
           }
         },
         "is-accessor-descriptor": {
           "version": "1.0.0",
-          "resolved": "http://localhost:4873/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
         },
         "is-data-descriptor": {
           "version": "1.0.0",
-          "resolved": "http://localhost:4873/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
         },
         "is-descriptor": {
           "version": "1.0.2",
-          "resolved": "http://localhost:4873/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
             "kind-of": "^6.0.2"
           }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "http://localhost:4873/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
         }
       }
     },
     "base64-arraybuffer": {
       "version": "0.1.5",
-      "resolved": "http://localhost:4873/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
       "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=",
       "dev": true
     },
     "base64-js": {
       "version": "1.3.0",
-      "resolved": "http://localhost:4873/base64-js/-/base64-js-1.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
       "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
       "dev": true
     },
     "base64id": {
       "version": "1.0.0",
-      "resolved": "http://localhost:4873/base64id/-/base64id-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz",
       "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=",
       "dev": true
     },
     "batch": {
       "version": "0.6.1",
-      "resolved": "http://localhost:4873/batch/-/batch-0.6.1.tgz",
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
     "bcrypt-pbkdf": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -2322,33 +2139,43 @@
     },
     "beeper": {
       "version": "1.1.1",
-      "resolved": "http://localhost:4873/beeper/-/beeper-1.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
       "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=",
       "dev": true
     },
     "better-assert": {
       "version": "1.0.2",
-      "resolved": "http://localhost:4873/better-assert/-/better-assert-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
       "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=",
       "dev": true,
       "requires": {
         "callsite": "1.0.0"
       }
     },
+    "bfj-node4": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/bfj-node4/-/bfj-node4-5.3.1.tgz",
+      "integrity": "sha512-SOmOsowQWfXc7ybFARsK3C4MCOWzERaOMV/Fl3Tgjs+5dJWyzo3oa127jL44eMbQiAN17J7SvAs2TRxEScTUmg==",
+      "dev": true,
+      "requires": {
+        "bluebird": "^3.5.1",
+        "check-types": "^7.3.0",
+        "tryer": "^1.0.0"
+      }
+    },
     "big.js": {
       "version": "3.2.0",
-      "resolved": "http://localhost:4873/big.js/-/big.js-3.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
       "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="
     },
     "binary-extensions": {
       "version": "1.11.0",
-      "resolved": "http://localhost:4873/binary-extensions/-/binary-extensions-1.11.0.tgz",
-      "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=",
-      "dev": true
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz",
+      "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU="
     },
     "bitsyntax": {
       "version": "0.0.4",
-      "resolved": "http://localhost:4873/bitsyntax/-/bitsyntax-0.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/bitsyntax/-/bitsyntax-0.0.4.tgz",
       "integrity": "sha1-6xDMb4K4xJDj6FaY8H6D1G4MuoI=",
       "dev": true,
       "optional": true,
@@ -2358,7 +2185,7 @@
     },
     "bl": {
       "version": "1.1.2",
-      "resolved": "http://localhost:4873/bl/-/bl-1.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz",
       "integrity": "sha1-/cqHGplxOqANGeO7ukHER4emU5g=",
       "dev": true,
       "optional": true,
@@ -2368,14 +2195,14 @@
       "dependencies": {
         "process-nextick-args": {
           "version": "1.0.7",
-          "resolved": "http://localhost:4873/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
           "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
           "dev": true,
           "optional": true
         },
         "readable-stream": {
           "version": "2.0.6",
-          "resolved": "http://localhost:4873/readable-stream/-/readable-stream-2.0.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
           "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
           "dev": true,
           "optional": true,
@@ -2390,7 +2217,7 @@
         },
         "string_decoder": {
           "version": "0.10.31",
-          "resolved": "http://localhost:4873/string_decoder/-/string_decoder-0.10.31.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
           "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
           "dev": true,
           "optional": true
@@ -2399,13 +2226,13 @@
     },
     "blob": {
       "version": "0.0.4",
-      "resolved": "http://localhost:4873/blob/-/blob-0.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz",
       "integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=",
       "dev": true
     },
     "block-stream": {
       "version": "0.0.9",
-      "resolved": "http://localhost:4873/block-stream/-/block-stream-0.0.9.tgz",
+      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
       "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
       "dev": true,
       "requires": {
@@ -2413,9 +2240,9 @@
       }
     },
     "blocking-proxy": {
-      "version": "0.0.5",
-      "resolved": "http://localhost:4873/blocking-proxy/-/blocking-proxy-0.0.5.tgz",
-      "integrity": "sha1-RikF4Nz76pcPQao3Ij3anAexkSs=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/blocking-proxy/-/blocking-proxy-1.0.1.tgz",
+      "integrity": "sha512-KE8NFMZr3mN2E0HcvCgRtX7DjhiIQrwle+nSVJVC/yqFb9+xznHl2ZcoBp2L9qzkI4t4cBFJ1efXF8Dwi132RA==",
       "dev": true,
       "requires": {
         "minimist": "^1.2.0"
@@ -2423,7 +2250,7 @@
       "dependencies": {
         "minimist": {
           "version": "1.2.0",
-          "resolved": "http://localhost:4873/minimist/-/minimist-1.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
           "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
           "dev": true
         }
@@ -2431,19 +2258,19 @@
     },
     "bluebird": {
       "version": "3.5.1",
-      "resolved": "http://localhost:4873/bluebird/-/bluebird-3.5.1.tgz",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
       "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
       "dev": true
     },
     "bn.js": {
       "version": "4.11.8",
-      "resolved": "http://localhost:4873/bn.js/-/bn.js-4.11.8.tgz",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
       "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
       "dev": true
     },
     "body-parser": {
       "version": "1.18.2",
-      "resolved": "http://localhost:4873/body-parser/-/body-parser-1.18.2.tgz",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz",
       "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=",
       "dev": true,
       "requires": {
@@ -2459,18 +2286,9 @@
         "type-is": "~1.6.15"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "http://localhost:4873/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
         "qs": {
           "version": "6.5.1",
-          "resolved": "http://localhost:4873/qs/-/qs-6.5.1.tgz",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
           "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
           "dev": true
         }
@@ -2478,7 +2296,7 @@
     },
     "bonjour": {
       "version": "3.5.0",
-      "resolved": "http://localhost:4873/bonjour/-/bonjour-3.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
       "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
       "dev": true,
       "requires": {
@@ -2492,13 +2310,13 @@
     },
     "boolbase": {
       "version": "1.0.0",
-      "resolved": "http://localhost:4873/boolbase/-/boolbase-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
       "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
       "dev": true
     },
     "boom": {
       "version": "2.10.1",
-      "resolved": "http://localhost:4873/boom/-/boom-2.10.1.tgz",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
       "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
       "dev": true,
       "requires": {
@@ -2507,7 +2325,7 @@
     },
     "boxen": {
       "version": "1.3.0",
-      "resolved": "http://localhost:4873/boxen/-/boxen-1.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz",
       "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==",
       "dev": true,
       "requires": {
@@ -2522,7 +2340,7 @@
     },
     "brace-expansion": {
       "version": "1.1.11",
-      "resolved": "http://localhost:4873/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "requires": {
         "balanced-match": "^1.0.0",
@@ -2530,25 +2348,41 @@
       }
     },
     "braces": {
-      "version": "1.8.5",
-      "resolved": "http://localhost:4873/braces/-/braces-1.8.5.tgz",
-      "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-      "dev": true,
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
       "requires": {
-        "expand-range": "^1.8.1",
-        "preserve": "^0.2.0",
-        "repeat-element": "^1.1.2"
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
       }
     },
     "brorand": {
       "version": "1.1.0",
-      "resolved": "http://localhost:4873/brorand/-/brorand-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
       "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
       "dev": true
     },
     "browserify-aes": {
       "version": "1.2.0",
-      "resolved": "http://localhost:4873/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
       "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
       "dev": true,
       "requires": {
@@ -2562,7 +2396,7 @@
     },
     "browserify-cipher": {
       "version": "1.0.1",
-      "resolved": "http://localhost:4873/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
       "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
       "dev": true,
       "requires": {
@@ -2572,19 +2406,20 @@
       }
     },
     "browserify-des": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/browserify-des/-/browserify-des-1.0.1.tgz",
-      "integrity": "sha512-zy0Cobe3hhgpiOM32Tj7KQ3Vl91m0njwsjzZQK1L+JDf11dzP9qIvjreVinsvXrgfjhStXwUWAEpB9D7Gwmayw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
       "dev": true,
       "requires": {
         "cipher-base": "^1.0.1",
         "des.js": "^1.0.0",
-        "inherits": "^2.0.1"
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
       }
     },
     "browserify-rsa": {
       "version": "4.0.1",
-      "resolved": "http://localhost:4873/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
       "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
       "dev": true,
       "requires": {
@@ -2594,7 +2429,7 @@
     },
     "browserify-sign": {
       "version": "4.0.4",
-      "resolved": "http://localhost:4873/browserify-sign/-/browserify-sign-4.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
       "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
       "dev": true,
       "requires": {
@@ -2609,7 +2444,7 @@
     },
     "browserify-zlib": {
       "version": "0.2.0",
-      "resolved": "http://localhost:4873/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
       "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
       "dev": true,
       "requires": {
@@ -2617,18 +2452,27 @@
       }
     },
     "browserslist": {
-      "version": "2.11.3",
-      "resolved": "http://localhost:4873/browserslist/-/browserslist-2.11.3.tgz",
-      "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
+      "version": "3.2.8",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz",
+      "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30000792",
-        "electron-to-chromium": "^1.3.30"
+        "caniuse-lite": "^1.0.30000844",
+        "electron-to-chromium": "^1.3.47"
+      }
+    },
+    "browserstack": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/browserstack/-/browserstack-1.5.1.tgz",
+      "integrity": "sha512-O8VMT64P9NOLhuIoD4YngyxBURefaSdR4QdhG8l6HZ9VxtU7jc3m6jLufFwKA5gaf7fetfB2TnRJnMxyob+heg==",
+      "dev": true,
+      "requires": {
+        "https-proxy-agent": "^2.2.1"
       }
     },
     "buffer": {
       "version": "4.9.1",
-      "resolved": "http://localhost:4873/buffer/-/buffer-4.9.1.tgz",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
       "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
       "dev": true,
       "requires": {
@@ -2637,39 +2481,55 @@
         "isarray": "^1.0.0"
       }
     },
-    "buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "http://localhost:4873/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+    "buffer-alloc": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
+      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
+      "dev": true,
+      "requires": {
+        "buffer-alloc-unsafe": "^1.1.0",
+        "buffer-fill": "^1.0.0"
+      }
+    },
+    "buffer-alloc-unsafe": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
+      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
+      "dev": true
+    },
+    "buffer-fill": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
+      "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=",
       "dev": true
     },
     "buffer-from": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz",
-      "integrity": "sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
       "dev": true
     },
     "buffer-indexof": {
       "version": "1.1.1",
-      "resolved": "http://localhost:4873/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
       "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
       "dev": true
     },
     "buffer-more-ints": {
       "version": "0.0.2",
-      "resolved": "http://localhost:4873/buffer-more-ints/-/buffer-more-ints-0.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/buffer-more-ints/-/buffer-more-ints-0.0.2.tgz",
       "integrity": "sha1-JrOIXRD6E9t/wBquOquHAZngEkw=",
       "dev": true
     },
     "buffer-xor": {
       "version": "1.0.3",
-      "resolved": "http://localhost:4873/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
       "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
       "dev": true
     },
     "buildmail": {
       "version": "4.0.1",
-      "resolved": "http://localhost:4873/buildmail/-/buildmail-4.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/buildmail/-/buildmail-4.0.1.tgz",
       "integrity": "sha1-h393OLeHKYccmhBeO4N9K+EaenI=",
       "dev": true,
       "optional": true,
@@ -2685,7 +2545,7 @@
       "dependencies": {
         "punycode": {
           "version": "1.4.1",
-          "resolved": "http://localhost:4873/punycode/-/punycode-1.4.1.tgz",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
           "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
           "dev": true,
           "optional": true
@@ -2694,18 +2554,24 @@
     },
     "builtin-modules": {
       "version": "1.1.1",
-      "resolved": "http://localhost:4873/builtin-modules/-/builtin-modules-1.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
       "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8="
     },
     "builtin-status-codes": {
       "version": "3.0.0",
-      "resolved": "http://localhost:4873/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
       "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
       "dev": true
     },
+    "builtins": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz",
+      "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og=",
+      "dev": true
+    },
     "bundlesize": {
       "version": "0.15.3",
-      "resolved": "http://localhost:4873/bundlesize/-/bundlesize-0.15.3.tgz",
+      "resolved": "https://registry.npmjs.org/bundlesize/-/bundlesize-0.15.3.tgz",
       "integrity": "sha512-CqLtaDKQFZVh9l53Py67lJOLOT//aNrmF9xT1v5cS080bbqyhOdTX5+LuoVI8LOKa351fUikGcxsQDYWQXfizg==",
       "dev": true,
       "requires": {
@@ -2723,7 +2589,7 @@
       "dependencies": {
         "load-json-file": {
           "version": "2.0.0",
-          "resolved": "http://localhost:4873/load-json-file/-/load-json-file-2.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
           "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
           "dev": true,
           "requires": {
@@ -2735,7 +2601,7 @@
         },
         "parse-json": {
           "version": "2.2.0",
-          "resolved": "http://localhost:4873/parse-json/-/parse-json-2.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
           "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
           "dev": true,
           "requires": {
@@ -2744,7 +2610,7 @@
         },
         "path-type": {
           "version": "2.0.0",
-          "resolved": "http://localhost:4873/path-type/-/path-type-2.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
           "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
           "dev": true,
           "requires": {
@@ -2753,13 +2619,13 @@
         },
         "pify": {
           "version": "2.3.0",
-          "resolved": "http://localhost:4873/pify/-/pify-2.3.0.tgz",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
           "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
           "dev": true
         },
         "read-pkg": {
           "version": "2.0.0",
-          "resolved": "http://localhost:4873/read-pkg/-/read-pkg-2.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
           "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
           "dev": true,
           "requires": {
@@ -2770,7 +2636,7 @@
         },
         "read-pkg-up": {
           "version": "2.0.0",
-          "resolved": "http://localhost:4873/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
           "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
           "dev": true,
           "requires": {
@@ -2782,13 +2648,13 @@
     },
     "bytes": {
       "version": "3.0.0",
-      "resolved": "http://localhost:4873/bytes/-/bytes-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
       "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
       "dev": true
     },
     "cacache": {
       "version": "10.0.4",
-      "resolved": "http://localhost:4873/cacache/-/cacache-10.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz",
       "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
       "dev": true,
       "requires": {
@@ -2809,7 +2675,7 @@
       "dependencies": {
         "y18n": {
           "version": "4.0.0",
-          "resolved": "http://localhost:4873/y18n/-/y18n-4.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
           "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
           "dev": true
         }
@@ -2817,9 +2683,8 @@
     },
     "cache-base": {
       "version": "1.0.1",
-      "resolved": "http://localhost:4873/cache-base/-/cache-base-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
       "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-      "dev": true,
       "requires": {
         "collection-visit": "^1.0.0",
         "component-emitter": "^1.2.1",
@@ -2830,37 +2695,17 @@
         "to-object-path": "^0.3.0",
         "union-value": "^1.0.0",
         "unset-value": "^1.0.0"
-      },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        }
-      }
-    },
-    "cache-loader": {
-      "version": "1.2.2",
-      "resolved": "http://localhost:4873/cache-loader/-/cache-loader-1.2.2.tgz",
-      "integrity": "sha512-rsGh4SIYyB9glU+d0OcHwiXHXBoUgDhHZaQ1KAbiXqfz1CDPxtTboh1gPbJ0q2qdO8a9lfcjgC5CJ2Ms32y5bw==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^1.1.0",
-        "mkdirp": "^0.5.1",
-        "neo-async": "^2.5.0",
-        "schema-utils": "^0.4.2"
       }
     },
     "callsite": {
       "version": "1.0.0",
-      "resolved": "http://localhost:4873/callsite/-/callsite-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
       "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=",
       "dev": true
     },
     "camel-case": {
       "version": "3.0.0",
-      "resolved": "http://localhost:4873/camel-case/-/camel-case-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
       "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
       "dev": true,
       "requires": {
@@ -2870,12 +2715,12 @@
     },
     "camelcase": {
       "version": "4.1.0",
-      "resolved": "http://localhost:4873/camelcase/-/camelcase-4.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
       "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
     },
     "camelcase-keys": {
       "version": "2.1.0",
-      "resolved": "http://localhost:4873/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
       "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
       "dev": true,
       "requires": {
@@ -2885,69 +2730,45 @@
       "dependencies": {
         "camelcase": {
           "version": "2.1.1",
-          "resolved": "http://localhost:4873/camelcase/-/camelcase-2.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
           "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
           "dev": true
         }
       }
     },
-    "caniuse-api": {
-      "version": "1.6.1",
-      "resolved": "http://localhost:4873/caniuse-api/-/caniuse-api-1.6.1.tgz",
-      "integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=",
-      "dev": true,
-      "requires": {
-        "browserslist": "^1.3.6",
-        "caniuse-db": "^1.0.30000529",
-        "lodash.memoize": "^4.1.2",
-        "lodash.uniq": "^4.5.0"
-      },
-      "dependencies": {
-        "browserslist": {
-          "version": "1.7.7",
-          "resolved": "http://localhost:4873/browserslist/-/browserslist-1.7.7.tgz",
-          "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
-          "dev": true,
-          "requires": {
-            "caniuse-db": "^1.0.30000639",
-            "electron-to-chromium": "^1.2.7"
-          }
-        }
-      }
-    },
     "caniuse-db": {
-      "version": "1.0.30000846",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000846.tgz",
-      "integrity": "sha1-2chvkUc4202gmO7e2ZdBPERWG9I=",
+      "version": "1.0.30000875",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000875.tgz",
+      "integrity": "sha512-L1YQcIv8YPymJpbQyO8uM2KEkEVsuFcQRO2vNp0n4GNGAmq0f8GWQKUCTqZHvsyX2EeOO4aLWgc3qCH6zMWFag==",
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30000846",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000846.tgz",
-      "integrity": "sha512-qxUOHr5mTaadWH1ap0ueivHd8x42Bnemcn+JutVr7GWmm2bU4zoBhjuv5QdXgALQnnT626lOQros7cCDf8PwCg==",
+      "version": "1.0.30000874",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000874.tgz",
+      "integrity": "sha512-29nr1EPiHwrJTAHHsEmTt2h+55L8j2GNFdAcYPlRy2NX6iFz7ZZiepVI7kP/QqlnHLq3KvfWpbmGa0d063U09w==",
       "dev": true
     },
     "capture-stack-trace": {
       "version": "1.0.0",
-      "resolved": "http://localhost:4873/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz",
       "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0=",
       "dev": true
     },
     "caseless": {
       "version": "0.12.0",
-      "resolved": "http://localhost:4873/caseless/-/caseless-0.12.0.tgz",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
       "dev": true
     },
     "ccount": {
       "version": "1.0.3",
-      "resolved": "http://localhost:4873/ccount/-/ccount-1.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.0.3.tgz",
       "integrity": "sha512-Jt9tIBkRc9POUof7QA/VwWd+58fKkEEfI+/t1/eOlxKM7ZhrczNzMFefge7Ai+39y1pR/pP6cI19guHy3FSLmw==",
       "dev": true
     },
     "center-align": {
       "version": "0.1.3",
-      "resolved": "http://localhost:4873/center-align/-/center-align-0.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
       "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
       "dev": true,
       "requires": {
@@ -2957,7 +2778,7 @@
     },
     "chalk": {
       "version": "2.4.1",
-      "resolved": "http://localhost:4873/chalk/-/chalk-2.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
       "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
       "requires": {
         "ansi-styles": "^3.2.1",
@@ -2967,37 +2788,37 @@
     },
     "character-entities": {
       "version": "1.2.2",
-      "resolved": "http://localhost:4873/character-entities/-/character-entities-1.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.2.tgz",
       "integrity": "sha512-sMoHX6/nBiy3KKfC78dnEalnpn0Az0oSNvqUWYTtYrhRI5iUIYsROU48G+E+kMFQzqXaJ8kHJZ85n7y6/PHgwQ==",
       "dev": true
     },
     "character-entities-html4": {
       "version": "1.1.2",
-      "resolved": "http://localhost:4873/character-entities-html4/-/character-entities-html4-1.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.2.tgz",
       "integrity": "sha512-sIrXwyna2+5b0eB9W149izTPJk/KkJTg6mEzDGibwBUkyH1SbDa+nf515Ppdi3MaH35lW0JFJDWeq9Luzes1Iw==",
       "dev": true
     },
     "character-entities-legacy": {
       "version": "1.1.2",
-      "resolved": "http://localhost:4873/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz",
       "integrity": "sha512-9NB2VbXtXYWdXzqrvAHykE/f0QJxzaKIpZ5QzNZrrgQ7Iyxr2vnfS8fCBNVW9nUEZE0lo57nxKRqnzY/dKrwlA==",
       "dev": true
     },
     "character-reference-invalid": {
       "version": "1.1.2",
-      "resolved": "http://localhost:4873/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz",
       "integrity": "sha512-7I/xceXfKyUJmSAn/jw8ve/9DyOP7XxufNYLI9Px7CmsKgEUaZLUTax6nZxGQtaoiZCjpu6cHPj20xC/vqRReQ==",
       "dev": true
     },
     "chardet": {
       "version": "0.4.2",
-      "resolved": "http://localhost:4873/chardet/-/chardet-0.4.2.tgz",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
       "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=",
       "dev": true
     },
     "chart.js": {
       "version": "2.5.0",
-      "resolved": "http://localhost:4873/chart.js/-/chart.js-2.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.5.0.tgz",
       "integrity": "sha1-/m51Gok3afVucr7lrZEgfhxZKVc=",
       "requires": {
         "chartjs-color": "^2.0.0",
@@ -3006,59 +2827,81 @@
     },
     "chartjs-color": {
       "version": "2.2.0",
-      "resolved": "http://localhost:4873/chartjs-color/-/chartjs-color-2.2.0.tgz",
+      "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"
+      },
+      "dependencies": {
+        "color-convert": {
+          "version": "0.5.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz",
+          "integrity": "sha1-vbbGnOZg+t/+CwAHzER+G59ygr0="
+        }
       }
     },
     "chartjs-color-string": {
       "version": "0.5.0",
-      "resolved": "http://localhost:4873/chartjs-color-string/-/chartjs-color-string-0.5.0.tgz",
+      "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"
       }
     },
+    "check-types": {
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/check-types/-/check-types-7.4.0.tgz",
+      "integrity": "sha512-YbulWHdfP99UfZ73NcUDlNJhEIDgm9Doq9GhpyXbF+7Aegi3CVV7qqMCKTTqJxlvEvnQBp9IA+dxsGN6xK/nSg==",
+      "dev": true
+    },
     "chokidar": {
-      "version": "1.7.0",
-      "resolved": "http://localhost:4873/chokidar/-/chokidar-1.7.0.tgz",
-      "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
-      "dev": true,
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
+      "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
       "requires": {
-        "anymatch": "^1.3.0",
+        "anymatch": "^2.0.0",
         "async-each": "^1.0.0",
-        "fsevents": "^1.0.0",
-        "glob-parent": "^2.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": "^2.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"
+        "readdirp": "^2.0.0",
+        "upath": "^1.0.5"
       }
     },
     "chownr": {
       "version": "1.0.1",
-      "resolved": "http://localhost:4873/chownr/-/chownr-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
       "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=",
       "dev": true
     },
+    "chrome-trace-event": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-0.1.3.tgz",
+      "integrity": "sha512-sjndyZHrrWiu4RY7AkHgjn80GfAM2ZSzUkZLV/Js59Ldmh6JDThf0SUmOHU53rFu2rVxxfCzJ30Ukcfch3Gb/A==",
+      "dev": true
+    },
     "ci-env": {
       "version": "1.6.1",
-      "resolved": "http://localhost:4873/ci-env/-/ci-env-1.6.1.tgz",
+      "resolved": "https://registry.npmjs.org/ci-env/-/ci-env-1.6.1.tgz",
       "integrity": "sha512-sH0odjml3wEHLGLtdkrAaWcJxwbKyMUa60zedA+zoBfldhI2K75utVChP5Km8410R82aAw4/nflWBHG30+WlPQ==",
       "dev": true
     },
     "ci-info": {
       "version": "1.1.3",
-      "resolved": "http://localhost:4873/ci-info/-/ci-info-1.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.3.tgz",
       "integrity": "sha512-SK/846h/Rcy8q9Z9CAwGBLfCJ6EkjJWdpelWDufQpqVDYq2Wnnv8zlSO6AMQap02jvhVruKKpEtQOufo3pFhLg==",
       "dev": true
     },
     "cipher-base": {
       "version": "1.0.4",
-      "resolved": "http://localhost:4873/cipher-base/-/cipher-base-1.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
       "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
       "dev": true,
       "requires": {
@@ -3067,73 +2910,21 @@
       }
     },
     "circular-dependency-plugin": {
-      "version": "4.4.0",
-      "resolved": "http://localhost:4873/circular-dependency-plugin/-/circular-dependency-plugin-4.4.0.tgz",
-      "integrity": "sha512-yEFtUNUYT4jBykEX5ZOHw+5goA3glGZr9wAXIQqoyakjz5H5TeUmScnWRc52douAhb9eYzK3s7V6bXfNnjFdzg==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.0.2.tgz",
+      "integrity": "sha512-oC7/DVAyfcY3UWKm0sN/oVoDedQDQiw/vIiAnuTWTpE5s0zWf7l3WY417Xw/Fbi/QbAjctAkxgMiS9P0s3zkmA==",
       "dev": true
     },
     "circular-json": {
-      "version": "0.5.4",
-      "resolved": "http://localhost:4873/circular-json/-/circular-json-0.5.4.tgz",
-      "integrity": "sha512-vnJA8KS0BfOihugYEUkLRcnmq21FbuivbxgzDLXNs3zIk4KllV4Mx4UuTzBXht9F00C7QfD1YqMXg1zP6EXpig==",
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.5.tgz",
+      "integrity": "sha512-13YaR6kiz0kBNmIVM87Io8Hp7bWOo4r61vkEANy8iH9R9bc6avud/1FT0SBpqR1RpIQADOh/Q+yHZDA1iL6ysA==",
       "dev": true
     },
-    "clap": {
-      "version": "1.2.3",
-      "resolved": "http://localhost:4873/clap/-/clap-1.2.3.tgz",
-      "integrity": "sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==",
-      "dev": true,
-      "requires": {
-        "chalk": "^1.1.3"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
-      }
-    },
     "class-utils": {
       "version": "0.3.6",
-      "resolved": "http://localhost:4873/class-utils/-/class-utils-0.3.6.tgz",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
       "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
-      "dev": true,
       "requires": {
         "arr-union": "^3.1.0",
         "define-property": "^0.2.5",
@@ -3143,44 +2934,45 @@
       "dependencies": {
         "define-property": {
           "version": "0.2.5",
-          "resolved": "http://localhost:4873/define-property/-/define-property-0.2.5.tgz",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
           "requires": {
             "is-descriptor": "^0.1.0"
           }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
         }
       }
     },
     "classlist.js": {
       "version": "1.1.20150312",
-      "resolved": "http://localhost:4873/classlist.js/-/classlist.js-1.1.20150312.tgz",
+      "resolved": "https://registry.npmjs.org/classlist.js/-/classlist.js-1.1.20150312.tgz",
       "integrity": "sha1-HXCEL3Ai8I2awIbOaeWyUPLFd4k="
     },
     "clean-css": {
-      "version": "4.1.11",
-      "resolved": "http://localhost:4873/clean-css/-/clean-css-4.1.11.tgz",
-      "integrity": "sha1-Ls3xRaujj1R0DybO/Q/z4D4SXWo=",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz",
+      "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==",
       "dev": true,
       "requires": {
-        "source-map": "0.5.x"
+        "source-map": "~0.6.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
       }
     },
     "cli-boxes": {
       "version": "1.0.0",
-      "resolved": "http://localhost:4873/cli-boxes/-/cli-boxes-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz",
       "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=",
       "dev": true
     },
     "cli-cursor": {
       "version": "2.1.0",
-      "resolved": "http://localhost:4873/cli-cursor/-/cli-cursor-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
       "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
       "dev": true,
       "requires": {
@@ -3189,13 +2981,13 @@
     },
     "cli-width": {
       "version": "2.2.0",
-      "resolved": "http://localhost:4873/cli-width/-/cli-width-2.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
       "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
       "dev": true
     },
     "cliui": {
       "version": "4.1.0",
-      "resolved": "http://localhost:4873/cliui/-/cliui-4.1.0.tgz",
+      "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",
@@ -3204,14 +2996,14 @@
       }
     },
     "clone": {
-      "version": "2.1.1",
-      "resolved": "http://localhost:4873/clone/-/clone-2.1.1.tgz",
-      "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
       "dev": true
     },
     "clone-deep": {
       "version": "2.0.2",
-      "resolved": "http://localhost:4873/clone-deep/-/clone-deep-2.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz",
       "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
       "dev": true,
       "requires": {
@@ -3219,54 +3011,28 @@
         "is-plain-object": "^2.0.4",
         "kind-of": "^6.0.0",
         "shallow-clone": "^1.0.0"
-      },
-      "dependencies": {
-        "for-own": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/for-own/-/for-own-1.0.0.tgz",
-          "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
-          "dev": true,
-          "requires": {
-            "for-in": "^1.0.1"
-          }
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "http://localhost:4873/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
-        }
       }
     },
     "clone-stats": {
       "version": "0.0.1",
-      "resolved": "http://localhost:4873/clone-stats/-/clone-stats-0.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
       "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
       "dev": true
     },
     "co": {
       "version": "4.6.0",
-      "resolved": "http://localhost:4873/co/-/co-4.6.0.tgz",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
       "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
       "dev": true
     },
-    "coa": {
-      "version": "1.0.4",
-      "resolved": "http://localhost:4873/coa/-/coa-1.0.4.tgz",
-      "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=",
-      "dev": true,
-      "requires": {
-        "q": "^1.1.2"
-      }
-    },
     "code-point-at": {
       "version": "1.1.0",
-      "resolved": "http://localhost:4873/code-point-at/-/code-point-at-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
       "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
     },
     "codelyzer": {
       "version": "4.3.0",
-      "resolved": "http://localhost:4873/codelyzer/-/codelyzer-4.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-4.3.0.tgz",
       "integrity": "sha512-RLMrtLwrBS0dfo2/KTP+2NHofCpzcuh0bEp/A/naqvQonbUL4AW/qWQdbpn8dMNudtpmzEx9eS8KEpGdVPg1BA==",
       "dev": true,
       "requires": {
@@ -3280,99 +3046,53 @@
     },
     "coffee-script": {
       "version": "1.12.7",
-      "resolved": "http://localhost:4873/coffee-script/-/coffee-script-1.12.7.tgz",
+      "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz",
       "integrity": "sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==",
       "dev": true
     },
     "collapse-white-space": {
       "version": "1.0.4",
-      "resolved": "http://localhost:4873/collapse-white-space/-/collapse-white-space-1.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.4.tgz",
       "integrity": "sha512-YfQ1tAUZm561vpYD+5eyWN8+UsceQbSrqqlc/6zDY2gtAE+uZLSdkkovhnGpmCThsvKBFakq4EdY/FF93E8XIw==",
       "dev": true
     },
     "collection-visit": {
       "version": "1.0.0",
-      "resolved": "http://localhost:4873/collection-visit/-/collection-visit-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
       "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
-      "dev": true,
       "requires": {
         "map-visit": "^1.0.0",
         "object-visit": "^1.0.0"
       }
     },
-    "color": {
-      "version": "0.11.4",
-      "resolved": "http://localhost:4873/color/-/color-0.11.4.tgz",
-      "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=",
-      "dev": true,
-      "requires": {
-        "clone": "^1.0.2",
-        "color-convert": "^1.3.0",
-        "color-string": "^0.3.0"
-      },
-      "dependencies": {
-        "clone": {
-          "version": "1.0.4",
-          "resolved": "http://localhost:4873/clone/-/clone-1.0.4.tgz",
-          "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
-          "dev": true
-        },
-        "color-convert": {
-          "version": "1.9.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz",
-          "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "^1.1.1"
-          }
-        }
-      }
-    },
     "color-convert": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz",
-      "integrity": "sha1-vbbGnOZg+t/+CwAHzER+G59ygr0="
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz",
+      "integrity": "sha512-3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg==",
+      "requires": {
+        "color-name": "1.1.1"
+      }
     },
     "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-    },
-    "color-string": {
-      "version": "0.3.0",
-      "resolved": "http://localhost:4873/color-string/-/color-string-0.3.0.tgz",
-      "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=",
-      "dev": true,
-      "requires": {
-        "color-name": "^1.0.0"
-      }
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz",
+      "integrity": "sha1-SxQVMEz1ACjqgWQ2Q72C6gWANok="
     },
     "color-support": {
       "version": "1.1.3",
-      "resolved": "http://localhost:4873/color-support/-/color-support-1.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
       "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
       "dev": true
     },
-    "colormin": {
-      "version": "1.1.2",
-      "resolved": "http://localhost:4873/colormin/-/colormin-1.1.2.tgz",
-      "integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=",
-      "dev": true,
-      "requires": {
-        "color": "^0.11.0",
-        "css-color-names": "0.0.4",
-        "has": "^1.0.1"
-      }
-    },
     "colors": {
       "version": "1.1.2",
-      "resolved": "http://localhost:4873/colors/-/colors-1.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
       "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
       "dev": true
     },
     "combine-lists": {
       "version": "1.0.1",
-      "resolved": "http://localhost:4873/combine-lists/-/combine-lists-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz",
       "integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=",
       "dev": true,
       "requires": {
@@ -3381,111 +3101,79 @@
     },
     "combined-stream": {
       "version": "1.0.6",
-      "resolved": "http://localhost:4873/combined-stream/-/combined-stream-1.0.6.tgz",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
       "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
       "requires": {
         "delayed-stream": "~1.0.0"
       }
     },
     "commander": {
-      "version": "2.15.1",
-      "resolved": "http://localhost:4873/commander/-/commander-2.15.1.tgz",
-      "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
+      "version": "2.17.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+      "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
       "dev": true
     },
-    "commenting": {
-      "version": "1.0.5",
-      "resolved": "http://localhost:4873/commenting/-/commenting-1.0.5.tgz",
-      "integrity": "sha512-U7qGbcDLSNpOcV3RQRKHp7hFpy9WUmfawbkPdS4R2RhrSu4dOF85QQpx/Zjcv7uLF6tWSUKEKUIkxknPCrVjwg==",
-      "dev": true
-    },
-    "common-tags": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.7.2.tgz",
-      "integrity": "sha512-joj9ZlUOjCrwdbmiLqafeUSgkUM74NqhLsZtSqDmhKudaIY197zTrb8JMl31fMnCUuxwFT23eC/oWvrZzDLRJQ==",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.26.0"
-      }
-    },
     "commondir": {
       "version": "1.0.1",
-      "resolved": "http://localhost:4873/commondir/-/commondir-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
       "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
       "dev": true
     },
     "compare-versions": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.2.1.tgz",
-      "integrity": "sha512-2y2nHcopMG/NAyk6vWXlLs86XeM9sik4jmx1tKIgzMi9/RQ2eo758RGpxQO3ErihHmg0RlQITPqgz73y6s7quA==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.3.0.tgz",
+      "integrity": "sha512-MAAAIOdi2s4Gl6rZ76PNcUa9IOYB+5ICdT41o5uMRf09aEu/F9RK+qhe8RjXNPwcTjGV7KU7h2P/fljThFVqyQ==",
       "dev": true
     },
     "component-bind": {
       "version": "1.0.0",
-      "resolved": "http://localhost:4873/component-bind/-/component-bind-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
       "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=",
       "dev": true
     },
     "component-emitter": {
       "version": "1.2.1",
-      "resolved": "http://localhost:4873/component-emitter/-/component-emitter-1.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
       "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
     },
     "component-inherit": {
       "version": "0.0.3",
-      "resolved": "http://localhost:4873/component-inherit/-/component-inherit-0.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
       "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=",
       "dev": true
     },
     "compressible": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.13.tgz",
-      "integrity": "sha1-DRAgq5JLL9tNYnmHXH1tq6a6p6k=",
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.14.tgz",
+      "integrity": "sha1-MmxfUH+7BV9UEWeCuWmoG2einac=",
       "dev": true,
       "requires": {
-        "mime-db": ">= 1.33.0 < 2"
+        "mime-db": ">= 1.34.0 < 2"
       }
     },
     "compression": {
-      "version": "1.7.2",
-      "resolved": "http://localhost:4873/compression/-/compression-1.7.2.tgz",
-      "integrity": "sha1-qv+81qr4VLROuygDU9WtFlH1mmk=",
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz",
+      "integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==",
       "dev": true,
       "requires": {
-        "accepts": "~1.3.4",
+        "accepts": "~1.3.5",
         "bytes": "3.0.0",
-        "compressible": "~2.0.13",
+        "compressible": "~2.0.14",
         "debug": "2.6.9",
         "on-headers": "~1.0.1",
-        "safe-buffer": "5.1.1",
+        "safe-buffer": "5.1.2",
         "vary": "~1.1.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "http://localhost:4873/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.1",
-          "resolved": "http://localhost:4873/safe-buffer/-/safe-buffer-5.1.1.tgz",
-          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-          "dev": true
-        }
       }
     },
     "concat-map": {
       "version": "0.0.1",
-      "resolved": "http://localhost:4873/concat-map/-/concat-map-0.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
     "concat-stream": {
       "version": "1.6.2",
-      "resolved": "http://localhost:4873/concat-stream/-/concat-stream-1.6.2.tgz",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
       "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
       "dev": true,
       "requires": {
@@ -3496,69 +3184,28 @@
       }
     },
     "concurrently": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-3.5.1.tgz",
-      "integrity": "sha512-689HrwGw8Rbk1xtV9C4dY6TPJAvIYZbRbnKSAtfJ7tHqICFGoZ0PCWYjxfmerRyxBG0o3sbG3pe7N8vqPwIHuQ==",
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-3.6.1.tgz",
+      "integrity": "sha512-/+ugz+gwFSEfTGUxn0KHkY+19XPRTXR8+7oUK/HxgiN1n7FjeJmkrbSiXAJfyQ0zORgJYPaenmymwon51YXH9Q==",
       "dev": true,
       "requires": {
-        "chalk": "0.5.1",
+        "chalk": "^2.4.1",
         "commander": "2.6.0",
         "date-fns": "^1.23.0",
         "lodash": "^4.5.1",
+        "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"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
-          "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
-          "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
-          "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^1.1.0",
-            "escape-string-regexp": "^1.0.0",
-            "has-ansi": "^0.1.0",
-            "strip-ansi": "^0.3.0",
-            "supports-color": "^0.2.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "0.2.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
-              "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=",
-              "dev": true
-            }
-          }
-        },
         "commander": {
           "version": "2.6.0",
           "resolved": "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz",
           "integrity": "sha1-nfflL7Kgyw+4kFjugMMQQiXzfh0=",
           "dev": true
         },
-        "has-ansi": {
-          "version": "0.1.0",
-          "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
-          "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^0.2.0"
-          }
-        },
         "has-flag": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
@@ -3571,29 +3218,20 @@
           "integrity": "sha1-FPlQpCF9fjXapxu8vljv9o6ksrc=",
           "dev": true
         },
-        "strip-ansi": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
-          "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^0.2.1"
-          }
-        },
         "supports-color": {
           "version": "3.2.3",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
     },
     "config-chain": {
       "version": "1.1.11",
-      "resolved": "http://localhost:4873/config-chain/-/config-chain-1.1.11.tgz",
+      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz",
       "integrity": "sha1-q6CXR9++TD5w52am5BWG4YWfxvI=",
       "dev": true,
       "requires": {
@@ -3603,7 +3241,7 @@
     },
     "configstore": {
       "version": "3.1.2",
-      "resolved": "http://localhost:4873/configstore/-/configstore-3.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz",
       "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==",
       "dev": true,
       "requires": {
@@ -3617,7 +3255,7 @@
     },
     "connect": {
       "version": "3.6.6",
-      "resolved": "http://localhost:4873/connect/-/connect-3.6.6.tgz",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
       "integrity": "sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=",
       "dev": true,
       "requires": {
@@ -3627,18 +3265,9 @@
         "utils-merge": "1.0.1"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "http://localhost:4873/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
         "finalhandler": {
           "version": "1.1.0",
-          "resolved": "http://localhost:4873/finalhandler/-/finalhandler-1.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
           "integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
           "dev": true,
           "requires": {
@@ -3653,7 +3282,7 @@
         },
         "statuses": {
           "version": "1.3.1",
-          "resolved": "http://localhost:4873/statuses/-/statuses-1.3.1.tgz",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
           "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
           "dev": true
         }
@@ -3661,13 +3290,13 @@
     },
     "connect-history-api-fallback": {
       "version": "1.5.0",
-      "resolved": "http://localhost:4873/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz",
       "integrity": "sha1-sGhzk0vF40T+9hGhlqb6rgruAVo=",
       "dev": true
     },
     "console-browserify": {
       "version": "1.1.0",
-      "resolved": "http://localhost:4873/console-browserify/-/console-browserify-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
       "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
       "dev": true,
       "requires": {
@@ -3676,43 +3305,43 @@
     },
     "console-control-strings": {
       "version": "1.1.0",
-      "resolved": "http://localhost:4873/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
       "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
       "dev": true
     },
     "constants-browserify": {
       "version": "1.0.0",
-      "resolved": "http://localhost:4873/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
       "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
       "dev": true
     },
     "content-disposition": {
       "version": "0.5.2",
-      "resolved": "http://localhost:4873/content-disposition/-/content-disposition-0.5.2.tgz",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
       "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=",
       "dev": true
     },
     "content-type": {
       "version": "1.0.4",
-      "resolved": "http://localhost:4873/content-type/-/content-type-1.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
       "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
       "dev": true
     },
     "convert-source-map": {
       "version": "1.5.1",
-      "resolved": "http://localhost:4873/convert-source-map/-/convert-source-map-1.5.1.tgz",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz",
       "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=",
       "dev": true
     },
     "cookie": {
       "version": "0.3.1",
-      "resolved": "http://localhost:4873/cookie/-/cookie-0.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
       "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
       "dev": true
     },
     "cookie-signature": {
       "version": "1.0.6",
-      "resolved": "http://localhost:4873/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
       "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
       "dev": true
     },
@@ -3723,7 +3352,7 @@
     },
     "copy-concurrently": {
       "version": "1.0.5",
-      "resolved": "http://localhost:4873/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
+      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
       "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
       "dev": true,
       "requires": {
@@ -3737,169 +3366,50 @@
     },
     "copy-descriptor": {
       "version": "0.1.1",
-      "resolved": "http://localhost:4873/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
-      "dev": true
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
     },
     "copy-webpack-plugin": {
-      "version": "4.0.1",
-      "resolved": "http://localhost:4873/copy-webpack-plugin/-/copy-webpack-plugin-4.0.1.tgz",
-      "integrity": "sha1-lyjjg7lDFgUNDHRjlY8rhcCqggA=",
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.5.2.tgz",
+      "integrity": "sha512-zmC33E8FFSq3AbflTvqvPvBo621H36Afsxlui91d+QyZxPIuXghfnTsa1CuqiAaCPgJoSUWfTFbKJnadZpKEbQ==",
       "dev": true,
       "requires": {
-        "bluebird": "^2.10.2",
-        "fs-extra": "^0.26.4",
-        "glob": "^6.0.4",
-        "is-glob": "^3.1.0",
-        "loader-utils": "^0.2.15",
-        "lodash": "^4.3.0",
-        "minimatch": "^3.0.0",
-        "node-dir": "^0.1.10"
-      },
-      "dependencies": {
-        "bluebird": {
-          "version": "2.11.0",
-          "resolved": "http://localhost:4873/bluebird/-/bluebird-2.11.0.tgz",
-          "integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=",
-          "dev": true
-        },
-        "fs-extra": {
-          "version": "0.26.7",
-          "resolved": "http://localhost:4873/fs-extra/-/fs-extra-0.26.7.tgz",
-          "integrity": "sha1-muH92UiXeY7at20JGM9C0MMYT6k=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^2.1.0",
-            "klaw": "^1.0.0",
-            "path-is-absolute": "^1.0.0",
-            "rimraf": "^2.2.8"
-          }
-        },
-        "glob": {
-          "version": "6.0.4",
-          "resolved": "http://localhost:4873/glob/-/glob-6.0.4.tgz",
-          "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
-          "dev": true,
-          "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "is-extglob": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/is-extglob/-/is-extglob-2.1.1.tgz",
-          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "3.1.0",
-          "resolved": "http://localhost:4873/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.0"
-          }
-        },
-        "jsonfile": {
-          "version": "2.4.0",
-          "resolved": "http://localhost:4873/jsonfile/-/jsonfile-2.4.0.tgz",
-          "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.6"
-          }
-        },
-        "loader-utils": {
-          "version": "0.2.17",
-          "resolved": "http://localhost:4873/loader-utils/-/loader-utils-0.2.17.tgz",
-          "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"
-          }
-        }
+        "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"
       }
     },
     "core-js": {
-      "version": "2.4.1",
-      "resolved": "http://localhost:4873/core-js/-/core-js-2.4.1.tgz",
-      "integrity": "sha1-TekR5mew6ukSTjQlS1OupvxhjT4="
-    },
-    "core-object": {
-      "version": "3.1.5",
-      "resolved": "http://localhost:4873/core-object/-/core-object-3.1.5.tgz",
-      "integrity": "sha512-sA2/4+/PZ/KV6CKgjrVrrUVBKCkdDO02CUlQ0YKTQoYUwPYNOtOAcWlbYhd5v/1JqYaA6oZ4sDlOU4ppVw6Wbg==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.0.0"
-      }
+      "version": "2.5.7",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
+      "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw=="
     },
     "core-util-is": {
       "version": "1.0.2",
-      "resolved": "http://localhost:4873/core-util-is/-/core-util-is-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "cosmiconfig": {
-      "version": "2.2.2",
-      "resolved": "http://localhost:4873/cosmiconfig/-/cosmiconfig-2.2.2.tgz",
-      "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz",
+      "integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
       "dev": true,
       "requires": {
         "is-directory": "^0.3.1",
-        "js-yaml": "^3.4.3",
-        "minimist": "^1.2.0",
-        "object-assign": "^4.1.0",
-        "os-homedir": "^1.0.1",
-        "parse-json": "^2.2.0",
-        "require-from-string": "^1.1.0"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "http://localhost:4873/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        },
-        "parse-json": {
-          "version": "2.2.0",
-          "resolved": "http://localhost:4873/parse-json/-/parse-json-2.2.0.tgz",
-          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-          "dev": true,
-          "requires": {
-            "error-ex": "^1.2.0"
-          }
-        }
-      }
-    },
-    "cpx": {
-      "version": "1.5.0",
-      "resolved": "http://localhost:4873/cpx/-/cpx-1.5.0.tgz",
-      "integrity": "sha1-GFvgGFEdhycN7czCkxceN2VauI8=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.9.2",
-        "chokidar": "^1.6.0",
-        "duplexer": "^0.1.1",
-        "glob": "^7.0.5",
-        "glob2base": "^0.0.12",
-        "minimatch": "^3.0.2",
-        "mkdirp": "^0.5.1",
-        "resolve": "^1.1.7",
-        "safe-buffer": "^5.0.1",
-        "shell-quote": "^1.6.1",
-        "subarg": "^1.0.0"
+        "js-yaml": "^3.9.0",
+        "parse-json": "^4.0.0",
+        "require-from-string": "^2.0.1"
       }
     },
     "create-ecdh": {
       "version": "4.0.3",
-      "resolved": "http://localhost:4873/create-ecdh/-/create-ecdh-4.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
       "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
       "dev": true,
       "requires": {
@@ -3909,7 +3419,7 @@
     },
     "create-error-class": {
       "version": "3.0.2",
-      "resolved": "http://localhost:4873/create-error-class/-/create-error-class-3.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
       "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
       "dev": true,
       "requires": {
@@ -3918,7 +3428,7 @@
     },
     "create-hash": {
       "version": "1.2.0",
-      "resolved": "http://localhost:4873/create-hash/-/create-hash-1.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
       "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
       "dev": true,
       "requires": {
@@ -3931,7 +3441,7 @@
     },
     "create-hmac": {
       "version": "1.1.7",
-      "resolved": "http://localhost:4873/create-hmac/-/create-hmac-1.1.7.tgz",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
       "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
       "dev": true,
       "requires": {
@@ -3943,27 +3453,9 @@
         "sha.js": "^2.4.8"
       }
     },
-    "cross-fetch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-2.0.0.tgz",
-      "integrity": "sha512-gnx0GnDyW73iDq6DpqceL8i4GGn55PPKDzNwZkopJ3mKPcfJ0BUIXBsnYfJBVw+jFDB+hzIp2ELNRdqoxN6M3w==",
-      "dev": true,
-      "requires": {
-        "node-fetch": "2.0.0",
-        "whatwg-fetch": "2.0.3"
-      },
-      "dependencies": {
-        "node-fetch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.0.0.tgz",
-          "integrity": "sha1-mCu6Q+zU8pIqKcwYamu7C7c/y6Y=",
-          "dev": true
-        }
-      }
-    },
     "cross-spawn": {
       "version": "5.1.0",
-      "resolved": "http://localhost:4873/cross-spawn/-/cross-spawn-5.1.0.tgz",
+      "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",
@@ -3973,7 +3465,7 @@
     },
     "cryptiles": {
       "version": "2.0.5",
-      "resolved": "http://localhost:4873/cryptiles/-/cryptiles-2.0.5.tgz",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
       "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
       "dev": true,
       "requires": {
@@ -3982,7 +3474,7 @@
     },
     "crypto-browserify": {
       "version": "3.12.0",
-      "resolved": "http://localhost:4873/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
       "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
       "dev": true,
       "requires": {
@@ -4001,145 +3493,19 @@
     },
     "crypto-random-string": {
       "version": "1.0.0",
-      "resolved": "http://localhost:4873/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
       "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=",
       "dev": true
     },
-    "css-color-names": {
-      "version": "0.0.4",
-      "resolved": "http://localhost:4873/css-color-names/-/css-color-names-0.0.4.tgz",
-      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
-      "dev": true
-    },
-    "css-loader": {
-      "version": "0.25.0",
-      "resolved": "http://localhost:4873/css-loader/-/css-loader-0.25.0.tgz",
-      "integrity": "sha1-w/68jOKPTINXa2sTcH9H+Qw5AiM=",
-      "dev": true,
-      "requires": {
-        "babel-code-frame": "^6.11.0",
-        "css-selector-tokenizer": "^0.6.0",
-        "cssnano": ">=2.6.1 <4",
-        "loader-utils": "~0.2.2",
-        "lodash.camelcase": "^3.0.1",
-        "object-assign": "^4.0.1",
-        "postcss": "^5.0.6",
-        "postcss-modules-extract-imports": "^1.0.0",
-        "postcss-modules-local-by-default": "^1.0.1",
-        "postcss-modules-scope": "^1.0.0",
-        "postcss-modules-values": "^1.1.0",
-        "source-list-map": "^0.1.4"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "css-selector-tokenizer": {
-          "version": "0.6.0",
-          "resolved": "http://localhost:4873/css-selector-tokenizer/-/css-selector-tokenizer-0.6.0.tgz",
-          "integrity": "sha1-ZEX1gseTDSQdzFAHpD1vy48HMVI=",
-          "dev": true,
-          "requires": {
-            "cssesc": "^0.1.0",
-            "fastparse": "^1.1.1",
-            "regexpu-core": "^1.0.0"
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "loader-utils": {
-          "version": "0.2.17",
-          "resolved": "http://localhost:4873/loader-utils/-/loader-utils-0.2.17.tgz",
-          "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"
-          }
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://localhost:4873/postcss/-/postcss-5.2.18.tgz",
-          "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"
-          }
-        },
-        "source-list-map": {
-          "version": "0.1.8",
-          "resolved": "http://localhost:4873/source-list-map/-/source-list-map-0.1.8.tgz",
-          "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
     "css-parse": {
       "version": "1.7.0",
-      "resolved": "http://localhost:4873/css-parse/-/css-parse-1.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz",
       "integrity": "sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=",
       "dev": true
     },
     "css-select": {
       "version": "1.2.0",
-      "resolved": "http://localhost:4873/css-select/-/css-select-1.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
       "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
       "dev": true,
       "requires": {
@@ -4151,189 +3517,42 @@
     },
     "css-selector-tokenizer": {
       "version": "0.7.0",
-      "resolved": "http://localhost:4873/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz",
       "integrity": "sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=",
-      "dev": true,
       "requires": {
         "cssesc": "^0.1.0",
         "fastparse": "^1.1.1",
         "regexpu-core": "^1.0.0"
       }
     },
-    "css-to-string-loader": {
-      "version": "0.1.2",
-      "resolved": "http://localhost:4873/css-to-string-loader/-/css-to-string-loader-0.1.2.tgz",
-      "integrity": "sha1-t/8B3Xj7veaYuFmVUj9hG+onaAk=",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^0.2.15"
-      },
-      "dependencies": {
-        "loader-utils": {
-          "version": "0.2.17",
-          "resolved": "http://localhost:4873/loader-utils/-/loader-utils-0.2.17.tgz",
-          "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"
-          }
-        }
-      }
-    },
     "css-what": {
       "version": "2.1.0",
-      "resolved": "http://localhost:4873/css-what/-/css-what-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz",
       "integrity": "sha1-lGfQMsOM+u+58teVASUwYvh/ob0=",
       "dev": true
     },
     "cssauron": {
       "version": "1.4.0",
-      "resolved": "http://localhost:4873/cssauron/-/cssauron-1.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz",
       "integrity": "sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=",
-      "dev": true,
       "requires": {
         "through": "X.X.X"
       }
     },
     "cssesc": {
       "version": "0.1.0",
-      "resolved": "http://localhost:4873/cssesc/-/cssesc-0.1.0.tgz",
-      "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=",
-      "dev": true
-    },
-    "cssnano": {
-      "version": "3.8.1",
-      "resolved": "http://localhost:4873/cssnano/-/cssnano-3.8.1.tgz",
-      "integrity": "sha1-AIpIIUjulIzwry7m5EvZfFP4huw=",
-      "dev": true,
-      "requires": {
-        "autoprefixer": "^6.3.1",
-        "decamelize": "^1.1.2",
-        "defined": "^1.0.0",
-        "has": "^1.0.1",
-        "object-assign": "^4.0.1",
-        "postcss": "^5.0.14",
-        "postcss-calc": "^5.2.0",
-        "postcss-colormin": "^2.1.8",
-        "postcss-convert-values": "^2.3.4",
-        "postcss-discard-comments": "^2.0.4",
-        "postcss-discard-duplicates": "^2.0.1",
-        "postcss-discard-empty": "^2.0.1",
-        "postcss-discard-overridden": "^0.1.1",
-        "postcss-discard-unused": "^2.2.1",
-        "postcss-filter-plugins": "^2.0.0",
-        "postcss-merge-idents": "^2.1.5",
-        "postcss-merge-longhand": "^2.0.1",
-        "postcss-merge-rules": "^2.0.3",
-        "postcss-minify-font-values": "^1.0.2",
-        "postcss-minify-gradients": "^1.0.1",
-        "postcss-minify-params": "^1.0.4",
-        "postcss-minify-selectors": "^2.0.4",
-        "postcss-normalize-charset": "^1.1.0",
-        "postcss-normalize-url": "^3.0.7",
-        "postcss-ordered-values": "^2.1.0",
-        "postcss-reduce-idents": "^2.2.2",
-        "postcss-reduce-initial": "^1.0.0",
-        "postcss-reduce-transforms": "^1.0.3",
-        "postcss-svgo": "^2.1.1",
-        "postcss-unique-selectors": "^2.0.2",
-        "postcss-value-parser": "^3.2.3",
-        "postcss-zindex": "^2.0.1"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://localhost:4873/postcss/-/postcss-5.2.18.tgz",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "csso": {
-      "version": "2.3.2",
-      "resolved": "http://localhost:4873/csso/-/csso-2.3.2.tgz",
-      "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=",
-      "dev": true,
-      "requires": {
-        "clap": "^1.0.9",
-        "source-map": "^0.5.3"
-      }
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz",
+      "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q="
     },
     "cuint": {
       "version": "0.2.2",
-      "resolved": "http://localhost:4873/cuint/-/cuint-0.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz",
       "integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=",
       "dev": true
     },
     "currently-unhandled": {
       "version": "0.4.1",
-      "resolved": "http://localhost:4873/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
       "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
       "dev": true,
       "requires": {
@@ -4342,18 +3561,18 @@
     },
     "custom-event": {
       "version": "1.0.1",
-      "resolved": "http://localhost:4873/custom-event/-/custom-event-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
       "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=",
       "dev": true
     },
     "custom-event-polyfill": {
       "version": "0.3.0",
-      "resolved": "http://localhost:4873/custom-event-polyfill/-/custom-event-polyfill-0.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/custom-event-polyfill/-/custom-event-polyfill-0.3.0.tgz",
       "integrity": "sha1-mYB4Ob5i7bRGtkWDLg2A6tb6GIg="
     },
     "cyclist": {
       "version": "0.2.2",
-      "resolved": "http://localhost:4873/cyclist/-/cyclist-0.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
       "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
       "dev": true
     },
@@ -4367,49 +3586,41 @@
     },
     "dashdash": {
       "version": "1.14.1",
-      "resolved": "http://localhost:4873/dashdash/-/dashdash-1.14.1.tgz",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
       "dev": true,
       "requires": {
         "assert-plus": "^1.0.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
-        }
       }
     },
     "data-uri-to-buffer": {
       "version": "1.2.0",
-      "resolved": "http://localhost:4873/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz",
       "integrity": "sha512-vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ==",
       "dev": true,
       "optional": true
     },
     "date-fns": {
       "version": "1.29.0",
-      "resolved": "http://localhost:4873/date-fns/-/date-fns-1.29.0.tgz",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.29.0.tgz",
       "integrity": "sha512-lbTXWZ6M20cWH8N9S6afb0SBm6tMk+uUg6z3MqHPKE9atmsY3kJkTm8vKe93izJ2B2+q5MV990sM2CHgtAZaOw==",
       "dev": true
     },
     "date-format": {
       "version": "1.2.0",
-      "resolved": "http://localhost:4873/date-format/-/date-format-1.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/date-format/-/date-format-1.2.0.tgz",
       "integrity": "sha1-YV6CjiM90aubua4JUODOzPpuytg=",
       "dev": true
     },
     "date-now": {
       "version": "0.1.4",
-      "resolved": "http://localhost:4873/date-now/-/date-now-0.1.4.tgz",
+      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
       "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
       "dev": true
     },
     "dateformat": {
       "version": "1.0.12",
-      "resolved": "http://localhost:4873/dateformat/-/dateformat-1.0.12.tgz",
+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
       "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
       "dev": true,
       "requires": {
@@ -4418,65 +3629,53 @@
       }
     },
     "debug": {
-      "version": "3.1.0",
-      "resolved": "http://localhost:4873/debug/-/debug-3.1.0.tgz",
-      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "requires": {
         "ms": "2.0.0"
       }
     },
     "decamelize": {
       "version": "1.2.0",
-      "resolved": "http://localhost:4873/decamelize/-/decamelize-1.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
       "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
     },
     "decode-uri-component": {
       "version": "0.2.0",
-      "resolved": "http://localhost:4873/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
-      "dev": true
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
     },
     "deep-equal": {
       "version": "1.0.1",
-      "resolved": "http://localhost:4873/deep-equal/-/deep-equal-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
       "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
       "dev": true
     },
     "deep-extend": {
-      "version": "0.4.2",
-      "resolved": "http://localhost:4873/deep-extend/-/deep-extend-0.4.2.tgz",
-      "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=",
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz",
+      "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==",
       "dev": true
     },
     "deep-is": {
       "version": "0.1.3",
-      "resolved": "http://localhost:4873/deep-is/-/deep-is-0.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
       "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
       "dev": true
     },
     "default-require-extensions": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/default-require-extensions/-/default-require-extensions-1.0.0.tgz",
-      "integrity": "sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-2.0.0.tgz",
+      "integrity": "sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=",
       "dev": true,
       "requires": {
-        "strip-bom": "^2.0.0"
-      },
-      "dependencies": {
-        "strip-bom": {
-          "version": "2.0.0",
-          "resolved": "http://localhost:4873/strip-bom/-/strip-bom-2.0.0.tgz",
-          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-          "dev": true,
-          "requires": {
-            "is-utf8": "^0.2.0"
-          }
-        }
+        "strip-bom": "^3.0.0"
       }
     },
     "define-properties": {
       "version": "1.1.2",
-      "resolved": "http://localhost:4873/define-properties/-/define-properties-1.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
       "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
       "requires": {
         "foreach": "^2.0.5",
@@ -4485,9 +3684,8 @@
     },
     "define-property": {
       "version": "2.0.2",
-      "resolved": "http://localhost:4873/define-property/-/define-property-2.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
       "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-      "dev": true,
       "requires": {
         "is-descriptor": "^1.0.2",
         "isobject": "^3.0.1"
@@ -4495,56 +3693,35 @@
       "dependencies": {
         "is-accessor-descriptor": {
           "version": "1.0.0",
-          "resolved": "http://localhost:4873/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
         },
         "is-data-descriptor": {
           "version": "1.0.0",
-          "resolved": "http://localhost:4873/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
         },
         "is-descriptor": {
           "version": "1.0.2",
-          "resolved": "http://localhost:4873/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
             "kind-of": "^6.0.2"
           }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "http://localhost:4873/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
         }
       }
     },
-    "defined": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/defined/-/defined-1.0.0.tgz",
-      "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
-      "dev": true
-    },
     "degenerator": {
       "version": "1.0.4",
-      "resolved": "http://localhost:4873/degenerator/-/degenerator-1.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-1.0.4.tgz",
       "integrity": "sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU=",
       "dev": true,
       "optional": true,
@@ -4556,7 +3733,7 @@
       "dependencies": {
         "esprima": {
           "version": "3.1.3",
-          "resolved": "http://localhost:4873/esprima/-/esprima-3.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
           "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
           "dev": true,
           "optional": true
@@ -4565,7 +3742,7 @@
     },
     "del": {
       "version": "3.0.0",
-      "resolved": "http://localhost:4873/del/-/del-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
       "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
       "dev": true,
       "requires": {
@@ -4579,7 +3756,7 @@
       "dependencies": {
         "globby": {
           "version": "6.1.0",
-          "resolved": "http://localhost:4873/globby/-/globby-6.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
           "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
           "dev": true,
           "requires": {
@@ -4592,7 +3769,7 @@
           "dependencies": {
             "pify": {
               "version": "2.3.0",
-              "resolved": "http://localhost:4873/pify/-/pify-2.3.0.tgz",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
               "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
               "dev": true
             }
@@ -4602,30 +3779,24 @@
     },
     "delayed-stream": {
       "version": "1.0.0",
-      "resolved": "http://localhost:4873/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
     "delegates": {
       "version": "1.0.0",
-      "resolved": "http://localhost:4873/delegates/-/delegates-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
       "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
       "dev": true
     },
-    "denodeify": {
-      "version": "1.2.1",
-      "resolved": "http://localhost:4873/denodeify/-/denodeify-1.2.1.tgz",
-      "integrity": "sha1-OjYof1A05pnnV3kBBSwubJQlFjE=",
-      "dev": true
-    },
     "depd": {
       "version": "1.1.2",
-      "resolved": "http://localhost:4873/depd/-/depd-1.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
       "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
       "dev": true
     },
     "des.js": {
       "version": "1.0.0",
-      "resolved": "http://localhost:4873/des.js/-/des.js-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
       "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
       "dev": true,
       "requires": {
@@ -4635,13 +3806,13 @@
     },
     "destroy": {
       "version": "1.0.4",
-      "resolved": "http://localhost:4873/destroy/-/destroy-1.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
       "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
       "dev": true
     },
     "detect-indent": {
       "version": "4.0.0",
-      "resolved": "http://localhost:4873/detect-indent/-/detect-indent-4.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
       "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
       "dev": true,
       "requires": {
@@ -4650,31 +3821,37 @@
     },
     "detect-node": {
       "version": "2.0.3",
-      "resolved": "http://localhost:4873/detect-node/-/detect-node-2.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.3.tgz",
       "integrity": "sha1-ogM8CcyOFY03dI+951B4Mr1s4Sc=",
       "dev": true
     },
     "di": {
       "version": "0.0.1",
-      "resolved": "http://localhost:4873/di/-/di-0.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
       "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
       "dev": true
     },
     "diacritics-map": {
       "version": "0.1.0",
-      "resolved": "http://localhost:4873/diacritics-map/-/diacritics-map-0.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/diacritics-map/-/diacritics-map-0.1.0.tgz",
       "integrity": "sha1-bfwP+dAQAKLt8oZTccrDFulJd68=",
       "dev": true
     },
     "diff": {
       "version": "3.5.0",
-      "resolved": "http://localhost:4873/diff/-/diff-3.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
       "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
       "dev": true
     },
+    "diff_match_patch": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/diff_match_patch/-/diff_match_patch-0.1.1.tgz",
+      "integrity": "sha1-0/FNW3b7S1qc9EcGJh2ttb2X7bw=",
+      "dev": true
+    },
     "diffie-hellman": {
       "version": "5.0.3",
-      "resolved": "http://localhost:4873/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
       "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
       "dev": true,
       "requires": {
@@ -4685,7 +3862,7 @@
     },
     "dir-glob": {
       "version": "2.0.0",
-      "resolved": "http://localhost:4873/dir-glob/-/dir-glob-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
       "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
       "dev": true,
       "requires": {
@@ -4695,13 +3872,13 @@
     },
     "dns-equal": {
       "version": "1.0.0",
-      "resolved": "http://localhost:4873/dns-equal/-/dns-equal-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
       "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=",
       "dev": true
     },
     "dns-packet": {
       "version": "1.3.1",
-      "resolved": "http://localhost:4873/dns-packet/-/dns-packet-1.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
       "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
       "dev": true,
       "requires": {
@@ -4711,7 +3888,7 @@
     },
     "dns-txt": {
       "version": "2.0.2",
-      "resolved": "http://localhost:4873/dns-txt/-/dns-txt-2.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
       "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
       "dev": true,
       "requires": {
@@ -4720,7 +3897,7 @@
     },
     "dom-converter": {
       "version": "0.1.4",
-      "resolved": "http://localhost:4873/dom-converter/-/dom-converter-0.1.4.tgz",
+      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.1.4.tgz",
       "integrity": "sha1-pF71cnuJDJv/5tfIduexnLDhfzs=",
       "dev": true,
       "requires": {
@@ -4729,7 +3906,7 @@
       "dependencies": {
         "utila": {
           "version": "0.3.3",
-          "resolved": "http://localhost:4873/utila/-/utila-0.3.3.tgz",
+          "resolved": "https://registry.npmjs.org/utila/-/utila-0.3.3.tgz",
           "integrity": "sha1-1+jn1+MJEHCSsF+NloiCTWM6QiY=",
           "dev": true
         }
@@ -4737,7 +3914,7 @@
     },
     "dom-serialize": {
       "version": "2.2.1",
-      "resolved": "http://localhost:4873/dom-serialize/-/dom-serialize-2.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
       "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
       "dev": true,
       "requires": {
@@ -4749,7 +3926,7 @@
     },
     "dom-serializer": {
       "version": "0.1.0",
-      "resolved": "http://localhost:4873/dom-serializer/-/dom-serializer-0.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
       "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
       "dev": true,
       "requires": {
@@ -4759,7 +3936,7 @@
       "dependencies": {
         "domelementtype": {
           "version": "1.1.3",
-          "resolved": "http://localhost:4873/domelementtype/-/domelementtype-1.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
           "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
           "dev": true
         }
@@ -4767,19 +3944,19 @@
     },
     "domain-browser": {
       "version": "1.2.0",
-      "resolved": "http://localhost:4873/domain-browser/-/domain-browser-1.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
       "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
       "dev": true
     },
     "domelementtype": {
       "version": "1.3.0",
-      "resolved": "http://localhost:4873/domelementtype/-/domelementtype-1.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
       "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=",
       "dev": true
     },
     "domhandler": {
       "version": "2.1.0",
-      "resolved": "http://localhost:4873/domhandler/-/domhandler-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.1.0.tgz",
       "integrity": "sha1-0mRvXlf2w7qxHPbLBdPArPdBJZQ=",
       "dev": true,
       "requires": {
@@ -4788,7 +3965,7 @@
     },
     "domutils": {
       "version": "1.5.1",
-      "resolved": "http://localhost:4873/domutils/-/domutils-1.5.1.tgz",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
       "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
       "dev": true,
       "requires": {
@@ -4798,7 +3975,7 @@
     },
     "dot-prop": {
       "version": "4.2.0",
-      "resolved": "http://localhost:4873/dot-prop/-/dot-prop-4.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
       "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
       "dev": true,
       "requires": {
@@ -4807,19 +3984,19 @@
     },
     "double-ended-queue": {
       "version": "2.1.0-0",
-      "resolved": "http://localhost:4873/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz",
+      "resolved": "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz",
       "integrity": "sha1-ED01J/0xUo9AGIEwyEHv3XgmTlw=",
       "dev": true,
       "optional": true
     },
     "duplexer": {
       "version": "0.1.1",
-      "resolved": "http://localhost:4873/duplexer/-/duplexer-0.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
       "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E="
     },
     "duplexer2": {
       "version": "0.0.2",
-      "resolved": "http://localhost:4873/duplexer2/-/duplexer2-0.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
       "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
       "dev": true,
       "requires": {
@@ -4828,13 +4005,13 @@
       "dependencies": {
         "isarray": {
           "version": "0.0.1",
-          "resolved": "http://localhost:4873/isarray/-/isarray-0.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
           "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
           "dev": true
         },
         "readable-stream": {
           "version": "1.1.14",
-          "resolved": "http://localhost:4873/readable-stream/-/readable-stream-1.1.14.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
           "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
           "dev": true,
           "requires": {
@@ -4846,7 +4023,7 @@
         },
         "string_decoder": {
           "version": "0.10.31",
-          "resolved": "http://localhost:4873/string_decoder/-/string_decoder-0.10.31.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
           "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
           "dev": true
         }
@@ -4854,13 +4031,13 @@
     },
     "duplexer3": {
       "version": "0.1.4",
-      "resolved": "http://localhost:4873/duplexer3/-/duplexer3-0.1.4.tgz",
+      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
       "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
       "dev": true
     },
     "duplexify": {
       "version": "3.6.0",
-      "resolved": "http://localhost:4873/duplexify/-/duplexify-3.6.0.tgz",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz",
       "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==",
       "dev": true,
       "requires": {
@@ -4871,18 +4048,19 @@
       }
     },
     "ecc-jsbn": {
-      "version": "0.1.1",
-      "resolved": "http://localhost:4873/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
       "dev": true,
       "optional": true,
       "requires": {
-        "jsbn": "~0.1.0"
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
       }
     },
     "editorconfig": {
       "version": "0.13.3",
-      "resolved": "http://localhost:4873/editorconfig/-/editorconfig-0.13.3.tgz",
+      "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.3.tgz",
       "integrity": "sha512-WkjsUNVCu+ITKDj73QDvi0trvpdDWdkDyHybDGSXPfekLCqwmpD7CP7iPbvBgosNuLcI96XTDwNa75JyFl7tEQ==",
       "dev": true,
       "requires": {
@@ -4895,7 +4073,7 @@
       "dependencies": {
         "lru-cache": {
           "version": "3.2.0",
-          "resolved": "http://localhost:4873/lru-cache/-/lru-cache-3.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz",
           "integrity": "sha1-cXibO39Tmb7IVl3aOKow0qCX7+4=",
           "dev": true,
           "requires": {
@@ -4906,25 +4084,25 @@
     },
     "ee-first": {
       "version": "1.1.1",
-      "resolved": "http://localhost:4873/ee-first/-/ee-first-1.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
       "dev": true
     },
     "ejs": {
       "version": "2.6.1",
-      "resolved": "http://localhost:4873/ejs/-/ejs-2.6.1.tgz",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.6.1.tgz",
       "integrity": "sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==",
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.48",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.48.tgz",
-      "integrity": "sha1-07DYWTgUBE4JLs4hCPw6ya6kuQA=",
+      "version": "1.3.55",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.55.tgz",
+      "integrity": "sha1-8VDhCyC3fZ1Br8yjEu/gw7Gn/c4=",
       "dev": true
     },
     "elliptic": {
       "version": "6.4.0",
-      "resolved": "http://localhost:4873/elliptic/-/elliptic-6.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz",
       "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=",
       "dev": true,
       "requires": {
@@ -4937,32 +4115,26 @@
         "minimalistic-crypto-utils": "^1.0.0"
       }
     },
-    "ember-cli-string-utils": {
-      "version": "1.1.0",
-      "resolved": "http://localhost:4873/ember-cli-string-utils/-/ember-cli-string-utils-1.1.0.tgz",
-      "integrity": "sha1-ObZ3/CgF9VFzc1N2/O8njqpEUqE=",
-      "dev": true
-    },
     "emoji-regex": {
       "version": "6.1.1",
-      "resolved": "http://localhost:4873/emoji-regex/-/emoji-regex-6.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.1.tgz",
       "integrity": "sha1-xs0OwbBkLio8Z6ETfvxeeW2k+I4=",
       "dev": true
     },
     "emojis-list": {
       "version": "2.1.0",
-      "resolved": "http://localhost:4873/emojis-list/-/emojis-list-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
       "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k="
     },
     "encodeurl": {
       "version": "1.0.2",
-      "resolved": "http://localhost:4873/encodeurl/-/encodeurl-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
       "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
       "dev": true
     },
     "encoding": {
       "version": "0.1.12",
-      "resolved": "http://localhost:4873/encoding/-/encoding-0.1.12.tgz",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
       "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
       "dev": true,
       "requires": {
@@ -4971,7 +4143,7 @@
     },
     "end-of-stream": {
       "version": "1.4.1",
-      "resolved": "http://localhost:4873/end-of-stream/-/end-of-stream-1.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
       "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
       "dev": true,
       "requires": {
@@ -4980,7 +4152,7 @@
     },
     "engine.io": {
       "version": "3.1.5",
-      "resolved": "http://localhost:4873/engine.io/-/engine.io-3.1.5.tgz",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.1.5.tgz",
       "integrity": "sha512-D06ivJkYxyRrcEe0bTpNnBQNgP9d3xog+qZlLbui8EsMr/DouQpf5o9FzJnWYHEYE0YsFHllUv2R1dkgYZXHcA==",
       "dev": true,
       "requires": {
@@ -4991,11 +4163,22 @@
         "engine.io-parser": "~2.1.0",
         "uws": "~9.14.0",
         "ws": "~3.3.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
       }
     },
     "engine.io-client": {
       "version": "3.1.6",
-      "resolved": "http://localhost:4873/engine.io-client/-/engine.io-client-3.1.6.tgz",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.6.tgz",
       "integrity": "sha512-hnuHsFluXnsKOndS4Hv6SvUrgdYx1pk2NqfaDMW+GWdgfU3+/V25Cj7I8a0x92idSpa5PIhJRKxPvp9mnoLsfg==",
       "dev": true,
       "requires": {
@@ -5010,11 +4193,22 @@
         "ws": "~3.3.1",
         "xmlhttprequest-ssl": "~1.5.4",
         "yeast": "0.1.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
       }
     },
     "engine.io-parser": {
       "version": "2.1.2",
-      "resolved": "http://localhost:4873/engine.io-parser/-/engine.io-parser-2.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.2.tgz",
       "integrity": "sha512-dInLFzr80RijZ1rGpx1+56/uFoH7/7InhH3kZt+Ms6hT8tNx3NGW/WNSA/f8As1WkOfkuyb3tnRyuXGxusclMw==",
       "dev": true,
       "requires": {
@@ -5026,32 +4220,31 @@
       }
     },
     "enhanced-resolve": {
-      "version": "3.4.1",
-      "resolved": "http://localhost:4873/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz",
-      "integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz",
+      "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.2",
         "memory-fs": "^0.4.0",
-        "object-assign": "^4.0.1",
-        "tapable": "^0.2.7"
+        "tapable": "^1.0.0"
       }
     },
     "ent": {
       "version": "2.2.0",
-      "resolved": "http://localhost:4873/ent/-/ent-2.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
       "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
       "dev": true
     },
     "entities": {
       "version": "1.1.1",
-      "resolved": "http://localhost:4873/entities/-/entities-1.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
       "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=",
       "dev": true
     },
     "errno": {
       "version": "0.1.7",
-      "resolved": "http://localhost:4873/errno/-/errno-0.1.7.tgz",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
       "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
       "dev": true,
       "requires": {
@@ -5059,17 +4252,17 @@
       }
     },
     "error-ex": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
-      "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
+      "version": "1.3.2",
+      "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"
       }
     },
     "es-abstract": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.11.0.tgz",
-      "integrity": "sha512-ZnQrE/lXTTQ39ulXZ+J1DTFazV9qBy61x2bY071B+qGco8Z8q1QddsLdt/EF8Ai9hcWH72dWS0kFqXLxOxqslA==",
+      "version": "1.12.0",
+      "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",
@@ -5080,7 +4273,7 @@
     },
     "es-to-primitive": {
       "version": "1.1.1",
-      "resolved": "http://localhost:4873/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
       "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
       "requires": {
         "is-callable": "^1.1.1",
@@ -5089,9 +4282,9 @@
       }
     },
     "es5-ext": {
-      "version": "0.10.42",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.42.tgz",
-      "integrity": "sha512-AJxO1rmPe1bDEfSR6TJ/FgMFYuTBhR5R57KW58iCkYACMyFbrkqVyzXSurYoScDGvgyMpk7uRF/lPUPPTmsRSA==",
+      "version": "0.10.45",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.45.tgz",
+      "integrity": "sha512-FkfM6Vxxfmztilbxxz5UKSD4ICMf5tSpRFtDNtkAhOxZ0EKtX6qwmXNyH/sFyIbX2P/nU5AMiA9jilWsUGJzCQ==",
       "requires": {
         "es6-iterator": "~2.0.3",
         "es6-symbol": "~3.1.1",
@@ -5100,7 +4293,7 @@
     },
     "es6-iterator": {
       "version": "2.0.3",
-      "resolved": "http://localhost:4873/es6-iterator/-/es6-iterator-2.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
       "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
       "requires": {
         "d": "1",
@@ -5110,7 +4303,7 @@
       "dependencies": {
         "d": {
           "version": "1.0.0",
-          "resolved": "http://localhost:4873/d/-/d-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
           "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
           "requires": {
             "es5-ext": "^0.10.9"
@@ -5118,93 +4311,24 @@
         }
       }
     },
-    "es6-map": {
-      "version": "0.1.5",
-      "resolved": "http://localhost:4873/es6-map/-/es6-map-0.1.5.tgz",
-      "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14",
-        "es6-iterator": "~2.0.1",
-        "es6-set": "~0.1.5",
-        "es6-symbol": "~3.1.1",
-        "event-emitter": "~0.3.5"
-      },
-      "dependencies": {
-        "d": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/d/-/d-1.0.0.tgz",
-          "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
-          "dev": true,
-          "requires": {
-            "es5-ext": "^0.10.9"
-          }
-        },
-        "event-emitter": {
-          "version": "0.3.5",
-          "resolved": "http://localhost:4873/event-emitter/-/event-emitter-0.3.5.tgz",
-          "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-          "dev": true,
-          "requires": {
-            "d": "1",
-            "es5-ext": "~0.10.14"
-          }
-        }
-      }
-    },
     "es6-promise": {
       "version": "4.2.4",
-      "resolved": "http://localhost:4873/es6-promise/-/es6-promise-4.2.4.tgz",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz",
       "integrity": "sha512-/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ==",
       "dev": true
     },
     "es6-promisify": {
       "version": "5.0.0",
-      "resolved": "http://localhost:4873/es6-promisify/-/es6-promisify-5.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
       "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
       "dev": true,
       "requires": {
         "es6-promise": "^4.0.3"
       }
     },
-    "es6-set": {
-      "version": "0.1.5",
-      "resolved": "http://localhost:4873/es6-set/-/es6-set-0.1.5.tgz",
-      "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14",
-        "es6-iterator": "~2.0.1",
-        "es6-symbol": "3.1.1",
-        "event-emitter": "~0.3.5"
-      },
-      "dependencies": {
-        "d": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/d/-/d-1.0.0.tgz",
-          "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
-          "dev": true,
-          "requires": {
-            "es5-ext": "^0.10.9"
-          }
-        },
-        "event-emitter": {
-          "version": "0.3.5",
-          "resolved": "http://localhost:4873/event-emitter/-/event-emitter-0.3.5.tgz",
-          "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-          "dev": true,
-          "requires": {
-            "d": "1",
-            "es5-ext": "~0.10.14"
-          }
-        }
-      }
-    },
     "es6-symbol": {
       "version": "3.1.1",
-      "resolved": "http://localhost:4873/es6-symbol/-/es6-symbol-3.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
       "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
       "requires": {
         "d": "1",
@@ -5213,7 +4337,7 @@
       "dependencies": {
         "d": {
           "version": "1.0.0",
-          "resolved": "http://localhost:4873/d/-/d-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
           "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
           "requires": {
             "es5-ext": "^0.10.9"
@@ -5223,7 +4347,7 @@
     },
     "es6-template-strings": {
       "version": "2.0.1",
-      "resolved": "http://localhost:4873/es6-template-strings/-/es6-template-strings-2.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/es6-template-strings/-/es6-template-strings-2.0.1.tgz",
       "integrity": "sha1-sWbGpiVi9Hi7d3X2ypYQOlmbSyw=",
       "dev": true,
       "requires": {
@@ -5231,95 +4355,63 @@
         "esniff": "^1.1"
       }
     },
-    "es6-templates": {
-      "version": "0.2.3",
-      "resolved": "http://localhost:4873/es6-templates/-/es6-templates-0.2.3.tgz",
-      "integrity": "sha1-XLmsn7He1usSOTQrgdeSu7QHjuQ=",
-      "dev": true,
-      "requires": {
-        "recast": "~0.11.12",
-        "through": "~2.3.6"
-      }
-    },
-    "es6-weak-map": {
-      "version": "2.0.2",
-      "resolved": "http://localhost:4873/es6-weak-map/-/es6-weak-map-2.0.2.tgz",
-      "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.14",
-        "es6-iterator": "^2.0.1",
-        "es6-symbol": "^3.1.1"
-      },
-      "dependencies": {
-        "d": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/d/-/d-1.0.0.tgz",
-          "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
-          "dev": true,
-          "requires": {
-            "es5-ext": "^0.10.9"
-          }
-        }
-      }
-    },
     "escape-html": {
       "version": "1.0.3",
-      "resolved": "http://localhost:4873/escape-html/-/escape-html-1.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
       "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
       "dev": true
     },
     "escape-string-regexp": {
       "version": "1.0.5",
-      "resolved": "http://localhost:4873/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "escodegen": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz",
-      "integrity": "sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
+      "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
       "dev": true,
-      "optional": true,
       "requires": {
-        "esprima": "^3.1.3",
-        "estraverse": "^4.2.0",
+        "esprima": "^2.7.1",
+        "estraverse": "^1.9.1",
         "esutils": "^2.0.2",
         "optionator": "^0.8.1",
-        "source-map": "~0.6.1"
+        "source-map": "~0.2.0"
       },
       "dependencies": {
-        "esprima": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
-          "dev": true,
-          "optional": true
-        },
         "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
+          "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
           "dev": true,
-          "optional": true
+          "optional": true,
+          "requires": {
+            "amdefine": ">=0.0.4"
+          }
         }
       }
     },
-    "escope": {
-      "version": "3.6.0",
-      "resolved": "http://localhost:4873/escope/-/escope-3.6.0.tgz",
-      "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
+    "eslint-scope": {
+      "version": "3.7.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.3.tgz",
+      "integrity": "sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==",
       "dev": true,
       "requires": {
-        "es6-map": "^0.1.3",
-        "es6-weak-map": "^2.0.1",
         "esrecurse": "^4.1.0",
         "estraverse": "^4.1.1"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+          "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+          "dev": true
+        }
       }
     },
     "esniff": {
       "version": "1.1.0",
-      "resolved": "http://localhost:4873/esniff/-/esniff-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/esniff/-/esniff-1.1.0.tgz",
       "integrity": "sha1-xmhJIp+RRk3t4uDUAgHtar9l8qw=",
       "dev": true,
       "requires": {
@@ -5329,7 +4421,7 @@
       "dependencies": {
         "d": {
           "version": "1.0.0",
-          "resolved": "http://localhost:4873/d/-/d-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
           "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
           "dev": true,
           "requires": {
@@ -5339,47 +4431,55 @@
       }
     },
     "esprima": {
-      "version": "4.0.0",
-      "resolved": "http://localhost:4873/esprima/-/esprima-4.0.0.tgz",
-      "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+      "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
       "dev": true
     },
     "esrecurse": {
       "version": "4.2.1",
-      "resolved": "http://localhost:4873/esrecurse/-/esrecurse-4.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
       "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
       "dev": true,
       "requires": {
         "estraverse": "^4.1.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+          "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+          "dev": true
+        }
       }
     },
     "estraverse": {
-      "version": "4.2.0",
-      "resolved": "http://localhost:4873/estraverse/-/estraverse-4.2.0.tgz",
-      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
+      "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=",
       "dev": true
     },
     "estree-walker": {
       "version": "0.5.2",
-      "resolved": "http://localhost:4873/estree-walker/-/estree-walker-0.5.2.tgz",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.5.2.tgz",
       "integrity": "sha512-XpCnW/AE10ws/kDAs37cngSkvgIR8aN3G0MS85m7dUpuK2EREo9VJ00uvw6Dg/hXEpfsE1I1TvJOJr+Z+TL+ig==",
       "dev": true
     },
     "esutils": {
       "version": "2.0.2",
-      "resolved": "http://localhost:4873/esutils/-/esutils-2.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
       "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
       "dev": true
     },
     "etag": {
       "version": "1.8.1",
-      "resolved": "http://localhost:4873/etag/-/etag-1.8.1.tgz",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
       "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
       "dev": true
     },
     "eve-raphael": {
       "version": "0.5.0",
-      "resolved": "http://localhost:4873/eve-raphael/-/eve-raphael-0.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/eve-raphael/-/eve-raphael-0.5.0.tgz",
       "integrity": "sha1-F8dUt5K+7z+maE15z1pHxjxM2jA="
     },
     "event-emitter": {
@@ -5393,7 +4493,7 @@
     },
     "event-stream": {
       "version": "3.3.4",
-      "resolved": "http://localhost:4873/event-stream/-/event-stream-3.3.4.tgz",
+      "resolved": "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
       "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
       "requires": {
         "duplexer": "~0.1.1",
@@ -5407,19 +4507,19 @@
     },
     "eventemitter3": {
       "version": "3.1.0",
-      "resolved": "http://localhost:4873/eventemitter3/-/eventemitter3-3.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
       "integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==",
       "dev": true
     },
     "events": {
       "version": "1.1.1",
-      "resolved": "http://localhost:4873/events/-/events-1.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
       "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
       "dev": true
     },
     "eventsource": {
       "version": "0.1.6",
-      "resolved": "http://localhost:4873/eventsource/-/eventsource-0.1.6.tgz",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-0.1.6.tgz",
       "integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=",
       "dev": true,
       "requires": {
@@ -5428,7 +4528,7 @@
     },
     "evp_bytestokey": {
       "version": "1.0.3",
-      "resolved": "http://localhost:4873/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
       "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
       "dev": true,
       "requires": {
@@ -5436,9 +4536,18 @@
         "safe-buffer": "^5.1.1"
       }
     },
+    "exceptions": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/exceptions/-/exceptions-0.1.1.tgz",
+      "integrity": "sha1-twOQB5XCjwetadusX2h4b5RWIbI=",
+      "dev": true,
+      "requires": {
+        "formaterrors": "0.1.1"
+      }
+    },
     "execa": {
       "version": "0.7.0",
-      "resolved": "http://localhost:4873/execa/-/execa-0.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
       "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
       "requires": {
         "cross-spawn": "^5.0.1",
@@ -5452,13 +4561,13 @@
     },
     "exit": {
       "version": "0.1.2",
-      "resolved": "http://localhost:4873/exit/-/exit-0.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
       "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
       "dev": true
     },
     "expand-braces": {
       "version": "0.1.2",
-      "resolved": "http://localhost:4873/expand-braces/-/expand-braces-0.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz",
       "integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=",
       "dev": true,
       "requires": {
@@ -5467,9 +4576,15 @@
         "braces": "^0.1.2"
       },
       "dependencies": {
+        "array-unique": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
+          "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
+          "dev": true
+        },
         "braces": {
           "version": "0.1.5",
-          "resolved": "http://localhost:4873/braces/-/braces-0.1.5.tgz",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz",
           "integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=",
           "dev": true,
           "requires": {
@@ -5478,7 +4593,7 @@
         },
         "expand-range": {
           "version": "0.1.1",
-          "resolved": "http://localhost:4873/expand-range/-/expand-range-0.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz",
           "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=",
           "dev": true,
           "requires": {
@@ -5488,39 +4603,104 @@
         },
         "is-number": {
           "version": "0.1.1",
-          "resolved": "http://localhost:4873/is-number/-/is-number-0.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz",
           "integrity": "sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=",
           "dev": true
         },
         "repeat-string": {
           "version": "0.2.2",
-          "resolved": "http://localhost:4873/repeat-string/-/repeat-string-0.2.2.tgz",
+          "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz",
           "integrity": "sha1-x6jTI2BoNiBZp+RlH8aITosftK4=",
           "dev": true
         }
       }
     },
     "expand-brackets": {
-      "version": "0.1.5",
-      "resolved": "http://localhost:4873/expand-brackets/-/expand-brackets-0.1.5.tgz",
-      "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-      "dev": true,
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
       "requires": {
-        "is-posix-bracket": "^0.1.0"
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
       }
     },
     "expand-range": {
       "version": "1.8.2",
-      "resolved": "http://localhost:4873/expand-range/-/expand-range-1.8.2.tgz",
+      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
       "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
       "dev": true,
       "requires": {
         "fill-range": "^2.1.0"
+      },
+      "dependencies": {
+        "fill-range": {
+          "version": "2.2.4",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
+          "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
+          "dev": true,
+          "requires": {
+            "is-number": "^2.1.0",
+            "isobject": "^2.0.0",
+            "randomatic": "^3.0.0",
+            "repeat-element": "^1.1.2",
+            "repeat-string": "^1.5.2"
+          }
+        },
+        "is-number": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
+          "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          }
+        },
+        "isobject": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+          "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+          "dev": true,
+          "requires": {
+            "isarray": "1.0.0"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
       }
     },
     "express": {
       "version": "4.16.3",
-      "resolved": "http://localhost:4873/express/-/express-4.16.3.tgz",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.16.3.tgz",
       "integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=",
       "dev": true,
       "requires": {
@@ -5558,43 +4738,33 @@
       "dependencies": {
         "array-flatten": {
           "version": "1.1.1",
-          "resolved": "http://localhost:4873/array-flatten/-/array-flatten-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
           "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
           "dev": true
         },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "http://localhost:4873/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
         "qs": {
           "version": "6.5.1",
-          "resolved": "http://localhost:4873/qs/-/qs-6.5.1.tgz",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
           "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
           "dev": true
         },
         "safe-buffer": {
           "version": "5.1.1",
-          "resolved": "http://localhost:4873/safe-buffer/-/safe-buffer-5.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
           "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
           "dev": true
         }
       }
     },
     "extend": {
-      "version": "3.0.1",
-      "resolved": "http://localhost:4873/extend/-/extend-3.0.1.tgz",
-      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
     },
     "extend-shallow": {
       "version": "3.0.2",
-      "resolved": "http://localhost:4873/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
       "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
       "requires": {
         "assign-symbols": "^1.0.0",
         "is-extendable": "^1.0.1"
@@ -5602,9 +4772,8 @@
       "dependencies": {
         "is-extendable": {
           "version": "1.0.1",
-          "resolved": "http://localhost:4873/is-extendable/-/is-extendable-1.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
           "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
           "requires": {
             "is-plain-object": "^2.0.4"
           }
@@ -5613,7 +4782,7 @@
     },
     "external-editor": {
       "version": "2.2.0",
-      "resolved": "http://localhost:4873/external-editor/-/external-editor-2.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
       "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
       "dev": true,
       "requires": {
@@ -5623,122 +4792,134 @@
       }
     },
     "extglob": {
-      "version": "0.3.2",
-      "resolved": "http://localhost:4873/extglob/-/extglob-0.3.2.tgz",
-      "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-      "dev": true,
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
       "requires": {
-        "is-extglob": "^1.0.0"
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
       }
     },
     "extract-text-webpack-plugin": {
-      "version": "2.0.0-rc.3",
-      "resolved": "http://localhost:4873/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.0.0-rc.3.tgz",
-      "integrity": "sha1-c4GqeGnOJtSzmnurcc8J5aOEMrI=",
+      "version": "4.0.0-beta.0",
+      "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-4.0.0-beta.0.tgz",
+      "integrity": "sha512-Hypkn9jUTnFr0DpekNam53X47tXn3ucY08BQumv7kdGgeVUBLq3DJHJTi6HNxv4jl9W+Skxjz9+RnK0sJyqqjA==",
       "dev": true,
       "requires": {
-        "ajv": "^4.11.2",
-        "async": "^2.1.2",
-        "loader-utils": "^0.2.16",
-        "webpack-sources": "^0.1.0"
+        "async": "^2.4.1",
+        "loader-utils": "^1.1.0",
+        "schema-utils": "^0.4.5",
+        "webpack-sources": "^1.1.0"
       },
       "dependencies": {
-        "ajv": {
-          "version": "4.11.8",
-          "resolved": "http://localhost:4873/ajv/-/ajv-4.11.8.tgz",
-          "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
+        "async": {
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
+          "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
           "dev": true,
           "requires": {
-            "co": "^4.6.0",
-            "json-stable-stringify": "^1.0.1"
-          }
-        },
-        "loader-utils": {
-          "version": "0.2.17",
-          "resolved": "http://localhost:4873/loader-utils/-/loader-utils-0.2.17.tgz",
-          "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"
-          }
-        },
-        "source-list-map": {
-          "version": "0.1.8",
-          "resolved": "http://localhost:4873/source-list-map/-/source-list-map-0.1.8.tgz",
-          "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
-          "dev": true
-        },
-        "webpack-sources": {
-          "version": "0.1.5",
-          "resolved": "http://localhost:4873/webpack-sources/-/webpack-sources-0.1.5.tgz",
-          "integrity": "sha1-qh86vw8NdNtxEcQOUAuE+WZkB1A=",
-          "dev": true,
-          "requires": {
-            "source-list-map": "~0.1.7",
-            "source-map": "~0.5.3"
+            "lodash": "^4.17.10"
           }
         }
       }
     },
     "extsprintf": {
       "version": "1.3.0",
-      "resolved": "http://localhost:4873/extsprintf/-/extsprintf-1.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
       "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
       "dev": true
     },
     "fancy-log": {
       "version": "1.3.2",
-      "resolved": "http://localhost:4873/fancy-log/-/fancy-log-1.3.2.tgz",
+      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz",
       "integrity": "sha1-9BEl49hPLn2JpD0G2VjI94vha+E=",
       "dev": true,
       "requires": {
         "ansi-gray": "^0.1.1",
         "color-support": "^1.1.3",
         "time-stamp": "^1.0.0"
-      },
-      "dependencies": {
-        "time-stamp": {
-          "version": "1.1.0",
-          "resolved": "http://localhost:4873/time-stamp/-/time-stamp-1.1.0.tgz",
-          "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
-          "dev": true
-        }
       }
     },
     "fast-deep-equal": {
-      "version": "2.0.1",
-      "resolved": "http://localhost:4873/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+      "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
     },
     "fast-json-patch": {
       "version": "0.5.7",
-      "resolved": "http://localhost:4873/fast-json-patch/-/fast-json-patch-0.5.7.tgz",
+      "resolved": "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-0.5.7.tgz",
       "integrity": "sha1-taj0nSWWJFlu+YuHLz/aiVtNhmU=",
       "dev": true
     },
     "fast-json-stable-stringify": {
       "version": "2.0.0",
-      "resolved": "http://localhost:4873/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
       "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
     },
     "fast-levenshtein": {
       "version": "2.0.6",
-      "resolved": "http://localhost:4873/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
       "dev": true
     },
     "fastparse": {
       "version": "1.1.1",
-      "resolved": "http://localhost:4873/fastparse/-/fastparse-1.1.1.tgz",
-      "integrity": "sha1-0eJkOzipTXWDtHkGDmxK/8lAcfg=",
-      "dev": true
+      "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz",
+      "integrity": "sha1-0eJkOzipTXWDtHkGDmxK/8lAcfg="
     },
     "fault": {
       "version": "1.0.2",
-      "resolved": "http://localhost:4873/fault/-/fault-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.2.tgz",
       "integrity": "sha512-o2eo/X2syzzERAtN5LcGbiVQ0WwZSlN3qLtadwAz3X8Bu+XWD16dja/KMsjZLiQr+BLGPDnHGkc4yUJf1Xpkpw==",
       "dev": true,
       "requires": {
@@ -5747,7 +4928,7 @@
     },
     "faye-websocket": {
       "version": "0.10.0",
-      "resolved": "http://localhost:4873/faye-websocket/-/faye-websocket-0.10.0.tgz",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
       "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
       "dev": true,
       "requires": {
@@ -5756,7 +4937,7 @@
     },
     "figures": {
       "version": "2.0.0",
-      "resolved": "http://localhost:4873/figures/-/figures-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
       "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
       "dev": true,
       "requires": {
@@ -5764,30 +4945,31 @@
       }
     },
     "file-loader": {
-      "version": "0.11.1",
-      "resolved": "http://localhost:4873/file-loader/-/file-loader-0.11.1.tgz",
-      "integrity": "sha1-azKO4SNKcp5OR9Njdd1tNcDh24Q=",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz",
+      "integrity": "sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.0.2"
+        "loader-utils": "^1.0.2",
+        "schema-utils": "^0.4.5"
       }
     },
     "file-uri-to-path": {
       "version": "1.0.0",
-      "resolved": "http://localhost:4873/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
       "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
       "dev": true,
       "optional": true
     },
     "filename-regex": {
       "version": "2.0.1",
-      "resolved": "http://localhost:4873/filename-regex/-/filename-regex-2.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
       "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
       "dev": true
     },
     "fileset": {
       "version": "2.0.3",
-      "resolved": "http://localhost:4873/fileset/-/fileset-2.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz",
       "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=",
       "dev": true,
       "requires": {
@@ -5797,26 +4979,34 @@
     },
     "filesize": {
       "version": "3.6.1",
-      "resolved": "http://localhost:4873/filesize/-/filesize-3.6.1.tgz",
+      "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
       "integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==",
       "dev": true
     },
     "fill-range": {
-      "version": "2.2.4",
-      "resolved": "http://localhost:4873/fill-range/-/fill-range-2.2.4.tgz",
-      "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
-      "dev": true,
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
       "requires": {
-        "is-number": "^2.1.0",
-        "isobject": "^2.0.0",
-        "randomatic": "^3.0.0",
-        "repeat-element": "^1.1.2",
-        "repeat-string": "^1.5.2"
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
       }
     },
     "finalhandler": {
       "version": "1.1.1",
-      "resolved": "http://localhost:4873/finalhandler/-/finalhandler-1.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
       "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
       "dev": true,
       "requires": {
@@ -5827,22 +5017,11 @@
         "parseurl": "~1.3.2",
         "statuses": "~1.4.0",
         "unpipe": "~1.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "http://localhost:4873/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
       }
     },
     "find-cache-dir": {
       "version": "1.0.0",
-      "resolved": "http://localhost:4873/find-cache-dir/-/find-cache-dir-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz",
       "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
       "dev": true,
       "requires": {
@@ -5851,35 +5030,23 @@
         "pkg-dir": "^2.0.0"
       }
     },
-    "find-index": {
-      "version": "0.1.1",
-      "resolved": "http://localhost:4873/find-index/-/find-index-0.1.1.tgz",
-      "integrity": "sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=",
-      "dev": true
-    },
     "find-parent-dir": {
       "version": "0.3.0",
-      "resolved": "http://localhost:4873/find-parent-dir/-/find-parent-dir-0.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.0.tgz",
       "integrity": "sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=",
       "dev": true
     },
     "find-up": {
       "version": "2.1.0",
-      "resolved": "http://localhost:4873/find-up/-/find-up-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
       "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
       "requires": {
         "locate-path": "^2.0.0"
       }
     },
-    "flatten": {
-      "version": "1.0.2",
-      "resolved": "http://localhost:4873/flatten/-/flatten-1.0.2.tgz",
-      "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
-      "dev": true
-    },
     "flush-write-stream": {
       "version": "1.0.3",
-      "resolved": "http://localhost:4873/flush-write-stream/-/flush-write-stream-1.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz",
       "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
       "dev": true,
       "requires": {
@@ -5888,24 +5055,34 @@
       }
     },
     "follow-redirects": {
-      "version": "1.5.0",
-      "resolved": "http://localhost:4873/follow-redirects/-/follow-redirects-1.5.0.tgz",
-      "integrity": "sha512-fdrt472/9qQ6Kgjvb935ig6vJCuofpBUD14f9Vb+SLlm7xIe4Qva5gey8EKtv8lp7ahE1wilg3xL1znpVGtZIA==",
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.2.tgz",
+      "integrity": "sha512-kssLorP/9acIdpQ2udQVTiCS5LQmdEz9mvdIfDcl1gYX2tPKFADHSyFdvJS040XdFsPzemWtgI3q8mFVCxtX8A==",
       "dev": true,
       "requires": {
         "debug": "^3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
       }
     },
     "for-in": {
       "version": "1.0.2",
-      "resolved": "http://localhost:4873/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-      "dev": true
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
     },
     "for-own": {
-      "version": "0.1.5",
-      "resolved": "http://localhost:4873/for-own/-/for-own-0.1.5.tgz",
-      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
+      "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
       "dev": true,
       "requires": {
         "for-in": "^1.0.1"
@@ -5913,73 +5090,18 @@
     },
     "foreach": {
       "version": "2.0.5",
-      "resolved": "http://localhost:4873/foreach/-/foreach-2.0.5.tgz",
+      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
       "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k="
     },
     "forever-agent": {
       "version": "0.6.1",
-      "resolved": "http://localhost:4873/forever-agent/-/forever-agent-0.6.1.tgz",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
       "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
       "dev": true
     },
-    "fork-ts-checker-webpack-plugin": {
-      "version": "0.2.3",
-      "resolved": "http://localhost:4873/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-0.2.3.tgz",
-      "integrity": "sha1-dEk9mqC3yNWiBvlz5cCe7sfnL44=",
-      "dev": true,
-      "requires": {
-        "chalk": "^1.1.3",
-        "chokidar": "^1.7.0",
-        "lodash.endswith": "^4.2.1",
-        "lodash.isstring": "^4.0.1",
-        "lodash.startswith": "^4.2.1"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
-      }
-    },
     "form-data": {
       "version": "2.3.2",
-      "resolved": "http://localhost:4873/form-data/-/form-data-2.3.2.tgz",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
       "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
       "requires": {
         "asynckit": "^0.4.0",
@@ -5989,10 +5111,20 @@
     },
     "format": {
       "version": "0.2.2",
-      "resolved": "http://localhost:4873/format/-/format-0.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz",
       "integrity": "sha1-1hcBB+nv3E7TDJ3DkBbflCtctYs=",
       "dev": true
     },
+    "formaterrors": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/formaterrors/-/formaterrors-0.1.1.tgz",
+      "integrity": "sha1-fjZz5HTfeoOXE5KBgpNito/ODes=",
+      "dev": true,
+      "requires": {
+        "diff_match_patch": "0.1.1",
+        "stack-trace": "0.0.6"
+      }
+    },
     "formidable": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz",
@@ -6000,33 +5132,32 @@
     },
     "forwarded": {
       "version": "0.1.2",
-      "resolved": "http://localhost:4873/forwarded/-/forwarded-0.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
       "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
       "dev": true
     },
     "fragment-cache": {
       "version": "0.2.1",
-      "resolved": "http://localhost:4873/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
       "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
-      "dev": true,
       "requires": {
         "map-cache": "^0.2.2"
       }
     },
     "fresh": {
       "version": "0.5.2",
-      "resolved": "http://localhost:4873/fresh/-/fresh-0.5.2.tgz",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
       "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
       "dev": true
     },
     "from": {
       "version": "0.1.7",
-      "resolved": "http://localhost:4873/from/-/from-0.1.7.tgz",
+      "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
       "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4="
     },
     "from2": {
       "version": "2.3.0",
-      "resolved": "http://localhost:4873/from2/-/from2-2.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
       "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
       "dev": true,
       "requires": {
@@ -6036,7 +5167,7 @@
     },
     "fs-access": {
       "version": "1.0.1",
-      "resolved": "http://localhost:4873/fs-access/-/fs-access-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
       "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
       "dev": true,
       "requires": {
@@ -6045,7 +5176,7 @@
     },
     "fs-extra": {
       "version": "4.0.3",
-      "resolved": "http://localhost:4873/fs-extra/-/fs-extra-4.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
       "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
       "dev": true,
       "requires": {
@@ -6054,18 +5185,9 @@
         "universalify": "^0.1.0"
       }
     },
-    "fs-minipass": {
-      "version": "1.2.5",
-      "resolved": "http://localhost:4873/fs-minipass/-/fs-minipass-1.2.5.tgz",
-      "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
-      "dev": true,
-      "requires": {
-        "minipass": "^2.2.1"
-      }
-    },
     "fs-write-stream-atomic": {
       "version": "1.0.10",
-      "resolved": "http://localhost:4873/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
+      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
       "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
       "dev": true,
       "requires": {
@@ -6077,15 +5199,14 @@
     },
     "fs.realpath": {
       "version": "1.0.0",
-      "resolved": "http://localhost:4873/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
       "dev": true
     },
     "fsevents": {
       "version": "1.2.4",
-      "resolved": "http://localhost:4873/fsevents/-/fsevents-1.2.4.tgz",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
       "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
-      "dev": true,
       "optional": true,
       "requires": {
         "nan": "^2.9.2",
@@ -6094,25 +5215,25 @@
       "dependencies": {
         "abbrev": {
           "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+          "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
           "optional": true
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true,
-          "dev": true
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
         },
         "aproba": {
           "version": "1.2.0",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+          "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
           "optional": true
         },
         "are-we-there-yet": {
           "version": "1.1.4",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
+          "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
           "optional": true,
           "requires": {
             "delegates": "^1.0.0",
@@ -6121,13 +5242,13 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true
+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
         },
         "brace-expansion": {
           "version": "1.1.11",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+          "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -6135,35 +5256,35 @@
         },
         "chownr": {
           "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
+          "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=",
           "optional": true
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true,
-          "dev": true
+          "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true,
-          "dev": true
+          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true,
-          "dev": true
+          "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+          "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
         },
         "core-util-is": {
           "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+          "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
           "optional": true
         },
         "debug": {
           "version": "2.6.9",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "optional": true,
           "requires": {
             "ms": "2.0.0"
@@ -6171,26 +5292,26 @@
         },
         "deep-extend": {
           "version": "0.5.1",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz",
+          "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==",
           "optional": true
         },
         "delegates": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+          "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
           "optional": true
         },
         "detect-libc": {
           "version": "1.0.3",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+          "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
           "optional": true
         },
         "fs-minipass": {
           "version": "1.2.5",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz",
+          "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
           "optional": true,
           "requires": {
             "minipass": "^2.2.1"
@@ -6198,14 +5319,14 @@
         },
         "fs.realpath": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+          "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
           "optional": true
         },
         "gauge": {
           "version": "2.7.4",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+          "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
           "optional": true,
           "requires": {
             "aproba": "^1.0.3",
@@ -6220,8 +5341,8 @@
         },
         "glob": {
           "version": "7.1.2",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
           "optional": true,
           "requires": {
             "fs.realpath": "^1.0.0",
@@ -6234,14 +5355,14 @@
         },
         "has-unicode": {
           "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+          "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
           "optional": true
         },
         "iconv-lite": {
           "version": "0.4.21",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.21.tgz",
+          "integrity": "sha512-En5V9za5mBt2oUA03WGD3TwDv0MKAruqsuxstbMUZaj9W9k/m1CV/9py3l0L5kw9Bln8fdHQmzHSYtvpvTLpKw==",
           "optional": true,
           "requires": {
             "safer-buffer": "^2.1.0"
@@ -6249,8 +5370,8 @@
         },
         "ignore-walk": {
           "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
+          "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
           "optional": true,
           "requires": {
             "minimatch": "^3.0.4"
@@ -6258,8 +5379,8 @@
         },
         "inflight": {
           "version": "1.0.6",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+          "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
           "optional": true,
           "requires": {
             "once": "^1.3.0",
@@ -6268,46 +5389,46 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true,
-          "dev": true
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
         },
         "ini": {
           "version": "1.3.5",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+          "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
           "optional": true
         },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
+          "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"
           }
         },
         "isarray": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
           "optional": true
         },
         "minimatch": {
           "version": "3.0.4",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "0.0.8",
-          "bundled": true,
-          "dev": true
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
         },
         "minipass": {
           "version": "2.2.4",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz",
+          "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==",
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -6315,8 +5436,8 @@
         },
         "minizlib": {
           "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz",
+          "integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==",
           "optional": true,
           "requires": {
             "minipass": "^2.2.1"
@@ -6324,22 +5445,22 @@
         },
         "mkdirp": {
           "version": "0.5.1",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "requires": {
             "minimist": "0.0.8"
           }
         },
         "ms": {
           "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "optional": true
         },
         "needle": {
           "version": "2.2.0",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/needle/-/needle-2.2.0.tgz",
+          "integrity": "sha512-eFagy6c+TYayorXw/qtAdSvaUpEbBsDwDyxYFgLZ0lTojfH7K+OdBqAF7TAFwDokJaGpubpSGG0wO3iC0XPi8w==",
           "optional": true,
           "requires": {
             "debug": "^2.1.2",
@@ -6349,8 +5470,8 @@
         },
         "node-pre-gyp": {
           "version": "0.10.0",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.0.tgz",
+          "integrity": "sha512-G7kEonQLRbcA/mOoFoxvlMrw6Q6dPf92+t/l0DFSMuSlDoWaI9JWIyPwK0jyE1bph//CUEL65/Fz1m2vJbmjQQ==",
           "optional": true,
           "requires": {
             "detect-libc": "^1.0.2",
@@ -6367,8 +5488,8 @@
         },
         "nopt": {
           "version": "4.0.1",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+          "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
           "optional": true,
           "requires": {
             "abbrev": "1",
@@ -6377,14 +5498,14 @@
         },
         "npm-bundled": {
           "version": "1.0.3",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz",
+          "integrity": "sha512-ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow==",
           "optional": true
         },
         "npm-packlist": {
           "version": "1.1.10",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz",
+          "integrity": "sha512-AQC0Dyhzn4EiYEfIUjCdMl0JJ61I2ER9ukf/sLxJUcZHfo+VyEfz2rMJgLZSS1v30OxPQe1cN0LZA1xbcaVfWA==",
           "optional": true,
           "requires": {
             "ignore-walk": "^3.0.1",
@@ -6393,8 +5514,8 @@
         },
         "npmlog": {
           "version": "4.1.2",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+          "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
           "optional": true,
           "requires": {
             "are-we-there-yet": "~1.1.2",
@@ -6405,39 +5526,39 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true,
-          "dev": true
+          "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
         },
         "object-assign": {
           "version": "4.1.1",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
           "optional": true
         },
         "once": {
           "version": "1.4.0",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "requires": {
             "wrappy": "1"
           }
         },
         "os-homedir": {
           "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+          "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
           "optional": true
         },
         "os-tmpdir": {
           "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+          "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
           "optional": true
         },
         "osenv": {
           "version": "0.1.5",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+          "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
           "optional": true,
           "requires": {
             "os-homedir": "^1.0.0",
@@ -6446,20 +5567,20 @@
         },
         "path-is-absolute": {
           "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+          "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
           "optional": true
         },
         "process-nextick-args": {
           "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
           "optional": true
         },
         "rc": {
           "version": "1.2.7",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz",
+          "integrity": "sha512-LdLD8xD4zzLsAT5xyushXDNscEjB7+2ulnl8+r1pnESlYtlJtVSoCMBGr30eDRJ3+2Gq89jK9P9e4tCEH1+ywA==",
           "optional": true,
           "requires": {
             "deep-extend": "^0.5.1",
@@ -6470,16 +5591,16 @@
           "dependencies": {
             "minimist": {
               "version": "1.2.0",
-              "bundled": true,
-              "dev": true,
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+              "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
               "optional": true
             }
           }
         },
         "readable-stream": {
           "version": "2.3.6",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
@@ -6493,8 +5614,8 @@
         },
         "rimraf": {
           "version": "2.6.2",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+          "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
           "optional": true,
           "requires": {
             "glob": "^7.0.5"
@@ -6502,43 +5623,43 @@
         },
         "safe-buffer": {
           "version": "5.1.1",
-          "bundled": true,
-          "dev": true
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
         },
         "safer-buffer": {
           "version": "2.1.2",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+          "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
           "optional": true
         },
         "sax": {
           "version": "1.2.4",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+          "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
           "optional": true
         },
         "semver": {
           "version": "5.5.0",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
+          "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
           "optional": true
         },
         "set-blocking": {
           "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+          "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
           "optional": true
         },
         "signal-exit": {
           "version": "3.0.2",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+          "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
           "optional": true
         },
         "string-width": {
           "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
+          "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",
@@ -6547,8 +5668,8 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
@@ -6556,22 +5677,22 @@
         },
         "strip-ansi": {
           "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "requires": {
             "ansi-regex": "^2.0.0"
           }
         },
         "strip-json-comments": {
           "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+          "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
           "optional": true
         },
         "tar": {
           "version": "4.4.1",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz",
+          "integrity": "sha512-O+v1r9yN4tOsvl90p5HAP4AEqbYhx4036AGMm075fH9F8Qwi3oJ+v4u50FkT/KkvywNGtwkk0zRI+8eYm1X/xg==",
           "optional": true,
           "requires": {
             "chownr": "^1.0.1",
@@ -6585,14 +5706,14 @@
         },
         "util-deprecate": {
           "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
           "optional": true
         },
         "wide-align": {
           "version": "1.1.2",
-          "bundled": true,
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
+          "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
           "optional": true,
           "requires": {
             "string-width": "^1.0.2"
@@ -6600,19 +5721,19 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true,
-          "dev": true
+          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
         },
         "yallist": {
           "version": "3.0.2",
-          "bundled": true,
-          "dev": true
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz",
+          "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k="
         }
       }
     },
     "fstream": {
       "version": "1.0.11",
-      "resolved": "http://localhost:4873/fstream/-/fstream-1.0.11.tgz",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
       "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
       "dev": true,
       "requires": {
@@ -6624,7 +5745,7 @@
     },
     "ftp": {
       "version": "0.3.10",
-      "resolved": "http://localhost:4873/ftp/-/ftp-0.3.10.tgz",
+      "resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz",
       "integrity": "sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=",
       "dev": true,
       "optional": true,
@@ -6635,14 +5756,14 @@
       "dependencies": {
         "isarray": {
           "version": "0.0.1",
-          "resolved": "http://localhost:4873/isarray/-/isarray-0.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
           "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
           "dev": true,
           "optional": true
         },
         "readable-stream": {
           "version": "1.1.14",
-          "resolved": "http://localhost:4873/readable-stream/-/readable-stream-1.1.14.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
           "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
           "dev": true,
           "optional": true,
@@ -6655,7 +5776,7 @@
         },
         "string_decoder": {
           "version": "0.10.31",
-          "resolved": "http://localhost:4873/string_decoder/-/string_decoder-0.10.31.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
           "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
           "dev": true,
           "optional": true
@@ -6664,12 +5785,12 @@
     },
     "function-bind": {
       "version": "1.1.1",
-      "resolved": "http://localhost:4873/function-bind/-/function-bind-1.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
     "gauge": {
       "version": "2.7.4",
-      "resolved": "http://localhost:4873/gauge/-/gauge-2.7.4.tgz",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
       "dev": true,
       "requires": {
@@ -6682,13660 +5803,6 @@
         "strip-ansi": "^3.0.1",
         "wide-align": "^1.1.0"
       },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "dev": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "http://localhost:4873/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "dev": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        }
-      }
-    },
-    "gaze": {
-      "version": "1.1.3",
-      "resolved": "http://localhost:4873/gaze/-/gaze-1.1.3.tgz",
-      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
-      "dev": true,
-      "requires": {
-        "globule": "^1.0.0"
-      }
-    },
-    "generate-function": {
-      "version": "2.0.0",
-      "resolved": "http://localhost:4873/generate-function/-/generate-function-2.0.0.tgz",
-      "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=",
-      "dev": true,
-      "optional": true
-    },
-    "generate-object-property": {
-      "version": "1.2.0",
-      "resolved": "http://localhost:4873/generate-object-property/-/generate-object-property-1.2.0.tgz",
-      "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "is-property": "^1.0.0"
-      }
-    },
-    "get-caller-file": {
-      "version": "1.0.2",
-      "resolved": "http://localhost:4873/get-caller-file/-/get-caller-file-1.0.2.tgz",
-      "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U="
-    },
-    "get-stdin": {
-      "version": "4.0.1",
-      "resolved": "http://localhost:4873/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-      "dev": true
-    },
-    "get-stream": {
-      "version": "3.0.0",
-      "resolved": "http://localhost:4873/get-stream/-/get-stream-3.0.0.tgz",
-      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
-    },
-    "get-uri": {
-      "version": "2.0.2",
-      "resolved": "http://localhost:4873/get-uri/-/get-uri-2.0.2.tgz",
-      "integrity": "sha512-ZD325dMZOgerGqF/rF6vZXyFGTAay62svjQIT+X/oU2PtxYpFxvSkbsdi+oxIrsNxlZVd4y8wUDqkaExWTI/Cw==",
-      "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"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "http://localhost:4873/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
-      }
-    },
-    "get-value": {
-      "version": "2.0.6",
-      "resolved": "http://localhost:4873/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-      "dev": true
-    },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "http://localhost:4873/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
-        }
-      }
-    },
-    "github-build": {
-      "version": "1.2.0",
-      "resolved": "http://localhost:4873/github-build/-/github-build-1.2.0.tgz",
-      "integrity": "sha512-Iq7NialLYz5yRZDkiX8zaOWd+N3BssJJfUvG7wd8r4MeLCN88SdxEYo2esseMLpLtP4vNXhgamg1eRm7hw59qw==",
-      "dev": true,
-      "requires": {
-        "axios": "0.15.3"
-      },
-      "dependencies": {
-        "axios": {
-          "version": "0.15.3",
-          "resolved": "http://localhost:4873/axios/-/axios-0.15.3.tgz",
-          "integrity": "sha1-LJ1jiy4ZGgjqHWzJiOrda6W9wFM=",
-          "dev": true,
-          "requires": {
-            "follow-redirects": "1.0.0"
-          }
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "http://localhost:4873/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "follow-redirects": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/follow-redirects/-/follow-redirects-1.0.0.tgz",
-          "integrity": "sha1-jjQpjL0uF28lTv/sdaHHjMhJ/Tc=",
-          "dev": true,
-          "requires": {
-            "debug": "^2.2.0"
-          }
-        }
-      }
-    },
-    "github-slugger": {
-      "version": "1.2.0",
-      "resolved": "http://localhost:4873/github-slugger/-/github-slugger-1.2.0.tgz",
-      "integrity": "sha512-wIaa75k1vZhyPm9yWrD08A5Xnx/V+RmzGrpjQuLemGKSb77Qukiaei58Bogrl/LZSADDfPzKJX8jhLs4CRTl7Q==",
-      "dev": true,
-      "requires": {
-        "emoji-regex": ">=6.0.0 <=6.1.1"
-      }
-    },
-    "glob": {
-      "version": "7.1.2",
-      "resolved": "http://localhost:4873/glob/-/glob-7.1.2.tgz",
-      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-      "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"
-      }
-    },
-    "glob-base": {
-      "version": "0.3.0",
-      "resolved": "http://localhost:4873/glob-base/-/glob-base-0.3.0.tgz",
-      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
-      "dev": true,
-      "requires": {
-        "glob-parent": "^2.0.0",
-        "is-glob": "^2.0.0"
-      }
-    },
-    "glob-parent": {
-      "version": "2.0.0",
-      "resolved": "http://localhost:4873/glob-parent/-/glob-parent-2.0.0.tgz",
-      "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-      "dev": true,
-      "requires": {
-        "is-glob": "^2.0.0"
-      }
-    },
-    "glob2base": {
-      "version": "0.0.12",
-      "resolved": "http://localhost:4873/glob2base/-/glob2base-0.0.12.tgz",
-      "integrity": "sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=",
-      "dev": true,
-      "requires": {
-        "find-index": "^0.1.1"
-      }
-    },
-    "global-dirs": {
-      "version": "0.1.1",
-      "resolved": "http://localhost:4873/global-dirs/-/global-dirs-0.1.1.tgz",
-      "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
-      "dev": true,
-      "requires": {
-        "ini": "^1.3.4"
-      }
-    },
-    "globals": {
-      "version": "9.18.0",
-      "resolved": "http://localhost:4873/globals/-/globals-9.18.0.tgz",
-      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-      "dev": true
-    },
-    "globby": {
-      "version": "7.1.1",
-      "resolved": "http://localhost:4873/globby/-/globby-7.1.1.tgz",
-      "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
-      "dev": true,
-      "requires": {
-        "array-union": "^1.0.1",
-        "dir-glob": "^2.0.0",
-        "glob": "^7.1.2",
-        "ignore": "^3.3.5",
-        "pify": "^3.0.0",
-        "slash": "^1.0.0"
-      }
-    },
-    "globs": {
-      "version": "0.1.4",
-      "resolved": "http://localhost:4873/globs/-/globs-0.1.4.tgz",
-      "integrity": "sha512-D23dWbOq48vlOraoSigbcQV4tWrnhwk+E/Um2cMuDS3/5dwGmdFeA7L/vAvDhLFlQOTDqHcXh35m/71g2A2WzQ==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.1"
-      }
-    },
-    "globule": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz",
-      "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=",
-      "dev": true,
-      "requires": {
-        "glob": "~7.1.1",
-        "lodash": "~4.17.4",
-        "minimatch": "~3.0.2"
-      }
-    },
-    "glogg": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/glogg/-/glogg-1.0.1.tgz",
-      "integrity": "sha512-ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw==",
-      "dev": true,
-      "requires": {
-        "sparkles": "^1.0.0"
-      }
-    },
-    "got": {
-      "version": "6.7.1",
-      "resolved": "http://localhost:4873/got/-/got-6.7.1.tgz",
-      "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
-      "dev": true,
-      "requires": {
-        "create-error-class": "^3.0.0",
-        "duplexer3": "^0.1.4",
-        "get-stream": "^3.0.0",
-        "is-redirect": "^1.0.0",
-        "is-retry-allowed": "^1.0.0",
-        "is-stream": "^1.0.0",
-        "lowercase-keys": "^1.0.0",
-        "safe-buffer": "^5.0.1",
-        "timed-out": "^4.0.0",
-        "unzip-response": "^2.0.1",
-        "url-parse-lax": "^1.0.0"
-      }
-    },
-    "graceful-fs": {
-      "version": "4.1.11",
-      "resolved": "http://localhost:4873/graceful-fs/-/graceful-fs-4.1.11.tgz",
-      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
-    },
-    "graceful-readlink": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
-      "dev": true
-    },
-    "graphql-request": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/graphql-request/-/graphql-request-1.6.0.tgz",
-      "integrity": "sha512-qqAPLZuaGlwZDsMQ2FfgEyZMcXFMsPPDl6bQQlmwP/xCnk1TqxkE1S644LsHTXAHYPvmRWsIimfdcnys5+o+fQ==",
-      "dev": true,
-      "requires": {
-        "cross-fetch": "2.0.0"
-      }
-    },
-    "graphviz": {
-      "version": "0.0.8",
-      "resolved": "http://localhost:4873/graphviz/-/graphviz-0.0.8.tgz",
-      "integrity": "sha1-5ZnkBzPvgOFlO/6JpfAx7PKqSqo=",
-      "requires": {
-        "temp": "~0.4.0"
-      }
-    },
-    "gray-matter": {
-      "version": "2.1.1",
-      "resolved": "http://localhost:4873/gray-matter/-/gray-matter-2.1.1.tgz",
-      "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"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "http://localhost:4873/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "gulp-util": {
-      "version": "3.0.7",
-      "resolved": "http://localhost:4873/gulp-util/-/gulp-util-3.0.7.tgz",
-      "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",
-        "replace-ext": "0.0.1",
-        "through2": "^2.0.0",
-        "vinyl": "^0.5.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          }
-        },
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "http://localhost:4873/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        },
-        "object-assign": {
-          "version": "3.0.0",
-          "resolved": "http://localhost:4873/object-assign/-/object-assign-3.0.0.tgz",
-          "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
-      }
-    },
-    "gulplog": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/gulplog/-/gulplog-1.0.0.tgz",
-      "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
-      "dev": true,
-      "requires": {
-        "glogg": "^1.0.0"
-      }
-    },
-    "gzip-size": {
-      "version": "4.1.0",
-      "resolved": "http://localhost:4873/gzip-size/-/gzip-size-4.1.0.tgz",
-      "integrity": "sha1-iuCWJX6r59acRb4rZ8RIEk/7UXw=",
-      "dev": true,
-      "requires": {
-        "duplexer": "^0.1.1",
-        "pify": "^3.0.0"
-      }
-    },
-    "hammerjs": {
-      "version": "2.0.8",
-      "resolved": "http://localhost:4873/hammerjs/-/hammerjs-2.0.8.tgz",
-      "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
-    },
-    "handle-thing": {
-      "version": "1.2.5",
-      "resolved": "http://localhost:4873/handle-thing/-/handle-thing-1.2.5.tgz",
-      "integrity": "sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=",
-      "dev": true
-    },
-    "handlebars": {
-      "version": "4.0.11",
-      "resolved": "http://localhost:4873/handlebars/-/handlebars-4.0.11.tgz",
-      "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=",
-      "dev": true,
-      "requires": {
-        "async": "^1.4.0",
-        "optimist": "^0.6.1",
-        "source-map": "^0.4.4",
-        "uglify-js": "^2.6"
-      },
-      "dependencies": {
-        "async": {
-          "version": "1.5.2",
-          "resolved": "http://localhost:4873/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-          "dev": true
-        },
-        "camelcase": {
-          "version": "1.2.1",
-          "resolved": "http://localhost:4873/camelcase/-/camelcase-1.2.1.tgz",
-          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
-          "dev": true,
-          "optional": true
-        },
-        "cliui": {
-          "version": "2.1.0",
-          "resolved": "http://localhost:4873/cliui/-/cliui-2.1.0.tgz",
-          "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "center-align": "^0.1.1",
-            "right-align": "^0.1.1",
-            "wordwrap": "0.0.2"
-          }
-        },
-        "source-map": {
-          "version": "0.4.4",
-          "resolved": "http://localhost:4873/source-map/-/source-map-0.4.4.tgz",
-          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-          "dev": true,
-          "requires": {
-            "amdefine": ">=0.0.4"
-          }
-        },
-        "uglify-js": {
-          "version": "2.8.29",
-          "resolved": "http://localhost:4873/uglify-js/-/uglify-js-2.8.29.tgz",
-          "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "source-map": "~0.5.1",
-            "uglify-to-browserify": "~1.0.0",
-            "yargs": "~3.10.0"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "http://localhost:4873/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "yargs": {
-          "version": "3.10.0",
-          "resolved": "http://localhost:4873/yargs/-/yargs-3.10.0.tgz",
-          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "camelcase": "^1.0.2",
-            "cliui": "^2.1.0",
-            "decamelize": "^1.0.0",
-            "window-size": "0.1.0"
-          }
-        }
-      }
-    },
-    "happypack": {
-      "version": "4.0.0",
-      "resolved": "http://localhost:4873/happypack/-/happypack-4.0.0.tgz",
-      "integrity": "sha1-3hdw1HLasz4/MXgqPttOd8xlhjE=",
-      "dev": true,
-      "requires": {
-        "async": "1.5.0",
-        "json-stringify-safe": "5.0.1",
-        "loader-utils": "1.1.0",
-        "serialize-error": "^2.1.0"
-      },
-      "dependencies": {
-        "async": {
-          "version": "1.5.0",
-          "resolved": "http://localhost:4873/async/-/async-1.5.0.tgz",
-          "integrity": "sha1-J5ZkJyNXOFlWVjP8YnRES+4vjOM=",
-          "dev": true
-        }
-      }
-    },
-    "har-schema": {
-      "version": "1.0.5",
-      "resolved": "http://localhost:4873/har-schema/-/har-schema-1.0.5.tgz",
-      "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
-      "dev": true
-    },
-    "har-validator": {
-      "version": "4.2.1",
-      "resolved": "http://localhost:4873/har-validator/-/har-validator-4.2.1.tgz",
-      "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
-      "dev": true,
-      "requires": {
-        "ajv": "^4.9.1",
-        "har-schema": "^1.0.5"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "4.11.8",
-          "resolved": "http://localhost:4873/ajv/-/ajv-4.11.8.tgz",
-          "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
-          "dev": true,
-          "requires": {
-            "co": "^4.6.0",
-            "json-stable-stringify": "^1.0.1"
-          }
-        }
-      }
-    },
-    "has": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
-      "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
-      "requires": {
-        "function-bind": "^1.0.2"
-      }
-    },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "http://localhost:4873/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        }
-      }
-    },
-    "has-binary2": {
-      "version": "1.0.3",
-      "resolved": "http://localhost:4873/has-binary2/-/has-binary2-1.0.3.tgz",
-      "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
-      "dev": true,
-      "requires": {
-        "isarray": "2.0.1"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "2.0.1",
-          "resolved": "http://localhost:4873/isarray/-/isarray-2.0.1.tgz",
-          "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
-          "dev": true
-        }
-      }
-    },
-    "has-cors": {
-      "version": "1.1.0",
-      "resolved": "http://localhost:4873/has-cors/-/has-cors-1.1.0.tgz",
-      "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=",
-      "dev": true
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "http://localhost:4873/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
-    },
-    "has-gulplog": {
-      "version": "0.1.0",
-      "resolved": "http://localhost:4873/has-gulplog/-/has-gulplog-0.1.0.tgz",
-      "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
-      "dev": true,
-      "requires": {
-        "sparkles": "^1.0.0"
-      }
-    },
-    "has-unicode": {
-      "version": "2.0.1",
-      "resolved": "http://localhost:4873/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-      "dev": true
-    },
-    "has-value": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/has-value/-/has-value-1.0.0.tgz",
-      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-      "dev": true,
-      "requires": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
-      },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        }
-      }
-    },
-    "has-values": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/has-values/-/has-values-1.0.0.tgz",
-      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-      "dev": true,
-      "requires": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
-      },
-      "dependencies": {
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "http://localhost:4873/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "http://localhost:4873/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "kind-of": {
-          "version": "4.0.0",
-          "resolved": "http://localhost:4873/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "hash-base": {
-      "version": "3.0.4",
-      "resolved": "http://localhost:4873/hash-base/-/hash-base-3.0.4.tgz",
-      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "hash.js": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz",
-      "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "hawk": {
-      "version": "3.1.3",
-      "resolved": "http://localhost:4873/hawk/-/hawk-3.1.3.tgz",
-      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
-      "dev": true,
-      "requires": {
-        "boom": "2.x.x",
-        "cryptiles": "2.x.x",
-        "hoek": "2.x.x",
-        "sntp": "1.x.x"
-      }
-    },
-    "he": {
-      "version": "1.1.1",
-      "resolved": "http://localhost:4873/he/-/he-1.1.1.tgz",
-      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
-      "dev": true
-    },
-    "highlight.js": {
-      "version": "9.12.0",
-      "resolved": "http://localhost:4873/highlight.js/-/highlight.js-9.12.0.tgz",
-      "integrity": "sha1-5tnb5Xy+/mB1HwKvM2GVhwyQwB4=",
-      "dev": true
-    },
-    "hipchat-notifier": {
-      "version": "1.1.0",
-      "resolved": "http://localhost:4873/hipchat-notifier/-/hipchat-notifier-1.1.0.tgz",
-      "integrity": "sha1-ttJJdVQ3wZEII2d5nTupoPI7Ix4=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "lodash": "^4.0.0",
-        "request": "^2.0.0"
-      }
-    },
-    "hmac-drbg": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-      "dev": true,
-      "requires": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "hoek": {
-      "version": "2.16.3",
-      "resolved": "http://localhost:4873/hoek/-/hoek-2.16.3.tgz",
-      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-      "dev": true
-    },
-    "home-or-tmp": {
-      "version": "2.0.0",
-      "resolved": "http://localhost:4873/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
-      "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
-      "dev": true,
-      "requires": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.1"
-      }
-    },
-    "homedir-polyfill": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz",
-      "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=",
-      "dev": true,
-      "requires": {
-        "parse-passwd": "^1.0.0"
-      }
-    },
-    "hosted-git-info": {
-      "version": "2.6.0",
-      "resolved": "http://localhost:4873/hosted-git-info/-/hosted-git-info-2.6.0.tgz",
-      "integrity": "sha512-lIbgIIQA3lz5XaB6vxakj6sDHADJiZadYEJB+FgA+C4nubM1NwcuvUr9EJPmnH1skZqpqUzWborWo8EIUi0Sdw=="
-    },
-    "hpack.js": {
-      "version": "2.1.6",
-      "resolved": "http://localhost:4873/hpack.js/-/hpack.js-2.1.6.tgz",
-      "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "obuf": "^1.0.0",
-        "readable-stream": "^2.0.1",
-        "wbuf": "^1.1.0"
-      }
-    },
-    "html-comment-regex": {
-      "version": "1.1.1",
-      "resolved": "http://localhost:4873/html-comment-regex/-/html-comment-regex-1.1.1.tgz",
-      "integrity": "sha1-ZouTd26q5V696POtRkswekljYl4=",
-      "dev": true
-    },
-    "html-entities": {
-      "version": "1.2.1",
-      "resolved": "http://localhost:4873/html-entities/-/html-entities-1.2.1.tgz",
-      "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
-      "dev": true
-    },
-    "html-loader": {
-      "version": "0.4.4",
-      "resolved": "http://localhost:4873/html-loader/-/html-loader-0.4.4.tgz",
-      "integrity": "sha1-8rW5rNXgNf86tf02nBPJenuwFNo=",
-      "dev": true,
-      "requires": {
-        "es6-templates": "^0.2.2",
-        "fastparse": "^1.1.1",
-        "html-minifier": "^3.0.1",
-        "loader-utils": "^0.2.15",
-        "object-assign": "^4.1.0"
-      },
-      "dependencies": {
-        "loader-utils": {
-          "version": "0.2.17",
-          "resolved": "http://localhost:4873/loader-utils/-/loader-utils-0.2.17.tgz",
-          "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"
-          }
-        }
-      }
-    },
-    "html-minifier": {
-      "version": "3.5.16",
-      "resolved": "http://localhost:4873/html-minifier/-/html-minifier-3.5.16.tgz",
-      "integrity": "sha512-zP5EfLSpiLRp0aAgud4CQXPQZm9kXwWjR/cF0PfdOj+jjWnOaCgeZcll4kYXSvIBPeUMmyaSc7mM4IDtA+kboA==",
-      "dev": true,
-      "requires": {
-        "camel-case": "3.0.x",
-        "clean-css": "4.1.x",
-        "commander": "2.15.x",
-        "he": "1.1.x",
-        "param-case": "2.1.x",
-        "relateurl": "0.2.x",
-        "uglify-js": "3.3.x"
-      }
-    },
-    "html-webpack-plugin": {
-      "version": "2.28.0",
-      "resolved": "http://localhost:4873/html-webpack-plugin/-/html-webpack-plugin-2.28.0.tgz",
-      "integrity": "sha1-LnhjtX5f1I/iYzA+L/yTTDBk0Ak=",
-      "dev": true,
-      "requires": {
-        "bluebird": "^3.4.7",
-        "html-minifier": "^3.2.3",
-        "loader-utils": "^0.2.16",
-        "lodash": "^4.17.3",
-        "pretty-error": "^2.0.2",
-        "toposort": "^1.0.0"
-      },
-      "dependencies": {
-        "loader-utils": {
-          "version": "0.2.17",
-          "resolved": "http://localhost:4873/loader-utils/-/loader-utils-0.2.17.tgz",
-          "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"
-          }
-        }
-      }
-    },
-    "htmlparser2": {
-      "version": "3.3.0",
-      "resolved": "http://localhost:4873/htmlparser2/-/htmlparser2-3.3.0.tgz",
-      "integrity": "sha1-zHDQWln2VC5D8OaFyYLhTJJKnv4=",
-      "dev": true,
-      "requires": {
-        "domelementtype": "1",
-        "domhandler": "2.1",
-        "domutils": "1.1",
-        "readable-stream": "1.0"
-      },
-      "dependencies": {
-        "domutils": {
-          "version": "1.1.6",
-          "resolved": "http://localhost:4873/domutils/-/domutils-1.1.6.tgz",
-          "integrity": "sha1-vdw94Jm5ou+sxRxiPyj0FuzFdIU=",
-          "dev": true,
-          "requires": {
-            "domelementtype": "1"
-          }
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "http://localhost:4873/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "http://localhost:4873/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "http://localhost:4873/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        }
-      }
-    },
-    "http-deceiver": {
-      "version": "1.2.7",
-      "resolved": "http://localhost:4873/http-deceiver/-/http-deceiver-1.2.7.tgz",
-      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
-      "dev": true
-    },
-    "http-errors": {
-      "version": "1.6.3",
-      "resolved": "http://localhost:4873/http-errors/-/http-errors-1.6.3.tgz",
-      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
-      "dev": true,
-      "requires": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.0",
-        "statuses": ">= 1.4.0 < 2"
-      }
-    },
-    "http-parser-js": {
-      "version": "0.4.13",
-      "resolved": "http://localhost:4873/http-parser-js/-/http-parser-js-0.4.13.tgz",
-      "integrity": "sha1-O9bW/ebjFyyTNMOzO2wZPYD+ETc=",
-      "dev": true
-    },
-    "http-proxy": {
-      "version": "1.17.0",
-      "resolved": "http://localhost:4873/http-proxy/-/http-proxy-1.17.0.tgz",
-      "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
-      "dev": true,
-      "requires": {
-        "eventemitter3": "^3.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "http-proxy-agent": {
-      "version": "2.1.0",
-      "resolved": "http://localhost:4873/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
-      "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
-      "dev": true,
-      "requires": {
-        "agent-base": "4",
-        "debug": "3.1.0"
-      }
-    },
-    "http-proxy-middleware": {
-      "version": "0.17.4",
-      "resolved": "http://localhost:4873/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz",
-      "integrity": "sha1-ZC6ISIUdZvCdTxJJEoRtuutBuDM=",
-      "dev": true,
-      "requires": {
-        "http-proxy": "^1.16.2",
-        "is-glob": "^3.1.0",
-        "lodash": "^4.17.2",
-        "micromatch": "^2.3.11"
-      },
-      "dependencies": {
-        "is-extglob": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/is-extglob/-/is-extglob-2.1.1.tgz",
-          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "3.1.0",
-          "resolved": "http://localhost:4873/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.0"
-          }
-        }
-      }
-    },
-    "http-signature": {
-      "version": "1.1.1",
-      "resolved": "http://localhost:4873/http-signature/-/http-signature-1.1.1.tgz",
-      "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^0.2.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      }
-    },
-    "httpntlm": {
-      "version": "1.6.1",
-      "resolved": "http://localhost:4873/httpntlm/-/httpntlm-1.6.1.tgz",
-      "integrity": "sha1-rQFScUOi6Hc8+uapb1hla7UqNLI=",
-      "dev": true,
-      "requires": {
-        "httpreq": ">=0.4.22",
-        "underscore": "~1.7.0"
-      }
-    },
-    "httpreq": {
-      "version": "0.4.24",
-      "resolved": "http://localhost:4873/httpreq/-/httpreq-0.4.24.tgz",
-      "integrity": "sha1-QzX/2CzZaWaKOUZckprGHWOTYn8=",
-      "dev": true
-    },
-    "https-browserify": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/https-browserify/-/https-browserify-1.0.0.tgz",
-      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
-      "dev": true
-    },
-    "https-proxy-agent": {
-      "version": "2.2.1",
-      "resolved": "http://localhost:4873/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz",
-      "integrity": "sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==",
-      "dev": true,
-      "requires": {
-        "agent-base": "^4.1.0",
-        "debug": "^3.1.0"
-      }
-    },
-    "iconv-lite": {
-      "version": "0.4.19",
-      "resolved": "http://localhost:4873/iconv-lite/-/iconv-lite-0.4.19.tgz",
-      "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==",
-      "dev": true
-    },
-    "icss-replace-symbols": {
-      "version": "1.1.0",
-      "resolved": "http://localhost:4873/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
-      "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=",
-      "dev": true
-    },
-    "ieee754": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.11.tgz",
-      "integrity": "sha512-VhDzCKN7K8ufStx/CLj5/PDTMgph+qwN5Pkd5i0sGnVwk56zJ0lkT8Qzi1xqWLS0Wp29DgDtNeS7v8/wMoZeHg==",
-      "dev": true
-    },
-    "iferr": {
-      "version": "0.1.5",
-      "resolved": "http://localhost:4873/iferr/-/iferr-0.1.5.tgz",
-      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
-      "dev": true
-    },
-    "ignore": {
-      "version": "3.3.8",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.8.tgz",
-      "integrity": "sha512-pUh+xUQQhQzevjRHHFqqcTy0/dP/kS9I8HSrUydhihjuD09W6ldVWFtIrwhXdUJHis3i2rZNqEHpZH/cbinFbg==",
-      "dev": true
-    },
-    "image-size": {
-      "version": "0.5.5",
-      "resolved": "http://localhost:4873/image-size/-/image-size-0.5.5.tgz",
-      "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
-      "dev": true,
-      "optional": true
-    },
-    "import-lazy": {
-      "version": "2.1.0",
-      "resolved": "http://localhost:4873/import-lazy/-/import-lazy-2.1.0.tgz",
-      "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=",
-      "dev": true
-    },
-    "import-local": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/import-local/-/import-local-1.0.0.tgz",
-      "integrity": "sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==",
-      "dev": true,
-      "requires": {
-        "pkg-dir": "^2.0.0",
-        "resolve-cwd": "^2.0.0"
-      }
-    },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "http://localhost:4873/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true
-    },
-    "in-publish": {
-      "version": "2.0.0",
-      "resolved": "http://localhost:4873/in-publish/-/in-publish-2.0.0.tgz",
-      "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
-      "dev": true
-    },
-    "indent-string": {
-      "version": "2.1.0",
-      "resolved": "http://localhost:4873/indent-string/-/indent-string-2.1.0.tgz",
-      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-      "dev": true,
-      "requires": {
-        "repeating": "^2.0.0"
-      }
-    },
-    "indexes-of": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/indexes-of/-/indexes-of-1.0.1.tgz",
-      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
-      "dev": true
-    },
-    "indexof": {
-      "version": "0.0.1",
-      "resolved": "http://localhost:4873/indexof/-/indexof-0.0.1.tgz",
-      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
-      "dev": true
-    },
-    "inflection": {
-      "version": "1.12.0",
-      "resolved": "http://localhost:4873/inflection/-/inflection-1.12.0.tgz",
-      "integrity": "sha1-ogCTVlbW9fa8TcdQLhrstwMihBY=",
-      "dev": true,
-      "optional": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "http://localhost:4873/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.3",
-      "resolved": "http://localhost:4873/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-    },
-    "ini": {
-      "version": "1.3.5",
-      "resolved": "http://localhost:4873/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
-      "dev": true
-    },
-    "injection-js": {
-      "version": "2.2.1",
-      "resolved": "http://localhost:4873/injection-js/-/injection-js-2.2.1.tgz",
-      "integrity": "sha512-zHI+E+dM0PXix5FFTO1Y4/UOyAzE7zG1l/QwAn4jchTThOoBq+UYRFK4AVG7lQgFL+go62SbrzSsjXy9DFEZUg==",
-      "dev": true
-    },
-    "inquirer": {
-      "version": "3.0.6",
-      "resolved": "http://localhost:4873/inquirer/-/inquirer-3.0.6.tgz",
-      "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",
-        "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"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
-      }
-    },
-    "internal-ip": {
-      "version": "1.2.0",
-      "resolved": "http://localhost:4873/internal-ip/-/internal-ip-1.2.0.tgz",
-      "integrity": "sha1-rp+/k7mEh4eF1QqN4bNWlWBYz1w=",
-      "dev": true,
-      "requires": {
-        "meow": "^3.3.0"
-      }
-    },
-    "interpret": {
-      "version": "1.1.0",
-      "resolved": "http://localhost:4873/interpret/-/interpret-1.1.0.tgz",
-      "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=",
-      "dev": true
-    },
-    "intl": {
-      "version": "1.2.5",
-      "resolved": "http://localhost:4873/intl/-/intl-1.2.5.tgz",
-      "integrity": "sha1-giRKIZDE5Bn4Nx9ao02qNCDiq94="
-    },
-    "invariant": {
-      "version": "2.2.4",
-      "resolved": "http://localhost:4873/invariant/-/invariant-2.2.4.tgz",
-      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-      "dev": true,
-      "requires": {
-        "loose-envify": "^1.0.0"
-      }
-    },
-    "invert-kv": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
-    },
-    "ip": {
-      "version": "1.1.5",
-      "resolved": "http://localhost:4873/ip/-/ip-1.1.5.tgz",
-      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
-      "dev": true
-    },
-    "ipaddr.js": {
-      "version": "1.6.0",
-      "resolved": "http://localhost:4873/ipaddr.js/-/ipaddr.js-1.6.0.tgz",
-      "integrity": "sha1-4/o1e3c9phnybpXwSdBVxyeW+Gs=",
-      "dev": true
-    },
-    "is-absolute-url": {
-      "version": "2.1.0",
-      "resolved": "http://localhost:4873/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
-      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
-      "dev": true
-    },
-    "is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "http://localhost:4873/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      }
-    },
-    "is-alphabetical": {
-      "version": "1.0.2",
-      "resolved": "http://localhost:4873/is-alphabetical/-/is-alphabetical-1.0.2.tgz",
-      "integrity": "sha512-V0xN4BYezDHcBSKb1QHUFMlR4as/XEuCZBzMJUU4n7+Cbt33SmUnSol+pnXFvLxSHNq2CemUXNdaXV6Flg7+xg==",
-      "dev": true
-    },
-    "is-alphanumeric": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz",
-      "integrity": "sha1-Spzvcdr0wAHB2B1j0UDPU/1oifQ=",
-      "dev": true
-    },
-    "is-alphanumerical": {
-      "version": "1.0.2",
-      "resolved": "http://localhost:4873/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz",
-      "integrity": "sha512-pyfU/0kHdISIgslFfZN9nfY1Gk3MquQgUm1mJTjdkEPpkAKNWuBTSqFwewOpR7N351VkErCiyV71zX7mlQQqsg==",
-      "dev": true,
-      "requires": {
-        "is-alphabetical": "^1.0.0",
-        "is-decimal": "^1.0.0"
-      }
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "http://localhost:4873/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
-    },
-    "is-binary-path": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/is-binary-path/-/is-binary-path-1.0.1.tgz",
-      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-      "dev": true,
-      "requires": {
-        "binary-extensions": "^1.0.0"
-      }
-    },
-    "is-buffer": {
-      "version": "1.1.6",
-      "resolved": "http://localhost:4873/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "is-builtin-module": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
-      "requires": {
-        "builtin-modules": "^1.0.0"
-      }
-    },
-    "is-callable": {
-      "version": "1.1.3",
-      "resolved": "http://localhost:4873/is-callable/-/is-callable-1.1.3.tgz",
-      "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI="
-    },
-    "is-ci": {
-      "version": "1.1.0",
-      "resolved": "http://localhost:4873/is-ci/-/is-ci-1.1.0.tgz",
-      "integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==",
-      "dev": true,
-      "requires": {
-        "ci-info": "^1.0.0"
-      }
-    },
-    "is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "http://localhost:4873/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      }
-    },
-    "is-date-object": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/is-date-object/-/is-date-object-1.0.1.tgz",
-      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
-    },
-    "is-decimal": {
-      "version": "1.0.2",
-      "resolved": "http://localhost:4873/is-decimal/-/is-decimal-1.0.2.tgz",
-      "integrity": "sha512-TRzl7mOCchnhchN+f3ICUCzYvL9ul7R+TYOsZ8xia++knyZAJfv/uA1FvQXsAnYIl1T3B2X5E/J7Wb1QXiIBXg==",
-      "dev": true
-    },
-    "is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "http://localhost:4873/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "requires": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "http://localhost:4873/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        }
-      }
-    },
-    "is-directory": {
-      "version": "0.3.1",
-      "resolved": "http://localhost:4873/is-directory/-/is-directory-0.3.1.tgz",
-      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
-      "dev": true
-    },
-    "is-dotfile": {
-      "version": "1.0.3",
-      "resolved": "http://localhost:4873/is-dotfile/-/is-dotfile-1.0.3.tgz",
-      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
-      "dev": true
-    },
-    "is-equal-shallow": {
-      "version": "0.1.3",
-      "resolved": "http://localhost:4873/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
-      "dev": true,
-      "requires": {
-        "is-primitive": "^2.0.0"
-      }
-    },
-    "is-extendable": {
-      "version": "0.1.1",
-      "resolved": "http://localhost:4873/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true
-    },
-    "is-extglob": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-      "dev": true
-    },
-    "is-finite": {
-      "version": "1.0.2",
-      "resolved": "http://localhost:4873/is-finite/-/is-finite-1.0.2.tgz",
-      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-      "dev": true,
-      "requires": {
-        "number-is-nan": "^1.0.0"
-      }
-    },
-    "is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "http://localhost:4873/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-    },
-    "is-glob": {
-      "version": "2.0.1",
-      "resolved": "http://localhost:4873/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-      "dev": true,
-      "requires": {
-        "is-extglob": "^1.0.0"
-      }
-    },
-    "is-hexadecimal": {
-      "version": "1.0.2",
-      "resolved": "http://localhost:4873/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz",
-      "integrity": "sha512-but/G3sapV3MNyqiDBLrOi4x8uCIw0RY3o/Vb5GT0sMFHrVV7731wFSVy41T5FO1og7G0gXLJh0MkgPRouko/A==",
-      "dev": true
-    },
-    "is-installed-globally": {
-      "version": "0.1.0",
-      "resolved": "http://localhost:4873/is-installed-globally/-/is-installed-globally-0.1.0.tgz",
-      "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=",
-      "dev": true,
-      "requires": {
-        "global-dirs": "^0.1.0",
-        "is-path-inside": "^1.0.0"
-      }
-    },
-    "is-module": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/is-module/-/is-module-1.0.0.tgz",
-      "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=",
-      "dev": true
-    },
-    "is-my-ip-valid": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz",
-      "integrity": "sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==",
-      "dev": true,
-      "optional": true
-    },
-    "is-my-json-valid": {
-      "version": "2.17.2",
-      "resolved": "http://localhost:4873/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz",
-      "integrity": "sha512-IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg==",
-      "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"
-      }
-    },
-    "is-npm": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/is-npm/-/is-npm-1.0.0.tgz",
-      "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=",
-      "dev": true
-    },
-    "is-number": {
-      "version": "2.1.0",
-      "resolved": "http://localhost:4873/is-number/-/is-number-2.1.0.tgz",
-      "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      }
-    },
-    "is-obj": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/is-obj/-/is-obj-1.0.1.tgz",
-      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
-      "dev": true
-    },
-    "is-odd": {
-      "version": "2.0.0",
-      "resolved": "http://localhost:4873/is-odd/-/is-odd-2.0.0.tgz",
-      "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==",
-      "dev": true,
-      "requires": {
-        "is-number": "^4.0.0"
-      },
-      "dependencies": {
-        "is-number": {
-          "version": "4.0.0",
-          "resolved": "http://localhost:4873/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-          "dev": true
-        }
-      }
-    },
-    "is-path-cwd": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
-      "dev": true
-    },
-    "is-path-in-cwd": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
-      "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
-      "dev": true,
-      "requires": {
-        "is-path-inside": "^1.0.0"
-      }
-    },
-    "is-path-inside": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/is-path-inside/-/is-path-inside-1.0.1.tgz",
-      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
-      "dev": true,
-      "requires": {
-        "path-is-inside": "^1.0.1"
-      }
-    },
-    "is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "http://localhost:4873/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-      "dev": true
-    },
-    "is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "http://localhost:4873/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.1"
-      },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        }
-      }
-    },
-    "is-posix-bracket": {
-      "version": "0.1.1",
-      "resolved": "http://localhost:4873/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
-      "dev": true
-    },
-    "is-primitive": {
-      "version": "2.0.0",
-      "resolved": "http://localhost:4873/is-primitive/-/is-primitive-2.0.0.tgz",
-      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-      "dev": true
-    },
-    "is-promise": {
-      "version": "2.1.0",
-      "resolved": "http://localhost:4873/is-promise/-/is-promise-2.1.0.tgz",
-      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
-      "dev": true
-    },
-    "is-property": {
-      "version": "1.0.2",
-      "resolved": "http://localhost:4873/is-property/-/is-property-1.0.2.tgz",
-      "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
-      "dev": true,
-      "optional": true
-    },
-    "is-redirect": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/is-redirect/-/is-redirect-1.0.0.tgz",
-      "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
-      "dev": true
-    },
-    "is-regex": {
-      "version": "1.0.4",
-      "resolved": "http://localhost:4873/is-regex/-/is-regex-1.0.4.tgz",
-      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
-      "requires": {
-        "has": "^1.0.1"
-      }
-    },
-    "is-retry-allowed": {
-      "version": "1.1.0",
-      "resolved": "http://localhost:4873/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
-      "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
-      "dev": true
-    },
-    "is-stream": {
-      "version": "1.1.0",
-      "resolved": "http://localhost:4873/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
-    },
-    "is-svg": {
-      "version": "2.1.0",
-      "resolved": "http://localhost:4873/is-svg/-/is-svg-2.1.0.tgz",
-      "integrity": "sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=",
-      "dev": true,
-      "requires": {
-        "html-comment-regex": "^1.1.0"
-      }
-    },
-    "is-symbol": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/is-symbol/-/is-symbol-1.0.1.tgz",
-      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI="
-    },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "dev": true
-    },
-    "is-utf8": {
-      "version": "0.2.1",
-      "resolved": "http://localhost:4873/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-      "dev": true
-    },
-    "is-whitespace-character": {
-      "version": "1.0.2",
-      "resolved": "http://localhost:4873/is-whitespace-character/-/is-whitespace-character-1.0.2.tgz",
-      "integrity": "sha512-SzM+T5GKUCtLhlHFKt2SDAX2RFzfS6joT91F2/WSi9LxgFdsnhfPK/UIA+JhRR2xuyLdrCys2PiFDrtn1fU5hQ==",
-      "dev": true
-    },
-    "is-windows": {
-      "version": "1.0.2",
-      "resolved": "http://localhost:4873/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true
-    },
-    "is-word-character": {
-      "version": "1.0.2",
-      "resolved": "http://localhost:4873/is-word-character/-/is-word-character-1.0.2.tgz",
-      "integrity": "sha512-T3FlsX8rCHAH8e7RE7PfOPZVFQlcV3XRF9eOOBQ1uf70OxO7CjjSOjeImMPCADBdYWcStAbVbYvJ1m2D3tb+EA==",
-      "dev": true
-    },
-    "is-wsl": {
-      "version": "1.1.0",
-      "resolved": "http://localhost:4873/is-wsl/-/is-wsl-1.1.0.tgz",
-      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0="
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-    },
-    "isbinaryfile": {
-      "version": "3.0.2",
-      "resolved": "http://localhost:4873/isbinaryfile/-/isbinaryfile-3.0.2.tgz",
-      "integrity": "sha1-Sj6XTsDLqQBNP8bN5yCeppNopiE=",
-      "dev": true
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "http://localhost:4873/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
-    },
-    "isobject": {
-      "version": "2.1.0",
-      "resolved": "http://localhost:4873/isobject/-/isobject-2.1.0.tgz",
-      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-      "dev": true,
-      "requires": {
-        "isarray": "1.0.0"
-      }
-    },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "http://localhost:4873/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-      "dev": true
-    },
-    "istanbul": {
-      "version": "0.4.5",
-      "resolved": "http://localhost:4873/istanbul/-/istanbul-0.4.5.tgz",
-      "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
-      "dev": true,
-      "requires": {
-        "abbrev": "1.0.x",
-        "async": "1.x",
-        "escodegen": "1.8.x",
-        "esprima": "2.7.x",
-        "glob": "^5.0.15",
-        "handlebars": "^4.0.1",
-        "js-yaml": "3.x",
-        "mkdirp": "0.5.x",
-        "nopt": "3.x",
-        "once": "1.x",
-        "resolve": "1.1.x",
-        "supports-color": "^3.1.0",
-        "which": "^1.1.1",
-        "wordwrap": "^1.0.0"
-      },
-      "dependencies": {
-        "abbrev": {
-          "version": "1.0.9",
-          "resolved": "http://localhost:4873/abbrev/-/abbrev-1.0.9.tgz",
-          "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
-          "dev": true
-        },
-        "async": {
-          "version": "1.5.2",
-          "resolved": "http://localhost:4873/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-          "dev": true
-        },
-        "escodegen": {
-          "version": "1.8.1",
-          "resolved": "http://localhost:4873/escodegen/-/escodegen-1.8.1.tgz",
-          "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": {
-          "version": "2.7.3",
-          "resolved": "http://localhost:4873/esprima/-/esprima-2.7.3.tgz",
-          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
-          "dev": true
-        },
-        "estraverse": {
-          "version": "1.9.3",
-          "resolved": "http://localhost:4873/estraverse/-/estraverse-1.9.3.tgz",
-          "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=",
-          "dev": true
-        },
-        "glob": {
-          "version": "5.0.15",
-          "resolved": "http://localhost:4873/glob/-/glob-5.0.15.tgz",
-          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-          "dev": true,
-          "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "nopt": {
-          "version": "3.0.6",
-          "resolved": "http://localhost:4873/nopt/-/nopt-3.0.6.tgz",
-          "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-          "dev": true,
-          "requires": {
-            "abbrev": "1"
-          }
-        },
-        "resolve": {
-          "version": "1.1.7",
-          "resolved": "http://localhost:4873/resolve/-/resolve-1.1.7.tgz",
-          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.2.0",
-          "resolved": "http://localhost:4873/source-map/-/source-map-0.2.0.tgz",
-          "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "amdefine": ">=0.0.4"
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        },
-        "wordwrap": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/wordwrap/-/wordwrap-1.0.0.tgz",
-          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
-          "dev": true
-        }
-      }
-    },
-    "istanbul-api": {
-      "version": "1.3.1",
-      "resolved": "http://localhost:4873/istanbul-api/-/istanbul-api-1.3.1.tgz",
-      "integrity": "sha512-duj6AlLcsWNwUpfyfHt0nWIeRiZpuShnP40YTxOGQgtaN8fd6JYSxsvxUphTDy8V5MfDXo4s/xVCIIvVCO808g==",
-      "dev": true,
-      "requires": {
-        "async": "^2.1.4",
-        "compare-versions": "^3.1.0",
-        "fileset": "^2.0.2",
-        "istanbul-lib-coverage": "^1.2.0",
-        "istanbul-lib-hook": "^1.2.0",
-        "istanbul-lib-instrument": "^1.10.1",
-        "istanbul-lib-report": "^1.1.4",
-        "istanbul-lib-source-maps": "^1.2.4",
-        "istanbul-reports": "^1.3.0",
-        "js-yaml": "^3.7.0",
-        "mkdirp": "^0.5.1",
-        "once": "^1.4.0"
-      }
-    },
-    "istanbul-instrumenter-loader": {
-      "version": "3.0.0",
-      "resolved": "http://localhost:4873/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.0.tgz",
-      "integrity": "sha512-alLSEFX06ApU75sm5oWcaVNaiss/bgMRiWTct3g0P0ZZTKjR+6QiCcuVOKDI1kWJgwHEnIXsv/dWm783kPpmtw==",
-      "dev": true,
-      "requires": {
-        "convert-source-map": "^1.5.0",
-        "istanbul-lib-instrument": "^1.7.3",
-        "loader-utils": "^1.1.0",
-        "schema-utils": "^0.3.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "5.5.2",
-          "resolved": "http://localhost:4873/ajv/-/ajv-5.5.2.tgz",
-          "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-          "dev": true,
-          "requires": {
-            "co": "^4.6.0",
-            "fast-deep-equal": "^1.0.0",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.3.0"
-          }
-        },
-        "fast-deep-equal": {
-          "version": "1.1.0",
-          "resolved": "http://localhost:4873/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-          "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "0.3.0",
-          "resolved": "http://localhost:4873/schema-utils/-/schema-utils-0.3.0.tgz",
-          "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
-          "dev": true,
-          "requires": {
-            "ajv": "^5.0.0"
-          }
-        }
-      }
-    },
-    "istanbul-lib-coverage": {
-      "version": "1.2.0",
-      "resolved": "http://localhost:4873/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz",
-      "integrity": "sha512-GvgM/uXRwm+gLlvkWHTjDAvwynZkL9ns15calTrmhGgowlwJBbWMYzWbKqE2DT6JDP1AFXKa+Zi0EkqNCUqY0A==",
-      "dev": true
-    },
-    "istanbul-lib-hook": {
-      "version": "1.2.0",
-      "resolved": "http://localhost:4873/istanbul-lib-hook/-/istanbul-lib-hook-1.2.0.tgz",
-      "integrity": "sha512-p3En6/oGkFQV55Up8ZPC2oLxvgSxD8CzA0yBrhRZSh3pfv3OFj9aSGVC0yoerAi/O4u7jUVnOGVX1eVFM+0tmQ==",
-      "dev": true,
-      "requires": {
-        "append-transform": "^0.4.0"
-      }
-    },
-    "istanbul-lib-instrument": {
-      "version": "1.10.1",
-      "resolved": "http://localhost:4873/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.1.tgz",
-      "integrity": "sha512-1dYuzkOCbuR5GRJqySuZdsmsNKPL3PTuyPevQfoCXJePT9C8y1ga75neU+Tuy9+yS3G/dgx8wgOmp2KLpgdoeQ==",
-      "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.0",
-        "semver": "^5.3.0"
-      }
-    },
-    "istanbul-lib-report": {
-      "version": "1.1.4",
-      "resolved": "http://localhost:4873/istanbul-lib-report/-/istanbul-lib-report-1.1.4.tgz",
-      "integrity": "sha512-Azqvq5tT0U09nrncK3q82e/Zjkxa4tkFZv7E6VcqP0QCPn6oNljDPfrZEC/umNXds2t7b8sRJfs6Kmpzt8m2kA==",
-      "dev": true,
-      "requires": {
-        "istanbul-lib-coverage": "^1.2.0",
-        "mkdirp": "^0.5.1",
-        "path-parse": "^1.0.5",
-        "supports-color": "^3.1.2"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "istanbul-lib-source-maps": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.4.tgz",
-      "integrity": "sha512-UzuK0g1wyQijiaYQxj/CdNycFhAd2TLtO2obKQMTZrZ1jzEMRY3rvpASEKkaxbRR6brvdovfA03znPa/pXcejg==",
-      "dev": true,
-      "requires": {
-        "debug": "^3.1.0",
-        "istanbul-lib-coverage": "^1.2.0",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.6.1",
-        "source-map": "^0.5.3"
-      }
-    },
-    "istanbul-reports": {
-      "version": "1.3.0",
-      "resolved": "http://localhost:4873/istanbul-reports/-/istanbul-reports-1.3.0.tgz",
-      "integrity": "sha512-y2Z2IMqE1gefWUaVjrBm0mSKvUkaBy9Vqz8iwr/r40Y9hBbIteH5wqHG/9DLTfJ9xUnUT2j7A3+VVJ6EaYBllA==",
-      "dev": true,
-      "requires": {
-        "handlebars": "^4.0.3"
-      }
-    },
-    "jasmine": {
-      "version": "2.99.0",
-      "resolved": "http://localhost:4873/jasmine/-/jasmine-2.99.0.tgz",
-      "integrity": "sha1-jKctEC5jm4Z8ZImFbg4YqceqQrc=",
-      "dev": true,
-      "requires": {
-        "exit": "^0.1.2",
-        "glob": "^7.0.6",
-        "jasmine-core": "~2.99.0"
-      },
-      "dependencies": {
-        "jasmine-core": {
-          "version": "2.99.1",
-          "resolved": "http://localhost:4873/jasmine-core/-/jasmine-core-2.99.1.tgz",
-          "integrity": "sha1-5kAN8ea1bhMLYcS80JPap/boyhU=",
-          "dev": true
-        }
-      }
-    },
-    "jasmine-ajax": {
-      "version": "3.2.0",
-      "resolved": "http://localhost:4873/jasmine-ajax/-/jasmine-ajax-3.2.0.tgz",
-      "integrity": "sha1-ChYAt9PFA6OQT4Bnm4Z5hahOR1Y=",
-      "dev": true
-    },
-    "jasmine-core": {
-      "version": "2.8.0",
-      "resolved": "http://localhost:4873/jasmine-core/-/jasmine-core-2.8.0.tgz",
-      "integrity": "sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=",
-      "dev": true
-    },
-    "jasmine-spec-reporter": {
-      "version": "4.2.1",
-      "resolved": "http://localhost:4873/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz",
-      "integrity": "sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==",
-      "dev": true,
-      "requires": {
-        "colors": "1.1.2"
-      }
-    },
-    "jasminewd2": {
-      "version": "2.2.0",
-      "resolved": "http://localhost:4873/jasminewd2/-/jasminewd2-2.2.0.tgz",
-      "integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=",
-      "dev": true
-    },
-    "js-base64": {
-      "version": "2.4.5",
-      "resolved": "http://localhost:4873/js-base64/-/js-base64-2.4.5.tgz",
-      "integrity": "sha512-aUnNwqMOXw3yvErjMPSQu6qIIzUmT1e5KcU1OZxRDU1g/am6mzBvcrmLAYwzmB59BHPrh5/tKaiF4OPhqRWESQ==",
-      "dev": true
-    },
-    "js-beautify": {
-      "version": "1.7.5",
-      "resolved": "http://localhost:4873/js-beautify/-/js-beautify-1.7.5.tgz",
-      "integrity": "sha512-9OhfAqGOrD7hoQBLJMTA+BKuKmoEtTJXzZ7WDF/9gvjtey1koVLuZqIY6c51aPDjbNdNtIXAkiWKVhziawE9Og==",
-      "dev": true,
-      "requires": {
-        "config-chain": "~1.1.5",
-        "editorconfig": "^0.13.2",
-        "mkdirp": "~0.5.0",
-        "nopt": "~3.0.1"
-      },
-      "dependencies": {
-        "nopt": {
-          "version": "3.0.6",
-          "resolved": "http://localhost:4873/nopt/-/nopt-3.0.6.tgz",
-          "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-          "dev": true,
-          "requires": {
-            "abbrev": "1"
-          }
-        }
-      }
-    },
-    "js-tokens": {
-      "version": "3.0.2",
-      "resolved": "http://localhost:4873/js-tokens/-/js-tokens-3.0.2.tgz",
-      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-      "dev": true
-    },
-    "js-yaml": {
-      "version": "3.11.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz",
-      "integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==",
-      "dev": true,
-      "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      }
-    },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "http://localhost:4873/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true,
-      "optional": true
-    },
-    "jsesc": {
-      "version": "1.3.0",
-      "resolved": "http://localhost:4873/jsesc/-/jsesc-1.3.0.tgz",
-      "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
-      "dev": true
-    },
-    "json-loader": {
-      "version": "0.5.7",
-      "resolved": "http://localhost:4873/json-loader/-/json-loader-0.5.7.tgz",
-      "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
-      "dev": true
-    },
-    "json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "http://localhost:4873/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
-    },
-    "json-schema": {
-      "version": "0.2.3",
-      "resolved": "http://localhost:4873/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-      "dev": true
-    },
-    "json-schema-migrate": {
-      "version": "0.2.0",
-      "resolved": "http://localhost:4873/json-schema-migrate/-/json-schema-migrate-0.2.0.tgz",
-      "integrity": "sha1-ukelsAcvxyOWRg4b1gtE1SF4u8Y=",
-      "dev": true,
-      "requires": {
-        "ajv": "^5.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "5.5.2",
-          "resolved": "http://localhost:4873/ajv/-/ajv-5.5.2.tgz",
-          "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-          "dev": true,
-          "requires": {
-            "co": "^4.6.0",
-            "fast-deep-equal": "^1.0.0",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.3.0"
-          }
-        },
-        "fast-deep-equal": {
-          "version": "1.1.0",
-          "resolved": "http://localhost:4873/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-          "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
-          "dev": true
-        }
-      }
-    },
-    "json-schema-traverse": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
-    },
-    "json-stable-stringify": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
-      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-      "dev": true,
-      "requires": {
-        "jsonify": "~0.0.0"
-      }
-    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "http://localhost:4873/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-      "dev": true
-    },
-    "json3": {
-      "version": "3.3.2",
-      "resolved": "http://localhost:4873/json3/-/json3-3.3.2.tgz",
-      "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
-      "dev": true
-    },
-    "json5": {
-      "version": "0.5.1",
-      "resolved": "http://localhost:4873/json5/-/json5-0.5.1.tgz",
-      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE="
-    },
-    "jsonfile": {
-      "version": "4.0.0",
-      "resolved": "http://localhost:4873/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "jsonify": {
-      "version": "0.0.0",
-      "resolved": "http://localhost:4873/jsonify/-/jsonify-0.0.0.tgz",
-      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
-    },
-    "jsonpointer": {
-      "version": "4.0.1",
-      "resolved": "http://localhost:4873/jsonpointer/-/jsonpointer-4.0.1.tgz",
-      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
-      "dev": true,
-      "optional": true
-    },
-    "jsprim": {
-      "version": "1.4.1",
-      "resolved": "http://localhost:4873/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
-        }
-      }
-    },
-    "jsrsasign": {
-      "version": "8.0.12",
-      "resolved": "http://localhost:4873/jsrsasign/-/jsrsasign-8.0.12.tgz",
-      "integrity": "sha1-Iqu5ZW00owuVMENnIINeicLlwxY="
-    },
-    "karma": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-2.0.2.tgz",
-      "integrity": "sha1-TS25QChQpmVR+nhLAWT7CCTtjEs=",
-      "dev": true,
-      "requires": {
-        "bluebird": "^3.3.0",
-        "body-parser": "^1.16.1",
-        "chokidar": "^1.4.1",
-        "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.3.9",
-        "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",
-        "socket.io": "2.0.4",
-        "source-map": "^0.6.1",
-        "tmp": "0.0.33",
-        "useragent": "2.2.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "karma-chrome-launcher": {
-      "version": "2.2.0",
-      "resolved": "http://localhost:4873/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz",
-      "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==",
-      "dev": true,
-      "requires": {
-        "fs-access": "^1.0.0",
-        "which": "^1.2.1"
-      }
-    },
-    "karma-cli": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/karma-cli/-/karma-cli-1.0.1.tgz",
-      "integrity": "sha1-rmw8WKMTodALRRZMRVubhs4X+WA=",
-      "dev": true,
-      "requires": {
-        "resolve": "^1.1.6"
-      }
-    },
-    "karma-coverage": {
-      "version": "1.1.1",
-      "resolved": "http://localhost:4873/karma-coverage/-/karma-coverage-1.1.1.tgz",
-      "integrity": "sha1-Wv+LOc9plNwi3kyENix2ABtjfPY=",
-      "dev": true,
-      "requires": {
-        "dateformat": "^1.0.6",
-        "istanbul": "^0.4.0",
-        "lodash": "^3.8.0",
-        "minimatch": "^3.0.0",
-        "source-map": "^0.5.1"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "3.10.1",
-          "resolved": "http://localhost:4873/lodash/-/lodash-3.10.1.tgz",
-          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
-          "dev": true
-        }
-      }
-    },
-    "karma-coverage-istanbul-reporter": {
-      "version": "1.4.3",
-      "resolved": "http://localhost:4873/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-1.4.3.tgz",
-      "integrity": "sha1-O13/RmT6W41RlrmInj9hwforgNk=",
-      "dev": true,
-      "requires": {
-        "istanbul-api": "^1.3.1",
-        "minimatch": "^3.0.4"
-      }
-    },
-    "karma-jasmine": {
-      "version": "1.1.2",
-      "resolved": "http://localhost:4873/karma-jasmine/-/karma-jasmine-1.1.2.tgz",
-      "integrity": "sha1-OU8rJf+0pkS5rabyLUQ+L9CIhsM=",
-      "dev": true
-    },
-    "karma-jasmine-ajax": {
-      "version": "0.1.13",
-      "resolved": "http://localhost:4873/karma-jasmine-ajax/-/karma-jasmine-ajax-0.1.13.tgz",
-      "integrity": "sha1-eLuS2Jb+MqJaGACYxHci4dlgW/w=",
-      "dev": true,
-      "requires": {
-        "jasmine-ajax": "^3.0.0"
-      }
-    },
-    "karma-jasmine-html-reporter": {
-      "version": "0.2.2",
-      "resolved": "http://localhost:4873/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-0.2.2.tgz",
-      "integrity": "sha1-SKjl7xiAdhfuK14zwRlMNbQ5Ukw=",
-      "dev": true,
-      "requires": {
-        "karma-jasmine": "^1.0.2"
-      }
-    },
-    "karma-mocha-reporter": {
-      "version": "2.2.2",
-      "resolved": "http://localhost:4873/karma-mocha-reporter/-/karma-mocha-reporter-2.2.2.tgz",
-      "integrity": "sha1-h23poockTlSmCFkXMqmOZmEfar4=",
-      "dev": true,
-      "requires": {
-        "chalk": "1.1.3"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
-      }
-    },
-    "karma-remap-istanbul": {
-      "version": "0.6.0",
-      "resolved": "http://localhost:4873/karma-remap-istanbul/-/karma-remap-istanbul-0.6.0.tgz",
-      "integrity": "sha1-l/O3cAZSVPm0ck8tm+SjouG69vw=",
-      "dev": true,
-      "requires": {
-        "istanbul": "^0.4.3",
-        "remap-istanbul": "^0.9.0"
-      },
-      "dependencies": {
-        "process-nextick-args": {
-          "version": "1.0.7",
-          "resolved": "http://localhost:4873/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-          "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.0.6",
-          "resolved": "http://localhost:4873/readable-stream/-/readable-stream-2.0.6.tgz",
-          "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"
-          }
-        },
-        "remap-istanbul": {
-          "version": "0.9.6",
-          "resolved": "http://localhost:4873/remap-istanbul/-/remap-istanbul-0.9.6.tgz",
-          "integrity": "sha512-l0WDBsVjaTzP8m3glERJO6bjlAFUahcgfcgvcX+owZw7dKeDLT3CVRpS7UO4L9LfGcMiNsqk223HopwVxlh8Hg==",
-          "dev": true,
-          "requires": {
-            "amdefine": "^1.0.0",
-            "gulp-util": "3.0.7",
-            "istanbul": "0.4.5",
-            "minimatch": "^3.0.3",
-            "source-map": "^0.6.1",
-            "through2": "2.0.1"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "http://localhost:4873/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "http://localhost:4873/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        },
-        "through2": {
-          "version": "2.0.1",
-          "resolved": "http://localhost:4873/through2/-/through2-2.0.1.tgz",
-          "integrity": "sha1-OE51MU1J8y3hLuu4E2uOtrXVnak=",
-          "dev": true,
-          "requires": {
-            "readable-stream": "~2.0.0",
-            "xtend": "~4.0.0"
-          }
-        }
-      }
-    },
-    "karma-source-map-support": {
-      "version": "1.3.0",
-      "resolved": "http://localhost:4873/karma-source-map-support/-/karma-source-map-support-1.3.0.tgz",
-      "integrity": "sha512-HcPqdAusNez/ywa+biN4EphGz62MmQyPggUsDfsHqa7tSe4jdsxgvTKuDfIazjL+IOxpVWyT7Pr4dhAV+sxX5Q==",
-      "dev": true,
-      "requires": {
-        "source-map-support": "^0.5.5"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "http://localhost:4873/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "source-map-support": {
-          "version": "0.5.6",
-          "resolved": "http://localhost:4873/source-map-support/-/source-map-support-0.5.6.tgz",
-          "integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==",
-          "dev": true,
-          "requires": {
-            "buffer-from": "^1.0.0",
-            "source-map": "^0.6.0"
-          }
-        }
-      }
-    },
-    "karma-sourcemap-loader": {
-      "version": "0.3.7",
-      "resolved": "http://localhost:4873/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz",
-      "integrity": "sha1-kTIsd/jxPUb+0GKwQuEAnUxFBdg=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2"
-      }
-    },
-    "karma-systemjs": {
-      "version": "0.16.0",
-      "resolved": "http://localhost:4873/karma-systemjs/-/karma-systemjs-0.16.0.tgz",
-      "integrity": "sha1-/iyB+vpkm8j9DuyMxba9dRXB8V0=",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.16.2",
-        "minimatch": "^3.0.0"
-      }
-    },
-    "karma-webpack": {
-      "version": "2.0.9",
-      "resolved": "http://localhost:4873/karma-webpack/-/karma-webpack-2.0.9.tgz",
-      "integrity": "sha512-F1j3IG/XhiMzcunAXbWXH95uizjzr3WdTzmVWlta8xqxcCtAu9FByCb4sccIMxaVFAefpgnUW9KlCo0oLvIX6A==",
-      "dev": true,
-      "requires": {
-        "async": "~0.9.0",
-        "loader-utils": "^0.2.5",
-        "lodash": "^3.8.0",
-        "source-map": "^0.5.6",
-        "webpack-dev-middleware": "^1.12.0"
-      },
-      "dependencies": {
-        "async": {
-          "version": "0.9.2",
-          "resolved": "http://localhost:4873/async/-/async-0.9.2.tgz",
-          "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
-          "dev": true
-        },
-        "loader-utils": {
-          "version": "0.2.17",
-          "resolved": "http://localhost:4873/loader-utils/-/loader-utils-0.2.17.tgz",
-          "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"
-          }
-        },
-        "lodash": {
-          "version": "3.10.1",
-          "resolved": "http://localhost:4873/lodash/-/lodash-3.10.1.tgz",
-          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
-          "dev": true
-        }
-      }
-    },
-    "killable": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/killable/-/killable-1.0.0.tgz",
-      "integrity": "sha1-2ouEvUfeU5WHj5XWTQLyRJ/gXms=",
-      "dev": true
-    },
-    "kind-of": {
-      "version": "3.2.2",
-      "resolved": "http://localhost:4873/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "requires": {
-        "is-buffer": "^1.1.5"
-      }
-    },
-    "klaw": {
-      "version": "1.3.1",
-      "resolved": "http://localhost:4873/klaw/-/klaw-1.3.1.tgz",
-      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.9"
-      }
-    },
-    "latest-version": {
-      "version": "3.1.0",
-      "resolved": "http://localhost:4873/latest-version/-/latest-version-3.1.0.tgz",
-      "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=",
-      "dev": true,
-      "requires": {
-        "package-json": "^4.0.0"
-      }
-    },
-    "lazy-cache": {
-      "version": "1.0.4",
-      "resolved": "http://localhost:4873/lazy-cache/-/lazy-cache-1.0.4.tgz",
-      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
-      "dev": true
-    },
-    "lcid": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-      "requires": {
-        "invert-kv": "^1.0.0"
-      }
-    },
-    "less": {
-      "version": "2.7.3",
-      "resolved": "http://localhost:4873/less/-/less-2.7.3.tgz",
-      "integrity": "sha512-KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ==",
-      "dev": true,
-      "requires": {
-        "errno": "^0.1.1",
-        "graceful-fs": "^4.1.2",
-        "image-size": "~0.5.0",
-        "mime": "^1.2.11",
-        "mkdirp": "^0.5.0",
-        "promise": "^7.1.1",
-        "request": "2.81.0",
-        "source-map": "^0.5.3"
-      }
-    },
-    "less-loader": {
-      "version": "4.1.0",
-      "resolved": "http://localhost:4873/less-loader/-/less-loader-4.1.0.tgz",
-      "integrity": "sha512-KNTsgCE9tMOM70+ddxp9yyt9iHqgmSs0yTZc5XH5Wo+g80RWRIYNqE58QJKm/yMud5wZEvz50ugRDuzVIkyahg==",
-      "dev": true,
-      "requires": {
-        "clone": "^2.1.1",
-        "loader-utils": "^1.1.0",
-        "pify": "^3.0.0"
-      }
-    },
-    "levn": {
-      "version": "0.3.0",
-      "resolved": "http://localhost:4873/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      }
-    },
-    "libbase64": {
-      "version": "0.1.0",
-      "resolved": "http://localhost:4873/libbase64/-/libbase64-0.1.0.tgz",
-      "integrity": "sha1-YjUag5VjrF/1vSbxL2Dpgwu3UeY=",
-      "dev": true
-    },
-    "libmime": {
-      "version": "3.0.0",
-      "resolved": "http://localhost:4873/libmime/-/libmime-3.0.0.tgz",
-      "integrity": "sha1-UaGp50SOy9Ms2lRCFnW7IbwJPaY=",
-      "dev": true,
-      "requires": {
-        "iconv-lite": "0.4.15",
-        "libbase64": "0.1.0",
-        "libqp": "1.1.0"
-      },
-      "dependencies": {
-        "iconv-lite": {
-          "version": "0.4.15",
-          "resolved": "http://localhost:4873/iconv-lite/-/iconv-lite-0.4.15.tgz",
-          "integrity": "sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es=",
-          "dev": true
-        }
-      }
-    },
-    "libqp": {
-      "version": "1.1.0",
-      "resolved": "http://localhost:4873/libqp/-/libqp-1.1.0.tgz",
-      "integrity": "sha1-9ebgatdLeU+1tbZpiL9yjvHe2+g=",
-      "dev": true
-    },
-    "license-webpack-plugin": {
-      "version": "1.3.1",
-      "resolved": "http://localhost:4873/license-webpack-plugin/-/license-webpack-plugin-1.3.1.tgz",
-      "integrity": "sha512-NqAFodJdpBUuf1iD+Ij8hQvF0rCFKlO2KaieoQzAPhFgzLCtJnC7Z7x5gQbGNjoe++wOKAtAmwVEIBLqq2Yp1A==",
-      "dev": true,
-      "requires": {
-        "ejs": "^2.5.7"
-      }
-    },
-    "linkify-it": {
-      "version": "2.0.3",
-      "resolved": "http://localhost:4873/linkify-it/-/linkify-it-2.0.3.tgz",
-      "integrity": "sha1-2UpGSPmxwXnWT6lykSaL22zpQ08=",
-      "dev": true,
-      "requires": {
-        "uc.micro": "^1.0.1"
-      }
-    },
-    "list-item": {
-      "version": "1.1.1",
-      "resolved": "http://localhost:4873/list-item/-/list-item-1.1.1.tgz",
-      "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"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "http://localhost:4873/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "load-json-file": {
-      "version": "4.0.0",
-      "resolved": "http://localhost:4873/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"
-      }
-    },
-    "loader-runner": {
-      "version": "2.3.0",
-      "resolved": "http://localhost:4873/loader-runner/-/loader-runner-2.3.0.tgz",
-      "integrity": "sha1-9IKuqC1UPgeSFwDVpG7yb9rGuKI=",
-      "dev": true
-    },
-    "loader-utils": {
-      "version": "1.1.0",
-      "resolved": "http://localhost:4873/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"
-      }
-    },
-    "locate-path": {
-      "version": "2.0.0",
-      "resolved": "http://localhost:4873/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-      "requires": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
-      }
-    },
-    "lodash": {
-      "version": "4.17.10",
-      "resolved": "http://localhost:4873/lodash/-/lodash-4.17.10.tgz",
-      "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==",
-      "dev": true
-    },
-    "lodash._basecopy": {
-      "version": "3.0.1",
-      "resolved": "http://localhost:4873/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
-      "dev": true
-    },
-    "lodash._basetostring": {
-      "version": "3.0.1",
-      "resolved": "http://localhost:4873/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
-      "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=",
-      "dev": true
-    },
-    "lodash._basevalues": {
-      "version": "3.0.0",
-      "resolved": "http://localhost:4873/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
-      "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
-      "dev": true
-    },
-    "lodash._createcompounder": {
-      "version": "3.0.0",
-      "resolved": "http://localhost:4873/lodash._createcompounder/-/lodash._createcompounder-3.0.0.tgz",
-      "integrity": "sha1-XdLLVTctbnDg4jkvsjBNZjEJEHU=",
-      "dev": true,
-      "requires": {
-        "lodash.deburr": "^3.0.0",
-        "lodash.words": "^3.0.0"
-      }
-    },
-    "lodash._getnative": {
-      "version": "3.9.1",
-      "resolved": "http://localhost:4873/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
-      "dev": true
-    },
-    "lodash._isiterateecall": {
-      "version": "3.0.9",
-      "resolved": "http://localhost:4873/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
-      "dev": true
-    },
-    "lodash._reescape": {
-      "version": "3.0.0",
-      "resolved": "http://localhost:4873/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
-      "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=",
-      "dev": true
-    },
-    "lodash._reevaluate": {
-      "version": "3.0.0",
-      "resolved": "http://localhost:4873/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
-      "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=",
-      "dev": true
-    },
-    "lodash._reinterpolate": {
-      "version": "3.0.0",
-      "resolved": "http://localhost:4873/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-      "dev": true
-    },
-    "lodash._root": {
-      "version": "3.0.1",
-      "resolved": "http://localhost:4873/lodash._root/-/lodash._root-3.0.1.tgz",
-      "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
-      "dev": true
-    },
-    "lodash.assign": {
-      "version": "4.2.0",
-      "resolved": "http://localhost:4873/lodash.assign/-/lodash.assign-4.2.0.tgz",
-      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
-      "dev": true
-    },
-    "lodash.camelcase": {
-      "version": "3.0.1",
-      "resolved": "http://localhost:4873/lodash.camelcase/-/lodash.camelcase-3.0.1.tgz",
-      "integrity": "sha1-kyyLh/ikN3iXxnGXUzKC+Xrqwpg=",
-      "dev": true,
-      "requires": {
-        "lodash._createcompounder": "^3.0.0"
-      }
-    },
-    "lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "http://localhost:4873/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-      "dev": true
-    },
-    "lodash.deburr": {
-      "version": "3.2.0",
-      "resolved": "http://localhost:4873/lodash.deburr/-/lodash.deburr-3.2.0.tgz",
-      "integrity": "sha1-baj1QzSjZqfPTEx2742Aqhs2XtU=",
-      "dev": true,
-      "requires": {
-        "lodash._root": "^3.0.0"
-      }
-    },
-    "lodash.endswith": {
-      "version": "4.2.1",
-      "resolved": "http://localhost:4873/lodash.endswith/-/lodash.endswith-4.2.1.tgz",
-      "integrity": "sha1-/tWawXOO0+I27dcGTsRWRIs3vAk=",
-      "dev": true
-    },
-    "lodash.escape": {
-      "version": "3.2.0",
-      "resolved": "http://localhost:4873/lodash.escape/-/lodash.escape-3.2.0.tgz",
-      "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
-      "dev": true,
-      "requires": {
-        "lodash._root": "^3.0.0"
-      }
-    },
-    "lodash.flatten": {
-      "version": "4.3.0",
-      "resolved": "http://localhost:4873/lodash.flatten/-/lodash.flatten-4.3.0.tgz",
-      "integrity": "sha1-5exO/ofvxZzlL5F8uovxYGNkac8=",
-      "dev": true
-    },
-    "lodash.isarguments": {
-      "version": "3.1.0",
-      "resolved": "http://localhost:4873/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
-      "dev": true
-    },
-    "lodash.isarray": {
-      "version": "3.0.4",
-      "resolved": "http://localhost:4873/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
-      "dev": true
-    },
-    "lodash.isstring": {
-      "version": "4.0.1",
-      "resolved": "http://localhost:4873/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-      "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=",
-      "dev": true
-    },
-    "lodash.keys": {
-      "version": "3.1.2",
-      "resolved": "http://localhost:4873/lodash.keys/-/lodash.keys-3.1.2.tgz",
-      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-      "dev": true,
-      "requires": {
-        "lodash._getnative": "^3.0.0",
-        "lodash.isarguments": "^3.0.0",
-        "lodash.isarray": "^3.0.0"
-      }
-    },
-    "lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "http://localhost:4873/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
-      "dev": true
-    },
-    "lodash.mergewith": {
-      "version": "4.6.1",
-      "resolved": "http://localhost:4873/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz",
-      "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==",
-      "dev": true
-    },
-    "lodash.restparam": {
-      "version": "3.6.1",
-      "resolved": "http://localhost:4873/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
-      "dev": true
-    },
-    "lodash.startswith": {
-      "version": "4.2.1",
-      "resolved": "http://localhost:4873/lodash.startswith/-/lodash.startswith-4.2.1.tgz",
-      "integrity": "sha1-xZjErc4YiiflMUVzHNxsDnF3YAw=",
-      "dev": true
-    },
-    "lodash.tail": {
-      "version": "4.1.1",
-      "resolved": "http://localhost:4873/lodash.tail/-/lodash.tail-4.1.1.tgz",
-      "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=",
-      "dev": true
-    },
-    "lodash.template": {
-      "version": "3.6.2",
-      "resolved": "http://localhost:4873/lodash.template/-/lodash.template-3.6.2.tgz",
-      "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.templatesettings": {
-      "version": "3.1.1",
-      "resolved": "http://localhost:4873/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
-      "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
-      "dev": true,
-      "requires": {
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.escape": "^3.0.0"
-      }
-    },
-    "lodash.uniq": {
-      "version": "4.5.0",
-      "resolved": "http://localhost:4873/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
-      "dev": true
-    },
-    "lodash.values": {
-      "version": "4.2.0",
-      "resolved": "http://localhost:4873/lodash.values/-/lodash.values-4.2.0.tgz",
-      "integrity": "sha1-kyYl99LJVLY9uJUlVUjztJ8SDpo=",
-      "dev": true
-    },
-    "lodash.words": {
-      "version": "3.2.0",
-      "resolved": "http://localhost:4873/lodash.words/-/lodash.words-3.2.0.tgz",
-      "integrity": "sha1-TiqGSbwIdFsXxpWxo86P7llmI7M=",
-      "dev": true,
-      "requires": {
-        "lodash._root": "^3.0.0"
-      }
-    },
-    "log4js": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/log4js/-/log4js-2.7.0.tgz",
-      "integrity": "sha512-FyTwaPJfbfiK2AHc9ct/oFHNN4bJj0IQeqdO/LaDHhfjeBi8fnZU5rPcHOZhkYV0Aes31Ow+St1YTCluPtzs5g==",
-      "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",
-        "streamroller": "0.7.0"
-      },
-      "dependencies": {
-        "axios": {
-          "version": "0.15.3",
-          "resolved": "https://registry.npmjs.org/axios/-/axios-0.15.3.tgz",
-          "integrity": "sha1-LJ1jiy4ZGgjqHWzJiOrda6W9wFM=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "follow-redirects": "1.0.0"
-          }
-        },
-        "follow-redirects": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.0.0.tgz",
-          "integrity": "sha1-jjQpjL0uF28lTv/sdaHHjMhJ/Tc=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "debug": "2.6.9"
-          },
-          "dependencies": {
-            "debug": {
-              "version": "2.6.9",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-              "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "ms": "2.0.0"
-              }
-            }
-          }
-        },
-        "semver": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
-          "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
-          "dev": true
-        }
-      }
-    },
-    "loggly": {
-      "version": "1.1.1",
-      "resolved": "http://localhost:4873/loggly/-/loggly-1.1.1.tgz",
-      "integrity": "sha1-Cg/B0/o6XsRP3HuJe+uipGlc6+4=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "json-stringify-safe": "5.0.x",
-        "request": "2.75.x",
-        "timespan": "2.3.x"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true,
-          "optional": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true,
-          "optional": true
-        },
-        "caseless": {
-          "version": "0.11.0",
-          "resolved": "http://localhost:4873/caseless/-/caseless-0.11.0.tgz",
-          "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
-          "dev": true,
-          "optional": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "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"
-          }
-        },
-        "form-data": {
-          "version": "2.0.0",
-          "resolved": "http://localhost:4873/form-data/-/form-data-2.0.0.tgz",
-          "integrity": "sha1-bwrrrcxdoWwT4ezBETfYX5uIOyU=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "^1.0.5",
-            "mime-types": "^2.1.11"
-          }
-        },
-        "har-validator": {
-          "version": "2.0.6",
-          "resolved": "http://localhost:4873/har-validator/-/har-validator-2.0.6.tgz",
-          "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
-          "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"
-          }
-        },
-        "node-uuid": {
-          "version": "1.4.8",
-          "resolved": "http://localhost:4873/node-uuid/-/node-uuid-1.4.8.tgz",
-          "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=",
-          "dev": true,
-          "optional": true
-        },
-        "qs": {
-          "version": "6.2.3",
-          "resolved": "http://localhost:4873/qs/-/qs-6.2.3.tgz",
-          "integrity": "sha1-HPyyXBCpsrSDBT/zn138kjOQjP4=",
-          "dev": true,
-          "optional": true
-        },
-        "request": {
-          "version": "2.75.0",
-          "resolved": "http://localhost:4873/request/-/request-2.75.0.tgz",
-          "integrity": "sha1-0rgmiihtoT6qXQGt9dGMyQ9lfZM=",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true,
-          "optional": true
-        },
-        "tunnel-agent": {
-          "version": "0.4.3",
-          "resolved": "http://localhost:4873/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "loglevel": {
-      "version": "1.6.1",
-      "resolved": "http://localhost:4873/loglevel/-/loglevel-1.6.1.tgz",
-      "integrity": "sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=",
-      "dev": true
-    },
-    "longest": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/longest/-/longest-1.0.1.tgz",
-      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
-      "dev": true
-    },
-    "longest-streak": {
-      "version": "2.0.2",
-      "resolved": "http://localhost:4873/longest-streak/-/longest-streak-2.0.2.tgz",
-      "integrity": "sha512-TmYTeEYxiAmSVdpbnQDXGtvYOIRsCMg89CVZzwzc2o7GFL1CjoiRPjH5ec0NFAVlAx3fVof9dX/t6KKRAo2OWA==",
-      "dev": true
-    },
-    "loose-envify": {
-      "version": "1.3.1",
-      "resolved": "http://localhost:4873/loose-envify/-/loose-envify-1.3.1.tgz",
-      "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
-      "dev": true,
-      "requires": {
-        "js-tokens": "^3.0.0"
-      }
-    },
-    "loud-rejection": {
-      "version": "1.6.0",
-      "resolved": "http://localhost:4873/loud-rejection/-/loud-rejection-1.6.0.tgz",
-      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-      "dev": true,
-      "requires": {
-        "currently-unhandled": "^0.4.1",
-        "signal-exit": "^3.0.0"
-      }
-    },
-    "lower-case": {
-      "version": "1.1.4",
-      "resolved": "http://localhost:4873/lower-case/-/lower-case-1.1.4.tgz",
-      "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
-      "dev": true
-    },
-    "lowercase-keys": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
-      "dev": true
-    },
-    "lru-cache": {
-      "version": "4.1.3",
-      "resolved": "http://localhost:4873/lru-cache/-/lru-cache-4.1.3.tgz",
-      "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
-      "requires": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
-      }
-    },
-    "magic-string": {
-      "version": "0.22.5",
-      "resolved": "http://localhost:4873/magic-string/-/magic-string-0.22.5.tgz",
-      "integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==",
-      "dev": true,
-      "requires": {
-        "vlq": "^0.2.2"
-      }
-    },
-    "mailcomposer": {
-      "version": "4.0.1",
-      "resolved": "http://localhost:4873/mailcomposer/-/mailcomposer-4.0.1.tgz",
-      "integrity": "sha1-DhxEsqB890DuF9wUm6AJ8Zyt/rQ=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "buildmail": "4.0.1",
-        "libmime": "3.0.0"
-      }
-    },
-    "mailgun-js": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/mailgun-js/-/mailgun-js-0.18.0.tgz",
-      "integrity": "sha512-o0P6jjZlx5CQj12tvVgDTbgjTqVN0+5h6/6P1+3c6xmozVKBwniQ6Qt3MkCSF0+ueVTbobAfWyGpWRZMJu8t1g==",
-      "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"
-      }
-    },
-    "make-dir": {
-      "version": "1.3.0",
-      "resolved": "http://localhost:4873/make-dir/-/make-dir-1.3.0.tgz",
-      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
-      "dev": true,
-      "requires": {
-        "pify": "^3.0.0"
-      }
-    },
-    "make-error": {
-      "version": "1.3.4",
-      "resolved": "http://localhost:4873/make-error/-/make-error-1.3.4.tgz",
-      "integrity": "sha512-0Dab5btKVPhibSalc9QGXb559ED7G7iLjFXBaj9Wq8O3vorueR5K5jaE3hkG6ZQINyhA/JgG6Qk4qdFQjsYV6g==",
-      "dev": true
-    },
-    "map-cache": {
-      "version": "0.2.2",
-      "resolved": "http://localhost:4873/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-      "dev": true
-    },
-    "map-obj": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true
-    },
-    "map-stream": {
-      "version": "0.1.0",
-      "resolved": "http://localhost:4873/map-stream/-/map-stream-0.1.0.tgz",
-      "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ="
-    },
-    "map-visit": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
-      "dev": true,
-      "requires": {
-        "object-visit": "^1.0.0"
-      }
-    },
-    "markdown-escapes": {
-      "version": "1.0.2",
-      "resolved": "http://localhost:4873/markdown-escapes/-/markdown-escapes-1.0.2.tgz",
-      "integrity": "sha512-lbRZ2mE3Q9RtLjxZBZ9+IMl68DKIXaVAhwvwn9pmjnPLS0h/6kyBMgNhqi1xFJ/2yv6cSyv0jbiZavZv93JkkA==",
-      "dev": true
-    },
-    "markdown-it": {
-      "version": "8.4.1",
-      "resolved": "http://localhost:4873/markdown-it/-/markdown-it-8.4.1.tgz",
-      "integrity": "sha512-CzzqSSNkFRUf9vlWvhK1awpJreMRqdCrBvZ8DIoDWTOkESMIF741UPAhuAmbyWmdiFPA6WARNhnu2M6Nrhwa+A==",
-      "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"
-      }
-    },
-    "markdown-link": {
-      "version": "0.1.1",
-      "resolved": "http://localhost:4873/markdown-link/-/markdown-link-0.1.1.tgz",
-      "integrity": "sha1-MsXGUZmmRXMWMi0eQinRNAfIx88=",
-      "dev": true
-    },
-    "markdown-table": {
-      "version": "1.1.2",
-      "resolved": "http://localhost:4873/markdown-table/-/markdown-table-1.1.2.tgz",
-      "integrity": "sha512-NcWuJFHDA8V3wkDgR/j4+gZx+YQwstPgfQDV8ndUeWWzta3dnDTBxpVzqS9lkmJAuV5YX35lmyojl6HO5JXAgw==",
-      "dev": true
-    },
-    "markdown-toc": {
-      "version": "1.1.0",
-      "resolved": "http://localhost:4873/markdown-toc/-/markdown-toc-1.1.0.tgz",
-      "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"
-      },
-      "dependencies": {
-        "lazy-cache": {
-          "version": "2.0.2",
-          "resolved": "http://localhost:4873/lazy-cache/-/lazy-cache-2.0.2.tgz",
-          "integrity": "sha1-uRkKT5EzVGlIQIWfio9whNiCImQ=",
-          "dev": true,
-          "requires": {
-            "set-getter": "^0.1.0"
-          }
-        },
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "http://localhost:4873/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        }
-      }
-    },
-    "markdownlint": {
-      "version": "0.4.1",
-      "resolved": "http://localhost:4873/markdownlint/-/markdownlint-0.4.1.tgz",
-      "integrity": "sha1-NzIMqUSTgCT9a0IbJAGtNJNJWIo=",
-      "dev": true,
-      "requires": {
-        "markdown-it": "^8.3.1"
-      }
-    },
-    "markdownlint-cli": {
-      "version": "0.3.1",
-      "resolved": "http://localhost:4873/markdownlint-cli/-/markdownlint-cli-0.3.1.tgz",
-      "integrity": "sha1-fgWAnyfn9QiGvwWtx9LSW7OwUpM=",
-      "dev": true,
-      "requires": {
-        "commander": "~2.9.0",
-        "deep-extend": "~0.4.1",
-        "glob": "~7.0.3",
-        "lodash.flatten": "~4.3.0",
-        "lodash.values": "~4.2.0",
-        "markdownlint": "~0.4.1",
-        "rc": "~1.1.6"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.9.0",
-          "resolved": "http://localhost:4873/commander/-/commander-2.9.0.tgz",
-          "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
-          "dev": true,
-          "requires": {
-            "graceful-readlink": ">= 1.0.0"
-          }
-        },
-        "glob": {
-          "version": "7.0.6",
-          "resolved": "http://localhost:4873/glob/-/glob-7.0.6.tgz",
-          "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.2",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        }
-      }
-    },
-    "marked": {
-      "version": "0.3.19",
-      "resolved": "http://localhost:4873/marked/-/marked-0.3.19.tgz",
-      "integrity": "sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg==",
-      "dev": true
-    },
-    "math-expression-evaluator": {
-      "version": "1.2.17",
-      "resolved": "http://localhost:4873/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz",
-      "integrity": "sha1-3oGf282E3M2PrlnGrreWFbnSZqw=",
-      "dev": true
-    },
-    "math-random": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/math-random/-/math-random-1.0.1.tgz",
-      "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=",
-      "dev": true
-    },
-    "md5.js": {
-      "version": "1.3.4",
-      "resolved": "http://localhost:4873/md5.js/-/md5.js-1.3.4.tgz",
-      "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
-      "dev": true,
-      "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
-    "mdast-comment-marker": {
-      "version": "1.0.2",
-      "resolved": "http://localhost:4873/mdast-comment-marker/-/mdast-comment-marker-1.0.2.tgz",
-      "integrity": "sha1-Hd8O+BH7UkOQF8jSwLkiA18rp0o=",
-      "dev": true
-    },
-    "mdast-util-compact": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/mdast-util-compact/-/mdast-util-compact-1.0.1.tgz",
-      "integrity": "sha1-zbX4TitqLTEU3zO9BdnLMuPECDo=",
-      "dev": true,
-      "requires": {
-        "unist-util-modify-children": "^1.0.0",
-        "unist-util-visit": "^1.1.0"
-      }
-    },
-    "mdast-util-heading-range": {
-      "version": "2.1.0",
-      "resolved": "http://localhost:4873/mdast-util-heading-range/-/mdast-util-heading-range-2.1.0.tgz",
-      "integrity": "sha1-0Pq3tCYbyg2Al8rebSChcpLrTDQ=",
-      "dev": true,
-      "requires": {
-        "mdast-util-to-string": "^1.0.0"
-      }
-    },
-    "mdast-util-to-string": {
-      "version": "1.0.4",
-      "resolved": "http://localhost:4873/mdast-util-to-string/-/mdast-util-to-string-1.0.4.tgz",
-      "integrity": "sha1-XEVch4yTVfDB5/PotxnPWDaRrPs=",
-      "dev": true
-    },
-    "mdast-util-toc": {
-      "version": "2.0.1",
-      "resolved": "http://localhost:4873/mdast-util-toc/-/mdast-util-toc-2.0.1.tgz",
-      "integrity": "sha1-sdLLI7+wH4Evp7Vb/+iwqL7fbyE=",
-      "dev": true,
-      "requires": {
-        "github-slugger": "^1.1.1",
-        "mdast-util-to-string": "^1.0.2",
-        "unist-util-visit": "^1.1.0"
-      }
-    },
-    "mdast-zone": {
-      "version": "3.0.1",
-      "resolved": "http://localhost:4873/mdast-zone/-/mdast-zone-3.0.1.tgz",
-      "integrity": "sha1-PqMacZwZdlKUoTorYH91uH6sQro=",
-      "dev": true,
-      "requires": {
-        "mdast-comment-marker": "^1.0.1",
-        "unist-util-visit": "^1.0.0"
-      }
-    },
-    "mdurl": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
-      "dev": true
-    },
-    "media-typer": {
-      "version": "0.3.0",
-      "resolved": "http://localhost:4873/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
-      "dev": true
-    },
-    "mem": {
-      "version": "1.1.0",
-      "resolved": "http://localhost:4873/mem/-/mem-1.1.0.tgz",
-      "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
-      "requires": {
-        "mimic-fn": "^1.0.0"
-      }
-    },
-    "memory-fs": {
-      "version": "0.4.1",
-      "resolved": "http://localhost:4873/memory-fs/-/memory-fs-0.4.1.tgz",
-      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-      "dev": true,
-      "requires": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
-      }
-    },
-    "memorystream": {
-      "version": "0.3.1",
-      "resolved": "http://localhost:4873/memorystream/-/memorystream-0.3.1.tgz",
-      "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI="
-    },
-    "meow": {
-      "version": "3.7.0",
-      "resolved": "http://localhost:4873/meow/-/meow-3.7.0.tgz",
-      "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"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "http://localhost:4873/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        }
-      }
-    },
-    "merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
-      "dev": true
-    },
-    "merge-stream": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/merge-stream/-/merge-stream-1.0.1.tgz",
-      "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "^2.0.1"
-      }
-    },
-    "methods": {
-      "version": "1.1.2",
-      "resolved": "http://localhost:4873/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
-    },
-    "micromatch": {
-      "version": "2.3.11",
-      "resolved": "http://localhost:4873/micromatch/-/micromatch-2.3.11.tgz",
-      "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-      "dev": true,
-      "requires": {
-        "arr-diff": "^2.0.0",
-        "array-unique": "^0.2.1",
-        "braces": "^1.8.2",
-        "expand-brackets": "^0.1.4",
-        "extglob": "^0.3.1",
-        "filename-regex": "^2.0.0",
-        "is-extglob": "^1.0.0",
-        "is-glob": "^2.0.1",
-        "kind-of": "^3.0.2",
-        "normalize-path": "^2.0.1",
-        "object.omit": "^2.0.0",
-        "parse-glob": "^3.0.4",
-        "regex-cache": "^0.4.2"
-      }
-    },
-    "miller-rabin": {
-      "version": "4.0.1",
-      "resolved": "http://localhost:4873/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
-      }
-    },
-    "mime": {
-      "version": "1.6.0",
-      "resolved": "http://localhost:4873/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
-    },
-    "mime-db": {
-      "version": "1.33.0",
-      "resolved": "http://localhost:4873/mime-db/-/mime-db-1.33.0.tgz",
-      "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="
-    },
-    "mime-types": {
-      "version": "2.1.18",
-      "resolved": "http://localhost:4873/mime-types/-/mime-types-2.1.18.tgz",
-      "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
-      "requires": {
-        "mime-db": "~1.33.0"
-      }
-    },
-    "mimic-fn": {
-      "version": "1.2.0",
-      "resolved": "http://localhost:4873/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
-    },
-    "minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-      "dev": true
-    },
-    "minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
-      "dev": true
-    },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "http://localhost:4873/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "0.0.8",
-      "resolved": "http://localhost:4873/minimist/-/minimist-0.0.8.tgz",
-      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-      "dev": true
-    },
-    "minipass": {
-      "version": "2.3.3",
-      "resolved": "http://localhost:4873/minipass/-/minipass-2.3.3.tgz",
-      "integrity": "sha512-/jAn9/tEX4gnpyRATxgHEOV6xbcyxgT7iUnxo9Y3+OB0zX00TgKIv/2FZCf5brBbICcwbLqVv2ImjvWWrQMSYw==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.1.2",
-        "yallist": "^3.0.0"
-      },
-      "dependencies": {
-        "yallist": {
-          "version": "3.0.2",
-          "resolved": "http://localhost:4873/yallist/-/yallist-3.0.2.tgz",
-          "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=",
-          "dev": true
-        }
-      }
-    },
-    "minizlib": {
-      "version": "1.1.0",
-      "resolved": "http://localhost:4873/minizlib/-/minizlib-1.1.0.tgz",
-      "integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==",
-      "dev": true,
-      "requires": {
-        "minipass": "^2.2.1"
-      }
-    },
-    "mississippi": {
-      "version": "2.0.0",
-      "resolved": "http://localhost:4873/mississippi/-/mississippi-2.0.0.tgz",
-      "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"
-      }
-    },
-    "mixin-deep": {
-      "version": "1.3.1",
-      "resolved": "http://localhost:4873/mixin-deep/-/mixin-deep-1.3.1.tgz",
-      "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
-      "dev": true,
-      "requires": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "http://localhost:4873/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
-      }
-    },
-    "mixin-object": {
-      "version": "2.0.1",
-      "resolved": "http://localhost:4873/mixin-object/-/mixin-object-2.0.1.tgz",
-      "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
-      "dev": true,
-      "requires": {
-        "for-in": "^0.1.3",
-        "is-extendable": "^0.1.1"
-      },
-      "dependencies": {
-        "for-in": {
-          "version": "0.1.8",
-          "resolved": "http://localhost:4873/for-in/-/for-in-0.1.8.tgz",
-          "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=",
-          "dev": true
-        }
-      }
-    },
-    "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "http://localhost:4873/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "dev": true,
-      "requires": {
-        "minimist": "0.0.8"
-      }
-    },
-    "moment": {
-      "version": "2.20.1",
-      "resolved": "http://localhost:4873/moment/-/moment-2.20.1.tgz",
-      "integrity": "sha512-Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg=="
-    },
-    "moment-es6": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/moment-es6/-/moment-es6-1.0.0.tgz",
-      "integrity": "sha1-VS/PQF1iVlsKH+hObB5peseTMt8=",
-      "requires": {
-        "moment": "*"
-      }
-    },
-    "move-concurrently": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/move-concurrently/-/move-concurrently-1.0.1.tgz",
-      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
-      "dev": true,
-      "requires": {
-        "aproba": "^1.1.1",
-        "copy-concurrently": "^1.0.0",
-        "fs-write-stream-atomic": "^1.0.8",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.3"
-      }
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "http://localhost:4873/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "multicast-dns": {
-      "version": "6.2.3",
-      "resolved": "http://localhost:4873/multicast-dns/-/multicast-dns-6.2.3.tgz",
-      "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
-      "dev": true,
-      "requires": {
-        "dns-packet": "^1.3.1",
-        "thunky": "^1.0.2"
-      }
-    },
-    "multicast-dns-service-types": {
-      "version": "1.1.0",
-      "resolved": "http://localhost:4873/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
-      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
-      "dev": true
-    },
-    "multipipe": {
-      "version": "0.1.2",
-      "resolved": "http://localhost:4873/multipipe/-/multipipe-0.1.2.tgz",
-      "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
-      "dev": true,
-      "requires": {
-        "duplexer2": "0.0.2"
-      }
-    },
-    "mute-stream": {
-      "version": "0.0.7",
-      "resolved": "http://localhost:4873/mute-stream/-/mute-stream-0.0.7.tgz",
-      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
-      "dev": true
-    },
-    "mz": {
-      "version": "2.7.0",
-      "resolved": "http://localhost:4873/mz/-/mz-2.7.0.tgz",
-      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
-      "dev": true,
-      "requires": {
-        "any-promise": "^1.0.0",
-        "object-assign": "^4.0.1",
-        "thenify-all": "^1.0.0"
-      }
-    },
-    "nan": {
-      "version": "2.10.0",
-      "resolved": "http://localhost:4873/nan/-/nan-2.10.0.tgz",
-      "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
-      "dev": true
-    },
-    "nanomatch": {
-      "version": "1.2.9",
-      "resolved": "http://localhost:4873/nanomatch/-/nanomatch-1.2.9.tgz",
-      "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==",
-      "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-odd": "^2.0.0",
-        "is-windows": "^1.0.2",
-        "kind-of": "^6.0.2",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "http://localhost:4873/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-          "dev": true
-        },
-        "array-unique": {
-          "version": "0.3.2",
-          "resolved": "http://localhost:4873/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "http://localhost:4873/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
-        }
-      }
-    },
-    "nconf": {
-      "version": "0.10.0",
-      "resolved": "http://localhost:4873/nconf/-/nconf-0.10.0.tgz",
-      "integrity": "sha512-fKiXMQrpP7CYWJQzKkPPx9hPgmq+YLDyxcG9N8RpiE9FoCkCbzD0NyW0YhE3xn3Aupe7nnDeIx4PFzYehpHT9Q==",
-      "dev": true,
-      "requires": {
-        "async": "^1.4.0",
-        "ini": "^1.3.0",
-        "secure-keys": "^1.0.0",
-        "yargs": "^3.19.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "async": {
-          "version": "1.5.2",
-          "resolved": "http://localhost:4873/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-          "dev": true
-        },
-        "camelcase": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/camelcase/-/camelcase-2.1.1.tgz",
-          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-          "dev": true
-        },
-        "cliui": {
-          "version": "3.2.0",
-          "resolved": "http://localhost:4873/cliui/-/cliui-3.2.0.tgz",
-          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-          "dev": true,
-          "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wrap-ansi": "^2.0.0"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "dev": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "os-locale": {
-          "version": "1.4.0",
-          "resolved": "http://localhost:4873/os-locale/-/os-locale-1.4.0.tgz",
-          "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-          "dev": true,
-          "requires": {
-            "lcid": "^1.0.0"
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "http://localhost:4873/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "dev": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "window-size": {
-          "version": "0.1.4",
-          "resolved": "http://localhost:4873/window-size/-/window-size-0.1.4.tgz",
-          "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=",
-          "dev": true
-        },
-        "yargs": {
-          "version": "3.32.0",
-          "resolved": "http://localhost:4873/yargs/-/yargs-3.32.0.tgz",
-          "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"
-          }
-        }
-      }
-    },
-    "negotiator": {
-      "version": "0.6.1",
-      "resolved": "http://localhost:4873/negotiator/-/negotiator-0.6.1.tgz",
-      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
-      "dev": true
-    },
-    "neo-async": {
-      "version": "2.5.1",
-      "resolved": "http://localhost:4873/neo-async/-/neo-async-2.5.1.tgz",
-      "integrity": "sha512-3KL3fvuRkZ7s4IFOMfztb7zJp3QaVWnBeGoJlgB38XnCRPj/0tLzzLG5IB8NYOHbJ8g8UGrgZv44GLDk6CxTxA==",
-      "dev": true
-    },
-    "netmask": {
-      "version": "1.0.6",
-      "resolved": "http://localhost:4873/netmask/-/netmask-1.0.6.tgz",
-      "integrity": "sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU=",
-      "dev": true,
-      "optional": true
-    },
-    "next-tick": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/next-tick/-/next-tick-1.0.0.tgz",
-      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw="
-    },
-    "ng-packagr": {
-      "version": "2.4.2",
-      "resolved": "http://localhost:4873/ng-packagr/-/ng-packagr-2.4.2.tgz",
-      "integrity": "sha512-aPjIUoYO+sdEhlQbpJeBt7n+PgN0cZ8Q9FCIXZ8uTG0uJc/t9QddGZ3wIjfaBh9+WTDdh1ACZCIFb6J1WH/szA==",
-      "dev": true,
-      "requires": {
-        "@ngtools/json-schema": "^1.1.0",
-        "autoprefixer": "^7.1.1",
-        "browserslist": "^2.1.5",
-        "chalk": "^2.3.1",
-        "commander": "^2.12.0",
-        "cpx": "^1.5.0",
-        "fs-extra": "^5.0.0",
-        "glob": "^7.1.2",
-        "injection-js": "^2.2.1",
-        "less": "^2.7.2",
-        "node-sass": "^4.5.3",
-        "node-sass-tilde-importer": "^1.0.0",
-        "postcss": "^6.0.2",
-        "postcss-clean": "^1.1.0",
-        "postcss-url": "^7.3.0",
-        "read-pkg-up": "^3.0.0",
-        "rimraf": "^2.6.1",
-        "rollup": "^0.55.0",
-        "rollup-plugin-cleanup": "^2.0.0",
-        "rollup-plugin-commonjs": "8.3.0",
-        "rollup-plugin-license": "^0.6.0",
-        "rollup-plugin-node-resolve": "^3.0.0",
-        "rxjs": "^5.5.0",
-        "sorcery": "^0.10.0",
-        "strip-bom": "^3.0.0",
-        "stylus": "^0.54.5",
-        "tar": "^4.4.1",
-        "uglify-js": "^3.3.20",
-        "update-notifier": "^2.3.0"
-      },
-      "dependencies": {
-        "autoprefixer": {
-          "version": "7.2.6",
-          "resolved": "http://localhost:4873/autoprefixer/-/autoprefixer-7.2.6.tgz",
-          "integrity": "sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==",
-          "dev": true,
-          "requires": {
-            "browserslist": "^2.11.3",
-            "caniuse-lite": "^1.0.30000805",
-            "normalize-range": "^0.1.2",
-            "num2fraction": "^1.2.2",
-            "postcss": "^6.0.17",
-            "postcss-value-parser": "^3.2.3"
-          }
-        },
-        "fs-extra": {
-          "version": "5.0.0",
-          "resolved": "http://localhost:4873/fs-extra/-/fs-extra-5.0.0.tgz",
-          "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        },
-        "lodash": {
-          "version": "4.17.5",
-          "resolved": "http://localhost:4873/lodash/-/lodash-4.17.5.tgz",
-          "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==",
-          "dev": true
-        },
-        "magic-string": {
-          "version": "0.22.4",
-          "resolved": "http://localhost:4873/magic-string/-/magic-string-0.22.4.tgz",
-          "integrity": "sha512-kxBL06p6iO2qPBHsqGK2b3cRwiRGpnmSuVWNhwHcMX7qJOUr1HvricYP1LZOCdkQBUp0jiWg2d6WJwR3vYgByw==",
-          "dev": true,
-          "requires": {
-            "vlq": "^0.2.1"
-          }
-        },
-        "moment": {
-          "version": "2.21.0",
-          "resolved": "http://localhost:4873/moment/-/moment-2.21.0.tgz",
-          "integrity": "sha512-TCZ36BjURTeFTM/CwRcViQlfkMvL1/vFISuNLO5GkcVm1+QHfbSiNqZuWeMFjj1/3+uAjXswgRk30j1kkLYJBQ==",
-          "dev": true
-        },
-        "read-pkg-up": {
-          "version": "3.0.0",
-          "resolved": "http://localhost:4873/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
-          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
-          "dev": true,
-          "requires": {
-            "find-up": "^2.0.0",
-            "read-pkg": "^3.0.0"
-          }
-        },
-        "rollup-plugin-license": {
-          "version": "0.6.0",
-          "resolved": "http://localhost:4873/rollup-plugin-license/-/rollup-plugin-license-0.6.0.tgz",
-          "integrity": "sha512-Ttz65oRtNKcfV5icDkQTixc8ja64ueoXejRJoAtmjXYAWVg0qx+tu5rXmEOXWXmUXeGs0ARUVIAG0p1JK0gACQ==",
-          "dev": true,
-          "requires": {
-            "commenting": "1.0.5",
-            "lodash": "4.17.5",
-            "magic-string": "0.22.4",
-            "mkdirp": "0.5.1",
-            "moment": "2.21.0"
-          }
-        },
-        "tar": {
-          "version": "4.4.3",
-          "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.3.tgz",
-          "integrity": "sha512-LBw+tcY+/iCCTvF4i3SjqKWIgixSs/dB+Elg3BaY0MXh03D9jWclYskg3BiOkgg414NqpFI3nRgr2Qnw5jJs7Q==",
-          "dev": true,
-          "requires": {
-            "chownr": "^1.0.1",
-            "fs-minipass": "^1.2.5",
-            "minipass": "^2.3.3",
-            "minizlib": "^1.1.0",
-            "mkdirp": "^0.5.0",
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.2"
-          }
-        },
-        "yallist": {
-          "version": "3.0.2",
-          "resolved": "http://localhost:4873/yallist/-/yallist-3.0.2.tgz",
-          "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=",
-          "dev": true
-        }
-      }
-    },
-    "ng2-charts": {
-      "version": "1.6.0",
-      "resolved": "http://localhost:4873/ng2-charts/-/ng2-charts-1.6.0.tgz",
-      "integrity": "sha512-9w0WH69x5/nuqC1og2WaY39NbaBqTGIP1+5gZaH7/KPN6UEPonNg/pYnsIVklLj1DWPWXKa8+XXIJZ1jy5nLxg==",
-      "requires": {
-        "chart.js": "^2.6.0"
-      },
-      "dependencies": {
-        "chart.js": {
-          "version": "2.7.2",
-          "resolved": "http://localhost:4873/chart.js/-/chart.js-2.7.2.tgz",
-          "integrity": "sha512-90wl3V9xRZ8tnMvMlpcW+0Yg13BelsGS9P9t0ClaDxv/hdypHDr/YAGf+728m11P5ljwyB0ZHfPKCapZFqSqYA==",
-          "requires": {
-            "chartjs-color": "^2.1.0",
-            "moment": "^2.10.2"
-          }
-        }
-      }
-    },
-    "no-case": {
-      "version": "2.3.2",
-      "resolved": "http://localhost:4873/no-case/-/no-case-2.3.2.tgz",
-      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
-      "dev": true,
-      "requires": {
-        "lower-case": "^1.1.1"
-      }
-    },
-    "node-dir": {
-      "version": "0.1.17",
-      "resolved": "http://localhost:4873/node-dir/-/node-dir-0.1.17.tgz",
-      "integrity": "sha1-X1Zl2TNRM1yqvvjxxVRRbPXx5OU=",
-      "dev": true,
-      "requires": {
-        "minimatch": "^3.0.2"
-      }
-    },
-    "node-ensure": {
-      "version": "0.0.0",
-      "resolved": "http://localhost:4873/node-ensure/-/node-ensure-0.0.0.tgz",
-      "integrity": "sha1-7K52QVDemYYexcgQ/V0Jaxg5Mqc="
-    },
-    "node-fetch": {
-      "version": "1.6.3",
-      "resolved": "http://localhost:4873/node-fetch/-/node-fetch-1.6.3.tgz",
-      "integrity": "sha1-3CNO3WSJmC1Y6PDbT2lQKavNjAQ=",
-      "dev": true,
-      "requires": {
-        "encoding": "^0.1.11",
-        "is-stream": "^1.0.1"
-      }
-    },
-    "node-forge": {
-      "version": "0.7.5",
-      "resolved": "http://localhost:4873/node-forge/-/node-forge-0.7.5.tgz",
-      "integrity": "sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==",
-      "dev": true
-    },
-    "node-gyp": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz",
-      "integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=",
-      "dev": true,
-      "requires": {
-        "fstream": "^1.0.0",
-        "glob": "^7.0.3",
-        "graceful-fs": "^4.1.2",
-        "minimatch": "^3.0.2",
-        "mkdirp": "^0.5.0",
-        "nopt": "2 || 3",
-        "npmlog": "0 || 1 || 2 || 3 || 4",
-        "osenv": "0",
-        "request": "2",
-        "rimraf": "2",
-        "semver": "~5.3.0",
-        "tar": "^2.0.0",
-        "which": "1"
-      },
-      "dependencies": {
-        "nopt": {
-          "version": "3.0.6",
-          "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-          "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-          "dev": true,
-          "requires": {
-            "abbrev": "1.1.1"
-          }
-        },
-        "semver": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-          "dev": true
-        }
-      }
-    },
-    "node-libs-browser": {
-      "version": "2.1.0",
-      "resolved": "http://localhost:4873/node-libs-browser/-/node-libs-browser-2.1.0.tgz",
-      "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",
-        "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",
-        "tty-browserify": "0.0.0",
-        "url": "^0.11.0",
-        "util": "^0.10.3",
-        "vm-browserify": "0.0.4"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "http://localhost:4873/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true
-        }
-      }
-    },
-    "node-modules-path": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/node-modules-path/-/node-modules-path-1.0.1.tgz",
-      "integrity": "sha1-QAlrCM560OoUaAhjr0ScfHWl0cg=",
-      "dev": true
-    },
-    "node-sass": {
-      "version": "4.5.3",
-      "resolved": "http://localhost:4873/node-sass/-/node-sass-4.5.3.tgz",
-      "integrity": "sha1-0JydEXlkEjnRuX/8YjH9zsU+FWg=",
-      "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.3.2",
-        "node-gyp": "^3.3.1",
-        "npmlog": "^4.0.0",
-        "request": "^2.79.0",
-        "sass-graph": "^2.1.1",
-        "stdout-stream": "^1.4.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          }
-        },
-        "cross-spawn": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/cross-spawn/-/cross-spawn-3.0.1.tgz",
-          "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^4.0.1",
-            "which": "^1.2.9"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
-      }
-    },
-    "node-sass-tilde-importer": {
-      "version": "1.0.2",
-      "resolved": "http://localhost:4873/node-sass-tilde-importer/-/node-sass-tilde-importer-1.0.2.tgz",
-      "integrity": "sha512-Swcmr38Y7uB78itQeBm3mThjxBy9/Ah/ykPIaURY/L6Nec9AyRoL/jJ7ECfMR+oZeCTVQNxVMu/aHU+TLRVbdg==",
-      "dev": true,
-      "requires": {
-        "find-parent-dir": "^0.3.0"
-      }
-    },
-    "nodemailer": {
-      "version": "2.7.2",
-      "resolved": "http://localhost:4873/nodemailer/-/nodemailer-2.7.2.tgz",
-      "integrity": "sha1-8kLmSa7q45tsftdA73sGHEBNMPk=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "libmime": "3.0.0",
-        "mailcomposer": "4.0.1",
-        "nodemailer-direct-transport": "3.3.2",
-        "nodemailer-shared": "1.1.0",
-        "nodemailer-smtp-pool": "2.8.2",
-        "nodemailer-smtp-transport": "2.7.2",
-        "socks": "1.1.9"
-      },
-      "dependencies": {
-        "socks": {
-          "version": "1.1.9",
-          "resolved": "http://localhost:4873/socks/-/socks-1.1.9.tgz",
-          "integrity": "sha1-Yo1+TQSRJDVEWsC25Fk3bLPm1pE=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ip": "^1.1.2",
-            "smart-buffer": "^1.0.4"
-          }
-        }
-      }
-    },
-    "nodemailer-direct-transport": {
-      "version": "3.3.2",
-      "resolved": "http://localhost:4873/nodemailer-direct-transport/-/nodemailer-direct-transport-3.3.2.tgz",
-      "integrity": "sha1-6W+vuQNYVglH5WkBfZfmBzilCoY=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "nodemailer-shared": "1.1.0",
-        "smtp-connection": "2.12.0"
-      }
-    },
-    "nodemailer-fetch": {
-      "version": "1.6.0",
-      "resolved": "http://localhost:4873/nodemailer-fetch/-/nodemailer-fetch-1.6.0.tgz",
-      "integrity": "sha1-ecSQihwPXzdbc/6IjamCj23JY6Q=",
-      "dev": true
-    },
-    "nodemailer-shared": {
-      "version": "1.1.0",
-      "resolved": "http://localhost:4873/nodemailer-shared/-/nodemailer-shared-1.1.0.tgz",
-      "integrity": "sha1-z1mU4v0mjQD1zw+nZ6CBae2wfsA=",
-      "dev": true,
-      "requires": {
-        "nodemailer-fetch": "1.6.0"
-      }
-    },
-    "nodemailer-smtp-pool": {
-      "version": "2.8.2",
-      "resolved": "http://localhost:4873/nodemailer-smtp-pool/-/nodemailer-smtp-pool-2.8.2.tgz",
-      "integrity": "sha1-LrlNbPhXgLG0clzoU7nL1ejajHI=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "nodemailer-shared": "1.1.0",
-        "nodemailer-wellknown": "0.1.10",
-        "smtp-connection": "2.12.0"
-      }
-    },
-    "nodemailer-smtp-transport": {
-      "version": "2.7.2",
-      "resolved": "http://localhost:4873/nodemailer-smtp-transport/-/nodemailer-smtp-transport-2.7.2.tgz",
-      "integrity": "sha1-A9ccdjFPFKx9vHvwM6am0W1n+3c=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "nodemailer-shared": "1.1.0",
-        "nodemailer-wellknown": "0.1.10",
-        "smtp-connection": "2.12.0"
-      }
-    },
-    "nodemailer-wellknown": {
-      "version": "0.1.10",
-      "resolved": "http://localhost:4873/nodemailer-wellknown/-/nodemailer-wellknown-0.1.10.tgz",
-      "integrity": "sha1-WG24EB2zDLRDjrVGc3pBqtDPE9U=",
-      "dev": true
-    },
-    "nopt": {
-      "version": "4.0.1",
-      "resolved": "http://localhost:4873/nopt/-/nopt-4.0.1.tgz",
-      "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
-      "dev": true,
-      "requires": {
-        "abbrev": "1",
-        "osenv": "^0.1.4"
-      }
-    },
-    "normalize-package-data": {
-      "version": "2.4.0",
-      "resolved": "http://localhost:4873/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"
-      }
-    },
-    "normalize-path": {
-      "version": "2.1.1",
-      "resolved": "http://localhost:4873/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "dev": true,
-      "requires": {
-        "remove-trailing-separator": "^1.0.1"
-      }
-    },
-    "normalize-range": {
-      "version": "0.1.2",
-      "resolved": "http://localhost:4873/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
-      "dev": true
-    },
-    "normalize-url": {
-      "version": "1.9.1",
-      "resolved": "http://localhost:4873/normalize-url/-/normalize-url-1.9.1.tgz",
-      "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
-      "dev": true,
-      "requires": {
-        "object-assign": "^4.0.1",
-        "prepend-http": "^1.0.0",
-        "query-string": "^4.1.0",
-        "sort-keys": "^1.0.0"
-      }
-    },
-    "npm-run-all": {
-      "version": "4.1.2",
-      "resolved": "http://localhost:4873/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"
-      }
-    },
-    "npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "http://localhost:4873/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-      "requires": {
-        "path-key": "^2.0.0"
-      }
-    },
-    "npmlog": {
-      "version": "4.1.2",
-      "resolved": "http://localhost:4873/npmlog/-/npmlog-4.1.2.tgz",
-      "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"
-      }
-    },
-    "nth-check": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/nth-check/-/nth-check-1.0.1.tgz",
-      "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=",
-      "dev": true,
-      "requires": {
-        "boolbase": "~1.0.0"
-      }
-    },
-    "null-check": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/null-check/-/null-check-1.0.0.tgz",
-      "integrity": "sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=",
-      "dev": true
-    },
-    "null-loader": {
-      "version": "0.1.1",
-      "resolved": "http://localhost:4873/null-loader/-/null-loader-0.1.1.tgz",
-      "integrity": "sha1-F76av80/8OFRL2/Er8sfUDk3j64=",
-      "dev": true
-    },
-    "num2fraction": {
-      "version": "1.2.2",
-      "resolved": "http://localhost:4873/num2fraction/-/num2fraction-1.2.2.tgz",
-      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
-      "dev": true
-    },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
-    },
-    "oauth-sign": {
-      "version": "0.8.2",
-      "resolved": "http://localhost:4873/oauth-sign/-/oauth-sign-0.8.2.tgz",
-      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
-      "dev": true
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "http://localhost:4873/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true
-    },
-    "object-component": {
-      "version": "0.0.3",
-      "resolved": "http://localhost:4873/object-component/-/object-component-0.0.3.tgz",
-      "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=",
-      "dev": true
-    },
-    "object-copy": {
-      "version": "0.1.0",
-      "resolved": "http://localhost:4873/object-copy/-/object-copy-0.1.0.tgz",
-      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
-      "dev": true,
-      "requires": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "http://localhost:4873/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
-      }
-    },
-    "object-keys": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
-      "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0="
-    },
-    "object-visit": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/object-visit/-/object-visit-1.0.1.tgz",
-      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.0"
-      },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        }
-      }
-    },
-    "object.omit": {
-      "version": "2.0.1",
-      "resolved": "http://localhost:4873/object.omit/-/object.omit-2.0.1.tgz",
-      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
-      "dev": true,
-      "requires": {
-        "for-own": "^0.1.4",
-        "is-extendable": "^0.1.1"
-      }
-    },
-    "object.pick": {
-      "version": "1.3.0",
-      "resolved": "http://localhost:4873/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.1"
-      },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        }
-      }
-    },
-    "obuf": {
-      "version": "1.1.2",
-      "resolved": "http://localhost:4873/obuf/-/obuf-1.1.2.tgz",
-      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
-      "dev": true
-    },
-    "on-finished": {
-      "version": "2.3.0",
-      "resolved": "http://localhost:4873/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "dev": true,
-      "requires": {
-        "ee-first": "1.1.1"
-      }
-    },
-    "on-headers": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/on-headers/-/on-headers-1.0.1.tgz",
-      "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=",
-      "dev": true
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "http://localhost:4873/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "onetime": {
-      "version": "2.0.1",
-      "resolved": "http://localhost:4873/onetime/-/onetime-2.0.1.tgz",
-      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-      "dev": true,
-      "requires": {
-        "mimic-fn": "^1.0.0"
-      }
-    },
-    "opencollective": {
-      "version": "1.0.3",
-      "resolved": "http://localhost:4873/opencollective/-/opencollective-1.0.3.tgz",
-      "integrity": "sha1-ruY3K8KBRFg2kMPKja7PwSDdDvE=",
-      "dev": true,
-      "requires": {
-        "babel-polyfill": "6.23.0",
-        "chalk": "1.1.3",
-        "inquirer": "3.0.6",
-        "minimist": "1.2.0",
-        "node-fetch": "1.6.3",
-        "opn": "4.0.2"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          }
-        },
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "http://localhost:4873/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        },
-        "opn": {
-          "version": "4.0.2",
-          "resolved": "http://localhost:4873/opn/-/opn-4.0.2.tgz",
-          "integrity": "sha1-erwi5kTf9jsKltWrfyeQwPAavJU=",
-          "dev": true,
-          "requires": {
-            "object-assign": "^4.0.1",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
-      }
-    },
-    "opener": {
-      "version": "1.4.3",
-      "resolved": "http://localhost:4873/opener/-/opener-1.4.3.tgz",
-      "integrity": "sha1-XG2ixdflgx6P+jlklQ+NZnSskLg=",
-      "dev": true
-    },
-    "opn": {
-      "version": "5.3.0",
-      "resolved": "http://localhost:4873/opn/-/opn-5.3.0.tgz",
-      "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==",
-      "requires": {
-        "is-wsl": "^1.1.0"
-      }
-    },
-    "optimist": {
-      "version": "0.6.1",
-      "resolved": "http://localhost:4873/optimist/-/optimist-0.6.1.tgz",
-      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-      "dev": true,
-      "requires": {
-        "minimist": "~0.0.1",
-        "wordwrap": "~0.0.2"
-      }
-    },
-    "optionator": {
-      "version": "0.8.2",
-      "resolved": "http://localhost:4873/optionator/-/optionator-0.8.2.tgz",
-      "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"
-      },
-      "dependencies": {
-        "wordwrap": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/wordwrap/-/wordwrap-1.0.0.tgz",
-          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
-          "dev": true
-        }
-      }
-    },
-    "options": {
-      "version": "0.0.6",
-      "resolved": "http://localhost:4873/options/-/options-0.0.6.tgz",
-      "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=",
-      "dev": true
-    },
-    "original": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/original/-/original-1.0.1.tgz",
-      "integrity": "sha512-IEvtB5vM5ULvwnqMxWBLxkS13JIEXbakizMSo3yoPNPCIWzg8TG3Usn/UhXoZFM/m+FuEA20KdzPSFq/0rS+UA==",
-      "dev": true,
-      "requires": {
-        "url-parse": "~1.4.0"
-      }
-    },
-    "os-browserify": {
-      "version": "0.3.0",
-      "resolved": "http://localhost:4873/os-browserify/-/os-browserify-0.3.0.tgz",
-      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
-      "dev": true
-    },
-    "os-homedir": {
-      "version": "1.0.2",
-      "resolved": "http://localhost:4873/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-      "dev": true
-    },
-    "os-locale": {
-      "version": "2.1.0",
-      "resolved": "http://localhost:4873/os-locale/-/os-locale-2.1.0.tgz",
-      "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
-      "requires": {
-        "execa": "^0.7.0",
-        "lcid": "^1.0.0",
-        "mem": "^1.1.0"
-      }
-    },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "http://localhost:4873/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
-    },
-    "osenv": {
-      "version": "0.1.5",
-      "resolved": "http://localhost:4873/osenv/-/osenv-0.1.5.tgz",
-      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-      "dev": true,
-      "requires": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.0"
-      }
-    },
-    "p-finally": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
-    },
-    "p-limit": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz",
-      "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==",
-      "requires": {
-        "p-try": "^1.0.0"
-      }
-    },
-    "p-locate": {
-      "version": "2.0.0",
-      "resolved": "http://localhost:4873/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-      "requires": {
-        "p-limit": "^1.1.0"
-      }
-    },
-    "p-map": {
-      "version": "1.2.0",
-      "resolved": "http://localhost:4873/p-map/-/p-map-1.2.0.tgz",
-      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
-      "dev": true
-    },
-    "p-try": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
-    },
-    "pac-proxy-agent": {
-      "version": "2.0.2",
-      "resolved": "http://localhost:4873/pac-proxy-agent/-/pac-proxy-agent-2.0.2.tgz",
-      "integrity": "sha512-cDNAN1Ehjbf5EHkNY5qnRhGPUCp6SnpyVof5fRzN800QV1Y2OkzbH9rmjZkbBRa8igof903yOnjIl6z0SlAhxA==",
-      "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": "^3.0.0"
-      }
-    },
-    "pac-resolver": {
-      "version": "3.0.0",
-      "resolved": "http://localhost:4873/pac-resolver/-/pac-resolver-3.0.0.tgz",
-      "integrity": "sha512-tcc38bsjuE3XZ5+4vP96OfhOugrX+JcnpUbhfuc4LuXBLQhoTthOstZeoQJBDnQUDYzYmdImKsbz0xSl1/9qeA==",
-      "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"
-      }
-    },
-    "package-json": {
-      "version": "4.0.1",
-      "resolved": "http://localhost:4873/package-json/-/package-json-4.0.1.tgz",
-      "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
-      "dev": true,
-      "requires": {
-        "got": "^6.7.1",
-        "registry-auth-token": "^3.0.1",
-        "registry-url": "^3.0.3",
-        "semver": "^5.1.0"
-      }
-    },
-    "pako": {
-      "version": "1.0.6",
-      "resolved": "http://localhost:4873/pako/-/pako-1.0.6.tgz",
-      "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==",
-      "dev": true
-    },
-    "parallel-transform": {
-      "version": "1.1.0",
-      "resolved": "http://localhost:4873/parallel-transform/-/parallel-transform-1.1.0.tgz",
-      "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
-      "dev": true,
-      "requires": {
-        "cyclist": "~0.2.2",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.1.5"
-      }
-    },
-    "param-case": {
-      "version": "2.1.1",
-      "resolved": "http://localhost:4873/param-case/-/param-case-2.1.1.tgz",
-      "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
-      "dev": true,
-      "requires": {
-        "no-case": "^2.2.0"
-      }
-    },
-    "parse-asn1": {
-      "version": "5.1.1",
-      "resolved": "http://localhost:4873/parse-asn1/-/parse-asn1-5.1.1.tgz",
-      "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"
-      }
-    },
-    "parse-entities": {
-      "version": "1.1.2",
-      "resolved": "http://localhost:4873/parse-entities/-/parse-entities-1.1.2.tgz",
-      "integrity": "sha512-5N9lmQ7tmxfXf+hO3X6KRG6w7uYO/HL9fHalSySTdyn63C3WNvTM/1R8tn1u1larNcEbo3Slcy2bsVDQqvEpUg==",
-      "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"
-      }
-    },
-    "parse-glob": {
-      "version": "3.0.4",
-      "resolved": "http://localhost:4873/parse-glob/-/parse-glob-3.0.4.tgz",
-      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
-      "dev": true,
-      "requires": {
-        "glob-base": "^0.3.0",
-        "is-dotfile": "^1.0.0",
-        "is-extglob": "^1.0.0",
-        "is-glob": "^2.0.0"
-      }
-    },
-    "parse-json": {
-      "version": "4.0.0",
-      "resolved": "http://localhost:4873/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"
-      }
-    },
-    "parse-passwd": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/parse-passwd/-/parse-passwd-1.0.0.tgz",
-      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
-      "dev": true
-    },
-    "parseqs": {
-      "version": "0.0.5",
-      "resolved": "http://localhost:4873/parseqs/-/parseqs-0.0.5.tgz",
-      "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
-      "dev": true,
-      "requires": {
-        "better-assert": "~1.0.0"
-      }
-    },
-    "parseuri": {
-      "version": "0.0.5",
-      "resolved": "http://localhost:4873/parseuri/-/parseuri-0.0.5.tgz",
-      "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
-      "dev": true,
-      "requires": {
-        "better-assert": "~1.0.0"
-      }
-    },
-    "parseurl": {
-      "version": "1.3.2",
-      "resolved": "http://localhost:4873/parseurl/-/parseurl-1.3.2.tgz",
-      "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=",
-      "dev": true
-    },
-    "pascalcase": {
-      "version": "0.1.1",
-      "resolved": "http://localhost:4873/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
-      "dev": true
-    },
-    "path-browserify": {
-      "version": "0.0.0",
-      "resolved": "http://localhost:4873/path-browserify/-/path-browserify-0.0.0.tgz",
-      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
-      "dev": true
-    },
-    "path-dirname": {
-      "version": "1.0.2",
-      "resolved": "http://localhost:4873/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
-      "dev": true
-    },
-    "path-exists": {
-      "version": "3.0.0",
-      "resolved": "http://localhost:4873/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
-    },
-    "path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "http://localhost:4873/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-      "dev": true
-    },
-    "path-key": {
-      "version": "2.0.1",
-      "resolved": "http://localhost:4873/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
-    },
-    "path-parse": {
-      "version": "1.0.5",
-      "resolved": "http://localhost:4873/path-parse/-/path-parse-1.0.5.tgz",
-      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
-      "dev": true
-    },
-    "path-proxy": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/path-proxy/-/path-proxy-1.0.0.tgz",
-      "integrity": "sha1-GOijaFn8nS8aU7SN7hOFQ8Ag3l4=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "inflection": "~1.3.0"
-      },
-      "dependencies": {
-        "inflection": {
-          "version": "1.3.8",
-          "resolved": "http://localhost:4873/inflection/-/inflection-1.3.8.tgz",
-          "integrity": "sha1-y9Fg2p91sUw8xjV41POWeEvzAU4=",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "http://localhost:4873/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
-      "dev": true
-    },
-    "path-type": {
-      "version": "3.0.0",
-      "resolved": "http://localhost:4873/path-type/-/path-type-3.0.0.tgz",
-      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-      "requires": {
-        "pify": "^3.0.0"
-      }
-    },
-    "pause-stream": {
-      "version": "0.0.11",
-      "resolved": "http://localhost:4873/pause-stream/-/pause-stream-0.0.11.tgz",
-      "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
-      "requires": {
-        "through": "~2.3"
-      }
-    },
-    "pbkdf2": {
-      "version": "3.0.16",
-      "resolved": "http://localhost:4873/pbkdf2/-/pbkdf2-3.0.16.tgz",
-      "integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==",
-      "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"
-      }
-    },
-    "pdfjs-dist": {
-      "version": "2.0.265",
-      "resolved": "http://localhost:4873/pdfjs-dist/-/pdfjs-dist-2.0.265.tgz",
-      "integrity": "sha1-l/8UUXuJ8kYK/ENZzBhsaRuvGec=",
-      "requires": {
-        "node-ensure": "^0.0.0",
-        "worker-loader": "^1.1.0"
-      }
-    },
-    "performance-now": {
-      "version": "0.2.0",
-      "resolved": "http://localhost:4873/performance-now/-/performance-now-0.2.0.tgz",
-      "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
-      "dev": true
-    },
-    "pify": {
-      "version": "3.0.0",
-      "resolved": "http://localhost:4873/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
-    },
-    "pinkie": {
-      "version": "2.0.4",
-      "resolved": "http://localhost:4873/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-      "dev": true
-    },
-    "pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "http://localhost:4873/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "dev": true,
-      "requires": {
-        "pinkie": "^2.0.0"
-      }
-    },
-    "pkg-dir": {
-      "version": "2.0.0",
-      "resolved": "http://localhost:4873/pkg-dir/-/pkg-dir-2.0.0.tgz",
-      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
-      "dev": true,
-      "requires": {
-        "find-up": "^2.1.0"
-      }
-    },
-    "portfinder": {
-      "version": "1.0.13",
-      "resolved": "http://localhost:4873/portfinder/-/portfinder-1.0.13.tgz",
-      "integrity": "sha1-uzLs2HwnEErm7kS1o8y/Drsa7ek=",
-      "dev": true,
-      "requires": {
-        "async": "^1.5.2",
-        "debug": "^2.2.0",
-        "mkdirp": "0.5.x"
-      },
-      "dependencies": {
-        "async": {
-          "version": "1.5.2",
-          "resolved": "http://localhost:4873/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-          "dev": true
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "http://localhost:4873/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
-      }
-    },
-    "posix-character-classes": {
-      "version": "0.1.1",
-      "resolved": "http://localhost:4873/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
-      "dev": true
-    },
-    "postcss": {
-      "version": "6.0.22",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.22.tgz",
-      "integrity": "sha512-Toc9lLoUASwGqxBSJGTVcOQiDqjK+Z2XlWBg+IgYwQMY9vA2f7iMpXVc1GpPcfTSyM5lkxNo0oDwDRO+wm7XHA==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-calc": {
-      "version": "5.3.1",
-      "resolved": "http://localhost:4873/postcss-calc/-/postcss-calc-5.3.1.tgz",
-      "integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=",
-      "dev": true,
-      "requires": {
-        "postcss": "^5.0.2",
-        "postcss-message-helpers": "^2.0.0",
-        "reduce-css-calc": "^1.2.6"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://localhost:4873/postcss/-/postcss-5.2.18.tgz",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-clean": {
-      "version": "1.1.0",
-      "resolved": "http://localhost:4873/postcss-clean/-/postcss-clean-1.1.0.tgz",
-      "integrity": "sha512-83g3GqMbCM5NL6MlbbPLJ/m2NrUepBF44MoDk4Gt04QGXeXKh9+ilQa0DzLnYnvqYHQCw83nckuEzBFr2muwbg==",
-      "dev": true,
-      "requires": {
-        "clean-css": "^4.x",
-        "postcss": "^6.x"
-      }
-    },
-    "postcss-colormin": {
-      "version": "2.2.2",
-      "resolved": "http://localhost:4873/postcss-colormin/-/postcss-colormin-2.2.2.tgz",
-      "integrity": "sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=",
-      "dev": true,
-      "requires": {
-        "colormin": "^1.0.5",
-        "postcss": "^5.0.13",
-        "postcss-value-parser": "^3.2.3"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://localhost:4873/postcss/-/postcss-5.2.18.tgz",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-convert-values": {
-      "version": "2.6.1",
-      "resolved": "http://localhost:4873/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz",
-      "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=",
-      "dev": true,
-      "requires": {
-        "postcss": "^5.0.11",
-        "postcss-value-parser": "^3.1.2"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://localhost:4873/postcss/-/postcss-5.2.18.tgz",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-discard-comments": {
-      "version": "2.0.4",
-      "resolved": "http://localhost:4873/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz",
-      "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=",
-      "dev": true,
-      "requires": {
-        "postcss": "^5.0.14"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://localhost:4873/postcss/-/postcss-5.2.18.tgz",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-discard-duplicates": {
-      "version": "2.1.0",
-      "resolved": "http://localhost:4873/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz",
-      "integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=",
-      "dev": true,
-      "requires": {
-        "postcss": "^5.0.4"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://localhost:4873/postcss/-/postcss-5.2.18.tgz",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-discard-empty": {
-      "version": "2.1.0",
-      "resolved": "http://localhost:4873/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz",
-      "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=",
-      "dev": true,
-      "requires": {
-        "postcss": "^5.0.14"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://localhost:4873/postcss/-/postcss-5.2.18.tgz",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-discard-overridden": {
-      "version": "0.1.1",
-      "resolved": "http://localhost:4873/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz",
-      "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=",
-      "dev": true,
-      "requires": {
-        "postcss": "^5.0.16"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://localhost:4873/postcss/-/postcss-5.2.18.tgz",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-discard-unused": {
-      "version": "2.2.3",
-      "resolved": "http://localhost:4873/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz",
-      "integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=",
-      "dev": true,
-      "requires": {
-        "postcss": "^5.0.14",
-        "uniqs": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://localhost:4873/postcss/-/postcss-5.2.18.tgz",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-filter-plugins": {
-      "version": "2.0.3",
-      "resolved": "http://localhost:4873/postcss-filter-plugins/-/postcss-filter-plugins-2.0.3.tgz",
-      "integrity": "sha512-T53GVFsdinJhgwm7rg1BzbeBRomOg9y5MBVhGcsV0CxurUdVj1UlPdKtn7aqYA/c/QVkzKMjq2bSV5dKG5+AwQ==",
-      "dev": true,
-      "requires": {
-        "postcss": "^5.0.4"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://localhost:4873/postcss/-/postcss-5.2.18.tgz",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-import": {
-      "version": "11.1.0",
-      "resolved": "http://localhost:4873/postcss-import/-/postcss-import-11.1.0.tgz",
-      "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-load-config": {
-      "version": "1.2.0",
-      "resolved": "http://localhost:4873/postcss-load-config/-/postcss-load-config-1.2.0.tgz",
-      "integrity": "sha1-U56a/J3chiASHr+djDZz4M5Q0oo=",
-      "dev": true,
-      "requires": {
-        "cosmiconfig": "^2.1.0",
-        "object-assign": "^4.1.0",
-        "postcss-load-options": "^1.2.0",
-        "postcss-load-plugins": "^2.3.0"
-      }
-    },
-    "postcss-load-options": {
-      "version": "1.2.0",
-      "resolved": "http://localhost:4873/postcss-load-options/-/postcss-load-options-1.2.0.tgz",
-      "integrity": "sha1-sJixVZ3awt8EvAuzdfmaXP4rbYw=",
-      "dev": true,
-      "requires": {
-        "cosmiconfig": "^2.1.0",
-        "object-assign": "^4.1.0"
-      }
-    },
-    "postcss-load-plugins": {
-      "version": "2.3.0",
-      "resolved": "http://localhost:4873/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz",
-      "integrity": "sha1-dFdoEWWZrKLwCfrUJrABdQSdjZI=",
-      "dev": true,
-      "requires": {
-        "cosmiconfig": "^2.1.1",
-        "object-assign": "^4.1.0"
-      }
-    },
-    "postcss-loader": {
-      "version": "2.1.5",
-      "resolved": "http://localhost:4873/postcss-loader/-/postcss-loader-2.1.5.tgz",
-      "integrity": "sha512-pV7kB5neJ0/1tZ8L1uGOBNTVBCSCXQoIsZMsrwvO8V2rKGa2tBl/f80GGVxow2jJnRJ2w1ocx693EKhZAb9Isg==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^1.1.0",
-        "postcss": "^6.0.0",
-        "postcss-load-config": "^1.2.0",
-        "schema-utils": "^0.4.0"
-      }
-    },
-    "postcss-merge-idents": {
-      "version": "2.1.7",
-      "resolved": "http://localhost:4873/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz",
-      "integrity": "sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.1",
-        "postcss": "^5.0.10",
-        "postcss-value-parser": "^3.1.1"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://localhost:4873/postcss/-/postcss-5.2.18.tgz",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-merge-longhand": {
-      "version": "2.0.2",
-      "resolved": "http://localhost:4873/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz",
-      "integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=",
-      "dev": true,
-      "requires": {
-        "postcss": "^5.0.4"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://localhost:4873/postcss/-/postcss-5.2.18.tgz",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-merge-rules": {
-      "version": "2.1.2",
-      "resolved": "http://localhost:4873/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz",
-      "integrity": "sha1-0d9d+qexrMO+VT8OnhDofGG19yE=",
-      "dev": true,
-      "requires": {
-        "browserslist": "^1.5.2",
-        "caniuse-api": "^1.5.2",
-        "postcss": "^5.0.4",
-        "postcss-selector-parser": "^2.2.2",
-        "vendors": "^1.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "browserslist": {
-          "version": "1.7.7",
-          "resolved": "http://localhost:4873/browserslist/-/browserslist-1.7.7.tgz",
-          "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
-          "dev": true,
-          "requires": {
-            "caniuse-db": "^1.0.30000639",
-            "electron-to-chromium": "^1.2.7"
-          }
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://localhost:4873/postcss/-/postcss-5.2.18.tgz",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-message-helpers": {
-      "version": "2.0.0",
-      "resolved": "http://localhost:4873/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz",
-      "integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=",
-      "dev": true
-    },
-    "postcss-minify-font-values": {
-      "version": "1.0.5",
-      "resolved": "http://localhost:4873/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz",
-      "integrity": "sha1-S1jttWZB66fIR0qzUmyv17vey2k=",
-      "dev": true,
-      "requires": {
-        "object-assign": "^4.0.1",
-        "postcss": "^5.0.4",
-        "postcss-value-parser": "^3.0.2"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://localhost:4873/postcss/-/postcss-5.2.18.tgz",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-minify-gradients": {
-      "version": "1.0.5",
-      "resolved": "http://localhost:4873/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz",
-      "integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=",
-      "dev": true,
-      "requires": {
-        "postcss": "^5.0.12",
-        "postcss-value-parser": "^3.3.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://localhost:4873/postcss/-/postcss-5.2.18.tgz",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-minify-params": {
-      "version": "1.2.2",
-      "resolved": "http://localhost:4873/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz",
-      "integrity": "sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=",
-      "dev": true,
-      "requires": {
-        "alphanum-sort": "^1.0.1",
-        "postcss": "^5.0.2",
-        "postcss-value-parser": "^3.0.2",
-        "uniqs": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://localhost:4873/postcss/-/postcss-5.2.18.tgz",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-minify-selectors": {
-      "version": "2.1.1",
-      "resolved": "http://localhost:4873/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz",
-      "integrity": "sha1-ssapjAByz5G5MtGkllCBFDEXNb8=",
-      "dev": true,
-      "requires": {
-        "alphanum-sort": "^1.0.2",
-        "has": "^1.0.1",
-        "postcss": "^5.0.14",
-        "postcss-selector-parser": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://localhost:4873/postcss/-/postcss-5.2.18.tgz",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-modules-extract-imports": {
-      "version": "1.1.0",
-      "resolved": "http://localhost:4873/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz",
-      "integrity": "sha1-thTJcgvmgW6u41+zpfqh26agXds=",
-      "dev": true,
-      "requires": {
-        "postcss": "^6.0.1"
-      }
-    },
-    "postcss-modules-local-by-default": {
-      "version": "1.2.0",
-      "resolved": "http://localhost:4873/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz",
-      "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=",
-      "dev": true,
-      "requires": {
-        "css-selector-tokenizer": "^0.7.0",
-        "postcss": "^6.0.1"
-      }
-    },
-    "postcss-modules-scope": {
-      "version": "1.1.0",
-      "resolved": "http://localhost:4873/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz",
-      "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=",
-      "dev": true,
-      "requires": {
-        "css-selector-tokenizer": "^0.7.0",
-        "postcss": "^6.0.1"
-      }
-    },
-    "postcss-modules-values": {
-      "version": "1.3.0",
-      "resolved": "http://localhost:4873/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz",
-      "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=",
-      "dev": true,
-      "requires": {
-        "icss-replace-symbols": "^1.1.0",
-        "postcss": "^6.0.1"
-      }
-    },
-    "postcss-normalize-charset": {
-      "version": "1.1.1",
-      "resolved": "http://localhost:4873/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz",
-      "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=",
-      "dev": true,
-      "requires": {
-        "postcss": "^5.0.5"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://localhost:4873/postcss/-/postcss-5.2.18.tgz",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-normalize-url": {
-      "version": "3.0.8",
-      "resolved": "http://localhost:4873/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz",
-      "integrity": "sha1-EI90s/L82viRov+j6kWSJ5/HgiI=",
-      "dev": true,
-      "requires": {
-        "is-absolute-url": "^2.0.0",
-        "normalize-url": "^1.4.0",
-        "postcss": "^5.0.14",
-        "postcss-value-parser": "^3.2.3"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://localhost:4873/postcss/-/postcss-5.2.18.tgz",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-ordered-values": {
-      "version": "2.2.3",
-      "resolved": "http://localhost:4873/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz",
-      "integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=",
-      "dev": true,
-      "requires": {
-        "postcss": "^5.0.4",
-        "postcss-value-parser": "^3.0.1"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://localhost:4873/postcss/-/postcss-5.2.18.tgz",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-reduce-idents": {
-      "version": "2.4.0",
-      "resolved": "http://localhost:4873/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz",
-      "integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=",
-      "dev": true,
-      "requires": {
-        "postcss": "^5.0.4",
-        "postcss-value-parser": "^3.0.2"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://localhost:4873/postcss/-/postcss-5.2.18.tgz",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-reduce-initial": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz",
-      "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=",
-      "dev": true,
-      "requires": {
-        "postcss": "^5.0.4"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://localhost:4873/postcss/-/postcss-5.2.18.tgz",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-reduce-transforms": {
-      "version": "1.0.4",
-      "resolved": "http://localhost:4873/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz",
-      "integrity": "sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.1",
-        "postcss": "^5.0.8",
-        "postcss-value-parser": "^3.0.1"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://localhost:4873/postcss/-/postcss-5.2.18.tgz",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-selector-parser": {
-      "version": "2.2.3",
-      "resolved": "http://localhost:4873/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
-      "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
-      "dev": true,
-      "requires": {
-        "flatten": "^1.0.2",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      }
-    },
-    "postcss-svgo": {
-      "version": "2.1.6",
-      "resolved": "http://localhost:4873/postcss-svgo/-/postcss-svgo-2.1.6.tgz",
-      "integrity": "sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=",
-      "dev": true,
-      "requires": {
-        "is-svg": "^2.0.0",
-        "postcss": "^5.0.14",
-        "postcss-value-parser": "^3.2.3",
-        "svgo": "^0.7.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://localhost:4873/postcss/-/postcss-5.2.18.tgz",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-unique-selectors": {
-      "version": "2.0.2",
-      "resolved": "http://localhost:4873/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz",
-      "integrity": "sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=",
-      "dev": true,
-      "requires": {
-        "alphanum-sort": "^1.0.1",
-        "postcss": "^5.0.4",
-        "uniqs": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://localhost:4873/postcss/-/postcss-5.2.18.tgz",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-url": {
-      "version": "7.3.2",
-      "resolved": "http://localhost:4873/postcss-url/-/postcss-url-7.3.2.tgz",
-      "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"
-      }
-    },
-    "postcss-value-parser": {
-      "version": "3.3.0",
-      "resolved": "http://localhost:4873/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz",
-      "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=",
-      "dev": true
-    },
-    "postcss-zindex": {
-      "version": "2.2.0",
-      "resolved": "http://localhost:4873/postcss-zindex/-/postcss-zindex-2.2.0.tgz",
-      "integrity": "sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.1",
-        "postcss": "^5.0.4",
-        "uniqs": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://localhost:4873/postcss/-/postcss-5.2.18.tgz",
-          "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"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "http://localhost:4873/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "dev": true
-    },
-    "prepend-http": {
-      "version": "1.0.4",
-      "resolved": "http://localhost:4873/prepend-http/-/prepend-http-1.0.4.tgz",
-      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-      "dev": true
-    },
-    "preserve": {
-      "version": "0.2.0",
-      "resolved": "http://localhost:4873/preserve/-/preserve-0.2.0.tgz",
-      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
-      "dev": true
-    },
-    "pretty-bytes": {
-      "version": "4.0.2",
-      "resolved": "http://localhost:4873/pretty-bytes/-/pretty-bytes-4.0.2.tgz",
-      "integrity": "sha1-sr+C5zUNZcbDOqlaqlpPYyf2HNk=",
-      "dev": true
-    },
-    "pretty-error": {
-      "version": "2.1.1",
-      "resolved": "http://localhost:4873/pretty-error/-/pretty-error-2.1.1.tgz",
-      "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=",
-      "dev": true,
-      "requires": {
-        "renderkid": "^2.0.1",
-        "utila": "~0.4"
-      }
-    },
-    "prettycli": {
-      "version": "1.4.3",
-      "resolved": "http://localhost:4873/prettycli/-/prettycli-1.4.3.tgz",
-      "integrity": "sha512-KLiwAXXfSWXZqGmZlnKPuGMTFp+0QbcySplL1ft9gfteT/BNsG64Xo8u2Qr9r+qnsIZWBQ66Zs8tg+8s2fmzvw==",
-      "dev": true,
-      "requires": {
-        "chalk": "2.1.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.1.0",
-          "resolved": "http://localhost:4873/chalk/-/chalk-2.1.0.tgz",
-          "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.1.0",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^4.0.0"
-          }
-        },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "4.5.0",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^2.0.0"
-          }
-        }
-      }
-    },
-    "private": {
-      "version": "0.1.8",
-      "resolved": "http://localhost:4873/private/-/private-0.1.8.tgz",
-      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
-      "dev": true
-    },
-    "process": {
-      "version": "0.11.10",
-      "resolved": "http://localhost:4873/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-      "dev": true
-    },
-    "process-nextick-args": {
-      "version": "2.0.0",
-      "resolved": "http://localhost:4873/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
-    },
-    "progress": {
-      "version": "2.0.0",
-      "resolved": "http://localhost:4873/progress/-/progress-2.0.0.tgz",
-      "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=",
-      "dev": true
-    },
-    "promise": {
-      "version": "7.3.1",
-      "resolved": "http://localhost:4873/promise/-/promise-7.3.1.tgz",
-      "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
-      "dev": true,
-      "requires": {
-        "asap": "~2.0.3"
-      }
-    },
-    "promise-inflight": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/promise-inflight/-/promise-inflight-1.0.1.tgz",
-      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
-      "dev": true
-    },
-    "promisify-call": {
-      "version": "2.0.4",
-      "resolved": "http://localhost:4873/promisify-call/-/promisify-call-2.0.4.tgz",
-      "integrity": "sha1-1IwtRWUszM1SgB3ey9UzptS9X7o=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "with-callback": "^1.0.2"
-      }
-    },
-    "proto-list": {
-      "version": "1.2.4",
-      "resolved": "http://localhost:4873/proto-list/-/proto-list-1.2.4.tgz",
-      "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=",
-      "dev": true
-    },
-    "protractor": {
-      "version": "5.1.2",
-      "resolved": "http://localhost:4873/protractor/-/protractor-5.1.2.tgz",
-      "integrity": "sha1-myIXQXCaTGLVzVPGqt1UpxE36V8=",
-      "dev": true,
-      "requires": {
-        "@types/node": "^6.0.46",
-        "@types/q": "^0.0.32",
-        "@types/selenium-webdriver": "~2.53.39",
-        "blocking-proxy": "0.0.5",
-        "chalk": "^1.1.3",
-        "glob": "^7.0.3",
-        "jasmine": "^2.5.3",
-        "jasminewd2": "^2.1.0",
-        "optimist": "~0.6.0",
-        "q": "1.4.1",
-        "saucelabs": "~1.3.0",
-        "selenium-webdriver": "3.0.1",
-        "source-map-support": "~0.4.0",
-        "webdriver-js-extender": "^1.0.0",
-        "webdriver-manager": "^12.0.6"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          }
-        },
-        "del": {
-          "version": "2.2.2",
-          "resolved": "http://localhost:4873/del/-/del-2.2.2.tgz",
-          "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": {
-          "version": "5.0.0",
-          "resolved": "http://localhost:4873/globby/-/globby-5.0.0.tgz",
-          "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"
-          }
-        },
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "http://localhost:4873/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "http://localhost:4873/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        },
-        "q": {
-          "version": "1.4.1",
-          "resolved": "http://localhost:4873/q/-/q-1.4.1.tgz",
-          "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        },
-        "webdriver-manager": {
-          "version": "12.0.6",
-          "resolved": "http://localhost:4873/webdriver-manager/-/webdriver-manager-12.0.6.tgz",
-          "integrity": "sha1-PfGkgZdwELTL+MnYXHpXeCjA5ws=",
-          "dev": true,
-          "requires": {
-            "adm-zip": "^0.4.7",
-            "chalk": "^1.1.1",
-            "del": "^2.2.0",
-            "glob": "^7.0.3",
-            "ini": "^1.3.4",
-            "minimist": "^1.2.0",
-            "q": "^1.4.1",
-            "request": "^2.78.0",
-            "rimraf": "^2.5.2",
-            "semver": "^5.3.0",
-            "xml2js": "^0.4.17"
-          }
-        }
-      }
-    },
-    "proxy-addr": {
-      "version": "2.0.3",
-      "resolved": "http://localhost:4873/proxy-addr/-/proxy-addr-2.0.3.tgz",
-      "integrity": "sha512-jQTChiCJteusULxjBp8+jftSQE5Obdl3k4cnmLA6WXtK6XFuWRnvVL7aCiBqaLPM8c4ph0S4tKna8XvmIwEnXQ==",
-      "dev": true,
-      "requires": {
-        "forwarded": "~0.1.2",
-        "ipaddr.js": "1.6.0"
-      }
-    },
-    "proxy-agent": {
-      "version": "3.0.0",
-      "resolved": "http://localhost:4873/proxy-agent/-/proxy-agent-3.0.0.tgz",
-      "integrity": "sha512-g6n6vnk8fRf705ShN+FEXFG/SDJaW++lSs0d9KaJh4uBWW/wi7en4Cpo5VYQW3SZzAE121lhB/KLQrbURoubZw==",
-      "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": "^2.0.1",
-        "proxy-from-env": "^1.0.0",
-        "socks-proxy-agent": "^3.0.0"
-      }
-    },
-    "proxy-from-env": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
-      "integrity": "sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=",
-      "dev": true,
-      "optional": true
-    },
-    "prr": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
-      "dev": true
-    },
-    "ps-tree": {
-      "version": "1.1.0",
-      "resolved": "http://localhost:4873/ps-tree/-/ps-tree-1.1.0.tgz",
-      "integrity": "sha1-tCGyQUDWID8e08dplrRCewjowBQ=",
-      "requires": {
-        "event-stream": "~3.3.0"
-      }
-    },
-    "pseudomap": {
-      "version": "1.0.2",
-      "resolved": "http://localhost:4873/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
-    },
-    "public-encrypt": {
-      "version": "4.0.2",
-      "resolved": "http://localhost:4873/public-encrypt/-/public-encrypt-4.0.2.tgz",
-      "integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==",
-      "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"
-      }
-    },
-    "pump": {
-      "version": "2.0.1",
-      "resolved": "http://localhost:4873/pump/-/pump-2.0.1.tgz",
-      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "pumpify": {
-      "version": "1.5.1",
-      "resolved": "http://localhost:4873/pumpify/-/pumpify-1.5.1.tgz",
-      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
-      "dev": true,
-      "requires": {
-        "duplexify": "^3.6.0",
-        "inherits": "^2.0.3",
-        "pump": "^2.0.0"
-      }
-    },
-    "punycode": {
-      "version": "2.1.1",
-      "resolved": "http://localhost:4873/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
-    },
-    "q": {
-      "version": "1.5.1",
-      "resolved": "http://localhost:4873/q/-/q-1.5.1.tgz",
-      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-      "dev": true
-    },
-    "qjobs": {
-      "version": "1.2.0",
-      "resolved": "http://localhost:4873/qjobs/-/qjobs-1.2.0.tgz",
-      "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
-      "dev": true
-    },
-    "qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
-    },
-    "query-string": {
-      "version": "4.3.4",
-      "resolved": "http://localhost:4873/query-string/-/query-string-4.3.4.tgz",
-      "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
-      "dev": true,
-      "requires": {
-        "object-assign": "^4.1.0",
-        "strict-uri-encode": "^1.0.0"
-      }
-    },
-    "querystring": {
-      "version": "0.2.0",
-      "resolved": "http://localhost:4873/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
-      "dev": true
-    },
-    "querystring-es3": {
-      "version": "0.2.1",
-      "resolved": "http://localhost:4873/querystring-es3/-/querystring-es3-0.2.1.tgz",
-      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
-      "dev": true
-    },
-    "querystringify": {
-      "version": "2.0.0",
-      "resolved": "http://localhost:4873/querystringify/-/querystringify-2.0.0.tgz",
-      "integrity": "sha512-eTPo5t/4bgaMNZxyjWx6N2a6AuE0mq51KWvpc7nU/MAqixcI6v6KrGUKES0HaomdnolQBBXU/++X6/QQ9KL4tw==",
-      "dev": true
-    },
-    "randomatic": {
-      "version": "3.0.0",
-      "resolved": "http://localhost:4873/randomatic/-/randomatic-3.0.0.tgz",
-      "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==",
-      "dev": true,
-      "requires": {
-        "is-number": "^4.0.0",
-        "kind-of": "^6.0.0",
-        "math-random": "^1.0.1"
-      },
-      "dependencies": {
-        "is-number": {
-          "version": "4.0.0",
-          "resolved": "http://localhost:4873/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "http://localhost:4873/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
-        }
-      }
-    },
-    "randombytes": {
-      "version": "2.0.6",
-      "resolved": "http://localhost:4873/randombytes/-/randombytes-2.0.6.tgz",
-      "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "randomfill": {
-      "version": "1.0.4",
-      "resolved": "http://localhost:4873/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-      "dev": true,
-      "requires": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "range-parser": {
-      "version": "1.2.0",
-      "resolved": "http://localhost:4873/range-parser/-/range-parser-1.2.0.tgz",
-      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
-      "dev": true
-    },
-    "raphael": {
-      "version": "2.2.7",
-      "resolved": "http://localhost:4873/raphael/-/raphael-2.2.7.tgz",
-      "integrity": "sha1-IxsZFB+NCGmG2PrOtm+LVi7iyBA=",
-      "requires": {
-        "eve-raphael": "0.5.0"
-      }
-    },
-    "raw-body": {
-      "version": "2.3.2",
-      "resolved": "http://localhost:4873/raw-body/-/raw-body-2.3.2.tgz",
-      "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
-      "dev": true,
-      "requires": {
-        "bytes": "3.0.0",
-        "http-errors": "1.6.2",
-        "iconv-lite": "0.4.19",
-        "unpipe": "1.0.0"
-      },
-      "dependencies": {
-        "depd": {
-          "version": "1.1.1",
-          "resolved": "http://localhost:4873/depd/-/depd-1.1.1.tgz",
-          "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
-          "dev": true
-        },
-        "http-errors": {
-          "version": "1.6.2",
-          "resolved": "http://localhost:4873/http-errors/-/http-errors-1.6.2.tgz",
-          "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
-          "dev": true,
-          "requires": {
-            "depd": "1.1.1",
-            "inherits": "2.0.3",
-            "setprototypeof": "1.0.3",
-            "statuses": ">= 1.3.1 < 2"
-          }
-        },
-        "setprototypeof": {
-          "version": "1.0.3",
-          "resolved": "http://localhost:4873/setprototypeof/-/setprototypeof-1.0.3.tgz",
-          "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=",
-          "dev": true
-        }
-      }
-    },
-    "raw-loader": {
-      "version": "0.5.1",
-      "resolved": "http://localhost:4873/raw-loader/-/raw-loader-0.5.1.tgz",
-      "integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao=",
-      "dev": true
-    },
-    "rc": {
-      "version": "1.1.7",
-      "resolved": "http://localhost:4873/rc/-/rc-1.1.7.tgz",
-      "integrity": "sha1-xepWS7B6/5/TpbMukGwdOmWUD+o=",
-      "dev": true,
-      "requires": {
-        "deep-extend": "~0.4.0",
-        "ini": "~1.3.0",
-        "minimist": "^1.2.0",
-        "strip-json-comments": "~2.0.1"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "http://localhost:4873/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        }
-      }
-    },
-    "read-cache": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/read-cache/-/read-cache-1.0.0.tgz",
-      "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
-      "dev": true,
-      "requires": {
-        "pify": "^2.3.0"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "http://localhost:4873/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        }
-      }
-    },
-    "read-pkg": {
-      "version": "3.0.0",
-      "resolved": "http://localhost:4873/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"
-      }
-    },
-    "read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-      "dev": true,
-      "requires": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "1.1.2",
-          "resolved": "http://localhost:4873/find-up/-/find-up-1.1.2.tgz",
-          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-          "dev": true,
-          "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "load-json-file": {
-          "version": "1.1.0",
-          "resolved": "http://localhost:4873/load-json-file/-/load-json-file-1.1.0.tgz",
-          "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"
-          }
-        },
-        "parse-json": {
-          "version": "2.2.0",
-          "resolved": "http://localhost:4873/parse-json/-/parse-json-2.2.0.tgz",
-          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-          "dev": true,
-          "requires": {
-            "error-ex": "^1.2.0"
-          }
-        },
-        "path-exists": {
-          "version": "2.1.0",
-          "resolved": "http://localhost:4873/path-exists/-/path-exists-2.1.0.tgz",
-          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-          "dev": true,
-          "requires": {
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "path-type": {
-          "version": "1.1.0",
-          "resolved": "http://localhost:4873/path-type/-/path-type-1.1.0.tgz",
-          "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "http://localhost:4873/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        },
-        "read-pkg": {
-          "version": "1.1.0",
-          "resolved": "http://localhost:4873/read-pkg/-/read-pkg-1.1.0.tgz",
-          "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-          "dev": true,
-          "requires": {
-            "load-json-file": "^1.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^1.0.0"
-          }
-        },
-        "strip-bom": {
-          "version": "2.0.0",
-          "resolved": "http://localhost:4873/strip-bom/-/strip-bom-2.0.0.tgz",
-          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-          "dev": true,
-          "requires": {
-            "is-utf8": "^0.2.0"
-          }
-        }
-      }
-    },
-    "readable-stream": {
-      "version": "2.3.6",
-      "resolved": "http://localhost:4873/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"
-      }
-    },
-    "readdirp": {
-      "version": "2.1.0",
-      "resolved": "http://localhost:4873/readdirp/-/readdirp-2.1.0.tgz",
-      "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "minimatch": "^3.0.2",
-        "readable-stream": "^2.0.2",
-        "set-immediate-shim": "^1.0.1"
-      }
-    },
-    "recast": {
-      "version": "0.11.23",
-      "resolved": "http://localhost:4873/recast/-/recast-0.11.23.tgz",
-      "integrity": "sha1-RR/TAEqx5N+bTktmN2sqIZEkYtM=",
-      "dev": true,
-      "requires": {
-        "ast-types": "0.9.6",
-        "esprima": "~3.1.0",
-        "private": "~0.1.5",
-        "source-map": "~0.5.0"
-      },
-      "dependencies": {
-        "esprima": {
-          "version": "3.1.3",
-          "resolved": "http://localhost:4873/esprima/-/esprima-3.1.3.tgz",
-          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
-          "dev": true
-        }
-      }
-    },
-    "rechoir": {
-      "version": "0.6.2",
-      "resolved": "http://localhost:4873/rechoir/-/rechoir-0.6.2.tgz",
-      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-      "dev": true,
-      "requires": {
-        "resolve": "^1.1.6"
-      }
-    },
-    "redent": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/redent/-/redent-1.0.0.tgz",
-      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-      "dev": true,
-      "requires": {
-        "indent-string": "^2.1.0",
-        "strip-indent": "^1.0.1"
-      }
-    },
-    "redis": {
-      "version": "2.8.0",
-      "resolved": "http://localhost:4873/redis/-/redis-2.8.0.tgz",
-      "integrity": "sha512-M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "double-ended-queue": "^2.1.0-0",
-        "redis-commands": "^1.2.0",
-        "redis-parser": "^2.6.0"
-      }
-    },
-    "redis-commands": {
-      "version": "1.3.5",
-      "resolved": "http://localhost:4873/redis-commands/-/redis-commands-1.3.5.tgz",
-      "integrity": "sha512-foGF8u6MXGFF++1TZVC6icGXuMYPftKXt1FBT2vrfU9ZATNtZJ8duRC5d1lEfE8hyVe3jhelHGB91oB7I6qLsA==",
-      "dev": true,
-      "optional": true
-    },
-    "redis-parser": {
-      "version": "2.6.0",
-      "resolved": "http://localhost:4873/redis-parser/-/redis-parser-2.6.0.tgz",
-      "integrity": "sha1-Uu0J2srBCPGmMcB+m2mUHnoZUEs=",
-      "dev": true,
-      "optional": true
-    },
-    "reduce-css-calc": {
-      "version": "1.3.0",
-      "resolved": "http://localhost:4873/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz",
-      "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=",
-      "dev": true,
-      "requires": {
-        "balanced-match": "^0.4.2",
-        "math-expression-evaluator": "^1.2.14",
-        "reduce-function-call": "^1.0.1"
-      },
-      "dependencies": {
-        "balanced-match": {
-          "version": "0.4.2",
-          "resolved": "http://localhost:4873/balanced-match/-/balanced-match-0.4.2.tgz",
-          "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
-          "dev": true
-        }
-      }
-    },
-    "reduce-function-call": {
-      "version": "1.0.2",
-      "resolved": "http://localhost:4873/reduce-function-call/-/reduce-function-call-1.0.2.tgz",
-      "integrity": "sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=",
-      "dev": true,
-      "requires": {
-        "balanced-match": "^0.4.2"
-      },
-      "dependencies": {
-        "balanced-match": {
-          "version": "0.4.2",
-          "resolved": "http://localhost:4873/balanced-match/-/balanced-match-0.4.2.tgz",
-          "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
-          "dev": true
-        }
-      }
-    },
-    "reflect-metadata": {
-      "version": "0.1.10",
-      "resolved": "http://localhost:4873/reflect-metadata/-/reflect-metadata-0.1.10.tgz",
-      "integrity": "sha1-tPg3BEFqytiZiMmxVjXUfgO5NEo="
-    },
-    "regenerate": {
-      "version": "1.4.0",
-      "resolved": "http://localhost:4873/regenerate/-/regenerate-1.4.0.tgz",
-      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==",
-      "dev": true
-    },
-    "regenerator-runtime": {
-      "version": "0.11.1",
-      "resolved": "http://localhost:4873/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
-      "dev": true
-    },
-    "regex-cache": {
-      "version": "0.4.4",
-      "resolved": "http://localhost:4873/regex-cache/-/regex-cache-0.4.4.tgz",
-      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
-      "dev": true,
-      "requires": {
-        "is-equal-shallow": "^0.1.3"
-      }
-    },
-    "regex-not": {
-      "version": "1.0.2",
-      "resolved": "http://localhost:4873/regex-not/-/regex-not-1.0.2.tgz",
-      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^3.0.2",
-        "safe-regex": "^1.1.0"
-      }
-    },
-    "regexpu-core": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/regexpu-core/-/regexpu-core-1.0.0.tgz",
-      "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
-      "dev": true,
-      "requires": {
-        "regenerate": "^1.2.1",
-        "regjsgen": "^0.2.0",
-        "regjsparser": "^0.1.4"
-      }
-    },
-    "registry-auth-token": {
-      "version": "3.3.2",
-      "resolved": "http://localhost:4873/registry-auth-token/-/registry-auth-token-3.3.2.tgz",
-      "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==",
-      "dev": true,
-      "requires": {
-        "rc": "^1.1.6",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "registry-url": {
-      "version": "3.1.0",
-      "resolved": "http://localhost:4873/registry-url/-/registry-url-3.1.0.tgz",
-      "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
-      "dev": true,
-      "requires": {
-        "rc": "^1.0.1"
-      }
-    },
-    "regjsgen": {
-      "version": "0.2.0",
-      "resolved": "http://localhost:4873/regjsgen/-/regjsgen-0.2.0.tgz",
-      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
-      "dev": true
-    },
-    "regjsparser": {
-      "version": "0.1.5",
-      "resolved": "http://localhost:4873/regjsparser/-/regjsparser-0.1.5.tgz",
-      "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
-      "dev": true,
-      "requires": {
-        "jsesc": "~0.5.0"
-      },
-      "dependencies": {
-        "jsesc": {
-          "version": "0.5.0",
-          "resolved": "http://localhost:4873/jsesc/-/jsesc-0.5.0.tgz",
-          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-          "dev": true
-        }
-      }
-    },
-    "relateurl": {
-      "version": "0.2.7",
-      "resolved": "http://localhost:4873/relateurl/-/relateurl-0.2.7.tgz",
-      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
-      "dev": true
-    },
-    "remap-istanbul": {
-      "version": "0.6.3",
-      "resolved": "http://localhost:4873/remap-istanbul/-/remap-istanbul-0.6.3.tgz",
-      "integrity": "sha1-0HHV3Fw2Z+fha4m1eymj+PKADTE=",
-      "dev": true,
-      "requires": {
-        "amdefine": "1.0.0",
-        "gulp-util": "3.0.7",
-        "istanbul": "0.4.3",
-        "source-map": "0.5.3",
-        "through2": "2.0.1"
-      },
-      "dependencies": {
-        "abbrev": {
-          "version": "1.0.9",
-          "resolved": "http://localhost:4873/abbrev/-/abbrev-1.0.9.tgz",
-          "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
-          "dev": true
-        },
-        "amdefine": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/amdefine/-/amdefine-1.0.0.tgz",
-          "integrity": "sha1-/RdHRwDLXMnCtwnwvp0jzjwZjDM=",
-          "dev": true
-        },
-        "async": {
-          "version": "1.5.2",
-          "resolved": "http://localhost:4873/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-          "dev": true
-        },
-        "escodegen": {
-          "version": "1.8.1",
-          "resolved": "http://localhost:4873/escodegen/-/escodegen-1.8.1.tgz",
-          "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"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.2.0",
-              "resolved": "http://localhost:4873/source-map/-/source-map-0.2.0.tgz",
-              "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "amdefine": ">=0.0.4"
-              }
-            }
-          }
-        },
-        "esprima": {
-          "version": "2.7.3",
-          "resolved": "http://localhost:4873/esprima/-/esprima-2.7.3.tgz",
-          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
-          "dev": true
-        },
-        "estraverse": {
-          "version": "1.9.3",
-          "resolved": "http://localhost:4873/estraverse/-/estraverse-1.9.3.tgz",
-          "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=",
-          "dev": true
-        },
-        "fileset": {
-          "version": "0.2.1",
-          "resolved": "http://localhost:4873/fileset/-/fileset-0.2.1.tgz",
-          "integrity": "sha1-WI74lzxmI7KnbfRlEFaWuWqsgGc=",
-          "dev": true,
-          "requires": {
-            "glob": "5.x",
-            "minimatch": "2.x"
-          }
-        },
-        "glob": {
-          "version": "5.0.15",
-          "resolved": "http://localhost:4873/glob/-/glob-5.0.15.tgz",
-          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-          "dev": true,
-          "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "istanbul": {
-          "version": "0.4.3",
-          "resolved": "http://localhost:4873/istanbul/-/istanbul-0.4.3.tgz",
-          "integrity": "sha1-W3FO4K5JOsXvIEuZ84crzu9z1To=",
-          "dev": true,
-          "requires": {
-            "abbrev": "1.0.x",
-            "async": "1.x",
-            "escodegen": "1.8.x",
-            "esprima": "2.7.x",
-            "fileset": "0.2.x",
-            "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"
-          }
-        },
-        "minimatch": {
-          "version": "2.0.10",
-          "resolved": "http://localhost:4873/minimatch/-/minimatch-2.0.10.tgz",
-          "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^1.0.0"
-          }
-        },
-        "nopt": {
-          "version": "3.0.6",
-          "resolved": "http://localhost:4873/nopt/-/nopt-3.0.6.tgz",
-          "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-          "dev": true,
-          "requires": {
-            "abbrev": "1"
-          }
-        },
-        "process-nextick-args": {
-          "version": "1.0.7",
-          "resolved": "http://localhost:4873/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-          "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.0.6",
-          "resolved": "http://localhost:4873/readable-stream/-/readable-stream-2.0.6.tgz",
-          "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"
-          }
-        },
-        "resolve": {
-          "version": "1.1.7",
-          "resolved": "http://localhost:4873/resolve/-/resolve-1.1.7.tgz",
-          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.3",
-          "resolved": "http://localhost:4873/source-map/-/source-map-0.5.3.tgz",
-          "integrity": "sha1-gmdLhacbC+dsPnQW0V6fUlLrO+A=",
-          "dev": true
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "http://localhost:4873/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        },
-        "through2": {
-          "version": "2.0.1",
-          "resolved": "http://localhost:4873/through2/-/through2-2.0.1.tgz",
-          "integrity": "sha1-OE51MU1J8y3hLuu4E2uOtrXVnak=",
-          "dev": true,
-          "requires": {
-            "readable-stream": "~2.0.0",
-            "xtend": "~4.0.0"
-          }
-        },
-        "wordwrap": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/wordwrap/-/wordwrap-1.0.0.tgz",
-          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
-          "dev": true
-        }
-      }
-    },
-    "remark": {
-      "version": "9.0.0",
-      "resolved": "http://localhost:4873/remark/-/remark-9.0.0.tgz",
-      "integrity": "sha512-amw8rGdD5lHbMEakiEsllmkdBP+/KpjW/PRK6NSGPZKCQowh0BT4IWXDAkRMyG3SB9dKPXWMviFjNusXzXNn3A==",
-      "dev": true,
-      "requires": {
-        "remark-parse": "^5.0.0",
-        "remark-stringify": "^5.0.0",
-        "unified": "^6.0.0"
-      }
-    },
-    "remark-frontmatter": {
-      "version": "1.2.0",
-      "resolved": "http://localhost:4873/remark-frontmatter/-/remark-frontmatter-1.2.0.tgz",
-      "integrity": "sha512-BqcYv/ly+I94TiOM/n7iyNVBknzvTIblnQJiAg+6W/s/jxjtBIz5D66Tcjc20elFwW4hIqQI7R2UV1nlYumY3A==",
-      "dev": true,
-      "requires": {
-        "fault": "^1.0.1",
-        "xtend": "^4.0.1"
-      }
-    },
-    "remark-parse": {
-      "version": "5.0.0",
-      "resolved": "http://localhost:4873/remark-parse/-/remark-parse-5.0.0.tgz",
-      "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",
-        "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"
-      }
-    },
-    "remark-stringify": {
-      "version": "5.0.0",
-      "resolved": "http://localhost:4873/remark-stringify/-/remark-stringify-5.0.0.tgz",
-      "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"
-      }
-    },
-    "remarkable": {
-      "version": "1.7.1",
-      "resolved": "http://localhost:4873/remarkable/-/remarkable-1.7.1.tgz",
-      "integrity": "sha1-qspJchALZqZCpjoQIcpLrBvjv/Y=",
-      "dev": true,
-      "requires": {
-        "argparse": "~0.1.15",
-        "autolinker": "~0.15.0"
-      },
-      "dependencies": {
-        "argparse": {
-          "version": "0.1.16",
-          "resolved": "http://localhost:4873/argparse/-/argparse-0.1.16.tgz",
-          "integrity": "sha1-z9AeD7uj1srtBJ+9dY1A9lGW9Xw=",
-          "dev": true,
-          "requires": {
-            "underscore": "~1.7.0",
-            "underscore.string": "~2.4.0"
-          }
-        }
-      }
-    },
-    "remove-trailing-separator": {
-      "version": "1.1.0",
-      "resolved": "http://localhost:4873/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-      "dev": true
-    },
-    "renderkid": {
-      "version": "2.0.1",
-      "resolved": "http://localhost:4873/renderkid/-/renderkid-2.0.1.tgz",
-      "integrity": "sha1-iYyr/Ivt5Le5ETWj/9Mj5YwNsxk=",
-      "dev": true,
-      "requires": {
-        "css-select": "^1.1.0",
-        "dom-converter": "~0.1",
-        "htmlparser2": "~3.3.0",
-        "strip-ansi": "^3.0.0",
-        "utila": "~0.3"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "utila": {
-          "version": "0.3.3",
-          "resolved": "http://localhost:4873/utila/-/utila-0.3.3.tgz",
-          "integrity": "sha1-1+jn1+MJEHCSsF+NloiCTWM6QiY=",
-          "dev": true
-        }
-      }
-    },
-    "repeat-element": {
-      "version": "1.1.2",
-      "resolved": "http://localhost:4873/repeat-element/-/repeat-element-1.1.2.tgz",
-      "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=",
-      "dev": true
-    },
-    "repeat-string": {
-      "version": "1.6.1",
-      "resolved": "http://localhost:4873/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-      "dev": true
-    },
-    "repeating": {
-      "version": "2.0.1",
-      "resolved": "http://localhost:4873/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-      "dev": true,
-      "requires": {
-        "is-finite": "^1.0.0"
-      }
-    },
-    "replace-ext": {
-      "version": "0.0.1",
-      "resolved": "http://localhost:4873/replace-ext/-/replace-ext-0.0.1.tgz",
-      "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
-      "dev": true
-    },
-    "request": {
-      "version": "2.81.0",
-      "resolved": "http://localhost:4873/request/-/request-2.81.0.tgz",
-      "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
-      "dev": true,
-      "requires": {
-        "aws-sign2": "~0.6.0",
-        "aws4": "^1.2.1",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.5",
-        "extend": "~3.0.0",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.1.1",
-        "har-validator": "~4.2.1",
-        "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",
-        "oauth-sign": "~0.8.1",
-        "performance-now": "^0.2.0",
-        "qs": "~6.4.0",
-        "safe-buffer": "^5.0.1",
-        "stringstream": "~0.0.4",
-        "tough-cookie": "~2.3.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.0.0"
-      },
-      "dependencies": {
-        "form-data": {
-          "version": "2.1.4",
-          "resolved": "http://localhost:4873/form-data/-/form-data-2.1.4.tgz",
-          "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
-          "dev": true,
-          "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "^1.0.5",
-            "mime-types": "^2.1.12"
-          }
-        },
-        "qs": {
-          "version": "6.4.0",
-          "resolved": "http://localhost:4873/qs/-/qs-6.4.0.tgz",
-          "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
-          "dev": true
-        }
-      }
-    },
-    "requestretry": {
-      "version": "1.13.0",
-      "resolved": "http://localhost:4873/requestretry/-/requestretry-1.13.0.tgz",
-      "integrity": "sha512-Lmh9qMvnQXADGAQxsXHP4rbgO6pffCfuR8XUBdP9aitJcLQJxhp7YZK4xAVYXnPJ5E52mwrfiKQtKonPL8xsmg==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "extend": "^3.0.0",
-        "lodash": "^4.15.0",
-        "request": "^2.74.0",
-        "when": "^3.7.7"
-      }
-    },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "http://localhost:4873/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
-    },
-    "require-from-string": {
-      "version": "1.2.1",
-      "resolved": "http://localhost:4873/require-from-string/-/require-from-string-1.2.1.tgz",
-      "integrity": "sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg=",
-      "dev": true
-    },
-    "require-main-filename": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
-    },
-    "requires-port": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
-      "dev": true
-    },
-    "resolve": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz",
-      "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==",
-      "dev": true,
-      "requires": {
-        "path-parse": "^1.0.5"
-      }
-    },
-    "resolve-cwd": {
-      "version": "2.0.0",
-      "resolved": "http://localhost:4873/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
-      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
-      "dev": true,
-      "requires": {
-        "resolve-from": "^3.0.0"
-      }
-    },
-    "resolve-from": {
-      "version": "3.0.0",
-      "resolved": "http://localhost:4873/resolve-from/-/resolve-from-3.0.0.tgz",
-      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
-      "dev": true
-    },
-    "resolve-url": {
-      "version": "0.2.1",
-      "resolved": "http://localhost:4873/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-      "dev": true
-    },
-    "restore-cursor": {
-      "version": "2.0.0",
-      "resolved": "http://localhost:4873/restore-cursor/-/restore-cursor-2.0.0.tgz",
-      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
-      "dev": true,
-      "requires": {
-        "onetime": "^2.0.0",
-        "signal-exit": "^3.0.2"
-      }
-    },
-    "ret": {
-      "version": "0.1.15",
-      "resolved": "http://localhost:4873/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true
-    },
-    "right-align": {
-      "version": "0.1.3",
-      "resolved": "http://localhost:4873/right-align/-/right-align-0.1.3.tgz",
-      "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
-      "dev": true,
-      "requires": {
-        "align-text": "^0.1.1"
-      }
-    },
-    "rimraf": {
-      "version": "2.6.2",
-      "resolved": "http://localhost:4873/rimraf/-/rimraf-2.6.2.tgz",
-      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.0.5"
-      }
-    },
-    "ripemd160": {
-      "version": "2.0.2",
-      "resolved": "http://localhost:4873/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "dev": true,
-      "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
-    "rollup": {
-      "version": "0.55.5",
-      "resolved": "http://localhost:4873/rollup/-/rollup-0.55.5.tgz",
-      "integrity": "sha512-2hke9NOy332kxvnmMQOgl7DHm94zihNyYJNd8ZLWo4U0EjFvjUkeWa0+ge+70bTg+mY0xJ7NUsf5kIhDtrGrtA==",
-      "dev": true
-    },
-    "rollup-plugin-cleanup": {
-      "version": "2.0.1",
-      "resolved": "http://localhost:4873/rollup-plugin-cleanup/-/rollup-plugin-cleanup-2.0.1.tgz",
-      "integrity": "sha512-Z2UpMe3l2Oo8jzoB2gAWcb3UqIyiGxlh8kKlcs/W53yTPtwdF8RGfhuTx+/kjRlkSc5TC03t3sX3Lj3B40k9Eg==",
-      "dev": true,
-      "requires": {
-        "acorn": "4.x",
-        "magic-string": "^0.22.4",
-        "rollup-pluginutils": "^2.0.1"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "4.0.13",
-          "resolved": "http://localhost:4873/acorn/-/acorn-4.0.13.tgz",
-          "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
-          "dev": true
-        }
-      }
-    },
-    "rollup-plugin-commonjs": {
-      "version": "8.3.0",
-      "resolved": "http://localhost:4873/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.3.0.tgz",
-      "integrity": "sha512-PYs3OiYgENFYEmI3vOEm5nrp3eY90YZqd5vGmQqeXmhJsAWFIrFdROCvOasqJ1HgeTvqyYo9IGXnFDyoboNcgQ==",
-      "dev": true,
-      "requires": {
-        "acorn": "^5.2.1",
-        "estree-walker": "^0.5.0",
-        "magic-string": "^0.22.4",
-        "resolve": "^1.4.0",
-        "rollup-pluginutils": "^2.0.1"
-      }
-    },
-    "rollup-plugin-license": {
-      "version": "0.5.0",
-      "resolved": "http://localhost:4873/rollup-plugin-license/-/rollup-plugin-license-0.5.0.tgz",
-      "integrity": "sha1-XnBzdftY0pV1JToNKOl+QYgmgvc=",
-      "dev": true,
-      "requires": {
-        "commenting": "1.0.4",
-        "lodash": "4.17.4",
-        "magic-string": "0.22.4",
-        "mkdirp": "0.5.1",
-        "moment": "2.18.1"
-      },
-      "dependencies": {
-        "commenting": {
-          "version": "1.0.4",
-          "resolved": "http://localhost:4873/commenting/-/commenting-1.0.4.tgz",
-          "integrity": "sha1-0UCvMmNPy97k1xOWk0wfzawUflA=",
-          "dev": true
-        },
-        "lodash": {
-          "version": "4.17.4",
-          "resolved": "http://localhost:4873/lodash/-/lodash-4.17.4.tgz",
-          "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-          "dev": true
-        },
-        "magic-string": {
-          "version": "0.22.4",
-          "resolved": "http://localhost:4873/magic-string/-/magic-string-0.22.4.tgz",
-          "integrity": "sha512-kxBL06p6iO2qPBHsqGK2b3cRwiRGpnmSuVWNhwHcMX7qJOUr1HvricYP1LZOCdkQBUp0jiWg2d6WJwR3vYgByw==",
-          "dev": true,
-          "requires": {
-            "vlq": "^0.2.1"
-          }
-        },
-        "moment": {
-          "version": "2.18.1",
-          "resolved": "http://localhost:4873/moment/-/moment-2.18.1.tgz",
-          "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8=",
-          "dev": true
-        }
-      }
-    },
-    "rollup-plugin-node-resolve": {
-      "version": "3.3.0",
-      "resolved": "http://localhost:4873/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.3.0.tgz",
-      "integrity": "sha512-9zHGr3oUJq6G+X0oRMYlzid9fXicBdiydhwGChdyeNRGPcN/majtegApRKHLR5drboUvEWU+QeUmGTyEZQs3WA==",
-      "dev": true,
-      "requires": {
-        "builtin-modules": "^2.0.0",
-        "is-module": "^1.0.0",
-        "resolve": "^1.1.6"
-      },
-      "dependencies": {
-        "builtin-modules": {
-          "version": "2.0.0",
-          "resolved": "http://localhost:4873/builtin-modules/-/builtin-modules-2.0.0.tgz",
-          "integrity": "sha512-3U5kUA5VPsRUA3nofm/BXX7GVHKfxz0hOBAPxXrIvHzlDRkQVqEn6yi8QJegxl4LzOHLdvb7XF5dVawa/VVYBg==",
-          "dev": true
-        }
-      }
-    },
-    "rollup-plugin-shift-header": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/rollup-plugin-shift-header/-/rollup-plugin-shift-header-1.0.1.tgz",
-      "integrity": "sha1-HPq7stwXHR9+dVpYlwN9Nw4tCDo=",
-      "dev": true,
-      "requires": {
-        "magic-string": "^0.22.4"
-      }
-    },
-    "rollup-pluginutils": {
-      "version": "2.3.0",
-      "resolved": "http://localhost:4873/rollup-pluginutils/-/rollup-pluginutils-2.3.0.tgz",
-      "integrity": "sha512-xB6hsRsjdJdIYWEyYUJy/3ki5g69wrf0luHPGNK3ZSocV6HLNfio59l3dZ3TL4xUwEKgROhFi9jOCt6c5gfUWw==",
-      "dev": true,
-      "requires": {
-        "estree-walker": "^0.5.2",
-        "micromatch": "^2.3.11"
-      }
-    },
-    "rsvp": {
-      "version": "3.6.2",
-      "resolved": "http://localhost:4873/rsvp/-/rsvp-3.6.2.tgz",
-      "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==",
-      "dev": true
-    },
-    "run-async": {
-      "version": "2.3.0",
-      "resolved": "http://localhost:4873/run-async/-/run-async-2.3.0.tgz",
-      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
-      "dev": true,
-      "requires": {
-        "is-promise": "^2.1.0"
-      }
-    },
-    "run-queue": {
-      "version": "1.0.3",
-      "resolved": "http://localhost:4873/run-queue/-/run-queue-1.0.3.tgz",
-      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
-      "dev": true,
-      "requires": {
-        "aproba": "^1.1.1"
-      }
-    },
-    "run-sequence": {
-      "version": "1.2.2",
-      "resolved": "http://localhost:4873/run-sequence/-/run-sequence-1.2.2.tgz",
-      "integrity": "sha1-UJWgvr6YczsBQL0I3YDsAw3azes=",
-      "dev": true,
-      "requires": {
-        "chalk": "*",
-        "gulp-util": "*"
-      }
-    },
-    "rx": {
-      "version": "4.1.0",
-      "resolved": "http://localhost:4873/rx/-/rx-4.1.0.tgz",
-      "integrity": "sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=",
-      "dev": true
-    },
-    "rxjs": {
-      "version": "5.5.2",
-      "resolved": "http://localhost:4873/rxjs/-/rxjs-5.5.2.tgz",
-      "integrity": "sha512-oRYoIKWBU3Ic37fLA5VJu31VqQO4bWubRntcHSJ+cwaDQBwdnZ9x4zmhJfm/nFQ2E82/I4loSioHnACamrKGgA==",
-      "requires": {
-        "symbol-observable": "^1.0.1"
-      }
-    },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "http://localhost:4873/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    },
-    "safe-regex": {
-      "version": "1.1.0",
-      "resolved": "http://localhost:4873/safe-regex/-/safe-regex-1.1.0.tgz",
-      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
-      "dev": true,
-      "requires": {
-        "ret": "~0.1.10"
-      }
-    },
-    "sander": {
-      "version": "0.5.1",
-      "resolved": "http://localhost:4873/sander/-/sander-0.5.1.tgz",
-      "integrity": "sha1-dB4kXiMfB8r7b98PEzrfohalAq0=",
-      "dev": true,
-      "requires": {
-        "es6-promise": "^3.1.2",
-        "graceful-fs": "^4.1.3",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.2"
-      },
-      "dependencies": {
-        "es6-promise": {
-          "version": "3.3.1",
-          "resolved": "http://localhost:4873/es6-promise/-/es6-promise-3.3.1.tgz",
-          "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=",
-          "dev": true
-        }
-      }
-    },
-    "sass-graph": {
-      "version": "2.2.4",
-      "resolved": "http://localhost:4873/sass-graph/-/sass-graph-2.2.4.tgz",
-      "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
-      "dev": true,
-      "requires": {
-        "glob": "^7.0.0",
-        "lodash": "^4.0.0",
-        "scss-tokenizer": "^0.2.3",
-        "yargs": "^7.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "camelcase": {
-          "version": "3.0.0",
-          "resolved": "http://localhost:4873/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-          "dev": true
-        },
-        "cliui": {
-          "version": "3.2.0",
-          "resolved": "http://localhost:4873/cliui/-/cliui-3.2.0.tgz",
-          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-          "dev": true,
-          "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wrap-ansi": "^2.0.0"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "dev": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "os-locale": {
-          "version": "1.4.0",
-          "resolved": "http://localhost:4873/os-locale/-/os-locale-1.4.0.tgz",
-          "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-          "dev": true,
-          "requires": {
-            "lcid": "^1.0.0"
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "http://localhost:4873/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "dev": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "which-module": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/which-module/-/which-module-1.0.0.tgz",
-          "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-          "dev": true
-        },
-        "yargs": {
-          "version": "7.1.0",
-          "resolved": "http://localhost:4873/yargs/-/yargs-7.1.0.tgz",
-          "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"
-          }
-        },
-        "yargs-parser": {
-          "version": "5.0.0",
-          "resolved": "http://localhost:4873/yargs-parser/-/yargs-parser-5.0.0.tgz",
-          "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
-          "dev": true,
-          "requires": {
-            "camelcase": "^3.0.0"
-          }
-        }
-      }
-    },
-    "sass-loader": {
-      "version": "6.0.5",
-      "resolved": "http://localhost:4873/sass-loader/-/sass-loader-6.0.5.tgz",
-      "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"
-      },
-      "dependencies": {
-        "clone-deep": {
-          "version": "0.2.4",
-          "resolved": "http://localhost:4873/clone-deep/-/clone-deep-0.2.4.tgz",
-          "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"
-          }
-        },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "http://localhost:4873/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        },
-        "shallow-clone": {
-          "version": "0.1.2",
-          "resolved": "http://localhost:4873/shallow-clone/-/shallow-clone-0.1.2.tgz",
-          "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"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "2.0.1",
-              "resolved": "http://localhost:4873/kind-of/-/kind-of-2.0.1.tgz",
-              "integrity": "sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.0.2"
-              }
-            },
-            "lazy-cache": {
-              "version": "0.2.7",
-              "resolved": "http://localhost:4873/lazy-cache/-/lazy-cache-0.2.7.tgz",
-              "integrity": "sha1-f+3fLctu23fRHvHRF6tf/fCrG2U=",
-              "dev": true
-            }
-          }
-        }
-      }
-    },
-    "saucelabs": {
-      "version": "1.3.0",
-      "resolved": "http://localhost:4873/saucelabs/-/saucelabs-1.3.0.tgz",
-      "integrity": "sha1-0kDoAJ33+ocwbsRXimm6O1xCT+4=",
-      "dev": true,
-      "requires": {
-        "https-proxy-agent": "^1.0.0"
-      },
-      "dependencies": {
-        "agent-base": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/agent-base/-/agent-base-2.1.1.tgz",
-          "integrity": "sha1-1t4Q1a9hMtW9aSQn1G/FOFOQlMc=",
-          "dev": true,
-          "requires": {
-            "extend": "~3.0.0",
-            "semver": "~5.0.1"
-          }
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "http://localhost:4873/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "https-proxy-agent": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz",
-          "integrity": "sha1-NffabEjOTdv6JkiRrFk+5f+GceY=",
-          "dev": true,
-          "requires": {
-            "agent-base": "2",
-            "debug": "2",
-            "extend": "3"
-          }
-        },
-        "semver": {
-          "version": "5.0.3",
-          "resolved": "http://localhost:4873/semver/-/semver-5.0.3.tgz",
-          "integrity": "sha1-d0Zt5YnNXTyV8TiqeLxWmjy10no=",
-          "dev": true
-        }
-      }
-    },
-    "sax": {
-      "version": "0.5.8",
-      "resolved": "http://localhost:4873/sax/-/sax-0.5.8.tgz",
-      "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=",
-      "dev": true
-    },
-    "schema-utils": {
-      "version": "0.4.5",
-      "resolved": "http://localhost:4873/schema-utils/-/schema-utils-0.4.5.tgz",
-      "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==",
-      "requires": {
-        "ajv": "^6.1.0",
-        "ajv-keywords": "^3.1.0"
-      }
-    },
-    "script-loader": {
-      "version": "0.7.0",
-      "resolved": "http://localhost:4873/script-loader/-/script-loader-0.7.0.tgz",
-      "integrity": "sha1-aF3H5waeDe56kmdPDrxbD1W6pew=",
-      "dev": true,
-      "requires": {
-        "raw-loader": "~0.5.1"
-      }
-    },
-    "scss-bundle": {
-      "version": "2.1.0",
-      "resolved": "http://localhost:4873/scss-bundle/-/scss-bundle-2.1.0.tgz",
-      "integrity": "sha512-8TJaz8f5FMyyH2Se0mxfQY6CKaFb8gxyIE0qPHxk4Dfx7x8IhnvIIXyZwh0O5XK+uD0L4/gQkkRVT5zW+GcJcw==",
-      "dev": true,
-      "requires": {
-        "archy": "^1.0.0",
-        "globs": "^0.1.3",
-        "mkdirp": "^0.5.1",
-        "mz": "^2.6.0",
-        "node-sass": "^4.5.0",
-        "pretty-bytes": "^4.0.2",
-        "promise": "^7.1.1",
-        "yargs": "^7.0.2"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "camelcase": {
-          "version": "3.0.0",
-          "resolved": "http://localhost:4873/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-          "dev": true
-        },
-        "cliui": {
-          "version": "3.2.0",
-          "resolved": "http://localhost:4873/cliui/-/cliui-3.2.0.tgz",
-          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-          "dev": true,
-          "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wrap-ansi": "^2.0.0"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "dev": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "os-locale": {
-          "version": "1.4.0",
-          "resolved": "http://localhost:4873/os-locale/-/os-locale-1.4.0.tgz",
-          "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-          "dev": true,
-          "requires": {
-            "lcid": "^1.0.0"
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "http://localhost:4873/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "dev": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "which-module": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/which-module/-/which-module-1.0.0.tgz",
-          "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-          "dev": true
-        },
-        "yargs": {
-          "version": "7.1.0",
-          "resolved": "http://localhost:4873/yargs/-/yargs-7.1.0.tgz",
-          "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"
-          }
-        },
-        "yargs-parser": {
-          "version": "5.0.0",
-          "resolved": "http://localhost:4873/yargs-parser/-/yargs-parser-5.0.0.tgz",
-          "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
-          "dev": true,
-          "requires": {
-            "camelcase": "^3.0.0"
-          }
-        }
-      }
-    },
-    "scss-tokenizer": {
-      "version": "0.2.3",
-      "resolved": "http://localhost:4873/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
-      "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
-      "dev": true,
-      "requires": {
-        "js-base64": "^2.1.8",
-        "source-map": "^0.4.2"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.4.4",
-          "resolved": "http://localhost:4873/source-map/-/source-map-0.4.4.tgz",
-          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-          "dev": true,
-          "requires": {
-            "amdefine": ">=0.0.4"
-          }
-        }
-      }
-    },
-    "secure-keys": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/secure-keys/-/secure-keys-1.0.0.tgz",
-      "integrity": "sha1-8MgtmKOxOah3aogIBQuCRDEIf8o=",
-      "dev": true
-    },
-    "select-hose": {
-      "version": "2.0.0",
-      "resolved": "http://localhost:4873/select-hose/-/select-hose-2.0.0.tgz",
-      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=",
-      "dev": true
-    },
-    "selenium-webdriver": {
-      "version": "3.0.1",
-      "resolved": "http://localhost:4873/selenium-webdriver/-/selenium-webdriver-3.0.1.tgz",
-      "integrity": "sha1-ot6l2kqX9mcuiefKcnbO+jZRR6c=",
-      "dev": true,
-      "requires": {
-        "adm-zip": "^0.4.7",
-        "rimraf": "^2.5.4",
-        "tmp": "0.0.30",
-        "xml2js": "^0.4.17"
-      },
-      "dependencies": {
-        "tmp": {
-          "version": "0.0.30",
-          "resolved": "http://localhost:4873/tmp/-/tmp-0.0.30.tgz",
-          "integrity": "sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=",
-          "dev": true,
-          "requires": {
-            "os-tmpdir": "~1.0.1"
-          }
-        }
-      }
-    },
-    "selfsigned": {
-      "version": "1.10.3",
-      "resolved": "http://localhost:4873/selfsigned/-/selfsigned-1.10.3.tgz",
-      "integrity": "sha512-vmZenZ+8Al3NLHkWnhBQ0x6BkML1eCP2xEi3JE+f3D9wW9fipD9NNJHYtE9XJM4TsPaHGZJIamrSI6MTg1dU2Q==",
-      "dev": true,
-      "requires": {
-        "node-forge": "0.7.5"
-      }
-    },
-    "semver": {
-      "version": "5.4.1",
-      "resolved": "http://localhost:4873/semver/-/semver-5.4.1.tgz",
-      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
-    },
-    "semver-diff": {
-      "version": "2.1.0",
-      "resolved": "http://localhost:4873/semver-diff/-/semver-diff-2.1.0.tgz",
-      "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=",
-      "dev": true,
-      "requires": {
-        "semver": "^5.0.3"
-      }
-    },
-    "semver-dsl": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/semver-dsl/-/semver-dsl-1.0.1.tgz",
-      "integrity": "sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=",
-      "dev": true,
-      "requires": {
-        "semver": "^5.3.0"
-      }
-    },
-    "semver-intersect": {
-      "version": "1.3.1",
-      "resolved": "http://localhost:4873/semver-intersect/-/semver-intersect-1.3.1.tgz",
-      "integrity": "sha1-j6hKnhAovSOeRTDRo+GB5pjYhLo=",
-      "dev": true,
-      "requires": {
-        "semver": "^5.0.0"
-      }
-    },
-    "send": {
-      "version": "0.16.2",
-      "resolved": "http://localhost:4873/send/-/send-0.16.2.tgz",
-      "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "~1.6.2",
-        "mime": "1.4.1",
-        "ms": "2.0.0",
-        "on-finished": "~2.3.0",
-        "range-parser": "~1.2.0",
-        "statuses": "~1.4.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "http://localhost:4873/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "mime": {
-          "version": "1.4.1",
-          "resolved": "http://localhost:4873/mime/-/mime-1.4.1.tgz",
-          "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-          "dev": true
-        }
-      }
-    },
-    "serialize-error": {
-      "version": "2.1.0",
-      "resolved": "http://localhost:4873/serialize-error/-/serialize-error-2.1.0.tgz",
-      "integrity": "sha1-ULZ51WNc34Rme9yOWa9OW4HV9go=",
-      "dev": true
-    },
-    "serialize-javascript": {
-      "version": "1.5.0",
-      "resolved": "http://localhost:4873/serialize-javascript/-/serialize-javascript-1.5.0.tgz",
-      "integrity": "sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==",
-      "dev": true
-    },
-    "serve-index": {
-      "version": "1.9.1",
-      "resolved": "http://localhost:4873/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
-      "dev": true,
-      "requires": {
-        "accepts": "~1.3.4",
-        "batch": "0.6.1",
-        "debug": "2.6.9",
-        "escape-html": "~1.0.3",
-        "http-errors": "~1.6.2",
-        "mime-types": "~2.1.17",
-        "parseurl": "~1.3.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "http://localhost:4873/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
-      }
-    },
-    "serve-static": {
-      "version": "1.13.2",
-      "resolved": "http://localhost:4873/serve-static/-/serve-static-1.13.2.tgz",
-      "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
-      "dev": true,
-      "requires": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.2",
-        "send": "0.16.2"
-      }
-    },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "http://localhost:4873/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
-    },
-    "set-getter": {
-      "version": "0.1.0",
-      "resolved": "http://localhost:4873/set-getter/-/set-getter-0.1.0.tgz",
-      "integrity": "sha1-12nBgsnVpR9AkUXy+6guXoboA3Y=",
-      "dev": true,
-      "requires": {
-        "to-object-path": "^0.3.0"
-      }
-    },
-    "set-immediate-shim": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
-      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
-      "dev": true
-    },
-    "set-value": {
-      "version": "2.0.0",
-      "resolved": "http://localhost:4873/set-value/-/set-value-2.0.0.tgz",
-      "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"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "http://localhost:4873/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "setimmediate": {
-      "version": "1.0.5",
-      "resolved": "http://localhost:4873/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
-      "dev": true
-    },
-    "setprototypeof": {
-      "version": "1.1.0",
-      "resolved": "http://localhost:4873/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-      "dev": true
-    },
-    "sha.js": {
-      "version": "2.4.11",
-      "resolved": "http://localhost:4873/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "shallow-clone": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/shallow-clone/-/shallow-clone-1.0.0.tgz",
-      "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"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "http://localhost:4873/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        }
-      }
-    },
-    "shebang-command": {
-      "version": "1.2.0",
-      "resolved": "http://localhost:4873/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "requires": {
-        "shebang-regex": "^1.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
-    },
-    "shell-quote": {
-      "version": "1.6.1",
-      "resolved": "http://localhost:4873/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"
-      }
-    },
-    "shelljs": {
-      "version": "0.8.2",
-      "resolved": "http://localhost:4873/shelljs/-/shelljs-0.8.2.tgz",
-      "integrity": "sha512-pRXeNrCA2Wd9itwhvLp5LZQvPJ0wU6bcjaTMywHHGX5XWhVN2nzSu7WV0q+oUY7mGK3mgSkDDzP3MgjqdyIgbQ==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.0.0",
-        "interpret": "^1.0.0",
-        "rechoir": "^0.6.2"
-      }
-    },
-    "sigmund": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/sigmund/-/sigmund-1.0.1.tgz",
-      "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
-      "dev": true
-    },
-    "signal-exit": {
-      "version": "3.0.2",
-      "resolved": "http://localhost:4873/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
-    },
-    "silent-error": {
-      "version": "1.1.0",
-      "resolved": "http://localhost:4873/silent-error/-/silent-error-1.1.0.tgz",
-      "integrity": "sha1-IglwbxyFCp8dENDYQJGLRvJuG8k=",
-      "dev": true,
-      "requires": {
-        "debug": "^2.2.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "http://localhost:4873/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
-      }
-    },
-    "slack-node": {
-      "version": "0.2.0",
-      "resolved": "http://localhost:4873/slack-node/-/slack-node-0.2.0.tgz",
-      "integrity": "sha1-3kuN3aqLeT9h29KTgQT9q/N9+jA=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "requestretry": "^1.2.2"
-      }
-    },
-    "slash": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/slash/-/slash-1.0.0.tgz",
-      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
-      "dev": true
-    },
-    "smart-buffer": {
-      "version": "1.1.15",
-      "resolved": "http://localhost:4873/smart-buffer/-/smart-buffer-1.1.15.tgz",
-      "integrity": "sha1-fxFLW2X6s+KjWqd1uxLw0cZJvxY=",
-      "dev": true
-    },
-    "smtp-connection": {
-      "version": "2.12.0",
-      "resolved": "http://localhost:4873/smtp-connection/-/smtp-connection-2.12.0.tgz",
-      "integrity": "sha1-1275EnyyPCJZ7bHoNJwujV4tdME=",
-      "dev": true,
-      "requires": {
-        "httpntlm": "1.6.1",
-        "nodemailer-shared": "1.1.0"
-      }
-    },
-    "snapdragon": {
-      "version": "0.8.2",
-      "resolved": "http://localhost:4873/snapdragon/-/snapdragon-0.8.2.tgz",
-      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-      "dev": true,
-      "requires": {
-        "base": "^0.11.1",
-        "debug": "^2.2.0",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "map-cache": "^0.2.2",
-        "source-map": "^0.5.6",
-        "source-map-resolve": "^0.5.0",
-        "use": "^3.1.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "http://localhost:4873/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "http://localhost:4873/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "http://localhost:4873/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "snapdragon-node": {
-      "version": "2.1.1",
-      "resolved": "http://localhost:4873/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-      "dev": true,
-      "requires": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "http://localhost:4873/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "http://localhost:4873/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
-        }
-      }
-    },
-    "snapdragon-util": {
-      "version": "3.0.1",
-      "resolved": "http://localhost:4873/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.2.0"
-      }
-    },
-    "sntp": {
-      "version": "1.0.9",
-      "resolved": "http://localhost:4873/sntp/-/sntp-1.0.9.tgz",
-      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
-      "dev": true,
-      "requires": {
-        "hoek": "2.x.x"
-      }
-    },
-    "socket.io": {
-      "version": "2.0.4",
-      "resolved": "http://localhost:4873/socket.io/-/socket.io-2.0.4.tgz",
-      "integrity": "sha1-waRZDO/4fs8TxyZS8Eb3FrKeYBQ=",
-      "dev": true,
-      "requires": {
-        "debug": "~2.6.6",
-        "engine.io": "~3.1.0",
-        "socket.io-adapter": "~1.1.0",
-        "socket.io-client": "2.0.4",
-        "socket.io-parser": "~3.1.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "http://localhost:4873/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
-      }
-    },
-    "socket.io-adapter": {
-      "version": "1.1.1",
-      "resolved": "http://localhost:4873/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz",
-      "integrity": "sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=",
-      "dev": true
-    },
-    "socket.io-client": {
-      "version": "2.0.4",
-      "resolved": "http://localhost:4873/socket.io-client/-/socket.io-client-2.0.4.tgz",
-      "integrity": "sha1-CRilUkBtxeVAs4Dc2Xr8SmQzL44=",
-      "dev": true,
-      "requires": {
-        "backo2": "1.0.2",
-        "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",
-        "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",
-        "to-array": "0.1.4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "http://localhost:4873/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
-      }
-    },
-    "socket.io-parser": {
-      "version": "3.1.3",
-      "resolved": "http://localhost:4873/socket.io-parser/-/socket.io-parser-3.1.3.tgz",
-      "integrity": "sha512-g0a2HPqLguqAczs3dMECuA1RgoGFPyvDqcbaDEdCWY9g59kdUAz3YRmaJBNKXflrHNwB7Q12Gkf/0CZXfdHR7g==",
-      "dev": true,
-      "requires": {
-        "component-emitter": "1.2.1",
-        "debug": "~3.1.0",
-        "has-binary2": "~1.0.2",
-        "isarray": "2.0.1"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "2.0.1",
-          "resolved": "http://localhost:4873/isarray/-/isarray-2.0.1.tgz",
-          "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
-          "dev": true
-        }
-      }
-    },
-    "sockjs": {
-      "version": "0.3.19",
-      "resolved": "http://localhost:4873/sockjs/-/sockjs-0.3.19.tgz",
-      "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
-      "dev": true,
-      "requires": {
-        "faye-websocket": "^0.10.0",
-        "uuid": "^3.0.1"
-      }
-    },
-    "sockjs-client": {
-      "version": "1.1.4",
-      "resolved": "http://localhost:4873/sockjs-client/-/sockjs-client-1.1.4.tgz",
-      "integrity": "sha1-W6vjhrd15M8U51IJEUUmVAFsixI=",
-      "dev": true,
-      "requires": {
-        "debug": "^2.6.6",
-        "eventsource": "0.1.6",
-        "faye-websocket": "~0.11.0",
-        "inherits": "^2.0.1",
-        "json3": "^3.3.2",
-        "url-parse": "^1.1.8"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "http://localhost:4873/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "faye-websocket": {
-          "version": "0.11.1",
-          "resolved": "http://localhost:4873/faye-websocket/-/faye-websocket-0.11.1.tgz",
-          "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
-          "dev": true,
-          "requires": {
-            "websocket-driver": ">=0.5.1"
-          }
-        }
-      }
-    },
-    "socks": {
-      "version": "1.1.10",
-      "resolved": "http://localhost:4873/socks/-/socks-1.1.10.tgz",
-      "integrity": "sha1-W4t/x8jzQcU+0FbpKbe/Tei6e1o=",
-      "dev": true,
-      "requires": {
-        "ip": "^1.1.4",
-        "smart-buffer": "^1.0.13"
-      }
-    },
-    "socks-proxy-agent": {
-      "version": "3.0.1",
-      "resolved": "http://localhost:4873/socks-proxy-agent/-/socks-proxy-agent-3.0.1.tgz",
-      "integrity": "sha512-ZwEDymm204mTzvdqyUqOdovVr2YRd2NYskrYrF2LXyZ9qDiMAoFESGK8CRphiO7rtbo2Y757k2Nia3x2hGtalA==",
-      "dev": true,
-      "requires": {
-        "agent-base": "^4.1.0",
-        "socks": "^1.1.10"
-      }
-    },
-    "sorcery": {
-      "version": "0.10.0",
-      "resolved": "http://localhost:4873/sorcery/-/sorcery-0.10.0.tgz",
-      "integrity": "sha1-iukK19fLBfxZ8asMY3hF1cFaUrc=",
-      "dev": true,
-      "requires": {
-        "buffer-crc32": "^0.2.5",
-        "minimist": "^1.2.0",
-        "sander": "^0.5.0",
-        "sourcemap-codec": "^1.3.0"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "http://localhost:4873/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        }
-      }
-    },
-    "sort-keys": {
-      "version": "1.1.2",
-      "resolved": "http://localhost:4873/sort-keys/-/sort-keys-1.1.2.tgz",
-      "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
-      "dev": true,
-      "requires": {
-        "is-plain-obj": "^1.0.0"
-      }
-    },
-    "source-list-map": {
-      "version": "2.0.0",
-      "resolved": "http://localhost:4873/source-list-map/-/source-list-map-2.0.0.tgz",
-      "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==",
-      "dev": true
-    },
-    "source-map": {
-      "version": "0.5.7",
-      "resolved": "http://localhost:4873/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true
-    },
-    "source-map-loader": {
-      "version": "0.2.3",
-      "resolved": "http://localhost:4873/source-map-loader/-/source-map-loader-0.2.3.tgz",
-      "integrity": "sha512-MYbFX9DYxmTQFfy2v8FC1XZwpwHKYxg3SK8Wb7VPBKuhDjz8gi9re2819MsG4p49HDyiOSUKlmZ+nQBArW5CGw==",
-      "dev": true,
-      "requires": {
-        "async": "^2.5.0",
-        "loader-utils": "~0.2.2",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "loader-utils": {
-          "version": "0.2.17",
-          "resolved": "http://localhost:4873/loader-utils/-/loader-utils-0.2.17.tgz",
-          "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"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "http://localhost:4873/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "source-map-resolve": {
-      "version": "0.5.2",
-      "resolved": "http://localhost:4873/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-      "dev": true,
-      "requires": {
-        "atob": "^2.1.1",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
-      }
-    },
-    "source-map-support": {
-      "version": "0.4.18",
-      "resolved": "http://localhost:4873/source-map-support/-/source-map-support-0.4.18.tgz",
-      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
-      "dev": true,
-      "requires": {
-        "source-map": "^0.5.6"
-      }
-    },
-    "source-map-url": {
-      "version": "0.4.0",
-      "resolved": "http://localhost:4873/source-map-url/-/source-map-url-0.4.0.tgz",
-      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
-      "dev": true
-    },
-    "sourcemap-codec": {
-      "version": "1.4.1",
-      "resolved": "http://localhost:4873/sourcemap-codec/-/sourcemap-codec-1.4.1.tgz",
-      "integrity": "sha512-hX1eNBNuilj8yfFnECh0DzLgwKpBLMIvmhgEhixXNui8lMLBInTI8Kyxt++RwJnMNu7cAUo635L2+N1TxMJCzA==",
-      "dev": true
-    },
-    "sparkles": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/sparkles/-/sparkles-1.0.1.tgz",
-      "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
-      "dev": true
-    },
-    "spawn-command": {
-      "version": "0.0.2-1",
-      "resolved": "http://localhost:4873/spawn-command/-/spawn-command-0.0.2-1.tgz",
-      "integrity": "sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=",
-      "dev": true
-    },
-    "spdx-correct": {
-      "version": "3.0.0",
-      "resolved": "http://localhost:4873/spdx-correct/-/spdx-correct-3.0.0.tgz",
-      "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==",
-      "requires": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "spdx-exceptions": {
-      "version": "2.1.0",
-      "resolved": "http://localhost:4873/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz",
-      "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg=="
-    },
-    "spdx-expression-parse": {
-      "version": "3.0.0",
-      "resolved": "http://localhost:4873/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
-      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
-      "requires": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "spdx-license-ids": {
-      "version": "3.0.0",
-      "resolved": "http://localhost:4873/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz",
-      "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA=="
-    },
-    "spdy": {
-      "version": "3.4.7",
-      "resolved": "http://localhost:4873/spdy/-/spdy-3.4.7.tgz",
-      "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"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "http://localhost:4873/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
-      }
-    },
-    "spdy-transport": {
-      "version": "2.1.0",
-      "resolved": "http://localhost:4873/spdy-transport/-/spdy-transport-2.1.0.tgz",
-      "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"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "http://localhost:4873/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
-      }
-    },
-    "split": {
-      "version": "0.3.3",
-      "resolved": "http://localhost:4873/split/-/split-0.3.3.tgz",
-      "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
-      "requires": {
-        "through": "2"
-      }
-    },
-    "split-string": {
-      "version": "3.1.0",
-      "resolved": "http://localhost:4873/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^3.0.0"
-      }
-    },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "http://localhost:4873/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
-    },
-    "sshpk": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz",
-      "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=",
-      "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",
-        "tweetnacl": "~0.14.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
-        }
-      }
-    },
-    "ssri": {
-      "version": "5.3.0",
-      "resolved": "http://localhost:4873/ssri/-/ssri-5.3.0.tgz",
-      "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "state-toggle": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/state-toggle/-/state-toggle-1.0.1.tgz",
-      "integrity": "sha512-Qe8QntFrrpWTnHwvwj2FZTgv+PKIsp0B9VxLzLLbSpPXWOgRgc5LVj/aTiSfK1RqIeF9jeC1UeOH8Q8y60A7og==",
-      "dev": true
-    },
-    "static-extend": {
-      "version": "0.1.2",
-      "resolved": "http://localhost:4873/static-extend/-/static-extend-0.1.2.tgz",
-      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
-      "dev": true,
-      "requires": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "http://localhost:4873/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
-      }
-    },
-    "statuses": {
-      "version": "1.4.0",
-      "resolved": "http://localhost:4873/statuses/-/statuses-1.4.0.tgz",
-      "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
-      "dev": true
-    },
-    "stdout-stream": {
-      "version": "1.4.0",
-      "resolved": "http://localhost:4873/stdout-stream/-/stdout-stream-1.4.0.tgz",
-      "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "^2.0.1"
-      }
-    },
-    "stream-browserify": {
-      "version": "2.0.1",
-      "resolved": "http://localhost:4873/stream-browserify/-/stream-browserify-2.0.1.tgz",
-      "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
-      "dev": true,
-      "requires": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "stream-combiner": {
-      "version": "0.0.4",
-      "resolved": "http://localhost:4873/stream-combiner/-/stream-combiner-0.0.4.tgz",
-      "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
-      "requires": {
-        "duplexer": "~0.1.1"
-      }
-    },
-    "stream-each": {
-      "version": "1.2.2",
-      "resolved": "http://localhost:4873/stream-each/-/stream-each-1.2.2.tgz",
-      "integrity": "sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "stream-http": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.2.tgz",
-      "integrity": "sha512-QllfrBhqF1DPcz46WxKTs6Mz1Bpc+8Qm6vbqOpVav5odAXwbyzwnEczoWqtxrsmlO+cJqtPrp/8gWKWjaKLLlA==",
-      "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"
-      }
-    },
-    "stream-shift": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/stream-shift/-/stream-shift-1.0.0.tgz",
-      "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
-      "dev": true
-    },
-    "streamroller": {
-      "version": "0.7.0",
-      "resolved": "http://localhost:4873/streamroller/-/streamroller-0.7.0.tgz",
-      "integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==",
-      "dev": true,
-      "requires": {
-        "date-format": "^1.2.0",
-        "debug": "^3.1.0",
-        "mkdirp": "^0.5.1",
-        "readable-stream": "^2.3.0"
-      }
-    },
-    "strict-uri-encode": {
-      "version": "1.1.0",
-      "resolved": "http://localhost:4873/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
-      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
-      "dev": true
-    },
-    "string-width": {
-      "version": "2.1.1",
-      "resolved": "http://localhost:4873/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "requires": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      }
-    },
-    "string.prototype.padend": {
-      "version": "3.0.0",
-      "resolved": "http://localhost:4873/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"
-      }
-    },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "http://localhost:4873/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "stringify-entities": {
-      "version": "1.3.2",
-      "resolved": "http://localhost:4873/stringify-entities/-/stringify-entities-1.3.2.tgz",
-      "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"
-      }
-    },
-    "stringstream": {
-      "version": "0.0.6",
-      "resolved": "http://localhost:4873/stringstream/-/stringstream-0.0.6.tgz",
-      "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==",
-      "dev": true
-    },
-    "strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-      "requires": {
-        "ansi-regex": "^3.0.0"
-      }
-    },
-    "strip-bom": {
-      "version": "3.0.0",
-      "resolved": "http://localhost:4873/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
-    },
-    "strip-color": {
-      "version": "0.1.0",
-      "resolved": "http://localhost:4873/strip-color/-/strip-color-0.1.0.tgz",
-      "integrity": "sha1-EG9l09PmotlAHKwOsM6LinArT3s=",
-      "dev": true
-    },
-    "strip-eof": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
-    },
-    "strip-indent": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/strip-indent/-/strip-indent-1.0.1.tgz",
-      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-      "dev": true,
-      "requires": {
-        "get-stdin": "^4.0.1"
-      }
-    },
-    "strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "http://localhost:4873/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-      "dev": true
-    },
-    "style-loader": {
-      "version": "0.13.1",
-      "resolved": "http://localhost:4873/style-loader/-/style-loader-0.13.1.tgz",
-      "integrity": "sha1-RoKA77wEcwI806bNVuM7Wh1/w6k=",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^0.2.7"
-      },
-      "dependencies": {
-        "loader-utils": {
-          "version": "0.2.17",
-          "resolved": "http://localhost:4873/loader-utils/-/loader-utils-0.2.17.tgz",
-          "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"
-          }
-        }
-      }
-    },
-    "stylus": {
-      "version": "0.54.5",
-      "resolved": "http://localhost:4873/stylus/-/stylus-0.54.5.tgz",
-      "integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=",
-      "dev": true,
-      "requires": {
-        "css-parse": "1.7.x",
-        "debug": "*",
-        "glob": "7.0.x",
-        "mkdirp": "0.5.x",
-        "sax": "0.5.x",
-        "source-map": "0.1.x"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.0.6",
-          "resolved": "http://localhost:4873/glob/-/glob-7.0.6.tgz",
-          "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.2",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "source-map": {
-          "version": "0.1.43",
-          "resolved": "http://localhost:4873/source-map/-/source-map-0.1.43.tgz",
-          "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
-          "dev": true,
-          "requires": {
-            "amdefine": ">=0.0.4"
-          }
-        }
-      }
-    },
-    "stylus-loader": {
-      "version": "3.0.2",
-      "resolved": "http://localhost:4873/stylus-loader/-/stylus-loader-3.0.2.tgz",
-      "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^1.0.2",
-        "lodash.clonedeep": "^4.5.0",
-        "when": "~3.6.x"
-      },
-      "dependencies": {
-        "when": {
-          "version": "3.6.4",
-          "resolved": "http://localhost:4873/when/-/when-3.6.4.tgz",
-          "integrity": "sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=",
-          "dev": true
-        }
-      }
-    },
-    "subarg": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/subarg/-/subarg-1.0.0.tgz",
-      "integrity": "sha1-9izxdYHplrSPyWVpn1TAauJouNI=",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.1.0"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "http://localhost:4873/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        }
-      }
-    },
-    "superagent": {
-      "version": "3.8.2",
-      "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"
-      }
-    },
-    "supports-color": {
-      "version": "5.4.0",
-      "resolved": "http://localhost:4873/supports-color/-/supports-color-5.4.0.tgz",
-      "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-      "requires": {
-        "has-flag": "^3.0.0"
-      }
-    },
-    "svgo": {
-      "version": "0.7.2",
-      "resolved": "http://localhost:4873/svgo/-/svgo-0.7.2.tgz",
-      "integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=",
-      "dev": true,
-      "requires": {
-        "coa": "~1.0.1",
-        "colors": "~1.1.2",
-        "csso": "~2.3.1",
-        "js-yaml": "~3.7.0",
-        "mkdirp": "~0.5.1",
-        "sax": "~1.2.1",
-        "whet.extend": "~0.9.9"
-      },
-      "dependencies": {
-        "esprima": {
-          "version": "2.7.3",
-          "resolved": "http://localhost:4873/esprima/-/esprima-2.7.3.tgz",
-          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
-          "dev": true
-        },
-        "js-yaml": {
-          "version": "3.7.0",
-          "resolved": "http://localhost:4873/js-yaml/-/js-yaml-3.7.0.tgz",
-          "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=",
-          "dev": true,
-          "requires": {
-            "argparse": "^1.0.7",
-            "esprima": "^2.6.0"
-          }
-        },
-        "sax": {
-          "version": "1.2.4",
-          "resolved": "http://localhost:4873/sax/-/sax-1.2.4.tgz",
-          "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-          "dev": true
-        }
-      }
-    },
-    "symbol-observable": {
-      "version": "1.2.0",
-      "resolved": "http://localhost:4873/symbol-observable/-/symbol-observable-1.2.0.tgz",
-      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
-    },
-    "systemjs": {
-      "version": "0.19.27",
-      "resolved": "http://localhost:4873/systemjs/-/systemjs-0.19.27.tgz",
-      "integrity": "sha1-8XQNVlzmQ3GsDecHKk0eVHG6e6I=",
-      "requires": {
-        "when": "^3.7.5"
-      }
-    },
-    "systemjs-builder": {
-      "version": "0.15.34",
-      "resolved": "http://localhost:4873/systemjs-builder/-/systemjs-builder-0.15.34.tgz",
-      "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-plugin-transform-global-system-wrapper": "0.0.1",
-        "babel-plugin-transform-system-register": "0.0.1",
-        "bluebird": "^3.3.4",
-        "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",
-        "traceur": "0.0.105",
-        "uglify-js": "^2.6.1"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "1.2.1",
-          "resolved": "http://localhost:4873/camelcase/-/camelcase-1.2.1.tgz",
-          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
-          "dev": true
-        },
-        "cliui": {
-          "version": "2.1.0",
-          "resolved": "http://localhost:4873/cliui/-/cliui-2.1.0.tgz",
-          "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
-          "dev": true,
-          "requires": {
-            "center-align": "^0.1.1",
-            "right-align": "^0.1.1",
-            "wordwrap": "0.0.2"
-          }
-        },
-        "commander": {
-          "version": "2.9.0",
-          "resolved": "http://localhost:4873/commander/-/commander-2.9.0.tgz",
-          "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
-          "dev": true,
-          "requires": {
-            "graceful-readlink": ">= 1.0.0"
-          }
-        },
-        "data-uri-to-buffer": {
-          "version": "0.0.4",
-          "resolved": "http://localhost:4873/data-uri-to-buffer/-/data-uri-to-buffer-0.0.4.tgz",
-          "integrity": "sha1-RuE6udqOMJdFyNAc5UchPr2y/j8=",
-          "dev": true
-        },
-        "rollup": {
-          "version": "0.36.4",
-          "resolved": "http://localhost:4873/rollup/-/rollup-0.36.4.tgz",
-          "integrity": "sha1-oiRJTFOGwdc9OPe7hvafXrARo9I=",
-          "dev": true,
-          "requires": {
-            "source-map-support": "^0.4.0"
-          }
-        },
-        "semver": {
-          "version": "4.3.6",
-          "resolved": "http://localhost:4873/semver/-/semver-4.3.6.tgz",
-          "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
-          "dev": true
-        },
-        "systemjs": {
-          "version": "0.19.47",
-          "resolved": "http://localhost:4873/systemjs/-/systemjs-0.19.47.tgz",
-          "integrity": "sha1-yMk5NxgPP1SBx2nNJyB2P7SjHG8=",
-          "dev": true,
-          "requires": {
-            "when": "^3.7.5"
-          }
-        },
-        "traceur": {
-          "version": "0.0.105",
-          "resolved": "http://localhost:4873/traceur/-/traceur-0.0.105.tgz",
-          "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"
-          },
-          "dependencies": {
-            "glob": {
-              "version": "5.0.15",
-              "resolved": "http://localhost:4873/glob/-/glob-5.0.15.tgz",
-              "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-              "dev": true,
-              "requires": {
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "2 || 3",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
-              }
-            },
-            "source-map": {
-              "version": "0.1.32",
-              "resolved": "http://localhost:4873/source-map/-/source-map-0.1.32.tgz",
-              "integrity": "sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY=",
-              "dev": true,
-              "requires": {
-                "amdefine": ">=0.0.4"
-              }
-            },
-            "source-map-support": {
-              "version": "0.2.10",
-              "resolved": "http://localhost:4873/source-map-support/-/source-map-support-0.2.10.tgz",
-              "integrity": "sha1-6lo5AKHByyUJagrozFwrSxDe09w=",
-              "dev": true,
-              "requires": {
-                "source-map": "0.1.32"
-              }
-            }
-          }
-        },
-        "uglify-js": {
-          "version": "2.8.29",
-          "resolved": "http://localhost:4873/uglify-js/-/uglify-js-2.8.29.tgz",
-          "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
-          "dev": true,
-          "requires": {
-            "source-map": "~0.5.1",
-            "uglify-to-browserify": "~1.0.0",
-            "yargs": "~3.10.0"
-          }
-        },
-        "yargs": {
-          "version": "3.10.0",
-          "resolved": "http://localhost:4873/yargs/-/yargs-3.10.0.tgz",
-          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
-          "dev": true,
-          "requires": {
-            "camelcase": "^1.0.2",
-            "cliui": "^2.1.0",
-            "decamelize": "^1.0.0",
-            "window-size": "0.1.0"
-          }
-        }
-      }
-    },
-    "tapable": {
-      "version": "0.2.8",
-      "resolved": "http://localhost:4873/tapable/-/tapable-0.2.8.tgz",
-      "integrity": "sha1-mTcqXJmb8t8WCvwNdL7U9HlIzSI=",
-      "dev": true
-    },
-    "tar": {
-      "version": "2.2.1",
-      "resolved": "http://localhost:4873/tar/-/tar-2.2.1.tgz",
-      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
-      "dev": true,
-      "requires": {
-        "block-stream": "*",
-        "fstream": "^1.0.2",
-        "inherits": "2"
-      }
-    },
-    "temp": {
-      "version": "0.4.0",
-      "resolved": "http://localhost:4873/temp/-/temp-0.4.0.tgz",
-      "integrity": "sha1-ZxrWPVe+D+nXKUZks/xABjZnimA="
-    },
-    "term-size": {
-      "version": "1.2.0",
-      "resolved": "http://localhost:4873/term-size/-/term-size-1.2.0.tgz",
-      "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=",
-      "dev": true,
-      "requires": {
-        "execa": "^0.7.0"
-      }
-    },
-    "thenify": {
-      "version": "3.3.0",
-      "resolved": "http://localhost:4873/thenify/-/thenify-3.3.0.tgz",
-      "integrity": "sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=",
-      "dev": true,
-      "requires": {
-        "any-promise": "^1.0.0"
-      }
-    },
-    "thenify-all": {
-      "version": "1.6.0",
-      "resolved": "http://localhost:4873/thenify-all/-/thenify-all-1.6.0.tgz",
-      "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
-      "dev": true,
-      "requires": {
-        "thenify": ">= 3.1.0 < 4"
-      }
-    },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "http://localhost:4873/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
-    },
-    "through2": {
-      "version": "2.0.3",
-      "resolved": "http://localhost:4873/through2/-/through2-2.0.3.tgz",
-      "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "^2.1.5",
-        "xtend": "~4.0.1"
-      }
-    },
-    "thunkify": {
-      "version": "2.1.2",
-      "resolved": "http://localhost:4873/thunkify/-/thunkify-2.1.2.tgz",
-      "integrity": "sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0=",
-      "dev": true,
-      "optional": true
-    },
-    "thunky": {
-      "version": "1.0.2",
-      "resolved": "http://localhost:4873/thunky/-/thunky-1.0.2.tgz",
-      "integrity": "sha1-qGLgGOP7HqLsP85dVWBc9X8kc3E=",
-      "dev": true
-    },
-    "time-stamp": {
-      "version": "2.0.0",
-      "resolved": "http://localhost:4873/time-stamp/-/time-stamp-2.0.0.tgz",
-      "integrity": "sha1-lcakRTDhW6jW9KPsuMOj+sRto1c=",
-      "dev": true
-    },
-    "timed-out": {
-      "version": "4.0.1",
-      "resolved": "http://localhost:4873/timed-out/-/timed-out-4.0.1.tgz",
-      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
-      "dev": true
-    },
-    "timers-browserify": {
-      "version": "2.0.10",
-      "resolved": "http://localhost:4873/timers-browserify/-/timers-browserify-2.0.10.tgz",
-      "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
-      "dev": true,
-      "requires": {
-        "setimmediate": "^1.0.4"
-      }
-    },
-    "timespan": {
-      "version": "2.3.0",
-      "resolved": "http://localhost:4873/timespan/-/timespan-2.3.0.tgz",
-      "integrity": "sha1-SQLOBAvRPYRcj1myfp1ZutbzmSk=",
-      "dev": true,
-      "optional": true
-    },
-    "tmp": {
-      "version": "0.0.33",
-      "resolved": "http://localhost:4873/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "requires": {
-        "os-tmpdir": "~1.0.2"
-      }
-    },
-    "to-array": {
-      "version": "0.1.4",
-      "resolved": "http://localhost:4873/to-array/-/to-array-0.1.4.tgz",
-      "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=",
-      "dev": true
-    },
-    "to-arraybuffer": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-      "dev": true
-    },
-    "to-fast-properties": {
-      "version": "1.0.3",
-      "resolved": "http://localhost:4873/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
-      "dev": true
-    },
-    "to-object-path": {
-      "version": "0.3.0",
-      "resolved": "http://localhost:4873/to-object-path/-/to-object-path-0.3.0.tgz",
-      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      }
-    },
-    "to-regex": {
-      "version": "3.0.2",
-      "resolved": "http://localhost:4873/to-regex/-/to-regex-3.0.2.tgz",
-      "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"
-      }
-    },
-    "to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "http://localhost:4873/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dev": true,
-      "requires": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "dependencies": {
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "http://localhost:4873/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          }
-        }
-      }
-    },
-    "to-string-loader": {
-      "version": "1.1.5",
-      "resolved": "http://localhost:4873/to-string-loader/-/to-string-loader-1.1.5.tgz",
-      "integrity": "sha1-e3qheJG3u0lHp6Eb+wO1/enG5pU=",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^0.2.16"
-      },
-      "dependencies": {
-        "loader-utils": {
-          "version": "0.2.17",
-          "resolved": "http://localhost:4873/loader-utils/-/loader-utils-0.2.17.tgz",
-          "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"
-          }
-        }
-      }
-    },
-    "toml": {
-      "version": "2.3.3",
-      "resolved": "http://localhost:4873/toml/-/toml-2.3.3.tgz",
-      "integrity": "sha512-O7L5hhSQHxuufWUdcTRPfuTh3phKfAZ/dqfxZFoxPCj2RYmpaSGLEIs016FCXItQwNr08yefUB5TSjzRYnajTA==",
-      "dev": true
-    },
-    "toposort": {
-      "version": "1.0.7",
-      "resolved": "http://localhost:4873/toposort/-/toposort-1.0.7.tgz",
-      "integrity": "sha1-LmhELZ9k7HILjMieZEOsbKqVACk=",
-      "dev": true
-    },
-    "tough-cookie": {
-      "version": "2.3.4",
-      "resolved": "http://localhost:4873/tough-cookie/-/tough-cookie-2.3.4.tgz",
-      "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
-      "dev": true,
-      "requires": {
-        "punycode": "^1.4.1"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "http://localhost:4873/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true
-        }
-      }
-    },
-    "traceur": {
-      "version": "0.0.91",
-      "resolved": "http://localhost:4873/traceur/-/traceur-0.0.91.tgz",
-      "integrity": "sha1-RfBt4iThDo0wBix2pVgdWmi3ZxQ=",
-      "dev": true,
-      "requires": {
-        "commander": "2.6",
-        "glob": "4.3",
-        "rsvp": "^3.0.13",
-        "semver": "2.x",
-        "source-map-support": "~0.2.8"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.6.0",
-          "resolved": "http://localhost:4873/commander/-/commander-2.6.0.tgz",
-          "integrity": "sha1-nfflL7Kgyw+4kFjugMMQQiXzfh0=",
-          "dev": true
-        },
-        "glob": {
-          "version": "4.3.5",
-          "resolved": "http://localhost:4873/glob/-/glob-4.3.5.tgz",
-          "integrity": "sha1-gPuwjKVA8jiszl0R0em8QedRc9M=",
-          "dev": true,
-          "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^2.0.1",
-            "once": "^1.3.0"
-          }
-        },
-        "minimatch": {
-          "version": "2.0.10",
-          "resolved": "http://localhost:4873/minimatch/-/minimatch-2.0.10.tgz",
-          "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^1.0.0"
-          }
-        },
-        "semver": {
-          "version": "2.3.2",
-          "resolved": "http://localhost:4873/semver/-/semver-2.3.2.tgz",
-          "integrity": "sha1-uYSPJdbPNjMwc+ye+IVtQvEjPlI=",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.1.32",
-          "resolved": "http://localhost:4873/source-map/-/source-map-0.1.32.tgz",
-          "integrity": "sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY=",
-          "dev": true,
-          "requires": {
-            "amdefine": ">=0.0.4"
-          }
-        },
-        "source-map-support": {
-          "version": "0.2.10",
-          "resolved": "http://localhost:4873/source-map-support/-/source-map-support-0.2.10.tgz",
-          "integrity": "sha1-6lo5AKHByyUJagrozFwrSxDe09w=",
-          "dev": true,
-          "requires": {
-            "source-map": "0.1.32"
-          }
-        }
-      }
-    },
-    "tree-kill": {
-      "version": "1.2.0",
-      "resolved": "http://localhost:4873/tree-kill/-/tree-kill-1.2.0.tgz",
-      "integrity": "sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==",
-      "dev": true
-    },
-    "trim": {
-      "version": "0.0.1",
-      "resolved": "http://localhost:4873/trim/-/trim-0.0.1.tgz",
-      "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0=",
-      "dev": true
-    },
-    "trim-newlines": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/trim-newlines/-/trim-newlines-1.0.0.tgz",
-      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-      "dev": true
-    },
-    "trim-right": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/trim-right/-/trim-right-1.0.1.tgz",
-      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
-      "dev": true
-    },
-    "trim-trailing-lines": {
-      "version": "1.1.1",
-      "resolved": "http://localhost:4873/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz",
-      "integrity": "sha512-bWLv9BbWbbd7mlqqs2oQYnLD/U/ZqeJeJwbO0FG2zA1aTq+HTvxfHNKFa/HGCVyJpDiioUYaBhfiT6rgk+l4mg==",
-      "dev": true
-    },
-    "trough": {
-      "version": "1.0.2",
-      "resolved": "http://localhost:4873/trough/-/trough-1.0.2.tgz",
-      "integrity": "sha512-FHkoUZvG6Egrv9XZAyYGKEyb1JMsFphgPjoczkZC2y6W93U1jswcVURB8MUvtsahEPEVACyxD47JAL63vF4JsQ==",
-      "dev": true
-    },
-    "true-case-path": {
-      "version": "1.0.2",
-      "resolved": "http://localhost:4873/true-case-path/-/true-case-path-1.0.2.tgz",
-      "integrity": "sha1-fskRMJJHZsf1c74wIMNPj9/QDWI=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "glob": "^6.0.4"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "6.0.4",
-          "resolved": "http://localhost:4873/glob/-/glob-6.0.4.tgz",
-          "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        }
-      }
-    },
-    "ts-loader": {
-      "version": "3.3.0",
-      "resolved": "http://localhost:4873/ts-loader/-/ts-loader-3.3.0.tgz",
-      "integrity": "sha512-2QcXFLrGFDgCe8t5oZj08CQ0IHG2jI2T8fwanxCuJ3lM7DRvoAQguleBCfj10PJpKJz7fUSIGxJhPybabAlh6g==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.3.0",
-        "enhanced-resolve": "^3.0.0",
-        "loader-utils": "^1.0.2",
-        "micromatch": "^3.1.4",
-        "semver": "^5.0.1"
-      },
-      "dependencies": {
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "http://localhost:4873/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-          "dev": true
-        },
-        "array-unique": {
-          "version": "0.3.2",
-          "resolved": "http://localhost:4873/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-          "dev": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "http://localhost:4873/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "http://localhost:4873/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "http://localhost:4873/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "expand-brackets": {
-          "version": "2.1.4",
-          "resolved": "http://localhost:4873/expand-brackets/-/expand-brackets-2.1.4.tgz",
-          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-          "dev": true,
-          "requires": {
-            "debug": "^2.3.3",
-            "define-property": "^0.2.5",
-            "extend-shallow": "^2.0.1",
-            "posix-character-classes": "^0.1.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "0.2.5",
-              "resolved": "http://localhost:4873/define-property/-/define-property-0.2.5.tgz",
-              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^0.1.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "http://localhost:4873/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            },
-            "is-accessor-descriptor": {
-              "version": "0.1.6",
-              "resolved": "http://localhost:4873/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-              "dev": true,
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "http://localhost:4873/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "is-data-descriptor": {
-              "version": "0.1.4",
-              "resolved": "http://localhost:4873/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-              "dev": true,
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "http://localhost:4873/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "is-descriptor": {
-              "version": "0.1.6",
-              "resolved": "http://localhost:4873/is-descriptor/-/is-descriptor-0.1.6.tgz",
-              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-              "dev": true,
-              "requires": {
-                "is-accessor-descriptor": "^0.1.6",
-                "is-data-descriptor": "^0.1.4",
-                "kind-of": "^5.0.0"
-              }
-            },
-            "kind-of": {
-              "version": "5.1.0",
-              "resolved": "http://localhost:4873/kind-of/-/kind-of-5.1.0.tgz",
-              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-              "dev": true
-            }
-          }
-        },
-        "extglob": {
-          "version": "2.0.4",
-          "resolved": "http://localhost:4873/extglob/-/extglob-2.0.4.tgz",
-          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-          "dev": true,
-          "requires": {
-            "array-unique": "^0.3.2",
-            "define-property": "^1.0.0",
-            "expand-brackets": "^2.1.4",
-            "extend-shallow": "^2.0.1",
-            "fragment-cache": "^0.2.1",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "1.0.0",
-              "resolved": "http://localhost:4873/define-property/-/define-property-1.0.0.tgz",
-              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^1.0.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "http://localhost:4873/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "http://localhost:4873/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "http://localhost:4873/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "http://localhost:4873/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "http://localhost:4873/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "http://localhost:4873/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "http://localhost:4873/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "http://localhost:4873/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        }
-      }
-    },
-    "ts-node": {
-      "version": "4.1.0",
-      "resolved": "http://localhost:4873/ts-node/-/ts-node-4.1.0.tgz",
-      "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"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "http://localhost:4873/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "http://localhost:4873/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "source-map-support": {
-          "version": "0.5.6",
-          "resolved": "http://localhost:4873/source-map-support/-/source-map-support-0.5.6.tgz",
-          "integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==",
-          "dev": true,
-          "requires": {
-            "buffer-from": "^1.0.0",
-            "source-map": "^0.6.0"
-          }
-        }
-      }
-    },
-    "tsconfig": {
-      "version": "7.0.0",
-      "resolved": "http://localhost:4873/tsconfig/-/tsconfig-7.0.0.tgz",
-      "integrity": "sha512-vZXmzPrL+EmC4T/4rVlT2jNVMWCi/O4DIiSj3UHg1OE5kCKbk4mfrXc6dZksLgRM/TZlKnousKH9bbTazUWRRw==",
-      "dev": true,
-      "requires": {
-        "@types/strip-bom": "^3.0.0",
-        "@types/strip-json-comments": "0.0.30",
-        "strip-bom": "^3.0.0",
-        "strip-json-comments": "^2.0.0"
-      }
-    },
-    "tsickle": {
-      "version": "0.26.0",
-      "resolved": "http://localhost:4873/tsickle/-/tsickle-0.26.0.tgz",
-      "integrity": "sha512-eWJ2CUfttGK0LqF9iJ/Avnxbj4M+fCyJ50Zag3wm73Fut1hsasPRHKxKdrMWVj4BMHnQNx7TO+DdNmLmJTSuNw==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.0",
-        "mkdirp": "^0.5.1",
-        "source-map": "^0.5.6",
-        "source-map-support": "^0.4.2"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "http://localhost:4873/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        }
-      }
-    },
-    "tslib": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.1.tgz",
-      "integrity": "sha512-avfPS28HmGLLc2o4elcc2EIq2FcH++Yo5YxpBZi9Yw93BCTGFthI4HPE4Rpep6vSYQaK8e69PelM44tPj+RaQg=="
-    },
-    "tslint": {
-      "version": "5.9.1",
-      "resolved": "http://localhost:4873/tslint/-/tslint-5.9.1.tgz",
-      "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"
-      }
-    },
-    "tslint-loader": {
-      "version": "3.5.3",
-      "resolved": "http://localhost:4873/tslint-loader/-/tslint-loader-3.5.3.tgz",
-      "integrity": "sha1-ND90Ei2U81a2iUV9P1n2SmmrYG8=",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^1.0.2",
-        "mkdirp": "^0.5.1",
-        "object-assign": "^4.1.1",
-        "rimraf": "^2.4.4",
-        "semver": "^5.3.0"
-      }
-    },
-    "tsscmp": {
-      "version": "1.0.5",
-      "resolved": "http://localhost:4873/tsscmp/-/tsscmp-1.0.5.tgz",
-      "integrity": "sha1-fcSjOvcVgatDN9qR2FylQn69mpc=",
-      "dev": true,
-      "optional": true
-    },
-    "tsutils": {
-      "version": "2.27.1",
-      "resolved": "http://localhost:4873/tsutils/-/tsutils-2.27.1.tgz",
-      "integrity": "sha512-AE/7uzp32MmaHvNNFES85hhUDHFdFZp6OAiZcd6y4ZKKIg6orJTm8keYWBhIhrJQH3a4LzNKat7ZPXZt5aTf6w==",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.8.1"
-      }
-    },
-    "tty-browserify": {
-      "version": "0.0.0",
-      "resolved": "http://localhost:4873/tty-browserify/-/tty-browserify-0.0.0.tgz",
-      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
-      "dev": true
-    },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "http://localhost:4873/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "http://localhost:4873/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true,
-      "optional": true
-    },
-    "type-check": {
-      "version": "0.3.2",
-      "resolved": "http://localhost:4873/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "~1.1.2"
-      }
-    },
-    "type-is": {
-      "version": "1.6.16",
-      "resolved": "http://localhost:4873/type-is/-/type-is-1.6.16.tgz",
-      "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
-      "dev": true,
-      "requires": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.18"
-      }
-    },
-    "typedarray": {
-      "version": "0.0.6",
-      "resolved": "http://localhost:4873/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-      "dev": true
-    },
-    "typedoc": {
-      "version": "0.11.1",
-      "resolved": "http://localhost:4873/typedoc/-/typedoc-0.11.1.tgz",
-      "integrity": "sha512-jdNIoHm5wkZqxQTe/g9AQ3LKnZyrzHXqu6A/c9GUOeJyBWLxNr7/Dm3rwFvLksuxRNwTvY/0HRDU9sJTa9WQSg==",
-      "dev": true,
-      "requires": {
-        "@types/fs-extra": "5.0.1",
-        "@types/handlebars": "4.0.36",
-        "@types/highlight.js": "9.12.2",
-        "@types/lodash": "4.14.104",
-        "@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",
-        "typescript": "2.7.2"
-      },
-      "dependencies": {
-        "fs-extra": {
-          "version": "5.0.0",
-          "resolved": "http://localhost:4873/fs-extra/-/fs-extra-5.0.0.tgz",
-          "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        },
-        "typescript": {
-          "version": "2.7.2",
-          "resolved": "http://localhost:4873/typescript/-/typescript-2.7.2.tgz",
-          "integrity": "sha512-p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw==",
-          "dev": true
-        }
-      }
-    },
-    "typedoc-default-themes": {
-      "version": "0.5.0",
-      "resolved": "http://localhost:4873/typedoc-default-themes/-/typedoc-default-themes-0.5.0.tgz",
-      "integrity": "sha1-bcJDPnjti+qOiHo6zeLzF4W9Yic=",
-      "dev": true
-    },
-    "typescript": {
-      "version": "2.6.1",
-      "resolved": "http://localhost:4873/typescript/-/typescript-2.6.1.tgz",
-      "integrity": "sha1-7znN6ierrAtQAkLWcmq5DgyEZjE=",
-      "dev": true
-    },
-    "uc.micro": {
-      "version": "1.0.5",
-      "resolved": "http://localhost:4873/uc.micro/-/uc.micro-1.0.5.tgz",
-      "integrity": "sha512-JoLI4g5zv5qNyT09f4YAvEZIIV1oOjqnewYg5D38dkQljIzpPT296dbIGvKro3digYI1bkb7W6EP1y4uDlmzLg==",
-      "dev": true
-    },
-    "uglify-js": {
-      "version": "3.3.27",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.27.tgz",
-      "integrity": "sha512-O94wxMSb3td/TlofkITYvYIlvIVdldvNXDVRekzK13CQZuL37ua4nrdXX0Ro7MapfUVzglRHs0/+imPRUdOghg==",
-      "dev": true,
-      "requires": {
-        "commander": "~2.15.0",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "uglify-to-browserify": {
-      "version": "1.0.2",
-      "resolved": "http://localhost:4873/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
-      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
-      "dev": true,
-      "optional": true
-    },
-    "uglifyjs-webpack-plugin": {
-      "version": "1.1.6",
-      "resolved": "http://localhost:4873/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.1.6.tgz",
-      "integrity": "sha512-VUja+7rYbznEvUaeb8IxOCTUrq4BCb1ml0vffa+mfwKtrAwlqnU0ENF14DtYltV1cxd/HSuK51CCA/D/8kMQVw==",
-      "dev": true,
-      "requires": {
-        "cacache": "^10.0.1",
-        "find-cache-dir": "^1.0.0",
-        "schema-utils": "^0.4.2",
-        "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"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.13.0",
-          "resolved": "http://localhost:4873/commander/-/commander-2.13.0.tgz",
-          "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "http://localhost:4873/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "uglify-es": {
-          "version": "3.3.9",
-          "resolved": "http://localhost:4873/uglify-es/-/uglify-es-3.3.9.tgz",
-          "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
-          "dev": true,
-          "requires": {
-            "commander": "~2.13.0",
-            "source-map": "~0.6.1"
-          }
-        }
-      }
-    },
-    "ultron": {
-      "version": "1.1.1",
-      "resolved": "http://localhost:4873/ultron/-/ultron-1.1.1.tgz",
-      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
-      "dev": true
-    },
-    "underscore": {
-      "version": "1.7.0",
-      "resolved": "http://localhost:4873/underscore/-/underscore-1.7.0.tgz",
-      "integrity": "sha1-a7rwh3UA02vjTsqlhODbn+8DUgk=",
-      "dev": true
-    },
-    "underscore.string": {
-      "version": "2.4.0",
-      "resolved": "http://localhost:4873/underscore.string/-/underscore.string-2.4.0.tgz",
-      "integrity": "sha1-jN2PusTi0uoefi6Al8QvRCKA+Fs=",
-      "dev": true
-    },
-    "unherit": {
-      "version": "1.1.1",
-      "resolved": "http://localhost:4873/unherit/-/unherit-1.1.1.tgz",
-      "integrity": "sha512-+XZuV691Cn4zHsK0vkKYwBEwB74T3IZIcxrgn2E4rKwTfFyI1zCh7X7grwh9Re08fdPlarIdyWgI8aVB3F5A5g==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "xtend": "^4.0.1"
-      }
-    },
-    "unified": {
-      "version": "6.2.0",
-      "resolved": "http://localhost:4873/unified/-/unified-6.2.0.tgz",
-      "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"
-      }
-    },
-    "union-value": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/union-value/-/union-value-1.0.0.tgz",
-      "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"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "http://localhost:4873/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "set-value": {
-          "version": "0.4.3",
-          "resolved": "http://localhost:4873/set-value/-/set-value-0.4.3.tgz",
-          "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"
-          }
-        }
-      }
-    },
-    "uniq": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/uniq/-/uniq-1.0.1.tgz",
-      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
-      "dev": true
-    },
-    "uniqs": {
-      "version": "2.0.0",
-      "resolved": "http://localhost:4873/uniqs/-/uniqs-2.0.0.tgz",
-      "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
-      "dev": true
-    },
-    "unique-filename": {
-      "version": "1.1.0",
-      "resolved": "http://localhost:4873/unique-filename/-/unique-filename-1.1.0.tgz",
-      "integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=",
-      "dev": true,
-      "requires": {
-        "unique-slug": "^2.0.0"
-      }
-    },
-    "unique-slug": {
-      "version": "2.0.0",
-      "resolved": "http://localhost:4873/unique-slug/-/unique-slug-2.0.0.tgz",
-      "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=",
-      "dev": true,
-      "requires": {
-        "imurmurhash": "^0.1.4"
-      }
-    },
-    "unique-string": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/unique-string/-/unique-string-1.0.0.tgz",
-      "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
-      "dev": true,
-      "requires": {
-        "crypto-random-string": "^1.0.0"
-      }
-    },
-    "unist-util-is": {
-      "version": "2.1.2",
-      "resolved": "http://localhost:4873/unist-util-is/-/unist-util-is-2.1.2.tgz",
-      "integrity": "sha512-YkXBK/H9raAmG7KXck+UUpnKiNmUdB+aBGrknfQ4EreE1banuzrKABx3jP6Z5Z3fMSPMQQmeXBlKpCbMwBkxVw==",
-      "dev": true
-    },
-    "unist-util-modify-children": {
-      "version": "1.1.2",
-      "resolved": "http://localhost:4873/unist-util-modify-children/-/unist-util-modify-children-1.1.2.tgz",
-      "integrity": "sha512-GRi04yhng1WqBf5RBzPkOtWAadcZS2gvuOgNn/cyJBYNxtTuyYqTKN0eg4rC1YJwGnzrqfRB3dSKm8cNCjNirg==",
-      "dev": true,
-      "requires": {
-        "array-iterate": "^1.0.0"
-      }
-    },
-    "unist-util-remove-position": {
-      "version": "1.1.2",
-      "resolved": "http://localhost:4873/unist-util-remove-position/-/unist-util-remove-position-1.1.2.tgz",
-      "integrity": "sha512-XxoNOBvq1WXRKXxgnSYbtCF76TJrRoe5++pD4cCBsssSiWSnPEktyFrFLE8LTk3JW5mt9hB0Sk5zn4x/JeWY7Q==",
-      "dev": true,
-      "requires": {
-        "unist-util-visit": "^1.1.0"
-      }
-    },
-    "unist-util-stringify-position": {
-      "version": "1.1.2",
-      "resolved": "http://localhost:4873/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz",
-      "integrity": "sha512-pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ==",
-      "dev": true
-    },
-    "unist-util-visit": {
-      "version": "1.3.1",
-      "resolved": "http://localhost:4873/unist-util-visit/-/unist-util-visit-1.3.1.tgz",
-      "integrity": "sha512-0fdB9EQJU0tho5tK0VzOJzAQpPv2LyLZ030b10GxuzAWEfvd54mpY7BMjQ1L69k2YNvL+SvxRzH0yUIehOO8aA==",
-      "dev": true,
-      "requires": {
-        "unist-util-is": "^2.1.1"
-      }
-    },
-    "universalify": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
-      "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=",
-      "dev": true
-    },
-    "unpipe": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
-      "dev": true
-    },
-    "unset-value": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/unset-value/-/unset-value-1.0.0.tgz",
-      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
-      "dev": true,
-      "requires": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
-      },
-      "dependencies": {
-        "has-value": {
-          "version": "0.3.1",
-          "resolved": "http://localhost:4873/has-value/-/has-value-0.3.1.tgz",
-          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-          "dev": true,
-          "requires": {
-            "get-value": "^2.0.3",
-            "has-values": "^0.1.4",
-            "isobject": "^2.0.0"
-          },
-          "dependencies": {
-            "isobject": {
-              "version": "2.1.0",
-              "resolved": "http://localhost:4873/isobject/-/isobject-2.1.0.tgz",
-              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-              "dev": true,
-              "requires": {
-                "isarray": "1.0.0"
-              }
-            }
-          }
-        },
-        "has-values": {
-          "version": "0.1.4",
-          "resolved": "http://localhost:4873/has-values/-/has-values-0.1.4.tgz",
-          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
-          "dev": true
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        }
-      }
-    },
-    "unzip-response": {
-      "version": "2.0.1",
-      "resolved": "http://localhost:4873/unzip-response/-/unzip-response-2.0.1.tgz",
-      "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=",
-      "dev": true
-    },
-    "upath": {
-      "version": "1.1.0",
-      "resolved": "http://localhost:4873/upath/-/upath-1.1.0.tgz",
-      "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
-      "dev": true
-    },
-    "update-notifier": {
-      "version": "2.5.0",
-      "resolved": "http://localhost:4873/update-notifier/-/update-notifier-2.5.0.tgz",
-      "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
-      "dev": true,
-      "requires": {
-        "boxen": "^1.2.1",
-        "chalk": "^2.0.1",
-        "configstore": "^3.0.0",
-        "import-lazy": "^2.1.0",
-        "is-ci": "^1.0.10",
-        "is-installed-globally": "^0.1.0",
-        "is-npm": "^1.0.0",
-        "latest-version": "^3.0.0",
-        "semver-diff": "^2.0.0",
-        "xdg-basedir": "^3.0.0"
-      }
-    },
-    "upper-case": {
-      "version": "1.1.3",
-      "resolved": "http://localhost:4873/upper-case/-/upper-case-1.1.3.tgz",
-      "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
-      "dev": true
-    },
-    "uri-js": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.1.tgz",
-      "integrity": "sha512-jpKCA3HjsBfSDOEgxRDAxQCNyHfCPSbq57PqCkd3gAyBuPb3IWxw54EHncqESznIdqSetHfw3D7ylThu2Kcc9A==",
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "urix": {
-      "version": "0.1.0",
-      "resolved": "http://localhost:4873/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-      "dev": true
-    },
-    "url": {
-      "version": "0.11.0",
-      "resolved": "http://localhost:4873/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-      "dev": true,
-      "requires": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.3.2",
-          "resolved": "http://localhost:4873/punycode/-/punycode-1.3.2.tgz",
-          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
-          "dev": true
-        }
-      }
-    },
-    "url-loader": {
-      "version": "0.6.2",
-      "resolved": "http://localhost:4873/url-loader/-/url-loader-0.6.2.tgz",
-      "integrity": "sha512-h3qf9TNn53BpuXTTcpC+UehiRrl0Cv45Yr/xWayApjw6G8Bg2dGke7rIwDQ39piciWCWrC+WiqLjOh3SUp9n0Q==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^1.0.2",
-        "mime": "^1.4.1",
-        "schema-utils": "^0.3.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "5.5.2",
-          "resolved": "http://localhost:4873/ajv/-/ajv-5.5.2.tgz",
-          "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-          "dev": true,
-          "requires": {
-            "co": "^4.6.0",
-            "fast-deep-equal": "^1.0.0",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.3.0"
-          }
-        },
-        "fast-deep-equal": {
-          "version": "1.1.0",
-          "resolved": "http://localhost:4873/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-          "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "0.3.0",
-          "resolved": "http://localhost:4873/schema-utils/-/schema-utils-0.3.0.tgz",
-          "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
-          "dev": true,
-          "requires": {
-            "ajv": "^5.0.0"
-          }
-        }
-      }
-    },
-    "url-parse": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.0.tgz",
-      "integrity": "sha512-ERuGxDiQ6Xw/agN4tuoCRbmwRuZP0cJ1lJxJubXr5Q/5cDa78+Dc4wfvtxzhzhkm5VvmW6Mf8EVj9SPGN4l8Lg==",
-      "dev": true,
-      "requires": {
-        "querystringify": "^2.0.0",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "url-parse-lax": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
-      "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
-      "dev": true,
-      "requires": {
-        "prepend-http": "^1.0.1"
-      }
-    },
-    "use": {
-      "version": "3.1.0",
-      "resolved": "http://localhost:4873/use/-/use-3.1.0.tgz",
-      "integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^6.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "http://localhost:4873/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
-        }
-      }
-    },
-    "useragent": {
-      "version": "2.2.1",
-      "resolved": "http://localhost:4873/useragent/-/useragent-2.2.1.tgz",
-      "integrity": "sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4=",
-      "dev": true,
-      "requires": {
-        "lru-cache": "2.2.x",
-        "tmp": "0.0.x"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "2.2.4",
-          "resolved": "http://localhost:4873/lru-cache/-/lru-cache-2.2.4.tgz",
-          "integrity": "sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=",
-          "dev": true
-        }
-      }
-    },
-    "util": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.1"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-          "dev": true
-        }
-      }
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "http://localhost:4873/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-    },
-    "utila": {
-      "version": "0.4.0",
-      "resolved": "http://localhost:4873/utila/-/utila-0.4.0.tgz",
-      "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=",
-      "dev": true
-    },
-    "utils-merge": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
-      "dev": true
-    },
-    "uuid": {
-      "version": "3.2.1",
-      "resolved": "http://localhost:4873/uuid/-/uuid-3.2.1.tgz",
-      "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==",
-      "dev": true
-    },
-    "uws": {
-      "version": "9.14.0",
-      "resolved": "http://localhost:4873/uws/-/uws-9.14.0.tgz",
-      "integrity": "sha512-HNMztPP5A1sKuVFmdZ6BPVpBQd5bUjNC8EFMFiICK+oho/OQsAJy5hnIx4btMHiOk8j04f/DbIlqnEZ9d72dqg==",
-      "dev": true,
-      "optional": true
-    },
-    "v8flags": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.0.tgz",
-      "integrity": "sha512-0m69VIK2dudEf2Ub0xwLQhZkDZu85OmiOpTw+UGDt56ibviYICHziM/3aE+oVg7IjGPp0c83w3eSVqa+lYZ9UQ==",
-      "dev": true,
-      "requires": {
-        "homedir-polyfill": "^1.0.1"
-      }
-    },
-    "validate-npm-package-license": {
-      "version": "3.0.3",
-      "resolved": "http://localhost:4873/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz",
-      "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==",
-      "requires": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "vary": {
-      "version": "1.1.2",
-      "resolved": "http://localhost:4873/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
-      "dev": true
-    },
-    "vendors": {
-      "version": "1.0.2",
-      "resolved": "http://localhost:4873/vendors/-/vendors-1.0.2.tgz",
-      "integrity": "sha512-w/hry/368nO21AN9QljsaIhb9ZiZtZARoVH5f3CsFbawdLdayCgKRPup7CggujvySMxx0I91NOyxdVENohprLQ==",
-      "dev": true
-    },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "http://localhost:4873/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
-        }
-      }
-    },
-    "vfile": {
-      "version": "2.3.0",
-      "resolved": "http://localhost:4873/vfile/-/vfile-2.3.0.tgz",
-      "integrity": "sha512-ASt4mBUHcTpMKD/l5Q+WJXNtshlWxOogYyGYYrg4lt/vuRjC1EFQtlAofL5VmtVNIZJzWYFJjzGWZ0Gw8pzW1w==",
-      "dev": true,
-      "requires": {
-        "is-buffer": "^1.1.4",
-        "replace-ext": "1.0.0",
-        "unist-util-stringify-position": "^1.0.0",
-        "vfile-message": "^1.0.0"
-      },
-      "dependencies": {
-        "replace-ext": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/replace-ext/-/replace-ext-1.0.0.tgz",
-          "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
-          "dev": true
-        }
-      }
-    },
-    "vfile-location": {
-      "version": "2.0.3",
-      "resolved": "http://localhost:4873/vfile-location/-/vfile-location-2.0.3.tgz",
-      "integrity": "sha512-zM5/l4lfw1CBoPx3Jimxoc5RNDAHHpk6AM6LM0pTIkm5SUSsx8ZekZ0PVdf0WEZ7kjlhSt7ZlqbRL6Cd6dBs6A==",
-      "dev": true
-    },
-    "vfile-message": {
-      "version": "1.0.1",
-      "resolved": "http://localhost:4873/vfile-message/-/vfile-message-1.0.1.tgz",
-      "integrity": "sha512-vSGCkhNvJzO6VcWC6AlJW4NtYOVtS+RgCaqFIYUjoGIlHnFL+i0LbtYvonDWOMcB97uTPT4PRsyYY7REWC9vug==",
-      "dev": true,
-      "requires": {
-        "unist-util-stringify-position": "^1.1.1"
-      }
-    },
-    "vinyl": {
-      "version": "0.5.3",
-      "resolved": "http://localhost:4873/vinyl/-/vinyl-0.5.3.tgz",
-      "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
-      "dev": true,
-      "requires": {
-        "clone": "^1.0.0",
-        "clone-stats": "^0.0.1",
-        "replace-ext": "0.0.1"
-      },
-      "dependencies": {
-        "clone": {
-          "version": "1.0.4",
-          "resolved": "http://localhost:4873/clone/-/clone-1.0.4.tgz",
-          "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
-          "dev": true
-        }
-      }
-    },
-    "viz.js": {
-      "version": "1.8.2",
-      "resolved": "http://localhost:4873/viz.js/-/viz.js-1.8.2.tgz",
-      "integrity": "sha512-W+1+N/hdzLpQZEcvz79n2IgUE9pfx6JLdHh3Kh8RGvLL8P1LdJVQmi2OsDcLdY4QVID4OUy+FPelyerX0nJxIQ=="
-    },
-    "vlq": {
-      "version": "0.2.3",
-      "resolved": "http://localhost:4873/vlq/-/vlq-0.2.3.tgz",
-      "integrity": "sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==",
-      "dev": true
-    },
-    "vm-browserify": {
-      "version": "0.0.4",
-      "resolved": "http://localhost:4873/vm-browserify/-/vm-browserify-0.0.4.tgz",
-      "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
-      "dev": true,
-      "requires": {
-        "indexof": "0.0.1"
-      }
-    },
-    "void-elements": {
-      "version": "2.0.1",
-      "resolved": "http://localhost:4873/void-elements/-/void-elements-2.0.1.tgz",
-      "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
-      "dev": true
-    },
-    "watchpack": {
-      "version": "1.6.0",
-      "resolved": "http://localhost:4873/watchpack/-/watchpack-1.6.0.tgz",
-      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
-      "dev": true,
-      "requires": {
-        "chokidar": "^2.0.2",
-        "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0"
-      },
-      "dependencies": {
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "http://localhost:4873/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-          "dev": true,
-          "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
-          }
-        },
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "http://localhost:4873/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-          "dev": true
-        },
-        "array-unique": {
-          "version": "0.3.2",
-          "resolved": "http://localhost:4873/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-          "dev": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "http://localhost:4873/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "http://localhost:4873/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "chokidar": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz",
-          "integrity": "sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==",
-          "dev": true,
-          "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.0",
-            "braces": "^2.3.0",
-            "fsevents": "^1.1.2",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.1",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
-            "normalize-path": "^2.1.1",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.0.0",
-            "upath": "^1.0.0"
-          }
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "http://localhost:4873/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "expand-brackets": {
-          "version": "2.1.4",
-          "resolved": "http://localhost:4873/expand-brackets/-/expand-brackets-2.1.4.tgz",
-          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-          "dev": true,
-          "requires": {
-            "debug": "^2.3.3",
-            "define-property": "^0.2.5",
-            "extend-shallow": "^2.0.1",
-            "posix-character-classes": "^0.1.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "0.2.5",
-              "resolved": "http://localhost:4873/define-property/-/define-property-0.2.5.tgz",
-              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^0.1.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "http://localhost:4873/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            },
-            "is-accessor-descriptor": {
-              "version": "0.1.6",
-              "resolved": "http://localhost:4873/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-              "dev": true,
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "http://localhost:4873/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "is-data-descriptor": {
-              "version": "0.1.4",
-              "resolved": "http://localhost:4873/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-              "dev": true,
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "http://localhost:4873/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "is-descriptor": {
-              "version": "0.1.6",
-              "resolved": "http://localhost:4873/is-descriptor/-/is-descriptor-0.1.6.tgz",
-              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-              "dev": true,
-              "requires": {
-                "is-accessor-descriptor": "^0.1.6",
-                "is-data-descriptor": "^0.1.4",
-                "kind-of": "^5.0.0"
-              }
-            },
-            "kind-of": {
-              "version": "5.1.0",
-              "resolved": "http://localhost:4873/kind-of/-/kind-of-5.1.0.tgz",
-              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-              "dev": true
-            }
-          }
-        },
-        "extglob": {
-          "version": "2.0.4",
-          "resolved": "http://localhost:4873/extglob/-/extglob-2.0.4.tgz",
-          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-          "dev": true,
-          "requires": {
-            "array-unique": "^0.3.2",
-            "define-property": "^1.0.0",
-            "expand-brackets": "^2.1.4",
-            "extend-shallow": "^2.0.1",
-            "fragment-cache": "^0.2.1",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "1.0.0",
-              "resolved": "http://localhost:4873/define-property/-/define-property-1.0.0.tgz",
-              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^1.0.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "http://localhost:4873/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "http://localhost:4873/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "http://localhost:4873/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "http://localhost:4873/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-          "dev": true,
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "http://localhost:4873/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-              "dev": true,
-              "requires": {
-                "is-extglob": "^2.1.0"
-              }
-            }
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "http://localhost:4873/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        },
-        "is-extglob": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/is-extglob/-/is-extglob-2.1.1.tgz",
-          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "4.0.0",
-          "resolved": "http://localhost:4873/is-glob/-/is-glob-4.0.0.tgz",
-          "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.1"
-          }
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "http://localhost:4873/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "http://localhost:4873/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "http://localhost:4873/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "http://localhost:4873/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        }
-      }
-    },
-    "wbuf": {
-      "version": "1.7.3",
-      "resolved": "http://localhost:4873/wbuf/-/wbuf-1.7.3.tgz",
-      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-      "dev": true,
-      "requires": {
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "web-animations-js": {
-      "version": "2.3.1",
-      "resolved": "http://localhost:4873/web-animations-js/-/web-animations-js-2.3.1.tgz",
-      "integrity": "sha1-Om2bwVGWN3qQ+OKAP6UmIWWwRRA="
-    },
-    "webdriver-js-extender": {
-      "version": "1.0.0",
-      "resolved": "http://localhost:4873/webdriver-js-extender/-/webdriver-js-extender-1.0.0.tgz",
-      "integrity": "sha1-gcUzqeM9W/tZe05j4s2yW1R3dRU=",
-      "dev": true,
-      "requires": {
-        "@types/selenium-webdriver": "^2.53.35",
-        "selenium-webdriver": "^2.53.2"
-      },
-      "dependencies": {
-        "adm-zip": {
-          "version": "0.4.4",
-          "resolved": "http://localhost:4873/adm-zip/-/adm-zip-0.4.4.tgz",
-          "integrity": "sha1-ph7VrmkFw66lizplfSUDMJEFJzY=",
-          "dev": true
-        },
-        "sax": {
-          "version": "0.6.1",
-          "resolved": "http://localhost:4873/sax/-/sax-0.6.1.tgz",
-          "integrity": "sha1-VjsZx8HeiS4Jv8Ty/DDjwn8JUrk=",
-          "dev": true
-        },
-        "selenium-webdriver": {
-          "version": "2.53.3",
-          "resolved": "http://localhost:4873/selenium-webdriver/-/selenium-webdriver-2.53.3.tgz",
-          "integrity": "sha1-0p/1qVff8aG0ncRXdW5OS/vc4IU=",
-          "dev": true,
-          "requires": {
-            "adm-zip": "0.4.4",
-            "rimraf": "^2.2.8",
-            "tmp": "0.0.24",
-            "ws": "^1.0.1",
-            "xml2js": "0.4.4"
-          }
-        },
-        "tmp": {
-          "version": "0.0.24",
-          "resolved": "http://localhost:4873/tmp/-/tmp-0.0.24.tgz",
-          "integrity": "sha1-1qXhmNFKmDXMby18PZ4wJCjIzxI=",
-          "dev": true
-        },
-        "ultron": {
-          "version": "1.0.2",
-          "resolved": "http://localhost:4873/ultron/-/ultron-1.0.2.tgz",
-          "integrity": "sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po=",
-          "dev": true
-        },
-        "ws": {
-          "version": "1.1.5",
-          "resolved": "http://localhost:4873/ws/-/ws-1.1.5.tgz",
-          "integrity": "sha512-o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w==",
-          "dev": true,
-          "requires": {
-            "options": ">=0.0.5",
-            "ultron": "1.0.x"
-          }
-        },
-        "xml2js": {
-          "version": "0.4.4",
-          "resolved": "http://localhost:4873/xml2js/-/xml2js-0.4.4.tgz",
-          "integrity": "sha1-MREBAAMAiuGSQOuhdJe1fHKcVV0=",
-          "dev": true,
-          "requires": {
-            "sax": "0.6.x",
-            "xmlbuilder": ">=1.0.0"
-          }
-        }
-      }
-    },
-    "webpack": {
-      "version": "3.11.0",
-      "resolved": "http://localhost:4873/webpack/-/webpack-3.11.0.tgz",
-      "integrity": "sha512-3kOFejWqj5ISpJk4Qj/V7w98h9Vl52wak3CLiw/cDOfbVTq7FeoZ0SdoHHY9PYlHr50ZS42OfvzE2vB4nncKQg==",
-      "dev": true,
-      "requires": {
-        "acorn": "^5.0.0",
-        "acorn-dynamic-import": "^2.0.0",
-        "ajv": "^6.1.0",
-        "ajv-keywords": "^3.1.0",
-        "async": "^2.1.2",
-        "enhanced-resolve": "^3.4.0",
-        "escope": "^3.6.0",
-        "interpret": "^1.0.0",
-        "json-loader": "^0.5.4",
-        "json5": "^0.5.1",
-        "loader-runner": "^2.3.0",
-        "loader-utils": "^1.1.0",
-        "memory-fs": "~0.4.1",
-        "mkdirp": "~0.5.0",
-        "node-libs-browser": "^2.0.0",
-        "source-map": "^0.5.3",
-        "supports-color": "^4.2.1",
-        "tapable": "^0.2.7",
-        "uglifyjs-webpack-plugin": "^0.4.6",
-        "watchpack": "^1.4.0",
-        "webpack-sources": "^1.0.1",
-        "yargs": "^8.0.2"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "camelcase": {
-          "version": "1.2.1",
-          "resolved": "http://localhost:4873/camelcase/-/camelcase-1.2.1.tgz",
-          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
-          "dev": true
-        },
-        "cliui": {
-          "version": "2.1.0",
-          "resolved": "http://localhost:4873/cliui/-/cliui-2.1.0.tgz",
-          "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
-          "dev": true,
-          "requires": {
-            "center-align": "^0.1.1",
-            "right-align": "^0.1.1",
-            "wordwrap": "0.0.2"
-          }
-        },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "http://localhost:4873/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "dev": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "load-json-file": {
-          "version": "2.0.0",
-          "resolved": "http://localhost:4873/load-json-file/-/load-json-file-2.0.0.tgz",
-          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "strip-bom": "^3.0.0"
-          }
-        },
-        "parse-json": {
-          "version": "2.2.0",
-          "resolved": "http://localhost:4873/parse-json/-/parse-json-2.2.0.tgz",
-          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-          "dev": true,
-          "requires": {
-            "error-ex": "^1.2.0"
-          }
-        },
-        "path-type": {
-          "version": "2.0.0",
-          "resolved": "http://localhost:4873/path-type/-/path-type-2.0.0.tgz",
-          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
-          "dev": true,
-          "requires": {
-            "pify": "^2.0.0"
-          }
-        },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "http://localhost:4873/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        },
-        "read-pkg": {
-          "version": "2.0.0",
-          "resolved": "http://localhost:4873/read-pkg/-/read-pkg-2.0.0.tgz",
-          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
-          "dev": true,
-          "requires": {
-            "load-json-file": "^2.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^2.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "2.0.0",
-          "resolved": "http://localhost:4873/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
-          "dev": true,
-          "requires": {
-            "find-up": "^2.0.0",
-            "read-pkg": "^2.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "4.5.0",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^2.0.0"
-          }
-        },
-        "uglify-js": {
-          "version": "2.8.29",
-          "resolved": "http://localhost:4873/uglify-js/-/uglify-js-2.8.29.tgz",
-          "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
-          "dev": true,
-          "requires": {
-            "source-map": "~0.5.1",
-            "uglify-to-browserify": "~1.0.0",
-            "yargs": "~3.10.0"
-          },
-          "dependencies": {
-            "yargs": {
-              "version": "3.10.0",
-              "resolved": "http://localhost:4873/yargs/-/yargs-3.10.0.tgz",
-              "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
-              "dev": true,
-              "requires": {
-                "camelcase": "^1.0.2",
-                "cliui": "^2.1.0",
-                "decamelize": "^1.0.0",
-                "window-size": "0.1.0"
-              }
-            }
-          }
-        },
-        "uglifyjs-webpack-plugin": {
-          "version": "0.4.6",
-          "resolved": "http://localhost:4873/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz",
-          "integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=",
-          "dev": true,
-          "requires": {
-            "source-map": "^0.5.6",
-            "uglify-js": "^2.8.29",
-            "webpack-sources": "^1.0.1"
-          }
-        },
-        "yargs": {
-          "version": "8.0.2",
-          "resolved": "http://localhost:4873/yargs/-/yargs-8.0.2.tgz",
-          "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
-          "dev": true,
-          "requires": {
-            "camelcase": "^4.1.0",
-            "cliui": "^3.2.0",
-            "decamelize": "^1.1.1",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^2.0.0",
-            "read-pkg-up": "^2.0.0",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^3.2.1",
-            "yargs-parser": "^7.0.0"
-          },
-          "dependencies": {
-            "camelcase": {
-              "version": "4.1.0",
-              "resolved": "http://localhost:4873/camelcase/-/camelcase-4.1.0.tgz",
-              "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-              "dev": true
-            },
-            "cliui": {
-              "version": "3.2.0",
-              "resolved": "http://localhost:4873/cliui/-/cliui-3.2.0.tgz",
-              "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-              "dev": true,
-              "requires": {
-                "string-width": "^1.0.1",
-                "strip-ansi": "^3.0.1",
-                "wrap-ansi": "^2.0.0"
-              },
-              "dependencies": {
-                "string-width": {
-                  "version": "1.0.2",
-                  "resolved": "http://localhost:4873/string-width/-/string-width-1.0.2.tgz",
-                  "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-                  "dev": true,
-                  "requires": {
-                    "code-point-at": "^1.0.0",
-                    "is-fullwidth-code-point": "^1.0.0",
-                    "strip-ansi": "^3.0.0"
-                  }
-                }
-              }
-            }
-          }
-        },
-        "yargs-parser": {
-          "version": "7.0.0",
-          "resolved": "http://localhost:4873/yargs-parser/-/yargs-parser-7.0.0.tgz",
-          "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
-          "dev": true,
-          "requires": {
-            "camelcase": "^4.1.0"
-          },
-          "dependencies": {
-            "camelcase": {
-              "version": "4.1.0",
-              "resolved": "http://localhost:4873/camelcase/-/camelcase-4.1.0.tgz",
-              "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-              "dev": true
-            }
-          }
-        }
-      }
-    },
-    "webpack-bundle-analyzer": {
-      "version": "2.9.0",
-      "resolved": "http://localhost:4873/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.9.0.tgz",
-      "integrity": "sha1-tYvDTMMLJ//brz0AvyerpvopxuM=",
-      "dev": true,
-      "requires": {
-        "acorn": "^5.1.1",
-        "chalk": "^1.1.3",
-        "commander": "^2.9.0",
-        "ejs": "^2.5.6",
-        "express": "^4.15.2",
-        "filesize": "^3.5.9",
-        "gzip-size": "^3.0.0",
-        "lodash": "^4.17.4",
-        "mkdirp": "^0.5.1",
-        "opener": "^1.4.3",
-        "ws": "^2.3.1"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "http://localhost:4873/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://localhost:4873/chalk/-/chalk-1.1.3.tgz",
-          "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"
-          }
-        },
-        "gzip-size": {
-          "version": "3.0.0",
-          "resolved": "http://localhost:4873/gzip-size/-/gzip-size-3.0.0.tgz",
-          "integrity": "sha1-VGGI6b3DN/Zzdy+BZgRks4nc5SA=",
-          "dev": true,
-          "requires": {
-            "duplexer": "^0.1.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.0.1",
-          "resolved": "http://localhost:4873/safe-buffer/-/safe-buffer-5.0.1.tgz",
-          "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "http://localhost:4873/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        },
-        "ws": {
-          "version": "2.3.1",
-          "resolved": "http://localhost:4873/ws/-/ws-2.3.1.tgz",
-          "integrity": "sha1-a5Sz5EfLajY/eF6vlK9jWejoHIA=",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.0.1",
-            "ultron": "~1.1.0"
-          }
-        }
-      }
-    },
-    "webpack-core": {
-      "version": "0.6.9",
-      "resolved": "http://localhost:4873/webpack-core/-/webpack-core-0.6.9.tgz",
-      "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
-      "dev": true,
-      "requires": {
-        "source-list-map": "~0.1.7",
-        "source-map": "~0.4.1"
-      },
-      "dependencies": {
-        "source-list-map": {
-          "version": "0.1.8",
-          "resolved": "http://localhost:4873/source-list-map/-/source-list-map-0.1.8.tgz",
-          "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.4.4",
-          "resolved": "http://localhost:4873/source-map/-/source-map-0.4.4.tgz",
-          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-          "dev": true,
-          "requires": {
-            "amdefine": ">=0.0.4"
-          }
-        }
-      }
-    },
-    "webpack-dev-middleware": {
-      "version": "1.12.2",
-      "resolved": "http://localhost:4873/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz",
-      "integrity": "sha512-FCrqPy1yy/sN6U/SaEZcHKRXGlqU0DUaEBL45jkUYoB8foVb6wCnbIJ1HKIx+qUFTW+3JpVcCJCxZ8VATL4e+A==",
-      "dev": true,
-      "requires": {
-        "memory-fs": "~0.4.1",
-        "mime": "^1.5.0",
-        "path-is-absolute": "^1.0.0",
-        "range-parser": "^1.0.3",
-        "time-stamp": "^2.0.0"
-      }
-    },
-    "webpack-dev-server": {
-      "version": "2.11.2",
-      "resolved": "http://localhost:4873/webpack-dev-server/-/webpack-dev-server-2.11.2.tgz",
-      "integrity": "sha512-zrPoX97bx47vZiAXfDrkw8pe9QjJ+lunQl3dypojyWwWr1M5I2h0VSrMPfTjopHQPRNn+NqfjcMmhoLcUJe2gA==",
-      "dev": true,
-      "requires": {
-        "ansi-html": "0.0.7",
-        "array-includes": "^3.0.3",
-        "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.17.4",
-        "import-local": "^1.0.0",
-        "internal-ip": "1.2.0",
-        "ip": "^1.1.5",
-        "killable": "^1.0.0",
-        "loglevel": "^1.4.1",
-        "opn": "^5.1.0",
-        "portfinder": "^1.0.9",
-        "selfsigned": "^1.9.1",
-        "serve-index": "^1.7.2",
-        "sockjs": "0.3.19",
-        "sockjs-client": "1.1.4",
-        "spdy": "^3.4.1",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^5.1.0",
-        "webpack-dev-middleware": "1.12.2",
-        "yargs": "6.6.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "http://localhost:4873/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-          "dev": true,
-          "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
-          }
-        },
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "http://localhost:4873/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-          "dev": true
-        },
-        "array-unique": {
-          "version": "0.3.2",
-          "resolved": "http://localhost:4873/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-          "dev": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "http://localhost:4873/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "http://localhost:4873/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "camelcase": {
-          "version": "3.0.0",
-          "resolved": "http://localhost:4873/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-          "dev": true
-        },
-        "chokidar": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz",
-          "integrity": "sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==",
-          "dev": true,
-          "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.0",
-            "braces": "^2.3.0",
-            "fsevents": "^1.1.2",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.1",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
-            "normalize-path": "^2.1.1",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.0.0",
-            "upath": "^1.0.0"
-          }
-        },
-        "cliui": {
-          "version": "3.2.0",
-          "resolved": "http://localhost:4873/cliui/-/cliui-3.2.0.tgz",
-          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-          "dev": true,
-          "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wrap-ansi": "^2.0.0"
-          }
-        },
-        "expand-brackets": {
-          "version": "2.1.4",
-          "resolved": "http://localhost:4873/expand-brackets/-/expand-brackets-2.1.4.tgz",
-          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-          "dev": true,
-          "requires": {
-            "debug": "^2.3.3",
-            "define-property": "^0.2.5",
-            "extend-shallow": "^2.0.1",
-            "posix-character-classes": "^0.1.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "debug": {
-              "version": "2.6.9",
-              "resolved": "http://localhost:4873/debug/-/debug-2.6.9.tgz",
-              "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-              "dev": true,
-              "requires": {
-                "ms": "2.0.0"
-              }
-            },
-            "define-property": {
-              "version": "0.2.5",
-              "resolved": "http://localhost:4873/define-property/-/define-property-0.2.5.tgz",
-              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^0.1.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "http://localhost:4873/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            },
-            "is-accessor-descriptor": {
-              "version": "0.1.6",
-              "resolved": "http://localhost:4873/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-              "dev": true,
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "http://localhost:4873/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "is-data-descriptor": {
-              "version": "0.1.4",
-              "resolved": "http://localhost:4873/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-              "dev": true,
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "http://localhost:4873/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "is-descriptor": {
-              "version": "0.1.6",
-              "resolved": "http://localhost:4873/is-descriptor/-/is-descriptor-0.1.6.tgz",
-              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-              "dev": true,
-              "requires": {
-                "is-accessor-descriptor": "^0.1.6",
-                "is-data-descriptor": "^0.1.4",
-                "kind-of": "^5.0.0"
-              }
-            },
-            "kind-of": {
-              "version": "5.1.0",
-              "resolved": "http://localhost:4873/kind-of/-/kind-of-5.1.0.tgz",
-              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-              "dev": true
-            }
-          }
-        },
-        "extglob": {
-          "version": "2.0.4",
-          "resolved": "http://localhost:4873/extglob/-/extglob-2.0.4.tgz",
-          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-          "dev": true,
-          "requires": {
-            "array-unique": "^0.3.2",
-            "define-property": "^1.0.0",
-            "expand-brackets": "^2.1.4",
-            "extend-shallow": "^2.0.1",
-            "fragment-cache": "^0.2.1",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "1.0.0",
-              "resolved": "http://localhost:4873/define-property/-/define-property-1.0.0.tgz",
-              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^1.0.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "http://localhost:4873/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "http://localhost:4873/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "http://localhost:4873/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "http://localhost:4873/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-          "dev": true,
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "http://localhost:4873/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-              "dev": true,
-              "requires": {
-                "is-extglob": "^2.1.0"
-              }
-            }
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "http://localhost:4873/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        },
-        "is-extglob": {
-          "version": "2.1.1",
-          "resolved": "http://localhost:4873/is-extglob/-/is-extglob-2.1.1.tgz",
-          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "dev": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "is-glob": {
-          "version": "4.0.0",
-          "resolved": "http://localhost:4873/is-glob/-/is-glob-4.0.0.tgz",
-          "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.1"
-          }
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "http://localhost:4873/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "http://localhost:4873/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "http://localhost:4873/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "http://localhost:4873/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "os-locale": {
-          "version": "1.4.0",
-          "resolved": "http://localhost:4873/os-locale/-/os-locale-1.4.0.tgz",
-          "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-          "dev": true,
-          "requires": {
-            "lcid": "^1.0.0"
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "http://localhost:4873/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "dev": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "which-module": {
-          "version": "1.0.0",
-          "resolved": "http://localhost:4873/which-module/-/which-module-1.0.0.tgz",
-          "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-          "dev": true
-        },
-        "yargs": {
-          "version": "6.6.0",
-          "resolved": "http://localhost:4873/yargs/-/yargs-6.6.0.tgz",
-          "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"
-          }
-        },
-        "yargs-parser": {
-          "version": "4.2.1",
-          "resolved": "http://localhost:4873/yargs-parser/-/yargs-parser-4.2.1.tgz",
-          "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=",
-          "dev": true,
-          "requires": {
-            "camelcase": "^3.0.0"
-          }
-        }
-      }
-    },
-    "webpack-merge": {
-      "version": "2.6.1",
-      "resolved": "http://localhost:4873/webpack-merge/-/webpack-merge-2.6.1.tgz",
-      "integrity": "sha1-8dgB0sXTn4P/7J8RkkCz476ZShw=",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.4"
-      }
-    },
-    "webpack-sources": {
-      "version": "1.1.0",
-      "resolved": "http://localhost:4873/webpack-sources/-/webpack-sources-1.1.0.tgz",
-      "integrity": "sha512-aqYp18kPphgoO5c/+NaUvEeACtZjMESmDChuD3NBciVpah3XpMEU9VAAtIaB1BsfJWWTSdv8Vv1m3T0aRk2dUw==",
-      "dev": true,
-      "requires": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "http://localhost:4873/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "webpack-subresource-integrity": {
-      "version": "1.0.4",
-      "resolved": "http://localhost:4873/webpack-subresource-integrity/-/webpack-subresource-integrity-1.0.4.tgz",
-      "integrity": "sha1-j6yKfo61n8ahZ2ioXJ2U7n+dDts=",
-      "dev": true,
-      "requires": {
-        "webpack-core": "^0.6.8"
-      }
-    },
-    "websocket-driver": {
-      "version": "0.7.0",
-      "resolved": "http://localhost:4873/websocket-driver/-/websocket-driver-0.7.0.tgz",
-      "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
-      "dev": true,
-      "requires": {
-        "http-parser-js": ">=0.4.0",
-        "websocket-extensions": ">=0.1.1"
-      }
-    },
-    "websocket-extensions": {
-      "version": "0.1.3",
-      "resolved": "http://localhost:4873/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
-      "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
-      "dev": true
-    },
-    "whatwg-fetch": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz",
-      "integrity": "sha1-nITsLc9oGH/wC8ZOEnS0QhduHIQ=",
-      "dev": true
-    },
-    "when": {
-      "version": "3.7.8",
-      "resolved": "http://localhost:4873/when/-/when-3.7.8.tgz",
-      "integrity": "sha1-xxMLan6gRpPoQs3J56Hyqjmjn4I="
-    },
-    "whet.extend": {
-      "version": "0.9.9",
-      "resolved": "http://localhost:4873/whet.extend/-/whet.extend-0.9.9.tgz",
-      "integrity": "sha1-+HfVv2SMl+WqVC+twW1qJZucEaE=",
-      "dev": true
-    },
-    "which": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
-      "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "which-module": {
-      "version": "2.0.0",
-      "resolved": "http://localhost:4873/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
-    },
-    "wide-align": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
-      "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
-      "dev": true,
-      "requires": {
-        "string-width": "^1.0.2"
-      },
       "dependencies": {
         "ansi-regex": {
           "version": "2.1.1",
@@ -20374,9 +5841,9863 @@
         }
       }
     },
+    "gaze": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
+      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
+      "dev": true,
+      "requires": {
+        "globule": "^1.0.0"
+      }
+    },
+    "generate-function": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
+      "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=",
+      "dev": true,
+      "optional": true
+    },
+    "generate-object-property": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+      "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "is-property": "^1.0.0"
+      }
+    },
+    "get-caller-file": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
+    },
+    "get-stdin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
+      "dev": true
+    },
+    "get-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
+    },
+    "get-uri": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-2.0.2.tgz",
+      "integrity": "sha512-ZD325dMZOgerGqF/rF6vZXyFGTAay62svjQIT+X/oU2PtxYpFxvSkbsdi+oxIrsNxlZVd4y8wUDqkaExWTI/Cw==",
+      "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"
+      }
+    },
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "github-build": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/github-build/-/github-build-1.2.0.tgz",
+      "integrity": "sha512-Iq7NialLYz5yRZDkiX8zaOWd+N3BssJJfUvG7wd8r4MeLCN88SdxEYo2esseMLpLtP4vNXhgamg1eRm7hw59qw==",
+      "dev": true,
+      "requires": {
+        "axios": "0.15.3"
+      },
+      "dependencies": {
+        "axios": {
+          "version": "0.15.3",
+          "resolved": "https://registry.npmjs.org/axios/-/axios-0.15.3.tgz",
+          "integrity": "sha1-LJ1jiy4ZGgjqHWzJiOrda6W9wFM=",
+          "dev": true,
+          "requires": {
+            "follow-redirects": "1.0.0"
+          }
+        },
+        "follow-redirects": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.0.0.tgz",
+          "integrity": "sha1-jjQpjL0uF28lTv/sdaHHjMhJ/Tc=",
+          "dev": true,
+          "requires": {
+            "debug": "^2.2.0"
+          }
+        }
+      }
+    },
+    "github-slugger": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-1.2.0.tgz",
+      "integrity": "sha512-wIaa75k1vZhyPm9yWrD08A5Xnx/V+RmzGrpjQuLemGKSb77Qukiaei58Bogrl/LZSADDfPzKJX8jhLs4CRTl7Q==",
+      "dev": true,
+      "requires": {
+        "emoji-regex": ">=6.0.0 <=6.1.1"
+      }
+    },
+    "glob": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "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"
+      }
+    },
+    "glob-base": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
+      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
+      "dev": true,
+      "requires": {
+        "glob-parent": "^2.0.0",
+        "is-glob": "^2.0.0"
+      },
+      "dependencies": {
+        "glob-parent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
+          "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+          "dev": true,
+          "requires": {
+            "is-glob": "^2.0.0"
+          }
+        },
+        "is-extglob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^1.0.0"
+          }
+        }
+      }
+    },
+    "glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+      "requires": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      },
+      "dependencies": {
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "requires": {
+            "is-extglob": "^2.1.0"
+          }
+        }
+      }
+    },
+    "global-dirs": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
+      "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
+      "dev": true,
+      "requires": {
+        "ini": "^1.3.4"
+      }
+    },
+    "global-modules-path": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/global-modules-path/-/global-modules-path-2.3.0.tgz",
+      "integrity": "sha512-HchvMJNYh9dGSCy8pOQ2O8u/hoXaL+0XhnrwH0RyLiSXMMTl9W3N6KUU73+JFOg5PGjtzl6VZzUQsnrpm7Szag==",
+      "dev": true
+    },
+    "globals": {
+      "version": "9.18.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
+      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+      "dev": true
+    },
+    "globby": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
+      "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
+      "dev": true,
+      "requires": {
+        "array-union": "^1.0.1",
+        "dir-glob": "^2.0.0",
+        "glob": "^7.1.2",
+        "ignore": "^3.3.5",
+        "pify": "^3.0.0",
+        "slash": "^1.0.0"
+      }
+    },
+    "globs": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/globs/-/globs-0.1.4.tgz",
+      "integrity": "sha512-D23dWbOq48vlOraoSigbcQV4tWrnhwk+E/Um2cMuDS3/5dwGmdFeA7L/vAvDhLFlQOTDqHcXh35m/71g2A2WzQ==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.1"
+      }
+    },
+    "globule": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
+      "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
+      "dev": true,
+      "requires": {
+        "glob": "~7.1.1",
+        "lodash": "~4.17.10",
+        "minimatch": "~3.0.2"
+      }
+    },
+    "glogg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.1.tgz",
+      "integrity": "sha512-ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw==",
+      "dev": true,
+      "requires": {
+        "sparkles": "^1.0.0"
+      }
+    },
+    "got": {
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
+      "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
+      "dev": true,
+      "requires": {
+        "create-error-class": "^3.0.0",
+        "duplexer3": "^0.1.4",
+        "get-stream": "^3.0.0",
+        "is-redirect": "^1.0.0",
+        "is-retry-allowed": "^1.0.0",
+        "is-stream": "^1.0.0",
+        "lowercase-keys": "^1.0.0",
+        "safe-buffer": "^5.0.1",
+        "timed-out": "^4.0.0",
+        "unzip-response": "^2.0.1",
+        "url-parse-lax": "^1.0.0"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
+    },
+    "graceful-readlink": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
+      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
+      "dev": true
+    },
+    "graphviz": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/graphviz/-/graphviz-0.0.8.tgz",
+      "integrity": "sha1-5ZnkBzPvgOFlO/6JpfAx7PKqSqo=",
+      "requires": {
+        "temp": "~0.4.0"
+      }
+    },
+    "gray-matter": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/gray-matter/-/gray-matter-2.1.1.tgz",
+      "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"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "gulp-util": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz",
+      "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",
+        "replace-ext": "0.0.1",
+        "through2": "^2.0.0",
+        "vinyl": "^0.5.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "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"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        },
+        "object-assign": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
+          "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "gulplog": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
+      "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
+      "dev": true,
+      "requires": {
+        "glogg": "^1.0.0"
+      }
+    },
+    "gzip-size": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-4.1.0.tgz",
+      "integrity": "sha1-iuCWJX6r59acRb4rZ8RIEk/7UXw=",
+      "dev": true,
+      "requires": {
+        "duplexer": "^0.1.1",
+        "pify": "^3.0.0"
+      }
+    },
+    "hammerjs": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
+      "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
+    },
+    "handle-thing": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz",
+      "integrity": "sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=",
+      "dev": true
+    },
+    "handlebars": {
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz",
+      "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=",
+      "dev": true,
+      "requires": {
+        "async": "^1.4.0",
+        "optimist": "^0.6.1",
+        "source-map": "^0.4.4",
+        "uglify-js": "^2.6"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+          "dev": true,
+          "optional": true
+        },
+        "cliui": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+          "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "center-align": "^0.1.1",
+            "right-align": "^0.1.1",
+            "wordwrap": "0.0.2"
+          }
+        },
+        "source-map": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+          "dev": true,
+          "requires": {
+            "amdefine": ">=0.0.4"
+          }
+        },
+        "uglify-js": {
+          "version": "2.8.29",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
+          "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "source-map": "~0.5.1",
+            "uglify-to-browserify": "~1.0.0",
+            "yargs": "~3.10.0"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "wordwrap": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+          "dev": true,
+          "optional": true
+        },
+        "yargs": {
+          "version": "3.10.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "camelcase": "^1.0.2",
+            "cliui": "^2.1.0",
+            "decamelize": "^1.0.0",
+            "window-size": "0.1.0"
+          }
+        }
+      }
+    },
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+      "dev": true
+    },
+    "har-validator": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+      "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
+      "dev": true,
+      "requires": {
+        "ajv": "^5.1.0",
+        "har-schema": "^2.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "5.5.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+          "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+          "dev": true,
+          "requires": {
+            "co": "^4.6.0",
+            "fast-deep-equal": "^1.0.0",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.3.0"
+          }
+        }
+      }
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        }
+      }
+    },
+    "has-binary2": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
+      "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
+      "dev": true,
+      "requires": {
+        "isarray": "2.0.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+          "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
+          "dev": true
+        }
+      }
+    },
+    "has-cors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
+      "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=",
+      "dev": true
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+    },
+    "has-gulplog": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
+      "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
+      "dev": true,
+      "requires": {
+        "sparkles": "^1.0.0"
+      }
+    },
+    "has-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
+      "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
+      "dev": true
+    },
+    "has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
+      "dev": true
+    },
+    "has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "requires": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      }
+    },
+    "has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "requires": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "hash-base": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "hash.js": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.5.tgz",
+      "integrity": "sha512-eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "hawk": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+      "dev": true,
+      "requires": {
+        "boom": "2.x.x",
+        "cryptiles": "2.x.x",
+        "hoek": "2.x.x",
+        "sntp": "1.x.x"
+      }
+    },
+    "he": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
+      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
+      "dev": true
+    },
+    "highlight.js": {
+      "version": "9.12.0",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz",
+      "integrity": "sha1-5tnb5Xy+/mB1HwKvM2GVhwyQwB4=",
+      "dev": true
+    },
+    "hipchat-notifier": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/hipchat-notifier/-/hipchat-notifier-1.1.0.tgz",
+      "integrity": "sha1-ttJJdVQ3wZEII2d5nTupoPI7Ix4=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "lodash": "^4.0.0",
+        "request": "^2.0.0"
+      }
+    },
+    "hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
+      "requires": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "hoek": {
+      "version": "2.16.3",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+      "dev": true
+    },
+    "home-or-tmp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
+      "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
+      "dev": true,
+      "requires": {
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.1"
+      }
+    },
+    "homedir-polyfill": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz",
+      "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=",
+      "dev": true,
+      "requires": {
+        "parse-passwd": "^1.0.0"
+      }
+    },
+    "hosted-git-info": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
+      "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="
+    },
+    "hpack.js": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+      "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "obuf": "^1.0.0",
+        "readable-stream": "^2.0.1",
+        "wbuf": "^1.1.0"
+      }
+    },
+    "html-entities": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
+      "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
+      "dev": true
+    },
+    "html-minifier": {
+      "version": "3.5.19",
+      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.19.tgz",
+      "integrity": "sha512-Qr2JC9nsjK8oCrEmuB430ZIA8YWbF3D5LSjywD75FTuXmeqacwHgIM8wp3vHYzzPbklSjp53RdmDuzR4ub2HzA==",
+      "dev": true,
+      "requires": {
+        "camel-case": "3.0.x",
+        "clean-css": "4.1.x",
+        "commander": "2.16.x",
+        "he": "1.1.x",
+        "param-case": "2.1.x",
+        "relateurl": "0.2.x",
+        "uglify-js": "3.4.x"
+      },
+      "dependencies": {
+        "clean-css": {
+          "version": "4.1.11",
+          "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.11.tgz",
+          "integrity": "sha1-Ls3xRaujj1R0DybO/Q/z4D4SXWo=",
+          "dev": true,
+          "requires": {
+            "source-map": "0.5.x"
+          }
+        },
+        "commander": {
+          "version": "2.16.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz",
+          "integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==",
+          "dev": true
+        }
+      }
+    },
+    "html-webpack-plugin": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
+      "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",
+        "util.promisify": "1.0.0"
+      },
+      "dependencies": {
+        "loader-utils": {
+          "version": "0.2.17",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
+          "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"
+          }
+        }
+      }
+    },
+    "htmlparser2": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz",
+      "integrity": "sha1-zHDQWln2VC5D8OaFyYLhTJJKnv4=",
+      "dev": true,
+      "requires": {
+        "domelementtype": "1",
+        "domhandler": "2.1",
+        "domutils": "1.1",
+        "readable-stream": "1.0"
+      },
+      "dependencies": {
+        "domutils": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.1.6.tgz",
+          "integrity": "sha1-vdw94Jm5ou+sxRxiPyj0FuzFdIU=",
+          "dev": true,
+          "requires": {
+            "domelementtype": "1"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        }
+      }
+    },
+    "http-deceiver": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
+      "dev": true
+    },
+    "http-errors": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+      "dev": true,
+      "requires": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.0",
+        "statuses": ">= 1.4.0 < 2"
+      }
+    },
+    "http-parser-js": {
+      "version": "0.4.13",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.13.tgz",
+      "integrity": "sha1-O9bW/ebjFyyTNMOzO2wZPYD+ETc=",
+      "dev": true
+    },
+    "http-proxy": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
+      "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
+      "dev": true,
+      "requires": {
+        "eventemitter3": "^3.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "http-proxy-agent": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
+      "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
+      "dev": true,
+      "requires": {
+        "agent-base": "4",
+        "debug": "3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "http-proxy-middleware": {
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz",
+      "integrity": "sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==",
+      "dev": true,
+      "requires": {
+        "http-proxy": "^1.16.2",
+        "is-glob": "^4.0.0",
+        "lodash": "^4.17.5",
+        "micromatch": "^3.1.9"
+      }
+    },
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      }
+    },
+    "httpntlm": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/httpntlm/-/httpntlm-1.6.1.tgz",
+      "integrity": "sha1-rQFScUOi6Hc8+uapb1hla7UqNLI=",
+      "dev": true,
+      "requires": {
+        "httpreq": ">=0.4.22",
+        "underscore": "~1.7.0"
+      },
+      "dependencies": {
+        "underscore": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz",
+          "integrity": "sha1-a7rwh3UA02vjTsqlhODbn+8DUgk=",
+          "dev": true
+        }
+      }
+    },
+    "httpreq": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/httpreq/-/httpreq-0.4.24.tgz",
+      "integrity": "sha1-QzX/2CzZaWaKOUZckprGHWOTYn8=",
+      "dev": true
+    },
+    "https-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
+      "dev": true
+    },
+    "https-proxy-agent": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz",
+      "integrity": "sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==",
+      "dev": true,
+      "requires": {
+        "agent-base": "^4.1.0",
+        "debug": "^3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "iconv-lite": {
+      "version": "0.4.19",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
+      "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==",
+      "dev": true
+    },
+    "ieee754": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz",
+      "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==",
+      "dev": true
+    },
+    "iferr": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
+      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
+      "dev": true
+    },
+    "ignore": {
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+      "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
+      "dev": true
+    },
+    "image-size": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
+      "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
+      "dev": true,
+      "optional": true
+    },
+    "immediate": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+      "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=",
+      "dev": true
+    },
+    "import-cwd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
+      "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
+      "dev": true,
+      "requires": {
+        "import-from": "^2.1.0"
+      }
+    },
+    "import-from": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
+      "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
+      "dev": true,
+      "requires": {
+        "resolve-from": "^3.0.0"
+      }
+    },
+    "import-lazy": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
+      "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=",
+      "dev": true
+    },
+    "import-local": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-1.0.0.tgz",
+      "integrity": "sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==",
+      "dev": true,
+      "requires": {
+        "pkg-dir": "^2.0.0",
+        "resolve-cwd": "^2.0.0"
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
+    "in-publish": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
+      "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
+      "dev": true
+    },
+    "indent-string": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+      "dev": true,
+      "requires": {
+        "repeating": "^2.0.0"
+      }
+    },
+    "indexof": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
+      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
+      "dev": true
+    },
+    "inflection": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.12.0.tgz",
+      "integrity": "sha1-ogCTVlbW9fa8TcdQLhrstwMihBY=",
+      "dev": true,
+      "optional": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+    },
+    "ini": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "dev": true
+    },
+    "injection-js": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/injection-js/-/injection-js-2.2.1.tgz",
+      "integrity": "sha512-zHI+E+dM0PXix5FFTO1Y4/UOyAzE7zG1l/QwAn4jchTThOoBq+UYRFK4AVG7lQgFL+go62SbrzSsjXy9DFEZUg==",
+      "dev": true
+    },
+    "inquirer": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.0.6.tgz",
+      "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",
+        "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"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "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"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "internal-ip": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-1.2.0.tgz",
+      "integrity": "sha1-rp+/k7mEh4eF1QqN4bNWlWBYz1w=",
+      "dev": true,
+      "requires": {
+        "meow": "^3.3.0"
+      }
+    },
+    "interpret": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
+      "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=",
+      "dev": true
+    },
+    "intl": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/intl/-/intl-1.2.5.tgz",
+      "integrity": "sha1-giRKIZDE5Bn4Nx9ao02qNCDiq94="
+    },
+    "invariant": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "dev": true,
+      "requires": {
+        "loose-envify": "^1.0.0"
+      }
+    },
+    "invert-kv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
+    },
+    "ip": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
+      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
+      "dev": true
+    },
+    "ipaddr.js": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz",
+      "integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4=",
+      "dev": true
+    },
+    "is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-alphabetical": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.2.tgz",
+      "integrity": "sha512-V0xN4BYezDHcBSKb1QHUFMlR4as/XEuCZBzMJUU4n7+Cbt33SmUnSol+pnXFvLxSHNq2CemUXNdaXV6Flg7+xg==",
+      "dev": true
+    },
+    "is-alphanumeric": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz",
+      "integrity": "sha1-Spzvcdr0wAHB2B1j0UDPU/1oifQ=",
+      "dev": true
+    },
+    "is-alphanumerical": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz",
+      "integrity": "sha512-pyfU/0kHdISIgslFfZN9nfY1Gk3MquQgUm1mJTjdkEPpkAKNWuBTSqFwewOpR7N351VkErCiyV71zX7mlQQqsg==",
+      "dev": true,
+      "requires": {
+        "is-alphabetical": "^1.0.0",
+        "is-decimal": "^1.0.0"
+      }
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
+    },
+    "is-binary-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "requires": {
+        "binary-extensions": "^1.0.0"
+      }
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+    },
+    "is-builtin-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
+      "requires": {
+        "builtin-modules": "^1.0.0"
+      }
+    },
+    "is-callable": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
+      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="
+    },
+    "is-ci": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz",
+      "integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==",
+      "dev": true,
+      "requires": {
+        "ci-info": "^1.0.0"
+      }
+    },
+    "is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-date-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
+    },
+    "is-decimal": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.2.tgz",
+      "integrity": "sha512-TRzl7mOCchnhchN+f3ICUCzYvL9ul7R+TYOsZ8xia++knyZAJfv/uA1FvQXsAnYIl1T3B2X5E/J7Wb1QXiIBXg==",
+      "dev": true
+    },
+    "is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "requires": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
+        }
+      }
+    },
+    "is-directory": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
+      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
+      "dev": true
+    },
+    "is-dotfile": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
+      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
+      "dev": true
+    },
+    "is-equal-shallow": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
+      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
+      "dev": true,
+      "requires": {
+        "is-primitive": "^2.0.0"
+      }
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik="
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
+    },
+    "is-finite": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
+      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
+      "dev": true,
+      "requires": {
+        "number-is-nan": "^1.0.0"
+      }
+    },
+    "is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+    },
+    "is-glob": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
+      "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-hexadecimal": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz",
+      "integrity": "sha512-but/G3sapV3MNyqiDBLrOi4x8uCIw0RY3o/Vb5GT0sMFHrVV7731wFSVy41T5FO1og7G0gXLJh0MkgPRouko/A==",
+      "dev": true
+    },
+    "is-installed-globally": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz",
+      "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=",
+      "dev": true,
+      "requires": {
+        "global-dirs": "^0.1.0",
+        "is-path-inside": "^1.0.0"
+      }
+    },
+    "is-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
+      "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=",
+      "dev": true
+    },
+    "is-my-ip-valid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz",
+      "integrity": "sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==",
+      "dev": true,
+      "optional": true
+    },
+    "is-my-json-valid": {
+      "version": "2.17.2",
+      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz",
+      "integrity": "sha512-IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg==",
+      "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"
+      }
+    },
+    "is-npm": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz",
+      "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=",
+      "dev": true
+    },
+    "is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
+      "dev": true
+    },
+    "is-path-cwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
+      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
+      "dev": true
+    },
+    "is-path-in-cwd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
+      "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
+      "dev": true,
+      "requires": {
+        "is-path-inside": "^1.0.0"
+      }
+    },
+    "is-path-inside": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
+      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
+      "dev": true,
+      "requires": {
+        "path-is-inside": "^1.0.1"
+      }
+    },
+    "is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "dev": true
+    },
+    "is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "is-posix-bracket": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
+      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
+      "dev": true
+    },
+    "is-primitive": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
+      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
+      "dev": true
+    },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+      "dev": true
+    },
+    "is-property": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
+      "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
+      "dev": true,
+      "optional": true
+    },
+    "is-redirect": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
+      "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
+      "dev": true
+    },
+    "is-regex": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "requires": {
+        "has": "^1.0.1"
+      }
+    },
+    "is-retry-allowed": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
+      "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
+      "dev": true
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+    },
+    "is-symbol": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
+      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI="
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
+    },
+    "is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+      "dev": true
+    },
+    "is-whitespace-character": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.2.tgz",
+      "integrity": "sha512-SzM+T5GKUCtLhlHFKt2SDAX2RFzfS6joT91F2/WSi9LxgFdsnhfPK/UIA+JhRR2xuyLdrCys2PiFDrtn1fU5hQ==",
+      "dev": true
+    },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
+    },
+    "is-word-character": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.2.tgz",
+      "integrity": "sha512-T3FlsX8rCHAH8e7RE7PfOPZVFQlcV3XRF9eOOBQ1uf70OxO7CjjSOjeImMPCADBdYWcStAbVbYvJ1m2D3tb+EA==",
+      "dev": true
+    },
+    "is-wsl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0="
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
+    "isbinaryfile": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
+      "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
+      "dev": true,
+      "requires": {
+        "buffer-alloc": "^1.2.0"
+      }
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+    },
+    "isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "dev": true
+    },
+    "istanbul": {
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz",
+      "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
+      "dev": true,
+      "requires": {
+        "abbrev": "1.0.x",
+        "async": "1.x",
+        "escodegen": "1.8.x",
+        "esprima": "2.7.x",
+        "glob": "^5.0.15",
+        "handlebars": "^4.0.1",
+        "js-yaml": "3.x",
+        "mkdirp": "0.5.x",
+        "nopt": "3.x",
+        "once": "1.x",
+        "resolve": "1.1.x",
+        "supports-color": "^3.1.0",
+        "which": "^1.1.1",
+        "wordwrap": "^1.0.0"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "5.0.15",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+          "dev": true,
+          "requires": {
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "2 || 3",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "istanbul-api": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.3.1.tgz",
+      "integrity": "sha512-duj6AlLcsWNwUpfyfHt0nWIeRiZpuShnP40YTxOGQgtaN8fd6JYSxsvxUphTDy8V5MfDXo4s/xVCIIvVCO808g==",
+      "dev": true,
+      "requires": {
+        "async": "^2.1.4",
+        "compare-versions": "^3.1.0",
+        "fileset": "^2.0.2",
+        "istanbul-lib-coverage": "^1.2.0",
+        "istanbul-lib-hook": "^1.2.0",
+        "istanbul-lib-instrument": "^1.10.1",
+        "istanbul-lib-report": "^1.1.4",
+        "istanbul-lib-source-maps": "^1.2.4",
+        "istanbul-reports": "^1.3.0",
+        "js-yaml": "^3.7.0",
+        "mkdirp": "^0.5.1",
+        "once": "^1.4.0"
+      },
+      "dependencies": {
+        "async": {
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
+          "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
+          "dev": true,
+          "requires": {
+            "lodash": "^4.17.10"
+          }
+        }
+      }
+    },
+    "istanbul-instrumenter-loader": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz",
+      "integrity": "sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w==",
+      "dev": true,
+      "requires": {
+        "convert-source-map": "^1.5.0",
+        "istanbul-lib-instrument": "^1.7.3",
+        "loader-utils": "^1.1.0",
+        "schema-utils": "^0.3.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "5.5.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+          "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+          "dev": true,
+          "requires": {
+            "co": "^4.6.0",
+            "fast-deep-equal": "^1.0.0",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.3.0"
+          }
+        },
+        "schema-utils": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
+          "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
+          "dev": true,
+          "requires": {
+            "ajv": "^5.0.0"
+          }
+        }
+      }
+    },
+    "istanbul-lib-coverage": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz",
+      "integrity": "sha512-GvgM/uXRwm+gLlvkWHTjDAvwynZkL9ns15calTrmhGgowlwJBbWMYzWbKqE2DT6JDP1AFXKa+Zi0EkqNCUqY0A==",
+      "dev": true
+    },
+    "istanbul-lib-hook": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.2.1.tgz",
+      "integrity": "sha512-eLAMkPG9FU0v5L02lIkcj/2/Zlz9OuluaXikdr5iStk8FDbSwAixTK9TkYxbF0eNnzAJTwM2fkV2A1tpsIp4Jg==",
+      "dev": true,
+      "requires": {
+        "append-transform": "^1.0.0"
+      }
+    },
+    "istanbul-lib-instrument": {
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.1.tgz",
+      "integrity": "sha512-1dYuzkOCbuR5GRJqySuZdsmsNKPL3PTuyPevQfoCXJePT9C8y1ga75neU+Tuy9+yS3G/dgx8wgOmp2KLpgdoeQ==",
+      "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.0",
+        "semver": "^5.3.0"
+      }
+    },
+    "istanbul-lib-report": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.4.tgz",
+      "integrity": "sha512-Azqvq5tT0U09nrncK3q82e/Zjkxa4tkFZv7E6VcqP0QCPn6oNljDPfrZEC/umNXds2t7b8sRJfs6Kmpzt8m2kA==",
+      "dev": true,
+      "requires": {
+        "istanbul-lib-coverage": "^1.2.0",
+        "mkdirp": "^0.5.1",
+        "path-parse": "^1.0.5",
+        "supports-color": "^3.1.2"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "istanbul-lib-source-maps": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.5.tgz",
+      "integrity": "sha512-8O2T/3VhrQHn0XcJbP1/GN7kXMiRAlPi+fj3uEHrjBD8Oz7Py0prSC25C09NuAZS6bgW1NNKAvCSHZXB0irSGA==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.1.0",
+        "istanbul-lib-coverage": "^1.2.0",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.6.1",
+        "source-map": "^0.5.3"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "istanbul-reports": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.3.0.tgz",
+      "integrity": "sha512-y2Z2IMqE1gefWUaVjrBm0mSKvUkaBy9Vqz8iwr/r40Y9hBbIteH5wqHG/9DLTfJ9xUnUT2j7A3+VVJ6EaYBllA==",
+      "dev": true,
+      "requires": {
+        "handlebars": "^4.0.3"
+      }
+    },
+    "jasmine": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.8.0.tgz",
+      "integrity": "sha1-awicChFXax8W3xG4AUbZHU6Lij4=",
+      "dev": true,
+      "requires": {
+        "exit": "^0.1.2",
+        "glob": "^7.0.6",
+        "jasmine-core": "~2.8.0"
+      }
+    },
+    "jasmine-ajax": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/jasmine-ajax/-/jasmine-ajax-3.2.0.tgz",
+      "integrity": "sha1-ChYAt9PFA6OQT4Bnm4Z5hahOR1Y=",
+      "dev": true
+    },
+    "jasmine-core": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.8.0.tgz",
+      "integrity": "sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=",
+      "dev": true
+    },
+    "jasmine-diff": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/jasmine-diff/-/jasmine-diff-0.1.3.tgz",
+      "integrity": "sha1-k8zC3MQQKMXd1GBlWAdIOfLe6qg=",
+      "dev": true,
+      "requires": {
+        "diff": "^3.2.0"
+      }
+    },
+    "jasmine-reporters": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/jasmine-reporters/-/jasmine-reporters-2.3.2.tgz",
+      "integrity": "sha512-u/7AT9SkuZsUfFBLLzbErohTGNsEUCKaQbsVYnLFW1gEuL2DzmBL4n8v90uZsqIqlWvWUgian8J6yOt5Fyk/+A==",
+      "dev": true,
+      "requires": {
+        "mkdirp": "^0.5.1",
+        "xmldom": "^0.1.22"
+      }
+    },
+    "jasmine-spec-reporter": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz",
+      "integrity": "sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==",
+      "dev": true,
+      "requires": {
+        "colors": "1.1.2"
+      }
+    },
+    "jasmine2-protractor-utils": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/jasmine2-protractor-utils/-/jasmine2-protractor-utils-1.1.3.tgz",
+      "integrity": "sha1-QdJ6+qSiWjNV0IIeMRPnZFX8Q7U=",
+      "dev": true,
+      "requires": {
+        "mkdirp": "^0.5.1",
+        "q": "^1.4.1"
+      }
+    },
+    "jasminewd2": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-2.2.0.tgz",
+      "integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=",
+      "dev": true
+    },
+    "js-base64": {
+      "version": "2.4.8",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.8.tgz",
+      "integrity": "sha512-hm2nYpDrwoO/OzBhdcqs/XGT6XjSuSSCVEpia+Kl2J6x4CYt5hISlVL/AYU1khoDXv0AQVgxtdJySb9gjAn56Q==",
+      "dev": true
+    },
+    "js-beautify": {
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.7.5.tgz",
+      "integrity": "sha512-9OhfAqGOrD7hoQBLJMTA+BKuKmoEtTJXzZ7WDF/9gvjtey1koVLuZqIY6c51aPDjbNdNtIXAkiWKVhziawE9Og==",
+      "dev": true,
+      "requires": {
+        "config-chain": "~1.1.5",
+        "editorconfig": "^0.13.2",
+        "mkdirp": "~0.5.0",
+        "nopt": "~3.0.1"
+      }
+    },
+    "js-tokens": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
+      "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
+      "dev": true,
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+          "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+          "dev": true
+        }
+      }
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "dev": true,
+      "optional": true
+    },
+    "jsesc": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0="
+    },
+    "json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+      "dev": true
+    },
+    "json-schema-migrate": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/json-schema-migrate/-/json-schema-migrate-0.2.0.tgz",
+      "integrity": "sha1-ukelsAcvxyOWRg4b1gtE1SF4u8Y=",
+      "dev": true,
+      "requires": {
+        "ajv": "^5.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "5.5.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+          "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+          "dev": true,
+          "requires": {
+            "co": "^4.6.0",
+            "fast-deep-equal": "^1.0.0",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.3.0"
+          }
+        }
+      }
+    },
+    "json-schema-traverse": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
+    },
+    "json-stable-stringify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
+      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
+      "dev": true,
+      "requires": {
+        "jsonify": "~0.0.0"
+      }
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true
+    },
+    "json3": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
+      "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
+      "dev": true
+    },
+    "json5": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE="
+    },
+    "jsonfile": {
+      "version": "4.0.0",
+      "resolved": "http://localhost:4873/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "jsonify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
+    },
+    "jsonpointer": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
+      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
+      "dev": true,
+      "optional": true
+    },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
+    "jszip": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.1.5.tgz",
+      "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"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz",
+          "integrity": "sha1-+rg/uwstjchfpjbEudNMdUIMbWU=",
+          "dev": true
+        },
+        "es6-promise": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz",
+          "integrity": "sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y=",
+          "dev": true
+        },
+        "process-nextick-args": {
+          "version": "1.0.7",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+          "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.0.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
+          "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"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        }
+      }
+    },
+    "karma": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-2.0.5.tgz",
+      "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",
+        "socket.io": "2.0.4",
+        "source-map": "^0.6.1",
+        "tmp": "0.0.33",
+        "useragent": "2.2.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "karma-chrome-launcher": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz",
+      "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==",
+      "dev": true,
+      "requires": {
+        "fs-access": "^1.0.0",
+        "which": "^1.2.1"
+      }
+    },
+    "karma-cli": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/karma-cli/-/karma-cli-1.0.1.tgz",
+      "integrity": "sha1-rmw8WKMTodALRRZMRVubhs4X+WA=",
+      "dev": true,
+      "requires": {
+        "resolve": "^1.1.6"
+      }
+    },
+    "karma-coverage": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-1.1.2.tgz",
+      "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"
+      }
+    },
+    "karma-coverage-istanbul-reporter": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-1.4.3.tgz",
+      "integrity": "sha1-O13/RmT6W41RlrmInj9hwforgNk=",
+      "dev": true,
+      "requires": {
+        "istanbul-api": "^1.3.1",
+        "minimatch": "^3.0.4"
+      }
+    },
+    "karma-jasmine": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-1.1.2.tgz",
+      "integrity": "sha1-OU8rJf+0pkS5rabyLUQ+L9CIhsM=",
+      "dev": true
+    },
+    "karma-jasmine-ajax": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/karma-jasmine-ajax/-/karma-jasmine-ajax-0.1.13.tgz",
+      "integrity": "sha1-eLuS2Jb+MqJaGACYxHci4dlgW/w=",
+      "dev": true,
+      "requires": {
+        "jasmine-ajax": "^3.0.0"
+      }
+    },
+    "karma-jasmine-html-reporter": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-0.2.2.tgz",
+      "integrity": "sha1-SKjl7xiAdhfuK14zwRlMNbQ5Ukw=",
+      "dev": true,
+      "requires": {
+        "karma-jasmine": "^1.0.2"
+      }
+    },
+    "karma-mocha-reporter": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/karma-mocha-reporter/-/karma-mocha-reporter-2.2.5.tgz",
+      "integrity": "sha1-FRIAlejtgZGG5HoLAS8810GJVWA=",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.1.0",
+        "log-symbols": "^2.1.0",
+        "strip-ansi": "^4.0.0"
+      }
+    },
+    "karma-remap-istanbul": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/karma-remap-istanbul/-/karma-remap-istanbul-0.6.0.tgz",
+      "integrity": "sha1-l/O3cAZSVPm0ck8tm+SjouG69vw=",
+      "dev": true,
+      "requires": {
+        "istanbul": "^0.4.3",
+        "remap-istanbul": "^0.9.0"
+      },
+      "dependencies": {
+        "process-nextick-args": {
+          "version": "1.0.7",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+          "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.0.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
+          "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"
+          }
+        },
+        "remap-istanbul": {
+          "version": "0.9.6",
+          "resolved": "https://registry.npmjs.org/remap-istanbul/-/remap-istanbul-0.9.6.tgz",
+          "integrity": "sha512-l0WDBsVjaTzP8m3glERJO6bjlAFUahcgfcgvcX+owZw7dKeDLT3CVRpS7UO4L9LfGcMiNsqk223HopwVxlh8Hg==",
+          "dev": true,
+          "requires": {
+            "amdefine": "^1.0.0",
+            "gulp-util": "3.0.7",
+            "istanbul": "0.4.5",
+            "minimatch": "^3.0.3",
+            "source-map": "^0.6.1",
+            "through2": "2.0.1"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        },
+        "through2": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz",
+          "integrity": "sha1-OE51MU1J8y3hLuu4E2uOtrXVnak=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "~2.0.0",
+            "xtend": "~4.0.0"
+          }
+        }
+      }
+    },
+    "karma-source-map-support": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.3.0.tgz",
+      "integrity": "sha512-HcPqdAusNez/ywa+biN4EphGz62MmQyPggUsDfsHqa7tSe4jdsxgvTKuDfIazjL+IOxpVWyT7Pr4dhAV+sxX5Q==",
+      "dev": true,
+      "requires": {
+        "source-map-support": "^0.5.5"
+      }
+    },
+    "karma-systemjs": {
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/karma-systemjs/-/karma-systemjs-0.16.0.tgz",
+      "integrity": "sha1-/iyB+vpkm8j9DuyMxba9dRXB8V0=",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.16.2",
+        "minimatch": "^3.0.0"
+      }
+    },
+    "killable": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.0.tgz",
+      "integrity": "sha1-2ouEvUfeU5WHj5XWTQLyRJ/gXms=",
+      "dev": true
+    },
+    "kind-of": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+    },
+    "latest-version": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz",
+      "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=",
+      "dev": true,
+      "requires": {
+        "package-json": "^4.0.0"
+      }
+    },
+    "lazy-cache": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
+      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
+      "dev": true
+    },
+    "lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+      "requires": {
+        "invert-kv": "^1.0.0"
+      }
+    },
+    "leb": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/leb/-/leb-0.3.0.tgz",
+      "integrity": "sha1-Mr7p+tFoMo1q6oUi2DP0GA7tHaM=",
+      "dev": true
+    },
+    "less": {
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/less/-/less-3.8.1.tgz",
+      "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"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "less-loader": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-4.1.0.tgz",
+      "integrity": "sha512-KNTsgCE9tMOM70+ddxp9yyt9iHqgmSs0yTZc5XH5Wo+g80RWRIYNqE58QJKm/yMud5wZEvz50ugRDuzVIkyahg==",
+      "dev": true,
+      "requires": {
+        "clone": "^2.1.1",
+        "loader-utils": "^1.1.0",
+        "pify": "^3.0.0"
+      }
+    },
+    "levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      }
+    },
+    "libbase64": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz",
+      "integrity": "sha1-YjUag5VjrF/1vSbxL2Dpgwu3UeY=",
+      "dev": true
+    },
+    "libmime": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/libmime/-/libmime-3.0.0.tgz",
+      "integrity": "sha1-UaGp50SOy9Ms2lRCFnW7IbwJPaY=",
+      "dev": true,
+      "requires": {
+        "iconv-lite": "0.4.15",
+        "libbase64": "0.1.0",
+        "libqp": "1.1.0"
+      },
+      "dependencies": {
+        "iconv-lite": {
+          "version": "0.4.15",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz",
+          "integrity": "sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es=",
+          "dev": true
+        }
+      }
+    },
+    "libqp": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz",
+      "integrity": "sha1-9ebgatdLeU+1tbZpiL9yjvHe2+g=",
+      "dev": true
+    },
+    "license-webpack-plugin": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-1.4.0.tgz",
+      "integrity": "sha512-iwuNFMWbXS76WiQXJBTs8/7Tby4NQnY8AIkBMuJG5El79UT8zWrJQMfpW+KRXt4Y2Bs5uk+Myg/MO7ROSF8jzA==",
+      "dev": true,
+      "requires": {
+        "ejs": "^2.5.7"
+      }
+    },
+    "lie": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
+      "integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=",
+      "dev": true,
+      "requires": {
+        "immediate": "~3.0.5"
+      }
+    },
+    "linkify-it": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.0.3.tgz",
+      "integrity": "sha1-2UpGSPmxwXnWT6lykSaL22zpQ08=",
+      "dev": true,
+      "requires": {
+        "uc.micro": "^1.0.1"
+      }
+    },
+    "list-item": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/list-item/-/list-item-1.1.1.tgz",
+      "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"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "is-number": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
+          "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "load-json-file": {
+      "version": "4.0.0",
+      "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"
+      }
+    },
+    "loader-runner": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz",
+      "integrity": "sha1-9IKuqC1UPgeSFwDVpG7yb9rGuKI=",
+      "dev": true
+    },
+    "loader-utils": {
+      "version": "1.1.0",
+      "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"
+      }
+    },
+    "locate-path": {
+      "version": "2.0.0",
+      "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"
+      }
+    },
+    "lodash": {
+      "version": "4.17.10",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
+      "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==",
+      "dev": true
+    },
+    "lodash._basecopy": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
+      "dev": true
+    },
+    "lodash._basetostring": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
+      "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=",
+      "dev": true
+    },
+    "lodash._basevalues": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
+      "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
+      "dev": true
+    },
+    "lodash._getnative": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
+      "dev": true
+    },
+    "lodash._isiterateecall": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
+      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
+      "dev": true
+    },
+    "lodash._reescape": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
+      "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=",
+      "dev": true
+    },
+    "lodash._reevaluate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
+      "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=",
+      "dev": true
+    },
+    "lodash._reinterpolate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
+      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
+      "dev": true
+    },
+    "lodash._root": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
+      "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
+      "dev": true
+    },
+    "lodash.assign": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
+      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
+      "dev": true
+    },
+    "lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+      "dev": true
+    },
+    "lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
+    },
+    "lodash.differencewith": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.differencewith/-/lodash.differencewith-4.5.0.tgz",
+      "integrity": "sha1-uvr7yRi1UVTheRdqALsK76rIVLc=",
+      "dev": true
+    },
+    "lodash.escape": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
+      "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
+      "dev": true,
+      "requires": {
+        "lodash._root": "^3.0.0"
+      }
+    },
+    "lodash.flatten": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
+      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
+      "dev": true
+    },
+    "lodash.isarguments": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
+      "dev": true
+    },
+    "lodash.isarray": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
+      "dev": true
+    },
+    "lodash.keys": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
+      "dev": true,
+      "requires": {
+        "lodash._getnative": "^3.0.0",
+        "lodash.isarguments": "^3.0.0",
+        "lodash.isarray": "^3.0.0"
+      }
+    },
+    "lodash.mergewith": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz",
+      "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==",
+      "dev": true
+    },
+    "lodash.restparam": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
+      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
+      "dev": true
+    },
+    "lodash.tail": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz",
+      "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=",
+      "dev": true
+    },
+    "lodash.template": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
+      "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.templatesettings": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
+      "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
+      "dev": true,
+      "requires": {
+        "lodash._reinterpolate": "^3.0.0",
+        "lodash.escape": "^3.0.0"
+      }
+    },
+    "log-symbols": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
+      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.0.1"
+      }
+    },
+    "log4js": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-2.11.0.tgz",
+      "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",
+        "streamroller": "0.7.0"
+      },
+      "dependencies": {
+        "axios": {
+          "version": "0.15.3",
+          "resolved": "https://registry.npmjs.org/axios/-/axios-0.15.3.tgz",
+          "integrity": "sha1-LJ1jiy4ZGgjqHWzJiOrda6W9wFM=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "follow-redirects": "1.0.0"
+          }
+        },
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "follow-redirects": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.0.0.tgz",
+          "integrity": "sha1-jjQpjL0uF28lTv/sdaHHjMhJ/Tc=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "^2.2.0"
+          },
+          "dependencies": {
+            "debug": {
+              "version": "2.6.9",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+              "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "ms": "2.0.0"
+              }
+            }
+          }
+        },
+        "semver": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
+          "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
+          "dev": true
+        }
+      }
+    },
+    "loggly": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/loggly/-/loggly-1.1.1.tgz",
+      "integrity": "sha1-Cg/B0/o6XsRP3HuJe+uipGlc6+4=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "json-stringify-safe": "5.0.x",
+        "request": "2.75.x",
+        "timespan": "2.3.x"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true,
+          "optional": true
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true,
+          "optional": true
+        },
+        "assert-plus": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
+          "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
+          "dev": true,
+          "optional": true
+        },
+        "aws-sign2": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+          "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
+          "dev": true,
+          "optional": true
+        },
+        "caseless": {
+          "version": "0.11.0",
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
+          "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
+          "dev": true,
+          "optional": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "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"
+          }
+        },
+        "form-data": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz",
+          "integrity": "sha1-bwrrrcxdoWwT4ezBETfYX5uIOyU=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.5",
+            "mime-types": "^2.1.11"
+          }
+        },
+        "har-validator": {
+          "version": "2.0.6",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
+          "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
+          "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"
+          }
+        },
+        "http-signature": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+          "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "^0.2.0",
+            "jsprim": "^1.2.2",
+            "sshpk": "^1.7.0"
+          }
+        },
+        "node-uuid": {
+          "version": "1.4.8",
+          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
+          "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=",
+          "dev": true,
+          "optional": true
+        },
+        "qs": {
+          "version": "6.2.3",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz",
+          "integrity": "sha1-HPyyXBCpsrSDBT/zn138kjOQjP4=",
+          "dev": true,
+          "optional": true
+        },
+        "request": {
+          "version": "2.75.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.75.0.tgz",
+          "integrity": "sha1-0rgmiihtoT6qXQGt9dGMyQ9lfZM=",
+          "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"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true,
+          "optional": true
+        },
+        "tunnel-agent": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "loglevel": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.1.tgz",
+      "integrity": "sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=",
+      "dev": true
+    },
+    "loglevelnext": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/loglevelnext/-/loglevelnext-1.0.5.tgz",
+      "integrity": "sha512-V/73qkPuJmx4BcBF19xPBr+0ZRVBhc4POxvZTZdMeXpJ4NItXSJ/MSwuFT0kQJlCbXvdlZoQQ/418bS1y9Jh6A==",
+      "dev": true,
+      "requires": {
+        "es6-symbol": "^3.1.1",
+        "object.assign": "^4.1.0"
+      }
+    },
+    "long": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz",
+      "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=",
+      "dev": true
+    },
+    "longest": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
+      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
+      "dev": true
+    },
+    "longest-streak": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.2.tgz",
+      "integrity": "sha512-TmYTeEYxiAmSVdpbnQDXGtvYOIRsCMg89CVZzwzc2o7GFL1CjoiRPjH5ec0NFAVlAx3fVof9dX/t6KKRAo2OWA==",
+      "dev": true
+    },
+    "loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dev": true,
+      "requires": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      }
+    },
+    "loud-rejection": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
+      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
+      "dev": true,
+      "requires": {
+        "currently-unhandled": "^0.4.1",
+        "signal-exit": "^3.0.0"
+      }
+    },
+    "lower-case": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
+      "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
+      "dev": true
+    },
+    "lowercase-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+      "dev": true
+    },
+    "lru-cache": {
+      "version": "4.1.3",
+      "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"
+      }
+    },
+    "magic-string": {
+      "version": "0.22.5",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz",
+      "integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==",
+      "dev": true,
+      "requires": {
+        "vlq": "^0.2.2"
+      }
+    },
+    "mailcomposer": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.1.tgz",
+      "integrity": "sha1-DhxEsqB890DuF9wUm6AJ8Zyt/rQ=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "buildmail": "4.0.1",
+        "libmime": "3.0.0"
+      }
+    },
+    "mailgun-js": {
+      "version": "0.18.1",
+      "resolved": "https://registry.npmjs.org/mailgun-js/-/mailgun-js-0.18.1.tgz",
+      "integrity": "sha512-lvuMP14u24HS2uBsJEnzSyPMxzU2b99tQsIx1o6QNjqxjk8b3WvR+vq5oG1mjqz/IBYo+5gF+uSoDS0RkMVHmg==",
+      "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"
+      },
+      "dependencies": {
+        "async": {
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
+          "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "lodash": "^4.17.10"
+          }
+        },
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "make-dir": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+      "dev": true,
+      "requires": {
+        "pify": "^3.0.0"
+      }
+    },
+    "make-error": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.4.tgz",
+      "integrity": "sha512-0Dab5btKVPhibSalc9QGXb559ED7G7iLjFXBaj9Wq8O3vorueR5K5jaE3hkG6ZQINyhA/JgG6Qk4qdFQjsYV6g==",
+      "dev": true
+    },
+    "map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8="
+    },
+    "map-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+      "dev": true
+    },
+    "map-stream": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
+      "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ="
+    },
+    "map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "requires": {
+        "object-visit": "^1.0.0"
+      }
+    },
+    "markdown-escapes": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.2.tgz",
+      "integrity": "sha512-lbRZ2mE3Q9RtLjxZBZ9+IMl68DKIXaVAhwvwn9pmjnPLS0h/6kyBMgNhqi1xFJ/2yv6cSyv0jbiZavZv93JkkA==",
+      "dev": true
+    },
+    "markdown-it": {
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.2.tgz",
+      "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"
+      }
+    },
+    "markdown-link": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/markdown-link/-/markdown-link-0.1.1.tgz",
+      "integrity": "sha1-MsXGUZmmRXMWMi0eQinRNAfIx88=",
+      "dev": true
+    },
+    "markdown-table": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-1.1.2.tgz",
+      "integrity": "sha512-NcWuJFHDA8V3wkDgR/j4+gZx+YQwstPgfQDV8ndUeWWzta3dnDTBxpVzqS9lkmJAuV5YX35lmyojl6HO5JXAgw==",
+      "dev": true
+    },
+    "markdown-toc": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/markdown-toc/-/markdown-toc-1.1.0.tgz",
+      "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"
+      },
+      "dependencies": {
+        "lazy-cache": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz",
+          "integrity": "sha1-uRkKT5EzVGlIQIWfio9whNiCImQ=",
+          "dev": true,
+          "requires": {
+            "set-getter": "^0.1.0"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
+    "markdownlint": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.11.0.tgz",
+      "integrity": "sha512-wE5WdKD6zW2DQaPQ5TFBTXh5j76DnWd/IFffnDQgHmi6Y61DJXBDfLftZ/suJHuv6cwPjM6gKw2GaRLJMOR+Mg==",
+      "dev": true,
+      "requires": {
+        "markdown-it": "8.4.2"
+      }
+    },
+    "markdownlint-cli": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.12.0.tgz",
+      "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"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.9.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
+          "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
+          "dev": true,
+          "requires": {
+            "graceful-readlink": ">= 1.0.0"
+          }
+        },
+        "esprima": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+          "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+          "dev": true
+        },
+        "get-stdin": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz",
+          "integrity": "sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=",
+          "dev": true
+        },
+        "glob": {
+          "version": "7.0.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
+          "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.2",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "js-yaml": {
+          "version": "3.11.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz",
+          "integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==",
+          "dev": true,
+          "requires": {
+            "argparse": "^1.0.7",
+            "esprima": "^4.0.0"
+          }
+        }
+      }
+    },
+    "marked": {
+      "version": "0.3.19",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz",
+      "integrity": "sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg==",
+      "dev": true
+    },
+    "math-random": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz",
+      "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=",
+      "dev": true
+    },
+    "md5.js": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
+      "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
+      "dev": true,
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "mdast-comment-marker": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/mdast-comment-marker/-/mdast-comment-marker-1.0.2.tgz",
+      "integrity": "sha1-Hd8O+BH7UkOQF8jSwLkiA18rp0o=",
+      "dev": true
+    },
+    "mdast-util-compact": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-1.0.1.tgz",
+      "integrity": "sha1-zbX4TitqLTEU3zO9BdnLMuPECDo=",
+      "dev": true,
+      "requires": {
+        "unist-util-modify-children": "^1.0.0",
+        "unist-util-visit": "^1.1.0"
+      }
+    },
+    "mdast-util-heading-range": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-heading-range/-/mdast-util-heading-range-2.1.0.tgz",
+      "integrity": "sha1-0Pq3tCYbyg2Al8rebSChcpLrTDQ=",
+      "dev": true,
+      "requires": {
+        "mdast-util-to-string": "^1.0.0"
+      }
+    },
+    "mdast-util-to-string": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-1.0.4.tgz",
+      "integrity": "sha1-XEVch4yTVfDB5/PotxnPWDaRrPs=",
+      "dev": true
+    },
+    "mdast-util-toc": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-toc/-/mdast-util-toc-2.0.1.tgz",
+      "integrity": "sha1-sdLLI7+wH4Evp7Vb/+iwqL7fbyE=",
+      "dev": true,
+      "requires": {
+        "github-slugger": "^1.1.1",
+        "mdast-util-to-string": "^1.0.2",
+        "unist-util-visit": "^1.1.0"
+      }
+    },
+    "mdast-zone": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-zone/-/mdast-zone-3.0.1.tgz",
+      "integrity": "sha1-PqMacZwZdlKUoTorYH91uH6sQro=",
+      "dev": true,
+      "requires": {
+        "mdast-comment-marker": "^1.0.1",
+        "unist-util-visit": "^1.0.0"
+      }
+    },
+    "mdurl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
+      "dev": true
+    },
+    "media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+      "dev": true
+    },
+    "mem": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
+      "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
+      "requires": {
+        "mimic-fn": "^1.0.0"
+      }
+    },
+    "memory-fs": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "dev": true,
+      "requires": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "memorystream": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
+      "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI="
+    },
+    "meow": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+      "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"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
+    "merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
+      "dev": true
+    },
+    "merge-stream": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
+      "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
+    },
+    "micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "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"
+      }
+    },
+    "miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      }
+    },
+    "mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
+    },
+    "mime-db": {
+      "version": "1.35.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz",
+      "integrity": "sha512-JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg=="
+    },
+    "mime-types": {
+      "version": "2.1.19",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz",
+      "integrity": "sha512-P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==",
+      "requires": {
+        "mime-db": "~1.35.0"
+      }
+    },
+    "mimic-fn": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
+    },
+    "mini-css-extract-plugin": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.1.tgz",
+      "integrity": "sha512-XWuB3G61Rtasq/gLe7cp5cuozehE6hN+E4sxCamRR/WDiHTg+f7ZIAS024r8UJQffY+e2gGELXQZgQoFDfNDCg==",
+      "dev": true,
+      "requires": {
+        "@webpack-contrib/schema-utils": "^1.0.0-beta.0",
+        "loader-utils": "^1.1.0",
+        "webpack-sources": "^1.1.0"
+      }
+    },
+    "minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
+    },
+    "minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimatch-browser": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/minimatch-browser/-/minimatch-browser-1.0.0.tgz",
+      "integrity": "sha512-xET0irkHzT47f9h16H6ZVZw9lFZ33pK5DD5Pt0Gt/PcXAlevXjCz8zzM859gIWEDcD2yjKa31dGfwlKgk/12NQ==",
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+      "dev": true
+    },
+    "mississippi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz",
+      "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"
+      }
+    },
+    "mixin-deep": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
+      "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+      "requires": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "mixin-object": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
+      "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
+      "dev": true,
+      "requires": {
+        "for-in": "^0.1.3",
+        "is-extendable": "^0.1.1"
+      },
+      "dependencies": {
+        "for-in": {
+          "version": "0.1.8",
+          "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
+          "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=",
+          "dev": true
+        }
+      }
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "dev": true,
+      "requires": {
+        "minimist": "0.0.8"
+      }
+    },
+    "moment": {
+      "version": "2.22.2",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz",
+      "integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y="
+    },
+    "moment-es6": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/moment-es6/-/moment-es6-1.0.0.tgz",
+      "integrity": "sha1-VS/PQF1iVlsKH+hObB5peseTMt8=",
+      "requires": {
+        "moment": "*"
+      }
+    },
+    "move-concurrently": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
+      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1",
+        "copy-concurrently": "^1.0.0",
+        "fs-write-stream-atomic": "^1.0.8",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.3"
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
+    "multicast-dns": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
+      "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
+      "dev": true,
+      "requires": {
+        "dns-packet": "^1.3.1",
+        "thunky": "^1.0.2"
+      }
+    },
+    "multicast-dns-service-types": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
+      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
+      "dev": true
+    },
+    "multipipe": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
+      "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
+      "dev": true,
+      "requires": {
+        "duplexer2": "0.0.2"
+      }
+    },
+    "mute-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
+      "dev": true
+    },
+    "nan": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
+      "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="
+    },
+    "nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "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"
+      }
+    },
+    "nconf": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/nconf/-/nconf-0.10.0.tgz",
+      "integrity": "sha512-fKiXMQrpP7CYWJQzKkPPx9hPgmq+YLDyxcG9N8RpiE9FoCkCbzD0NyW0YhE3xn3Aupe7nnDeIx4PFzYehpHT9Q==",
+      "dev": true,
+      "requires": {
+        "async": "^1.4.0",
+        "ini": "^1.3.0",
+        "secure-keys": "^1.0.0",
+        "yargs": "^3.19.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "camelcase": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+          "dev": true
+        },
+        "cliui": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+          "dev": true,
+          "requires": {
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1",
+            "wrap-ansi": "^2.0.0"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "dev": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "os-locale": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+          "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+          "dev": true,
+          "requires": {
+            "lcid": "^1.0.0"
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "dev": true,
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "window-size": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz",
+          "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=",
+          "dev": true
+        },
+        "yargs": {
+          "version": "3.32.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz",
+          "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"
+          }
+        }
+      }
+    },
+    "negotiator": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
+      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
+      "dev": true
+    },
+    "neo-async": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.5.1.tgz",
+      "integrity": "sha512-3KL3fvuRkZ7s4IFOMfztb7zJp3QaVWnBeGoJlgB38XnCRPj/0tLzzLG5IB8NYOHbJ8g8UGrgZv44GLDk6CxTxA==",
+      "dev": true
+    },
+    "netmask": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/netmask/-/netmask-1.0.6.tgz",
+      "integrity": "sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU=",
+      "dev": true,
+      "optional": true
+    },
+    "next-tick": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw="
+    },
+    "ng-packagr": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/ng-packagr/-/ng-packagr-4.0.1.tgz",
+      "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"
+      },
+      "dependencies": {
+        "autoprefixer": {
+          "version": "9.1.0",
+          "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.1.0.tgz",
+          "integrity": "sha512-BbAIdxNdptG/x4DiGGfpkDVYyqu4nUyNdBB0Utr49Gn3+0RERV1MdHik2FSbbWwhMAuk1KrfVJHe7nEMheGdBA==",
+          "dev": true,
+          "requires": {
+            "browserslist": "^4.0.1",
+            "caniuse-lite": "^1.0.30000872",
+            "normalize-range": "^0.1.2",
+            "num2fraction": "^1.2.2",
+            "postcss": "^7.0.2",
+            "postcss-value-parser": "^3.2.3"
+          }
+        },
+        "browserslist": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.0.1.tgz",
+          "integrity": "sha512-QqiiIWchEIkney3wY53/huI7ZErouNAdvOkjorUALAwRcu3tEwOV3Sh6He0DnP38mz1JjBpCBb50jQBmaYuHPw==",
+          "dev": true,
+          "requires": {
+            "caniuse-lite": "^1.0.30000865",
+            "electron-to-chromium": "^1.3.52",
+            "node-releases": "^1.0.0-alpha.10"
+          }
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "fs-extra": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.0.tgz",
+          "integrity": "sha512-EglNDLRpmaTWiD/qraZn6HREAEAHJcJOmxNEYwq6xeMKnVMAy3GUcFB+wXt2C6k4CNvB/mP1y/U3dzvKKj5OtQ==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.0.0.tgz",
+          "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz",
+          "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==",
+          "dev": true
+        },
+        "postcss": {
+          "version": "7.0.2",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.2.tgz",
+          "integrity": "sha512-fmaUY5370keLUTx+CnwRxtGiuFTcNBLQBqr1oE3WZ/euIYmGAo0OAgOhVJ3ByDnVmOR3PK+0V9VebzfjRIUcqw==",
+          "dev": true,
+          "requires": {
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz",
+          "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==",
+          "dev": true,
+          "requires": {
+            "find-up": "^3.0.0",
+            "read-pkg": "^3.0.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "ng2-charts": {
+      "version": "1.6.0",
+      "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"
+      },
+      "dependencies": {
+        "chart.js": {
+          "version": "2.7.2",
+          "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.7.2.tgz",
+          "integrity": "sha512-90wl3V9xRZ8tnMvMlpcW+0Yg13BelsGS9P9t0ClaDxv/hdypHDr/YAGf+728m11P5ljwyB0ZHfPKCapZFqSqYA==",
+          "requires": {
+            "chartjs-color": "^2.1.0",
+            "moment": "^2.10.2"
+          }
+        }
+      }
+    },
+    "ngx-monaco-editor": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ngx-monaco-editor/-/ngx-monaco-editor-5.0.0.tgz",
+      "integrity": "sha512-95MARPggYrpwk0Sf6IisaOw82Y/FQ5084kdX6vGzMLmaNnz4Dg2Uo/WoYTnbV+1299VMwdS0RgtQiZPhKlD/kQ=="
+    },
+    "nice-try": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.4.tgz",
+      "integrity": "sha512-2NpiFHqC87y/zFke0fC0spBXL3bBsoh/p5H1EFhshxjCR5+0g2d6BiXbUFz9v1sAcxsk2htp2eQnNIci2dIYcA==",
+      "dev": true
+    },
+    "no-case": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
+      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
+      "dev": true,
+      "requires": {
+        "lower-case": "^1.1.1"
+      }
+    },
+    "node-ensure": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/node-ensure/-/node-ensure-0.0.0.tgz",
+      "integrity": "sha1-7K52QVDemYYexcgQ/V0Jaxg5Mqc="
+    },
+    "node-fetch": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.6.3.tgz",
+      "integrity": "sha1-3CNO3WSJmC1Y6PDbT2lQKavNjAQ=",
+      "dev": true,
+      "requires": {
+        "encoding": "^0.1.11",
+        "is-stream": "^1.0.1"
+      }
+    },
+    "node-forge": {
+      "version": "0.7.5",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz",
+      "integrity": "sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==",
+      "dev": true
+    },
+    "node-gyp": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.7.0.tgz",
+      "integrity": "sha512-qDQE/Ft9xXP6zphwx4sD0t+VhwV7yFaloMpfbL2QnnDZcyaiakWlLdtFGGQfTAwpFHdpbRhRxVhIHN1OKAjgbg==",
+      "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.9.0 <2.82.0",
+        "rimraf": "2",
+        "semver": "~5.3.0",
+        "tar": "^2.0.0",
+        "which": "1"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "4.11.8",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
+          "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
+          "dev": true,
+          "requires": {
+            "co": "^4.6.0",
+            "json-stable-stringify": "^1.0.1"
+          }
+        },
+        "assert-plus": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
+          "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
+          "dev": true
+        },
+        "aws-sign2": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+          "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
+          "dev": true
+        },
+        "form-data": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+          "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+          "dev": true,
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.5",
+            "mime-types": "^2.1.12"
+          }
+        },
+        "har-schema": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
+          "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
+          "dev": true
+        },
+        "har-validator": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
+          "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
+          "dev": true,
+          "requires": {
+            "ajv": "^4.9.1",
+            "har-schema": "^1.0.5"
+          }
+        },
+        "http-signature": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+          "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+          "dev": true,
+          "requires": {
+            "assert-plus": "^0.2.0",
+            "jsprim": "^1.2.2",
+            "sshpk": "^1.7.0"
+          }
+        },
+        "performance-now": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
+          "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
+          "dev": true
+        },
+        "qs": {
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
+          "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
+          "dev": true
+        },
+        "request": {
+          "version": "2.81.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
+          "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
+          "dev": true,
+          "requires": {
+            "aws-sign2": "~0.6.0",
+            "aws4": "^1.2.1",
+            "caseless": "~0.12.0",
+            "combined-stream": "~1.0.5",
+            "extend": "~3.0.0",
+            "forever-agent": "~0.6.1",
+            "form-data": "~2.1.1",
+            "har-validator": "~4.2.1",
+            "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",
+            "oauth-sign": "~0.8.1",
+            "performance-now": "^0.2.0",
+            "qs": "~6.4.0",
+            "safe-buffer": "^5.0.1",
+            "stringstream": "~0.0.4",
+            "tough-cookie": "~2.3.0",
+            "tunnel-agent": "^0.6.0",
+            "uuid": "^3.0.0"
+          }
+        },
+        "semver": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
+          "dev": true
+        }
+      }
+    },
+    "node-libs-browser": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz",
+      "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",
+        "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",
+        "tty-browserify": "0.0.0",
+        "url": "^0.11.0",
+        "util": "^0.10.3",
+        "vm-browserify": "0.0.4"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+          "dev": true
+        }
+      }
+    },
+    "node-releases": {
+      "version": "1.0.0-alpha.10",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.0.0-alpha.10.tgz",
+      "integrity": "sha512-BSQrRgOfN6L/MoKIa7pRUc7dHvflCXMcqyTBvphixcSsgJTuUd24vAFONuNfVsuwTyz28S1HEc9XN6ZKylk4Hg==",
+      "dev": true,
+      "requires": {
+        "semver": "^5.3.0"
+      }
+    },
+    "node-sass": {
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.9.2.tgz",
+      "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",
+        "request": "2.87.0",
+        "sass-graph": "^2.2.4",
+        "stdout-stream": "^1.4.0",
+        "true-case-path": "^1.0.2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "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"
+          }
+        },
+        "cross-spawn": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
+          "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^4.0.1",
+            "which": "^1.2.9"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "node-sass-tilde-importer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/node-sass-tilde-importer/-/node-sass-tilde-importer-1.0.2.tgz",
+      "integrity": "sha512-Swcmr38Y7uB78itQeBm3mThjxBy9/Ah/ykPIaURY/L6Nec9AyRoL/jJ7ECfMR+oZeCTVQNxVMu/aHU+TLRVbdg==",
+      "dev": true,
+      "requires": {
+        "find-parent-dir": "^0.3.0"
+      }
+    },
+    "nodemailer": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-2.7.2.tgz",
+      "integrity": "sha1-8kLmSa7q45tsftdA73sGHEBNMPk=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "libmime": "3.0.0",
+        "mailcomposer": "4.0.1",
+        "nodemailer-direct-transport": "3.3.2",
+        "nodemailer-shared": "1.1.0",
+        "nodemailer-smtp-pool": "2.8.2",
+        "nodemailer-smtp-transport": "2.7.2",
+        "socks": "1.1.9"
+      },
+      "dependencies": {
+        "socks": {
+          "version": "1.1.9",
+          "resolved": "https://registry.npmjs.org/socks/-/socks-1.1.9.tgz",
+          "integrity": "sha1-Yo1+TQSRJDVEWsC25Fk3bLPm1pE=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ip": "^1.1.2",
+            "smart-buffer": "^1.0.4"
+          }
+        }
+      }
+    },
+    "nodemailer-direct-transport": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/nodemailer-direct-transport/-/nodemailer-direct-transport-3.3.2.tgz",
+      "integrity": "sha1-6W+vuQNYVglH5WkBfZfmBzilCoY=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "nodemailer-shared": "1.1.0",
+        "smtp-connection": "2.12.0"
+      }
+    },
+    "nodemailer-fetch": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.6.0.tgz",
+      "integrity": "sha1-ecSQihwPXzdbc/6IjamCj23JY6Q=",
+      "dev": true
+    },
+    "nodemailer-shared": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.1.0.tgz",
+      "integrity": "sha1-z1mU4v0mjQD1zw+nZ6CBae2wfsA=",
+      "dev": true,
+      "requires": {
+        "nodemailer-fetch": "1.6.0"
+      }
+    },
+    "nodemailer-smtp-pool": {
+      "version": "2.8.2",
+      "resolved": "https://registry.npmjs.org/nodemailer-smtp-pool/-/nodemailer-smtp-pool-2.8.2.tgz",
+      "integrity": "sha1-LrlNbPhXgLG0clzoU7nL1ejajHI=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "nodemailer-shared": "1.1.0",
+        "nodemailer-wellknown": "0.1.10",
+        "smtp-connection": "2.12.0"
+      }
+    },
+    "nodemailer-smtp-transport": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/nodemailer-smtp-transport/-/nodemailer-smtp-transport-2.7.2.tgz",
+      "integrity": "sha1-A9ccdjFPFKx9vHvwM6am0W1n+3c=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "nodemailer-shared": "1.1.0",
+        "nodemailer-wellknown": "0.1.10",
+        "smtp-connection": "2.12.0"
+      }
+    },
+    "nodemailer-wellknown": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.10.tgz",
+      "integrity": "sha1-WG24EB2zDLRDjrVGc3pBqtDPE9U=",
+      "dev": true
+    },
+    "nopt": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+      "dev": true,
+      "requires": {
+        "abbrev": "1"
+      }
+    },
+    "normalize-package-data": {
+      "version": "2.4.0",
+      "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"
+      }
+    },
+    "normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "requires": {
+        "remove-trailing-separator": "^1.0.1"
+      }
+    },
+    "normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+      "dev": true
+    },
+    "npm-package-arg": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz",
+      "integrity": "sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==",
+      "dev": true,
+      "requires": {
+        "hosted-git-info": "^2.6.0",
+        "osenv": "^0.1.5",
+        "semver": "^5.5.0",
+        "validate-npm-package-name": "^3.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
+          "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
+          "dev": true
+        }
+      }
+    },
+    "npm-registry-client": {
+      "version": "8.6.0",
+      "resolved": "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.6.0.tgz",
+      "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"
+      }
+    },
+    "npm-run-all": {
+      "version": "4.1.2",
+      "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"
+      }
+    },
+    "npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "requires": {
+        "path-key": "^2.0.0"
+      }
+    },
+    "npmlog": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+      "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"
+      }
+    },
+    "nth-check": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
+      "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=",
+      "dev": true,
+      "requires": {
+        "boolbase": "~1.0.0"
+      }
+    },
+    "null-check": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz",
+      "integrity": "sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=",
+      "dev": true
+    },
+    "num2fraction": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
+      "dev": true
+    },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+    },
+    "oauth-sign": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
+      "dev": true
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true
+    },
+    "object-component": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz",
+      "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=",
+      "dev": true
+    },
+    "object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "requires": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "object-keys": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz",
+      "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag=="
+    },
+    "object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "requires": {
+        "isobject": "^3.0.0"
+      }
+    },
+    "object.assign": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "function-bind": "^1.1.1",
+        "has-symbols": "^1.0.0",
+        "object-keys": "^1.0.11"
+      }
+    },
+    "object.getownpropertydescriptors": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
+      "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.5.1"
+      }
+    },
+    "object.omit": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
+      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
+      "dev": true,
+      "requires": {
+        "for-own": "^0.1.4",
+        "is-extendable": "^0.1.1"
+      },
+      "dependencies": {
+        "for-own": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+          "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+          "dev": true,
+          "requires": {
+            "for-in": "^1.0.1"
+          }
+        }
+      }
+    },
+    "object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "obuf": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
+      "dev": true
+    },
+    "on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "dev": true,
+      "requires": {
+        "ee-first": "1.1.1"
+      }
+    },
+    "on-headers": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz",
+      "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=",
+      "dev": true
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "onetime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+      "dev": true,
+      "requires": {
+        "mimic-fn": "^1.0.0"
+      }
+    },
+    "opencollective": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/opencollective/-/opencollective-1.0.3.tgz",
+      "integrity": "sha1-ruY3K8KBRFg2kMPKja7PwSDdDvE=",
+      "dev": true,
+      "requires": {
+        "babel-polyfill": "6.23.0",
+        "chalk": "1.1.3",
+        "inquirer": "3.0.6",
+        "minimist": "1.2.0",
+        "node-fetch": "1.6.3",
+        "opn": "4.0.2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "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"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        },
+        "opn": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/opn/-/opn-4.0.2.tgz",
+          "integrity": "sha1-erwi5kTf9jsKltWrfyeQwPAavJU=",
+          "dev": true,
+          "requires": {
+            "object-assign": "^4.0.1",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "opener": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/opener/-/opener-1.4.3.tgz",
+      "integrity": "sha1-XG2ixdflgx6P+jlklQ+NZnSskLg=",
+      "dev": true
+    },
+    "opn": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz",
+      "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==",
+      "requires": {
+        "is-wsl": "^1.1.0"
+      }
+    },
+    "optimist": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+      "dev": true,
+      "requires": {
+        "minimist": "~0.0.1",
+        "wordwrap": "~0.0.2"
+      },
+      "dependencies": {
+        "wordwrap": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
+          "dev": true
+        }
+      }
+    },
+    "optionator": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
+      "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"
+      }
+    },
+    "original": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
+      "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
+      "dev": true,
+      "requires": {
+        "url-parse": "^1.4.3"
+      }
+    },
+    "os-browserify": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
+      "dev": true
+    },
+    "os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "dev": true
+    },
+    "os-locale": {
+      "version": "2.1.0",
+      "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"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+    },
+    "osenv": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+      "dev": true,
+      "requires": {
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.0"
+      }
+    },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
+    },
+    "p-limit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "requires": {
+        "p-try": "^1.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "requires": {
+        "p-limit": "^1.1.0"
+      }
+    },
+    "p-map": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
+      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
+      "dev": true
+    },
+    "p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
+    },
+    "pac-proxy-agent": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-2.0.2.tgz",
+      "integrity": "sha512-cDNAN1Ehjbf5EHkNY5qnRhGPUCp6SnpyVof5fRzN800QV1Y2OkzbH9rmjZkbBRa8igof903yOnjIl6z0SlAhxA==",
+      "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": "^3.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "socks-proxy-agent": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.1.tgz",
+          "integrity": "sha512-ZwEDymm204mTzvdqyUqOdovVr2YRd2NYskrYrF2LXyZ9qDiMAoFESGK8CRphiO7rtbo2Y757k2Nia3x2hGtalA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "agent-base": "^4.1.0",
+            "socks": "^1.1.10"
+          }
+        }
+      }
+    },
+    "pac-resolver": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-3.0.0.tgz",
+      "integrity": "sha512-tcc38bsjuE3XZ5+4vP96OfhOugrX+JcnpUbhfuc4LuXBLQhoTthOstZeoQJBDnQUDYzYmdImKsbz0xSl1/9qeA==",
+      "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"
+      }
+    },
+    "package-json": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
+      "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
+      "dev": true,
+      "requires": {
+        "got": "^6.7.1",
+        "registry-auth-token": "^3.0.1",
+        "registry-url": "^3.0.3",
+        "semver": "^5.1.0"
+      }
+    },
+    "pako": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
+      "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==",
+      "dev": true
+    },
+    "parallel-transform": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
+      "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
+      "dev": true,
+      "requires": {
+        "cyclist": "~0.2.2",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.1.5"
+      }
+    },
+    "param-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
+      "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
+      "dev": true,
+      "requires": {
+        "no-case": "^2.2.0"
+      }
+    },
+    "parse-asn1": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
+      "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"
+      }
+    },
+    "parse-entities": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.2.tgz",
+      "integrity": "sha512-5N9lmQ7tmxfXf+hO3X6KRG6w7uYO/HL9fHalSySTdyn63C3WNvTM/1R8tn1u1larNcEbo3Slcy2bsVDQqvEpUg==",
+      "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"
+      }
+    },
+    "parse-glob": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
+      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
+      "dev": true,
+      "requires": {
+        "glob-base": "^0.3.0",
+        "is-dotfile": "^1.0.0",
+        "is-extglob": "^1.0.0",
+        "is-glob": "^2.0.0"
+      },
+      "dependencies": {
+        "is-extglob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^1.0.0"
+          }
+        }
+      }
+    },
+    "parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+      "requires": {
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1"
+      }
+    },
+    "parse-passwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
+      "dev": true
+    },
+    "parse5": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz",
+      "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==",
+      "optional": true
+    },
+    "parseqs": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
+      "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
+      "dev": true,
+      "requires": {
+        "better-assert": "~1.0.0"
+      }
+    },
+    "parseuri": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz",
+      "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
+      "dev": true,
+      "requires": {
+        "better-assert": "~1.0.0"
+      }
+    },
+    "parseurl": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
+      "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=",
+      "dev": true
+    },
+    "pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
+    },
+    "path-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
+      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
+      "dev": true
+    },
+    "path-dirname": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA="
+    },
+    "path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+    },
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
+      "dev": true
+    },
+    "path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
+    },
+    "path-parse": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "dev": true
+    },
+    "path-proxy": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/path-proxy/-/path-proxy-1.0.0.tgz",
+      "integrity": "sha1-GOijaFn8nS8aU7SN7hOFQ8Ag3l4=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "inflection": "~1.3.0"
+      },
+      "dependencies": {
+        "inflection": {
+          "version": "1.3.8",
+          "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.3.8.tgz",
+          "integrity": "sha1-y9Fg2p91sUw8xjV41POWeEvzAU4=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
+      "dev": true
+    },
+    "path-type": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+      "requires": {
+        "pify": "^3.0.0"
+      }
+    },
+    "pause-stream": {
+      "version": "0.0.11",
+      "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
+      "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
+      "requires": {
+        "through": "~2.3"
+      }
+    },
+    "pbkdf2": {
+      "version": "3.0.16",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz",
+      "integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==",
+      "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"
+      }
+    },
+    "pdfjs-dist": {
+      "version": "2.0.303",
+      "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.0.303.tgz",
+      "integrity": "sha1-jABTDyQihmA7/L/dLukXwYK51EE=",
+      "requires": {
+        "node-ensure": "^0.0.0",
+        "worker-loader": "^1.1.0"
+      }
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+      "dev": true
+    },
+    "pify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
+      "requires": {
+        "pinkie": "^2.0.0"
+      }
+    },
+    "pkg-dir": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+      "dev": true,
+      "requires": {
+        "find-up": "^2.1.0"
+      }
+    },
+    "plugin-error": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
+      "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"
+      },
+      "dependencies": {
+        "arr-diff": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
+          "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.0.1",
+            "array-slice": "^0.2.3"
+          }
+        },
+        "arr-union": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
+          "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
+          "dev": true
+        },
+        "extend-shallow": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
+          "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^1.1.0"
+          }
+        },
+        "kind-of": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+          "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
+          "dev": true
+        }
+      }
+    },
+    "portfinder": {
+      "version": "1.0.16",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.16.tgz",
+      "integrity": "sha512-icBXCFQxzlK2PMepOM0QeEdPPFSLAaXXeuKOv5AClJlMy1oVCBrkDGJ12IZYesI/BF8mpeVco3vRCmgeBb4+hw==",
+      "dev": true,
+      "requires": {
+        "async": "^1.5.2",
+        "debug": "^2.2.0",
+        "mkdirp": "0.5.x"
+      }
+    },
+    "posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
+    },
+    "postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-import": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-11.1.0.tgz",
+      "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-load-config": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.0.0.tgz",
+      "integrity": "sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==",
+      "dev": true,
+      "requires": {
+        "cosmiconfig": "^4.0.0",
+        "import-cwd": "^2.0.0"
+      }
+    },
+    "postcss-loader": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.1.6.tgz",
+      "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"
+      }
+    },
+    "postcss-url": {
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/postcss-url/-/postcss-url-7.3.2.tgz",
+      "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"
+      }
+    },
+    "postcss-value-parser": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz",
+      "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=",
+      "dev": true
+    },
+    "prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true
+    },
+    "prepend-http": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
+      "dev": true
+    },
+    "preserve": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
+      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
+      "dev": true
+    },
+    "pretty-bytes": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-4.0.2.tgz",
+      "integrity": "sha1-sr+C5zUNZcbDOqlaqlpPYyf2HNk=",
+      "dev": true
+    },
+    "pretty-error": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz",
+      "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=",
+      "dev": true,
+      "requires": {
+        "renderkid": "^2.0.1",
+        "utila": "~0.4"
+      }
+    },
+    "prettycli": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/prettycli/-/prettycli-1.4.3.tgz",
+      "integrity": "sha512-KLiwAXXfSWXZqGmZlnKPuGMTFp+0QbcySplL1ft9gfteT/BNsG64Xo8u2Qr9r+qnsIZWBQ66Zs8tg+8s2fmzvw==",
+      "dev": true,
+      "requires": {
+        "chalk": "2.1.0"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
+          "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.1.0",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^4.0.0"
+          }
+        },
+        "has-flag": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "dev": true,
+          "requires": {
+            "has-flag": "^2.0.0"
+          }
+        }
+      }
+    },
+    "private": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
+      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
+      "dev": true
+    },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "dev": true
+    },
+    "process-nextick-args": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
+    },
+    "progress": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
+      "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=",
+      "dev": true
+    },
+    "promise": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
+      "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "asap": "~2.0.3"
+      }
+    },
+    "promise-inflight": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
+      "dev": true
+    },
+    "promisify-call": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/promisify-call/-/promisify-call-2.0.4.tgz",
+      "integrity": "sha1-1IwtRWUszM1SgB3ey9UzptS9X7o=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "with-callback": "^1.0.2"
+      }
+    },
+    "proto-list": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
+      "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=",
+      "dev": true
+    },
+    "protractor": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/protractor/-/protractor-5.4.0.tgz",
+      "integrity": "sha512-6TSYqMhUUzxr4/wN0ttSISqPMKvcVRXF4k8jOEpGWD8OioLak4KLgfzHK9FJ49IrjzRrZ+Mx1q2Op8Rk0zEcnQ==",
+      "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",
+        "jasmine": "2.8.0",
+        "jasminewd2": "^2.1.0",
+        "optimist": "~0.6.0",
+        "q": "1.4.1",
+        "saucelabs": "^1.5.0",
+        "selenium-webdriver": "3.6.0",
+        "source-map-support": "~0.4.0",
+        "webdriver-js-extender": "2.0.0",
+        "webdriver-manager": "^12.0.6"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "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"
+          }
+        },
+        "del": {
+          "version": "2.2.2",
+          "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
+          "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": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
+          "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"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        },
+        "source-map-support": {
+          "version": "0.4.18",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
+          "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+          "dev": true,
+          "requires": {
+            "source-map": "^0.5.6"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        },
+        "webdriver-manager": {
+          "version": "12.1.0",
+          "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.1.0.tgz",
+          "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"
+          }
+        }
+      }
+    },
+    "protractor-retry": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/protractor-retry/-/protractor-retry-1.2.0.tgz",
+      "integrity": "sha1-mQvQ1TgIsxvtdr2syDpk4tA5Qwc="
+    },
+    "proxy-addr": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz",
+      "integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==",
+      "dev": true,
+      "requires": {
+        "forwarded": "~0.1.2",
+        "ipaddr.js": "1.8.0"
+      }
+    },
+    "proxy-agent": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.0.1.tgz",
+      "integrity": "sha512-mAZexaz9ZxQhYPWfAjzlrloEjW+JHiBFryE4AJXFDTnaXfmH/FKqC1swTRKuEPbHWz02flQNXFOyDUF7zfEG6A==",
+      "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": "^2.0.1",
+        "proxy-from-env": "^1.0.0",
+        "socks-proxy-agent": "^4.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "proxy-from-env": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
+      "integrity": "sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=",
+      "dev": true,
+      "optional": true
+    },
+    "prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+      "dev": true
+    },
+    "ps-tree": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.1.0.tgz",
+      "integrity": "sha1-tCGyQUDWID8e08dplrRCewjowBQ=",
+      "requires": {
+        "event-stream": "~3.3.0"
+      }
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
+    },
+    "public-encrypt": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz",
+      "integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==",
+      "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"
+      }
+    },
+    "pump": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "pumpify": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+      "dev": true,
+      "requires": {
+        "duplexify": "^3.6.0",
+        "inherits": "^2.0.3",
+        "pump": "^2.0.0"
+      }
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+    },
+    "q": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz",
+      "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=",
+      "dev": true
+    },
+    "qjobs": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
+      "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
+      "dev": true
+    },
+    "qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+    },
+    "querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+      "dev": true
+    },
+    "querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+      "dev": true
+    },
+    "querystringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.0.0.tgz",
+      "integrity": "sha512-eTPo5t/4bgaMNZxyjWx6N2a6AuE0mq51KWvpc7nU/MAqixcI6v6KrGUKES0HaomdnolQBBXU/++X6/QQ9KL4tw==",
+      "dev": true
+    },
+    "randomatic": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz",
+      "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==",
+      "dev": true,
+      "requires": {
+        "is-number": "^4.0.0",
+        "kind-of": "^6.0.0",
+        "math-random": "^1.0.1"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+          "dev": true
+        }
+      }
+    },
+    "randombytes": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
+      "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "dev": true,
+      "requires": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "range-parser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
+      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
+      "dev": true
+    },
+    "raphael": {
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/raphael/-/raphael-2.2.7.tgz",
+      "integrity": "sha1-IxsZFB+NCGmG2PrOtm+LVi7iyBA=",
+      "requires": {
+        "eve-raphael": "0.5.0"
+      }
+    },
+    "raw-body": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
+      "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
+      "dev": true,
+      "requires": {
+        "bytes": "3.0.0",
+        "http-errors": "1.6.2",
+        "iconv-lite": "0.4.19",
+        "unpipe": "1.0.0"
+      },
+      "dependencies": {
+        "depd": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
+          "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
+          "dev": true
+        },
+        "http-errors": {
+          "version": "1.6.2",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
+          "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
+          "dev": true,
+          "requires": {
+            "depd": "1.1.1",
+            "inherits": "2.0.3",
+            "setprototypeof": "1.0.3",
+            "statuses": ">= 1.3.1 < 2"
+          }
+        },
+        "setprototypeof": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
+          "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=",
+          "dev": true
+        }
+      }
+    },
+    "raw-loader": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz",
+      "integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao=",
+      "dev": true
+    },
+    "rc": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "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"
+      },
+      "dependencies": {
+        "deep-extend": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+          "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+          "dev": true
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
+    "read-cache": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
+      "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
+      "dev": true,
+      "requires": {
+        "pify": "^2.3.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "read-pkg": {
+      "version": "3.0.0",
+      "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"
+      }
+    },
+    "read-pkg-up": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+      "dev": true,
+      "requires": {
+        "find-up": "^1.0.0",
+        "read-pkg": "^1.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+          "dev": true,
+          "requires": {
+            "path-exists": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "load-json-file": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+          "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"
+          }
+        },
+        "parse-json": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+          "dev": true,
+          "requires": {
+            "error-ex": "^1.2.0"
+          }
+        },
+        "path-exists": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+          "dev": true,
+          "requires": {
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "path-type": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+          "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "pify": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        },
+        "read-pkg": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+          "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "^1.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^1.0.0"
+          }
+        },
+        "strip-bom": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+          "dev": true,
+          "requires": {
+            "is-utf8": "^0.2.0"
+          }
+        }
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "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"
+      }
+    },
+    "readdirp": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
+      "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "minimatch": "^3.0.2",
+        "readable-stream": "^2.0.2",
+        "set-immediate-shim": "^1.0.1"
+      }
+    },
+    "rechoir": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+      "dev": true,
+      "requires": {
+        "resolve": "^1.1.6"
+      }
+    },
+    "redent": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
+      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
+      "dev": true,
+      "requires": {
+        "indent-string": "^2.1.0",
+        "strip-indent": "^1.0.1"
+      }
+    },
+    "redis": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz",
+      "integrity": "sha512-M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "double-ended-queue": "^2.1.0-0",
+        "redis-commands": "^1.2.0",
+        "redis-parser": "^2.6.0"
+      }
+    },
+    "redis-commands": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.5.tgz",
+      "integrity": "sha512-foGF8u6MXGFF++1TZVC6icGXuMYPftKXt1FBT2vrfU9ZATNtZJ8duRC5d1lEfE8hyVe3jhelHGB91oB7I6qLsA==",
+      "dev": true,
+      "optional": true
+    },
+    "redis-parser": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-2.6.0.tgz",
+      "integrity": "sha1-Uu0J2srBCPGmMcB+m2mUHnoZUEs=",
+      "dev": true,
+      "optional": true
+    },
+    "reflect-metadata": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.10.tgz",
+      "integrity": "sha1-tPg3BEFqytiZiMmxVjXUfgO5NEo="
+    },
+    "regenerate": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
+      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg=="
+    },
+    "regenerator-runtime": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
+      "dev": true
+    },
+    "regex-cache": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
+      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
+      "dev": true,
+      "requires": {
+        "is-equal-shallow": "^0.1.3"
+      }
+    },
+    "regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "requires": {
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "regexpu-core": {
+      "version": "1.0.0",
+      "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"
+      }
+    },
+    "registry-auth-token": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz",
+      "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==",
+      "dev": true,
+      "requires": {
+        "rc": "^1.1.6",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "registry-url": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
+      "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
+      "dev": true,
+      "requires": {
+        "rc": "^1.0.1"
+      }
+    },
+    "regjsgen": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
+      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc="
+    },
+    "regjsparser": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
+      "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
+      "requires": {
+        "jsesc": "~0.5.0"
+      }
+    },
+    "relateurl": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
+      "dev": true
+    },
+    "remap-istanbul": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/remap-istanbul/-/remap-istanbul-0.11.1.tgz",
+      "integrity": "sha512-Itv3XvYjD6G+9xDzAeFohx4GUwbFjfqFt0UXlC826jHR18E49fEiEGqZUxUASwMq4z7wwUv2H9/XF2d6qj0iaQ==",
+      "dev": true,
+      "requires": {
+        "amdefine": "^1.0.0",
+        "istanbul": "0.4.5",
+        "minimatch": "^3.0.3",
+        "plugin-error": "^0.1.2",
+        "source-map": "^0.6.1",
+        "through2": "2.0.1"
+      },
+      "dependencies": {
+        "process-nextick-args": {
+          "version": "1.0.7",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+          "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.0.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
+          "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"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        },
+        "through2": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz",
+          "integrity": "sha1-OE51MU1J8y3hLuu4E2uOtrXVnak=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "~2.0.0",
+            "xtend": "~4.0.0"
+          }
+        }
+      }
+    },
+    "remark": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/remark/-/remark-9.0.0.tgz",
+      "integrity": "sha512-amw8rGdD5lHbMEakiEsllmkdBP+/KpjW/PRK6NSGPZKCQowh0BT4IWXDAkRMyG3SB9dKPXWMviFjNusXzXNn3A==",
+      "dev": true,
+      "requires": {
+        "remark-parse": "^5.0.0",
+        "remark-stringify": "^5.0.0",
+        "unified": "^6.0.0"
+      }
+    },
+    "remark-frontmatter": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/remark-frontmatter/-/remark-frontmatter-1.2.0.tgz",
+      "integrity": "sha512-BqcYv/ly+I94TiOM/n7iyNVBknzvTIblnQJiAg+6W/s/jxjtBIz5D66Tcjc20elFwW4hIqQI7R2UV1nlYumY3A==",
+      "dev": true,
+      "requires": {
+        "fault": "^1.0.1",
+        "xtend": "^4.0.1"
+      }
+    },
+    "remark-parse": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-5.0.0.tgz",
+      "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",
+        "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"
+      }
+    },
+    "remark-stringify": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-5.0.0.tgz",
+      "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"
+      }
+    },
+    "remarkable": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/remarkable/-/remarkable-1.7.1.tgz",
+      "integrity": "sha1-qspJchALZqZCpjoQIcpLrBvjv/Y=",
+      "dev": true,
+      "requires": {
+        "argparse": "~0.1.15",
+        "autolinker": "~0.15.0"
+      },
+      "dependencies": {
+        "argparse": {
+          "version": "0.1.16",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz",
+          "integrity": "sha1-z9AeD7uj1srtBJ+9dY1A9lGW9Xw=",
+          "dev": true,
+          "requires": {
+            "underscore": "~1.7.0",
+            "underscore.string": "~2.4.0"
+          }
+        },
+        "underscore": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz",
+          "integrity": "sha1-a7rwh3UA02vjTsqlhODbn+8DUgk=",
+          "dev": true
+        }
+      }
+    },
+    "remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
+    },
+    "renderkid": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.1.tgz",
+      "integrity": "sha1-iYyr/Ivt5Le5ETWj/9Mj5YwNsxk=",
+      "dev": true,
+      "requires": {
+        "css-select": "^1.1.0",
+        "dom-converter": "~0.1",
+        "htmlparser2": "~3.3.0",
+        "strip-ansi": "^3.0.0",
+        "utila": "~0.3"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "utila": {
+          "version": "0.3.3",
+          "resolved": "https://registry.npmjs.org/utila/-/utila-0.3.3.tgz",
+          "integrity": "sha1-1+jn1+MJEHCSsF+NloiCTWM6QiY=",
+          "dev": true
+        }
+      }
+    },
+    "repeat-element": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
+      "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo="
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
+    },
+    "repeating": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+      "dev": true,
+      "requires": {
+        "is-finite": "^1.0.0"
+      }
+    },
+    "replace-ext": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
+      "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
+      "dev": true
+    },
+    "request": {
+      "version": "2.87.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz",
+      "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"
+      }
+    },
+    "requestretry": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/requestretry/-/requestretry-1.13.0.tgz",
+      "integrity": "sha512-Lmh9qMvnQXADGAQxsXHP4rbgO6pffCfuR8XUBdP9aitJcLQJxhp7YZK4xAVYXnPJ5E52mwrfiKQtKonPL8xsmg==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "extend": "^3.0.0",
+        "lodash": "^4.15.0",
+        "request": "^2.74.0",
+        "when": "^3.7.7"
+      }
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
+    },
+    "require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true
+    },
+    "require-main-filename": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
+    },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
+      "dev": true
+    },
+    "resolve": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+      "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
+      "dev": true
+    },
+    "resolve-cwd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
+      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+      "dev": true,
+      "requires": {
+        "resolve-from": "^3.0.0"
+      }
+    },
+    "resolve-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+      "dev": true
+    },
+    "resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
+    },
+    "restore-cursor": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "dev": true,
+      "requires": {
+        "onetime": "^2.0.0",
+        "signal-exit": "^3.0.2"
+      }
+    },
+    "ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
+    },
+    "retry": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
+      "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=",
+      "dev": true
+    },
+    "right-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
+      "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
+      "dev": true,
+      "requires": {
+        "align-text": "^0.1.1"
+      }
+    },
+    "rimraf": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.0.5"
+      }
+    },
+    "ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dev": true,
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "rollup": {
+      "version": "0.63.5",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.63.5.tgz",
+      "integrity": "sha512-dFf8LpUNzIj3oE0vCvobX6rqOzHzLBoblyFp+3znPbjiSmSvOoK2kMKx+Fv9jYduG1rvcCfCveSgEaQHjWRF6g==",
+      "dev": true,
+      "requires": {
+        "@types/estree": "0.0.39",
+        "@types/node": "*"
+      }
+    },
+    "rollup-plugin-commonjs": {
+      "version": "9.1.4",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.1.4.tgz",
+      "integrity": "sha512-dpPb6QxvEMG35Eat1yFbpVcuYWE33D2LZK8q2BlSWIBpjXiX2uaqCEMf9czqFChFsfewsA2c2eEoROTepEmyng==",
+      "dev": true,
+      "requires": {
+        "estree-walker": "^0.5.1",
+        "magic-string": "^0.22.4",
+        "resolve": "^1.5.0",
+        "rollup-pluginutils": "^2.0.1"
+      },
+      "dependencies": {
+        "resolve": {
+          "version": "1.8.1",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz",
+          "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==",
+          "dev": true,
+          "requires": {
+            "path-parse": "^1.0.5"
+          }
+        }
+      }
+    },
+    "rollup-plugin-node-resolve": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.3.0.tgz",
+      "integrity": "sha512-9zHGr3oUJq6G+X0oRMYlzid9fXicBdiydhwGChdyeNRGPcN/majtegApRKHLR5drboUvEWU+QeUmGTyEZQs3WA==",
+      "dev": true,
+      "requires": {
+        "builtin-modules": "^2.0.0",
+        "is-module": "^1.0.0",
+        "resolve": "^1.1.6"
+      },
+      "dependencies": {
+        "builtin-modules": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-2.0.0.tgz",
+          "integrity": "sha512-3U5kUA5VPsRUA3nofm/BXX7GVHKfxz0hOBAPxXrIvHzlDRkQVqEn6yi8QJegxl4LzOHLdvb7XF5dVawa/VVYBg==",
+          "dev": true
+        }
+      }
+    },
+    "rollup-plugin-sourcemaps": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.4.2.tgz",
+      "integrity": "sha1-YhJaqUCHqt97g+9N+vYptHMTXoc=",
+      "dev": true,
+      "requires": {
+        "rollup-pluginutils": "^2.0.1",
+        "source-map-resolve": "^0.5.0"
+      }
+    },
+    "rollup-pluginutils": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.3.1.tgz",
+      "integrity": "sha512-JZS8aJMHEHhqmY2QVPMXwKP6lsD1ShkrcGYjhAIvqKKdXQyPHw/9NF0tl3On/xOJ4ACkxfeG7AF+chfCN1NpBg==",
+      "dev": true,
+      "requires": {
+        "estree-walker": "^0.5.2",
+        "micromatch": "^2.3.11"
+      },
+      "dependencies": {
+        "arr-diff": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
+          "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.0.1"
+          }
+        },
+        "array-unique": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
+          "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
+          "dev": true
+        },
+        "braces": {
+          "version": "1.8.5",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
+          "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
+          "dev": true,
+          "requires": {
+            "expand-range": "^1.8.1",
+            "preserve": "^0.2.0",
+            "repeat-element": "^1.1.2"
+          }
+        },
+        "expand-brackets": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
+          "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
+          "dev": true,
+          "requires": {
+            "is-posix-bracket": "^0.1.0"
+          }
+        },
+        "extglob": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
+          "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^1.0.0"
+          }
+        },
+        "is-extglob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^1.0.0"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        },
+        "micromatch": {
+          "version": "2.3.11",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
+          "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
+          "dev": true,
+          "requires": {
+            "arr-diff": "^2.0.0",
+            "array-unique": "^0.2.1",
+            "braces": "^1.8.2",
+            "expand-brackets": "^0.1.4",
+            "extglob": "^0.3.1",
+            "filename-regex": "^2.0.0",
+            "is-extglob": "^1.0.0",
+            "is-glob": "^2.0.1",
+            "kind-of": "^3.0.2",
+            "normalize-path": "^2.0.1",
+            "object.omit": "^2.0.0",
+            "parse-glob": "^3.0.4",
+            "regex-cache": "^0.4.2"
+          }
+        }
+      }
+    },
+    "rsvp": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
+      "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==",
+      "dev": true
+    },
+    "run-async": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "dev": true,
+      "requires": {
+        "is-promise": "^2.1.0"
+      }
+    },
+    "run-queue": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
+      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1"
+      }
+    },
+    "run-sequence": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/run-sequence/-/run-sequence-1.2.2.tgz",
+      "integrity": "sha1-UJWgvr6YczsBQL0I3YDsAw3azes=",
+      "dev": true,
+      "requires": {
+        "chalk": "*",
+        "gulp-util": "*"
+      }
+    },
+    "rx": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz",
+      "integrity": "sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=",
+      "dev": true
+    },
+    "rxjs": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz",
+      "integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "rxjs-compat": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/rxjs-compat/-/rxjs-compat-6.2.2.tgz",
+      "integrity": "sha512-h113JzEXnqBd6JQ8TYg33oDuM3baZ9WKS49rtbMX0gBW2Kz0z4wDZ0/pCA0T9sRJM1HkZT6mt45gpYOJ2MqWYQ=="
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "requires": {
+        "ret": "~0.1.10"
+      }
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "sass-graph": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
+      "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
+      "dev": true,
+      "requires": {
+        "glob": "^7.0.0",
+        "lodash": "^4.0.0",
+        "scss-tokenizer": "^0.2.3",
+        "yargs": "^7.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "camelcase": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+          "dev": true
+        },
+        "cliui": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+          "dev": true,
+          "requires": {
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1",
+            "wrap-ansi": "^2.0.0"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "dev": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "os-locale": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+          "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+          "dev": true,
+          "requires": {
+            "lcid": "^1.0.0"
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "dev": true,
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "which-module": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+          "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
+          "dev": true
+        },
+        "yargs": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
+          "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"
+          }
+        },
+        "yargs-parser": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
+          "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+          "dev": true,
+          "requires": {
+            "camelcase": "^3.0.0"
+          }
+        }
+      }
+    },
+    "sass-loader": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-6.0.5.tgz",
+      "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"
+      },
+      "dependencies": {
+        "async": {
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
+          "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
+          "dev": true,
+          "requires": {
+            "lodash": "^4.17.10"
+          }
+        },
+        "clone-deep": {
+          "version": "0.2.4",
+          "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.2.4.tgz",
+          "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": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+          "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+          "dev": true,
+          "requires": {
+            "for-in": "^1.0.1"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        },
+        "shallow-clone": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz",
+          "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"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
+              "integrity": "sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.0.2"
+              }
+            },
+            "lazy-cache": {
+              "version": "0.2.7",
+              "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz",
+              "integrity": "sha1-f+3fLctu23fRHvHRF6tf/fCrG2U=",
+              "dev": true
+            }
+          }
+        }
+      }
+    },
+    "saucelabs": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.5.0.tgz",
+      "integrity": "sha512-jlX3FGdWvYf4Q3LFfFWS1QvPg3IGCGWxIc8QBFdPTbpTJnt/v17FHXYVAn7C8sHf1yUXo2c7yIM0isDryfYtHQ==",
+      "dev": true,
+      "requires": {
+        "https-proxy-agent": "^2.2.1"
+      }
+    },
+    "sax": {
+      "version": "0.5.8",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz",
+      "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=",
+      "dev": true
+    },
+    "schema-utils": {
+      "version": "0.4.7",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
+      "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
+      "requires": {
+        "ajv": "^6.1.0",
+        "ajv-keywords": "^3.1.0"
+      }
+    },
+    "scss-bundle": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/scss-bundle/-/scss-bundle-2.3.2.tgz",
+      "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"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
+          "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "promise": {
+          "version": "8.0.1",
+          "resolved": "https://registry.npmjs.org/promise/-/promise-8.0.1.tgz",
+          "integrity": "sha1-5F1osAoXZHttpxG/he1u1HII9FA=",
+          "dev": true,
+          "requires": {
+            "asap": "~2.0.3"
+          }
+        }
+      }
+    },
+    "scss-tokenizer": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
+      "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
+      "dev": true,
+      "requires": {
+        "js-base64": "^2.1.8",
+        "source-map": "^0.4.2"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+          "dev": true,
+          "requires": {
+            "amdefine": ">=0.0.4"
+          }
+        }
+      }
+    },
+    "secure-keys": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/secure-keys/-/secure-keys-1.0.0.tgz",
+      "integrity": "sha1-8MgtmKOxOah3aogIBQuCRDEIf8o=",
+      "dev": true
+    },
+    "select-hose": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
+      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=",
+      "dev": true
+    },
+    "selenium-webdriver": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz",
+      "integrity": "sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==",
+      "dev": true,
+      "requires": {
+        "jszip": "^3.1.3",
+        "rimraf": "^2.5.4",
+        "tmp": "0.0.30",
+        "xml2js": "^0.4.17"
+      },
+      "dependencies": {
+        "tmp": {
+          "version": "0.0.30",
+          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz",
+          "integrity": "sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=",
+          "dev": true,
+          "requires": {
+            "os-tmpdir": "~1.0.1"
+          }
+        }
+      }
+    },
+    "selfsigned": {
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.3.tgz",
+      "integrity": "sha512-vmZenZ+8Al3NLHkWnhBQ0x6BkML1eCP2xEi3JE+f3D9wW9fipD9NNJHYtE9XJM4TsPaHGZJIamrSI6MTg1dU2Q==",
+      "dev": true,
+      "requires": {
+        "node-forge": "0.7.5"
+      }
+    },
+    "semver": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
+      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
+    },
+    "semver-diff": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz",
+      "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=",
+      "dev": true,
+      "requires": {
+        "semver": "^5.0.3"
+      }
+    },
+    "semver-dsl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/semver-dsl/-/semver-dsl-1.0.1.tgz",
+      "integrity": "sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=",
+      "requires": {
+        "semver": "^5.3.0"
+      }
+    },
+    "semver-intersect": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/semver-intersect/-/semver-intersect-1.4.0.tgz",
+      "integrity": "sha512-d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ==",
+      "dev": true,
+      "requires": {
+        "semver": "^5.0.0"
+      }
+    },
+    "send": {
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
+      "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "destroy": "~1.0.4",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "~1.6.2",
+        "mime": "1.4.1",
+        "ms": "2.0.0",
+        "on-finished": "~2.3.0",
+        "range-parser": "~1.2.0",
+        "statuses": "~1.4.0"
+      },
+      "dependencies": {
+        "mime": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+          "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
+          "dev": true
+        }
+      }
+    },
+    "serialize-javascript": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.5.0.tgz",
+      "integrity": "sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==",
+      "dev": true
+    },
+    "serve-index": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
+      "dev": true,
+      "requires": {
+        "accepts": "~1.3.4",
+        "batch": "0.6.1",
+        "debug": "2.6.9",
+        "escape-html": "~1.0.3",
+        "http-errors": "~1.6.2",
+        "mime-types": "~2.1.17",
+        "parseurl": "~1.3.2"
+      }
+    },
+    "serve-static": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
+      "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
+      "dev": true,
+      "requires": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.2",
+        "send": "0.16.2"
+      }
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+    },
+    "set-getter": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/set-getter/-/set-getter-0.1.0.tgz",
+      "integrity": "sha1-12nBgsnVpR9AkUXy+6guXoboA3Y=",
+      "dev": true,
+      "requires": {
+        "to-object-path": "^0.3.0"
+      }
+    },
+    "set-immediate-shim": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
+      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E="
+    },
+    "set-value": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
+      "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+      "dev": true
+    },
+    "setprototypeof": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+      "dev": true
+    },
+    "sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "shallow-clone": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz",
+      "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"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
+      }
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "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": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
+    },
+    "shell-quote": {
+      "version": "1.6.1",
+      "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"
+      }
+    },
+    "shelljs": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.2.tgz",
+      "integrity": "sha512-pRXeNrCA2Wd9itwhvLp5LZQvPJ0wU6bcjaTMywHHGX5XWhVN2nzSu7WV0q+oUY7mGK3mgSkDDzP3MgjqdyIgbQ==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.0.0",
+        "interpret": "^1.0.0",
+        "rechoir": "^0.6.2"
+      }
+    },
+    "sigmund": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+      "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
+      "dev": true
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
+    },
+    "slack-node": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/slack-node/-/slack-node-0.2.0.tgz",
+      "integrity": "sha1-3kuN3aqLeT9h29KTgQT9q/N9+jA=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "requestretry": "^1.2.2"
+      }
+    },
+    "slash": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+      "dev": true
+    },
+    "slide": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
+      "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=",
+      "dev": true
+    },
+    "smart-buffer": {
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.1.15.tgz",
+      "integrity": "sha1-fxFLW2X6s+KjWqd1uxLw0cZJvxY=",
+      "dev": true,
+      "optional": true
+    },
+    "smtp-connection": {
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/smtp-connection/-/smtp-connection-2.12.0.tgz",
+      "integrity": "sha1-1275EnyyPCJZ7bHoNJwujV4tdME=",
+      "dev": true,
+      "requires": {
+        "httpntlm": "1.6.1",
+        "nodemailer-shared": "1.1.0"
+      }
+    },
+    "snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "requires": {
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "requires": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "requires": {
+        "kind-of": "^3.2.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "sntp": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+      "dev": true,
+      "requires": {
+        "hoek": "2.x.x"
+      }
+    },
+    "socket.io": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.0.4.tgz",
+      "integrity": "sha1-waRZDO/4fs8TxyZS8Eb3FrKeYBQ=",
+      "dev": true,
+      "requires": {
+        "debug": "~2.6.6",
+        "engine.io": "~3.1.0",
+        "socket.io-adapter": "~1.1.0",
+        "socket.io-client": "2.0.4",
+        "socket.io-parser": "~3.1.1"
+      }
+    },
+    "socket.io-adapter": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz",
+      "integrity": "sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=",
+      "dev": true
+    },
+    "socket.io-client": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.0.4.tgz",
+      "integrity": "sha1-CRilUkBtxeVAs4Dc2Xr8SmQzL44=",
+      "dev": true,
+      "requires": {
+        "backo2": "1.0.2",
+        "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",
+        "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",
+        "to-array": "0.1.4"
+      }
+    },
+    "socket.io-parser": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.3.tgz",
+      "integrity": "sha512-g0a2HPqLguqAczs3dMECuA1RgoGFPyvDqcbaDEdCWY9g59kdUAz3YRmaJBNKXflrHNwB7Q12Gkf/0CZXfdHR7g==",
+      "dev": true,
+      "requires": {
+        "component-emitter": "1.2.1",
+        "debug": "~3.1.0",
+        "has-binary2": "~1.0.2",
+        "isarray": "2.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "isarray": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+          "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
+          "dev": true
+        }
+      }
+    },
+    "sockjs": {
+      "version": "0.3.19",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
+      "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
+      "dev": true,
+      "requires": {
+        "faye-websocket": "^0.10.0",
+        "uuid": "^3.0.1"
+      }
+    },
+    "sockjs-client": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.5.tgz",
+      "integrity": "sha1-G7fA9yIsQPQq3xT0RCy9Eml3GoM=",
+      "dev": true,
+      "requires": {
+        "debug": "^2.6.6",
+        "eventsource": "0.1.6",
+        "faye-websocket": "~0.11.0",
+        "inherits": "^2.0.1",
+        "json3": "^3.3.2",
+        "url-parse": "^1.1.8"
+      },
+      "dependencies": {
+        "faye-websocket": {
+          "version": "0.11.1",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
+          "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
+          "dev": true,
+          "requires": {
+            "websocket-driver": ">=0.5.1"
+          }
+        }
+      }
+    },
+    "socks": {
+      "version": "1.1.10",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-1.1.10.tgz",
+      "integrity": "sha1-W4t/x8jzQcU+0FbpKbe/Tei6e1o=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "ip": "^1.1.4",
+        "smart-buffer": "^1.0.13"
+      }
+    },
+    "socks-proxy-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "agent-base": "~4.2.0",
+        "socks": "~2.2.0"
+      },
+      "dependencies": {
+        "smart-buffer": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.0.1.tgz",
+          "integrity": "sha512-RFqinRVJVcCAL9Uh1oVqE6FZkqsyLiVOYEZ20TqIOjuX7iFVJ+zsbs4RIghnw/pTs7mZvt8ZHhvm1ZUrR4fykg==",
+          "dev": true,
+          "optional": true
+        },
+        "socks": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/socks/-/socks-2.2.1.tgz",
+          "integrity": "sha512-0GabKw7n9mI46vcNrVfs0o6XzWzjVa3h6GaSo2UPxtWAROXUWavfJWh1M4PR5tnE0dcnQXZIDFP4yrAysLze/w==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ip": "^1.1.5",
+            "smart-buffer": "^4.0.1"
+          }
+        }
+      }
+    },
+    "source-list-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz",
+      "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==",
+      "dev": true
+    },
+    "source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+    },
+    "source-map-loader": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.2.3.tgz",
+      "integrity": "sha512-MYbFX9DYxmTQFfy2v8FC1XZwpwHKYxg3SK8Wb7VPBKuhDjz8gi9re2819MsG4p49HDyiOSUKlmZ+nQBArW5CGw==",
+      "dev": true,
+      "requires": {
+        "async": "^2.5.0",
+        "loader-utils": "~0.2.2",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "async": {
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
+          "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
+          "dev": true,
+          "requires": {
+            "lodash": "^4.17.10"
+          }
+        },
+        "loader-utils": {
+          "version": "0.2.17",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
+          "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"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "source-map-resolve": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
+      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+      "requires": {
+        "atob": "^2.1.1",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "source-map-support": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.6.tgz",
+      "integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "source-map-url": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM="
+    },
+    "sparkles": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
+      "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
+      "dev": true
+    },
+    "spawn-command": {
+      "version": "0.0.2-1",
+      "resolved": "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz",
+      "integrity": "sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=",
+      "dev": true
+    },
+    "spdx-correct": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz",
+      "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==",
+      "requires": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-exceptions": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz",
+      "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg=="
+    },
+    "spdx-expression-parse": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "requires": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-license-ids": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz",
+      "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA=="
+    },
+    "spdy": {
+      "version": "3.4.7",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-3.4.7.tgz",
+      "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"
+      }
+    },
+    "spdy-transport": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-2.1.0.tgz",
+      "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"
+      }
+    },
+    "split": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
+      "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
+      "requires": {
+        "through": "2"
+      }
+    },
+    "split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "requires": {
+        "extend-shallow": "^3.0.0"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+    },
+    "sshpk": {
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz",
+      "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=",
+      "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"
+      }
+    },
+    "ssri": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz",
+      "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "stack-trace": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.6.tgz",
+      "integrity": "sha1-HnGb1qJin/CcGJ4Xqe+QKpT8XbA=",
+      "dev": true
+    },
+    "state-toggle": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.1.tgz",
+      "integrity": "sha512-Qe8QntFrrpWTnHwvwj2FZTgv+PKIsp0B9VxLzLLbSpPXWOgRgc5LVj/aTiSfK1RqIeF9jeC1UeOH8Q8y60A7og==",
+      "dev": true
+    },
+    "static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "requires": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "stats-webpack-plugin": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/stats-webpack-plugin/-/stats-webpack-plugin-0.6.2.tgz",
+      "integrity": "sha1-LFlJtTHgf4eojm6k3PrFOqjHWis=",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.4"
+      }
+    },
+    "statuses": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
+      "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
+      "dev": true
+    },
+    "stdout-stream": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.0.tgz",
+      "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "stream-browserify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
+      "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
+      "dev": true,
+      "requires": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "stream-combiner": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+      "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
+      "requires": {
+        "duplexer": "~0.1.1"
+      }
+    },
+    "stream-each": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
+      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "stream-http": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+      "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"
+      }
+    },
+    "stream-shift": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
+      "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
+      "dev": true
+    },
+    "streamroller": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz",
+      "integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==",
+      "dev": true,
+      "requires": {
+        "date-format": "^1.2.0",
+        "debug": "^3.1.0",
+        "mkdirp": "^0.5.1",
+        "readable-stream": "^2.3.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "string-width": {
+      "version": "2.1.1",
+      "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"
+      }
+    },
+    "string.prototype.padend": {
+      "version": "3.0.0",
+      "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"
+      }
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "stringify-entities": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.2.tgz",
+      "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"
+      }
+    },
+    "stringstream": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz",
+      "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==",
+      "dev": true
+    },
+    "strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "requires": {
+        "ansi-regex": "^3.0.0"
+      }
+    },
+    "strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
+    },
+    "strip-color": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/strip-color/-/strip-color-0.1.0.tgz",
+      "integrity": "sha1-EG9l09PmotlAHKwOsM6LinArT3s=",
+      "dev": true
+    },
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
+    },
+    "strip-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
+      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
+      "dev": true,
+      "requires": {
+        "get-stdin": "^4.0.1"
+      }
+    },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "dev": true
+    },
+    "style-loader": {
+      "version": "0.21.0",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.21.0.tgz",
+      "integrity": "sha512-T+UNsAcl3Yg+BsPKs1vd22Fr8sVT+CJMtzqc6LEw9bbJZb43lm9GoeIfUcDEefBSWC0BhYbcdupV1GtI4DGzxg==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.1.0",
+        "schema-utils": "^0.4.5"
+      }
+    },
+    "stylus": {
+      "version": "0.54.5",
+      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz",
+      "integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=",
+      "dev": true,
+      "requires": {
+        "css-parse": "1.7.x",
+        "debug": "*",
+        "glob": "7.0.x",
+        "mkdirp": "0.5.x",
+        "sax": "0.5.x",
+        "source-map": "0.1.x"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.0.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
+          "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.2",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "source-map": {
+          "version": "0.1.43",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+          "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+          "dev": true,
+          "requires": {
+            "amdefine": ">=0.0.4"
+          }
+        }
+      }
+    },
+    "stylus-loader": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz",
+      "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.0.2",
+        "lodash.clonedeep": "^4.5.0",
+        "when": "~3.6.x"
+      },
+      "dependencies": {
+        "when": {
+          "version": "3.6.4",
+          "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz",
+          "integrity": "sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=",
+          "dev": true
+        }
+      }
+    },
+    "superagent": {
+      "version": "3.8.2",
+      "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"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "supports-color": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+      "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "symbol-observable": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
+      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
+      "dev": true
+    },
+    "systemjs": {
+      "version": "0.19.27",
+      "resolved": "https://registry.npmjs.org/systemjs/-/systemjs-0.19.27.tgz",
+      "integrity": "sha1-8XQNVlzmQ3GsDecHKk0eVHG6e6I=",
+      "requires": {
+        "when": "^3.7.5"
+      }
+    },
+    "systemjs-builder": {
+      "version": "0.15.34",
+      "resolved": "https://registry.npmjs.org/systemjs-builder/-/systemjs-builder-0.15.34.tgz",
+      "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-plugin-transform-global-system-wrapper": "0.0.1",
+        "babel-plugin-transform-system-register": "0.0.1",
+        "bluebird": "^3.3.4",
+        "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",
+        "traceur": "0.0.105",
+        "uglify-js": "^2.6.1"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+          "dev": true
+        },
+        "cliui": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+          "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+          "dev": true,
+          "requires": {
+            "center-align": "^0.1.1",
+            "right-align": "^0.1.1",
+            "wordwrap": "0.0.2"
+          }
+        },
+        "commander": {
+          "version": "2.9.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
+          "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
+          "dev": true,
+          "requires": {
+            "graceful-readlink": ">= 1.0.0"
+          }
+        },
+        "data-uri-to-buffer": {
+          "version": "0.0.4",
+          "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-0.0.4.tgz",
+          "integrity": "sha1-RuE6udqOMJdFyNAc5UchPr2y/j8=",
+          "dev": true
+        },
+        "rollup": {
+          "version": "0.36.4",
+          "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.36.4.tgz",
+          "integrity": "sha1-oiRJTFOGwdc9OPe7hvafXrARo9I=",
+          "dev": true,
+          "requires": {
+            "source-map-support": "^0.4.0"
+          }
+        },
+        "semver": {
+          "version": "4.3.6",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
+          "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
+          "dev": true
+        },
+        "source-map-support": {
+          "version": "0.4.18",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
+          "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+          "dev": true,
+          "requires": {
+            "source-map": "^0.5.6"
+          }
+        },
+        "systemjs": {
+          "version": "0.19.47",
+          "resolved": "https://registry.npmjs.org/systemjs/-/systemjs-0.19.47.tgz",
+          "integrity": "sha1-yMk5NxgPP1SBx2nNJyB2P7SjHG8=",
+          "dev": true,
+          "requires": {
+            "when": "^3.7.5"
+          }
+        },
+        "traceur": {
+          "version": "0.0.105",
+          "resolved": "https://registry.npmjs.org/traceur/-/traceur-0.0.105.tgz",
+          "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"
+          },
+          "dependencies": {
+            "glob": {
+              "version": "5.0.15",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+              "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+              "dev": true,
+              "requires": {
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "2 || 3",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+              }
+            },
+            "source-map": {
+              "version": "0.1.32",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz",
+              "integrity": "sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY=",
+              "dev": true,
+              "requires": {
+                "amdefine": ">=0.0.4"
+              }
+            },
+            "source-map-support": {
+              "version": "0.2.10",
+              "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.2.10.tgz",
+              "integrity": "sha1-6lo5AKHByyUJagrozFwrSxDe09w=",
+              "dev": true,
+              "requires": {
+                "source-map": "0.1.32"
+              }
+            }
+          }
+        },
+        "uglify-js": {
+          "version": "2.8.29",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
+          "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
+          "dev": true,
+          "requires": {
+            "source-map": "~0.5.1",
+            "uglify-to-browserify": "~1.0.0",
+            "yargs": "~3.10.0"
+          }
+        },
+        "wordwrap": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+          "dev": true
+        },
+        "yargs": {
+          "version": "3.10.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+          "dev": true,
+          "requires": {
+            "camelcase": "^1.0.2",
+            "cliui": "^2.1.0",
+            "decamelize": "^1.0.0",
+            "window-size": "0.1.0"
+          }
+        }
+      }
+    },
+    "tapable": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.0.0.tgz",
+      "integrity": "sha512-dQRhbNQkRnaqauC7WqSJ21EEksgT0fYZX2lqXzGkpo8JNig9zGZTYoMGvyI2nWmXlE2VSVXVDu7wLVGu/mQEsg==",
+      "dev": true
+    },
+    "tar": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
+      "dev": true,
+      "requires": {
+        "block-stream": "*",
+        "fstream": "^1.0.2",
+        "inherits": "2"
+      }
+    },
+    "temp": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/temp/-/temp-0.4.0.tgz",
+      "integrity": "sha1-ZxrWPVe+D+nXKUZks/xABjZnimA="
+    },
+    "term-size": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz",
+      "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=",
+      "dev": true,
+      "requires": {
+        "execa": "^0.7.0"
+      }
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+    },
+    "through2": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+      "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "^2.1.5",
+        "xtend": "~4.0.1"
+      }
+    },
+    "thunkify": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz",
+      "integrity": "sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0=",
+      "dev": true,
+      "optional": true
+    },
+    "thunky": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.2.tgz",
+      "integrity": "sha1-qGLgGOP7HqLsP85dVWBc9X8kc3E=",
+      "dev": true
+    },
+    "time-stamp": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
+      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
+      "dev": true
+    },
+    "timed-out": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
+      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
+      "dev": true
+    },
+    "timers-browserify": {
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
+      "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
+      "dev": true,
+      "requires": {
+        "setimmediate": "^1.0.4"
+      }
+    },
+    "timespan": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/timespan/-/timespan-2.3.0.tgz",
+      "integrity": "sha1-SQLOBAvRPYRcj1myfp1ZutbzmSk=",
+      "dev": true,
+      "optional": true
+    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "requires": {
+        "os-tmpdir": "~1.0.2"
+      }
+    },
+    "to-array": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
+      "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=",
+      "dev": true
+    },
+    "to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+      "dev": true
+    },
+    "to-fast-properties": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+      "dev": true
+    },
+    "to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "requires": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "requires": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      }
+    },
+    "toml": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/toml/-/toml-2.3.3.tgz",
+      "integrity": "sha512-O7L5hhSQHxuufWUdcTRPfuTh3phKfAZ/dqfxZFoxPCj2RYmpaSGLEIs016FCXItQwNr08yefUB5TSjzRYnajTA==",
+      "dev": true
+    },
+    "toposort": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz",
+      "integrity": "sha1-LmhELZ9k7HILjMieZEOsbKqVACk=",
+      "dev": true
+    },
+    "tough-cookie": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
+      "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
+      "dev": true,
+      "requires": {
+        "punycode": "^1.4.1"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+          "dev": true
+        }
+      }
+    },
+    "traceur": {
+      "version": "0.0.111",
+      "resolved": "https://registry.npmjs.org/traceur/-/traceur-0.0.111.tgz",
+      "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"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.9.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
+          "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
+          "dev": true,
+          "requires": {
+            "graceful-readlink": ">= 1.0.0"
+          }
+        },
+        "glob": {
+          "version": "5.0.15",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+          "dev": true,
+          "requires": {
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "2 || 3",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "semver": {
+          "version": "4.3.6",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
+          "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.1.32",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz",
+          "integrity": "sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY=",
+          "dev": true,
+          "requires": {
+            "amdefine": ">=0.0.4"
+          }
+        },
+        "source-map-support": {
+          "version": "0.2.10",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.2.10.tgz",
+          "integrity": "sha1-6lo5AKHByyUJagrozFwrSxDe09w=",
+          "dev": true,
+          "requires": {
+            "source-map": "0.1.32"
+          }
+        }
+      }
+    },
+    "tree-kill": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz",
+      "integrity": "sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==",
+      "dev": true
+    },
+    "trim": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
+      "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0=",
+      "dev": true
+    },
+    "trim-newlines": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
+      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
+      "dev": true
+    },
+    "trim-right": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+      "dev": true
+    },
+    "trim-trailing-lines": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz",
+      "integrity": "sha512-bWLv9BbWbbd7mlqqs2oQYnLD/U/ZqeJeJwbO0FG2zA1aTq+HTvxfHNKFa/HGCVyJpDiioUYaBhfiT6rgk+l4mg==",
+      "dev": true
+    },
+    "trough": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.3.tgz",
+      "integrity": "sha512-fwkLWH+DimvA4YCy+/nvJd61nWQQ2liO/nF/RjkTpiOGi+zxZzVkhb1mvbHIIW4b/8nDsYI8uTmAlc0nNkRMOw==",
+      "dev": true
+    },
+    "true-case-path": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.2.tgz",
+      "integrity": "sha1-fskRMJJHZsf1c74wIMNPj9/QDWI=",
+      "dev": true,
+      "requires": {
+        "glob": "^6.0.4"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "6.0.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
+          "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
+          "dev": true,
+          "requires": {
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "2 || 3",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        }
+      }
+    },
+    "tryer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
+      "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==",
+      "dev": true
+    },
+    "ts-node": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-4.1.0.tgz",
+      "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"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
+    "tsconfig": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/tsconfig/-/tsconfig-7.0.0.tgz",
+      "integrity": "sha512-vZXmzPrL+EmC4T/4rVlT2jNVMWCi/O4DIiSj3UHg1OE5kCKbk4mfrXc6dZksLgRM/TZlKnousKH9bbTazUWRRw==",
+      "dev": true,
+      "requires": {
+        "@types/strip-bom": "^3.0.0",
+        "@types/strip-json-comments": "0.0.30",
+        "strip-bom": "^3.0.0",
+        "strip-json-comments": "^2.0.0"
+      }
+    },
+    "tsickle": {
+      "version": "0.32.1",
+      "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.32.1.tgz",
+      "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"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "tslib": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
+      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
+    },
+    "tslint": {
+      "version": "5.9.1",
+      "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.9.1.tgz",
+      "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"
+      },
+      "dependencies": {
+        "resolve": {
+          "version": "1.8.1",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz",
+          "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==",
+          "dev": true,
+          "requires": {
+            "path-parse": "^1.0.5"
+          }
+        }
+      }
+    },
+    "tsscmp": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz",
+      "integrity": "sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==",
+      "dev": true,
+      "optional": true
+    },
+    "tsutils": {
+      "version": "2.29.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
+      "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.8.1"
+      }
+    },
+    "tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+      "dev": true
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "dev": true,
+      "optional": true
+    },
+    "type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "~1.1.2"
+      }
+    },
+    "type-is": {
+      "version": "1.6.16",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
+      "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
+      "dev": true,
+      "requires": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.18"
+      }
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
+    },
+    "typedoc": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.11.1.tgz",
+      "integrity": "sha512-jdNIoHm5wkZqxQTe/g9AQ3LKnZyrzHXqu6A/c9GUOeJyBWLxNr7/Dm3rwFvLksuxRNwTvY/0HRDU9sJTa9WQSg==",
+      "dev": true,
+      "requires": {
+        "@types/fs-extra": "5.0.1",
+        "@types/handlebars": "4.0.36",
+        "@types/highlight.js": "9.12.2",
+        "@types/lodash": "4.14.104",
+        "@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",
+        "typescript": "2.7.2"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
+          "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "typescript": {
+          "version": "2.7.2",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz",
+          "integrity": "sha512-p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw==",
+          "dev": true
+        }
+      }
+    },
+    "typedoc-default-themes": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/typedoc-default-themes/-/typedoc-default-themes-0.5.0.tgz",
+      "integrity": "sha1-bcJDPnjti+qOiHo6zeLzF4W9Yic=",
+      "dev": true
+    },
+    "typescript": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
+      "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
+      "dev": true
+    },
+    "uc.micro": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.5.tgz",
+      "integrity": "sha512-JoLI4g5zv5qNyT09f4YAvEZIIV1oOjqnewYg5D38dkQljIzpPT296dbIGvKro3digYI1bkb7W6EP1y4uDlmzLg==",
+      "dev": true
+    },
+    "uglify-js": {
+      "version": "3.4.6",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.6.tgz",
+      "integrity": "sha512-O1D7L6WcOzS1qW2ehopEm4cWm5yA6bQBozlks8jO8ODxYCy4zv+bR/la4Lwp01tpkYGNonnpXvUpYtrvSu8Yzg==",
+      "dev": true,
+      "requires": {
+        "commander": "~2.16.0",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.16.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz",
+          "integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "uglify-to-browserify": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
+      "dev": true,
+      "optional": true
+    },
+    "uglifyjs-webpack-plugin": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.7.tgz",
+      "integrity": "sha512-1VicfKhCYHLS8m1DCApqBhoulnASsEoJ/BvpUpP4zoNAPpKzdH+ghk0olGJMmwX2/jprK2j3hAHdUbczBSy2FA==",
+      "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"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.13.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz",
+          "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "uglify-es": {
+          "version": "3.3.9",
+          "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz",
+          "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
+          "dev": true,
+          "requires": {
+            "commander": "~2.13.0",
+            "source-map": "~0.6.1"
+          }
+        }
+      }
+    },
+    "ultron": {
+      "version": "1.1.1",
+      "resolved": "http://localhost:4873/ultron/-/ultron-1.1.1.tgz",
+      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
+      "dev": true
+    },
+    "underscore": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
+      "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==",
+      "dev": true
+    },
+    "underscore.string": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz",
+      "integrity": "sha1-jN2PusTi0uoefi6Al8QvRCKA+Fs=",
+      "dev": true
+    },
+    "unherit": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.1.tgz",
+      "integrity": "sha512-+XZuV691Cn4zHsK0vkKYwBEwB74T3IZIcxrgn2E4rKwTfFyI1zCh7X7grwh9Re08fdPlarIdyWgI8aVB3F5A5g==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "xtend": "^4.0.1"
+      }
+    },
+    "unified": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/unified/-/unified-6.2.0.tgz",
+      "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"
+      }
+    },
+    "union-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
+      "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+      "requires": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^0.4.3"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "set-value": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
+          "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-extendable": "^0.1.1",
+            "is-plain-object": "^2.0.1",
+            "to-object-path": "^0.3.0"
+          }
+        }
+      }
+    },
+    "unique-filename": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz",
+      "integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=",
+      "dev": true,
+      "requires": {
+        "unique-slug": "^2.0.0"
+      }
+    },
+    "unique-slug": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz",
+      "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=",
+      "dev": true,
+      "requires": {
+        "imurmurhash": "^0.1.4"
+      }
+    },
+    "unique-string": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
+      "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
+      "dev": true,
+      "requires": {
+        "crypto-random-string": "^1.0.0"
+      }
+    },
+    "unist-util-is": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.2.tgz",
+      "integrity": "sha512-YkXBK/H9raAmG7KXck+UUpnKiNmUdB+aBGrknfQ4EreE1banuzrKABx3jP6Z5Z3fMSPMQQmeXBlKpCbMwBkxVw==",
+      "dev": true
+    },
+    "unist-util-modify-children": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-1.1.2.tgz",
+      "integrity": "sha512-GRi04yhng1WqBf5RBzPkOtWAadcZS2gvuOgNn/cyJBYNxtTuyYqTKN0eg4rC1YJwGnzrqfRB3dSKm8cNCjNirg==",
+      "dev": true,
+      "requires": {
+        "array-iterate": "^1.0.0"
+      }
+    },
+    "unist-util-remove-position": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.2.tgz",
+      "integrity": "sha512-XxoNOBvq1WXRKXxgnSYbtCF76TJrRoe5++pD4cCBsssSiWSnPEktyFrFLE8LTk3JW5mt9hB0Sk5zn4x/JeWY7Q==",
+      "dev": true,
+      "requires": {
+        "unist-util-visit": "^1.1.0"
+      }
+    },
+    "unist-util-stringify-position": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz",
+      "integrity": "sha512-pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ==",
+      "dev": true
+    },
+    "unist-util-visit": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.0.tgz",
+      "integrity": "sha512-FiGu34ziNsZA3ZUteZxSFaczIjGmksfSgdKqBfOejrrfzyUy5b7YrlzT1Bcvi+djkYDituJDy2XB7tGTeBieKw==",
+      "dev": true,
+      "requires": {
+        "unist-util-visit-parents": "^2.0.0"
+      }
+    },
+    "unist-util-visit-parents": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.0.1.tgz",
+      "integrity": "sha512-6B0UTiMfdWql4cQ03gDTCSns+64Zkfo2OCbK31Ov0uMizEz+CJeAp0cgZVb5Fhmcd7Bct2iRNywejT0orpbqUA==",
+      "dev": true,
+      "requires": {
+        "unist-util-is": "^2.1.2"
+      }
+    },
+    "universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true
+    },
+    "unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "dev": true
+    },
+    "unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "requires": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "dependencies": {
+        "has-value": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+          "requires": {
+            "get-value": "^2.0.3",
+            "has-values": "^0.1.4",
+            "isobject": "^2.0.0"
+          },
+          "dependencies": {
+            "isobject": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+              "requires": {
+                "isarray": "1.0.0"
+              }
+            }
+          }
+        },
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="
+        }
+      }
+    },
+    "unzip-response": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
+      "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=",
+      "dev": true
+    },
+    "upath": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
+      "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw=="
+    },
+    "update-notifier": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz",
+      "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
+      "dev": true,
+      "requires": {
+        "boxen": "^1.2.1",
+        "chalk": "^2.0.1",
+        "configstore": "^3.0.0",
+        "import-lazy": "^2.1.0",
+        "is-ci": "^1.0.10",
+        "is-installed-globally": "^0.1.0",
+        "is-npm": "^1.0.0",
+        "latest-version": "^3.0.0",
+        "semver-diff": "^2.0.0",
+        "xdg-basedir": "^3.0.0"
+      }
+    },
+    "upper-case": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
+      "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
+      "dev": true
+    },
+    "uri-js": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-3.0.2.tgz",
+      "integrity": "sha1-+QuFhQf4HepNz7s8TD2/orVX+qo=",
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
+    },
+    "url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "dev": true,
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+          "dev": true
+        }
+      }
+    },
+    "url-join": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.0.tgz",
+      "integrity": "sha1-TTNA6AfTdzvamZH4MFrNzCpmXSo=",
+      "dev": true
+    },
+    "url-loader": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-1.0.1.tgz",
+      "integrity": "sha512-rAonpHy7231fmweBKUFe0bYnlGDty77E+fm53NZdij7j/YOpyGzc7ttqG1nAXl3aRs0k41o0PC3TvGXQiw2Zvw==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.1.0",
+        "mime": "^2.0.3",
+        "schema-utils": "^0.4.3"
+      },
+      "dependencies": {
+        "mime": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz",
+          "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==",
+          "dev": true
+        }
+      }
+    },
+    "url-parse": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.3.tgz",
+      "integrity": "sha512-rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw==",
+      "dev": true,
+      "requires": {
+        "querystringify": "^2.0.0",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "url-parse-lax": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
+      "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
+      "dev": true,
+      "requires": {
+        "prepend-http": "^1.0.1"
+      }
+    },
+    "use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
+    },
+    "useragent": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz",
+      "integrity": "sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4=",
+      "dev": true,
+      "requires": {
+        "lru-cache": "2.2.x",
+        "tmp": "0.0.x"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "2.2.4",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz",
+          "integrity": "sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=",
+          "dev": true
+        }
+      }
+    },
+    "util": {
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3"
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    },
+    "util.promisify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
+      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "object.getownpropertydescriptors": "^2.0.3"
+      }
+    },
+    "utila": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
+      "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=",
+      "dev": true
+    },
+    "utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+      "dev": true
+    },
+    "uuid": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
+      "dev": true
+    },
+    "uws": {
+      "version": "9.14.0",
+      "resolved": "https://registry.npmjs.org/uws/-/uws-9.14.0.tgz",
+      "integrity": "sha512-HNMztPP5A1sKuVFmdZ6BPVpBQd5bUjNC8EFMFiICK+oho/OQsAJy5hnIx4btMHiOk8j04f/DbIlqnEZ9d72dqg==",
+      "dev": true,
+      "optional": true
+    },
+    "v8-compile-cache": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz",
+      "integrity": "sha512-1wFuMUIM16MDJRCrpbpuEPTUGmM5QMUg0cr3KFwra2XgOgFcPGDQHDh3CszSCD2Zewc/dh/pamNEW8CbfDebUw==",
+      "dev": true
+    },
+    "v8flags": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.1.tgz",
+      "integrity": "sha512-iw/1ViSEaff8NJ3HLyEjawk/8hjJib3E7pvG4pddVXfUg1983s3VGsiClDjhK64MQVDGqc1Q8r18S4VKQZS9EQ==",
+      "dev": true,
+      "requires": {
+        "homedir-polyfill": "^1.0.1"
+      }
+    },
+    "validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "requires": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "validate-npm-package-name": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
+      "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
+      "dev": true,
+      "requires": {
+        "builtins": "^1.0.3"
+      }
+    },
+    "vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
+      "dev": true
+    },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
+    "vfile": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/vfile/-/vfile-2.3.0.tgz",
+      "integrity": "sha512-ASt4mBUHcTpMKD/l5Q+WJXNtshlWxOogYyGYYrg4lt/vuRjC1EFQtlAofL5VmtVNIZJzWYFJjzGWZ0Gw8pzW1w==",
+      "dev": true,
+      "requires": {
+        "is-buffer": "^1.1.4",
+        "replace-ext": "1.0.0",
+        "unist-util-stringify-position": "^1.0.0",
+        "vfile-message": "^1.0.0"
+      },
+      "dependencies": {
+        "replace-ext": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
+          "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
+          "dev": true
+        }
+      }
+    },
+    "vfile-location": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.3.tgz",
+      "integrity": "sha512-zM5/l4lfw1CBoPx3Jimxoc5RNDAHHpk6AM6LM0pTIkm5SUSsx8ZekZ0PVdf0WEZ7kjlhSt7ZlqbRL6Cd6dBs6A==",
+      "dev": true
+    },
+    "vfile-message": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-1.0.1.tgz",
+      "integrity": "sha512-vSGCkhNvJzO6VcWC6AlJW4NtYOVtS+RgCaqFIYUjoGIlHnFL+i0LbtYvonDWOMcB97uTPT4PRsyYY7REWC9vug==",
+      "dev": true,
+      "requires": {
+        "unist-util-stringify-position": "^1.1.1"
+      }
+    },
+    "vinyl": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
+      "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
+      "dev": true,
+      "requires": {
+        "clone": "^1.0.0",
+        "clone-stats": "^0.0.1",
+        "replace-ext": "0.0.1"
+      },
+      "dependencies": {
+        "clone": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+          "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
+          "dev": true
+        }
+      }
+    },
+    "viz.js": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/viz.js/-/viz.js-1.8.2.tgz",
+      "integrity": "sha512-W+1+N/hdzLpQZEcvz79n2IgUE9pfx6JLdHh3Kh8RGvLL8P1LdJVQmi2OsDcLdY4QVID4OUy+FPelyerX0nJxIQ=="
+    },
+    "vlq": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz",
+      "integrity": "sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==",
+      "dev": true
+    },
+    "vm-browserify": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+      "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
+      "dev": true,
+      "requires": {
+        "indexof": "0.0.1"
+      }
+    },
+    "void-elements": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
+      "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
+      "dev": true
+    },
+    "watchpack": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
+      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
+      "dev": true,
+      "requires": {
+        "chokidar": "^2.0.2",
+        "graceful-fs": "^4.1.2",
+        "neo-async": "^2.5.0"
+      }
+    },
+    "wbuf": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+      "dev": true,
+      "requires": {
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "web-animations-js": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/web-animations-js/-/web-animations-js-2.3.1.tgz",
+      "integrity": "sha1-Om2bwVGWN3qQ+OKAP6UmIWWwRRA="
+    },
+    "webassemblyjs": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/webassemblyjs/-/webassemblyjs-1.4.3.tgz",
+      "integrity": "sha512-4lOV1Lv6olz0PJkDGQEp82HempAn147e6BXijWDzz9g7/2nSebVP9GVg62Fz5ZAs55mxq13GA0XLyvY8XkyDjg==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.4.3",
+        "@webassemblyjs/validation": "1.4.3",
+        "@webassemblyjs/wasm-parser": "1.4.3",
+        "@webassemblyjs/wast-parser": "1.4.3",
+        "long": "^3.2.0"
+      }
+    },
+    "webdriver-js-extender": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/webdriver-js-extender/-/webdriver-js-extender-2.0.0.tgz",
+      "integrity": "sha512-fbyKiVu3azzIc5d4+26YfuPQcFTlgFQV5yQ/0OQj4Ybkl4g1YQuIPskf5v5wqwRJhHJnPHthB6tqCjWHOKLWag==",
+      "dev": true,
+      "requires": {
+        "@types/selenium-webdriver": "^3.0.0",
+        "selenium-webdriver": "^3.0.1"
+      }
+    },
+    "webpack": {
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.9.2.tgz",
+      "integrity": "sha512-jlWrCrJDU3sdWFprel6jHH8esN2C++Q8ehedRo74u7MWLTUJn9SD7RSgsCTEZCSRpVpMascDylAqPoldauOMfA==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.4.3",
+        "@webassemblyjs/wasm-edit": "1.4.3",
+        "@webassemblyjs/wasm-parser": "1.4.3",
+        "acorn": "^5.0.0",
+        "acorn-dynamic-import": "^3.0.0",
+        "ajv": "^6.1.0",
+        "ajv-keywords": "^3.1.0",
+        "chrome-trace-event": "^0.1.1",
+        "enhanced-resolve": "^4.0.0",
+        "eslint-scope": "^3.7.1",
+        "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.0.0",
+        "uglifyjs-webpack-plugin": "^1.2.4",
+        "watchpack": "^1.5.0",
+        "webpack-sources": "^1.0.1"
+      }
+    },
+    "webpack-bundle-analyzer": {
+      "version": "2.13.1",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.1.tgz",
+      "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"
+      },
+      "dependencies": {
+        "ws": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-4.1.0.tgz",
+          "integrity": "sha512-ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA==",
+          "dev": true,
+          "requires": {
+            "async-limiter": "~1.0.0",
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "webpack-cli": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.1.0.tgz",
+      "integrity": "sha512-p5NeKDtYwjZozUWq6kGNs9w+Gtw/CPvyuXjXn2HMdz8Tie+krjEg8oAtonvIyITZdvpF7XG9xDHwscLr2c+ugQ==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.1",
+        "cross-spawn": "^6.0.5",
+        "enhanced-resolve": "^4.0.0",
+        "global-modules-path": "^2.1.0",
+        "import-local": "^1.0.0",
+        "inquirer": "^6.0.0",
+        "interpret": "^1.1.0",
+        "loader-utils": "^1.1.0",
+        "supports-color": "^5.4.0",
+        "v8-compile-cache": "^2.0.0",
+        "yargs": "^12.0.1"
+      },
+      "dependencies": {
+        "ansi-escapes": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
+          "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==",
+          "dev": true
+        },
+        "chardet": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.5.0.tgz",
+          "integrity": "sha512-9ZTaoBaePSCFvNlNGrsyI8ZVACP2svUtq0DkM7t4K2ClAa96sqOIRjAzDTc8zXzFt1cZR46rRzLTiHFSJ+Qw0g==",
+          "dev": true
+        },
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "dev": true,
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "decamelize": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
+          "integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==",
+          "dev": true,
+          "requires": {
+            "xregexp": "4.0.0"
+          }
+        },
+        "external-editor": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.0.tgz",
+          "integrity": "sha512-mpkfj0FEdxrIhOC04zk85X7StNtr0yXnG7zCb+8ikO8OJi2jsHh5YGoknNTyXgsbHOf1WOOcVU3kPFWT2WgCkQ==",
+          "dev": true,
+          "requires": {
+            "chardet": "^0.5.0",
+            "iconv-lite": "^0.4.22",
+            "tmp": "^0.0.33"
+          }
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "iconv-lite": {
+          "version": "0.4.23",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
+          "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
+          "dev": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
+        },
+        "inquirer": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.1.0.tgz",
+          "integrity": "sha512-f9K2MMx/G/AVmJSaZg2a+GVLRRmTdlGLbwxsibNd6yNTxXujqxPypjCnxnC0y4+Wb/rNY5KyKuq06AO5jrE+7w==",
+          "dev": true,
+          "requires": {
+            "ansi-escapes": "^3.0.0",
+            "chalk": "^2.0.0",
+            "cli-cursor": "^2.1.0",
+            "cli-width": "^2.0.0",
+            "external-editor": "^3.0.0",
+            "figures": "^2.0.0",
+            "lodash": "^4.3.0",
+            "mute-stream": "0.0.7",
+            "run-async": "^2.2.0",
+            "rxjs": "^6.1.0",
+            "string-width": "^2.1.0",
+            "strip-ansi": "^4.0.0",
+            "through": "^2.3.6"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.0.0.tgz",
+          "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz",
+          "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==",
+          "dev": true
+        },
+        "semver": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
+          "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
+          "dev": true
+        },
+        "xregexp": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz",
+          "integrity": "sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==",
+          "dev": true
+        },
+        "yargs": {
+          "version": "12.0.1",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.1.tgz",
+          "integrity": "sha512-B0vRAp1hRX4jgIOWFtjfNjd9OA9RWYZ6tqGA9/I/IrTMsxmKvtWy+ersM+jzpQqbC3YfLzeABPdeTgcJ9eu1qQ==",
+          "dev": true,
+          "requires": {
+            "cliui": "^4.0.0",
+            "decamelize": "^2.0.0",
+            "find-up": "^3.0.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 || ^4.0.0",
+            "yargs-parser": "^10.1.0"
+          }
+        },
+        "yargs-parser": {
+          "version": "10.1.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
+          "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^4.1.0"
+          }
+        }
+      }
+    },
+    "webpack-core": {
+      "version": "0.6.9",
+      "resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz",
+      "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
+      "dev": true,
+      "requires": {
+        "source-list-map": "~0.1.7",
+        "source-map": "~0.4.1"
+      },
+      "dependencies": {
+        "source-list-map": {
+          "version": "0.1.8",
+          "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
+          "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+          "dev": true,
+          "requires": {
+            "amdefine": ">=0.0.4"
+          }
+        }
+      }
+    },
+    "webpack-dev-middleware": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.1.3.tgz",
+      "integrity": "sha512-I6Mmy/QjWU/kXwCSFGaiOoL5YEQIVmbb0o45xMoCyQAg/mClqZVTcsX327sPfekDyJWpCxb+04whNyLOIxpJdQ==",
+      "dev": true,
+      "requires": {
+        "loud-rejection": "^1.6.0",
+        "memory-fs": "~0.4.1",
+        "mime": "^2.1.0",
+        "path-is-absolute": "^1.0.0",
+        "range-parser": "^1.0.3",
+        "url-join": "^4.0.0",
+        "webpack-log": "^1.0.1"
+      },
+      "dependencies": {
+        "mime": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz",
+          "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==",
+          "dev": true
+        }
+      }
+    },
+    "webpack-dev-server": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.5.tgz",
+      "integrity": "sha512-LVHg+EPwZLHIlfvokSTgtJqO/vI5CQi89fASb5JEDtVMDjY0yuIEqPPdMiKaBJIB/Ab7v/UN/sYZ7WsZvntQKw==",
+      "dev": true,
+      "requires": {
+        "ansi-html": "0.0.7",
+        "array-includes": "^3.0.3",
+        "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": "^1.0.0",
+        "internal-ip": "1.2.0",
+        "ip": "^1.1.5",
+        "killable": "^1.0.0",
+        "loglevel": "^1.4.1",
+        "opn": "^5.1.0",
+        "portfinder": "^1.0.9",
+        "selfsigned": "^1.9.1",
+        "serve-index": "^1.7.2",
+        "sockjs": "0.3.19",
+        "sockjs-client": "1.1.5",
+        "spdy": "^3.4.1",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^5.1.0",
+        "webpack-dev-middleware": "3.1.3",
+        "webpack-log": "^1.1.2",
+        "yargs": "11.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "yargs": {
+          "version": "11.0.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.0.0.tgz",
+          "integrity": "sha512-Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw==",
+          "dev": true,
+          "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"
+          }
+        },
+        "yargs-parser": {
+          "version": "9.0.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz",
+          "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
+          "dev": true,
+          "requires": {
+            "camelcase": "^4.1.0"
+          }
+        }
+      }
+    },
+    "webpack-log": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-1.2.0.tgz",
+      "integrity": "sha512-U9AnICnu50HXtiqiDxuli5gLB5PGBo7VvcHx36jRZHwK4vzOYLbImqT4lwWwoMHdQWwEKw736fCHEekokTEKHA==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.1.0",
+        "log-symbols": "^2.1.0",
+        "loglevelnext": "^1.0.1",
+        "uuid": "^3.1.0"
+      }
+    },
+    "webpack-merge": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-2.6.1.tgz",
+      "integrity": "sha1-8dgB0sXTn4P/7J8RkkCz476ZShw=",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.4"
+      }
+    },
+    "webpack-sources": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.1.0.tgz",
+      "integrity": "sha512-aqYp18kPphgoO5c/+NaUvEeACtZjMESmDChuD3NBciVpah3XpMEU9VAAtIaB1BsfJWWTSdv8Vv1m3T0aRk2dUw==",
+      "dev": true,
+      "requires": {
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "webpack-subresource-integrity": {
+      "version": "1.1.0-rc.4",
+      "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.4.tgz",
+      "integrity": "sha1-xcTj1pD50vZKlVDgeodn+Xlqpdg=",
+      "dev": true,
+      "requires": {
+        "webpack-core": "^0.6.8"
+      }
+    },
+    "websocket-driver": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
+      "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
+      "dev": true,
+      "requires": {
+        "http-parser-js": ">=0.4.0",
+        "websocket-extensions": ">=0.1.1"
+      }
+    },
+    "websocket-extensions": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
+      "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
+      "dev": true
+    },
+    "when": {
+      "version": "3.7.8",
+      "resolved": "https://registry.npmjs.org/when/-/when-3.7.8.tgz",
+      "integrity": "sha1-xxMLan6gRpPoQs3J56Hyqjmjn4I="
+    },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
+    },
+    "wide-align": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+      "dev": true,
+      "requires": {
+        "string-width": "^1.0.2 || 2"
+      }
+    },
     "widest-line": {
       "version": "2.0.0",
-      "resolved": "http://localhost:4873/widest-line/-/widest-line-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.0.tgz",
       "integrity": "sha1-AUKk6KJD+IgsAjOqDgKBqnYVInM=",
       "dev": true,
       "requires": {
@@ -20385,26 +15706,26 @@
     },
     "window-size": {
       "version": "0.1.0",
-      "resolved": "http://localhost:4873/window-size/-/window-size-0.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
       "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
       "dev": true
     },
     "with-callback": {
       "version": "1.0.2",
-      "resolved": "http://localhost:4873/with-callback/-/with-callback-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/with-callback/-/with-callback-1.0.2.tgz",
       "integrity": "sha1-oJYpuakgAo1yFAT7Q1vc/1yRvCE=",
       "dev": true,
       "optional": true
     },
     "wordwrap": {
-      "version": "0.0.2",
-      "resolved": "http://localhost:4873/wordwrap/-/wordwrap-0.0.2.tgz",
-      "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
       "dev": true
     },
     "worker-farm": {
       "version": "1.6.0",
-      "resolved": "http://localhost:4873/worker-farm/-/worker-farm-1.6.0.tgz",
+      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz",
       "integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
       "dev": true,
       "requires": {
@@ -20413,7 +15734,7 @@
     },
     "worker-loader": {
       "version": "1.1.1",
-      "resolved": "http://localhost:4873/worker-loader/-/worker-loader-1.1.1.tgz",
+      "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",
@@ -20422,7 +15743,7 @@
     },
     "wrap-ansi": {
       "version": "2.1.0",
-      "resolved": "http://localhost:4873/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
       "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
       "requires": {
         "string-width": "^1.0.1",
@@ -20431,12 +15752,12 @@
       "dependencies": {
         "ansi-regex": {
           "version": "2.1.1",
-          "resolved": "http://localhost:4873/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
         },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
-          "resolved": "http://localhost:4873/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "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"
@@ -20444,7 +15765,7 @@
         },
         "string-width": {
           "version": "1.0.2",
-          "resolved": "http://localhost:4873/string-width/-/string-width-1.0.2.tgz",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "requires": {
             "code-point-at": "^1.0.0",
@@ -20454,7 +15775,7 @@
         },
         "strip-ansi": {
           "version": "3.0.1",
-          "resolved": "http://localhost:4873/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "requires": {
             "ansi-regex": "^2.0.0"
@@ -20464,13 +15785,13 @@
     },
     "wrappy": {
       "version": "1.0.2",
-      "resolved": "http://localhost:4873/wrappy/-/wrappy-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
       "dev": true
     },
     "write-file-atomic": {
       "version": "2.3.0",
-      "resolved": "http://localhost:4873/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
       "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
       "dev": true,
       "requires": {
@@ -20492,19 +15813,19 @@
     },
     "x-is-string": {
       "version": "0.1.0",
-      "resolved": "http://localhost:4873/x-is-string/-/x-is-string-0.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/x-is-string/-/x-is-string-0.1.0.tgz",
       "integrity": "sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI=",
       "dev": true
     },
     "xdg-basedir": {
       "version": "3.0.0",
-      "resolved": "http://localhost:4873/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
       "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=",
       "dev": true
     },
     "xml2js": {
       "version": "0.4.19",
-      "resolved": "http://localhost:4873/xml2js/-/xml2js-0.4.19.tgz",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
       "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
       "dev": true,
       "requires": {
@@ -20514,7 +15835,7 @@
       "dependencies": {
         "sax": {
           "version": "1.2.4",
-          "resolved": "http://localhost:4873/sax/-/sax-1.2.4.tgz",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
           "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
           "dev": true
         }
@@ -20522,32 +15843,38 @@
     },
     "xmlbuilder": {
       "version": "9.0.7",
-      "resolved": "http://localhost:4873/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
       "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
       "dev": true
     },
+    "xmldom": {
+      "version": "0.1.27",
+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
+      "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk=",
+      "dev": true
+    },
     "xmlhttprequest-ssl": {
       "version": "1.5.5",
-      "resolved": "http://localhost:4873/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz",
       "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=",
       "dev": true
     },
     "xregexp": {
       "version": "2.0.0",
-      "resolved": "http://localhost:4873/xregexp/-/xregexp-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",
       "integrity": "sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=",
       "dev": true,
       "optional": true
     },
     "xtend": {
       "version": "4.0.1",
-      "resolved": "http://localhost:4873/xtend/-/xtend-4.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
       "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
       "dev": true
     },
     "xxhashjs": {
       "version": "0.2.2",
-      "resolved": "http://localhost:4873/xxhashjs/-/xxhashjs-0.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/xxhashjs/-/xxhashjs-0.2.2.tgz",
       "integrity": "sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==",
       "dev": true,
       "requires": {
@@ -20556,18 +15883,18 @@
     },
     "y18n": {
       "version": "3.2.1",
-      "resolved": "http://localhost:4873/y18n/-/y18n-3.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
       "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE="
     },
     "yallist": {
       "version": "2.1.2",
-      "resolved": "http://localhost:4873/yallist/-/yallist-2.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
       "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
     },
     "yargs": {
-      "version": "11.0.0",
-      "resolved": "http://localhost:4873/yargs/-/yargs-11.0.0.tgz",
-      "integrity": "sha512-Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw==",
+      "version": "11.1.0",
+      "resolved": "https://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",
@@ -20585,7 +15912,7 @@
       "dependencies": {
         "yargs-parser": {
           "version": "9.0.2",
-          "resolved": "http://localhost:4873/yargs-parser/-/yargs-parser-9.0.2.tgz",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz",
           "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
           "requires": {
             "camelcase": "^4.1.0"
@@ -20595,7 +15922,7 @@
     },
     "yargs-parser": {
       "version": "10.0.0",
-      "resolved": "http://localhost:4873/yargs-parser/-/yargs-parser-10.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.0.0.tgz",
       "integrity": "sha512-+DHejWujTVYeMHLff8U96rLc4uE4Emncoftvn5AjhB1Jw1pWxLzgBUT/WYbPrHmy6YPEBTZQx5myHhVcuuu64g==",
       "requires": {
         "camelcase": "^4.1.0"
@@ -20603,19 +15930,19 @@
     },
     "yeast": {
       "version": "0.1.2",
-      "resolved": "http://localhost:4873/yeast/-/yeast-0.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
       "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=",
       "dev": true
     },
     "yn": {
       "version": "2.0.0",
-      "resolved": "http://localhost:4873/yn/-/yn-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-2.0.0.tgz",
       "integrity": "sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=",
       "dev": true
     },
     "zone.js": {
       "version": "0.8.26",
-      "resolved": "http://localhost:4873/zone.js/-/zone.js-0.8.26.tgz",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.26.tgz",
       "integrity": "sha512-W9Nj+UmBJG251wkCacIkETgra4QgBo/vgoEkb4a2uoLzpQG7qF9nzwoLXWU5xj3Fg2mxGvEDh47mg24vXccYjA=="
     }
   }
diff --git a/package.json b/package.json
index d15b067b18..b989dd51fb 100644
--- a/package.json
+++ b/package.json
@@ -1,32 +1,31 @@
 {
   "name": "alfresco-components",
   "description": "Alfresco Angular components",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "author": "Alfresco Software, Ltd.",
   "main": "./index.js",
   "scripts": {
-    "docbuild": "node ./tools/doc/docProcessor.js",
+    "docbuild": "node node_modules/typedoc/bin/typedoc --tsconfig tsconfig.json --json docs/docs.json --exclude '**/*.spec.ts' --ignoreCompilerErrors && node tools/doc/buildYamlSourceInfo.js docs/docs.json && node ./tools/doc/docProcessor.js",
     "prepublishOnly": "npm run build-lib",
     "markdownlint": "markdownlint ./docs",
     "build-lib": "./scripts/ng-packagr.sh",
     "bundlesize-check": "bundlesize",
-    "bundlesize-map": "npm run webpack -- --config ./lib/config/webpack.bundle-check.js --progress --profile --bail",
     "lint-lib": "./node_modules/.bin/tslint -p ./lib/tsconfig.json -c ./lib/tslint.json",
+    "lint-e2e": "./node_modules/.bin/tslint --fix -p ./e2e/tsconfig.e2e.json -c ./tslint.json",
     "test-export": "ts-node ./tools/export-check/exportCheck.ts ./lib/core/public-api.ts ./lib/process-services/public-api.ts ./lib/content-services/public-api.ts ./lib/insights/public-api.ts",
-    "test-lib": "node ./node_modules/karma/bin/karma start ./lib/karma.conf.js --reporters mocha,coverage --single-run --component .",
-    "test-lib-browser": "node ./node_modules/karma/bin/karma start ./lib/karma.conf.js --reporters kjhtml",
     "ng": "ng",
     "validate-config": "ajv validate -s ./lib/core/app-config/schema.json -d ./demo-shell/src/app.config.json --errors=text --verbose",
-    "start": "npm run validate-config && npm run server-versions  && ng serve --host 0.0.0.0 --proxy-config ./demo-shell/proxy.conf.js --app dist --open",
-    "start:dev": "npm run validate-config && npm run server-versions && concurrently \"ng serve --host 0.0.0.0 --disable-host-check --app dev --proxy-config ./demo-shell/proxy.conf.js --open\" \"npm run style:dev --watch\" ",
-    "start:dist": "npm run validate-config && npm run server-versions && ng serve --prod --host 0.0.0.0 --disable-host-check --app dist --proxy-config ./demo-shell/proxy.conf.js --open",
-    "build": "npm run validate-config && npm run server-versions && ng build --app dist",
-    "build:dev": "npm run validate-config && npm run lint && npm run style:dev && npm run server-versions && ng build --app dev",
-    "build:dist": "npm run validate-config && npm run server-versions && ng build --prod --app dist",
+    "start": "ng lint dist && npm run validate-config && npm run server-versions  && ng serve dist --host 0.0.0.0 --proxy-config ./demo-shell/proxy.conf.js --open",
+    "start:dev": "ng lint dev && npm run validate-config && npm run server-versions && concurrently \"ng serve dev --host 0.0.0.0 --disable-host-check --proxy-config ./demo-shell/proxy.conf.js --open\" \"npm run style:dev --watch\" ",
+    "start:dist": "ng lint dist && npm run validate-config && npm run server-versions && ng serve dist --prod --host 0.0.0.0 --disable-host-check --proxy-config ./demo-shell/proxy.conf.js --open",
+    "build": "ng lint dev && npm run validate-config && npm run server-versions && ng build dist",
+    "build:dev": "npm run validate-config  && npm run style:dev && npm run server-versions && ng build dev",
+    "build:dist": "npm run validate-config && npm run server-versions && ng build dist --prod --stats-json ",
     "style:dev": "npm run webpack -- --config  ./lib/config/webpack.style.js --progress --profile --bail",
-    "test": "ng test --single-run",
-    "lint": "ng lint",
-    "e2e": "ng e2e --app dist --deleteOutputPath=false",
+    "webpack-bundle-analyzer": "webpack-bundle-analyzer demo-shell/dist/stats.json",
+    "test": "npm run validate-config && ng test dev --watch=false",
+    "e2e": "ng e2e demo-shell-e2e",
+    "e2e-lib": "ng e2e lib-e2e --port=4200 ",
     "server-versions": "rimraf ./demo-shell/src/versions.json && npm list --depth=0 --json=true --prod=true > ./demo-shell/src/versions.json  || exit 0",
     "clean": "rimraf dist ./node_modules typings",
     "clean-lock": "rimraf package-lock.json",
@@ -55,149 +54,137 @@
     "process services"
   ],
   "dependencies": {
-    "@alfresco/adf-content-services": "2.4.0",
-    "@alfresco/adf-core": "2.4.0",
-    "@alfresco/adf-insights": "2.4.0",
-    "@alfresco/adf-process-services": "2.4.0",
-    "@angular/animations": "5.1.1",
-    "@angular/cdk": "5.0.1",
-    "@angular/common": "5.1.1",
-    "@angular/compiler": "5.1.1",
-    "@angular/core": "5.1.1",
-    "@angular/flex-layout": "2.0.0-beta.12",
-    "@angular/forms": "5.1.1",
-    "@angular/http": "5.1.1",
-    "@angular/material": "5.0.1",
-    "@angular/material-moment-adapter": "5.0.1",
-    "@angular/platform-browser": "5.1.1",
-    "@angular/platform-browser-dynamic": "5.1.1",
-    "@angular/router": "5.1.1",
-    "@mat-datetimepicker/core": "1.0.4",
-    "@mat-datetimepicker/moment": "1.0.4",
-    "@ngx-translate/core": "9.1.1",
+    "@alfresco/adf-content-services": "2.5.0",
+    "@alfresco/adf-core": "2.5.0",
+    "@alfresco/adf-insights": "2.5.0",
+    "@alfresco/adf-process-services": "2.5.0",
+    "@angular-devkit/build-ng-packagr": "^0.7.1",
+    "@angular/animations": "6.1.2",
+    "@angular/cdk": "6.4.5",
+    "@angular/common": "6.1.2",
+    "@angular/compiler": "6.1.2",
+    "@angular/core": "6.1.2",
+    "@angular/flex-layout": "6.0.0-beta.16",
+    "@angular/forms": "6.1.2",
+    "@angular/http": "6.1.2",
+    "@angular/material": "6.4.5",
+    "@angular/material-moment-adapter": "6.4.5",
+    "@angular/platform-browser": "6.1.2",
+    "@angular/platform-browser-dynamic": "6.1.2",
+    "@angular/router": "6.1.2",
+    "@mat-datetimepicker/core": "2.0.1-beta.1",
+    "@mat-datetimepicker/moment": "2.0.1-beta.1",
+    "@ngx-translate/core": "10.0.2",
     "@nrwl/schematics": "^1.0.3",
-    "alfresco-js-api": "2.4.0",
+    "@schematics/angular": "^0.6.8",
+    "adf-tslint-rules": "0.0.4",
+    "alfresco-js-api": "2.5.0",
+    "alfresco-js-api-node": "2.5.0",
     "chart.js": "2.5.0",
     "classlist.js": "1.1.20150312",
-    "core-js": "2.4.1",
+    "core-js": "^2.5.4",
     "custom-event-polyfill": "0.3.0",
     "hammerjs": "2.0.8",
     "intl": "1.2.5",
-    "minimatch": "3.0.4",
-    "moment": "2.20.1",
+    "minimatch-browser": "1.0.0",
+    "moment": "2.22.2",
     "moment-es6": "^1.0.0",
     "ng2-charts": "1.6.0",
-    "pdfjs-dist": "2.0.265",
+    "ngx-monaco-editor": "^5.0.0",
+    "pdfjs-dist": "2.0.303",
+    "protractor-retry": "^1.2.0",
     "raphael": "2.2.7",
     "reflect-metadata": "0.1.10",
-    "rxjs": "5.5.2",
+    "rxjs": "^6.0.0",
+    "rxjs-compat": "^6.1.0",
     "systemjs": "0.19.27",
     "web-animations-js": "2.3.1",
-    "zone.js": "^0.8.26"
+    "zone.js": "~0.8.26"
   },
   "devDependencies": {
-    "@angular/cli": "1.7.4",
-    "@angular/compiler-cli": "^5.2.0",
+    "@angular-devkit/build-angular": "^0.7.2",
+    "@angular/cli": "^6.1.3",
+    "@angular/compiler-cli": "6.1.2",
     "@types/hammerjs": "2.0.35",
     "@types/jasmine": "~2.8.3",
     "@types/jasminewd2": "~2.0.2",
     "@types/node": "6.0.90",
     "ajv-cli": "^3.0.0",
     "angular2-template-loader": "0.6.2",
+    "astrolabe": "^0.3.6",
     "autoprefixer": "6.5.4",
     "bundlesize": "^0.15.3",
     "chalk": "^2.3.2",
     "codelyzer": "4.3.0",
     "commander": "^2.15.1",
     "concurrently": "^3.5.1",
-    "copy-webpack-plugin": "4.0.1",
-    "css-loader": "0.25.0",
-    "css-to-string-loader": "0.1.2",
-    "cssnano": "3.8.1",
     "ejs": "^2.6.1",
-    "extract-text-webpack-plugin": "2.0.0-rc.3",
-    "file-loader": "0.11.1",
-    "fork-ts-checker-webpack-plugin": "0.2.3",
+    "extract-text-webpack-plugin": "^4.0.0-beta.0",
     "fs-extra": "^4.0.2",
-    "graphql-request": "^1.6.0",
-    "happypack": "4.0.0",
-    "html-loader": "0.4.4",
-    "html-webpack-plugin": "2.28.0",
-    "istanbul-instrumenter-loader": "3.0.0",
     "jasmine-ajax": "3.2.0",
     "jasmine-core": "~2.8.0",
+    "jasmine-reporters": "^2.3.1",
     "jasmine-spec-reporter": "~4.2.1",
+    "jasmine2-protractor-utils": "1.1.3",
+    "js-yaml": "^3.12.0",
     "karma": "~2.0.0",
     "karma-chrome-launcher": "~2.2.0",
     "karma-cli": "~1.0.1",
-    "karma-coverage": "1.1.1",
+    "karma-coverage": "^1.1.2",
     "karma-coverage-istanbul-reporter": "^1.2.1",
     "karma-jasmine": "~1.1.0",
     "karma-jasmine-ajax": "0.1.13",
     "karma-jasmine-html-reporter": "^0.2.2",
-    "karma-mocha-reporter": "2.2.2",
+    "karma-mocha-reporter": "2.2.5",
     "karma-remap-istanbul": "0.6.0",
-    "karma-sourcemap-loader": "0.3.7",
     "karma-systemjs": "0.16.0",
-    "karma-webpack": "2.0.9",
-    "loader-utils": "1.1.0",
     "markdown-toc": "1.1.0",
-    "markdownlint-cli": "^0.3.1",
+    "markdownlint-cli": "^0.12.0",
     "mdast-util-compact": "^1.0.1",
     "mdast-util-heading-range": "^2.1.0",
     "mdast-util-toc": "^2.0.1",
     "mdast-zone": "^3.0.1",
     "merge-stream": "1.0.1",
     "nconf": "^0.10.0",
-    "ng-packagr": "2.4.2",
-    "node-sass": "4.5.3",
-    "null-loader": "0.1.1",
-    "protractor": "~5.1.2",
+    "ng-packagr": "4.0.1",
+    "node-sass": "4.9.2",
+    "protractor": "^5.4.0",
     "raw-loader": "0.5.1",
-    "remap-istanbul": "0.6.3",
+    "remap-istanbul": "^0.11.1",
     "remark": "^9.0.0",
     "remark-frontmatter": "^1.2.0",
     "rimraf": "^2.6.2",
-    "rollup-plugin-cleanup": "^2.0.0",
-    "rollup-plugin-commonjs": "8.3.0",
-    "rollup-plugin-license": "^0.5.0",
-    "rollup-plugin-shift-header": "^1.0.1",
     "run-sequence": "1.2.2",
     "sass-loader": "6.0.5",
-    "script-loader": "0.7.0",
-    "scss-bundle": "2.1.0",
-    "source-map-loader": "0.2.3",
-    "style-loader": "0.13.1",
+    "scss-bundle": "2.3.2",
     "systemjs-builder": "0.15.34",
-    "to-string-loader": "1.1.5",
-    "traceur": "0.0.91",
-    "ts-loader": "3.3.0",
+    "traceur": "0.0.111",
     "ts-node": "~4.1.0",
-    "tsickle": "^0.26.0",
+    "tsickle": "^0.32.1",
     "tslint": "5.9.1",
-    "tslint-loader": "3.5.3",
     "typedoc": "^0.11.1",
-    "typescript": "2.6.1",
-    "uglifyjs-webpack-plugin": "1.1.6",
-    "webpack-bundle-analyzer": "2.9.0",
+    "typescript": "2.9.2",
+    "url-join": "^4.0.0",
+    "webpack-bundle-analyzer": "^2.13.1",
+    "webpack-cli": "^3.1.0",
     "webpack-merge": "2.6.1"
   },
   "license": "Apache-2.0",
   "bundlesize": [
     {
-      "path": "./lib/dist/content-services/bundles/adf-content-services.umd.js",
+      "path": "./lib/dist/content-services/bundles/adf-content-services.umd.min.js",
       "maxSize": "70 kb"
     },
     {
-      "path": "./lib/dist/process-services/bundles/adf-process-services.umd.js",
+      "path": "./lib/dist/process-services/bundles/adf-process-services.umd.min.js",
       "maxSize": "50 kb"
     },
     {
-      "path": "./lib/dist/insights/bundles/adf-insights.umd.js",
+      "path": "./lib/dist/insights/bundles/adf-insights.umd.min.js",
       "maxSize": "50 kb"
     },
     {
-      "path": "./lib/dist/core/bundles/adf-core.umd.js",
+      "path": "./lib/dist/core/bundles/adf-core.umd.min.js",
       "maxSize": "150 kb"
     }
   ],
diff --git a/protractor.conf.js b/protractor.conf.js
new file mode 100644
index 0000000000..4640f375ee
--- /dev/null
+++ b/protractor.conf.js
@@ -0,0 +1,137 @@
+// Protractor configuration file, see link for more information
+// https://github.com/angular/protractor/blob/master/lib/config.ts
+
+const path = require('path');
+const {SpecReporter} = require('jasmine-spec-reporter');
+const jasmineReporters = require('jasmine-reporters');
+const retry = require('protractor-retry').retry;
+
+const projectRoot = path.resolve(__dirname);
+
+const width = 1366;
+const height = 768;
+
+var HOST = process.env.URL_HOST_ADF;
+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 NAME_TEST = process.env.NAME_TEST ? true : false
+
+var specsToRun = './e2e/' + FOLDER + '**/*.e2e.ts';
+
+if (process.env.NAME_TEST) {
+    specsToRun =   './e2e/**/' + process.env.NAME_TEST;
+}
+
+var args_options = [];
+
+if (BROWSER_RUN === 'true') {
+    args_options = ['--incognito', '--window-size=1366,768', '--disable-gpu'];
+} else {
+    args_options = ['--incognito', '--headless', '--window-size=1366,768', '--disable-gpu'];
+}
+
+var downloadFolder = path.join(__dirname, 'e2e/downloads');
+
+exports.config = {
+    allScriptsTimeout: 60000,
+
+    specs: [
+        specsToRun
+    ],
+
+    capabilities: {
+        browserName: 'chrome',
+
+        shardTestFiles: true,
+        maxInstances: 2,
+        chromeOptions: {
+            prefs: {
+                'credentials_enable_service': false,
+                'download': {
+                    'prompt_for_download': false,
+                    'default_directory': downloadFolder
+                }
+            },
+            args: args_options
+        }
+    },
+
+    directConnect: DIRECT_CONNECCT,
+
+    baseUrl: "http://" + HOST,
+
+    framework: 'jasmine2',
+
+    jasmineNodeOpts: {
+        showColors: true,
+        defaultTimeoutInterval: 90000,
+        print: function () {
+        }
+    },
+
+    /**
+     * The address of a running selenium server (must be manually start before running the tests). If this is specified seleniumServerJar and seleniumPort will be ignored.
+     * @config {String} seleniumAddress
+     */
+    seleniumAddress: SELENIUM_SERVER,
+
+    plugins: [{
+        package: 'jasmine2-protractor-utils',
+        disableHTMLReport: false,
+        disableScreenshot: false,
+        screenshotOnExpectFailure: true,
+        screenshotOnSpecFailure: false,
+        clearFoldersBeforeTest: true,
+        htmlReportDir: `${projectRoot}/e2e-output/html-report/`,
+        screenshotPath: `${projectRoot}/e2e-output/screenshots/`
+    }],
+
+    onCleanUp(results) {
+        retry.onCleanUp(results);
+    },
+
+    onPrepare() {
+        retry.onPrepare();
+
+        require('ts-node').register({
+            project: 'e2e/tsconfig.e2e.json'
+        });
+
+        browser.manage().window().setSize(width, height);
+
+        jasmine.getEnv().addReporter(new SpecReporter({spec: {displayStacktrace: true}}));
+
+        jasmine.getEnv().addReporter(new jasmineReporters.JUnitXmlReporter({
+            consolidateAll: true,
+            savePath: `${projectRoot}/e2e-output/junit-report`,
+            filePrefix: 'results.xml',
+            useDotNotation: false,
+            useFullTestName: false,
+            reportFailedUrl: true
+        }));
+
+        return browser.driver.executeScript(disableCSSAnimation);
+
+        function disableCSSAnimation() {
+            var css = '* {' +
+                '-webkit-transition-duration: 0s !important;' +
+                'transition-duration: 0s !important;' +
+                '-webkit-animation-duration: 0s !important;' +
+                'animation-duration: 0s !important;' +
+                '}',
+                head = document.head || document.getElementsByTagName('head')[0],
+                style = document.createElement('style');
+
+            style.type = 'text/css';
+            style.appendChild(document.createTextNode(css));
+            head.appendChild(style);
+        }
+
+    },
+
+    afterLaunch() {
+        return retry.afterLaunch(3);
+    }
+};
diff --git a/scripts/README.md b/scripts/README.md
index 965c6f91fb..0a1e565963 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -22,7 +22,7 @@ feel of what's available.
 * Start the demo shell using the JS-API from the development branch and the local component in the lib folder
 
 ```sh
-./start.sh -dev -t -gitjsapi development
+./start.sh -dev -gitjsapi development
 ```
 
 * Build the lib folder using the JS-API from the development branch 
@@ -145,8 +145,8 @@ The default behaviour of the ***npm-build-all.sh*** install node_modules and bui
 | Option | Description |
 | --- | --- |
 | -h or --help    | show the help  |
-| -t or --test    | Run the tests, this parameter accepts also a wildcard to execute tests for example -t "ng2-alfresco-core" |
-| -d or --debug    | Run the tests **in browser**, this parameter accepts also a wildcard to execute tests for example -d "ng2-alfresco-core" |
+| -t or --test    | Run the tests, this parameter accepts also a wildcard to execute tests for example -t "core" |
+| -d or --debug    | Run the tests **in browser**, this parameter accepts also a wildcard to execute tests for example -d "core" |
 | -c or --clean   | clean the ng2_components folders before start from all the temp builds files as node_modules  |
 | -gitjsapi   | start the demo shell using an alfresco-js-api referenced by commit-ish version of the JS-API |
 | -si or --skipinstall    | skip the installation of the node_modules  |
@@ -171,6 +171,13 @@ The default behaviour of the ***npm-build-all.sh*** install node_modules and bui
 ./npm-build-all.sh -d
 ```
 
+* Build only a part of the component and run the tests only for a specific folder **in BROWSER**:
+(you can change core with, any other lib in the lib folder) 
+
+```sh
+./npm-build-all.sh -si -sb -d "core"
+```
+
 * Clean the lib folder node_modules before build
 
 ```sh
@@ -358,3 +365,53 @@ Internal script for update the rancher env
 ```sh
 /rancher-update.sh --access_key ACCESS_KEY --secret_key SECRET_KEY --url RANCHER_URL--environment_name adf-master --image docker:alfresco/demo-shell:master
 ```
+
+
+# test-e2e-lib.sh
+
+***test-e2e-lib.sh*** 
+
+Script to run e2e test
+
+| Option | Description |
+| --- | --- |
+|-u or --username |username to use|
+|-p or --password|password to use|
+|-e or --email |email user to use|
+|-b or --browser |browser run the test in the browsrwer (No headless mode)|
+|-s or --spec |spec run a single test file|
+|-dev or --dev |run it against local development environment it will deploy on localhost:4200 the current version of your branch|
+|-t or --timeout |override the timeout foe the wait utils|
+|-host or --host | host against to run the test|
+|-proxy or --proxy | proxy Back end URL to use |
+
+## Examples
+
+```sh
+./scripts/test-e2e-lib.sh -host adf.domain.com -u admin -p admin -e admin
+```
+
+Run on browser
+
+```sh
+./scripts/test-e2e-lib.sh -host adf.domain.com -u admin -p admin -e admin --browser
+```
+
+
+Run a single test
+
+```sh
+./scripts/test-e2e-lib.sh -host adf.domain.com -u admin -p admin -e admin --spec filenam.e2e.ts
+```
+
+if the test in a subfolder in e2e you need to add the subfolder in the path:
+
+```shnpm in
+./scripts/test-e2e-lib.sh -host adf.domain.com -u admin -p admin -e admin --spec ./core/filenam.e2e.ts
+```
+
+Use a different backend
+
+```sh
+./scripts/test-e2e-lib.sh -host localhost:42000 -proxy adf.domain.com  -u admin -p admin -e admin
+```
diff --git a/scripts/ng-packagr.sh b/scripts/ng-packagr.sh
index 42818bcbff..97f1018517 100755
--- a/scripts/ng-packagr.sh
+++ b/scripts/ng-packagr.sh
@@ -13,20 +13,20 @@ rm -rf node_modules/@alfresco
 
 echo "====== Build lib ====="
 
-npm run ng-packagr -- -p ./lib/core/package.json
-mkdir -p ./node_modules/@alfresco/adf-core/
+npm run ng-packagr -- -p ./lib/core/ && \
+mkdir -p ./node_modules/@alfresco/adf-core/ && \
 cp -R ./lib/dist/core/* ./node_modules/@alfresco/adf-core/
 
-npm run ng-packagr -- -p ./lib/content-services/package.json
-mkdir -p ./node_modules/@alfresco/adf-content-services/
+npm run ng-packagr -- -p ./lib/content-services/ && \
+mkdir -p ./node_modules/@alfresco/adf-content-services/ && \
 cp -R ./lib/dist/content-services/* ./node_modules/@alfresco/adf-content-services/
 
-npm run ng-packagr -- -p ./lib/process-services/package.json
-mkdir -p ./node_modules/@alfresco/adf-process-services/
+npm run ng-packagr -- -p ./lib/process-services/ && \
+mkdir -p ./node_modules/@alfresco/adf-process-services/ && \
 cp -R ./lib/dist/process-services/* ./node_modules/@alfresco/adf-process-services/
 
-npm run ng-packagr -- -p ./lib/insights/package.json
-mkdir -p ./node_modules/@alfresco/adf-insights/
+npm run ng-packagr -- -p ./lib/insights/ && \
+mkdir -p ./node_modules/@alfresco/adf-insights/ && \
 cp -R ./lib/dist/insights/* ./node_modules/@alfresco/adf-insights/
 
 echo "====== Build style ====="
diff --git a/scripts/npm-build-all.sh b/scripts/npm-build-all.sh
index 59be510584..7b94f036db 100755
--- a/scripts/npm-build-all.sh
+++ b/scripts/npm-build-all.sh
@@ -4,7 +4,6 @@ set -f
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 eval RUN_TEST=false
 eval RUN_TESTBROWSER=false
-eval EXEC_FAST_TEST=false
 eval EXEC_CLEAN=false
 eval EXEC_BUILD=true
 eval EXEC_INSTALL=true
@@ -28,7 +27,6 @@ show_help() {
     echo "-c or --clean             Clean the node_modules before starting the build."
     echo "-si or --skipinstall      Skip the install of node_modules before starting the build."
     echo "-sb or --skipbuild        Skip the build of ng-components."
-    echo "-ft or --fasttest         Build all your local component and run also the test in one single karma-test-shim (high memory consuming and less details)"
     echo "-gitjsapi <commit-ish>    Build all the components against a commit-ish version of the JS-API"
     echo "-vjsapi <commit-ish>      Install different version from npm of JS-API defined in the package.json"
 }
@@ -55,16 +53,14 @@ enable_testbrowser(){
 
 test_project() {
     echo "====== test project: $1 ====="
-    npm run test-lib -- --component $1 --mode coverage || exit 1
+    ng lint $1 || exit 1
+    ng test $1 --watch=false || exit 1
 }
 
 debug_project() {
     echo "====== debug project: $1 ====="
-    npm run test-lib-browser -- --component $1 || exit 1
-}
-
-enable_fast_test() {
-    EXEC_FAST_TEST=true
+    ng lint $1 || exit 1
+    ng test $1 || exit 1
 }
 
 enable_js_api_git_link() {
@@ -106,7 +102,6 @@ while [[ $1 == -* ]]; do
                        fi
                        ;;
       -d|--debug)  enable_testbrowser $2; shift; if $EXEC_SINGLE_TEST == true; then shift; fi ;;
-      -ft|--fasttest)  enable_fast_test; shift;;
       -gitjsapi)  enable_js_api_git_link $2; shift 2;;
       -vjsapi)  version_js_api $2; shift 2;;
       -c|--clean)  clean; shift;;
@@ -147,14 +142,8 @@ if $EXEC_BUILD == true; then
     npm run build-lib || exit 1
 fi
 
-if $EXEC_FAST_TEST == true; then
-    echo "====== Test all components (fast option) ====="
-    npm run test-lib || exit 1
-fi
-
 if $RUN_TEST == true; then
       if $EXEC_SINGLE_TEST == true; then
-            cp -n "$DIR/../lib/config/karma-test-shim.js" "$DIR/../lib/$SINGLE_TEST/"
             test_project $SINGLE_TEST
       else
        for PACKAGE in ${projects[@]}
@@ -166,7 +155,6 @@ fi
 
 if $RUN_TESTBROWSER == true; then
       if $EXEC_SINGLE_TEST == true; then
-            cp -n "$DIR/../lib/config/karma-test-shim.js" "$DIR/../lib/$SINGLE_TEST/"
             debug_project $SINGLE_TEST
       else
        for PACKAGE in ${projects[@]}
diff --git a/scripts/pr-deploy.js b/scripts/pr-deploy.js
index 7b42b9f9cc..b791871618 100644
--- a/scripts/pr-deploy.js
+++ b/scripts/pr-deploy.js
@@ -1,15 +1,15 @@
 var program = require('commander');
 var request = require('request');
 
-var stackId = "1st550"
-
 function asyncRequest(option) {
     return new Promise(function (resolve, reject) {
         request(option, function (error, res, body) {
             if (!error && (res.statusCode == 200 || res.statusCode == 201)) {
                 resolve(body);
             } else {
+                console.log("Error " + JSON.stringify(body));
                 reject(error + JSON.stringify(body));
+                throw "Error";
             }
         });
     });
@@ -41,11 +41,27 @@ async function main() {
         },
         body: ""
     }).catch((error) => {
-        console.log(error);
+        console.log('Project name errror'+ error);
     });
 
+    var stacks = await asyncRequest({
+        url: `${program.server}/v2-beta/projects/1a2747/stacks?limit=-1&sort=name`,
+        method: 'GET',
+        json: true,
+        headers: {
+            "content-type": "application/json",
+            "accept": "application/json",
+            "Authorization": auth
+        },
+        body: ""
+    }).catch((error) => {
+        console.log('Stacks errror'+ error);
+    });
+
+    var stackId = stacks.data[0].id;
     var environmentId = project.data[0].id
 
+    console.log("StackId " + stackId);
     console.log("ID environment " + environmentId);
     console.log("image to Load " + program.image);
 
@@ -166,7 +182,7 @@ async function main() {
         },
         body: postData,
     }).catch((error) => {
-        console.log(error)
+        console.log('Error createService'+ error);
     });
 
     if (!createService) {
@@ -186,7 +202,7 @@ async function main() {
         },
         body: postData,
     }).catch((error) => {
-        console.log(error)
+        console.log('Error loadBalancer'+ error);
     });
 
     if (!loadBalancer) {
@@ -206,7 +222,7 @@ async function main() {
             "Authorization": auth
         }
     }).catch((error) => {
-        console.log(error)
+        console.log('Error get load balancer'+ error);
     });
 
     //console.log("Load balancer ID " + JSON.stringify(loadBalancerGet.lbConfig.portRules));
@@ -235,7 +251,7 @@ async function main() {
         },
         body: loadBalancerGet
     }).catch((error) => {
-        console.log(error)
+        console.log('Error Update load balancer'+ error);
     });
 
 }
diff --git a/scripts/simulate-publish.sh b/scripts/simulate-publish.sh
index 17409d33f6..070d62c64b 100755
--- a/scripts/simulate-publish.sh
+++ b/scripts/simulate-publish.sh
@@ -12,7 +12,7 @@ npm install -g verdaccio-auth-memory
 
 echo "====== Update version ===== "
 
-$DIR/update-version.sh -nextalpha
+$DIR/update-version.sh -nextbeta -components
 
 echo "====== Change registry ===== "
 
@@ -20,4 +20,4 @@ npm set registry http://localhost:4873/
 
 echo "====== Run verdaccio ===== "
 
-concurrently "verdaccio --listen 4873 --config $DIR/config/config-verdaccio.yaml" "$DIR/npm-publish.sh"
+concurrently "verdaccio --listen 4873 --config $DIR/config/config-verdaccio.yaml" "$DIR/npm-publish.sh --sleep 20 -f"
diff --git a/scripts/start.sh b/scripts/start.sh
index 7b6b690c21..a951de60cc 100755
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -174,12 +174,14 @@ fi
 
 if $EXEC_TEST == true; then
   echo "====== Demo shell Test ====="
-  npm run test
+  npm run test || exit 1
+  exit 0
 fi
 
 if $EXEC_E2E == true; then
   echo "====== Demo shell e2e ====="
   npm run e2e
+  exit 0
 fi
 
 if $EXEC_START == true; then
diff --git a/scripts/test-dist.sh b/scripts/test-dist.sh
index 07b2b508d2..cecf9368e6 100755
--- a/scripts/test-dist.sh
+++ b/scripts/test-dist.sh
@@ -44,7 +44,7 @@ mkdir -p $DIR/../node_modules/@alfresco/adf-content-services
 mkdir -p $DIR/../node_modules/@alfresco/adf-process-services
 mkdir -p $DIR/../node_modules/@alfresco/adf-insights
 
-cp -R $DIR/../lib/dist/core/* $DIR/..//node_modules/@alfresco/adf-core
+cp -R $DIR/../lib/dist/core/* $DIR/../node_modules/@alfresco/adf-core
 cp -R $DIR/../lib/dist/content-services/* $DIR/../node_modules/@alfresco/adf-content-services
 cp -R $DIR/../lib/dist/process-services/* $DIR/../node_modules/@alfresco/adf-process-services
 cp -R $DIR/../lib/dist/insights/* $DIR/../node_modules/@alfresco/adf-insights
@@ -52,7 +52,7 @@ cp -R $DIR/../lib/dist/insights/* $DIR/../node_modules/@alfresco/adf-insights
 echo "====== Build dist demo shell ===== "
 
 npm run server-versions
-ng build --prod --app dist --base-href=$NAME/ -op demo-shell/dist/$NAME || exit 1
+ng build dist --base-href=$NAME/ --output-path demo-shell/dist/$NAME || exit 1
 
 echo "====== e2e test ===== "
 
diff --git a/scripts/test-e2e-bc.sh b/scripts/test-e2e-bc.sh
index 2c2b69c21b..f01373f5d1 100755
--- a/scripts/test-e2e-bc.sh
+++ b/scripts/test-e2e-bc.sh
@@ -1,27 +1,54 @@
 #!/usr/bin/env bash
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-rm -rf "$DIR/../node_modules/@angular"
-cd "$DIR/../integration/base_ver_2_app"
+#echo "====== Build ADF ===== "
+
+npm run build-lib || exit 1
+
+cd $DIR/../integration/base_ver_2_app
 
-ADF_VERSION=$(npm view @alfresco/adf-core version)
 ANGULAR_VERSION="5.1.1"
-MATERIAL_VERSION="5.0.1"
-NGX_TRANSLATE_VERSION="9.1.1"
+ANGULAR_CLI_VERSION="1.7.4"
+MATERIAL_VERSION="5.1.1"
+NGX_TRANSLATE_VERSION="10.0.2"
 MOMENT_VERSION="2.20.1"
+RXJS_VERSION="6.0.0"
+TYPESCRIPT_VERSION=2.6.2
 
 npm install
 
-#Use last js-api
-npm install --save alfresco-js-api@alpha
+echo "====== Install New documented dependency ===== "
 
-#New documented dependency
-npm install --save-exact --save @alfresco/adf-content-services@${ADF_VERSION} @alfresco/adf-core@${ADF_VERSION}  @alfresco/adf-insights@${ADF_VERSION} @alfresco/adf-process-services@${ADF_VERSION}
-npm install --save-exact --save-dev @angular-devkit/core@0.0.28 @angular/compiler-cli@${ANGULAR_VERSION} typescript@2.6.2
+npm install --save-exact --save-dev @angular-devkit/core@0.0.28 @angular/compiler-cli@${ANGULAR_VERSION} @angular/cli@${ANGULAR_CLI_VERSION} typescript@${TYPESCRIPT_VERSION}
 npm install --save  @mat-datetimepicker/core @mat-datetimepicker/moment
 npm install --save-exact --save  @angular/animations@${ANGULAR_VERSION} @angular/common@${ANGULAR_VERSION}  @angular/compiler@${ANGULAR_VERSION} @angular/core@${ANGULAR_VERSION}  @angular/platform-browser@${ANGULAR_VERSION} @angular/router@${ANGULAR_VERSION} @angular/flex-layout@2.0.0-beta.12  @angular/forms@${ANGULAR_VERSION} @angular/forms@${ANGULAR_VERSION} @angular/http@${ANGULAR_VERSION}  @angular/platform-browser-dynamic@${ANGULAR_VERSION}
 npm install --save-exact --save @angular/cdk@${MATERIAL_VERSION} @angular/material@${MATERIAL_VERSION}
 npm install --save-exact --save @ngx-translate/core@${NGX_TRANSLATE_VERSION}
 npm install --save-exact --save moment@${MOMENT_VERSION}
+npm install --save-exact --save rxjs@${RXJS_VERSION}
+npm install --save-exact --save @angular/material-moment-adapter@${MATERIAL_VERSION}
+npm install --save-exact --save rxjs-compat@6.1.0
+
+echo "====== Install JS-API alpha ===== "
+npm install --save alfresco-js-api@alpha
+
+echo "====== COPY new build in node_modules ===== "
+
+rm -rf $DIR/../integration/base_ver_2_app/node_modules/@alfresco
+
+mkdir -p $DIR/../integration/base_ver_2_app/node_modules/@alfresco/adf-core/ && \
+cp -R  $DIR/../lib/dist/core/*  $DIR/../integration/base_ver_2_app/node_modules/@alfresco/adf-core/
+
+mkdir -p $DIR/../integration/base_ver_2_app/node_modules/@alfresco/adf-content-services/ && \
+cp -R $DIR/../lib/dist/content-services/* $DIR/../integration/base_ver_2_app/node_modules/@alfresco/adf-content-services/
+
+mkdir -p $DIR/../integration/base_ver_2_app/node_modules/@alfresco/adf-process-services/ && \
+cp -R $DIR/../lib/dist/process-services/* $DIR/../integration/base_ver_2_app/node_modules/@alfresco/adf-process-services/
+
+mkdir -p $DIR/../integration/base_ver_2_app/node_modules/@alfresco/adf-insights/ && \
+cp -R $DIR/../lib/dist/insights/* $DIR/../integration/base_ver_2_app/node_modules/@alfresco/adf-insights/
+
+rm -rf $DIR/../node_modules/@angular
+rm -rf $DIR/../node_modules/@alfresco
 
 npm run e2e
diff --git a/scripts/test-e2e-lib.sh b/scripts/test-e2e-lib.sh
new file mode 100755
index 0000000000..138ae2b98a
--- /dev/null
+++ b/scripts/test-e2e-lib.sh
@@ -0,0 +1,120 @@
+#!/usr/bin/env bash
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+cd "$DIR/../"
+BROWSER_RUN=false
+DEVELOPMENT=false
+
+show_help() {
+    echo "Usage: ./scripts/test-e2e-lib.sh -host adf.domain.com -u admin -p admin -e admin"
+    echo ""
+    echo "-u or --username"
+    echo "-p or --password"
+    echo "-e or --email"
+    echo "-b or --browser run the test in the browsrwer (No headless mode)"
+    echo "-s or --spec run a single test file"
+    echo "-f or --folder run a single folder test"
+    echo "--seleniumServer configure a selenium server to use to run the e2e test"
+    echo "-proxy or --proxy proxy Back end URL to use only possibel to use with -dev option"
+    echo "-dev or --dev run it against local development environment it will deploy on localhost:4200 the current version of your branch"
+    echo "-host or --host URL of the Front end to test"
+    echo "-save  save the error screenshot in the remote env"
+    echo "-timeout or --timeout override the timeout foe the wait utils"
+    echo "-h or --help"
+}
+
+set_username(){
+    USERNAME=$1
+}
+set_password(){
+    PASSWORD=$1
+}
+set_email(){
+    EMAIL=$1
+}
+set_host(){
+    HOST=$1
+}
+
+set_test(){
+    SINGLE_TEST=true
+    NAME_TEST=$1
+}
+
+set_browser(){
+    echo "====== BROWSER RUN ====="
+    BROWSER_RUN=true
+}
+
+set_proxy(){
+    PROXY=$1
+}
+
+set_timeout(){
+    TIMEOUT=$1
+}
+
+set_save_screenshot(){
+    SAVE_SCREENSHOT=true
+}
+
+set_development(){
+    DEVELOPMENT=true
+}
+
+set_test_folder(){
+    FOLDER=$1
+}
+
+set_selenium(){
+    SELENIUM_SERVER=$1
+}
+
+while [[ $1 == -* ]]; do
+    case "$1" in
+      -h|--help|-\?) show_help; exit 0;;
+      -u|--username)  set_username $2; shift 2;;
+      -p|--password)  set_password $2; shift 2;;
+      -e|--email)  set_email $2; shift 2;;
+      -f|--folder)  set_test_folder $2; shift 2;;
+      -timeout|--timeout)  set_timeout $2; shift 2;;
+      -b|--browser)  set_browser; shift;;
+      -dev|--dev)  set_development; shift;;
+      -s|--spec)  set_test $2; shift 2;;
+      -save)   set_save_screenshot; shift;;
+      -proxy|--proxy)  set_proxy $2; shift 2;;
+      -s|--seleniumServer) set_selenium $2; shift 2;;
+      -host|--host)  set_host $2; shift 2;;
+      -*) echo "invalid option: $1" 1>&2; show_help; exit 1;;
+    esac
+done
+
+rm -rf ./e2e/downloads/
+rm -rf ./e2e-output/screenshots/
+
+export URL_HOST_ADF=$HOST
+export USERNAME_ADF=$USERNAME
+export PASSWORD_ADF=$PASSWORD
+export EMAIL_ADF=$EMAIL
+export BROWSER_RUN=$BROWSER_RUN
+export PROXY_HOST_ADF=$PROXY
+export SAVE_SCREENSHOT=$SAVE_SCREENSHOT
+export TIMEOUT=$TIMEOUT
+export FOLDER=$FOLDER'/'
+export SELENIUM_SERVER=$SELENIUM_SERVER
+export NAME_TEST=$NAME_TEST
+
+npm run lint-e2e || exit 1
+
+if [[  $DEVELOPMENT == "true" ]]; then
+  echo "====== Run against local development  ====="
+    npm run e2e-lib || exit 1
+else
+     webdriver-manager update --gecko=false --versions.chrome=2.38
+     ./node_modules/protractor/bin/protractor protractor.conf.js || exit 1
+fi
+
+
+
+
+
diff --git a/tools/doc/SourceInfoClasses.js b/tools/doc/SourceInfoClasses.js
new file mode 100644
index 0000000000..abe7b9b90b
--- /dev/null
+++ b/tools/doc/SourceInfoClasses.js
@@ -0,0 +1,340 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var undocMethodNames = {
+    "ngOnChanges": 1
+};
+var PropInfo = /** @class */ (function () {
+    /*
+    constructor(rawProp: DeclarationReflection) {
+        this.errorMessages = [];
+        this.name = rawProp.name;
+        this.docText = rawProp.comment ? rawProp.comment.shortText : "";
+        this.docText = this.docText.replace(/[\n\r]+/g, " ").trim();
+        this.defaultValue = rawProp.defaultValue || "";
+        this.defaultValue = this.defaultValue.replace(/\|/, "\\|");
+        this.type = rawProp.type ? rawProp.type.toString().replace(/\s/g, "") : "";
+        this.type = this.type.replace(/\|/, "\\|");
+
+        this.isDeprecated = rawProp.comment && rawProp.comment.hasTag("deprecated");
+
+        if (this.isDeprecated) {
+            this.docText = "(**Deprecated:** " + rawProp.comment.getTag("deprecated").text.replace(/[\n\r]+/g, " ").trim() + ") " + this.docText;
+        }
+
+        if (rawProp.decorators) {
+            rawProp.decorators.forEach(dec => {
+                //console.log(dec);
+                if (dec.name === "Input") {
+                    this.isInput = true;
+                    
+                    if (dec.arguments) {
+                        let bindingName = dec.arguments["bindingPropertyName"];
+                        
+                        if (bindingName && (bindingName !== ""))
+                            this.name = bindingName.replace(/['"]/g, "");
+                    }
+                    
+                    if (!this.docText && !this.isDeprecated) {
+                        this.errorMessages.push(`Warning: Input "${rawProp.name}" has no doc text.`);
+                    }
+                }
+
+                if (dec.name === "Output") {
+                    this.isOutput = true;
+
+                    if (!this.docText && !this.isDeprecated) {
+                        this.errorMessages.push(`Warning: Output "${rawProp.name}" has no doc text.`);
+                    }
+                }
+            });
+        }
+    }
+    */
+    function PropInfo(sourceData) {
+        var _this = this;
+        this.errorMessages = [];
+        this.name = sourceData.name;
+        this.docText = sourceData.summary || "";
+        this.docText = this.docText.replace(/[\n\r]+/g, " ").trim();
+        var tempDefaultVal = sourceData.syntax["return"].defaultValue;
+        this.defaultValue = tempDefaultVal ? tempDefaultVal.toString() : "";
+        this.defaultValue = this.defaultValue.replace(/\|/, "\\|");
+        this.type = sourceData.syntax["return"].type || "";
+        this.type = this.type.toString().replace(/\|/, "\\|");
+        if (sourceData.tags) {
+            var depTag = sourceData.tags.find(function (tag) { return tag.name === "deprecated"; });
+            if (depTag) {
+                this.isDeprecated = true;
+                this.docText = "(**Deprecated:** " + depTag.text.replace(/[\n\r]+/g, " ").trim() + ") " + this.docText;
+            }
+        }
+        this.isInput = false;
+        this.isOutput = false;
+        if (sourceData.decorators) {
+            sourceData.decorators.forEach(function (dec) {
+                //console.log(dec);
+                if (dec.name === "Input") {
+                    _this.isInput = true;
+                    if (dec.arguments) {
+                        var bindingName = dec.arguments["bindingPropertyName"];
+                        if (bindingName && (bindingName !== ""))
+                            _this.name = bindingName.replace(/['"]/g, "");
+                    }
+                    if (!_this.docText && !_this.isDeprecated) {
+                        _this.errorMessages.push("Warning: Input \"" + sourceData.name + "\" has no doc text.");
+                    }
+                }
+                if (dec.name === "Output") {
+                    _this.isOutput = true;
+                    if (!_this.docText && !_this.isDeprecated) {
+                        _this.errorMessages.push("Warning: Output \"" + sourceData.name + "\" has no doc text.");
+                    }
+                }
+            });
+        }
+    }
+    Object.defineProperty(PropInfo.prototype, "errors", {
+        get: function () {
+            return this.errorMessages;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return PropInfo;
+}());
+exports.PropInfo = PropInfo;
+;
+var ParamInfo = /** @class */ (function () {
+    /*
+    constructor(rawParam: ParameterReflection) {
+        this.name = rawParam.name;
+        this.type = rawParam.type.toString().replace(/\s/g, "");
+        this.defaultValue = rawParam.defaultValue;
+        this.docText = rawParam.comment ? rawParam.comment.text : "";
+        this.docText = this.docText.replace(/[\n\r]+/g, " ").trim();
+        this.isOptional = rawParam.flags.isOptional;
+
+        this.combined = this.name;
+
+        if (this.isOptional)
+            this.combined += "?";
+
+        this.combined += `: \`${this.type}\``;
+        
+        if (this.defaultValue !== "")
+            this.combined += ` = \`${this.defaultValue}\``;
+    }
+    */
+    function ParamInfo(sourceData) {
+        this.name = sourceData.id;
+        this.type = sourceData.type.toString().replace(/\s/g, "");
+        this.defaultValue = sourceData.defaultValue;
+        this.docText = sourceData.description.replace(/[\n\r]+/g, " ").trim();
+        this.isOptional = false;
+        if (sourceData.flags) {
+            var flag = sourceData.flags.find(function (flag) { return flag.name === "isOptional"; });
+            if (flag) {
+                this.isOptional = true;
+            }
+        }
+        this.combined = this.name;
+        if (this.isOptional)
+            this.combined += "?";
+        this.combined += ": `" + this.type + "`";
+        if (this.defaultValue !== "")
+            this.combined += " = `" + this.defaultValue + "`";
+    }
+    return ParamInfo;
+}());
+exports.ParamInfo = ParamInfo;
+var MethodSigInfo = /** @class */ (function () {
+    /*
+    constructor(rawSig: SignatureReflection) {
+        this.errorMessages = [];
+        this.name = rawSig.name;
+        this.returnType = rawSig.type ? rawSig.type.toString().replace(/\s/g, "") : "";
+        this.returnsSomething = this.returnType != "void";
+
+        if (rawSig.hasComment()) {
+            this.docText = rawSig.comment.shortText + rawSig.comment.text;
+            this.docText = this.docText.replace(/[\n\r]+/g, " ").trim();
+            
+            if (!this.docText) {
+                this.errorMessages.push(`Warning: method "${rawSig.name}" has no doc text.`);
+            }
+
+            this.returnDocText = rawSig.comment.returns;
+            this.returnDocText = this.returnDocText ? this.returnDocText.replace(/[\n\r]+/g, " ").trim() : "";
+            
+            if (this.returnDocText.toLowerCase() === "nothing") {
+                this.returnsSomething = false;
+            }
+
+            if (this.returnsSomething && !this.returnDocText) {
+                this.errorMessages.push(`Warning: Return value of method "${rawSig.name}" has no doc text.`);
+            }
+
+            this.isDeprecated = rawSig.comment.hasTag("deprecated");
+        }
+
+        this.params = [];
+        let paramStrings = [];
+
+        if (rawSig.parameters) {
+            rawSig.parameters.forEach(rawParam => {
+                if (!rawParam.comment || !rawParam.comment.text) {
+                    this.errorMessages.push(`Warning: parameter "${rawParam.name}" of method "${rawSig.name}" has no doc text.`);
+                }
+
+                let param = new ParamInfo(rawParam);
+                this.params.push(param);
+                paramStrings.push(param.combined);
+            });
+        }
+
+        this.signature = "(" + paramStrings.join(", ") + ")";
+    }
+*/
+    function MethodSigInfo(sourceData) {
+        var _this = this;
+        this.errorMessages = [];
+        this.name = sourceData.name;
+        this.docText = sourceData.summary || "";
+        this.docText = this.docText.replace(/[\n\r]+/g, " ").trim();
+        if (!this.docText) {
+            this.errorMessages.push("Warning: method \"" + sourceData.name + "\" has no doc text.");
+        }
+        this.returnType = sourceData.syntax["return"].type || "";
+        this.returnType = this.returnType.toString().replace(/\s/g, "");
+        this.returnsSomething = this.returnType && (this.returnType !== "void");
+        this.returnDocText = sourceData.syntax["return"].summary || "";
+        if (this.returnDocText.toLowerCase() === "nothing") {
+            this.returnsSomething = false;
+        }
+        if (this.returnsSomething && !this.returnDocText) {
+            this.errorMessages.push("Warning: Return value of method \"" + sourceData.name + "\" has no doc text.");
+        }
+        this.isDeprecated = false;
+        if (sourceData.tags) {
+            var depTag = sourceData.tags.find(function (tag) { return tag.name === "deprecated"; });
+            if (depTag) {
+                this.isDeprecated = true;
+                this.docText = "(**Deprecated:** " + depTag.text.replace(/[\n\r]+/g, " ").trim() + ") " + this.docText;
+            }
+        }
+        this.params = [];
+        var paramStrings = [];
+        if (sourceData.syntax.parameters) {
+            sourceData.syntax.parameters.forEach(function (rawParam) {
+                if (!rawParam.description) {
+                    _this.errorMessages.push("Warning: parameter \"" + rawParam.name + "\" of method \"" + sourceData.name + "\" has no doc text.");
+                }
+                var param = new ParamInfo(rawParam);
+                _this.params.push(param);
+                paramStrings.push(param.combined);
+            });
+        }
+        this.signature = "(" + paramStrings.join(", ") + ")";
+    }
+    Object.defineProperty(MethodSigInfo.prototype, "errors", {
+        get: function () {
+            return this.errorMessages;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return MethodSigInfo;
+}());
+exports.MethodSigInfo = MethodSigInfo;
+var ComponentInfo = /** @class */ (function () {
+    /*
+    constructor(classRef: DeclarationReflection) {
+        let props = classRef.getChildrenByKind(ReflectionKind.Property);
+        let accessors = classRef.getChildrenByKind(ReflectionKind.Accessor);
+        
+        this.properties = [...props, ...accessors].map(item => {
+            return new PropInfo(item);
+        });
+
+        let methods = classRef.getChildrenByKind(ReflectionKind.Method);
+
+        this.methods = [];
+
+        methods.forEach(method =>{
+            if (!(method.flags.isPrivate || method.flags.isProtected || undocMethodNames[method.name])) {
+                method.signatures.forEach(sig => {
+                    this.methods.push(new MethodSigInfo(sig));
+                });
+            }
+        });
+        
+        this.hasInputs = false;
+        this.hasOutputs = false;
+        
+        this.properties.forEach(prop => {
+            if (prop.isInput)
+                this.hasInputs = true;
+            
+            if (prop.isOutput)
+                this.hasOutputs = true;
+        });
+
+        this.hasMethods = methods.length > 0;
+    }
+*/
+    function ComponentInfo(sourceData) {
+        var _this = this;
+        this.hasInputs = false;
+        this.hasOutputs = false;
+        this.hasMethods = false;
+        this.sourcePath = sourceData.items[0].source.path;
+        this.sourceLine = sourceData.items[0].source.line;
+        this.properties = [];
+        this.methods = [];
+        sourceData.items.forEach(function (item) {
+            switch (item.type) {
+                case "property":
+                    var prop = new PropInfo(item);
+                    _this.properties.push(prop);
+                    if (prop.isInput) {
+                        _this.hasInputs = true;
+                    }
+                    if (prop.isOutput) {
+                        _this.hasOutputs = true;
+                    }
+                    break;
+                case "method":
+                    if (item.flags && (item.flags.length > 0) &&
+                        !item.flags.find(function (flag) { return flag.name === "isPrivate"; }) &&
+                        !item.flags.find(function (flag) { return flag.name === "isProtected"; }) &&
+                        !undocMethodNames[item.name]) {
+                        _this.methods.push(new MethodSigInfo(item));
+                        _this.hasMethods = true;
+                    }
+                    break;
+                default:
+                    break;
+            }
+        });
+    }
+    Object.defineProperty(ComponentInfo.prototype, "errors", {
+        get: function () {
+            var combinedErrors = [];
+            this.methods.forEach(function (method) {
+                method.errors.forEach(function (err) {
+                    combinedErrors.push(err);
+                });
+            });
+            this.properties.forEach(function (prop) {
+                prop.errors.forEach(function (err) {
+                    combinedErrors.push(err);
+                });
+            });
+            return combinedErrors;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return ComponentInfo;
+}());
+exports.ComponentInfo = ComponentInfo;
diff --git a/tools/doc/SourceInfoClasses.ts b/tools/doc/SourceInfoClasses.ts
new file mode 100644
index 0000000000..8bc873deed
--- /dev/null
+++ b/tools/doc/SourceInfoClasses.ts
@@ -0,0 +1,420 @@
+import {
+    DeclarationReflection,
+    SignatureReflection,
+    ParameterReflection,
+    ReflectionKind,
+ } from "typedoc";
+import { find } from "shelljs";
+import { isUndefined } from "util";
+
+
+let undocMethodNames = {
+    "ngOnChanges": 1
+};
+
+ 
+export class PropInfo {
+    name: string;
+    type: string;
+    typeLink: string;
+    defaultValue: string;
+    docText: string;
+    isInput: boolean;
+    isOutput: boolean;
+    isDeprecated: boolean;
+
+    errorMessages: string[];
+
+    /*
+    constructor(rawProp: DeclarationReflection) {
+        this.errorMessages = [];
+        this.name = rawProp.name;
+        this.docText = rawProp.comment ? rawProp.comment.shortText : "";
+        this.docText = this.docText.replace(/[\n\r]+/g, " ").trim();
+        this.defaultValue = rawProp.defaultValue || "";
+        this.defaultValue = this.defaultValue.replace(/\|/, "\\|");
+        this.type = rawProp.type ? rawProp.type.toString().replace(/\s/g, "") : "";
+        this.type = this.type.replace(/\|/, "\\|");
+
+        this.isDeprecated = rawProp.comment && rawProp.comment.hasTag("deprecated");
+
+        if (this.isDeprecated) {
+            this.docText = "(**Deprecated:** " + rawProp.comment.getTag("deprecated").text.replace(/[\n\r]+/g, " ").trim() + ") " + this.docText;
+        }
+
+        if (rawProp.decorators) {
+            rawProp.decorators.forEach(dec => {
+                //console.log(dec);
+                if (dec.name === "Input") {
+                    this.isInput = true;
+                    
+                    if (dec.arguments) {
+                        let bindingName = dec.arguments["bindingPropertyName"];
+                        
+                        if (bindingName && (bindingName !== ""))
+                            this.name = bindingName.replace(/['"]/g, "");
+                    }
+                    
+                    if (!this.docText && !this.isDeprecated) {
+                        this.errorMessages.push(`Warning: Input "${rawProp.name}" has no doc text.`);
+                    }
+                }
+
+                if (dec.name === "Output") {
+                    this.isOutput = true;
+
+                    if (!this.docText && !this.isDeprecated) {
+                        this.errorMessages.push(`Warning: Output "${rawProp.name}" has no doc text.`);
+                    }
+                }
+            });
+        }
+    }
+    */
+
+    constructor(sourceData) {
+        this.errorMessages = [];
+
+        this.name = sourceData.name;
+        this.docText = sourceData.summary || "";
+        this.docText = this.docText.replace(/[\n\r]+/g, " ").trim();
+        
+        let tempDefaultVal = sourceData.syntax["return"].defaultValue;
+        this.defaultValue = tempDefaultVal ? tempDefaultVal.toString() : "";
+        this.defaultValue = this.defaultValue.replace(/\|/, "\\|");
+        this.type = sourceData.syntax["return"].type || "";
+        this.type = this.type.toString().replace(/\|/, "\\|");
+        
+        if (sourceData.tags) {
+            let depTag = sourceData.tags.find(tag => tag.name === "deprecated");
+            
+            if (depTag) {
+                this.isDeprecated = true;
+                    this.docText = "(**Deprecated:** " + depTag.text.replace(/[\n\r]+/g, " ").trim() + ") " + this.docText;
+            }
+        }
+
+        this.isInput = false;
+        this.isOutput = false;
+
+        if (sourceData.decorators) {
+            sourceData.decorators.forEach(dec => {
+                //console.log(dec);
+                if (dec.name === "Input") {
+                    this.isInput = true;
+                    
+                    if (dec.arguments) {
+                        let bindingName = dec.arguments["bindingPropertyName"];
+                        
+                        if (bindingName && (bindingName !== ""))
+                            this.name = bindingName.replace(/['"]/g, "");
+                    }
+                    
+                    if (!this.docText && !this.isDeprecated) {
+                        this.errorMessages.push(`Warning: Input "${sourceData.name}" has no doc text.`);
+                    }
+                }
+
+                if (dec.name === "Output") {
+                    this.isOutput = true;
+
+                    if (!this.docText && !this.isDeprecated) {
+                        this.errorMessages.push(`Warning: Output "${sourceData.name}" has no doc text.`);
+                    }
+                }
+            });
+        }
+    }
+
+    get errors() {
+        return this.errorMessages;
+    }
+};
+
+
+export class ParamInfo {
+    name: string;
+    type: string;
+    defaultValue: string;
+    docText: string;
+    combined: string;
+    isOptional: boolean;
+
+    /*
+    constructor(rawParam: ParameterReflection) {
+        this.name = rawParam.name;
+        this.type = rawParam.type.toString().replace(/\s/g, "");
+        this.defaultValue = rawParam.defaultValue;
+        this.docText = rawParam.comment ? rawParam.comment.text : "";
+        this.docText = this.docText.replace(/[\n\r]+/g, " ").trim();
+        this.isOptional = rawParam.flags.isOptional;
+
+        this.combined = this.name;
+
+        if (this.isOptional)
+            this.combined += "?";
+
+        this.combined += `: \`${this.type}\``;
+        
+        if (this.defaultValue !== "")
+            this.combined += ` = \`${this.defaultValue}\``;
+    }
+    */
+
+    constructor(sourceData) {
+        this.name = sourceData.id;
+        this.type = sourceData.type.toString().replace(/\s/g, "");
+        this.defaultValue = sourceData.defaultValue;
+        this.docText = sourceData.description.replace(/[\n\r]+/g, " ").trim();
+
+        this.isOptional = false;
+
+        if (sourceData.flags) {
+            let flag = sourceData.flags.find(flag => flag.name === "isOptional");
+
+            if (flag) {
+                this.isOptional = true;
+            }
+        }
+
+        this.combined = this.name;
+
+        if (this.isOptional)
+            this.combined += "?";
+
+        this.combined += `: \`${this.type}\``;
+        
+        if (this.defaultValue !== "")
+            this.combined += ` = \`${this.defaultValue}\``;
+    }
+}
+
+
+export class MethodSigInfo {
+    name: string;
+    docText: string;
+    returnType: string;
+    returnDocText: string;
+    returnsSomething: boolean;
+    signature: string;
+    params: ParamInfo[];
+    isDeprecated: boolean;
+
+    errorMessages: string[];
+
+
+    /*
+    constructor(rawSig: SignatureReflection) {
+        this.errorMessages = [];
+        this.name = rawSig.name;
+        this.returnType = rawSig.type ? rawSig.type.toString().replace(/\s/g, "") : "";
+        this.returnsSomething = this.returnType != "void";
+
+        if (rawSig.hasComment()) {
+            this.docText = rawSig.comment.shortText + rawSig.comment.text;
+            this.docText = this.docText.replace(/[\n\r]+/g, " ").trim();
+            
+            if (!this.docText) {
+                this.errorMessages.push(`Warning: method "${rawSig.name}" has no doc text.`);
+            }
+
+            this.returnDocText = rawSig.comment.returns;
+            this.returnDocText = this.returnDocText ? this.returnDocText.replace(/[\n\r]+/g, " ").trim() : "";
+            
+            if (this.returnDocText.toLowerCase() === "nothing") {
+                this.returnsSomething = false;
+            }
+
+            if (this.returnsSomething && !this.returnDocText) {
+                this.errorMessages.push(`Warning: Return value of method "${rawSig.name}" has no doc text.`);
+            }
+
+            this.isDeprecated = rawSig.comment.hasTag("deprecated");
+        }
+
+        this.params = [];
+        let paramStrings = [];
+
+        if (rawSig.parameters) {
+            rawSig.parameters.forEach(rawParam => {
+                if (!rawParam.comment || !rawParam.comment.text) {
+                    this.errorMessages.push(`Warning: parameter "${rawParam.name}" of method "${rawSig.name}" has no doc text.`);
+                }
+
+                let param = new ParamInfo(rawParam);
+                this.params.push(param);
+                paramStrings.push(param.combined);
+            });
+        }
+
+        this.signature = "(" + paramStrings.join(", ") + ")";
+    }
+*/
+
+    constructor(sourceData) {
+        this.errorMessages = [];
+
+        this.name = sourceData.name;
+
+        this.docText = sourceData.summary || "";
+        this.docText = this.docText.replace(/[\n\r]+/g, " ").trim();
+
+        if (!this.docText) {
+            this.errorMessages.push(`Warning: method "${sourceData.name}" has no doc text.`);
+        }
+
+        this.returnType = sourceData.syntax["return"].type || "";
+        this.returnType = this.returnType.toString().replace(/\s/g, "");
+        this.returnsSomething = this.returnType && (this.returnType !== "void");
+        this.returnDocText = sourceData.syntax["return"].summary || "";
+
+        if (this.returnDocText.toLowerCase() === "nothing") {
+            this.returnsSomething = false;
+        }
+
+        if (this.returnsSomething && !this.returnDocText) {
+            this.errorMessages.push(`Warning: Return value of method "${sourceData.name}" has no doc text.`);
+        }
+
+        this.isDeprecated = false;
+
+        if (sourceData.tags) {
+            let depTag = sourceData.tags.find(tag => tag.name === "deprecated");
+            
+            if (depTag) {
+                this.isDeprecated = true;
+                    this.docText = "(**Deprecated:** " + depTag.text.replace(/[\n\r]+/g, " ").trim() + ") " + this.docText;
+            }
+        }
+
+        this.params = [];
+        let paramStrings = [];
+
+        if (sourceData.syntax.parameters) {
+            sourceData.syntax.parameters.forEach(rawParam => {
+                if (!rawParam.description) {
+                    this.errorMessages.push(`Warning: parameter "${rawParam.name}" of method "${sourceData.name}" has no doc text.`);
+                }
+
+                let param = new ParamInfo(rawParam);
+                this.params.push(param);
+                paramStrings.push(param.combined);
+            });
+        }
+
+        this.signature = "(" + paramStrings.join(", ") + ")";
+    }
+
+    get errors() {
+        return this.errorMessages;
+    }
+}
+
+
+export class ComponentInfo {
+    properties: PropInfo[];
+    methods: MethodSigInfo[];
+    hasInputs: boolean;
+    hasOutputs: boolean;
+    hasMethods: boolean;
+    sourcePath: string;
+    sourceLine: number;
+
+    /*
+    constructor(classRef: DeclarationReflection) {
+        let props = classRef.getChildrenByKind(ReflectionKind.Property);
+        let accessors = classRef.getChildrenByKind(ReflectionKind.Accessor);
+        
+        this.properties = [...props, ...accessors].map(item => {
+            return new PropInfo(item);
+        });
+
+        let methods = classRef.getChildrenByKind(ReflectionKind.Method);
+
+        this.methods = [];
+
+        methods.forEach(method =>{
+            if (!(method.flags.isPrivate || method.flags.isProtected || undocMethodNames[method.name])) {
+                method.signatures.forEach(sig => {
+                    this.methods.push(new MethodSigInfo(sig));
+                });
+            }
+        });
+        
+        this.hasInputs = false;
+        this.hasOutputs = false;
+        
+        this.properties.forEach(prop => {
+            if (prop.isInput)
+                this.hasInputs = true;
+            
+            if (prop.isOutput)
+                this.hasOutputs = true;
+        });
+
+        this.hasMethods = methods.length > 0;
+    }
+*/
+
+    constructor(sourceData) {
+        this.hasInputs = false;
+        this.hasOutputs = false;
+        this.hasMethods = false;
+
+        this.sourcePath = sourceData.items[0].source.path;
+        this.sourceLine = sourceData.items[0].source.line;
+
+        this.properties = [];
+        this.methods = [];
+
+        sourceData.items.forEach(item => {
+            switch(item.type) {
+                case "property":
+                    var prop = new PropInfo(item);
+                    this.properties.push(prop);
+
+                    if (prop.isInput) {
+                        this.hasInputs = true;
+                    }
+
+                    if (prop.isOutput) {
+                        this.hasOutputs = true;
+                    }
+                    break;
+                
+                case "method":
+                    if (item.flags && (item.flags.length > 0) &&
+                        !item.flags.find(flag => flag.name === "isPrivate") &&
+                        !item.flags.find(flag => flag.name === "isProtected") &&
+                        !undocMethodNames[item.name]
+                    ) {
+                        this.methods.push(new MethodSigInfo(item));
+                        this.hasMethods = true;
+                    }
+                    break;
+
+                default:
+                    break;
+            }
+        });
+    }
+
+
+    get errors() {
+        let combinedErrors = [];
+
+        this.methods.forEach(method => {
+            method.errors.forEach(err => {
+                combinedErrors.push(err);
+            })
+        });
+
+        this.properties.forEach(prop => {
+            prop.errors.forEach(err => {
+                combinedErrors.push(err);
+            });
+        });
+
+        return combinedErrors;
+    }
+}
diff --git a/tools/doc/buildYamlSourceInfo.js b/tools/doc/buildYamlSourceInfo.js
new file mode 100644
index 0000000000..e57a06c00c
--- /dev/null
+++ b/tools/doc/buildYamlSourceInfo.js
@@ -0,0 +1,54 @@
+var fs = require("fs");
+var path = require("path");
+var ejs = require("ejs");
+
+
+var templateFolder = path.resolve("tools", "doc", "yamlTemplates");
+var outputFolder = path.resolve("docs", "sourceinfo");
+
+if (process.argv.length < 3) {
+    console.log("Error: Source filename required");
+    process.exit();
+}
+
+console.log(`Processing ${process.argv[2]}`);
+
+if (!fs.existsSync(outputFolder)) {
+    fs.mkdirSync(outputFolder);
+}
+
+var docData = JSON.parse(fs.readFileSync(path.resolve(process.argv[2]), "utf8"));
+var tempFilename = path.resolve(templateFolder, "template.ejs");
+var tempSource = fs.readFileSync(tempFilename, "utf8");
+var template = ejs.compile(
+    tempSource,
+    {
+        filename: tempFilename,
+        cache: true
+    }
+);
+
+searchItemsRecursively(docData);
+
+
+function searchItemsRecursively(item) {
+    if (interestedIn(item.kind)) {
+        processItem(item);
+    } else if (item.children) {
+        item.children.forEach(child => {
+            searchItemsRecursively(child);
+        });
+    }
+}
+
+
+function interestedIn(itemKind) {
+    return itemKind === 128;
+}
+
+
+function processItem(item) {
+    //console.log(`Generating ${item.name}`);
+    var docText = template(item);
+    fs.writeFileSync(path.resolve(outputFolder, item.name + ".yml"), docText); 
+}
\ No newline at end of file
diff --git a/tools/doc/docProcessor.js b/tools/doc/docProcessor.js
index add49df7d1..88a030cef8 100644
--- a/tools/doc/docProcessor.js
+++ b/tools/doc/docProcessor.js
@@ -1,7 +1,9 @@
 var fs = require("fs");
 var path = require("path");
+
 var program = require("commander");
 var lodash = require("lodash");
+var jsyaml = require("js-yaml");
 
 var remark = require("remark");
 var parse = require("remark-parse");
@@ -9,6 +11,10 @@ var stringify = require("remark-stringify");
 var frontMatter = require("remark-frontmatter");
 var mdCompact = require("mdast-util-compact");
 
+var tdoc = require("typedoc");
+
+var ngHelpers = require("./ngHelpers");
+var si = require("./SourceInfoClasses");
 
 // "Aggregate" data collected over the whole file set.
 var aggData = {};
@@ -16,66 +22,32 @@ var aggData = {};
 var toolsFolderName = "tools";
 var configFileName = "doctool.config.json";
 var defaultFolder = path.resolve("docs");
+var sourceInfoFolder = path.resolve("docs", "sourceinfo");
+
+var libFolders = ["core", "content-services", "process-services", "insights"];
+
+var excludePatterns = [
+    "**/*.spec.ts"
+];
 
 
-function initPhase(aggData) {
-    toolList.forEach(toolName => {
-        toolModules[toolName].initPhase(aggData);
-    });
-}
-
-
-function readPhase(filenames, aggData) {
-    for (var i = 0; i < filenames.length; i++) {
-        var pathname = filenames[i];//path.resolve(srcFolder, filenames[i]);
-        
-        var src = fs.readFileSync(pathname);
-        var tree = remark().use(frontMatter, ["yaml"]).parse(src);
-
-        toolList.forEach(toolName => {
-            toolModules[toolName].readPhase(tree, pathname, aggData);
-        });
-    }
-
-    //console.log(JSON.stringify(aggData.mdFileData));
-}
-
-
-function aggPhase(aggData) {
-    toolList.forEach(toolName => {
-        toolModules[toolName].aggPhase(aggData);
-    });
-}
-
-
-function updatePhase(filenames, aggData) {
+function updatePhase(mdCache, aggData) {
     var errorMessages;
 
-    for (var i = 0; i < filenames.length; i++) {
+    toolList.forEach(toolName => {
         errorMessages = [];
+        console.log(`Tool: ${toolName}`);
+        toolModules[toolName].processDocs(mdCache, aggData, errorMessages);
+    });
+
+    var filenames = Object.keys(mdCache);
+    
+
+    for (var i = 0; i < filenames.length; i++) {
         var pathname = filenames[i];
-        
-        if (program.verbose) {
-            console.log("Reading " + pathname);
-        }
-        
-        var src = fs.readFileSync(pathname);
-        var tree = remark().use(frontMatter, ["yaml"]).parse(src);
+        var tree = mdCache[pathname].mdOutTree;
+        var original = mdCache[pathname].mdInTree;
 
-        var original = minimiseTree(tree);
-
-        var modified = false;
-
-        toolList.forEach(toolName => {
-            modified |= toolModules[toolName].updatePhase(tree, pathname, aggData, errorMessages);
-        });
-        
-        if (errorMessages.length > 0) {
-            showErrors(pathname, errorMessages);
-        }
-
-        tree = minimiseTree(tree);
-       
         if (program.json) {
             let filename = path.basename(pathname);
 
@@ -84,10 +56,8 @@ function updatePhase(filenames, aggData) {
             console.log(`\nFile "${filename}" after processing:`);
             console.log(JSON.stringify(tree));
         }
-        
-        modified = !lodash.isEqual(tree, original);
 
-        if (modified) {
+        if (!lodash.isEqual(tree, original)) {
             if (program.verbose) {
                 console.log(`Modified: ${pathname}`);
             }
@@ -113,17 +83,6 @@ function minimiseTree(tree) {
 }
 
 
-function showErrors(filename, errorMessages) {
-    console.log(filename);
-
-    errorMessages.forEach(message => {
-        console.log("    " + message);
-    });
-
-    console.log("");
-}
-
-
 function loadToolModules() {
     var mods = {};
     var toolsFolderPath = path.resolve(__dirname, toolsFolderName);
@@ -164,13 +123,113 @@ function getAllDocFilePaths(docFolder, files) {
 }
 
 
+function initMdCache(filenames) {
+    var mdCache = {};
+
+    for (var i = 0; i < filenames.length; i++) {
+        var pathname = filenames[i];
+        mdCache[pathname] = {};
+
+        var src = fs.readFileSync(pathname);
+        var tree = remark().use(frontMatter, ["yaml"]).parse(src);
+        mdCache[pathname].mdInTree = minimiseTree(tree);
+        mdCache[pathname].mdOutTree = minimiseTree(tree);
+    }
+
+    return mdCache;
+}
+
+
+function getSourceInfo(infoFolder) {
+    var sourceInfo = {};
+
+    var yamlFiles = fs.readdirSync(infoFolder);
+
+    yamlFiles.forEach(file => {
+        var yamlText = fs.readFileSync(path.resolve(infoFolder, file), "utf8");
+        var yaml = jsyaml.safeLoad(yamlText);
+        sou
+    });
+}
+
+
+function initSourceInfo(aggData, mdCache) {
+
+    var app = new tdoc.Application({
+        exclude: excludePatterns,
+        ignoreCompilerErrors: true,
+        experimentalDecorators: true,
+        tsconfig: "tsconfig.json"
+    });
+
+    let sources = app.expandInputFiles(libFolders.map(folder => {
+        return path.resolve("lib", folder);
+    }));    
+    
+    aggData.projData = app.convert(sources);
+
+
+    aggData.classInfo = {};
+
+    var mdFiles = Object.keys(mdCache);
+
+    mdFiles.forEach(mdFile => {
+        /*
+        var className = ngHelpers.ngNameToClassName(path.basename(mdFile, ".md"), aggData.config.typeNameExceptions);
+        var classRef = aggData.projData.findReflectionByName(className);
+*/
+
+        var className = ngHelpers.ngNameToClassName(path.basename(mdFile, ".md"), aggData.config.typeNameExceptions);
+        var yamlText = fs.readFileSync(path.resolve(sourceInfoFolder, className + ".yml"), "utf8");
+        var yaml = jsyaml.safeLoad(yamlText);
+
+        if (yaml) {
+            aggData.classInfo[className] = new si.ComponentInfo(yaml);
+        }
+/*
+        if (classRef) {
+           aggData.classInfo[className] = new si.ComponentInfo(classRef); 
+        }
+        */
+
+    });
+}
+
+
+function initClassInfo(aggData) {
+    var yamlFilenames = fs.readdirSync(path.resolve(sourceInfoFolder));
+
+    aggData.classInfo = {};
+
+    yamlFilenames.forEach(yamlFilename => {
+        var classYamlText = fs.readFileSync(path.resolve(sourceInfoFolder, yamlFilename), "utf8");
+        var classYaml = jsyaml.safeLoad(classYamlText);
+        
+        if (program.verbose) {
+            console.log(classYaml.items[0].name);
+        }
+
+        aggData.classInfo[classYaml.items[0].name] = new si.ComponentInfo(classYaml);
+    });
+}
+
+
+
+
 program
 .usage("[options] <source>")
 .option("-p, --profile [profileName]", "Select named config profile", "default")
 .option("-j, --json", "Output JSON data for Markdown syntax tree")
 .option("-v, --verbose", "Log doc files as they are processed")
+.option("-t, --timing", "Output time taken for run")
 .parse(process.argv);
 
+var startTime;
+
+if (program.timing) {
+    startTime = process.hrtime();
+}
+
 var sourcePath;
 
 if (program.args.length === 0) {
@@ -206,23 +265,34 @@ if (sourceInfo.isDirectory()) {
 }
 
 files = files.filter(filename => 
+    (filename !== undefined) &&
     (path.extname(filename) === ".md") &&
     (filename !== "README.md")
 );
 
-//files.forEach(element => console.log(element));
 
+var mdCache = initMdCache(files);
+
+console.log("Loading source data...");
+//initSourceInfo(aggData, mdCache);
+
+initClassInfo(aggData);
+
+/*
 console.log("Initialising...");
 initPhase(aggData);
 
 console.log("Analysing Markdown files...");
-readPhase(files, aggData);
+readPhase(mdCache, aggData);
 
 console.log("Computing aggregate data...");
 aggPhase(aggData);
+*/
 
 console.log("Updating Markdown files...");
-updatePhase(files, aggData);
-
-
+updatePhase(mdCache, aggData);
 
+if (program.timing) {
+    var endTime = process.hrtime(startTime);
+    console.log(`Run complete in ${endTime[0]} sec`);
+}
\ No newline at end of file
diff --git a/tools/doc/doctool.config.json b/tools/doc/doctool.config.json
index 4ab632acdf..b06892c8b7 100644
--- a/tools/doc/doctool.config.json
+++ b/tools/doc/doctool.config.json
@@ -19,7 +19,8 @@
             "toc"
         ],
         "dev": [
-            "toc"
+            "tsInfo",
+            "typeLinker"
         ]
     },
     "statusIcons": {
@@ -50,7 +51,10 @@
         "text-mask.component": "InputMaskDirective",
         "card-item-types.service": "CardItemTypeService",
         "create-task-attachment.component": "AttachmentComponent",
-        "process-list.component": "ProcessInstanceListComponent"
+        "process-list.component": "ProcessInstanceListComponent",
+        "inherited-button.directive": "InheritPermissionDirective",
+        "node-share.directive": "NodeSharedDirective",
+        "sites-dropdown.component": "DropdownSitesComponent"
     },
     "undocStoplist": [
         "model",
diff --git a/tools/doc/ngHelpers.js b/tools/doc/ngHelpers.js
index 07b58c276b..701bf45a63 100644
--- a/tools/doc/ngHelpers.js
+++ b/tools/doc/ngHelpers.js
@@ -1,5 +1,6 @@
 module.exports = {
     "ngNameToDisplayName": ngNameToDisplayName,
+    "ngNameToClassName": ngNameToClassName,
     "dekebabifyName": dekebabifyName,
     "kebabifyClassName": kebabifyClassName,
     "classTypes": ["component", "directive", "model", "pipe", "service", "widget"]
@@ -13,6 +14,37 @@ function ngNameToDisplayName(ngName) {
 }
 
 
+function initialCap(str) {
+    return str[0].toUpperCase() + str.substr(1);
+}
+
+
+function ngNameToClassName(rawName, nameExceptions) {
+    if (nameExceptions[rawName])
+        return nameExceptions[rawName];
+
+	var name = rawName.replace(/\]|\(|\)/g, '');
+	
+    var fileNameSections = name.split('.');
+    var compNameSections = fileNameSections[0].split('-');
+    
+    var outCompName = '';
+    
+    for (var i = 0; i < compNameSections.length; i++) {
+        outCompName = outCompName + initialCap(compNameSections[i]);
+    }
+    
+    var itemTypeIndicator = '';
+    
+    if (fileNameSections.length > 1) {
+        itemTypeIndicator = initialCap(fileNameSections[1]);
+    }
+	
+    var finalName = outCompName + itemTypeIndicator;
+	
+    return finalName;
+}
+
 function displayNameToNgName(name) {
     var noSpaceName = ngName.replace(/ ([a-zA-Z])/, "$1".toUpperCase());
     return noSpaceName.substr(0, 1).toUpperCase() + noSpaceName.substr(1);
diff --git a/tools/doc/tools/index.js b/tools/doc/tools/index.js
index cf9072bd05..f9950297f0 100644
--- a/tools/doc/tools/index.js
+++ b/tools/doc/tools/index.js
@@ -12,10 +12,7 @@ var searchLibraryRecursive = require("../libsearch");
 var mdNav = require("../mdNav");
 
 module.exports = {
-    "initPhase": initPhase,
-    "readPhase": readPhase,
-    "aggPhase": aggPhase,
-    "updatePhase": updatePhase
+    "processDocs": processDocs
 }
 
 var angFilenameRegex = /([a-zA-Z0-9\-]+)\.((component)|(directive)|(model)|(pipe)|(service)|(widget))\.ts/;
@@ -34,6 +31,14 @@ var adfLibNames = ["core", "content-services", "insights", "process-services"];
 
 var statusIcons;
 
+
+function processDocs(mdCache, aggData, _errorMessages) {
+    initPhase(aggData);
+    readPhase(mdCache, aggData);
+    aggPhase(aggData);
+}
+
+
 function initPhase(aggData) {
     statusIcons = aggData.config["statusIcons"] || {};
     aggData.stoplist = makeStoplist(aggData.config);    
@@ -45,7 +50,16 @@ function initPhase(aggData) {
 }
 
 
-function readPhase(tree, pathname, aggData) {
+function readPhase(mdCache, aggData) {
+    var pathnames = Object.keys(mdCache);
+
+    pathnames.forEach(pathname => {
+        getFileData(mdCache[pathname].mdInTree, pathname, aggData);
+    });
+}
+
+
+function getFileData(tree, pathname, aggData) {
     var itemName = path.basename(pathname, ".md");
 
     // Look for the first paragraph in the file by skipping other items.
@@ -149,11 +163,6 @@ function aggPhase(aggData) {
 }
 
 
-function updatePhase(tree, pathname, aggData) {
-    return false;
-}
-
-
 // Create a stoplist of regular expressions.
 function makeStoplist(config) {
     var listExpressions = config.undocStoplist;
@@ -281,7 +290,7 @@ function makeMDDocumentedTableRow(docItem, forSubFolder) {
     }
 
     var srcFileLink = unist.makeLink(unist.makeText("Source"), srcPath);
-    var desc = docItem.briefDesc;
+    var desc = JSON.parse(JSON.stringify(docItem.briefDesc));
 
     removeBriefDescLinks(desc);
 
@@ -401,5 +410,6 @@ function removeBriefDescLinks(desc) {
     links.forEach(link => {
         link.item.type = "text";
         link.item.value = link.item.children[0].value;
+        link.item.children = null;
     });
 }
\ No newline at end of file
diff --git a/tools/doc/tools/toc.js b/tools/doc/tools/toc.js
index bd3db7443e..38d80d56cd 100644
--- a/tools/doc/tools/toc.js
+++ b/tools/doc/tools/toc.js
@@ -17,15 +17,18 @@ const maxTocHeadingDepth = 3;
 var templateFolder = path.resolve("tools", "doc", "templates");
 
 module.exports = {
-    "initPhase": initPhase,
-    "readPhase": readPhase,
-    "aggPhase": aggPhase,
-    "updatePhase": updatePhase
+    "processDocs": processDocs
+}
+
+
+function processDocs(mdCache, aggData, errorMessages) {
+    var pathnames = Object.keys(mdCache);
+
+    pathnames.forEach(pathname => {
+        updateFile(mdCache[pathname].mdOutTree, pathname, aggData, errorMessages);
+    });
 }
 
-function initPhase(aggData) {}
-function readPhase(tree, pathname, aggData) {}
-function aggPhase(aggData) {}
 
 
 // Find an existing Contents section or add a new empty one if needed.
@@ -80,7 +83,11 @@ function establishContentsSection(mdTree) {
     return numTocHeadings;
 }
 
-function updatePhase(tree, pathname, aggData) {
+
+
+
+
+function updateFile(tree, pathname, _aggData, _errorMessages) {
     if (path.basename(pathname, ".md").match(/README|versionIndex/)) {
         return false;
     }
@@ -120,7 +127,7 @@ function makeToc(tree) {
         context.headings.push({
             "level": heading.item.depth - 2,
             "title": heading.textValue,
-            "anchor": "#" + heading.textValue.toLowerCase().replace(/ /g, "-").replace(/[\.,]/g ,"")
+            "anchor": "#" + heading.textValue.toLowerCase().replace(/ /g, "-").replace(/[\.,'"`$]/g ,"")
         })
     });
 
diff --git a/tools/doc/tools/tsInfo.js b/tools/doc/tools/tsInfo.js
index 04afdbd4d6..9973563cd1 100644
--- a/tools/doc/tools/tsInfo.js
+++ b/tools/doc/tools/tsInfo.js
@@ -9,173 +9,34 @@ var remark = require("remark");
 var ejs = require("ejs");
 var typedoc_1 = require("typedoc");
 var mdNav_1 = require("../mdNav");
+var ngHelpers_1 = require("../ngHelpers");
 var libFolders = ["core", "content-services", "process-services", "insights"];
 var templateFolder = path.resolve("tools", "doc", "templates");
 var excludePatterns = [
     "**/*.spec.ts"
 ];
 var nameExceptions;
-var undocMethodNames = {
-    "ngOnChanges": 1
-};
-var PropInfo = /** @class */ (function () {
-    function PropInfo(rawProp) {
-        var _this = this;
-        this.errorMessages = [];
-        this.name = rawProp.name;
-        this.docText = rawProp.comment ? rawProp.comment.shortText : "";
-        this.docText = this.docText.replace(/[\n\r]+/g, " ").trim();
-        this.defaultValue = rawProp.defaultValue || "";
-        this.defaultValue = this.defaultValue.replace(/\|/, "\\|");
-        this.type = rawProp.type ? rawProp.type.toString().replace(/\s/g, "") : "";
-        this.type = this.type.replace(/\|/, "\\|");
-        this.isDeprecated = rawProp.comment && rawProp.comment.hasTag("deprecated");
-        if (this.isDeprecated) {
-            this.docText = "(**Deprecated:** " + rawProp.comment.getTag("deprecated").text.replace(/[\n\r]+/g, " ").trim() + ") " + this.docText;
+function processDocs(mdCache, aggData, _errorMessages) {
+    //initPhase(aggData);
+    nameExceptions = aggData.config.typeNameExceptions;
+    var pathnames = Object.keys(mdCache);
+    var internalErrors;
+    pathnames.forEach(function (pathname) {
+        internalErrors = [];
+        updateFile(mdCache[pathname].mdOutTree, pathname, aggData, internalErrors);
+        if (internalErrors.length > 0) {
+            showErrors(pathname, internalErrors);
         }
-        if (rawProp.decorators) {
-            rawProp.decorators.forEach(function (dec) {
-                //console.log(dec);
-                if (dec.name === "Input") {
-                    _this.isInput = true;
-                    if (dec.arguments) {
-                        var bindingName = dec.arguments["bindingPropertyName"];
-                        if (bindingName && (bindingName !== ""))
-                            _this.name = bindingName.replace(/['"]/g, "");
-                    }
-                    if (!_this.docText && !_this.isDeprecated) {
-                        _this.errorMessages.push("Warning: Input \"" + rawProp.name + "\" has no doc text.");
-                    }
-                }
-                if (dec.name === "Output") {
-                    _this.isOutput = true;
-                    if (!_this.docText && !_this.isDeprecated) {
-                        _this.errorMessages.push("Warning: Output \"" + rawProp.name + "\" has no doc text.");
-                    }
-                }
-            });
-        }
-    }
-    Object.defineProperty(PropInfo.prototype, "errors", {
-        get: function () {
-            return this.errorMessages;
-        },
-        enumerable: true,
-        configurable: true
     });
-    return PropInfo;
-}());
-;
-var ParamInfo = /** @class */ (function () {
-    function ParamInfo(rawParam) {
-        this.name = rawParam.name;
-        this.type = rawParam.type.toString().replace(/\s/g, "");
-        this.defaultValue = rawParam.defaultValue;
-        this.docText = rawParam.comment ? rawParam.comment.text : "";
-        this.docText = this.docText.replace(/[\n\r]+/g, " ").trim();
-        this.isOptional = rawParam.flags.isOptional;
-        this.combined = this.name;
-        if (this.isOptional)
-            this.combined += "?";
-        this.combined += ": `" + this.type + "`";
-        if (this.defaultValue !== "")
-            this.combined += " = `" + this.defaultValue + "`";
-    }
-    return ParamInfo;
-}());
-var MethodSigInfo = /** @class */ (function () {
-    function MethodSigInfo(rawSig) {
-        var _this = this;
-        this.errorMessages = [];
-        this.name = rawSig.name;
-        this.returnType = rawSig.type ? rawSig.type.toString().replace(/\s/g, "") : "";
-        this.returnsSomething = this.returnType != "void";
-        if (rawSig.hasComment()) {
-            this.docText = rawSig.comment.shortText + rawSig.comment.text;
-            this.docText = this.docText.replace(/[\n\r]+/g, " ").trim();
-            if (!this.docText) {
-                this.errorMessages.push("Warning: method \"" + rawSig.name + "\" has no doc text.");
-            }
-            this.returnDocText = rawSig.comment.returns;
-            this.returnDocText = this.returnDocText ? this.returnDocText.replace(/[\n\r]+/g, " ").trim() : "";
-            if (this.returnDocText.toLowerCase() === "nothing") {
-                this.returnsSomething = false;
-            }
-            if (this.returnsSomething && !this.returnDocText) {
-                this.errorMessages.push("Warning: Return value of method \"" + rawSig.name + "\" has no doc text.");
-            }
-            this.isDeprecated = rawSig.comment.hasTag("deprecated");
-        }
-        this.params = [];
-        var paramStrings = [];
-        if (rawSig.parameters) {
-            rawSig.parameters.forEach(function (rawParam) {
-                if (!rawParam.comment || !rawParam.comment.text) {
-                    _this.errorMessages.push("Warning: parameter \"" + rawParam.name + "\" of method \"" + rawSig.name + "\" has no doc text.");
-                }
-                var param = new ParamInfo(rawParam);
-                _this.params.push(param);
-                paramStrings.push(param.combined);
-            });
-        }
-        this.signature = "(" + paramStrings.join(", ") + ")";
-    }
-    Object.defineProperty(MethodSigInfo.prototype, "errors", {
-        get: function () {
-            return this.errorMessages;
-        },
-        enumerable: true,
-        configurable: true
+}
+exports.processDocs = processDocs;
+function showErrors(filename, errorMessages) {
+    console.log(filename);
+    errorMessages.forEach(function (message) {
+        console.log("    " + message);
     });
-    return MethodSigInfo;
-}());
-var ComponentInfo = /** @class */ (function () {
-    function ComponentInfo(classRef) {
-        var _this = this;
-        var props = classRef.getChildrenByKind(typedoc_1.ReflectionKind.Property);
-        var accessors = classRef.getChildrenByKind(typedoc_1.ReflectionKind.Accessor);
-        this.properties = props.concat(accessors).map(function (item) {
-            return new PropInfo(item);
-        });
-        var methods = classRef.getChildrenByKind(typedoc_1.ReflectionKind.Method);
-        this.methods = [];
-        methods.forEach(function (method) {
-            if (!(method.flags.isPrivate || method.flags.isProtected || undocMethodNames[method.name])) {
-                method.signatures.forEach(function (sig) {
-                    _this.methods.push(new MethodSigInfo(sig));
-                });
-            }
-        });
-        this.hasInputs = false;
-        this.hasOutputs = false;
-        this.properties.forEach(function (prop) {
-            if (prop.isInput)
-                _this.hasInputs = true;
-            if (prop.isOutput)
-                _this.hasOutputs = true;
-        });
-        this.hasMethods = methods.length > 0;
-    }
-    Object.defineProperty(ComponentInfo.prototype, "errors", {
-        get: function () {
-            var combinedErrors = [];
-            this.methods.forEach(function (method) {
-                method.errors.forEach(function (err) {
-                    combinedErrors.push(err);
-                });
-            });
-            this.properties.forEach(function (prop) {
-                prop.errors.forEach(function (err) {
-                    combinedErrors.push(err);
-                });
-            });
-            return combinedErrors;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return ComponentInfo;
-}());
+    console.log("");
+}
 function initPhase(aggData) {
     nameExceptions = aggData.config.typeNameExceptions;
     var app = new typedoc_1.Application({
@@ -189,23 +50,22 @@ function initPhase(aggData) {
     }));
     aggData.projData = app.convert(sources);
 }
-exports.initPhase = initPhase;
-function readPhase(tree, pathname, aggData) {
-}
-exports.readPhase = readPhase;
-function aggPhase(aggData) {
-}
-exports.aggPhase = aggPhase;
-function updatePhase(tree, pathname, aggData, errorMessages) {
-    var compName = angNameToClassName(path.basename(pathname, ".md"));
-    var classRef = aggData.projData.findReflectionByName(compName);
+function updateFile(tree, pathname, aggData, errorMessages) {
+    /*
+    let compName = angNameToClassName(path.basename(pathname, ".md"));
+    let classRef = aggData.projData.findReflectionByName(compName);
+
     if (!classRef) {
         // A doc file with no corresponding class (eg, Document Library Model).
         return false;
     }
-    var compData = new ComponentInfo(classRef);
-    var classTypeMatch = compName.match(/component|directive|service/i);
-    if (classTypeMatch) {
+
+    let compData = new ComponentInfo(classRef);
+    */
+    var className = ngHelpers_1.ngNameToClassName(path.basename(pathname, ".md"), nameExceptions);
+    var classTypeMatch = className.match(/component|directive|service/i);
+    var compData = aggData.classInfo[className];
+    if (classTypeMatch && compData) {
         var classType = classTypeMatch[0].toLowerCase();
         // Copy docs back from the .md file when the JSDocs are empty.
         var inputMD = getPropDocsFromMD(tree, "Properties", 3);
@@ -232,27 +92,38 @@ function updatePhase(tree, pathname, aggData, errorMessages) {
     }
     return true;
 }
-exports.updatePhase = updatePhase;
-function initialCap(str) {
+/*
+function initialCap(str: string) {
     return str[0].toUpperCase() + str.substr(1);
 }
-function angNameToClassName(rawName) {
+
+
+function angNameToClassName(rawName: string) {
     if (nameExceptions[rawName])
         return nameExceptions[rawName];
+
     var name = rawName.replace(/\]|\(|\)/g, '');
+    
     var fileNameSections = name.split('.');
     var compNameSections = fileNameSections[0].split('-');
+    
     var outCompName = '';
+    
     for (var i = 0; i < compNameSections.length; i++) {
         outCompName = outCompName + initialCap(compNameSections[i]);
     }
+    
     var itemTypeIndicator = '';
+    
     if (fileNameSections.length > 1) {
         itemTypeIndicator = initialCap(fileNameSections[1]);
     }
+    
     var finalName = outCompName + itemTypeIndicator;
+    
     return finalName;
 }
+*/
 function getPropDocsFromMD(tree, sectionHeading, docsColumn) {
     var result = {};
     var nav = new mdNav_1.MDNav(tree);
@@ -346,7 +217,7 @@ function getMDMethodParams(methItem) {
         }
         var paramDoc = paramListItem.childNav
             .paragraph().childNav
-            .text(function (t) { return true; }, 1).item.value;
+            .text(function (t) { return true; }, 1).value; //item.value;
         result[paramName] = paramDoc.replace(/^[ -]+/, "");
     });
     return result;
diff --git a/tools/doc/tools/tsInfo.ts b/tools/doc/tools/tsInfo.ts
index 49b3f3d473..84a4fa20b6 100644
--- a/tools/doc/tools/tsInfo.ts
+++ b/tools/doc/tools/tsInfo.ts
@@ -10,19 +10,14 @@ import * as ejs from "ejs";
 
 import {
     Application,
-    ProjectReflection,
-    Reflection,
-    DeclarationReflection,
-    SignatureReflection,
-    ParameterReflection,
-    ReflectionKind,
-    TraverseProperty,
-    Decorator
  } from "typedoc";
-import { CommentTag } from "typedoc/dist/lib/models";
 
 import { MDNav } from "../mdNav";
-import * as unist from "../unistHelpers";
+import { ngNameToClassName } from "../ngHelpers";
+
+import {
+    ComponentInfo
+} from "../SourceInfoClasses"
 
 
 let libFolders = ["core", "content-services", "process-services", "insights"];
@@ -35,230 +30,39 @@ let excludePatterns = [
 
 let nameExceptions;
 
-let undocMethodNames = {
-    "ngOnChanges": 1
-};
 
+export function processDocs(mdCache, aggData, _errorMessages) {
+    //initPhase(aggData);
+    
+    nameExceptions = aggData.config.typeNameExceptions;
+    
+    let pathnames = Object.keys(mdCache);
+    let internalErrors;
 
-class PropInfo {
-    name: string;
-    type: string;
-    typeLink: string;
-    defaultValue: string;
-    docText: string;
-    isInput: boolean;
-    isOutput: boolean;
-    isDeprecated: boolean;
+    pathnames.forEach(pathname => {
+        internalErrors = [];
+        updateFile(mdCache[pathname].mdOutTree, pathname, aggData, internalErrors);
 
-    errorMessages: string[];
-
-    constructor(rawProp: DeclarationReflection) {
-        this.errorMessages = [];
-        this.name = rawProp.name;
-        this.docText = rawProp.comment ? rawProp.comment.shortText : "";
-        this.docText = this.docText.replace(/[\n\r]+/g, " ").trim();
-        this.defaultValue = rawProp.defaultValue || "";
-        this.defaultValue = this.defaultValue.replace(/\|/, "\\|");
-        this.type = rawProp.type ? rawProp.type.toString().replace(/\s/g, "") : "";
-        this.type = this.type.replace(/\|/, "\\|");
-
-        this.isDeprecated = rawProp.comment && rawProp.comment.hasTag("deprecated");
-
-        if (this.isDeprecated) {
-            this.docText = "(**Deprecated:** " + rawProp.comment.getTag("deprecated").text.replace(/[\n\r]+/g, " ").trim() + ") " + this.docText;
+        if (internalErrors.length > 0) {
+            showErrors(pathname, internalErrors);
         }
-
-        if (rawProp.decorators) {
-            rawProp.decorators.forEach(dec => {
-                //console.log(dec);
-                if (dec.name === "Input") {
-                    this.isInput = true;
-                    
-                    if (dec.arguments) {
-                        let bindingName = dec.arguments["bindingPropertyName"];
-                        
-                        if (bindingName && (bindingName !== ""))
-                            this.name = bindingName.replace(/['"]/g, "");
-                    }
-                    
-                    if (!this.docText && !this.isDeprecated) {
-                        this.errorMessages.push(`Warning: Input "${rawProp.name}" has no doc text.`);
-                    }
-                }
-
-                if (dec.name === "Output") {
-                    this.isOutput = true;
-
-                    if (!this.docText && !this.isDeprecated) {
-                        this.errorMessages.push(`Warning: Output "${rawProp.name}" has no doc text.`);
-                    }
-                }
-            });
-        }
-    }
-
-    get errors() {
-        return this.errorMessages;
-    }
-};
-
-
-class ParamInfo {
-    name: string;
-    type: string;
-    defaultValue: string;
-    docText: string;
-    combined: string;
-    isOptional: boolean;
-
-    constructor(rawParam: ParameterReflection) {
-        this.name = rawParam.name;
-        this.type = rawParam.type.toString().replace(/\s/g, "");
-        this.defaultValue = rawParam.defaultValue;
-        this.docText = rawParam.comment ? rawParam.comment.text : "";
-        this.docText = this.docText.replace(/[\n\r]+/g, " ").trim();
-        this.isOptional = rawParam.flags.isOptional;
-
-        this.combined = this.name;
-
-        if (this.isOptional)
-            this.combined += "?";
-
-        this.combined += `: \`${this.type}\``;
-        
-        if (this.defaultValue !== "")
-            this.combined += ` = \`${this.defaultValue}\``;
-    }
+    });
 }
 
 
-class MethodSigInfo {
-    name: string;
-    docText: string;
-    returnType: string;
-    returnDocText: string;
-    returnsSomething: boolean;
-    signature: string;
-    params: ParamInfo[];
-    isDeprecated: boolean;
+function showErrors(filename, errorMessages) {
+    console.log(filename);
 
-    errorMessages: string[];
+    errorMessages.forEach(message => {
+        console.log("    " + message);
+    });
 
-
-    constructor(rawSig: SignatureReflection) {
-        this.errorMessages = [];
-        this.name = rawSig.name;
-        this.returnType = rawSig.type ? rawSig.type.toString().replace(/\s/g, "") : "";
-        this.returnsSomething = this.returnType != "void";
-
-        if (rawSig.hasComment()) {
-            this.docText = rawSig.comment.shortText + rawSig.comment.text;
-            this.docText = this.docText.replace(/[\n\r]+/g, " ").trim();
-            
-            if (!this.docText) {
-                this.errorMessages.push(`Warning: method "${rawSig.name}" has no doc text.`);
-            }
-
-            this.returnDocText = rawSig.comment.returns;
-            this.returnDocText = this.returnDocText ? this.returnDocText.replace(/[\n\r]+/g, " ").trim() : "";
-            
-            if (this.returnDocText.toLowerCase() === "nothing") {
-                this.returnsSomething = false;
-            }
-
-            if (this.returnsSomething && !this.returnDocText) {
-                this.errorMessages.push(`Warning: Return value of method "${rawSig.name}" has no doc text.`);
-            }
-
-            this.isDeprecated = rawSig.comment.hasTag("deprecated");
-        }
-
-        this.params = [];
-        let paramStrings = [];
-
-        if (rawSig.parameters) {
-            rawSig.parameters.forEach(rawParam => {
-                if (!rawParam.comment || !rawParam.comment.text) {
-                    this.errorMessages.push(`Warning: parameter "${rawParam.name}" of method "${rawSig.name}" has no doc text.`);
-                }
-
-                let param = new ParamInfo(rawParam);
-                this.params.push(param);
-                paramStrings.push(param.combined);
-            });
-        }
-
-        this.signature = "(" + paramStrings.join(", ") + ")";
-    }
-
-    get errors() {
-        return this.errorMessages;
-    }
+    console.log("");
 }
 
 
-class ComponentInfo {
-    properties: PropInfo[];
-    methods: MethodSigInfo[];
-    hasInputs: boolean;
-    hasOutputs: boolean;
-    hasMethods: boolean;
 
-    constructor(classRef: DeclarationReflection) {
-        let props = classRef.getChildrenByKind(ReflectionKind.Property);
-        let accessors = classRef.getChildrenByKind(ReflectionKind.Accessor);
-        
-        this.properties = [...props, ...accessors].map(item => {
-            return new PropInfo(item);
-        });
-
-        let methods = classRef.getChildrenByKind(ReflectionKind.Method);
-
-        this.methods = [];
-
-        methods.forEach(method =>{
-            if (!(method.flags.isPrivate || method.flags.isProtected || undocMethodNames[method.name])) {
-                method.signatures.forEach(sig => {
-                    this.methods.push(new MethodSigInfo(sig));
-                });
-            }
-        });
-        
-        this.hasInputs = false;
-        this.hasOutputs = false;
-        
-        this.properties.forEach(prop => {
-            if (prop.isInput)
-                this.hasInputs = true;
-            
-            if (prop.isOutput)
-                this.hasOutputs = true;
-        });
-
-        this.hasMethods = methods.length > 0;
-    }
-
-    get errors() {
-        let combinedErrors = [];
-
-        this.methods.forEach(method => {
-            method.errors.forEach(err => {
-                combinedErrors.push(err);
-            })
-        });
-
-        this.properties.forEach(prop => {
-            prop.errors.forEach(err => {
-                combinedErrors.push(err);
-            });
-        });
-
-        return combinedErrors;
-    }
-}
-
-
-export function initPhase(aggData) {
+function initPhase(aggData) {
     nameExceptions = aggData.config.typeNameExceptions;
 
     let app = new Application({
@@ -276,15 +80,10 @@ export function initPhase(aggData) {
 }
 
 
-export function readPhase(tree, pathname, aggData) {
-}
 
 
-export function aggPhase(aggData) {
-}
-
-
-export function updatePhase(tree, pathname, aggData, errorMessages) {
+function updateFile(tree, pathname, aggData, errorMessages) {
+    /*
     let compName = angNameToClassName(path.basename(pathname, ".md"));
     let classRef = aggData.projData.findReflectionByName(compName);
 
@@ -294,9 +93,13 @@ export function updatePhase(tree, pathname, aggData, errorMessages) {
     }
 
     let compData = new ComponentInfo(classRef);
-    let classTypeMatch = compName.match(/component|directive|service/i);
+    */
 
-    if (classTypeMatch) {
+    let className = ngNameToClassName(path.basename(pathname, ".md"), nameExceptions);
+    let classTypeMatch = className.match(/component|directive|service/i);
+    let compData = aggData.classInfo[className];
+
+    if (classTypeMatch && compData) {
         let classType = classTypeMatch[0].toLowerCase();
 
         // Copy docs back from the .md file when the JSDocs are empty.
@@ -332,7 +135,7 @@ export function updatePhase(tree, pathname, aggData, errorMessages) {
     return true;
 }
 
-
+/*
 function initialCap(str: string) {
     return str[0].toUpperCase() + str.substr(1);
 }
@@ -363,7 +166,7 @@ function angNameToClassName(rawName: string) {
 	
     return finalName;
 }
-
+*/
 
 function getPropDocsFromMD(tree, sectionHeading, docsColumn) {
     let result = {}
@@ -491,7 +294,7 @@ function getMDMethodParams(methItem: MDNav) {
 
         let paramDoc = paramListItem.childNav
         .paragraph().childNav
-        .text(t=>true, 1).item.value;
+        .text(t=>true, 1).value; //item.value;
 
         result[paramName] = paramDoc.replace(/^[ -]+/, "");
     });
diff --git a/tools/doc/tools/tutorialIndex.js b/tools/doc/tools/tutorialIndex.js
index 324607e823..3addb2e867 100644
--- a/tools/doc/tools/tutorialIndex.js
+++ b/tools/doc/tools/tutorialIndex.js
@@ -11,10 +11,10 @@ var unist = require("../unistHelpers");
 var tutFolder = path.resolve("docs", "tutorials");
 var templateFolder = path.resolve("tools", "doc", "templates");
 var userGuideFolder = path.resolve("docs", "user-guide");
-function initPhase(aggData) { }
-exports.initPhase = initPhase;
-function readPhase(tree, pathname, aggData) { }
-exports.readPhase = readPhase;
+function processDocs(tree, pathname, aggData, errorMessages) {
+    aggPhase(aggData);
+}
+exports.processDocs = processDocs;
 function aggPhase(aggData) {
     var indexDocData = getIndexDocData();
     var templateName = path.resolve(templateFolder, "tutIndex.ejs");
@@ -33,11 +33,6 @@ function aggPhase(aggData) {
     });
     fs.writeFileSync(tutIndexFile, remark().use(frontMatter, { type: 'yaml', fence: '---' }).data("settings", { paddedTable: false, gfm: false }).stringify(tutIndexMD));
 }
-exports.aggPhase = aggPhase;
-function updatePhase(tree, pathname, aggData) {
-    return false;
-}
-exports.updatePhase = updatePhase;
 function getIndexDocData() {
     var indexFile = path.resolve(userGuideFolder, "summary.json");
     var summaryArray = JSON.parse(fs.readFileSync(indexFile, "utf8"));
diff --git a/tools/doc/tools/tutorialIndex.ts b/tools/doc/tools/tutorialIndex.ts
index 277d0e9eb3..ae298602f9 100644
--- a/tools/doc/tools/tutorialIndex.ts
+++ b/tools/doc/tools/tutorialIndex.ts
@@ -15,12 +15,12 @@ const templateFolder = path.resolve("tools", "doc", "templates");
 const userGuideFolder = path.resolve("docs", "user-guide");
 
 
-export function initPhase(aggData) {}
-
-export function readPhase(tree, pathname, aggData) {}
+export function processDocs(tree, pathname, aggData, errorMessages) {
+    aggPhase(aggData);
+}
 
 
-export function aggPhase(aggData) {
+function aggPhase(aggData) {
     let indexDocData = getIndexDocData();
 
     let templateName = path.resolve(templateFolder, "tutIndex.ejs");
@@ -46,10 +46,6 @@ export function aggPhase(aggData) {
 }
 
 
-export function updatePhase(tree, pathname, aggData) {
-    return false;
-}
-
 
 function getIndexDocData() {
     let indexFile = path.resolve(userGuideFolder, "summary.json");
diff --git a/tools/doc/tools/typeLinker.js b/tools/doc/tools/typeLinker.js
index eb1bc9b022..4fa6a0bfb7 100644
--- a/tools/doc/tools/typeLinker.js
+++ b/tools/doc/tools/typeLinker.js
@@ -1,8 +1,22 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+exports.__esModule = true;
 var path = require("path");
 var fs = require("fs");
-var typedoc_1 = require("typedoc");
+/*
+import {
+    Application,
+    ProjectReflection,
+    Reflection,
+    DeclarationReflection,
+    SignatureReflection,
+    ParameterReflection,
+    ReflectionKind,
+    TraverseProperty,
+    Decorator
+ } from "typedoc";
+import { CommentTag } from "typedoc/dist/lib/models";
+*/
+var ProgressBar = require("progress");
 var unist = require("../unistHelpers");
 var ngHelpers = require("../ngHelpers");
 var includedNodeTypes = [
@@ -13,6 +27,21 @@ var includedNodeTypes = [
 var docFolder = path.resolve("docs");
 var adfLibNames = ["core", "content-services", "insights", "process-services"];
 var externalNameLinks;
+function processDocs(mdCache, aggData, errorMessages) {
+    initPhase(aggData);
+    var pathnames = Object.keys(mdCache);
+    var progress = new ProgressBar("Processing: [:bar] (:current/:total)", {
+        total: pathnames.length,
+        width: 50,
+        clear: true
+    });
+    pathnames.forEach(function (pathname) {
+        updateFile(mdCache[pathname].mdOutTree, pathname, aggData, errorMessages);
+        progress.tick();
+        progress.render();
+    });
+}
+exports.processDocs = processDocs;
 function initPhase(aggData) {
     externalNameLinks = aggData.config.externalNameLinks;
     aggData.docFiles = {};
@@ -28,21 +57,24 @@ function initPhase(aggData) {
             }
         });
     });
-    var classes = aggData.projData.getReflectionsByKind(typedoc_1.ReflectionKind.Class);
-    classes.forEach(function (currClass) {
+    /*
+    let classes = aggData.projData.getReflectionsByKind(ReflectionKind.Class);
+
+    classes.forEach(currClass => {
         if (currClass.name.match(/(Component|Directive|Interface|Model|Pipe|Service|Widget)$/)) {
             aggData.nameLookup.addName(currClass.name);
         }
     });
+    */
+    var classNames = Object.keys(aggData.classInfo);
+    classNames.forEach(function (currClassName) {
+        if (currClassName.match(/(Component|Directive|Interface|Model|Pipe|Service|Widget)$/)) {
+            aggData.nameLookup.addName(currClassName);
+        }
+    });
     //console.log(JSON.stringify(aggData.nameLookup));
 }
-exports.initPhase = initPhase;
-function readPhase(tree, pathname, aggData) { }
-exports.readPhase = readPhase;
-function aggPhase(aggData) {
-}
-exports.aggPhase = aggPhase;
-function updatePhase(tree, pathname, aggData) {
+function updateFile(tree, pathname, aggData, _errorMessages) {
     traverseMDTree(tree);
     return true;
     function traverseMDTree(node) {
@@ -86,7 +118,6 @@ function updatePhase(tree, pathname, aggData) {
         */
     }
 }
-exports.updatePhase = updatePhase;
 var SplitNameNode = /** @class */ (function () {
     function SplitNameNode(key, value) {
         if (key === void 0) { key = ""; }
@@ -281,11 +312,16 @@ function resolveTypeLink(aggData, text) {
     if (possTypeName === 'constructor') {
         return "";
     }
-    var ref = aggData.projData.findReflectionByName(possTypeName);
-    if (ref && isLinkable(ref.kind)) {
+    /*
+    let ref: Reflection = aggData.projData.findReflectionByName(possTypeName);
+*/
+    var classInfo = aggData.classInfo[possTypeName];
+    //if (ref && isLinkable(ref.kind)) {
+    if (classInfo) {
         var kebabName = ngHelpers.kebabifyClassName(possTypeName);
         var possDocFile = aggData.docFiles[kebabName];
-        var url = "../../lib/" + ref.sources[0].fileName;
+        //let url = "../../lib/" + ref.sources[0].fileName;
+        var url = "../../" + classInfo.sourcePath; //"../../lib/" + classInfo.items[0].source.path;
         if (possDocFile) {
             url = "../" + possDocFile;
         }
@@ -307,12 +343,14 @@ function cleanTypeName(text) {
         return text.replace(/\[\]$/, "");
     }
 }
-function isLinkable(kind) {
-    return (kind === typedoc_1.ReflectionKind.Class) ||
-        (kind === typedoc_1.ReflectionKind.Interface) ||
-        (kind === typedoc_1.ReflectionKind.Enum) ||
-        (kind === typedoc_1.ReflectionKind.TypeAlias);
+/*
+function isLinkable(kind: ReflectionKind) {
+    return (kind === ReflectionKind.Class) ||
+    (kind === ReflectionKind.Interface) ||
+    (kind === ReflectionKind.Enum) ||
+    (kind === ReflectionKind.TypeAlias);
 }
+*/
 function convertNodeToTypeLink(node, text, url, title) {
     if (title === void 0) { title = null; }
     var linkDisplayText = unist.makeInlineCode(text);
diff --git a/tools/doc/tools/typeLinker.ts b/tools/doc/tools/typeLinker.ts
index 77810f7bb3..18ef36cd69 100644
--- a/tools/doc/tools/typeLinker.ts
+++ b/tools/doc/tools/typeLinker.ts
@@ -1,10 +1,12 @@
 import * as path from "path";
 import * as fs from "fs";
 
+
 import * as remark from "remark";
 import * as stringify from "remark-stringify";
 import * as frontMatter from "remark-frontmatter";
 
+/*
 import {
     Application,
     ProjectReflection,
@@ -17,6 +19,9 @@ import {
     Decorator
  } from "typedoc";
 import { CommentTag } from "typedoc/dist/lib/models";
+*/
+
+import * as ProgressBar from "progress";
 
 import * as unist from "../unistHelpers";
 import * as ngHelpers from "../ngHelpers";
@@ -34,7 +39,26 @@ const adfLibNames = ["core", "content-services", "insights", "process-services"]
 
 let externalNameLinks;
 
-export function initPhase(aggData) {
+export function processDocs(mdCache, aggData, errorMessages) {
+    initPhase(aggData);
+
+    var pathnames = Object.keys(mdCache);
+
+    let progress = new ProgressBar("Processing: [:bar] (:current/:total)", {
+        total: pathnames.length,
+        width: 50,
+        clear: true
+    });
+
+    pathnames.forEach(pathname => {
+        updateFile(mdCache[pathname].mdOutTree, pathname, aggData, errorMessages);
+        progress.tick();
+        progress.render();
+    });
+}
+
+
+function initPhase(aggData) {
     externalNameLinks = aggData.config.externalNameLinks;
     aggData.docFiles = {};
     aggData.nameLookup = new SplitNameLookup();
@@ -53,6 +77,7 @@ export function initPhase(aggData) {
         });
     });
 
+    /*
     let classes = aggData.projData.getReflectionsByKind(ReflectionKind.Class);
 
     classes.forEach(currClass => {
@@ -60,19 +85,22 @@ export function initPhase(aggData) {
             aggData.nameLookup.addName(currClass.name);
         }
     });
+    */
 
+    let classNames = Object.keys(aggData.classInfo);
+
+    classNames.forEach(currClassName => {
+        if (currClassName.match(/(Component|Directive|Interface|Model|Pipe|Service|Widget)$/)) {
+            aggData.nameLookup.addName(currClassName);
+        }
+    });
     //console.log(JSON.stringify(aggData.nameLookup));
 }
 
-export function readPhase(tree, pathname, aggData) {}
 
 
-export function aggPhase(aggData) {
 
-}
-
-
-export function updatePhase(tree, pathname, aggData) {
+function updateFile(tree, pathname, aggData, _errorMessages) {
     traverseMDTree(tree);
     return true;
 
@@ -347,13 +375,19 @@ function resolveTypeLink(aggData, text): string {
         return "";
     }
 
+    /*
     let ref: Reflection = aggData.projData.findReflectionByName(possTypeName);
+*/
+    let classInfo = aggData.classInfo[possTypeName];
 
-    if (ref && isLinkable(ref.kind)) {
+    //if (ref && isLinkable(ref.kind)) {
+    if (classInfo) {
         let kebabName = ngHelpers.kebabifyClassName(possTypeName);
         let possDocFile = aggData.docFiles[kebabName];
-        let url = "../../lib/" + ref.sources[0].fileName;
-        
+        //let url = "../../lib/" + ref.sources[0].fileName;
+
+        let url = "../../" + classInfo.sourcePath; //"../../lib/" + classInfo.items[0].source.path;
+
         if (possDocFile) {
             url = "../" + possDocFile;
         }
@@ -377,13 +411,14 @@ function cleanTypeName(text) {
     }
 }
 
-
+/*
 function isLinkable(kind: ReflectionKind) {
     return (kind === ReflectionKind.Class) ||
     (kind === ReflectionKind.Interface) ||
     (kind === ReflectionKind.Enum) ||
     (kind === ReflectionKind.TypeAlias);
 }
+*/
 
 function convertNodeToTypeLink(node, text, url, title = null) {
     let linkDisplayText = unist.makeInlineCode(text);
diff --git a/tools/doc/tools/versionIndex.js b/tools/doc/tools/versionIndex.js
index fd512bef31..a3fc6be94c 100644
--- a/tools/doc/tools/versionIndex.js
+++ b/tools/doc/tools/versionIndex.js
@@ -14,10 +14,7 @@ var ngHelpers = require("../ngHelpers");
 
 
 module.exports = {
-    "initPhase": initPhase,
-    "readPhase": readPhase,
-    "aggPhase": aggPhase,
-    "updatePhase": updatePhase
+    "processDocs": processDocs
 }
 
 var angFilenameRegex = /([a-zA-Z0-9\-]+)\.((component)|(directive)|(model)|(pipe)|(service)|(widget))\.ts/;
@@ -30,12 +27,29 @@ var initialVersion = "v2.0.0";
 
 var templateFolder = path.resolve("tools", "doc", "templates");
 
+
+function processDocs(mdCache, aggData, errorMessages) {
+    initPhase(aggData);
+    readPhase(mdCache, aggData);
+    aggPhase(aggData);
+}
+
+
 function initPhase(aggData) {
     aggData.versions = { "v2.0.0":[] };
 }
 
 
-function readPhase(tree, pathname, aggData) {
+function readPhase(mdCache, aggData) {
+    var pathnames = Object.keys(mdCache);
+
+    pathnames.forEach(pathname => {
+        getFileData(mdCache[pathname].mdInTree, pathname, aggData);
+    });
+}
+
+
+function getFileData(tree, pathname, aggData) {
     var compName = pathname;
     var angNameRegex = /([a-zA-Z0-9\-]+)\.((component)|(directive)|(model)|(pipe)|(service)|(widget))/;
 
@@ -121,8 +135,3 @@ function aggPhase(aggData) {
 
     fs.writeFileSync(histFilePath, remark().use(frontMatter, {type: 'yaml', fence: '---'}).data("settings", {paddedTable: false, gfm: false}).stringify(histFileTree));
 }
-
-
-function updatePhase(tree, pathname, aggData) {
-    return false;
-}
\ No newline at end of file
diff --git a/tools/doc/yamlTemplates/methodSig.ejs b/tools/doc/yamlTemplates/methodSig.ejs
new file mode 100644
index 0000000000..29f1b5e611
--- /dev/null
+++ b/tools/doc/yamlTemplates/methodSig.ejs
@@ -0,0 +1,35 @@
+    summary: >-
+      <%- ((typeof sig.comment !== "undefined") && (typeof sig.comment.shortText !== "undefined")) ? (sig.comment.shortText || "").replace(/[\n\r]+/g, " ").trim() : "" %>
+    tags:
+<% if ((typeof sig.comment !== "undefined") && (typeof sig.comment.tags !== "undefined")) { -%>
+<% sig.comment.tags.forEach(tag => { -%>
+      - name: <%= tag.tag %>
+        text: >-
+          <%= (tag.text || "").replace(/[\n\r]+/g, " ").trim() %>
+<% }) -%>
+<% } -%>
+    syntax:
+      parameters:
+<% if ((typeof sig.parameters !== "undefined") && (sig.parameters.length > 0)) { -%>
+<% sig.parameters.forEach((param) => { -%>
+        - id: <%= param.name %>
+          type: >-
+            <%- include("type", {type: param.type}).trim() %>
+          description: >-
+            <%- param.comment ? (param.comment.text || "").replace(/[\n\r]+/g, " ").trim() : "" %>
+          defaultValue: >-
+            <%- (typeof param.defaultValue !== "undefined") ? param.defaultValue : "" %>
+          flags:
+<%_ if (typeof param.flags !== "undefined") { -%>
+<%_ Object.keys(param.flags).forEach(flagName => { -%>
+            - name: <%= flagName %>
+              value: <%- param.flags[flagName] %>
+<% }) -%>
+<% } -%>
+<% }) -%>
+<% } -%>
+      return:
+        type: >-
+          <%- include("type", {type: sig.type}).trim() %>
+        summary: >-
+          <%- ((typeof sig.comment !== "undefined") && (typeof sig.comment.returns !== "undefined")) ? (sig.comment.returns || "").replace(/[\n\r]+/g, " ").trim() : "" %>
diff --git a/tools/doc/yamlTemplates/property.ejs b/tools/doc/yamlTemplates/property.ejs
new file mode 100644
index 0000000000..8ace72fe32
--- /dev/null
+++ b/tools/doc/yamlTemplates/property.ejs
@@ -0,0 +1,27 @@
+    summary: >-
+      <%- (typeof child.comment !== "undefined") ? (child.comment.shortText || "").replace(/[\n\r]+/g, " ").trim() : "" %>
+    tags:
+<%_ if ((typeof child.comment !== "undefined") && (typeof child.comment.tags !== "undefined")) { -%>
+<% child.comment.tags.forEach(tag => { -%>
+      - name: <%= tag.tag %>
+        text: >-
+          <%- (tag.text || "").replace(/[\n\r]+/g, " ").trim() %>
+<%_ }) -%>
+<% } -%>
+    decorators:
+<%_ if (typeof child.decorators !== "undefined") { -%>
+<% child.decorators.forEach(dec => { -%>
+      - name: <%= dec.name %>
+        arguments:
+<% Object.keys(dec.arguments).forEach(argName => { -%>
+          - id: <%= argName %>
+            value: <%- dec.arguments[argName] %>
+<% }) %>
+<%_ }) -%>
+<% } -%>
+    syntax:
+      return:
+        type: >-
+          <%- include("type", {type: child.type}).trim() %>
+        defaultValue: >-
+          <%- (child.defaultValue || "").length < 20 ? child.defaultValue : "" %>
diff --git a/tools/doc/yamlTemplates/template.ejs b/tools/doc/yamlTemplates/template.ejs
new file mode 100644
index 0000000000..c47826966c
--- /dev/null
+++ b/tools/doc/yamlTemplates/template.ejs
@@ -0,0 +1,44 @@
+items:
+  - uid: <%= name %>
+    name: <%= name %>
+    fullName: <%= name %>
+    source:
+      path: <%= sources[0].fileName %>
+      startLine: <%= sources[0].line %>
+    children:
+<%_ if (typeof children !== "undefined") { -%>
+<%_ children.forEach((child) => { -%>
+        - <%= name %>.<%= child.name %>
+<% }) -%>
+<% } -%>
+    langs: typeScript
+    type: <%= kindString.toLowerCase() %>
+<%_ if (typeof children !== "undefined") { -%>
+<%_ children.forEach((child) => { -%>
+<%_ if ((child.kindString === "Constructor") || (child.kindString === "Method")) { -%>
+<%_ child.signatures.forEach((sig) => { -%>
+  - uid: <%= name %>.<%= child.name %>
+    name: <%= child.name %>
+    type: <%= child.kindString.toLowerCase() %>
+    flags:
+<%_ if (typeof child.flags !== "undefined") { -%>
+<%_ Object.keys(child.flags).forEach(flagName => { -%>
+      - name: <%= flagName %>
+        value: <%= child.flags[flagName] %>
+<% }) -%>
+<% } -%>
+<%- include("methodSig", {sig: sig}); -%>
+<% }); %>
+<% } else if (child.kindString === "Property") { -%>
+  - uid: <%= name %>.<%= child.name %>
+    name: <%= child.name %>
+    type: <%= child.kindString.toLowerCase() %>
+<%- include("property", {child: child}); -%>
+<% } else if ((child.kindString === "Accessor") && (typeof child.getSignature !== "undefined")) { -%>
+  - uid: <%= name %>.<%= child.name %>
+    name: <%= child.name %>
+    type: <%= child.kindString.toLowerCase() %>
+<%- include("property", {child: child.getSignature}); -%>
+<% } -%>
+<% }) -%>
+<% } -%>
\ No newline at end of file
diff --git a/tools/doc/yamlTemplates/type.ejs b/tools/doc/yamlTemplates/type.ejs
new file mode 100644
index 0000000000..0c7f82959f
--- /dev/null
+++ b/tools/doc/yamlTemplates/type.ejs
@@ -0,0 +1,20 @@
+<%_ if ((type.type === "intrinsic") || (type.type === "reference")) { _%>
+<%= type.name _%>
+<%_ if (typeof type.typeArguments !== "undefined") { _%>
+<<%_ type.typeArguments.forEach((arg, index) => { _%>
+<%= index === 0 ? "" : ", " _%>
+<%- include("type", {type: arg}).trim() _%>
+<%_ }) _%>>
+<%_ } _%>
+<%_ } else if (type.type === "stringLiteral") { _%>
+"<%= type.value _%>"
+<%_ } else if (type.type === "reflection") { _%>
+Function
+<%_ } else if (type.type === "array") { _%>
+<%- include("type", {type: type.elementType}).trim() _%>[]
+<%_ } else if (type.type === "union") { _%>
+<%_ type.types.forEach((unionItem, index) => { _%>
+<%= index === 0 ? "" : " | " _%>
+<%- include("type", {type: unionItem}).trim() _%>
+<%_ }) _%>
+<%_ } _%>
\ No newline at end of file
diff --git a/tools/export-check/export-2.3.0.json b/tools/export-check/export-2.3.0.json
index 3fcc927f85..14aef59f2a 100644
--- a/tools/export-check/export-2.3.0.json
+++ b/tools/export-check/export-2.3.0.json
@@ -5031,22 +5031,6 @@
         },
         "name": "RequiredFieldValidator"
     },
-    {
-        "position": {
-            "line": 21,
-            "character": 9,
-            "fileName": "lib/content-services/search/public-api.ts"
-        },
-        "name": "ResponseFacetField"
-    },
-    {
-        "position": {
-            "line": 22,
-            "character": 9,
-            "fileName": "lib/content-services/search/public-api.ts"
-        },
-        "name": "ResponseFacetQuery"
-    },
     {
         "position": {
             "line": 25,
diff --git a/tools/tslint-rules/adfLicenseBannerRule.js b/tools/tslint-rules/adfLicenseBannerRule.js
new file mode 100644
index 0000000000..7a41f4223d
--- /dev/null
+++ b/tools/tslint-rules/adfLicenseBannerRule.js
@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = require("path");
+const Lint = require("tslint");
+const minimatch = require("minimatch");
+const licenseBanner = `/*!
+ * @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.
+ */`;
+const tslintFix = Lint.Replacement.appendText(0, licenseBanner + '\n\n');
+class Rule extends Lint.Rules.AbstractRule {
+    apply(sourceFile) {
+        return this.applyWithWalker(new ADFLicenseBannerRule(sourceFile, this.getOptions()));
+    }
+}
+Rule.metadata = {
+    ruleName: 'adf-license-banner',
+    type: 'maintainability',
+    description: ``,
+    descriptionDetails: ``,
+    rationale: ``,
+    options: null,
+    optionsDescription: `Not configurable.`,
+    typescriptOnly: true,
+};
+Rule.FAILURE_STRING = 'Missing license header in this TypeScript ' +
+    'file Every TypeScript file of the library needs to have the Alfresco license banner at the top.';
+exports.Rule = Rule;
+class ADFLicenseBannerRule extends Lint.RuleWalker {
+    constructor(sourceFile, options) {
+        super(sourceFile, options);
+        const fileGlobs = options.ruleArguments;
+        const relativeFilePath = path.relative(process.cwd(), sourceFile.fileName);
+
+        this._enabled = fileGlobs.some(p => minimatch(relativeFilePath, p));
+
+    }
+    visitSourceFile(sourceFile) {
+        if (!this._enabled) {
+            return;
+        }
+        const fileContent = sourceFile.getFullText();
+        const licenseCommentPos = fileContent.indexOf(licenseBanner);
+        if (licenseCommentPos !== 0) {
+            return this.addFailureAt(0, 0, Rule.FAILURE_STRING, tslintFix);
+        }
+        super.visitSourceFile(sourceFile);
+    }
+}
diff --git a/tools/tslint-rules/adfLicenseBannerRule.ts b/tools/tslint-rules/adfLicenseBannerRule.ts
new file mode 100644
index 0000000000..1bae758819
--- /dev/null
+++ b/tools/tslint-rules/adfLicenseBannerRule.ts
@@ -0,0 +1,86 @@
+import * as path from 'path';
+import * as ts from 'typescript';
+import * as Lint from 'tslint';
+import * as minimatch from 'minimatch';
+
+/** License banner that is placed at the top of every public TypeScript file. */
+const licenseBanner = `/*!
+ * @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.
+ */`;
+
+
+/** TSLint fix that can be used to add the license banner easily. */
+const tslintFix = Lint.Replacement.appendText(0, licenseBanner + '\n\n');
+
+/**
+ * Rule that walks through all TypeScript files of public packages and shows failures if a
+ * file does not have the license banner at the top of the file.
+ */
+export class Rule extends Lint.Rules.AbstractRule {
+
+    public static metadata: Lint.IRuleMetadata = {
+        ruleName: 'adf-license-banner',
+        type: 'maintainability',
+        description: ``,
+        descriptionDetails: ``,
+        rationale: ``,
+        options: null,
+        optionsDescription: `Not configurable.`,
+        typescriptOnly: true,
+    };
+
+    static FAILURE_STRING: string = 'Missing license header in this TypeScript ' +
+        'file Every TypeScript file of the library needs to have the Alfresco license banner at the top.';
+
+    public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
+        return this.applyWithWalker(
+            new ADFLicenseBannerRule(sourceFile,
+                this.getOptions()));
+    }
+}
+
+class ADFLicenseBannerRule extends Lint.RuleWalker {
+
+    /** Whether the walker should check the current source file. */
+    private _enabled: boolean;
+
+    constructor(sourceFile: ts.SourceFile, options: Lint.IOptions) {
+        super(sourceFile, options);
+
+        // Globs that are used to determine which files to lint.
+        const fileGlobs = options.ruleArguments;
+
+        // Relative path for the current TypeScript source file.
+        const relativeFilePath = path.relative(process.cwd(), sourceFile.fileName);
+        // Whether the file should be checked at all.
+        this._enabled = fileGlobs.some(p => minimatch(relativeFilePath, p));
+    }
+
+    visitSourceFile(sourceFile: ts.SourceFile) {
+        if (!this._enabled) {
+            return;
+        }
+
+        const fileContent = sourceFile.getFullText();
+        const licenseCommentPos = fileContent.indexOf(licenseBanner);
+
+        if (licenseCommentPos !== 0) {
+            return this.addFailureAt(0, 0, Rule.FAILURE_STRING, tslintFix);
+        }
+
+        super.visitSourceFile(sourceFile);
+    }
+}
diff --git a/tools/tslint-rules/index.js b/tools/tslint-rules/index.js
index eddc45b307..b7b7669e44 100644
--- a/tools/tslint-rules/index.js
+++ b/tools/tslint-rules/index.js
@@ -6,3 +6,6 @@ var adfFileNameRule_1 = require("./adfFileNameRule");
 exports.ADFComponentSelectorRule = adfFileNameRule_1.Rule;
 var adfPrefixNameRule_1 = require("./adfPrefixNameRule");
 exports.ADFOutputPrefixNameRule = adfPrefixNameRule_1.Rule;
+var adfLicenseBannerRule_1 = require("./adfLicenseBannerRule");
+exports.ADFLicenseBannerRule = adfLicenseBannerRule_1.Rule;
+exports.rulesDirectory = '.';
diff --git a/tools/tslint-rules/index.ts b/tools/tslint-rules/index.ts
index d21f32b1fc..198124d0b6 100644
--- a/tools/tslint-rules/index.ts
+++ b/tools/tslint-rules/index.ts
@@ -1,3 +1,6 @@
 export { Rule as ADFClassNameRule } from './adfClassNameRule';
 export { Rule as ADFComponentSelectorRule } from './adfFileNameRule';
 export { Rule as ADFOutputPrefixNameRule } from './adfPrefixNameRule';
+export { Rule as ADFLicenseBannerRule } from './adfLicenseBannerRule';
+
+export const rulesDirectory = '.';
diff --git a/tools/tslint-rules/package.json b/tools/tslint-rules/package.json
index 2bec22297a..823341ab5a 100644
--- a/tools/tslint-rules/package.json
+++ b/tools/tslint-rules/package.json
@@ -16,29 +16,7 @@
     }
   ],
   "devDependencies": {
-    "@angular/compiler": "4.2.3",
-    "@angular/core": "4.2.3",
-    "@types/chai": "3.4.33",
-    "@types/less": "0.0.31",
-    "@types/mocha": "2.2.32",
-    "@types/node": "6.0.41",
-    "@types/node-sass": "3.10.31",
-    "@types/source-map": "0.5.0",
-    "@types/sprintf-js": "0.0.27",
-    "chai": "3.5.0",
-    "chai-spies": "0.7.1",
-    "minimalist": "1.0.0",
-    "mocha": "3.0.2",
-    "node-sass": "3.13.0",
-    "rimraf": "2.5.2",
-    "rxjs": "5.4.1",
-    "ts-node": "1.2.2",
-    "tslint": "5.0.0",
-    "typescript": "2.4.0",
-    "zone.js": "0.8.4",
-    "js-yaml": "3.8.4",
-    "json-stringify-pretty-compact": "1.0.4",
-    "@types/js-yaml": "3.5.31"
+    "typescript": "2.4.0"
   },
   "peerDependencies": {
     "tslint": "5.0.0"
diff --git a/tslint.json b/tslint.json
index 1835f6e10e..504da2943c 100644
--- a/tslint.json
+++ b/tslint.json
@@ -1,9 +1,13 @@
 {
   "rulesDirectory": [
-    "node_modules/codelyzer",
-    "./adf-tslint-rules"
+    "./node_modules/codelyzer",
+    "./tools/tslint-rules/"
   ],
   "rules": {
+    "adf-license-banner": [
+      true,
+      "e2e/**/*.ts"
+    ],
     "align": [
       true,
       "parameters",
@@ -12,13 +16,7 @@
     "ban": [
       true,
       "eval",
-      {
-        "name": [
-          "fdescribe",
-          "fit"
-        ],
-        "message": "don't focus tests"
-      }
+      "fdescribe"
     ],
     "class-name": true,
     "comment-format": [
@@ -41,8 +39,14 @@
     ],
     "member-ordering": [
       true,
-      "static-before-instance",
-      "variables-before-functions"
+      {
+        "order": [
+          "static-field",
+          "instance-field",
+          "static-method",
+          "instance-method"
+        ]
+      }
     ],
     "no-any": false,
     "no-arg": true,
@@ -61,6 +65,7 @@
     "no-construct": true,
     "no-constructor-vars": false,
     "no-debugger": true,
+    "no-duplicate-super": true,
     "no-duplicate-variable": true,
     "no-empty": false,
     "no-eval": true,
@@ -71,8 +76,6 @@
     "no-switch-case-fall-through": true,
     "no-trailing-whitespace": true,
     "no-unused-expression": true,
-    "no-unused-variable": true,
-    "no-use-before-declare": true,
     "no-var-keyword": true,
     "no-var-requires": true,
     "object-literal-sort-keys": false,
@@ -89,7 +92,10 @@
       "avoid-escape"
     ],
     "radix": true,
-    "semicolon": true,
+    "semicolon": [
+      true,
+      "always"
+    ],
     "switch-default": true,
     "trailing-comma": [
       true,
@@ -121,10 +127,6 @@
       "ban-keywords"
     ],
     "callable-types": true,
-    "import-blacklist": [
-      true,
-      "rxjs"
-    ],
     "import-spacing": true,
     "interface-over-type-literal": true,
     "member-access": false,
@@ -150,6 +152,12 @@
       "adf",
       "kebab-case"
     ],
+    "naming-convention": [
+      {
+        "type": "enumMember",
+        "format": "PascalCase"
+      }
+    ],
     "ordered-imports": false,
     "use-input-property-decorator": true,
     "use-output-property-decorator": true,
@@ -158,9 +166,10 @@
     "use-pipe-transform-interface": true,
     "component-class-suffix": true,
     "directive-class-suffix": true,
-    "no-access-missing-member": false,
     "adf-file-name": true,
     "adf-class-name": true,
-    "adf-prefix-name": true
+    "adf-prefix-name": true,
+    "no-input-rename": true,
+    "no-output-rename": true
   }
 }