diff --git a/demo-shell-ng2/config/webpack.common.js b/demo-shell-ng2/config/webpack.common.js
index 55e39787f8..ee7a199828 100644
--- a/demo-shell-ng2/config/webpack.common.js
+++ b/demo-shell-ng2/config/webpack.common.js
@@ -123,7 +123,7 @@ module.exports = {
                 return {
                     context: `../ng2-components/${lib}/bundles/assets/` ,
                     from: '**/*',
-                    to: `bundles/assets/`
+                    to: `assets/`
                 }
             }),
             {
diff --git a/ng2-components/config/webpack.common.js b/ng2-components/config/webpack.common.js
index 67fd8b9440..f05c4ec322 100644
--- a/ng2-components/config/webpack.common.js
+++ b/ng2-components/config/webpack.common.js
@@ -94,8 +94,8 @@ module.exports = {
                     },
                     publicPath: (url, resourcePath)=> {
                         var component = resourcePath.substring(0, resourcePath.indexOf('src'));
-                        var path = resourcePath.replace(component, '').replace('src', 'bundles');
-                        return './' + path + url;
+                        var path = resourcePath.replace(component, '').replace('src/', '');
+                        return path + url;
                     }
                 }
             }
diff --git a/ng2-components/ng2-activiti-analytics/config/webpack.common.js b/ng2-components/ng2-activiti-analytics/config/webpack.common.js
index 95cd33177e..52a680e87e 100644
--- a/ng2-components/ng2-activiti-analytics/config/webpack.common.js
+++ b/ng2-components/ng2-activiti-analytics/config/webpack.common.js
@@ -87,8 +87,8 @@ module.exports = {
                     },
                     publicPath: (url, resourcePath)=> {
                         var component = resourcePath.substring(0, resourcePath.indexOf('src'));
-                        var path = resourcePath.replace(component, '').replace('src', 'bundles');
-                        return './' + path + url;
+                        var path = resourcePath.replace(component, '').replace('src/', '');
+                        return path + url;
                     }
                 }
             }
diff --git a/ng2-components/ng2-activiti-analytics/demo/package.json b/ng2-components/ng2-activiti-analytics/demo/package.json
index b149870db0..272da2731e 100644
--- a/ng2-components/ng2-activiti-analytics/demo/package.json
+++ b/ng2-components/ng2-activiti-analytics/demo/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "ng2-activiti-diagrams-demo",
+  "name": "ng2-activiti-analytics-demo",
   "description": "Alfresco Angular2 Diagrams Component - Demo",
   "version": "0.1.0",
   "author": "Alfresco Software, Ltd.",
@@ -12,7 +12,7 @@
     "server": "wsrv -o -s -l",
     "build": "npm run tslint && npm run clean-build && npm run tsc",
     "build:w": "npm run tslint && rimraf dist && npm run tsc:w",
-    "travis": "npm link ng2-alfresco-core ng2-activiti-diagrams",
+    "travis": "npm link ng2-alfresco-core ng2-activiti-diagrams ng2-activiti-analytics",
     "tsc": "tsc",
     "tsc:w": "tsc -w",
     "tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts  -e '{,**/}**.d.ts'"
@@ -32,22 +32,28 @@
     "activiti-diagrams"
   ],
   "dependencies": {
-    "@angular/common": "2.4.7",
-    "@angular/compiler": "2.4.7",
-    "@angular/compiler-cli": "2.4.7",
-    "@angular/core": "2.4.7",
-    "@angular/forms": "2.4.7",
-    "@angular/http": "2.4.7",
-    "@angular/platform-browser": "2.4.7",
-    "@angular/platform-browser-dynamic": "2.4.7",
+    "@angular/animations": "~4.0.0",
+    "@angular/common": "~4.0.0",
+    "@angular/compiler": "~4.0.0",
+    "@angular/core": "~4.0.0",
+    "@angular/forms": "~4.0.0",
+    "@angular/http": "~4.0.0",
+    "@angular/platform-browser": "~4.0.0",
+    "@angular/platform-browser-dynamic": "~4.0.0",
+    "@angular/router": "~4.0.0",
+
     "@angular/material": "2.0.0-beta.1",
-    "@angular/router": "3.4.7",
-    "@angular/upgrade": "2.4.7",
+    "alfresco-js-api": "~1.4.0",
     "core-js": "2.4.1",
+    "hammerjs": "2.0.8",
+    "ng2-alfresco-core": "1.4.0",
+    "ng2-translate": "5.0.0",
     "reflect-metadata": "0.1.10",
     "rxjs": "5.1.0",
     "systemjs": "0.19.27",
     "zone.js": "0.7.6",
+
+
     "intl": "1.2.4",
     "dialog-polyfill": "0.4.7",
     "element.scrollintoviewifneeded-polyfill": "1.0.1",
@@ -55,18 +61,16 @@
     "material-design-lite": "1.2.1",
     "chart.js": "2.5.0",
     "md-date-time-picker": "2.2.0",
-    "ng2-charts": "1.1.0",
+    "ng2-charts": "1.5.0",
     "moment": "2.15.1",
     "raphael": "^2.2.6",
-    "ng2-translate": "5.0.0",
-    "alfresco-js-api": "~1.4.0",
-    "ng2-alfresco-core": "1.4.0",
     "ng2-activiti-diagrams": "1.4.0",
     "ng2-activiti-analytics": "1.4.0"
   },
   "devDependencies": {
-    "@types/jasmine": "^2.2.33",
-    "@types/node": "^6.0.42",
+    "@types/hammerjs": "^2.0.34",
+    "@types/jasmine": "2.5.35",
+    "@types/node": "6.0.45",
     "concurrently": "^2.2.0",
     "rimraf": "2.5.2",
     "tslint": "^3.8.1",
diff --git a/ng2-components/ng2-activiti-analytics/demo/systemjs.config.js b/ng2-components/ng2-activiti-analytics/demo/systemjs.config.js
index 0b8ca69bc1..07f10a7da3 100644
--- a/ng2-components/ng2-activiti-analytics/demo/systemjs.config.js
+++ b/ng2-components/ng2-activiti-analytics/demo/systemjs.config.js
@@ -22,6 +22,9 @@
             '@angular/router': 'npm:@angular/router/bundles/router.umd.js',
             '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
             '@angular/material': 'npm:@angular/material/bundles/material.umd.js',
+            '@angular/animations': 'npm:@angular/animations/bundles/animations.umd.min.js',
+            '@angular/animations/browser':'npm:@angular/animations/bundles/animations-browser.umd.js',
+            '@angular/platform-browser/animations': 'npm:@angular/platform-browser/bundles/platform-browser-animations.umd.js',
 
             // other libraries
             'rxjs': 'npm:rxjs',
@@ -44,11 +47,11 @@
             },
             'moment': 'npm:moment/min/moment.min.js',
             'ng2-translate': { defaultExtension: 'js' },
-            'ng2-charts': { main: 'ng2-charts.js', defaultExtension: 'js'},
+            'ng2-charts': { main: './bundles/ng2-charts.umd.js', defaultExtension: 'js'},
             'alfresco-js-api': { main: './alfresco-js-api.js', defaultExtension: 'js'},
             'ng2-alfresco-core': { main: './bundles/ng2-alfresco-core.js', defaultExtension: 'js'},
-            'ng2-analytics-diagrams': { main: './bundles/ng2-analytics-diagrams.js', defaultExtension: 'js'},
-            'ng2-analytics-analytics': { main: './bundles/ng2-analytics-analytics.js', defaultExtension: 'js'}
+            'ng2-activiti-diagrams': { main: './bundles/ng2-activiti-diagrams.js', defaultExtension: 'js'},
+            'ng2-activiti-analytics': { main: './bundles/ng2-activiti-analytics.js', defaultExtension: 'js'}
         }
     });
 })(this);
diff --git a/ng2-components/ng2-activiti-analytics/package.json b/ng2-components/ng2-activiti-analytics/package.json
index 691135b2f6..e9a420e520 100644
--- a/ng2-components/ng2-activiti-analytics/package.json
+++ b/ng2-components/ng2-activiti-analytics/package.json
@@ -31,6 +31,7 @@
     "url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
   },
   "dependencies": {
+    "@angular/animations": "~4.0.0",
     "@angular/common": "~4.0.0",
     "@angular/compiler": "~4.0.0",
     "@angular/core": "~4.0.0",
diff --git a/ng2-components/ng2-activiti-diagrams/config/webpack.common.js b/ng2-components/ng2-activiti-diagrams/config/webpack.common.js
index 95cd33177e..52a680e87e 100644
--- a/ng2-components/ng2-activiti-diagrams/config/webpack.common.js
+++ b/ng2-components/ng2-activiti-diagrams/config/webpack.common.js
@@ -87,8 +87,8 @@ module.exports = {
                     },
                     publicPath: (url, resourcePath)=> {
                         var component = resourcePath.substring(0, resourcePath.indexOf('src'));
-                        var path = resourcePath.replace(component, '').replace('src', 'bundles');
-                        return './' + path + url;
+                        var path = resourcePath.replace(component, '').replace('src/', '');
+                        return path + url;
                     }
                 }
             }
diff --git a/ng2-components/ng2-activiti-diagrams/demo/package.json b/ng2-components/ng2-activiti-diagrams/demo/package.json
index 96df7844b5..52a16ae8de 100644
--- a/ng2-components/ng2-activiti-diagrams/demo/package.json
+++ b/ng2-components/ng2-activiti-diagrams/demo/package.json
@@ -12,7 +12,7 @@
     "server": "wsrv -o -s -l",
     "build": "npm run tslint && npm run clean-build && npm run tsc",
     "build:w": "npm run tslint && rimraf dist && npm run tsc:w",
-    "travis": "npm link ng2-alfresco-core",
+    "travis": "npm link ng2-alfresco-core ng2-activiti-diagrams",
     "tsc": "tsc",
     "tsc:w": "tsc -w",
     "tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts  -e '{,**/}**.d.ts'"
@@ -32,32 +32,34 @@
     "activiti-diagrams"
   ],
   "dependencies": {
-    "@angular/common": "2.4.7",
-    "@angular/compiler": "2.4.7",
-    "@angular/compiler-cli": "2.4.7",
-    "@angular/core": "2.4.7",
-    "@angular/forms": "2.4.7",
-    "@angular/http": "2.4.7",
-    "@angular/platform-browser": "2.4.7",
-    "@angular/platform-browser-dynamic": "2.4.7",
+    "@angular/animations": "~4.0.0",
+    "@angular/common": "~4.0.0",
+    "@angular/compiler": "~4.0.0",
+    "@angular/core": "~4.0.0",
+    "@angular/forms": "~4.0.0",
+    "@angular/http": "~4.0.0",
+    "@angular/platform-browser": "~4.0.0",
+    "@angular/platform-browser-dynamic": "~4.0.0",
+    "@angular/router": "~4.0.0",
+
     "@angular/material": "2.0.0-beta.1",
-    "@angular/router": "3.4.7",
-    "@angular/upgrade": "2.4.7",
     "alfresco-js-api": "~1.4.0",
     "core-js": "2.4.1",
+    "hammerjs": "2.0.8",
+    "ng2-alfresco-core": "1.4.0",
+    "ng2-translate": "5.0.0",
+    "reflect-metadata": "0.1.10",
+    "rxjs": "5.1.0",
+    "systemjs": "0.19.27",
+    "zone.js": "0.7.6",
+
     "dialog-polyfill": "0.4.7",
     "element.scrollintoviewifneeded-polyfill": "1.0.1",
     "intl": "1.2.4",
     "material-design-icons": "2.2.3",
     "material-design-lite": "1.2.1",
     "ng2-activiti-diagrams": "1.4.0",
-    "ng2-alfresco-core": "1.4.0",
-    "ng2-translate": "5.0.0",
-    "raphael": "^2.2.6",
-    "reflect-metadata": "0.1.10",
-    "rxjs": "5.1.0",
-    "systemjs": "0.19.27",
-    "zone.js": "0.7.6"
+    "raphael": "^2.2.6"
   },
   "devDependencies": {
     "@types/jasmine": "^2.2.33",
diff --git a/ng2-components/ng2-activiti-diagrams/demo/systemjs.config.js b/ng2-components/ng2-activiti-diagrams/demo/systemjs.config.js
index f34f2f87ad..a3fb7b584d 100644
--- a/ng2-components/ng2-activiti-diagrams/demo/systemjs.config.js
+++ b/ng2-components/ng2-activiti-diagrams/demo/systemjs.config.js
@@ -22,6 +22,9 @@
             '@angular/router': 'npm:@angular/router/bundles/router.umd.js',
             '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
             '@angular/material': 'npm:@angular/material/bundles/material.umd.js',
+            '@angular/animations': 'npm:@angular/animations/bundles/animations.umd.min.js',
+            '@angular/animations/browser':'npm:@angular/animations/bundles/animations-browser.umd.js',
+            '@angular/platform-browser/animations': 'npm:@angular/platform-browser/bundles/platform-browser-animations.umd.js',
 
             // other libraries
             'rxjs': 'npm:rxjs',
diff --git a/ng2-components/ng2-activiti-diagrams/package.json b/ng2-components/ng2-activiti-diagrams/package.json
index 1b8864ed2e..ee95c39fc4 100644
--- a/ng2-components/ng2-activiti-diagrams/package.json
+++ b/ng2-components/ng2-activiti-diagrams/package.json
@@ -27,6 +27,7 @@
     "url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
   },
   "dependencies": {
+    "@angular/animations": "~4.0.0",
     "@angular/common": "~4.0.0",
     "@angular/compiler": "~4.0.0",
     "@angular/core": "~4.0.0",
diff --git a/ng2-components/ng2-activiti-form/config/webpack.common.js b/ng2-components/ng2-activiti-form/config/webpack.common.js
index 95cd33177e..52a680e87e 100644
--- a/ng2-components/ng2-activiti-form/config/webpack.common.js
+++ b/ng2-components/ng2-activiti-form/config/webpack.common.js
@@ -87,8 +87,8 @@ module.exports = {
                     },
                     publicPath: (url, resourcePath)=> {
                         var component = resourcePath.substring(0, resourcePath.indexOf('src'));
-                        var path = resourcePath.replace(component, '').replace('src', 'bundles');
-                        return './' + path + url;
+                        var path = resourcePath.replace(component, '').replace('src/', '');
+                        return path + url;
                     }
                 }
             }
diff --git a/ng2-components/ng2-activiti-form/demo/package.json b/ng2-components/ng2-activiti-form/demo/package.json
index 5567f382d3..952dc722f7 100644
--- a/ng2-components/ng2-activiti-form/demo/package.json
+++ b/ng2-components/ng2-activiti-form/demo/package.json
@@ -12,7 +12,7 @@
     "server": "wsrv -o -s -l",
     "build": "npm run tslint && npm run clean-build && npm run tsc",
     "build:w": "npm run tslint && rimraf dist && npm run tsc:w",
-    "travis": "npm link ng2-alfresco-core",
+    "travis": "npm link ng2-alfresco-core ng2-activiti-form",
     "tsc": "tsc",
     "tsc:w": "tsc -w",
     "tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts  -e '{,**/}**.d.ts'"
@@ -32,22 +32,27 @@
     "activiti-form"
   ],
   "dependencies": {
-    "@angular/common": "2.4.7",
-    "@angular/compiler": "2.4.7",
-    "@angular/compiler-cli": "2.4.7",
-    "@angular/core": "2.4.7",
-    "@angular/forms": "2.4.7",
-    "@angular/http": "2.4.7",
-    "@angular/platform-browser": "2.4.7",
-    "@angular/platform-browser-dynamic": "2.4.7",
+    "@angular/animations": "~4.0.0",
+    "@angular/common": "~4.0.0",
+    "@angular/compiler": "~4.0.0",
+    "@angular/core": "~4.0.0",
+    "@angular/forms": "~4.0.0",
+    "@angular/http": "~4.0.0",
+    "@angular/platform-browser": "~4.0.0",
+    "@angular/platform-browser-dynamic": "~4.0.0",
+    "@angular/router": "~4.0.0",
+
     "@angular/material": "2.0.0-beta.1",
-    "@angular/router": "3.4.7",
-    "@angular/upgrade": "2.4.7",
+    "alfresco-js-api": "~1.4.0",
     "core-js": "2.4.1",
+    "hammerjs": "2.0.8",
+    "ng2-alfresco-core": "1.4.0",
+    "ng2-translate": "5.0.0",
     "reflect-metadata": "0.1.10",
     "rxjs": "5.1.0",
     "systemjs": "0.19.27",
     "zone.js": "0.7.6",
+
     "intl": "1.2.4",
     "dialog-polyfill": "0.4.7",
     "element.scrollintoviewifneeded-polyfill": "1.0.1",
@@ -55,9 +60,6 @@
     "material-design-lite": "1.2.1",
     "moment": "2.15.1",
     "md-date-time-picker": "2.2.0",
-    "ng2-translate": "5.0.0",
-    "alfresco-js-api": "~1.4.0",
-    "ng2-alfresco-core": "1.4.0",
     "ng2-activiti-form": "1.4.0"
   },
   "devDependencies": {
diff --git a/ng2-components/ng2-activiti-form/demo/systemjs.config.js b/ng2-components/ng2-activiti-form/demo/systemjs.config.js
index 1e20c19026..7a7f9a1355 100644
--- a/ng2-components/ng2-activiti-form/demo/systemjs.config.js
+++ b/ng2-components/ng2-activiti-form/demo/systemjs.config.js
@@ -22,6 +22,9 @@
             '@angular/router': 'npm:@angular/router/bundles/router.umd.js',
             '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
             '@angular/material': 'npm:@angular/material/bundles/material.umd.js',
+            '@angular/animations': 'npm:@angular/animations/bundles/animations.umd.min.js',
+            '@angular/animations/browser':'npm:@angular/animations/bundles/animations-browser.umd.js',
+            '@angular/platform-browser/animations': 'npm:@angular/platform-browser/bundles/platform-browser-animations.umd.js',
 
             // other libraries
             'rxjs': 'npm:rxjs',
diff --git a/ng2-components/ng2-activiti-form/package.json b/ng2-components/ng2-activiti-form/package.json
index 3dc28649b7..8d9a63680a 100644
--- a/ng2-components/ng2-activiti-form/package.json
+++ b/ng2-components/ng2-activiti-form/package.json
@@ -34,6 +34,7 @@
     "activiti"
   ],
   "dependencies": {
+    "@angular/animations": "~4.0.0",
     "@angular/common": "~4.0.0",
     "@angular/compiler": "~4.0.0",
     "@angular/core": "~4.0.0",
diff --git a/ng2-components/ng2-activiti-processlist/config/webpack.common.js b/ng2-components/ng2-activiti-processlist/config/webpack.common.js
index 95cd33177e..52a680e87e 100644
--- a/ng2-components/ng2-activiti-processlist/config/webpack.common.js
+++ b/ng2-components/ng2-activiti-processlist/config/webpack.common.js
@@ -87,8 +87,8 @@ module.exports = {
                     },
                     publicPath: (url, resourcePath)=> {
                         var component = resourcePath.substring(0, resourcePath.indexOf('src'));
-                        var path = resourcePath.replace(component, '').replace('src', 'bundles');
-                        return './' + path + url;
+                        var path = resourcePath.replace(component, '').replace('src/', '');
+                        return path + url;
                     }
                 }
             }
diff --git a/ng2-components/ng2-activiti-processlist/demo/package.json b/ng2-components/ng2-activiti-processlist/demo/package.json
index 12d7875f30..235d80ba50 100644
--- a/ng2-components/ng2-activiti-processlist/demo/package.json
+++ b/ng2-components/ng2-activiti-processlist/demo/package.json
@@ -12,7 +12,7 @@
     "server": "wsrv -o -s -l",
     "build": "npm run tslint && npm run clean-build && npm run tsc",
     "build:w": "npm run tslint && rimraf dist && npm run tsc:w",
-    "travis": "npm link ng2-alfresco-core ng2-alfresco-datatable ng2-activiti-form ng2-activiti-tasklist",
+    "travis": "npm link ng2-alfresco-core ng2-alfresco-datatable ng2-activiti-form ng2-activiti-tasklist ng2-activiti-processlist",
     "tsc": "tsc",
     "tsc:w": "tsc -w",
     "tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts  -e '{,**/}**.d.ts'"
@@ -25,22 +25,27 @@
     "demo"
   ],
   "dependencies": {
-    "@angular/common": "2.4.7",
-    "@angular/compiler": "2.4.7",
-    "@angular/compiler-cli": "2.4.7",
-    "@angular/core": "2.4.7",
-    "@angular/forms": "2.4.7",
-    "@angular/http": "2.4.7",
-    "@angular/platform-browser": "2.4.7",
-    "@angular/platform-browser-dynamic": "2.4.7",
+    "@angular/animations": "~4.0.0",
+    "@angular/common": "~4.0.0",
+    "@angular/compiler": "~4.0.0",
+    "@angular/core": "~4.0.0",
+    "@angular/forms": "~4.0.0",
+    "@angular/http": "~4.0.0",
+    "@angular/platform-browser": "~4.0.0",
+    "@angular/platform-browser-dynamic": "~4.0.0",
+    "@angular/router": "~4.0.0",
+
     "@angular/material": "2.0.0-beta.1",
-    "@angular/router": "3.4.7",
-    "@angular/upgrade": "2.4.7",
+    "alfresco-js-api": "~1.4.0",
     "core-js": "2.4.1",
+    "hammerjs": "2.0.8",
+    "ng2-alfresco-core": "1.4.0",
+    "ng2-translate": "5.0.0",
     "reflect-metadata": "0.1.10",
     "rxjs": "5.1.0",
     "systemjs": "0.19.27",
     "zone.js": "0.7.6",
+
     "intl": "1.2.4",
     "dialog-polyfill": "0.4.7",
     "element.scrollintoviewifneeded-polyfill": "1.0.1",
@@ -48,10 +53,7 @@
     "material-design-lite": "1.2.1",
     "moment": "2.15.1",
     "md-date-time-picker": "2.2.0",
-    "ng2-translate": "5.0.0",
-    "alfresco-js-api": "~1.4.0",
     "ng2-activiti-tasklist": "1.4.0",
-    "ng2-alfresco-core": "1.4.0",
     "ng2-alfresco-datatable": "1.4.0",
     "ng2-activiti-processlist": "1.4.0"
   },
diff --git a/ng2-components/ng2-activiti-processlist/demo/systemjs.config.js b/ng2-components/ng2-activiti-processlist/demo/systemjs.config.js
index 952fd92e90..fb4d4b00b7 100644
--- a/ng2-components/ng2-activiti-processlist/demo/systemjs.config.js
+++ b/ng2-components/ng2-activiti-processlist/demo/systemjs.config.js
@@ -22,6 +22,9 @@
             '@angular/router': 'npm:@angular/router/bundles/router.umd.js',
             '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
             '@angular/material': 'npm:@angular/material/bundles/material.umd.js',
+            '@angular/animations': 'npm:@angular/animations/bundles/animations.umd.min.js',
+            '@angular/animations/browser':'npm:@angular/animations/bundles/animations-browser.umd.js',
+            '@angular/platform-browser/animations': 'npm:@angular/platform-browser/bundles/platform-browser-animations.umd.js',
 
             // other libraries
             'moment' : 'npm:moment/min/moment.min.js',
diff --git a/ng2-components/ng2-activiti-processlist/package.json b/ng2-components/ng2-activiti-processlist/package.json
index 582c9a34b9..4a567e46f4 100644
--- a/ng2-components/ng2-activiti-processlist/package.json
+++ b/ng2-components/ng2-activiti-processlist/package.json
@@ -33,6 +33,7 @@
     "alfresco"
   ],
   "dependencies": {
+    "@angular/animations": "~4.0.0",
     "@angular/common": "~4.0.0",
     "@angular/compiler": "~4.0.0",
     "@angular/core": "~4.0.0",
diff --git a/ng2-components/ng2-activiti-tasklist/config/webpack.common.js b/ng2-components/ng2-activiti-tasklist/config/webpack.common.js
index 95cd33177e..52a680e87e 100644
--- a/ng2-components/ng2-activiti-tasklist/config/webpack.common.js
+++ b/ng2-components/ng2-activiti-tasklist/config/webpack.common.js
@@ -87,8 +87,8 @@ module.exports = {
                     },
                     publicPath: (url, resourcePath)=> {
                         var component = resourcePath.substring(0, resourcePath.indexOf('src'));
-                        var path = resourcePath.replace(component, '').replace('src', 'bundles');
-                        return './' + path + url;
+                        var path = resourcePath.replace(component, '').replace('src/', '');
+                        return path + url;
                     }
                 }
             }
diff --git a/ng2-components/ng2-activiti-tasklist/demo/package.json b/ng2-components/ng2-activiti-tasklist/demo/package.json
index 6a4217bd79..9b0d896781 100644
--- a/ng2-components/ng2-activiti-tasklist/demo/package.json
+++ b/ng2-components/ng2-activiti-tasklist/demo/package.json
@@ -12,29 +12,34 @@
     "server": "wsrv -o -s -l",
     "build": "npm run tslint && npm run clean-build && npm run tsc",
     "build:w": "npm run tslint && rimraf dist && npm run tsc:w",
-    "travis": "npm link ng2-alfresco-core ng2-alfresco-datatable ng2-activiti-form",
+    "travis": "npm link ng2-alfresco-core ng2-alfresco-datatable ng2-activiti-form ng2-activiti-tasklist",
     "tsc": "tsc",
     "tsc:w": "tsc -w",
     "tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts  -e '{,**/}**.d.ts'"
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@angular/common": "2.4.7",
-    "@angular/compiler": "2.4.7",
-    "@angular/compiler-cli": "2.4.7",
-    "@angular/core": "2.4.7",
-    "@angular/forms": "2.4.7",
-    "@angular/http": "2.4.7",
-    "@angular/platform-browser": "2.4.7",
-    "@angular/platform-browser-dynamic": "2.4.7",
+    "@angular/animations": "~4.0.0",
+    "@angular/common": "~4.0.0",
+    "@angular/compiler": "~4.0.0",
+    "@angular/core": "~4.0.0",
+    "@angular/forms": "~4.0.0",
+    "@angular/http": "~4.0.0",
+    "@angular/platform-browser": "~4.0.0",
+    "@angular/platform-browser-dynamic": "~4.0.0",
+    "@angular/router": "~4.0.0",
+
     "@angular/material": "2.0.0-beta.1",
-    "@angular/router": "3.4.7",
-    "@angular/upgrade": "2.4.7",
+    "alfresco-js-api": "~1.4.0",
     "core-js": "2.4.1",
+    "hammerjs": "2.0.8",
+    "ng2-alfresco-core": "1.4.0",
+    "ng2-translate": "5.0.0",
     "reflect-metadata": "0.1.10",
     "rxjs": "5.1.0",
     "systemjs": "0.19.27",
     "zone.js": "0.7.6",
+
     "intl": "1.2.4",
     "dialog-polyfill": "0.4.7",
     "element.scrollintoviewifneeded-polyfill": "1.0.1",
@@ -42,9 +47,6 @@
     "material-design-lite": "1.2.1",
     "moment": "2.15.1",
     "md-date-time-picker": "2.2.0",
-    "ng2-translate": "5.0.0",
-    "alfresco-js-api": "~1.4.0",
-    "ng2-alfresco-core": "1.4.0",
     "ng2-alfresco-datatable": "1.4.0",
     "ng2-activiti-tasklist": "1.4.0"
   },
diff --git a/ng2-components/ng2-activiti-tasklist/demo/systemjs.config.js b/ng2-components/ng2-activiti-tasklist/demo/systemjs.config.js
index 772a76380a..bf04333fc7 100644
--- a/ng2-components/ng2-activiti-tasklist/demo/systemjs.config.js
+++ b/ng2-components/ng2-activiti-tasklist/demo/systemjs.config.js
@@ -22,6 +22,9 @@
             '@angular/router': 'npm:@angular/router/bundles/router.umd.js',
             '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
             '@angular/material': 'npm:@angular/material/bundles/material.umd.js',
+            '@angular/animations': 'npm:@angular/animations/bundles/animations.umd.min.js',
+            '@angular/animations/browser':'npm:@angular/animations/bundles/animations-browser.umd.js',
+            '@angular/platform-browser/animations': 'npm:@angular/platform-browser/bundles/platform-browser-animations.umd.js',
 
             // other libraries
             'moment' : 'npm:moment/min/moment.min.js',
diff --git a/ng2-components/ng2-activiti-tasklist/package.json b/ng2-components/ng2-activiti-tasklist/package.json
index ec63f4b06a..493eb0a5f3 100644
--- a/ng2-components/ng2-activiti-tasklist/package.json
+++ b/ng2-components/ng2-activiti-tasklist/package.json
@@ -37,6 +37,7 @@
     "alfresco"
   ],
   "dependencies": {
+    "@angular/animations": "~4.0.0",
     "@angular/common": "~4.0.0",
     "@angular/compiler": "~4.0.0",
     "@angular/core": "~4.0.0",
diff --git a/ng2-components/ng2-alfresco-core/config/webpack.common.js b/ng2-components/ng2-alfresco-core/config/webpack.common.js
index 95cd33177e..52a680e87e 100644
--- a/ng2-components/ng2-alfresco-core/config/webpack.common.js
+++ b/ng2-components/ng2-alfresco-core/config/webpack.common.js
@@ -87,8 +87,8 @@ module.exports = {
                     },
                     publicPath: (url, resourcePath)=> {
                         var component = resourcePath.substring(0, resourcePath.indexOf('src'));
-                        var path = resourcePath.replace(component, '').replace('src', 'bundles');
-                        return './' + path + url;
+                        var path = resourcePath.replace(component, '').replace('src/', '');
+                        return path + url;
                     }
                 }
             }
diff --git a/ng2-components/ng2-alfresco-datatable/config/webpack.common.js b/ng2-components/ng2-alfresco-datatable/config/webpack.common.js
index 95cd33177e..52a680e87e 100644
--- a/ng2-components/ng2-alfresco-datatable/config/webpack.common.js
+++ b/ng2-components/ng2-alfresco-datatable/config/webpack.common.js
@@ -87,8 +87,8 @@ module.exports = {
                     },
                     publicPath: (url, resourcePath)=> {
                         var component = resourcePath.substring(0, resourcePath.indexOf('src'));
-                        var path = resourcePath.replace(component, '').replace('src', 'bundles');
-                        return './' + path + url;
+                        var path = resourcePath.replace(component, '').replace('src/', '');
+                        return path + url;
                     }
                 }
             }
diff --git a/ng2-components/ng2-alfresco-datatable/demo/package.json b/ng2-components/ng2-alfresco-datatable/demo/package.json
index 9cfb151e2a..b542cf8d6c 100644
--- a/ng2-components/ng2-alfresco-datatable/demo/package.json
+++ b/ng2-components/ng2-alfresco-datatable/demo/package.json
@@ -12,7 +12,7 @@
     "server": "wsrv -o -s -l",
     "build": "npm run tslint && npm run clean-build && npm run tsc",
     "build:w": "npm run tslint && rimraf dist && npm run tsc:w",
-    "travis": "npm link ng2-alfresco-core",
+    "travis": "npm link ng2-alfresco-core ng2-alfresco-datatable",
     "tsc": "tsc",
     "tsc:w": "tsc -w",
     "tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts  -e '{,**/}**.d.ts'"
@@ -25,30 +25,33 @@
     }
   ],
   "dependencies": {
-    "@angular/common": "2.4.7",
-    "@angular/compiler": "2.4.7",
-    "@angular/compiler-cli": "2.4.7",
-    "@angular/core": "2.4.7",
-    "@angular/forms": "2.4.7",
-    "@angular/http": "2.4.7",
-    "@angular/platform-browser": "2.4.7",
-    "@angular/platform-browser-dynamic": "2.4.7",
+    "@angular/animations": "~4.0.0",
+    "@angular/common": "~4.0.0",
+    "@angular/compiler": "~4.0.0",
+    "@angular/core": "~4.0.0",
+    "@angular/forms": "~4.0.0",
+    "@angular/http": "~4.0.0",
+    "@angular/platform-browser": "~4.0.0",
+    "@angular/platform-browser-dynamic": "~4.0.0",
+    "@angular/router": "~4.0.0",
+
     "@angular/material": "2.0.0-beta.1",
-    "@angular/router": "3.4.7",
-    "@angular/upgrade": "2.4.7",
+    "alfresco-js-api": "~1.4.0",
     "core-js": "2.4.1",
+    "hammerjs": "2.0.8",
+    "ng2-alfresco-core": "1.4.0",
+    "ng2-translate": "5.0.0",
     "reflect-metadata": "0.1.10",
     "rxjs": "5.1.0",
     "systemjs": "0.19.27",
     "zone.js": "0.7.6",
+
+    "@angular/upgrade": "2.4.7",
     "intl": "1.2.4",
     "dialog-polyfill": "0.4.7",
     "element.scrollintoviewifneeded-polyfill": "1.0.1",
     "material-design-icons": "2.2.3",
     "material-design-lite": "1.2.1",
-    "ng2-translate": "5.0.0",
-    "alfresco-js-api": "~1.4.0",
-    "ng2-alfresco-core": "1.4.0",
     "ng2-alfresco-datatable": "1.4.0"
   },
   "devDependencies": {
diff --git a/ng2-components/ng2-alfresco-datatable/demo/systemjs.config.js b/ng2-components/ng2-alfresco-datatable/demo/systemjs.config.js
index bf0730f3cf..4fa982b2e9 100644
--- a/ng2-components/ng2-alfresco-datatable/demo/systemjs.config.js
+++ b/ng2-components/ng2-alfresco-datatable/demo/systemjs.config.js
@@ -22,6 +22,9 @@
             '@angular/router': 'npm:@angular/router/bundles/router.umd.js',
             '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
             '@angular/material': 'npm:@angular/material/bundles/material.umd.js',
+            '@angular/animations': 'npm:@angular/animations/bundles/animations.umd.min.js',
+            '@angular/animations/browser':'npm:@angular/animations/bundles/animations-browser.umd.js',
+            '@angular/platform-browser/animations': 'npm:@angular/platform-browser/bundles/platform-browser-animations.umd.js',
 
             // other libraries
             'rxjs': 'npm:rxjs',
diff --git a/ng2-components/ng2-alfresco-datatable/package.json b/ng2-components/ng2-alfresco-datatable/package.json
index 5b87b26137..c833c419fc 100644
--- a/ng2-components/ng2-alfresco-datatable/package.json
+++ b/ng2-components/ng2-alfresco-datatable/package.json
@@ -33,6 +33,7 @@
     "alfresco"
   ],
   "dependencies": {
+    "@angular/animations": "~4.0.0",
     "@angular/common": "~4.0.0",
     "@angular/compiler": "~4.0.0",
     "@angular/core": "~4.0.0",
diff --git a/ng2-components/ng2-alfresco-documentlist/config/webpack.common.js b/ng2-components/ng2-alfresco-documentlist/config/webpack.common.js
index 95cd33177e..52a680e87e 100644
--- a/ng2-components/ng2-alfresco-documentlist/config/webpack.common.js
+++ b/ng2-components/ng2-alfresco-documentlist/config/webpack.common.js
@@ -87,8 +87,8 @@ module.exports = {
                     },
                     publicPath: (url, resourcePath)=> {
                         var component = resourcePath.substring(0, resourcePath.indexOf('src'));
-                        var path = resourcePath.replace(component, '').replace('src', 'bundles');
-                        return './' + path + url;
+                        var path = resourcePath.replace(component, '').replace('src/', '');
+                        return path + url;
                     }
                 }
             }
diff --git a/ng2-components/ng2-alfresco-documentlist/demo/package.json b/ng2-components/ng2-alfresco-documentlist/demo/package.json
index e72980bff6..51a174b717 100644
--- a/ng2-components/ng2-alfresco-documentlist/demo/package.json
+++ b/ng2-components/ng2-alfresco-documentlist/demo/package.json
@@ -12,32 +12,34 @@
     "server": "wsrv -o -s -l",
     "build": "npm run tslint && npm run clean-build && npm run tsc",
     "build:w": "npm run tslint && rimraf dist && npm run tsc:w",
-    "travis": "npm link ng2-alfresco-core ng2-alfresco-datatable",
+    "travis": "npm link ng2-alfresco-core ng2-alfresco-datatable ng2-alfresco-documentlist",
     "tsc": "tsc",
     "tsc:w": "tsc -w",
     "tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts  -e '{,**/}**.d.ts'"
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@angular/common": "2.4.7",
-    "@angular/compiler": "2.4.7",
-    "@angular/compiler-cli": "2.4.7",
-    "@angular/core": "2.4.7",
-    "@angular/forms": "2.4.7",
-    "@angular/http": "2.4.7",
-    "@angular/platform-browser": "2.4.7",
-    "@angular/platform-browser-dynamic": "2.4.7",
+    "@angular/animations": "~4.0.0",
+    "@angular/common": "~4.0.0",
+    "@angular/compiler": "~4.0.0",
+    "@angular/core": "~4.0.0",
+    "@angular/forms": "~4.0.0",
+    "@angular/http": "~4.0.0",
+    "@angular/platform-browser": "~4.0.0",
+    "@angular/platform-browser-dynamic": "~4.0.0",
+    "@angular/router": "~4.0.0",
+
     "@angular/material": "2.0.0-beta.1",
-    "@angular/router": "3.4.7",
-    "@angular/upgrade": "2.4.7",
+    "alfresco-js-api": "~1.4.0",
     "core-js": "2.4.1",
+    "hammerjs": "2.0.8",
+    "ng2-alfresco-core": "1.4.0",
+    "ng2-translate": "5.0.0",
     "reflect-metadata": "0.1.10",
     "rxjs": "5.1.0",
     "systemjs": "0.19.27",
     "zone.js": "0.7.6",
-    "ng2-translate": "5.0.0",
-    "alfresco-js-api": "~1.4.0",
-    "ng2-alfresco-core": "1.4.0",
+
     "ng2-alfresco-datatable": "1.4.0",
     "ng2-alfresco-documentlist": "1.4.0",
     "material-design-icons": "2.2.3",
diff --git a/ng2-components/ng2-alfresco-documentlist/demo/systemjs.config.js b/ng2-components/ng2-alfresco-documentlist/demo/systemjs.config.js
index 70b1c64bca..cc70793519 100644
--- a/ng2-components/ng2-alfresco-documentlist/demo/systemjs.config.js
+++ b/ng2-components/ng2-alfresco-documentlist/demo/systemjs.config.js
@@ -22,6 +22,9 @@
             '@angular/router': 'npm:@angular/router/bundles/router.umd.js',
             '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
             '@angular/material': 'npm:@angular/material/bundles/material.umd.js',
+            '@angular/animations': 'npm:@angular/animations/bundles/animations.umd.min.js',
+            '@angular/animations/browser':'npm:@angular/animations/bundles/animations-browser.umd.js',
+            '@angular/platform-browser/animations': 'npm:@angular/platform-browser/bundles/platform-browser-animations.umd.js',
 
             // other libraries
             'rxjs': 'npm:rxjs',
diff --git a/ng2-components/ng2-alfresco-documentlist/package.json b/ng2-components/ng2-alfresco-documentlist/package.json
index d505dc3b20..622f4466c1 100644
--- a/ng2-components/ng2-alfresco-documentlist/package.json
+++ b/ng2-components/ng2-alfresco-documentlist/package.json
@@ -41,6 +41,7 @@
     "alfresco"
   ],
   "dependencies": {
+    "@angular/animations": "~4.0.0",
     "@angular/common": "~4.0.0",
     "@angular/compiler": "~4.0.0",
     "@angular/core": "~4.0.0",
diff --git a/ng2-components/ng2-alfresco-login/config/webpack.common.js b/ng2-components/ng2-alfresco-login/config/webpack.common.js
index 95cd33177e..52a680e87e 100644
--- a/ng2-components/ng2-alfresco-login/config/webpack.common.js
+++ b/ng2-components/ng2-alfresco-login/config/webpack.common.js
@@ -87,8 +87,8 @@ module.exports = {
                     },
                     publicPath: (url, resourcePath)=> {
                         var component = resourcePath.substring(0, resourcePath.indexOf('src'));
-                        var path = resourcePath.replace(component, '').replace('src', 'bundles');
-                        return './' + path + url;
+                        var path = resourcePath.replace(component, '').replace('src/', '');
+                        return path + url;
                     }
                 }
             }
diff --git a/ng2-components/ng2-alfresco-login/demo/package.json b/ng2-components/ng2-alfresco-login/demo/package.json
index 5a4e6f8ee2..8795003a03 100644
--- a/ng2-components/ng2-alfresco-login/demo/package.json
+++ b/ng2-components/ng2-alfresco-login/demo/package.json
@@ -12,7 +12,7 @@
     "server": "wsrv -o -s -l",
     "build": "npm run tslint && npm run clean-build && npm run tsc",
     "build:w": "npm run tslint && rimraf dist && npm run tsc:w",
-    "travis": "npm link ng2-alfresco-core",
+    "travis": "npm link ng2-alfresco-core ng2-alfresco-login",
     "tsc": "tsc",
     "tsc:w": "tsc -w",
     "tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts  -e '{,**/}**.d.ts'"
@@ -47,30 +47,32 @@
     "alfresco"
   ],
   "dependencies": {
-    "@angular/common": "2.4.7",
-    "@angular/compiler": "2.4.7",
-    "@angular/compiler-cli": "2.4.7",
-    "@angular/core": "2.4.7",
-    "@angular/forms": "2.4.7",
-    "@angular/http": "2.4.7",
-    "@angular/platform-browser": "2.4.7",
-    "@angular/platform-browser-dynamic": "2.4.7",
+    "@angular/animations": "~4.0.0",
+    "@angular/common": "~4.0.0",
+    "@angular/compiler": "~4.0.0",
+    "@angular/core": "~4.0.0",
+    "@angular/forms": "~4.0.0",
+    "@angular/http": "~4.0.0",
+    "@angular/platform-browser": "~4.0.0",
+    "@angular/platform-browser-dynamic": "~4.0.0",
+    "@angular/router": "~4.0.0",
+
     "@angular/material": "2.0.0-beta.1",
-    "@angular/router": "3.4.7",
-    "@angular/upgrade": "2.4.7",
+    "alfresco-js-api": "~1.4.0",
     "core-js": "2.4.1",
+    "hammerjs": "2.0.8",
+    "ng2-alfresco-core": "1.4.0",
+    "ng2-translate": "5.0.0",
     "reflect-metadata": "0.1.10",
     "rxjs": "5.1.0",
     "systemjs": "0.19.27",
     "zone.js": "0.7.6",
+
     "intl": "1.2.4",
     "dialog-polyfill": "0.4.7",
     "element.scrollintoviewifneeded-polyfill": "1.0.1",
     "material-design-icons": "2.2.3",
     "material-design-lite": "1.2.1",
-    "ng2-translate": "5.0.0",
-    "alfresco-js-api": "~1.4.0",
-    "ng2-alfresco-core": "1.4.0",
     "ng2-alfresco-login": "1.4.0"
   },
   "devDependencies": {
diff --git a/ng2-components/ng2-alfresco-login/demo/systemjs.config.js b/ng2-components/ng2-alfresco-login/demo/systemjs.config.js
index 0991c99dcf..49c8cd8c90 100644
--- a/ng2-components/ng2-alfresco-login/demo/systemjs.config.js
+++ b/ng2-components/ng2-alfresco-login/demo/systemjs.config.js
@@ -22,6 +22,9 @@
             '@angular/router': 'npm:@angular/router/bundles/router.umd.js',
             '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
             '@angular/material': 'npm:@angular/material/bundles/material.umd.js',
+            '@angular/animations': 'npm:@angular/animations/bundles/animations.umd.min.js',
+            '@angular/animations/browser':'npm:@angular/animations/bundles/animations-browser.umd.js',
+            '@angular/platform-browser/animations': 'npm:@angular/platform-browser/bundles/platform-browser-animations.umd.js',
 
             // other libraries
             'rxjs': 'npm:rxjs',
diff --git a/ng2-components/ng2-alfresco-login/package.json b/ng2-components/ng2-alfresco-login/package.json
index 3b6b4ac985..9389358f62 100644
--- a/ng2-components/ng2-alfresco-login/package.json
+++ b/ng2-components/ng2-alfresco-login/package.json
@@ -45,6 +45,7 @@
     "alfresco"
   ],
   "dependencies": {
+    "@angular/animations": "~4.0.0",
     "@angular/common": "~4.0.0",
     "@angular/compiler": "~4.0.0",
     "@angular/core": "~4.0.0",
diff --git a/ng2-components/ng2-alfresco-search/config/webpack.common.js b/ng2-components/ng2-alfresco-search/config/webpack.common.js
index 95cd33177e..52a680e87e 100644
--- a/ng2-components/ng2-alfresco-search/config/webpack.common.js
+++ b/ng2-components/ng2-alfresco-search/config/webpack.common.js
@@ -87,8 +87,8 @@ module.exports = {
                     },
                     publicPath: (url, resourcePath)=> {
                         var component = resourcePath.substring(0, resourcePath.indexOf('src'));
-                        var path = resourcePath.replace(component, '').replace('src', 'bundles');
-                        return './' + path + url;
+                        var path = resourcePath.replace(component, '').replace('src/', '');
+                        return path + url;
                     }
                 }
             }
diff --git a/ng2-components/ng2-alfresco-search/demo/package.json b/ng2-components/ng2-alfresco-search/demo/package.json
index 2e8fb4606e..da03b8522e 100644
--- a/ng2-components/ng2-alfresco-search/demo/package.json
+++ b/ng2-components/ng2-alfresco-search/demo/package.json
@@ -12,7 +12,7 @@
     "server": "wsrv -o -s -l",
     "build": "npm run tslint && npm run clean-build && npm run tsc",
     "build:w": "npm run tslint && rimraf dist && npm run tsc:w",
-    "travis": "npm link ng2-alfresco-core ng2-alfresco-datatable ng2-alfresco-documentlist",
+    "travis": "npm link  ng2-alfresco-search ng2-alfresco-core ng2-alfresco-datatable ng2-alfresco-documentlist",
     "tsc": "tsc",
     "tsc:w": "tsc -w",
     "tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts  -e '{,**/}**.d.ts'"
@@ -47,30 +47,32 @@
     "alfresco"
   ],
   "dependencies": {
-    "@angular/common": "2.4.7",
-    "@angular/compiler": "2.4.7",
-    "@angular/compiler-cli": "2.4.7",
-    "@angular/core": "2.4.7",
-    "@angular/forms": "2.4.7",
-    "@angular/http": "2.4.7",
-    "@angular/platform-browser": "2.4.7",
-    "@angular/platform-browser-dynamic": "2.4.7",
+    "@angular/animations": "~4.0.0",
+    "@angular/common": "~4.0.0",
+    "@angular/compiler": "~4.0.0",
+    "@angular/core": "~4.0.0",
+    "@angular/forms": "~4.0.0",
+    "@angular/http": "~4.0.0",
+    "@angular/platform-browser": "~4.0.0",
+    "@angular/platform-browser-dynamic": "~4.0.0",
+    "@angular/router": "~4.0.0",
+
     "@angular/material": "2.0.0-beta.1",
-    "@angular/router": "3.4.7",
-    "@angular/upgrade": "2.4.7",
+    "alfresco-js-api": "~1.4.0",
     "core-js": "2.4.1",
+    "hammerjs": "2.0.8",
+    "ng2-alfresco-core": "1.4.0",
+    "ng2-translate": "5.0.0",
     "reflect-metadata": "0.1.10",
     "rxjs": "5.1.0",
     "systemjs": "0.19.27",
     "zone.js": "0.7.6",
+
     "intl": "1.2.4",
     "dialog-polyfill": "0.4.7",
     "element.scrollintoviewifneeded-polyfill": "1.0.1",
     "material-design-icons": "2.2.3",
     "material-design-lite": "1.2.1",
-    "ng2-translate": "5.0.0",
-    "alfresco-js-api": "~1.4.0",
-    "ng2-alfresco-core": "1.4.0",
     "ng2-alfresco-datatable": "1.4.0",
     "ng2-alfresco-documentlist": "1.4.0",
     "ng2-alfresco-search": "1.4.0"
diff --git a/ng2-components/ng2-alfresco-search/demo/systemjs.config.js b/ng2-components/ng2-alfresco-search/demo/systemjs.config.js
index 353cef68ae..527c9b8a1f 100644
--- a/ng2-components/ng2-alfresco-search/demo/systemjs.config.js
+++ b/ng2-components/ng2-alfresco-search/demo/systemjs.config.js
@@ -22,6 +22,9 @@
             '@angular/router': 'npm:@angular/router/bundles/router.umd.js',
             '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
             '@angular/material': 'npm:@angular/material/bundles/material.umd.js',
+            '@angular/animations': 'npm:@angular/animations/bundles/animations.umd.min.js',
+            '@angular/animations/browser':'npm:@angular/animations/bundles/animations-browser.umd.js',
+            '@angular/platform-browser/animations': 'npm:@angular/platform-browser/bundles/platform-browser-animations.umd.js',
 
             // other libraries
             'rxjs': 'npm:rxjs',
diff --git a/ng2-components/ng2-alfresco-search/package.json b/ng2-components/ng2-alfresco-search/package.json
index 73f0ee291f..292d4cad14 100644
--- a/ng2-components/ng2-alfresco-search/package.json
+++ b/ng2-components/ng2-alfresco-search/package.json
@@ -41,6 +41,7 @@
     "alfresco"
   ],
   "dependencies": {
+    "@angular/animations": "~4.0.0",
     "@angular/common": "~4.0.0",
     "@angular/compiler": "~4.0.0",
     "@angular/core": "~4.0.0",
diff --git a/ng2-components/ng2-alfresco-social/config/webpack.common.js b/ng2-components/ng2-alfresco-social/config/webpack.common.js
index 95cd33177e..52a680e87e 100644
--- a/ng2-components/ng2-alfresco-social/config/webpack.common.js
+++ b/ng2-components/ng2-alfresco-social/config/webpack.common.js
@@ -87,8 +87,8 @@ module.exports = {
                     },
                     publicPath: (url, resourcePath)=> {
                         var component = resourcePath.substring(0, resourcePath.indexOf('src'));
-                        var path = resourcePath.replace(component, '').replace('src', 'bundles');
-                        return './' + path + url;
+                        var path = resourcePath.replace(component, '').replace('src/', '');
+                        return path + url;
                     }
                 }
             }
diff --git a/ng2-components/ng2-alfresco-social/demo/package.json b/ng2-components/ng2-alfresco-social/demo/package.json
index c833061861..5a55e194b7 100644
--- a/ng2-components/ng2-alfresco-social/demo/package.json
+++ b/ng2-components/ng2-alfresco-social/demo/package.json
@@ -12,37 +12,39 @@
     "server": "wsrv -o -s -l",
     "build": "npm run tslint && npm run clean-build && npm run tsc",
     "build:w": "npm run tslint && rimraf dist && npm run tsc:w",
-    "travis": "npm link ng2-alfresco-core",
+    "travis": "npm link ng2-alfresco-core ng2-alfresco-social",
     "tsc": "tsc",
     "tsc:w": "tsc -w",
     "tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts  -e '{,**/}**.d.ts'"
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@angular/common": "2.4.7",
-    "@angular/compiler": "2.4.7",
-    "@angular/compiler-cli": "2.4.7",
-    "@angular/core": "2.4.7",
-    "@angular/forms": "2.4.7",
-    "@angular/http": "2.4.7",
-    "@angular/platform-browser": "2.4.7",
-    "@angular/platform-browser-dynamic": "2.4.7",
+    "@angular/animations": "~4.0.0",
+    "@angular/common": "~4.0.0",
+    "@angular/compiler": "~4.0.0",
+    "@angular/core": "~4.0.0",
+    "@angular/forms": "~4.0.0",
+    "@angular/http": "~4.0.0",
+    "@angular/platform-browser": "~4.0.0",
+    "@angular/platform-browser-dynamic": "~4.0.0",
+    "@angular/router": "~4.0.0",
+
     "@angular/material": "2.0.0-beta.1",
-    "@angular/router": "3.4.7",
-    "@angular/upgrade": "2.4.7",
+    "alfresco-js-api": "~1.4.0",
     "core-js": "2.4.1",
+    "hammerjs": "2.0.8",
+    "ng2-alfresco-core": "1.4.0",
+    "ng2-translate": "5.0.0",
     "reflect-metadata": "0.1.10",
     "rxjs": "5.1.0",
     "systemjs": "0.19.27",
     "zone.js": "0.7.6",
+
     "intl": "1.2.4",
     "dialog-polyfill": "0.4.7",
     "element.scrollintoviewifneeded-polyfill": "1.0.1",
     "material-design-icons": "2.2.3",
     "material-design-lite": "1.2.1",
-    "ng2-translate": "5.0.0",
-    "alfresco-js-api": "~1.4.0",
-    "ng2-alfresco-core": "1.4.0",
     "ng2-alfresco-social": "1.4.0"
   },
   "devDependencies": {
diff --git a/ng2-components/ng2-alfresco-social/demo/systemjs.config.js b/ng2-components/ng2-alfresco-social/demo/systemjs.config.js
index b5e32d070a..2a250d51b1 100644
--- a/ng2-components/ng2-alfresco-social/demo/systemjs.config.js
+++ b/ng2-components/ng2-alfresco-social/demo/systemjs.config.js
@@ -22,6 +22,9 @@
             '@angular/router': 'npm:@angular/router/bundles/router.umd.js',
             '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
             '@angular/material': 'npm:@angular/material/bundles/material.umd.js',
+            '@angular/animations': 'npm:@angular/animations/bundles/animations.umd.min.js',
+            '@angular/animations/browser':'npm:@angular/animations/bundles/animations-browser.umd.js',
+            '@angular/platform-browser/animations': 'npm:@angular/platform-browser/bundles/platform-browser-animations.umd.js',
 
             // other libraries
             'rxjs': 'npm:rxjs',
diff --git a/ng2-components/ng2-alfresco-social/package.json b/ng2-components/ng2-alfresco-social/package.json
index 304fc0b769..98740e4c17 100644
--- a/ng2-components/ng2-alfresco-social/package.json
+++ b/ng2-components/ng2-alfresco-social/package.json
@@ -21,6 +21,7 @@
     "url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
   },
   "dependencies": {
+    "@angular/animations": "~4.0.0",
     "@angular/common": "~4.0.0",
     "@angular/compiler": "~4.0.0",
     "@angular/core": "~4.0.0",
diff --git a/ng2-components/ng2-alfresco-tag/config/webpack.common.js b/ng2-components/ng2-alfresco-tag/config/webpack.common.js
index 95cd33177e..52a680e87e 100644
--- a/ng2-components/ng2-alfresco-tag/config/webpack.common.js
+++ b/ng2-components/ng2-alfresco-tag/config/webpack.common.js
@@ -87,8 +87,8 @@ module.exports = {
                     },
                     publicPath: (url, resourcePath)=> {
                         var component = resourcePath.substring(0, resourcePath.indexOf('src'));
-                        var path = resourcePath.replace(component, '').replace('src', 'bundles');
-                        return './' + path + url;
+                        var path = resourcePath.replace(component, '').replace('src/', '');
+                        return path + url;
                     }
                 }
             }
diff --git a/ng2-components/ng2-alfresco-tag/demo/package.json b/ng2-components/ng2-alfresco-tag/demo/package.json
index 78581fc354..0ef7cec36e 100644
--- a/ng2-components/ng2-alfresco-tag/demo/package.json
+++ b/ng2-components/ng2-alfresco-tag/demo/package.json
@@ -12,42 +12,38 @@
     "server": "wsrv -o -s -l",
     "build": "npm run tslint && npm run clean-build && npm run tsc",
     "build:w": "npm run tslint && rimraf dist && npm run tsc:w",
-    "travis": "npm link ng2-alfresco-core",
+    "travis": "npm link ng2-alfresco-core ng2-alfresco-tag",
     "tsc": "tsc",
     "tsc:w": "tsc -w",
     "tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts  -e '{,**/}**.d.ts'"
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@angular/common": "2.4.7",
-    "@angular/compiler": "2.4.7",
-    "@angular/compiler-cli": "2.4.7",
-    "@angular/core": "2.4.7",
-    "@angular/forms": "2.4.7",
-    "@angular/http": "2.4.7",
-    "@angular/platform-browser": "2.4.7",
-    "@angular/platform-browser-dynamic": "2.4.7",
+    "@angular/animations": "~4.0.0",
+    "@angular/common": "~4.0.0",
+    "@angular/compiler": "~4.0.0",
+    "@angular/core": "~4.0.0",
+    "@angular/forms": "~4.0.0",
+    "@angular/http": "~4.0.0",
+    "@angular/platform-browser": "~4.0.0",
+    "@angular/platform-browser-dynamic": "~4.0.0",
+    "@angular/router": "~4.0.0",
+
     "@angular/material": "2.0.0-beta.1",
-    "@angular/router": "3.4.7",
-    "@angular/upgrade": "2.4.7",
+    "alfresco-js-api": "~1.4.0",
     "core-js": "2.4.1",
+    "hammerjs": "2.0.8",
+    "ng2-alfresco-core": "1.4.0",
+    "ng2-translate": "5.0.0",
     "reflect-metadata": "0.1.10",
     "rxjs": "5.1.0",
     "systemjs": "0.19.27",
-    "zone.js": "0.7.6",
-    "intl": "1.2.4",
-    "dialog-polyfill": "0.4.7",
-    "element.scrollintoviewifneeded-polyfill": "1.0.1",
-    "material-design-icons": "2.2.3",
-    "material-design-lite": "1.2.1",
-    "ng2-translate": "5.0.0",
-    "alfresco-js-api": "~1.4.0",
-    "ng2-alfresco-core": "1.4.0",
-    "ng2-alfresco-tag": "1.4.0"
+    "zone.js": "0.7.6"
   },
   "devDependencies": {
-    "@types/jasmine": "^2.2.33",
-    "@types/node": "^6.0.42",
+    "@types/hammerjs": "^2.0.34",
+    "@types/jasmine": "2.5.35",
+    "@types/node": "6.0.45",
     "concurrently": "^2.2.0",
     "rimraf": "2.5.2",
     "tslint": "3.15.1",
diff --git a/ng2-components/ng2-alfresco-tag/demo/systemjs.config.js b/ng2-components/ng2-alfresco-tag/demo/systemjs.config.js
index 6d080473a1..d4c4f382bc 100644
--- a/ng2-components/ng2-alfresco-tag/demo/systemjs.config.js
+++ b/ng2-components/ng2-alfresco-tag/demo/systemjs.config.js
@@ -22,6 +22,9 @@
             '@angular/router': 'npm:@angular/router/bundles/router.umd.js',
             '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
             '@angular/material': 'npm:@angular/material/bundles/material.umd.js',
+            '@angular/animations': 'npm:@angular/animations/bundles/animations.umd.min.js',
+            '@angular/animations/browser':'npm:@angular/animations/bundles/animations-browser.umd.js',
+            '@angular/platform-browser/animations': 'npm:@angular/platform-browser/bundles/platform-browser-animations.umd.js',
 
             // other libraries
             'rxjs': 'npm:rxjs',
diff --git a/ng2-components/ng2-alfresco-tag/package.json b/ng2-components/ng2-alfresco-tag/package.json
index 8170c978eb..aca0abc0ef 100644
--- a/ng2-components/ng2-alfresco-tag/package.json
+++ b/ng2-components/ng2-alfresco-tag/package.json
@@ -21,6 +21,7 @@
     "url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
   },
   "dependencies": {
+    "@angular/animations": "~4.0.0",
     "@angular/common": "~4.0.0",
     "@angular/compiler": "~4.0.0",
     "@angular/core": "~4.0.0",
diff --git a/ng2-components/ng2-alfresco-upload/config/webpack.common.js b/ng2-components/ng2-alfresco-upload/config/webpack.common.js
index 95cd33177e..52a680e87e 100644
--- a/ng2-components/ng2-alfresco-upload/config/webpack.common.js
+++ b/ng2-components/ng2-alfresco-upload/config/webpack.common.js
@@ -87,8 +87,8 @@ module.exports = {
                     },
                     publicPath: (url, resourcePath)=> {
                         var component = resourcePath.substring(0, resourcePath.indexOf('src'));
-                        var path = resourcePath.replace(component, '').replace('src', 'bundles');
-                        return './' + path + url;
+                        var path = resourcePath.replace(component, '').replace('src/', '');
+                        return path + url;
                     }
                 }
             }
diff --git a/ng2-components/ng2-alfresco-upload/demo/package.json b/ng2-components/ng2-alfresco-upload/demo/package.json
index d539b4ccf9..3765f93ee3 100644
--- a/ng2-components/ng2-alfresco-upload/demo/package.json
+++ b/ng2-components/ng2-alfresco-upload/demo/package.json
@@ -12,7 +12,7 @@
     "server": "wsrv -o -s -l",
     "build": "npm run tslint && npm run clean-build && npm run tsc",
     "build:w": "npm run tslint && rimraf dist && npm run tsc:w",
-    "travis": "npm link ng2-alfresco-core",
+    "travis": "npm link ng2-alfresco-core ng2-alfresco-upload",
     "tsc": "tsc",
     "tsc:w": "tsc -w",
     "tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts  -e '{,**/}**.d.ts'"
@@ -47,30 +47,32 @@
     "alfresco"
   ],
   "dependencies": {
-    "@angular/common": "2.4.7",
-    "@angular/compiler": "2.4.7",
-    "@angular/compiler-cli": "2.4.7",
-    "@angular/core": "2.4.7",
-    "@angular/forms": "2.4.7",
-    "@angular/http": "2.4.7",
-    "@angular/platform-browser": "2.4.7",
-    "@angular/platform-browser-dynamic": "2.4.7",
+    "@angular/animations": "~4.0.0",
+    "@angular/common": "~4.0.0",
+    "@angular/compiler": "~4.0.0",
+    "@angular/core": "~4.0.0",
+    "@angular/forms": "~4.0.0",
+    "@angular/http": "~4.0.0",
+    "@angular/platform-browser": "~4.0.0",
+    "@angular/platform-browser-dynamic": "~4.0.0",
+    "@angular/router": "~4.0.0",
+
     "@angular/material": "2.0.0-beta.1",
-    "@angular/router": "3.4.7",
-    "@angular/upgrade": "2.4.7",
+    "alfresco-js-api": "~1.4.0",
     "core-js": "2.4.1",
+    "hammerjs": "2.0.8",
+    "ng2-alfresco-core": "1.4.0",
+    "ng2-translate": "5.0.0",
     "reflect-metadata": "0.1.10",
     "rxjs": "5.1.0",
     "systemjs": "0.19.27",
     "zone.js": "0.7.6",
+
     "intl": "1.2.4",
     "dialog-polyfill": "0.4.7",
     "element.scrollintoviewifneeded-polyfill": "1.0.1",
     "material-design-icons": "2.2.3",
     "material-design-lite": "1.2.1",
-    "ng2-translate": "5.0.0",
-    "alfresco-js-api": "~1.4.0",
-    "ng2-alfresco-core": "1.4.0",
     "ng2-alfresco-upload": "1.4.0"
   },
   "devDependencies": {
diff --git a/ng2-components/ng2-alfresco-upload/demo/src/main.ts b/ng2-components/ng2-alfresco-upload/demo/src/main.ts
index a8c702b244..24f4c65120 100644
--- a/ng2-components/ng2-alfresco-upload/demo/src/main.ts
+++ b/ng2-components/ng2-alfresco-upload/demo/src/main.ts
@@ -42,22 +42,18 @@ import { UploadModule } from 'ng2-alfresco-upload';
                 </div>
                 <div *ngIf="!acceptedFilesTypeShow">
                     <alfresco-upload-button data-automation-id="multiple-file-upload"
-                                            [currentFolderPath]="currentPath"
                                             [multipleFiles]="multipleFileUpload"
                                             [uploadFolders]="folderUpload"
-                                            [versioning] = "versioning"
-                                            (onSuccess)="documentList.reload()">
+                                            [versioning] = "versioning">
                         <div class="mdl-spinner mdl-js-spinner is-active"></div>
                     </alfresco-upload-button>
                 </div>
                 <div *ngIf="acceptedFilesTypeShow">
                     <alfresco-upload-button data-automation-id="multiple-file-upload"
-                                            [currentFolderPath]="currentPath"
                                             acceptedFilesType="{{acceptedFilesType}}"
                                             [multipleFiles]="multipleFileUpload"
                                             [uploadFolders]="folderUpload"
-                                            [versioning] = "versioning"
-                                            (onSuccess)="documentList.reload()">
+                                            [versioning] = "versioning">
                         <div class="mdl-spinner mdl-js-spinner is-active"></div>
                     </alfresco-upload-button>
                 </div>
diff --git a/ng2-components/ng2-alfresco-upload/demo/systemjs.config.js b/ng2-components/ng2-alfresco-upload/demo/systemjs.config.js
index c9897420b6..5ac7852681 100644
--- a/ng2-components/ng2-alfresco-upload/demo/systemjs.config.js
+++ b/ng2-components/ng2-alfresco-upload/demo/systemjs.config.js
@@ -22,6 +22,9 @@
             '@angular/router': 'npm:@angular/router/bundles/router.umd.js',
             '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
             '@angular/material': 'npm:@angular/material/bundles/material.umd.js',
+            '@angular/animations': 'npm:@angular/animations/bundles/animations.umd.min.js',
+            '@angular/animations/browser':'npm:@angular/animations/bundles/animations-browser.umd.js',
+            '@angular/platform-browser/animations': 'npm:@angular/platform-browser/bundles/platform-browser-animations.umd.js',
 
             // other libraries
             'rxjs': 'npm:rxjs',
diff --git a/ng2-components/ng2-alfresco-upload/package.json b/ng2-components/ng2-alfresco-upload/package.json
index 0d65c5f890..ed1e7bee01 100644
--- a/ng2-components/ng2-alfresco-upload/package.json
+++ b/ng2-components/ng2-alfresco-upload/package.json
@@ -42,6 +42,7 @@
     "alfresco"
   ],
   "dependencies": {
+    "@angular/animations": "~4.0.0",
     "@angular/common": "~4.0.0",
     "@angular/compiler": "~4.0.0",
     "@angular/core": "~4.0.0",
diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts
index 84d19f9b9a..4256157030 100644
--- a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts
+++ b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts
@@ -17,7 +17,7 @@
 
 import { Component, ElementRef, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges } from '@angular/core';
 import { Subject } from 'rxjs/Rx';
-import { AlfrescoTranslationService, LogService, NotificationService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService, LogService, NotificationService, AlfrescoSettingsService } from 'ng2-alfresco-core';
 import { UploadService } from '../services/upload.service';
 import { FileModel } from '../models/file.model';
 import { PermissionModel } from '../models/permissions.model';
@@ -105,13 +105,18 @@ export class UploadButtonComponent implements OnInit, OnChanges {
                 private uploadService: UploadService,
                 private translateService: AlfrescoTranslationService,
                 private logService: LogService,
-                private notificationService: NotificationService) {
+                private notificationService: NotificationService,
+                private settingsService: AlfrescoSettingsService) {
         if (translateService) {
             translateService.addTranslationFolder('ng2-alfresco-upload', 'node_modules/ng2-alfresco-upload/src');
         }
     }
 
     ngOnInit() {
+        this.settingsService.ecmHostSubject.subscribe((hostEcm: string) => {
+            this.checkPermission();
+        });
+
         this.permissionValue.subscribe((permission: boolean) => {
             this.hasPermission = permission;
         });
diff --git a/ng2-components/ng2-alfresco-userinfo/config/webpack.common.js b/ng2-components/ng2-alfresco-userinfo/config/webpack.common.js
index 95cd33177e..52a680e87e 100644
--- a/ng2-components/ng2-alfresco-userinfo/config/webpack.common.js
+++ b/ng2-components/ng2-alfresco-userinfo/config/webpack.common.js
@@ -87,8 +87,8 @@ module.exports = {
                     },
                     publicPath: (url, resourcePath)=> {
                         var component = resourcePath.substring(0, resourcePath.indexOf('src'));
-                        var path = resourcePath.replace(component, '').replace('src', 'bundles');
-                        return './' + path + url;
+                        var path = resourcePath.replace(component, '').replace('src/', '');
+                        return path + url;
                     }
                 }
             }
diff --git a/ng2-components/ng2-alfresco-userinfo/demo/package.json b/ng2-components/ng2-alfresco-userinfo/demo/package.json
index 460b97c8ff..22e07723b4 100644
--- a/ng2-components/ng2-alfresco-userinfo/demo/package.json
+++ b/ng2-components/ng2-alfresco-userinfo/demo/package.json
@@ -12,37 +12,39 @@
     "server": "wsrv -o -s -l",
     "build": "npm run tslint && npm run clean-build && npm run tsc",
     "build:w": "npm run tslint && rimraf dist && npm run tsc:w",
-    "travis": "npm link ng2-alfresco-core",
+    "travis": "npm link ng2-alfresco-core ng2-alfresco-login ng2-alfresco-userinfo",
     "tsc": "tsc",
     "tsc:w": "tsc -w",
     "tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts  -e '{,**/}**.d.ts'"
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@angular/common": "2.4.7",
-    "@angular/compiler": "2.4.7",
-    "@angular/compiler-cli": "2.4.7",
-    "@angular/core": "2.4.7",
-    "@angular/forms": "2.4.7",
-    "@angular/http": "2.4.7",
-    "@angular/platform-browser": "2.4.7",
-    "@angular/platform-browser-dynamic": "2.4.7",
+    "@angular/animations": "~4.0.0",
+    "@angular/common": "~4.0.0",
+    "@angular/compiler": "~4.0.0",
+    "@angular/core": "~4.0.0",
+    "@angular/forms": "~4.0.0",
+    "@angular/http": "~4.0.0",
+    "@angular/platform-browser": "~4.0.0",
+    "@angular/platform-browser-dynamic": "~4.0.0",
+    "@angular/router": "~4.0.0",
+
     "@angular/material": "2.0.0-beta.1",
-    "@angular/router": "3.4.7",
-    "@angular/upgrade": "2.4.7",
+    "alfresco-js-api": "~1.4.0",
     "core-js": "2.4.1",
+    "hammerjs": "2.0.8",
+    "ng2-alfresco-core": "1.4.0",
+    "ng2-translate": "5.0.0",
     "reflect-metadata": "0.1.10",
     "rxjs": "5.1.0",
     "systemjs": "0.19.27",
     "zone.js": "0.7.6",
+
     "intl": "1.2.4",
     "dialog-polyfill": "0.4.7",
     "element.scrollintoviewifneeded-polyfill": "1.0.1",
     "material-design-icons": "2.2.3",
     "material-design-lite": "1.2.1",
-    "ng2-translate": "5.0.0",
-    "alfresco-js-api": "~1.4.0",
-    "ng2-alfresco-core": "1.4.0",
     "ng2-alfresco-login": "1.4.0",
     "ng2-alfresco-userinfo": "1.4.0"
   },
diff --git a/ng2-components/ng2-alfresco-userinfo/demo/systemjs.config.js b/ng2-components/ng2-alfresco-userinfo/demo/systemjs.config.js
index 9a8c09d837..284d7d0b4c 100644
--- a/ng2-components/ng2-alfresco-userinfo/demo/systemjs.config.js
+++ b/ng2-components/ng2-alfresco-userinfo/demo/systemjs.config.js
@@ -22,6 +22,9 @@
             '@angular/router': 'npm:@angular/router/bundles/router.umd.js',
             '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
             '@angular/material': 'npm:@angular/material/bundles/material.umd.js',
+            '@angular/animations': 'npm:@angular/animations/bundles/animations.umd.min.js',
+            '@angular/animations/browser':'npm:@angular/animations/bundles/animations-browser.umd.js',
+            '@angular/platform-browser/animations': 'npm:@angular/platform-browser/bundles/platform-browser-animations.umd.js',
 
             // other libraries
             'rxjs': 'npm:rxjs',
diff --git a/ng2-components/ng2-alfresco-userinfo/package.json b/ng2-components/ng2-alfresco-userinfo/package.json
index 1cad39a289..2cedbc1002 100644
--- a/ng2-components/ng2-alfresco-userinfo/package.json
+++ b/ng2-components/ng2-alfresco-userinfo/package.json
@@ -21,6 +21,7 @@
     "url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
   },
   "dependencies": {
+    "@angular/animations": "~4.0.0",
     "@angular/common": "~4.0.0",
     "@angular/compiler": "~4.0.0",
     "@angular/core": "~4.0.0",
diff --git a/ng2-components/ng2-alfresco-viewer/config/webpack.common.js b/ng2-components/ng2-alfresco-viewer/config/webpack.common.js
index 95cd33177e..52a680e87e 100644
--- a/ng2-components/ng2-alfresco-viewer/config/webpack.common.js
+++ b/ng2-components/ng2-alfresco-viewer/config/webpack.common.js
@@ -87,8 +87,8 @@ module.exports = {
                     },
                     publicPath: (url, resourcePath)=> {
                         var component = resourcePath.substring(0, resourcePath.indexOf('src'));
-                        var path = resourcePath.replace(component, '').replace('src', 'bundles');
-                        return './' + path + url;
+                        var path = resourcePath.replace(component, '').replace('src/', '');
+                        return path + url;
                     }
                 }
             }
diff --git a/ng2-components/ng2-alfresco-viewer/demo/package.json b/ng2-components/ng2-alfresco-viewer/demo/package.json
index bbbad09958..d0371e51e6 100644
--- a/ng2-components/ng2-alfresco-viewer/demo/package.json
+++ b/ng2-components/ng2-alfresco-viewer/demo/package.json
@@ -12,37 +12,39 @@
     "server": "wsrv -o -s -l",
     "build": "npm run tslint && npm run clean-build && npm run tsc",
     "build:w": "npm run tslint && rimraf dist && npm run tsc:w",
-    "travis": "npm link ng2-alfresco-core",
+    "travis": "npm link ng2-alfresco-core ng2-alfresco-viewer",
     "tsc": "tsc",
     "tsc:w": "tsc -w",
     "tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts  -e '{,**/}**.d.ts'"
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@angular/common": "2.4.7",
-    "@angular/compiler": "2.4.7",
-    "@angular/compiler-cli": "2.4.7",
-    "@angular/core": "2.4.7",
-    "@angular/forms": "2.4.7",
-    "@angular/http": "2.4.7",
-    "@angular/platform-browser": "2.4.7",
-    "@angular/platform-browser-dynamic": "2.4.7",
+    "@angular/animations": "~4.0.0",
+    "@angular/common": "~4.0.0",
+    "@angular/compiler": "~4.0.0",
+    "@angular/core": "~4.0.0",
+    "@angular/forms": "~4.0.0",
+    "@angular/http": "~4.0.0",
+    "@angular/platform-browser": "~4.0.0",
+    "@angular/platform-browser-dynamic": "~4.0.0",
+    "@angular/router": "~4.0.0",
+
     "@angular/material": "2.0.0-beta.1",
-    "@angular/router": "3.4.7",
-    "@angular/upgrade": "2.4.7",
+    "alfresco-js-api": "~1.4.0",
     "core-js": "2.4.1",
+    "hammerjs": "2.0.8",
+    "ng2-alfresco-core": "1.4.0",
+    "ng2-translate": "5.0.0",
     "reflect-metadata": "0.1.10",
     "rxjs": "5.1.0",
     "systemjs": "0.19.27",
     "zone.js": "0.7.6",
+
     "intl": "1.2.4",
     "dialog-polyfill": "0.4.7",
     "element.scrollintoviewifneeded-polyfill": "1.0.1",
     "material-design-icons": "2.2.3",
     "material-design-lite": "1.2.1",
-    "ng2-translate": "5.0.0",
-    "alfresco-js-api": "~1.4.0",
-    "ng2-alfresco-core": "1.4.0",
     "ng2-alfresco-viewer": "1.4.0",
     "pdfjs-dist": "1.5.404"
   },
diff --git a/ng2-components/ng2-alfresco-viewer/demo/systemjs.config.js b/ng2-components/ng2-alfresco-viewer/demo/systemjs.config.js
index b37069fb4d..8a17b8f848 100644
--- a/ng2-components/ng2-alfresco-viewer/demo/systemjs.config.js
+++ b/ng2-components/ng2-alfresco-viewer/demo/systemjs.config.js
@@ -22,6 +22,9 @@
             '@angular/router': 'npm:@angular/router/bundles/router.umd.js',
             '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
             '@angular/material': 'npm:@angular/material/bundles/material.umd.js',
+            '@angular/animations': 'npm:@angular/animations/bundles/animations.umd.min.js',
+            '@angular/animations/browser':'npm:@angular/animations/bundles/animations-browser.umd.js',
+            '@angular/platform-browser/animations': 'npm:@angular/platform-browser/bundles/platform-browser-animations.umd.js',
 
             // other libraries
             'rxjs': 'npm:rxjs',
diff --git a/ng2-components/ng2-alfresco-viewer/package.json b/ng2-components/ng2-alfresco-viewer/package.json
index 56c620ef88..41c1c2e07e 100644
--- a/ng2-components/ng2-alfresco-viewer/package.json
+++ b/ng2-components/ng2-alfresco-viewer/package.json
@@ -36,6 +36,7 @@
     "alfresco"
   ],
   "dependencies": {
+    "@angular/animations": "~4.0.0",
     "@angular/common": "~4.0.0",
     "@angular/compiler": "~4.0.0",
     "@angular/core": "~4.0.0",
diff --git a/ng2-components/ng2-alfresco-webscript/config/webpack.common.js b/ng2-components/ng2-alfresco-webscript/config/webpack.common.js
index 95cd33177e..52a680e87e 100644
--- a/ng2-components/ng2-alfresco-webscript/config/webpack.common.js
+++ b/ng2-components/ng2-alfresco-webscript/config/webpack.common.js
@@ -87,8 +87,8 @@ module.exports = {
                     },
                     publicPath: (url, resourcePath)=> {
                         var component = resourcePath.substring(0, resourcePath.indexOf('src'));
-                        var path = resourcePath.replace(component, '').replace('src', 'bundles');
-                        return './' + path + url;
+                        var path = resourcePath.replace(component, '').replace('src/', '');
+                        return path + url;
                     }
                 }
             }
diff --git a/ng2-components/ng2-alfresco-webscript/demo/package.json b/ng2-components/ng2-alfresco-webscript/demo/package.json
index ee378181e2..4a1d831482 100644
--- a/ng2-components/ng2-alfresco-webscript/demo/package.json
+++ b/ng2-components/ng2-alfresco-webscript/demo/package.json
@@ -12,37 +12,39 @@
     "server": "wsrv -o -s -l",
     "build": "npm run tslint && npm run clean-build && npm run tsc",
     "build:w": "npm run tslint && rimraf dist && npm run tsc:w",
-    "travis": "npm link ng2-alfresco-core ng2-alfresco-datatable",
+    "travis": "npm link ng2-alfresco-core ng2-alfresco-datatable ng2-alfresco-webscript",
     "tsc": "tsc",
     "tsc:w": "tsc -w",
     "tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts  -e '{,**/}**.d.ts'"
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@angular/common": "2.4.7",
-    "@angular/compiler": "2.4.7",
-    "@angular/compiler-cli": "2.4.7",
-    "@angular/core": "2.4.7",
-    "@angular/forms": "2.4.7",
-    "@angular/http": "2.4.7",
-    "@angular/platform-browser": "2.4.7",
-    "@angular/platform-browser-dynamic": "2.4.7",
+    "@angular/animations": "~4.0.0",
+    "@angular/common": "~4.0.0",
+    "@angular/compiler": "~4.0.0",
+    "@angular/core": "~4.0.0",
+    "@angular/forms": "~4.0.0",
+    "@angular/http": "~4.0.0",
+    "@angular/platform-browser": "~4.0.0",
+    "@angular/platform-browser-dynamic": "~4.0.0",
+    "@angular/router": "~4.0.0",
+
     "@angular/material": "2.0.0-beta.1",
-    "@angular/router": "3.4.7",
-    "@angular/upgrade": "2.4.7",
+    "alfresco-js-api": "~1.4.0",
     "core-js": "2.4.1",
+    "hammerjs": "2.0.8",
+    "ng2-alfresco-core": "1.4.0",
+    "ng2-translate": "5.0.0",
     "reflect-metadata": "0.1.10",
     "rxjs": "5.1.0",
     "systemjs": "0.19.27",
     "zone.js": "0.7.6",
+
     "intl": "1.2.4",
     "dialog-polyfill": "0.4.7",
     "element.scrollintoviewifneeded-polyfill": "1.0.1",
     "material-design-icons": "2.2.3",
     "material-design-lite": "1.2.1",
-    "ng2-translate": "5.0.0",
-    "alfresco-js-api": "~1.4.0",
-    "ng2-alfresco-core": "1.4.0",
     "ng2-alfresco-datatable": "1.4.0",
     "ng2-alfresco-webscript": "1.4.0"
   },
diff --git a/ng2-components/ng2-alfresco-webscript/demo/systemjs.config.js b/ng2-components/ng2-alfresco-webscript/demo/systemjs.config.js
index ef3161379c..a106cb4527 100644
--- a/ng2-components/ng2-alfresco-webscript/demo/systemjs.config.js
+++ b/ng2-components/ng2-alfresco-webscript/demo/systemjs.config.js
@@ -22,6 +22,9 @@
             '@angular/router': 'npm:@angular/router/bundles/router.umd.js',
             '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
             '@angular/material': 'npm:@angular/material/bundles/material.umd.js',
+            '@angular/animations': 'npm:@angular/animations/bundles/animations.umd.min.js',
+            '@angular/animations/browser':'npm:@angular/animations/bundles/animations-browser.umd.js',
+            '@angular/platform-browser/animations': 'npm:@angular/platform-browser/bundles/platform-browser-animations.umd.js',
 
             // other libraries
             'rxjs': 'npm:rxjs',
diff --git a/ng2-components/ng2-alfresco-webscript/package.json b/ng2-components/ng2-alfresco-webscript/package.json
index 96b7901a96..73eb80b819 100644
--- a/ng2-components/ng2-alfresco-webscript/package.json
+++ b/ng2-components/ng2-alfresco-webscript/package.json
@@ -21,6 +21,7 @@
     "url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
   },
   "dependencies": {
+    "@angular/animations": "~4.0.0",
     "@angular/common": "~4.0.0",
     "@angular/compiler": "~4.0.0",
     "@angular/core": "~4.0.0",
diff --git a/scripts/npm-build-all-demo.sh b/scripts/npm-build-all-demo.sh
new file mode 100755
index 0000000000..9a8f9e73df
--- /dev/null
+++ b/scripts/npm-build-all-demo.sh
@@ -0,0 +1,96 @@
+#!/usr/bin/env bash
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+eval EXEC_GIT_NPM_INSTALL_JSAPI=false
+eval EXEC_BUILD=true
+eval EXEC_INSTALL=true
+
+eval projects=(
+    "ng2-alfresco-core"
+    "ng2-alfresco-datatable"
+    "ng2-activiti-diagrams"
+    "ng2-activiti-analytics"
+    "ng2-activiti-form"
+    "ng2-activiti-tasklist"
+    "ng2-activiti-processlist"
+    "ng2-alfresco-documentlist"
+    "ng2-alfresco-login"
+    "ng2-alfresco-search"
+    "ng2-alfresco-social"
+    "ng2-alfresco-tag"
+    "ng2-alfresco-social"
+    "ng2-alfresco-upload"
+    "ng2-alfresco-viewer"
+    "ng2-alfresco-webscript"
+    "ng2-alfresco-userinfo" )
+
+enable_js_api_git_link() {
+    GIT_ISH='git://github.com/Alfresco/alfresco-js-api.git#'$1
+    EXEC_GIT_NPM_INSTALL_JSAPI=true
+}
+
+show_help() {
+    echo "Usage: npm-build-all-demo.sh"
+    echo ""
+    echo "-t or -test build all your local component and run also the test on them , this parameter accept also a wildecard to execute test for example -t "ng2-alfresco-core" "
+    echo "-gitjsapi to build all the components against a commit-ish version of the JS-API"
+}
+
+exclude_build(){
+    EXEC_BUILD=false
+}
+
+exec_install(){
+    EXEC_INSTALL=false
+}
+
+while [[ $1 == -* ]]; do
+    case "$1" in
+      -h|--help|-\?) show_help; exit 0;;
+      -si|--skipinstall)  exec_install; shift;;
+      -sb|--skipbuild)  exclude_build; shift;;
+      -gitjsapi)  enable_js_api_git_link $2; shift 2;;
+      -*) echo "invalid option: $1" 1>&2; show_help; exit 1;;
+    esac
+done
+
+cd "$DIR/../ng2-components/"
+
+if $EXEC_INSTALL == true; then
+    echo "====== Regenerate global ng2-components package.json ====="
+    npm install package-json-merge
+    npm run pkg-build
+    echo "====== Install ng2-components dependencies ====="
+    npm install
+
+    if $EXEC_GIT_NPM_INSTALL_JSAPI == true; then
+      echo "====== Use the alfresco JS-API  '$GIT_ISH'====="
+      npm install $GIT_ISH
+      cd "$DIR/../ng2-components/node_modules/alfresco-js-api"
+      npm install
+      cd "$DIR/../ng2-components/"
+    fi
+fi
+
+if $EXEC_BUILD == true; then
+    echo "====== Build ng2-components ====="
+    npm run build || exit 1
+fi
+
+for PACKAGE in ${projects[@]}
+do
+  DESTDIR="$DIR/../ng2-components/$PACKAGE/demo"
+  if $EXEC_GIT_NPM_INSTALL_JSAPI == true; then
+      echo "====== Use the alfresco JS-API  '$GIT_ISH' in $PACKAGE demo ====="
+      cd $DESTDIR
+      npm install $GIT_ISH
+      cd "$DIR/../ng2-components/$PACKAGE/demo/node_modules/alfresco-js-api"
+      npm install
+  fi
+  cd $DESTDIR
+
+  npm link
+  npm run travis
+done
+
diff --git a/scripts/update-version.sh b/scripts/update-version.sh
index bb87ab6881..06bdc127b8 100755
--- a/scripts/update-version.sh
+++ b/scripts/update-version.sh
@@ -93,8 +93,8 @@ update_component_js_version(){
 
 update_demo_shell_dependency_version(){
 
-   for (( k=0; j<${projectslength}; k++ ));
-    do
+   for (( k=0; k<${projectslength}; k++ ));
+   do
     echo "====== UPDATE VERSION OF DEMO-SHELL to ${projects[$k]} version ${VERSION} ======"
     DESTDIR="$DIR/../demo-shell-ng2/"
     sed "${sedi[@]}" "s/\"${projects[$k]}\": \"[0-9]\\.[0-9]\\.[0-9]\"/\"${projects[$k]}\": \"${VERSION}\"/g"  ${DESTDIR}/package.json