diff --git a/_VERSION b/_VERSION
index 0bc3fd55..cffcf214 100644
--- a/_VERSION
+++ b/_VERSION
@@ -1 +1 @@
-_VERSION=0.6.0
+_VERSION=0.7.0
diff --git a/config/webpack.common.js b/config/webpack.common.js
index ffb584ec..dc18bb82 100644
--- a/config/webpack.common.js
+++ b/config/webpack.common.js
@@ -10,6 +10,7 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 const ForkCheckerPlugin = require('awesome-typescript-loader').ForkCheckerPlugin;
 const HtmlElementsPlugin = require('./html-elements-plugin');
 const AssetsPlugin = require('assets-webpack-plugin');
+const ContextReplacementPlugin = require('webpack/lib/ContextReplacementPlugin');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
 
 /*
@@ -250,6 +251,20 @@ module.exports = function (options) {
         name: ['polyfills', 'vendor'].reverse()
       }),
 
+
+      /**
+       * Plugin: ContextReplacementPlugin
+       * Description: Provides context to Angular's use of System.import
+       *
+       * See: https://webpack.github.io/docs/list-of-plugins.html#contextreplacementplugin
+       * See: https://github.com/angular/angular/issues/11580
+       */
+      new ContextReplacementPlugin(
+        // The (\\|\/) piece accounts for path separators in *nix and Windows
+        /angular(\\|\/)core(\\|\/)(esm(\\|\/)src|src)(\\|\/)linker/,
+        helpers.root('src') // location of your src
+      ),
+
       /*
        * Plugin: CopyWebpackPlugin
        * Description: Copy files and directories in webpack.
diff --git a/package.json b/package.json
index 6981a135..b8594f9f 100644
--- a/package.json
+++ b/package.json
@@ -1,21 +1,21 @@
 {
   "name": "ng2-admin",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Angular 2 and Bootstrap 4 Admin Template.",
   "author": "akveo",
   "homepage": "http://akveo.github.io/ng2-admin/",
   "license": "MIT",
   "dependencies": {
 
-    "@angular/common": "2.0.0-rc.6",
-    "@angular/compiler": "2.0.0-rc.6",
-    "@angular/core": "2.0.0-rc.6",
-    "@angular/forms": "^2.0.0-rc.6",
-    "@angular/http": "2.0.0-rc.6",
-    "@angular/platform-browser": "2.0.0-rc.6",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.6",
-    "@angular/platform-server": "2.0.0-rc.6",
-    "@angular/router": "3.0.0-rc.2",
+    "@angular/common": "2.0.0",
+    "@angular/compiler": "2.0.0",
+    "@angular/core": "2.0.0",
+    "@angular/forms": "^2.0.0",
+    "@angular/http": "2.0.0",
+    "@angular/platform-browser": "2.0.0",
+    "@angular/platform-browser-dynamic": "2.0.0",
+    "@angular/platform-server": "2.0.0",
+    "@angular/router": "3.0.0",
 
     "@angularclass/request-idle-callback": "^1.0.7",
     "@angularclass/webpack-toolkit": "^1.3.3",
@@ -26,8 +26,8 @@
 
     "http-server": "^0.9.0",
     "ie-shim": "^0.1.0",
-    "rxjs": "5.0.0-beta.11",
-    "zone.js": "~0.6.17",
+    "rxjs": "5.0.0-beta.12",
+    "zone.js": "~0.6.23",
 
     "amcharts3": "github:amcharts/amcharts3",
     "ammap3": "github:amcharts/ammap3",
@@ -53,7 +53,7 @@
     "ng2-bootstrap": "1.1.5",
     "ng2-tree": "^0.0.2-7",
     "ng2-ckeditor": "1.0.7",
-    "ng2-smart-table": "^0.2.4",
+    "ng2-smart-table": "^0.3.1",
     "ng2-uploader": "1.1.0",
     "normalize.css": "^4.1.1",
     "tether": "^1.2.4"