fix(merge): merge tree view component

package.json

@@ -37,7 +37,7 @@
     "lodash": "^4.12.0",
     "ng2-bootstrap": "^1.0.20",
     "ng2-ckeditor": "^1.0.4",
-    "ng2-branchy": "0.0.2-2",
+    "ng2-branchy": "^0.0.2-5",
     "ng2-uploader": "^0.5.2",
     "normalize.css": "^4.1.1",
     "rxjs": "5.0.0-beta.6",

src/app/pages/components/components.component.ts

@@ -1,6 +1,4 @@
 import {Component} from '@angular/core';
-import {RouteConfig} from '@angular/router-deprecated';
-import {TreeView} from "./components/treeView";
 
 @Component({
   selector: 'components',
@@ -9,14 +7,6 @@ import {TreeView} from "./components/treeView";
   styles: [],
   template: `<router-outlet></router-outlet>`
 })
-@RouteConfig([
-  {
-    name: 'TreeView',
-    component: TreeView,
-    path: '/tree-view',
-    useAsDefault: true
-  }
-])
 export class Components {
 
   constructor() {

src/app/pages/pages.routes.ts

@@ -20,6 +20,8 @@ import {BubbleMaps} from './maps/components/bubbleMaps/bubbleMaps.component';
 import {LineMaps} from './maps/components/lineMaps/lineMaps.component';
 import {Editors} from './editors/editors.component';
 import {Ckeditor} from './editors/components/ckeditor/ckeditor.component';
+import {Components} from './components/components.component';
+import {TreeView} from './components/components/treeView/treeView.component';
 
 //noinspection TypeScriptValidateTypes
 export const PagesRoutes:RouterConfig = [
@@ -64,6 +66,30 @@ export const PagesRoutes:RouterConfig = [
           }
         ]
       },
+      {
+        path: 'components',
+        component: Components,
+        data: {
+          menu: {
+            title: 'Components',
+            icon: 'ion-gear-a',
+            selected: false,
+            expanded: false,
+            order: 250,
+          }
+        },
+        children: [
+          {
+            path: 'treeview',
+            component: TreeView,
+            data: {
+              menu: {
+                title: 'Tree View',
+              }
+            }
+          }
+        ]
+      },
       {
         path: 'charts',
         component: Charts,