diff --git a/demo-shell-ng2/README.md b/demo-shell-ng2/README.md
index d3195f01a1..4a5880fff5 100644
--- a/demo-shell-ng2/README.md
+++ b/demo-shell-ng2/README.md
@@ -28,83 +28,24 @@ to clean up afterwards
 docker-compose rm
 ```
 
-### Configuring development environment
+### Building and running steps:
 
-*All scripts assume you are at the project root folder*
-
-**Install symlinks for Alfresco components**
-
-**On Linux, you may need to use sudo cmd or add user write permissions to /usr/lib/node_modules**
-
-*ng2-alfresco-core:*
+1. Install dependencies
 
 ```sh
-npm link ../ng2-components/ng2-alfresco-core
-```
-
-*ng2-alfresco-datatable component:*
-
-```sh
-npm link ../ng2-components/ng2-alfresco-datatable
-```
-
-*ng2-alfresco-documentlist component:*
-
-```sh
-npm link ../ng2-components/ng2-alfresco-documentlist
-```
-
-*ng2-alfresco-login component:*
-
-```sh
-npm link ../ng2-components/ng2-alfresco-login
-```
-
-*ng2-alfresco-upload component:*
-
-```sh
-npm link ../ng2-components/ng2-alfresco-upload
-```
-
-*dev-platform-js-api client:*
-
-```sh
-npm link ../../dev-platform-js-api
-```
-
-Please refer to [this article](https://docs.npmjs.com/cli/link) for more details on npm link.
-
-### Building and running
-
-**Install dependencies:**
-
-```sh
-cd dev-platform-webcomponents/demo-shell-ng2/
 npm install
 ```
 
-**(Option 1) Fast build and watch for dev purposes:**
+2. Fast build and watch for dev purposes
 
 ```sh
-npm start
+npm start.dev
 ```
 
-`start` script also includes live reload and watchers for all the `.ts` files.
+>`start` script also includes live reload and watchers for all the `.ts` files.
 TypeScript watchers are also configured for `node_modules` folder within demo shell
 and provide live reload for all the component libraries as well.
 
-**(Option 2) Build and watch with Gulp:**
-
-```sh
-npm run build.dev
-```
-
-*or*
-
-```sh
-gulp dev
-```
-
 
 ###Multi-language
 To support a new language you need to create your language file (.json) and add it to `i18n/` folder.
diff --git a/demo-shell-ng2/package.json b/demo-shell-ng2/package.json
index f383ab2004..8f6899dba5 100644
--- a/demo-shell-ng2/package.json
+++ b/demo-shell-ng2/package.json
@@ -4,16 +4,16 @@
   "version": "0.1.0",
   "author": "Alfresco Software, Ltd.",
   "scripts": {
-    "build.dev": "gulp dev",
-    "build.prod": "gulp build",
     "prestart": "npm install",
-    "start": "concurrently \"npm run tsc:w\" \"npm run lite\" ",
+    "start.dev": "concurrently \"npm run tsc:w\" \"npm run serve\" ",
+    "start": "concurrently \"npm run tsc:w\" \"npm run serve\" ",
     "test": "live-server --open=tests-runner.html",
     "tsc": "tsc",
     "tsc:w": "tsc -w -p tsconfig.dev.json",
-    "lite": "lite-server",
+    "serve": "live-server",
     "typings": "typings",
-    "postinstall": "typings install"
+    "postinstall": "typings install && npm link ../ng2-components/ng2-alfresco-core &&  npm link ../ng2-components/ng2-alfresco-documentlist && npm link ../ng2-components/ng2-alfresco-login && npm link ../ng2-components/ng2-alfresco-upload && npm link ../ng2-components/ng2-alfresco-datatable",
+    "postupdate": "npm link ../ng2-components/ng2-alfresco-core &&  npm link ../ng2-components/ng2-alfresco-documentlist && npm link ../ng2-components/ng2-alfresco-login && npm link ../ng2-components/ng2-alfresco-upload && npm link ../ng2-components/ng2-alfresco-datatable"
   },
   "repository": {
     "type": "git",
@@ -40,6 +40,7 @@
     "alfresco"
   ],
   "dependencies": {
+    "alfresco-core-rest-api": "https://github.com/Alfresco/dev-platform-js-api",
     "angular2": "2.0.0-beta.15",
     "bootstrap": "^3.3.6",
     "es6-shim": "^0.35.0",
diff --git a/ng2-components/ng2-alfresco-core/package.json b/ng2-components/ng2-alfresco-core/package.json
index 4540a4f71c..e6057676a1 100644
--- a/ng2-components/ng2-alfresco-core/package.json
+++ b/ng2-components/ng2-alfresco-core/package.json
@@ -4,7 +4,7 @@
     "version": "0.1.0",
     "author": "Alfresco Software, Ltd.",
     "scripts": {
-        "postinstall": "npm run typings",
+        "postinstall": "npm run build && typings install",
         "typings": "typings install",
         "start": "npm run test && http-server -c-1 -o -p 8875 .",
         "build": "npm run tslint && typings install && rm -rf dist && tsc && npm run copytemplates && license-check",
diff --git a/ng2-components/ng2-alfresco-datatable/package.json b/ng2-components/ng2-alfresco-datatable/package.json
index 128c099b65..e3ebe65b1b 100644
--- a/ng2-components/ng2-alfresco-datatable/package.json
+++ b/ng2-components/ng2-alfresco-datatable/package.json
@@ -1,89 +1,89 @@
 {
-  "name": "ng2-alfresco-datatable",
-  "description": "Alfresco Angular2 DataTable Component",
-  "version": "0.1.0",
-  "author": "Alfresco Software, Ltd.",
-  "scripts": {
-    "postinstall": "npm run typings",
-    "typings": "typings install",
-    "start": "npm run test && http-server -c-1 -o -p 8875 .",
-    "build": "npm run tslint && typings install && rm -rf dist && tsc && npm run copytemplates && license-check",
-    "tslint": "npm run tslint-test && npm run tslint-src && npm run tslint-root",
-    "tslint-test": "tslint -c tslint.json test/**/*.ts",
-    "tslint-src": "tslint -c tslint.json src/**/*.ts",
-    "tslint-root": "tslint -c tslint.json *.ts",
-    "copytemplates": "npm run copy-html && npm run copy-css",
-    "copy-html": "copyfiles './src/**/*.html' dist",
-    "copy-css": "copyfiles './src/**/*.css' dist",
-    "licensecheck": "license-check",
-    "tsc": "tsc",
-    "pretest": "npm run build",
-    "test": "karma start karma.conf.js",
-    "posttest": "node_modules/.bin/remap-istanbul -i coverage/coverage-final.json -o coverage -t html",
-    "coverage": "http-server -c-1 -o -p 9875 ./coverage"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/Alfresco/dev-platform-webcomponents.git"
-  },
-  "bugs": {
-    "url": "https://github.com/Alfresco/dev-platform-webcomponents/issues"
-  },
-  "license": "Apache-2.0",
-  "contributors": [
-    {
-      "name": "Denys Vuika",
-      "email": "denis.vuyka@gmail.com"
-    }
-  ],
-  "keywords": [
-    "ng2",
-    "angular",
-    "angular2",
-    "alfresco"
-  ],
-  "dependencies": {
-    "angular2": "2.0.0-beta.15",
-    "systemjs": "0.19.26",
-    "es6-shim": "^0.35.0",
-    "reflect-metadata": "0.1.2",
-    "rxjs": "5.0.0-beta.2",
-    "zone.js": "^0.6.12",
-    "es6-module-loader": "^0.17.8"
-  },
-  "peerDependencies": {
-    "angular2": "2.0.0-beta.15"
-  },
-  "devDependencies": {
-    "copyfiles": "^0.2.1",
-    "coveralls": "^2.11.9",
-    "http-server": "0.8.5",
-    "jasmine-core": "2.4.1",
-    "karma": "~0.13.22",
-    "karma-chrome-launcher": "~1.0.1",
-    "karma-coverage": "^1.0.0",
-    "karma-jasmine": "~1.0.2",
-    "karma-mocha-reporter": "^2.0.3",
-    "license-check": "^1.0.4",
-    "remap-istanbul": "^0.6.3",
-    "traceur": "^0.0.91",
-    "tslint": "^3.8.1",
-    "typescript": "^1.8.10",
-    "typings": "^0.7.12"
-  },
-  "license-check-config": {
-    "src": [
-      "**/*.js",
-      "**/*.ts",
-      "!/**/coverage/**/*",
-      "!/**/demo/**/*",
-      "!/**/node_modules/**/*",
-      "!/**/typings/**/*",
-      "!*.js"
+    "name": "ng2-alfresco-datatable",
+    "description": "Alfresco Angular2 DataTable Component",
+    "version": "0.1.0",
+    "author": "Alfresco Software, Ltd.",
+    "scripts": {
+        "postinstall": "typings install && npm link ../ng2-alfresco-core && npm run build",
+        "typings": "typings install",
+        "start": "npm run test && http-server -c-1 -o -p 8875 .",
+        "build": "npm run tslint && typings install && rm -rf dist && tsc && npm run copytemplates && license-check",
+        "tslint": "npm run tslint-test && npm run tslint-src && npm run tslint-root",
+        "tslint-test": "tslint -c tslint.json test/**/*.ts",
+        "tslint-src": "tslint -c tslint.json src/**/*.ts",
+        "tslint-root": "tslint -c tslint.json *.ts",
+        "copytemplates": "npm run copy-html && npm run copy-css",
+        "copy-html": "copyfiles './src/**/*.html' dist",
+        "copy-css": "copyfiles './src/**/*.css' dist",
+        "licensecheck": "license-check",
+        "tsc": "tsc",
+        "pretest": "npm run build",
+        "test": "karma start karma.conf.js",
+        "posttest": "node_modules/.bin/remap-istanbul -i coverage/coverage-final.json -o coverage -t html",
+        "coverage": "http-server -c-1 -o -p 9875 ./coverage"
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/Alfresco/dev-platform-webcomponents.git"
+    },
+    "bugs": {
+        "url": "https://github.com/Alfresco/dev-platform-webcomponents/issues"
+    },
+    "license": "Apache-2.0",
+    "contributors": [
+        {
+            "name": "Denys Vuika",
+            "email": "denis.vuyka@gmail.com"
+        }
     ],
-    "path": "assets/license_header.txt",
-    "blocking": false,
-    "logInfo": false,
-    "logError": true
-  }
+    "keywords": [
+        "ng2",
+        "angular",
+        "angular2",
+        "alfresco"
+    ],
+    "dependencies": {
+        "angular2": "2.0.0-beta.15",
+        "systemjs": "0.19.26",
+        "es6-shim": "^0.35.0",
+        "reflect-metadata": "0.1.2",
+        "rxjs": "5.0.0-beta.2",
+        "zone.js": "^0.6.12",
+        "es6-module-loader": "^0.17.8"
+    },
+    "peerDependencies": {
+        "angular2": "2.0.0-beta.15"
+    },
+    "devDependencies": {
+        "copyfiles": "^0.2.1",
+        "coveralls": "^2.11.9",
+        "http-server": "0.8.5",
+        "jasmine-core": "2.4.1",
+        "karma": "~0.13.22",
+        "karma-chrome-launcher": "~1.0.1",
+        "karma-coverage": "^1.0.0",
+        "karma-jasmine": "~1.0.2",
+        "karma-mocha-reporter": "^2.0.3",
+        "license-check": "^1.0.4",
+        "remap-istanbul": "^0.6.3",
+        "traceur": "^0.0.91",
+        "tslint": "^3.8.1",
+        "typescript": "^1.8.10",
+        "typings": "^0.7.12"
+    },
+    "license-check-config": {
+        "src": [
+            "**/*.js",
+            "**/*.ts",
+            "!/**/coverage/**/*",
+            "!/**/demo/**/*",
+            "!/**/node_modules/**/*",
+            "!/**/typings/**/*",
+            "!*.js"
+        ],
+        "path": "assets/license_header.txt",
+        "blocking": false,
+        "logInfo": false,
+        "logError": true
+    }
 }
diff --git a/ng2-components/ng2-alfresco-documentlist/package.json b/ng2-components/ng2-alfresco-documentlist/package.json
index 69244d5562..b37b159635 100644
--- a/ng2-components/ng2-alfresco-documentlist/package.json
+++ b/ng2-components/ng2-alfresco-documentlist/package.json
@@ -1,93 +1,93 @@
 {
-  "name": "ng2-alfresco-documentlist",
-  "description": "Alfresco Angular2 Document List Component",
-  "version": "0.1.0",
-  "author": "Alfresco Software, Ltd.",
-  "scripts": {
-    "postinstall": "npm run typings",
-    "typings": "typings install",
-    "start": "npm run test && http-server -c-1 -o -p 8875 .",
-    "build": "npm run tslint && typings install && rm -rf dist && tsc && npm run copytemplates && license-check",
-    "tslint": "npm run tslint-test && npm run tslint-src && npm run tslint-root",
-    "tslint-test": "tslint -c tslint.json test/**/*.ts",
-    "tslint-src": "tslint -c tslint.json src/**/*.ts",
-    "tslint-root": "tslint -c tslint.json *.ts",
-    "copytemplates": "npm run copy-html && npm run copy-css",
-    "copy-html": "copyfiles './src/**/*.html' dist",
-    "copy-css": "copyfiles './src/**/*.css' dist",
-    "licensecheck": "license-check",
-    "tsc": "tsc",
-    "pretest": "npm run build",
-    "test": "karma start karma.conf.js",
-    "posttest": "node_modules/.bin/remap-istanbul -i coverage/coverage-final.json -o coverage -t html",
-    "coverage": "http-server -c-1 -o -p 9875 ./coverage"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/Alfresco/dev-platform-webcomponents.git"
-  },
-  "bugs": {
-    "url": "https://github.com/Alfresco/dev-platform-webcomponents/issues"
-  },
-  "license": "Apache-2.0",
-  "contributors": [
-    {
-      "name": "Denys Vuika",
-      "email": "denis.vuyka@gmail.com"
+    "name": "ng2-alfresco-documentlist",
+    "description": "Alfresco Angular2 Document List Component",
+    "version": "0.1.0",
+    "author": "Alfresco Software, Ltd.",
+    "scripts": {
+        "postinstall": "typings install && npm link ../ng2-alfresco-core && npm run build",
+        "typings": "typings install",
+        "start": "npm run test && http-server -c-1 -o -p 8875 .",
+        "build": "npm run tslint && typings install && rm -rf dist && tsc && npm run copytemplates && license-check",
+        "tslint": "npm run tslint-test && npm run tslint-src && npm run tslint-root",
+        "tslint-test": "tslint -c tslint.json test/**/*.ts",
+        "tslint-src": "tslint -c tslint.json src/**/*.ts",
+        "tslint-root": "tslint -c tslint.json *.ts",
+        "copytemplates": "npm run copy-html && npm run copy-css",
+        "copy-html": "copyfiles './src/**/*.html' dist",
+        "copy-css": "copyfiles './src/**/*.css' dist",
+        "licensecheck": "license-check",
+        "tsc": "tsc",
+        "pretest": "npm run build",
+        "test": "karma start karma.conf.js",
+        "posttest": "node_modules/.bin/remap-istanbul -i coverage/coverage-final.json -o coverage -t html",
+        "coverage": "http-server -c-1 -o -p 9875 ./coverage"
     },
-    {
-      "name": "Mario Romano",
-      "email": "mario.romano83@gmail.com"
-    }
-  ],
-  "keywords": [
-    "ng2",
-    "angular",
-    "angular2",
-    "alfresco"
-  ],
-  "dependencies": {
-    "angular2": "2.0.0-beta.15",
-    "systemjs": "0.19.26",
-    "es6-shim": "^0.35.0",
-    "reflect-metadata": "0.1.2",
-    "rxjs": "5.0.0-beta.2",
-    "zone.js": "^0.6.12",
-    "es6-module-loader": "^0.17.8"
-  },
-  "peerDependencies": {
-    "angular2": "2.0.0-beta.15"
-  },
-  "devDependencies": {
-    "copyfiles": "^0.2.1",
-    "coveralls": "^2.11.9",
-    "http-server": "0.8.5",
-    "jasmine-core": "2.4.1",
-    "karma": "~0.13.22",
-    "karma-chrome-launcher": "~1.0.1",
-    "karma-coverage": "^1.0.0",
-    "karma-jasmine": "~1.0.2",
-    "karma-mocha-reporter": "^2.0.3",
-    "license-check": "^1.0.4",
-    "remap-istanbul": "^0.6.3",
-    "traceur": "^0.0.91",
-    "tslint": "^3.8.1",
-    "typescript": "^1.8.10",
-    "typings": "^0.7.12"
-  },
-  "license-check-config": {
-    "src": [
-      "**/*.js",
-      "**/*.ts",
-      "!/**/coverage/**/*",
-      "!/**/demo/**/*",
-      "!/**/node_modules/**/*",
-      "!/**/typings/**/*",
-      "!*.js"
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/Alfresco/dev-platform-webcomponents.git"
+    },
+    "bugs": {
+        "url": "https://github.com/Alfresco/dev-platform-webcomponents/issues"
+    },
+    "license": "Apache-2.0",
+    "contributors": [
+        {
+            "name": "Denys Vuika",
+            "email": "denis.vuyka@gmail.com"
+        },
+        {
+            "name": "Mario Romano",
+            "email": "mario.romano83@gmail.com"
+        }
     ],
-    "path": "assets/license_header.txt",
-    "blocking": false,
-    "logInfo": false,
-    "logError": true
-  }
+    "keywords": [
+        "ng2",
+        "angular",
+        "angular2",
+        "alfresco"
+    ],
+    "dependencies": {
+        "angular2": "2.0.0-beta.15",
+        "systemjs": "0.19.26",
+        "es6-shim": "^0.35.0",
+        "reflect-metadata": "0.1.2",
+        "rxjs": "5.0.0-beta.2",
+        "zone.js": "^0.6.12",
+        "es6-module-loader": "^0.17.8"
+    },
+    "peerDependencies": {
+        "angular2": "2.0.0-beta.15"
+    },
+    "devDependencies": {
+        "copyfiles": "^0.2.1",
+        "coveralls": "^2.11.9",
+        "http-server": "0.8.5",
+        "jasmine-core": "2.4.1",
+        "karma": "~0.13.22",
+        "karma-chrome-launcher": "~1.0.1",
+        "karma-coverage": "^1.0.0",
+        "karma-jasmine": "~1.0.2",
+        "karma-mocha-reporter": "^2.0.3",
+        "license-check": "^1.0.4",
+        "remap-istanbul": "^0.6.3",
+        "traceur": "^0.0.91",
+        "tslint": "^3.8.1",
+        "typescript": "^1.8.10",
+        "typings": "^0.7.12"
+    },
+    "license-check-config": {
+        "src": [
+            "**/*.js",
+            "**/*.ts",
+            "!/**/coverage/**/*",
+            "!/**/demo/**/*",
+            "!/**/node_modules/**/*",
+            "!/**/typings/**/*",
+            "!*.js"
+        ],
+        "path": "assets/license_header.txt",
+        "blocking": false,
+        "logInfo": false,
+        "logError": true
+    }
 }
diff --git a/ng2-components/ng2-alfresco-login/package.json b/ng2-components/ng2-alfresco-login/package.json
index 0a61faa495..c0b4a86e12 100644
--- a/ng2-components/ng2-alfresco-login/package.json
+++ b/ng2-components/ng2-alfresco-login/package.json
@@ -4,7 +4,7 @@
     "version": "0.1.0",
     "author": "Alfresco Software, Ltd.",
     "scripts": {
-        "postinstall": "npm run typings",
+        "postinstall": "npm run build && typings install",
         "typings": "typings install",
         "start": "npm run test && http-server -c-1 -o -p 8875 .",
         "build": "npm run tslint && typings install && rm -rf dist && tsc && npm run copytemplates && license-check",
@@ -42,6 +42,10 @@
         {
             "name": "Mario Romano",
             "email": "mario.romano83@gmail.com"
+        },
+        {
+            "name": "Eugenio Romano",
+            "email": "eugenio.romano83@gmail.com"
         }
     ],
     "keywords": [
diff --git a/ng2-components/ng2-alfresco-upload/package.json b/ng2-components/ng2-alfresco-upload/package.json
index 03da0f7fab..b4bb37f32c 100644
--- a/ng2-components/ng2-alfresco-upload/package.json
+++ b/ng2-components/ng2-alfresco-upload/package.json
@@ -1,92 +1,96 @@
 {
-  "name": "ng2-alfresco-upload",
-  "description": "Alfresco Angular2 Upload Component",
-  "version": "0.1.0",
-  "author": "Alfresco Software, Ltd.",
-  "scripts": {
-    "postinstall": "npm run typings",
-    "typings": "typings install",
-    "start": "npm run test && http-server -c-1 -o -p 8875 .",
-    "build": "npm run tslint && typings install && rm -rf dist && tsc && npm run copytemplates && license-check",
-    "tslint": "npm run tslint-test && npm run tslint-src && npm run tslint-root",
-    "tslint-test": "tslint -c tslint.json test/**/*.ts",
-    "tslint-src": "tslint -c tslint.json src/**/*.ts",
-    "tslint-root": "tslint -c tslint.json *.ts",
-    "copytemplates": "npm run copy-html && npm run copy-css",
-    "copy-html": "copyfiles './src/**/*.html' dist",
-    "copy-css": "copyfiles './src/**/*.css' dist",
-    "licensecheck": "license-check",
-    "tsc": "tsc",
-    "pretest": "npm run build",
-    "test": "karma start karma.conf.js",
-    "posttest": "node_modules/.bin/remap-istanbul -i coverage/coverage-final.json -o coverage -t html",
-    "coverage": "http-server -c-1 -o -p 9875 ./coverage"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/Alfresco/dev-platform-webcomponents.git"
-  },
-  "bugs": {
-    "url": "https://github.com/Alfresco/dev-platform-webcomponents/issues"
-  },
-  "license": "Apache-2.0",
-  "contributors": [
-    {
-      "name": "Mario Romano",
-      "email": "mario.romano83@gmail.com"
-    }
-  ],
-  "keywords": [
-    "ng2",
-    "angular",
-    "angular2",
-    "alfresco"
-  ],
-  "dependencies": {
-    "angular2": "2.0.0-beta.15",
-    "systemjs": "0.19.26",
-    "es6-shim": "^0.35.0",
-    "reflect-metadata": "0.1.2",
-    "rxjs": "5.0.0-beta.2",
-    "ng2-translate": "^1.11.2",
-    "zone.js": "^0.6.12",
-    "es6-module-loader": "^0.17.8"
-  },
-  "peerDependencies": {
-    "angular2": "2.0.0-beta.15"
-  },
-  "devDependencies": {
-    "copyfiles": "^0.2.1",
-    "coveralls": "^2.11.9",
-    "http-server": "0.8.5",
-    "jasmine-ajax": "^3.2.0",
-    "jasmine-core": "2.4.1",
-    "karma": "~0.13.22",
-    "karma-chrome-launcher": "~1.0.1",
-    "karma-coverage": "^1.0.0",
-    "karma-jasmine": "~1.0.2",
-    "karma-jasmine-ajax": "^0.1.13",
-    "karma-mocha-reporter": "^2.0.3",
-    "license-check": "^1.0.4",
-    "remap-istanbul": "^0.6.3",
-    "traceur": "^0.0.91",
-    "tslint": "^3.8.1",
-    "typescript": "^1.8.10",
-    "typings": "^0.7.12"
-  },
-  "license-check-config": {
-    "src": [
-      "**/*.js",
-      "**/*.ts",
-      "!/**/coverage/**/*",
-      "!/**/demo/**/*",
-      "!/**/node_modules/**/*",
-      "!/**/typings/**/*",
-      "!*.js"
+    "name": "ng2-alfresco-upload",
+    "description": "Alfresco Angular2 Upload Component",
+    "version": "0.1.0",
+    "author": "Alfresco Software, Ltd.",
+    "scripts": {
+        "postinstall": "npm run build && typings install",
+        "typings": "typings install",
+        "start": "npm run test && http-server -c-1 -o -p 8875 .",
+        "build": "npm run tslint && typings install && rm -rf dist && tsc && npm run copytemplates && license-check",
+        "tslint": "npm run tslint-test && npm run tslint-src && npm run tslint-root",
+        "tslint-test": "tslint -c tslint.json test/**/*.ts",
+        "tslint-src": "tslint -c tslint.json src/**/*.ts",
+        "tslint-root": "tslint -c tslint.json *.ts",
+        "copytemplates": "npm run copy-html && npm run copy-css",
+        "copy-html": "copyfiles './src/**/*.html' dist",
+        "copy-css": "copyfiles './src/**/*.css' dist",
+        "licensecheck": "license-check",
+        "tsc": "tsc",
+        "pretest": "npm run build",
+        "test": "karma start karma.conf.js",
+        "posttest": "node_modules/.bin/remap-istanbul -i coverage/coverage-final.json -o coverage -t html",
+        "coverage": "http-server -c-1 -o -p 9875 ./coverage"
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/Alfresco/dev-platform-webcomponents.git"
+    },
+    "bugs": {
+        "url": "https://github.com/Alfresco/dev-platform-webcomponents/issues"
+    },
+    "license": "Apache-2.0",
+    "contributors": [
+        {
+            "name": "Mario Romano",
+            "email": "mario.romano83@gmail.com"
+        },
+        {
+            "name": "Eugenio Romano",
+            "email": "eugenio.romano83@gmail.com"
+        }
     ],
-    "path": "assets/license_header.txt",
-    "blocking": false,
-    "logInfo": false,
-    "logError": true
-  }
+    "keywords": [
+        "ng2",
+        "angular",
+        "angular2",
+        "alfresco"
+    ],
+    "dependencies": {
+        "angular2": "2.0.0-beta.15",
+        "systemjs": "0.19.26",
+        "es6-shim": "^0.35.0",
+        "reflect-metadata": "0.1.2",
+        "rxjs": "5.0.0-beta.2",
+        "ng2-translate": "^1.11.2",
+        "zone.js": "^0.6.12",
+        "es6-module-loader": "^0.17.8"
+    },
+    "peerDependencies": {
+        "angular2": "2.0.0-beta.15"
+    },
+    "devDependencies": {
+        "copyfiles": "^0.2.1",
+        "coveralls": "^2.11.9",
+        "http-server": "0.8.5",
+        "jasmine-ajax": "^3.2.0",
+        "jasmine-core": "2.4.1",
+        "karma": "~0.13.22",
+        "karma-chrome-launcher": "~1.0.1",
+        "karma-coverage": "^1.0.0",
+        "karma-jasmine": "~1.0.2",
+        "karma-jasmine-ajax": "^0.1.13",
+        "karma-mocha-reporter": "^2.0.3",
+        "license-check": "^1.0.4",
+        "remap-istanbul": "^0.6.3",
+        "traceur": "^0.0.91",
+        "tslint": "^3.8.1",
+        "typescript": "^1.8.10",
+        "typings": "^0.7.12"
+    },
+    "license-check-config": {
+        "src": [
+            "**/*.js",
+            "**/*.ts",
+            "!/**/coverage/**/*",
+            "!/**/demo/**/*",
+            "!/**/node_modules/**/*",
+            "!/**/typings/**/*",
+            "!*.js"
+        ],
+        "path": "assets/license_header.txt",
+        "blocking": false,
+        "logInfo": false,
+        "logError": true
+    }
 }
diff --git a/ng2-components/ng2-alfresco-viewer/package.json b/ng2-components/ng2-alfresco-viewer/package.json
index fb4481eb20..6c9b62472c 100644
--- a/ng2-components/ng2-alfresco-viewer/package.json
+++ b/ng2-components/ng2-alfresco-viewer/package.json
@@ -1,88 +1,90 @@
 {
-  "keywords": [
-    "viewer",
-    "pdf",
-    "alfresco-component"
-  ],
-  "name": "ng-2-alfresco-viewer",
-  "description": "Alfresco documents viewer",
-  "version": "0.1.0",
-  "author": "Eugenio Romano",
-  "scripts": {
-    "postinstall": "npm run typings",
-    "typings": "typings install",
-    "start": "npm run test && http-server -c-1 -o -p 8875 .",
-    "build": "npm run tslint && typings install && rm -rf dist && tsc && npm run copytemplates && license-check",
-    "tslint": "npm run tslint-test && npm run tslint-src && npm run tslint-root",
-    "tslint-test": "tslint -c tslint.json test/**/*.ts",
-    "tslint-src": "tslint -c tslint.json src/**/*.ts",
-    "tslint-root": "tslint -c tslint.json *.ts",
-    "copytemplates": "npm run copy-html && npm run copy-css",
-    "copy-html": "copyfiles './src/**/*.html' dist",
-    "copy-css": "copyfiles './src/**/*.css' dist",
-    "licensecheck": "license-check",
-    "tsc": "tsc",
-    "pretest": "npm run build",
-    "test": "karma start karma.conf.js",
-    "posttest": "node_modules/.bin/remap-istanbul -i coverage/coverage-final.json -o coverage -t html",
-    "coverage": "http-server -c-1 -o -p 9875 ./coverage"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/alfresco/ng-2-alfresco-viewer.git"
-  },
-  "bugs": {
-    "url": "https://github.com/alfresco/ng-2-alfresco-viewer/issues"
-  },
-  "dependencies": {
-    "angular2": "2.0.0-beta.15",
-    "systemjs": "0.19.26",
-    "es6-shim": "^0.35.0",
-    "es6-module-loader": "^0.17.8",
-    "reflect-metadata": "0.1.2",
-    "rxjs": "5.0.0-beta.2",
-    "zone.js": "^0.6.12",
-    "ng2-translate": "^1.11.2",
-    "alfresco-core-rest-api": "https://github.com/Alfresco/dev-platform-js-api"
-  },
-  "peerDependencies": {
-    "angular2": "2.0.0-beta.15"
-  },
-  "devDependencies": {
-    "copyfiles": "^0.2.1",
-    "coveralls": "^2.11.9",
-    "codelyzer": "0.0.19",
-    "http-server": "0.8.5",
-    "jasmine-core": "2.4.1",
-    "karma": "~0.12.0",
-    "karma-chrome-launcher": "~1.0.1",
-    "karma-coverage": "^1.0.0",
-    "karma-jasmine": "~1.0.2",
-    "karma-jasmine-ajax": "0.1.12",
-    "karma-mocha-reporter": "^2.0.3",
-    "license-check": "^1.0.4",
-    "remap-istanbul": "^0.6.3",
-    "traceur": "^0.0.91",
-    "tslint": "^3.8.1",
-    "typescript": "^1.8.10",
-    "typings": "^0.7.12",
-    "xo": "^0.14.0",
-    "yargs": "^4.7.0"
-  },
-  "license-check-config": {
-    "src": [
-      "**/*.js",
-      "**/*.ts",
-      "!/**/coverage/**/*",
-      "!/**/demo/**/*",
-      "!/**/node_modules/**/*",
-      "!/**/typings/**/*",
-      "!*.js"
+    "keywords": [
+        "viewer",
+        "pdf",
+        "alfresco-component"
     ],
-    "path": "assets/license_header.txt",
-    "blocking": false,
-    "logInfo": false,
-    "logError": true
-  },
-  "license": "Apache-2.0"
+    "name": "ng-2-alfresco-viewer",
+    "description": "Alfresco documents viewer",
+    "version": "0.1.0",
+    "author": "Eugenio Romano",
+    "scripts": {
+        "postinstall": "npm run build && typings install",
+        "typings": "typings install",
+        "start": "npm run test && http-server -c-1 -o -p 8875 .",
+        "build": "npm run tslint && typings install && rm -rf dist && tsc && npm run copytemplates && license-check",
+        "tslint": "npm run tslint-test && npm run tslint-src && npm run tslint-root",
+        "tslint-test": "tslint -c tslint.json test/**/*.ts",
+        "tslint-src": "tslint -c tslint.json src/**/*.ts",
+        "tslint-root": "tslint -c tslint.json *.ts",
+        "copytemplates": "npm run copy-html && npm run copy-css",
+        "copy-html": "copyfiles './src/**/*.html' dist",
+        "copy-css": "copyfiles './src/**/*.css' dist",
+        "licensecheck": "license-check",
+        "tsc": "tsc",
+        "pretest": "npm run build",
+        "test": "karma start karma.conf.js",
+        "posttest": "node_modules/.bin/remap-istanbul -i coverage/coverage-final.json -o coverage -t html",
+        "coverage": "http-server -c-1 -o -p 9875 ./coverage",
+        "deploy": "http-server -c-1 -o -p 9875 ./demo/demo.html"
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/alfresco/ng-2-alfresco-viewer.git"
+    },
+    "bugs": {
+        "url": "https://github.com/alfresco/ng-2-alfresco-viewer/issues"
+    },
+    "dependencies": {
+        "angular2": "2.0.0-beta.15",
+        "systemjs": "0.19.26",
+        "es6-shim": "^0.35.0",
+        "es6-module-loader": "^0.17.8",
+        "pdfjs-dist": "^1.5.258",
+        "reflect-metadata": "0.1.2",
+        "rxjs": "5.0.0-beta.2",
+        "zone.js": "^0.6.12",
+        "ng2-translate": "^1.11.2",
+        "alfresco-core-rest-api": "https://github.com/Alfresco/dev-platform-js-api"
+    },
+    "peerDependencies": {
+        "angular2": "2.0.0-beta.15"
+    },
+    "devDependencies": {
+        "codelyzer": "0.0.19",
+        "copyfiles": "^0.2.1",
+        "coveralls": "^2.11.9",
+        "http-server": "0.8.5",
+        "jasmine-core": "2.4.1",
+        "karma": "~0.12.0",
+        "karma-chrome-launcher": "~1.0.1",
+        "karma-coverage": "^1.0.0",
+        "karma-jasmine": "~1.0.2",
+        "karma-jasmine-ajax": "0.1.12",
+        "karma-mocha-reporter": "^2.0.3",
+        "license-check": "^1.0.4",
+        "remap-istanbul": "^0.6.3",
+        "traceur": "^0.0.91",
+        "tslint": "^3.8.1",
+        "typescript": "^1.8.10",
+        "typings": "^0.7.12",
+        "xo": "^0.14.0",
+        "yargs": "^4.7.0"
+    },
+    "license-check-config": {
+        "src": [
+            "**/*.js",
+            "**/*.ts",
+            "!/**/coverage/**/*",
+            "!/**/demo/**/*",
+            "!/**/node_modules/**/*",
+            "!/**/typings/**/*",
+            "!*.js"
+        ],
+        "path": "assets/license_header.txt",
+        "blocking": false,
+        "logInfo": false,
+        "logError": true
+    },
+    "license": "Apache-2.0"
 }