diff --git a/config/webpack.common.js b/config/webpack.common.js
index 25772a7d..979d8d2b 100644
--- a/config/webpack.common.js
+++ b/config/webpack.common.js
@@ -89,6 +89,7 @@ module.exports = {
           // these packages have problems with their sourcemaps
           helpers.root('node_modules/rxjs'),
           helpers.root('node_modules/ng2-bootstrap'),
+          helpers.root('node_modules/ng2-branchy')
         ]
       }
 
diff --git a/package.json b/package.json
index 163e6ed2..9da4336d 100644
--- a/package.json
+++ b/package.json
@@ -35,9 +35,9 @@
     "leaflet": "^0.7.7",
     "leaflet-map": "^0.2.1",
     "lodash": "^4.12.0",
-    "ng2-bootstrap": "^1.0.16",
-    "ng2-branchy": "0.0.2-2",
-    "ng2-ckeditor": "^1.0.3",
+    "ng2-bootstrap": "^1.0.20",
+    "ng2-ckeditor": "^1.0.4",
+    "ng2-branchy": "^0.0.2-5",
     "ng2-uploader": "^0.5.2",
     "normalize.css": "^4.1.1",
     "rxjs": "5.0.0-beta.6",
diff --git a/src/app/pages/components/components/treeView/treeView.component.ts b/src/app/pages/components/components/treeView/treeView.component.ts
index 1f7fbb96..ccded400 100644
--- a/src/app/pages/components/components/treeView/treeView.component.ts
+++ b/src/app/pages/components/components/treeView/treeView.component.ts
@@ -1,6 +1,6 @@
 import {Component} from '@angular/core';
 import {BranchyComponent, TreeModel} from 'ng2-branchy';
-import {BaCard} from "../../../../theme/components/baCard/baCard.component";
+import {BaCard} from '../../../../theme/components/baCard';
 
 @Component({
   selector: 'tree-view',
diff --git a/src/platform/browser/directives.ts b/src/platform/browser/directives.ts
index 732e4189..0b63ed5f 100644
--- a/src/platform/browser/directives.ts
+++ b/src/platform/browser/directives.ts
@@ -6,10 +6,13 @@ import {PLATFORM_DIRECTIVES} from '@angular/core';
 
 // Angular 2 Router
 import {ROUTER_DIRECTIVES} from '@angular/router';
+// Angular 2 forms
+import { REACTIVE_FORM_DIRECTIVES } from '@angular/forms';
 
 // application_directives: directives that are global through out the application
 export const APPLICATION_DIRECTIVES = [
-  ...ROUTER_DIRECTIVES
+  ...ROUTER_DIRECTIVES,
+  ...REACTIVE_FORM_DIRECTIVES
 ];
 
 export const DIRECTIVES = [
diff --git a/src/platform/browser/providers.ts b/src/platform/browser/providers.ts
index 51da187f..6f9dfa8f 100644
--- a/src/platform/browser/providers.ts
+++ b/src/platform/browser/providers.ts
@@ -10,15 +10,21 @@ import {HTTP_PROVIDERS} from '@angular/http';
 import {APP_ROUTER_PROVIDERS} from '../../app/app.routes';
 
 
+// Angular 2 forms
+import {disableDeprecatedForms, provideForms} from '@angular/forms';
+
 /*
-* Application Providers/Directives/Pipes
-* providers/directives/pipes that only live in our browser environment
-*/
+ * Application Providers/Directives/Pipes
+ * providers/directives/pipes that only live in our browser environment
+ */
 export const APPLICATION_PROVIDERS = [
-  ...FORM_PROVIDERS,
+  // new Angular 2 forms
+  disableDeprecatedForms(),
+  provideForms(),
   ...HTTP_PROVIDERS,
   ...APP_ROUTER_PROVIDERS,
-  {provide: LocationStrategy, useClass: HashLocationStrategy }
+  {provide: LocationStrategy, useClass: HashLocationStrategy},
+  {provide: LocationStrategy, useClass: HashLocationStrategy}
 ];
 
 export const PROVIDERS = [