Update to angular2-rc.6

src/app.module.ts

@@ -1,48 +1,89 @@
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { LocationStrategy, HashLocationStrategy } from '@angular/common';
+
+import { Select2Component } from 'ng2-select2/ng2-select2';
 
 import { DataProviderService } from './services/data-provider.service';
 import { MapperService } from './services/mapper.service';
+import {UhkConfigurationService} from './services/uhk-configuration.service';
 
-import { MainAppComponent, APP_ROUTER_PROVIDERS }  from './main-app';
+import { MainAppComponent, appRoutingProviders, routing }  from './main-app';
 import { KeymapComponent } from './components/keymap';
 import { MacroComponent } from './components/macro';
 import { LegacyLoaderComponent } from './components/legacy-loader';
 import { NotificationComponent } from './components/notification';
 import {
-    SvgKeystrokeKeyComponent, SvgOneLineTextKeyComponent, SvgTwoLineTextKeyComponent
+    SvgIconTextKeyComponent,
+    SvgKeyboardKeyComponent,
+    SvgKeystrokeKeyComponent,
+    SvgOneLineTextKeyComponent,
+    SvgSingleIconKeyComponent,
+    SvgSwitchKeymapKeyComponent,
+    SvgTextIconKeyComponent,
+    SvgTwoLineTextKeyComponent
 } from './components/svg/keys';
 import { SvgKeyboardWrapComponent } from './components/svg/wrap';
 import { LayersComponent } from './components/layers';
 import { SvgKeyboardComponent } from './components/svg/keyboard';
+import { SvgModuleComponent } from './components/svg/module';
 import { PopoverComponent } from './components/popover';
 import { KeymapAddComponent } from './components/keymap';
-import {UhkConfigurationService} from './services/uhk-configuration.service';
+import { MacroItemComponent } from './components/popover/tab/macro';
+import { SideMenuComponent } from './components/side-menu';
+import {
+    KeypressTabComponent,
+    KeymapTabComponent,
+    LayerTabComponent,
+    MacroTabComponent,
+    MouseTabComponent,
+    NoneTabComponent
+} from './components/popover/tab';
+import { CaptureKeystrokeButtonComponent } from './components/popover/widgets/capture-keystroke';
+import { IconComponent } from './components/popover/widgets/icon';
 
 @NgModule({
     declarations: [
+        Select2Component,
         MainAppComponent,
         KeymapComponent,
         MacroComponent,
         LegacyLoaderComponent,
         NotificationComponent,
+        SvgIconTextKeyComponent,
+        SvgKeyboardKeyComponent,
         SvgKeystrokeKeyComponent,
         SvgOneLineTextKeyComponent,
+        SvgSingleIconKeyComponent,
+        SvgSwitchKeymapKeyComponent,
+        SvgTextIconKeyComponent,
         SvgTwoLineTextKeyComponent,
+        SvgKeyboardKeyComponent,
         SvgKeyboardWrapComponent,
+        SvgKeyboardComponent,
+        SvgModuleComponent,
         LayersComponent,
         PopoverComponent,
-        SvgKeyboardComponent,
-        KeymapAddComponent
+        KeymapAddComponent,
+        SideMenuComponent,
+        KeypressTabComponent,
+        KeymapTabComponent,
+        LayerTabComponent,
+        MacroTabComponent,
+        MouseTabComponent,
+        NoneTabComponent,
+        CaptureKeystrokeButtonComponent,
+        IconComponent,
+        MacroItemComponent
+    ],
+    imports: [
+        BrowserModule,
+        routing
     ],
-    imports: [BrowserModule],
     providers: [
         DataProviderService,
         UhkConfigurationService,
         MapperService,
-        APP_ROUTER_PROVIDERS,
-        { provide: LocationStrategy, useClass: HashLocationStrategy }
+        appRoutingProviders
     ],
     bootstrap: [MainAppComponent]
 })